fix(app): keep new local sessions in the selected directory

[Hona]

• Keep new Local sessions in the folder selected for the draft, rather than substituting the project's cached canonical path.
• Preserve explicit workspace choices and new-workspace defaults. Existing session history is unchanged.
• Scope: new-session directory selection. The issue references include broader reports; this does not relocate existing sessions, separate clone histories, or resolve unrelated defects within multi-issue reports.

flowchart LR
  Open["Open C:/Projects/repo"] --> Local["Local session"]
  Local --> Fixed["Create session in C:/Projects/repo"]
  Local -. "previous behavior" .-> Stale["Cached canonical: D:/Projects/repo"]

Loading

Viewport	Before	After
Desktop
Mobile

• Screenshots use the production UI with an isolated API fixture: the old directory fails admission; the selected directory accepts it.

Production Home -> new session, Windows Chromium	Before (74eda7f950)	After
Ready, median	143.10 ms	200.30 ms
Ready, p95	194.30 ms	225.60 ms
Stable, median	174.20 ms	225.90 ms
Stable, p95	224.40 ms	255.90 ms

• Three serial samples per build; diagnostic measurements, not a performance claim.

Issue references: 57 related reports, including 22 already closed

• Fixes [BUG]: Project ID collision when repos cloned from same source share sessions #6696
• Fixes Bug: New session created with wrong directory when browsing a project #12918
• Fixes Multiple local clones of same repo share one project identity, breaking file change tracking #17940
• Fixes Sessions become orphaned when project directory is renamed #23248
• Fixes Desktop GUI reopens an existing session with the wrong workspace path after selecting a different project directory #29714
• Fixes Desktop chat logs cannot be recovered after being archived. After moving the project folder, the location on OpenCode cannot be changed, and the address is not updated when the project is reopened. #29823
• Fixes Desktop chat logs cannot be recovered after being archived. After moving the project folder, the location on OpenCode cannot be changed, and the address is not updated when the project is reopened. #29825
• Fixes Workspace working directory not updated after moving project to new location #30005
• Fixes Bug: Editor fails to update workspace path cache after moving project folder out of OneDrive #30462
• Fixes Move project folder to path B and delete old path A But OpenCode still opens and navigates to old path A, even though it no longer exists #30697
• Fixes Desktop app crashes on startup when cached workspace directory is deleted #30750
• Fixes 项目工作目录转移到别的位置以后，关闭项目重新打开还是显示原目录 #31063
• Fixes OpenCode Desktop on macOS keeps opening old project folder after project was moved #31074
• Fixes OpenCode keeps reopening deleted project path after creating a new session #31401
• Fixes Desktop workspace path stays stuck on old absolute path after folder rename #31869
• Fixes Bug: Stale Project Path Persists After Full Workspace Reset (Windows) #31888
• Fixes Desktop app redirects to wrong directory when multiple clones of same repo exist #32785
• Fixes OpenCode overwrites data in a different directory without any notification #32803
• Fixes OpenCode Desktop keeps restoring old project (frisiusmc2025) instead of selected project (groningenairport2023) #32847
• Fixes Desktop reuses the same window for two local clones of the same git remote #33313
• Fixes [Critical] Desktop App Crashes Continuously - 503 Service Unavailable & Path Confusion After Moving Project #33359
• Fixes opencode cannot open two same git project #33615
• Fixes Moving a project directory breaks all existing sessions created in the original one #33909
• Fixes Bug: Workspace session permanently locked to wrong directory (OpenCode Desktop) #33995
• Fixes 两个目录是同一个 git 仓库的副本，打开项目选择第2个目录时，opencode 通过 git tracking 把 cwd 解析到了第1个目录的路径 #34373
• Fixes Project path is not updated after moving project directory (opens old deleted path) #34737
• Fixes Server keeps stale project.worktree after project folder is renamed on disk; remote clients keep reopening the dead path #35240
• Fixes copied project folder permanently inherits original's workspace state #35297
• Fixes 500 error on POST /session/{id}/command when session.directory points to a moved/deleted project #35427
• Fixes 500 error on POST /session/{id}/command when session.directory points to a moved/deleted project #35491
• Fixes Parallel checkouts/worktrees of the same repository redirect to the first opened folder #35674
• Fixes Desktop app redirects to wrong project when multiple directories share the same git remote #35714
• Fixes Deleting and re-adding a project with a different path reuses stale worktree #35851
• Fixes [BUG] Two projects sharing the same git remote URL collide into one project ID after restart #35873
• Fixes After changing the project directory and reopening it, it still uses the old cached address, preventing the project from being reloaded. #36004
• Fixes Workspace path is not updated after moving/cloning the same Git repository #36150
• Fixes Desktop app: file browser uses stale absolute paths after moving project directory #37697
• Fixes Deleting/Renaming the lastest project fold will make Opencode not working. #38013
• Fixes select project path not match work path #38151
• Fixes Desktop restores a moved/deleted workspace and leaves its sessions permanently failing with FileSystem.realPath ENOENT #38578
• Fixes Desktop silently returns an empty response when the saved project directory no longer exists #39471
• Fixes Windows: shell working directory remains stuck on old project path after moving folder #39836
• Fixes [bug] 项目目录变更后 opencode serve Web 界面报错，TUI 模式正常 #40222
• Fixes Desktop app freezes / can't open sessions after the project folder is moved or renamed #40336
• Fixes [FEATURE]: Show a clear error when a workspace is renamed or moved #40596
• Fixes opencode -c fails with "Unexpected server error" after project directory is renamed/deleted #40677
• Fixes opencode seems to keep old project folder data with no easy way to remove it. #40699
• Fixes Desktop: renaming a project folder breaks the project binding (phantom project, rename ignored, sessions silently fall back to global) #40986
• Fixes Renaming a project's local folder leaves stale worktree path in project DB, causing persistent 500 errors on relaunch #41420
• Fixes Same git remote URL produces identical project_id for different local clones → only one project visible in desktop sidebar #42315
• Fixes After renaming the directory where the workspace is, things in the workspace stopped working properly. #43192
• Fixes Stale project paths in localStorage cause frontend to jump to non-existent directory, hiding new sessions #44073
• Fixes Desktop: two clones of same repo permanently show wrong project name/path - restart does not fix (identity from git remote) #44101
• Fixes Sessions disappear after renaming project folder - directory matching is case-sensitive with inconsistently normalized stored paths #44538
• Fixes Multiple Windows Desktop + WSL issues: model selection, project path persistence, stale directory references #45392
• Fixes Project location path does not update after moving project folder #45559
• Fixes Desktop: moving a project directory leaves stale worktree in project table — project shows "no git" and all prompts fail with ENOENT #46330

[Copilot]

🟡 Changes recommended

The controller still uses the cached project.worktree for branch listing and VCS sync after removing normalization, which can keep hitting the stale path and fail to sync the selected directory’s VCS state.

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Pull request overview

Fixes new-session workspace selection so that new Local sessions are created in the directory selected for the draft, instead of being redirected to a stale cached project worktree path; this aligns the desktop app behavior with user intent when projects are moved/re-added.

Changes:

• Simplifies resolveNewSessionWorktree to stop normalizing "main" to the cached project.worktree.
• Updates the workspace controller to persist the selected worktree value directly.
• Adjusts and adds tests to reflect the new worktree resolution behavior.

File summaries

File	Description
packages/app/src/new-session/workspace/controller.ts	Removes cached-worktree normalization from new-session worktree selection and updates worktree persistence logic.
packages/app/src/new-session/workspace/controller.test.ts	Updates unit tests to validate the new worktree resolution behavior under stale cached-path conditions.

Review details

• Files reviewed: 2/2 changed files
• Comments generated: 3
• Review effort level: Lite

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.