Skip to content

fix(project): use worktree paths for project ids - #23866

Closed
tinywind wants to merge 12 commits into
anomalyco:devfrom
tinywind:bugfix/project-id-by-worktree
Closed

fix(project): use worktree paths for project ids#23866
tinywind wants to merge 12 commits into
anomalyco:devfrom
tinywind:bugfix/project-id-by-worktree

Conversation

@tinywind

@tinywind tinywind commented Apr 22, 2026 •
edited
Loading

Copy link
Copy Markdown

Issue for this PR

Closes #23868

Type of change

  • Bug fix
  • New feature
  • Refactor / code improvement
  • Documentation

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 worktree sandboxes 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?

  • Ran bun test test/project/project.test.ts test/project/migrate-global.test.ts test/server/project-init-git.test.ts
  • Ran bun typecheck
  • Started an isolated serve instance with separate XDG_* and HOME paths and verified that digiwill-edugate and digwill-edugate-jbon now return different project IDs despite sharing the same root commit

Screenshots / recordings

N/A

Checklist

  • I have tested my changes locally
  • I have not included unrelated changes in this PR

rekram1-node and others added 12 commits April 22, 2026 00:35
@rekram1-node
feat: update codex plugin to support 5.5 (anomalyco#23789)
97f3c74
@Hona
chore: bump Bun to 1.3.13 (anomalyco#23791)
69e2f3b
@Brendonovich
fix(app): improve icon override handling in project edit dialog (anom…
a45d9a9 
…alyco#23768)
@opencode-agent
chore: update nix node_modules hashes
ed3d364
@Hona
fix: preserve BOM in text tool round-trips (anomalyco#23797)
bb69648
@opencode-agent
chore: generate
bfb954e
@Hona
test: fix cross-spawn stderr race on Windows CI (anomalyco#23808)
0595c28
@opencode-agent
chore: generate
6aa475f
@Brendonovich
fix: consolidate project avatar source logic (anomalyco#23819)
88c5f6b
@nexxeln
fix(tui): fail fast on invalid session startup (anomalyco#23837)
2a480a9
@opencode-agent
chore: generate
266e965
@tinywind
fix(project): use worktree paths for project ids
348e5c4 
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 github-actions Bot added needs:compliance This means the issue will auto-close after 2 hours. needs:issue labels Apr 22, 2026
@github-actions

github-actions Bot commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

Thanks for your contribution!

This PR doesn't have a linked issue. All PRs must reference an existing issue.

Please:

  1. Open an issue describing the bug/feature (if one doesn't exist)
  2. Add Fixes #<number> or Closes #<number> to this PR description

See CONTRIBUTING.md for details.

@tinywind tinywind mentioned this pull request Apr 22, 2026
Closed
@github-actions github-actions Bot removed needs:compliance This means the issue will auto-close after 2 hours. needs:issue labels Apr 22, 2026
@github-actions

github-actions Bot commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

Thanks for updating your PR! It now meets our contributing guidelines. 👍

@tinywind

tinywind commented Apr 22, 2026

Copy link
Copy Markdown
Author

pr-management / check-duplicates appears to have failed due to a timeout rather than an actual duplicate match.

The required pull_request workflows also look blocked in action_required and have not started yet:

  • test
  • typecheck
  • nix-eval

Could a maintainer approve the pending workflows and re-run pr-management / check-duplicates?

@github-actions

github-actions Bot commented May 22, 2026

Copy link
Copy Markdown
Contributor

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:

  • The PR was created more than 1 month ago
  • The PR had fewer than 2 positive reactions
  • Positive reactions are counted as thumbs-up, heart, celebration, or rocket reactions on the PR

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.

@github-actions github-actions Bot closed this May 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adamdotdevin adamdotdevin Awaiting requested review from adamdotdevin

Assignees

No one assigned

Labels

automated-pr-cleanup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Project ID collision when independent clones share a root commit

5 participants

@tinywind @rekram1-node @Hona @Brendonovich @nexxeln