fix(project): repair split project IDs across worktrees

[benoitheinrich]

Issue for this PR

Closes#14082

Type of change

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

What does this PR do?

When using git worktrees/sandboxes, the same repo can end up with multiple OpenCode project.id values for a single project.worktree. That splits sessions (and other project-scoped data) across IDs. In the Web UI with workspaces enabled this shows up as empty session lists for some sandboxes (/session?directory=<sandbox>&roots=true...) even though sessions exist.

This PR:

• Stabilizes the project-id cache by storing it in the git common dir (shared by all worktrees).
• Runs a one-time startup repair only when duplicates exist: creates a DB backup, migrates sessions from duplicate project IDs into the canonical project row, preserves metadata (sandboxes + icon/name/commands) and permissions when missing on the canonical row, then deletes duplicate project rows.
• Guards the repair to only act on worktrees that have at least one vcs='git' project row.

How did you verify your code works?

• cd packages/opencode && bun test test/project/project.test.ts
• Manual verification against a local DB with duplicate project rows:
  • After starting the server, project.current resolves to the same project id for root and sandbox directories.
  • /session?directory=<sandbox>&roots=true... returns the expected sessions.

Screenshots / recordings

N/A (backend-only change)

Checklist

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

[benoitheinrich]

Updated the PR description to match the PR template sections.

[github-actions]

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

[benoitheinrich]

CI note: the only failing check is e2e (windows) (and the dependent test (linux) job that just asserts all upstream jobs passed).

The Windows log shows failures in prompt e2e tests with Bun reporting missing zod under .opencode/node_modules/@opencode-ai/plugin/dist/tool.js (e.g. "Cannot find package 'zod'") along with a few NotFoundError messages.

I don't see the project repair running in that job (no "Found duplicate projects" output), so this looks unrelated to the project-id/worktree changes. Would appreciate a rerun of the Windows e2e check.

[benoitheinrich]

Added a test to assert returns the same when called from the repo root vs any git worktree path (: ). Commit bc711ab1b.

[benoitheinrich]

Added a test to assert Project.fromDirectory() returns the same project.id when called from the repo root vs a git worktree path.

Commit: bc711ab1b

[benoitheinrich]

I manually validated the one-time repair path locally.

Command:

• bun run --conditions=browser ./src/index.ts serve --port 4097

Observed output:

Found duplicate projects. Creating DB backup...
DB backup created at: /home/benoit/.local/share/opencode/opencode.db.before-project-repair.2026-02-19T142444290Z.bak
Duplicate project repair complete. To revert: stop opencode and restore /home/benoit/.local/share/opencode/opencode.db.before-project-repair.2026-02-19T142444290Z.bak (and .bak-wal/.bak-shm if present).
Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.
opencode server listening on http://127.0.0.1:4097

Here is a screenshot of my sandboxes (worktrees) back:

[benoitheinrich]

Added coverage for the canonicalRow = canonical(data.worktree) path: if a DB project row already exists for a worktree, fromDirectory() should reuse that canonical DB id even if the git common-dir cache file contains a different id.

Commit: 17c9e1b7d

[benoitheinrich]

@adamdotdevin any chance to get this PR reviewed soon ? thanks 😄

[benoitheinrich]

Finding: separate clones were colliding

While fixing #14082 (worktrees splitting project IDs), we noticed another scenario: two separate clones of the same git repo can end up sharing a project identity if the ID is derived from repo history (eg. root commit). In the UI this shows up as selecting one project selecting both.

Fix

• Git project identity is now a per-clone UUID cached in the git common dir: <git-common-dir>/opencode.
  • Worktrees share the same common dir → same project id
  • Separate clones have different common dirs → different project id
• Legacy root-commit IDs (40-hex) are migrated in Project.repairAll() (DB backup + migrate Project/Session/Permission rows).
• Project.fromDirectory() does not perform DB repairs/migrations.

[benoitheinrich]

Update: clone + worktree collision fixed

We found a second failure mode beyond #14082 (worktree split-brain): if the git project id is derived from repo history (legacy 40-hex root commit), separate clones of the same repo collide and the UI can treat them as the same project (selecting one selects both).

Here is how it looks like, the V icon is selected twice:

Fix

• Git project ids are now per-clone UUIDs cached in the git common dir (<git-common-dir>/opencode).
  • git worktrees share the same common dir → same project id
  • separate clones have different common dirs → different project id
• Project.repairAll() performs a one-time migration for legacy 40-hex ids:
  • splits sessions by git common-dir root (so worktrees stay attached to their clone)
  • migrates session.project_id (and permissions when present)
  • only deletes the legacy project row when no sessions remain (missing directories stay on legacy id)

Coverage

Added regression tests for:

• two clones don’t share identity
• legacy caches are upgraded without collisions
• splitting legacy ids across clones
• splitting across two clones each with their own worktrees (worktrees follow the correct clone)

CI is green on the latest push.

[benoitheinrich]

All is good for me, can this be merged ?

[benoitheinrich]

I confirm that after the latest fix the UI correctly renders and selects only the active project even if the same git repo was cloned in 2 different places (not worktrees but really different clones)

[nicolas-bourdeau]

any update on this issue ? soon to be released ? thanks