Repository navigation
Conversation
|
The following comment was made by an LLM, it may be inaccurate: Based on the search results, I found one related PR: Potentially Related PRPR #32935 - Why it's related: The current PR (33211) explicitly mentions this PR as related in the description: "Related: #32935. This PR keeps the snapshot file listing scoped to the launch directory while fixing the pathspec consumers, instead of moving the listing commands to the worktree root." This appears to be a different approach to handling the same snapshot subdirectory issue—PR #32935 moved listing commands to the worktree root, while PR #33211 takes an alternative approach of keeping the listing scoped to the launch directory while fixing path handling downstream. These are not duplicates (they're alternative solutions), but they are closely related and should be reviewed together to ensure they don't conflict. |
|
Automated PR Cleanup Thank you for contributing to opencode. Due to the high volume of PRs from users and AI agents, we periodically close older PRs using automated criteria so maintainers can focus review time on the most active and community-supported contributions. This PR was closed because it matched the following cleanup criteria:
PRs created within the last month are not affected by this cleanup. If you believe this PR was closed incorrectly, or if you are still actively working on it, please leave a comment explaining why it should be reopened. A maintainer can review and reopen it if appropriate. Thanks again for taking the time to contribute. |
Issue for this PR
Closes #27688
Related: #32935. This PR keeps the snapshot file listing scoped to the launch directory while fixing the pathspec consumers, instead of moving the listing commands to the worktree root.
Type of change
What does this PR do?
When opencode is launched from a git subdirectory, snapshot candidate paths can be consumed from the wrong cwd. For tracked files, git can report worktree-relative paths such as
src/date.txt; feeding those pathspecs togit addfromrepo/srcmakes git look forrepo/src/src/date.txtand snapshot tracking fails.This fixes the path handling without broadening snapshot scope:
diff-filesandls-files --othersscoped tostate.directory, so arepo/srcinstance does not snapshot unrelatedrepo/root.txtchanges--full-nametols-files --othersso untracked files are also worktree-relativeignore,drop, andstagefromstate.worktree, where those pathspecs resolve correctlystate.worktreebecause the candidate paths are worktree-relativeThe extra
--full-namematters because from a subdirectory,git diff-files --name-only -- .can returnsrc/date.txt, whilegit ls-files --others -- .can returndate.txtunless full-name output is requested.How did you verify your code works?
From
packages/opencode:bun test test/snapshot/snapshot.test.tsbun test test/session/revert-compact.test.tsbun test test/session/snapshot-tool-race.test.tsbun run typecheckFrom the repo root / during push:
git diff --checkPATH=/tmp/opencode-bun-1.3.14:$PATH git push -u fork snapshot-subdirran the pre-push hook successfully, including rootbun turbo typecheckManual checks:
src/src/pathspecfailure before the fixrepo/srcis reported correctly after adding--full-nameScreenshots / recordings
N/A, not a UI change.
Checklist