Note

Preserve checkout context when creating new threads in resolveSidebarNewThreadSeedContext

• Previously, resolveSidebarNewThreadSeedContext would immediately override context with 'worktree' mode whenever defaultEnvMode was 'worktree', ignoring any active thread or draft state.
• Now, the function checks for a matching activeDraftThread first, returning its full context (branch, worktreePath, envMode, startFromOrigin), then falls back to activeThread context with envMode derived from the presence of worktreePath, and finally falls back to defaultEnvMode.
• Behavioral Change: new threads now inherit branch and worktree context from the active thread or draft instead of defaulting to the project-level env mode.

^{Macroscope summarized d123417.}

Note

Medium Risk
Changes thread creation and git worktree/branch bootstrap behavior for users with default “New worktree”; wrong precedence could still spawn unexpected worktrees, but scope is limited to sidebar seed logic with solid test coverage.

Overview
New threads from the sidebar now inherit the active checkout instead of blindly applying the global “New worktree” default.

resolveSidebarNewThreadSeedContext no longer returns early with only { envMode: "worktree" } when defaultEnvMode is worktree. Resolution order is now matching active draft (branch, worktree, env mode, startFromOrigin), then matching active server thread (branch/worktree with env inferred from worktreePath), then the configured default env mode when nothing matches.

That stops contextual “new thread” actions from dropping branch/worktree and triggering unintended worktree bootstrap on first message. Regression tests cover drafts, local branches, existing worktrees, and the no-context fallback.

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