fix(slash_cmds): /update pins git commands to the repo root#681
Merged
lsdefine merged 1 commit intoJul 13, 2026
Merged
Conversation
The agent's default cwd is the temp/ subdirectory, where git resolves '-- <file>' pathspecs relative to cwd. Fed the root-relative paths that 'git diff --name-only' prints, 'git checkout upstream/main -- <file>' fails with "pathspec did not match", breaking the working-tree reconcile steps of /update. The prompt now tells the agent to run every git command from the repo root (_ROOT), in both EN and ZH.
lsdefine
pushed a commit
that referenced
this pull request
Jul 23, 2026
The agent's default cwd is the temp/ subdirectory, where git resolves '-- <file>' pathspecs relative to cwd. Fed the root-relative paths that 'git diff --name-only' prints, 'git checkout upstream/main -- <file>' fails with "pathspec did not match", breaking the working-tree reconcile steps of /update. The prompt now tells the agent to run every git command from the repo root (_ROOT), in both EN and ZH. Co-authored-by: Shen Hao <shenhao-stu@users.noreply.github.com>
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
2 participants
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.
Problem
The
/updateslash command kept failing at its working-tree reconcile steps witherror: pathspec '<file>' did not match any file(s) known to git.Root cause: the agent's default cwd is the
temp/subdirectory.git diff --name-only upstream/mainprints root-relative paths, butgit checkout upstream/main -- <file>resolves the pathspec relative to cwd — so fromtemp/every checkout looks fortemp/<file>and fails ('/update keeps looking in the wrong directory').Fix
build_update_promptnow injects one leading instruction (EN + ZH): run every git command from the repo root_ROOT(cd there first, or usegit -C)._ROOT = Path(__file__).resolve().parent.parentalso resolves correctly from any worktree.Testing
py_compileclean; both language prompts render with the pinned root.agentmain.py --func(agent cwd =temp/); the agent completed a full /update — fetch, history align, per-file working-tree reconcile — with zero pathspec errors, local enhancements and the fork-only overlay block preserved, no commit created.