Desktop app merges separate directories of the same Git repo into one project

[FQXCS]

Description

When adding projects in the desktop app, two different local directories that point to the same Git repository are merged into a single project. One directory becomes the main project worktree, and the other directory is shown/treated as a sandbox.

This is unexpected. In the desktop app, each added directory should appear as an independent project, even if both directories use the same Git remote or represent different branches of the same repository.

Plugins

OpenCode version

1.15.12

Steps to reproduce

1. Clone the same Git repository into two different local directories.
2. Checkout a different branch in each directory.
3. Open the desktop app.
4. Add the first directory as a project.
5. Add the second directory as another project.

Actual Behavior

The desktop app merges both directories into one project.

The first added directory becomes the main project, while the second directory is treated as a sandbox of that project.

Expected Behavior

The desktop app should show both directories as separate projects.

Projects in the desktop app should be distinguished by their local directory path, not only by Git repository identity, remote URL, or shared Git metadata.

Why This Matters

It is common to keep multiple checkouts of the same repository in different directories, especially when working on multiple branches at the same time.

Treating one checkout as a sandbox makes it harder to manage them independently in the desktop app.

Suggested Fix

The app could use git worktree list to distinguish linked Git worktrees from separate clones/checkouts.

Proposed behavior:

• If two directories are part of the same git worktree setup, merging them into one project with sandboxes makes sense.
• If two directories are separate clones or separate local checkouts of the same remote repository, they should be shown as two independent projects.
• In other words, sharing the same Git remote should not be enough to merge projects. The merge should only happen when Git reports the directories as linked worktrees of the same repository.

This would preserve the current sandbox behavior for real Git worktrees while avoiding accidental merging of unrelated local directories.

Screenshot and/or share link

Operating System

window 10

Terminal

Windows Terminal

[github-actions]

This issue might be a duplicate of existing issues. Please check:

• Branch display shows main repo branch instead of worktree branch when opening a git worktree directory #16474: Branch display shows main repo branch instead of worktree branch when opening a git worktree directory — that issue also documents that OpenCode stores project.worktree as the main repo path rather than the actual worktree directory, which appears to be the same root cause as the merging behavior you're seeing.

[darkfiredarkhalo]

Additional repro on macOS Desktop 1.15.13.

Scenario:

• Same remote Git repository exists in multiple local directories, each checked out to a different branch and with different working tree state.
• Example shape:
  • /Users/<user>/Desktop/repo-A on branch A
  • /Users/<user>/Desktop/repo-B on branch B
  • /Users/<user>/Desktop/repo-C on branch C
• These are intentionally separate local directories, not intended to be treated as the same active workspace.

Steps observed:

1. Open repo-A in OpenCode Desktop.
2. Use the left sidebar + to add/open repo-B, or use File -> Open Project and select repo-B.
3. Desktop still shows/activates repo-A.
4. Remove repo-A from the project list, then try opening repo-B again.
5. Desktop still comes back to repo-A.

Expected:

• OpenCode Desktop should distinguish projects by the selected local directory path, or at least allow multiple local clones/worktrees of the same remote repo to appear as separate workspaces.
• Selecting repo-B should switch the session root/workspace to repo-B, not the first opened clone.

Actual:

• Desktop appears to merge these directories by repository identity/remote and keeps resolving back to the first recorded directory.
• This makes parallel branch development with multiple local directories unusable because the UI cannot reliably switch to the intended working tree.

Local state evidence:

• ~/Library/Application Support/ai.opencode.desktop/opencode.global.dat stores server.projects.local with worktree entries and lastProject.local still pointing at the first opened directory.
• Clearing recent desktop state did not fix the behavior; reopening another clone of the same repo still resolves back to the first directory.

This is not just session history sharing. The active project/workspace path itself is wrong, so edits/reviews can target the wrong checkout.

[mysteriousHerb]

agree. i prefer to use separate git clone folder iunstead of git worktree. this may be by design tho