fix(obs): resolve squads dir from git root for worktree support#660
Merged
agents-squads[bot] merged 1 commit intodevelopfrom Mar 28, 2026
Merged
fix(obs): resolve squads dir from git root for worktree support#660agents-squads[bot] merged 1 commit intodevelopfrom
agents-squads[bot] merged 1 commit intodevelopfrom
Conversation
findSquadsDir() now uses a 3-stage fallback: 1. Standard 5-level ancestor walk from process.cwd() (unchanged happy path) 2. git rev-parse --show-toplevel — handles CWD deep inside a subdirectory 3. git rev-parse --git-common-dir — resolves main repo root and checks sibling directories (e.g. hq/ next to squads-cli/ or worktrees/) No new npm dependencies. spawnSync from child_process (built-in). Closes #652
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
squads obs syncfailed to find JSONL when invoked from a git worktree or any directory where hq is a sibling (not an ancestor).Root Cause
findSquadsDir()only walked up ancestors fromprocess.cwd(). From.worktrees/data-lead-xxx/, hq is atagents-squads/hq/— a sibling, not an ancestor.Fix
Three-stage fallback in
findSquadsDir():git rev-parse --show-toplevel— walk up from git toplevel if different from CWDgit rev-parse --git-common-dir— find main repo root, walk up from there + check siblingsNo new npm dependencies (uses built-in
child_process.spawnSync).Testing
npm run buildpassesnpm testpasses (1892 tests)Closes #652