fix(app): keep new sessions in their selected worktree - #52094

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.

The following comment was made by an LLM, it may be inaccurate:

Thanks for working on this — one gap worth flagging before merge.

This PR's condition only prefers the draft's current directory when it matches a known non-main worktree. The plain-subdirectory case (no worktree/sandbox at all) appears to fall through to the same project-canonical-path substitution, and it reproduces 100% on v2.0.26 Desktop:

CLI run, cwd = plain subdirectory:   location.directory = D:\vault\2-AI\notes-tuning   subpath = 2-AI/notes-tuning   OK
Desktop, footer = same subdirectory: location.directory = D:\vault                      subpath = (empty)            BROKEN
POST /api/session with explicit location.directory = subdirectory: stored correctly   OK

So the server accepts a plain subdirectory fine; the client just does not send it. The footer shows the selected subdirectory, but the created session lands at the repo root. Detailed repro and timeline: see the plain-subdirectory comment in #51992.

Two data points that may help locate the regression:

• fix(app): keep new local sessions in the selected directory #46713 (keep new local sessions in the selected directory) was merged on 2026-09-02, yet plain-subdirectory sessions from Desktop started binding to the repo root after 2026-10-08 — the earlier fix appears to have been bypassed, or a second substitution path exists in the new-session draft flow.
• Sessions created from the same bundled CLI 2.0.26 with cwd set to the subdirectory still record the subdirectory correctly, so this is specific to the app-side draft destination.

If the draft's current directory were trusted whenever it is a valid descendant of the project (not only when it maps to a known worktree), the worktree and plain-subdirectory variants would be covered by the same condition. If that is out of scope here, a pointer to where the plain-subdirectory case should be tracked would be appreciated.

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.