fix(project): use worktree paths for project ids#23866
Open
tinywind wants to merge 12 commits intoanomalyco:devfrom
Open
fix(project): use worktree paths for project ids#23866tinywind wants to merge 12 commits intoanomalyco:devfrom
tinywind wants to merge 12 commits intoanomalyco:devfrom
Conversation
Separate clones of the same repository should not collapse into a single OpenCode project just because they share the same root commit.\n\nDerive git project IDs from the canonical worktree directory instead of the root commit/cache file, keep git worktrees grouped under the same project, and update the affected tests to cover the new behavior.
github-actions
Bot
added
needs:compliance
Contributor
|
Thanks for your contribution! This PR doesn't have a linked issue. All PRs must reference an existing issue. Please:
See CONTRIBUTING.md for details. |
github-actions
Bot
removed
needs:compliance
Contributor
|
Thanks for updating your PR! It now meets our contributing guidelines. 👍 |
Author
|
The required
Could a maintainer approve the pending workflows and re-run |
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
5 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.
Issue for this PR
Closes #23868
Type of change
What does this PR do?
OpenCode currently derives git project IDs from shared repository history, so separate clones with the same root commit collapse into one project and share sessions.
This change derives the project ID from the canonical worktree directory instead. That keeps
git worktreesandboxes grouped under the same project while giving independent clones different IDs even when they share history.The tests were updated to cover three cases: independent clones now split correctly, worktrees still share a project, and global-to-git migration follows the new directory-based ID.
How did you verify your code works?
bun test test/project/project.test.ts test/project/migrate-global.test.ts test/server/project-init-git.test.tsbun typecheckserveinstance with separateXDG_*andHOMEpaths and verified thatdigiwill-edugateanddigwill-edugate-jbonnow return different project IDs despite sharing the same root commitScreenshots / recordings
N/A
Checklist