fix(web): keep worktree default when switching a draft's machine

[t3dotgg]

Problem

Opening a new thread (CMD+SHIFT+O) and then switching the target machine in the composer reset the workspace selector to "Current checkout" — even with defaultThreadEnvMode: "worktree" configured. The branch shown was whatever stale branch the target machine's main clone happened to have checked out.

Cause

Changing the environment on a draft goes through the projectChanged path in composerDraftStore (both createDraftThreadState and setDraftThreadContext). That path cleared branch and worktree path — correct, they're machine-specific — but also hardcoded envMode to "local" and startFromOrigin to false, discarding the user's configured default.

Fix

On a project/environment change, still reset branch and worktree path, but carry env mode and start-from-origin — they're user intent, not machine state. Updated the two store tests that asserted the old reset behavior.

---

🤖 Generated with Claude Code (Claude Fable 5)

---

Note

Low Risk
Localized composer draft state logic with updated unit tests; no auth, persistence schema, or server behavior changes.

Overview
Fixes new-thread drafts snapping back to Current checkout when you change the target machine in the composer, even with defaultThreadEnvMode: "worktree".

composerDraftStore still clears branch and worktree path on project/environment changes (they are machine-specific), but now preserves envMode and startFromOrigin instead of forcing local and false. The same rule applies in createDraftThreadState and setDraftThreadContext. useHandleNewThread comment updated to match.

Tests now expect worktree mode and start-from-origin to survive remapping a draft to another environment.

^{Reviewed by Cursor Bugbot for commit 63ce619. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep worktree envMode when switching a draft thread's machine

Previously, changing a draft thread's project or environment forced envMode to "local" and reset startFromOrigin to false. Now both fields are carried forward from the existing thread state unless explicitly overridden. Branch and worktree path are still cleared on project/environment change.

The fix applies to both createDraftThreadState and the setDraftThreadContext in-place update path.

^{Macroscope summarized 63ce619.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 3bf638bf-70ab-45f9-a1ab-034e438cc518

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[macroscopeapp]

Approvability

Verdict: Approved 63ce619

A straightforward bug fix that preserves user preferences (envMode and startFromOrigin) when switching a draft's machine/environment. The change is well-scoped to draft state management with updated tests documenting the expected behavior.

^{You can customize Macroscope's approvability policy. Learn more.}