@@ -28,7 +28,6 @@ import {
2828 resolveContextStripLabelsCompact ,
2929 resolveCurrentWorkspaceLabel ,
3030 resolveEnvModeLabel ,
31- resolveEffectiveEnvMode ,
3231 resolveLockedWorkspaceLabel ,
3332 resolvePreviousWorktreeLabel ,
3433 resolvePreviousWorktreeSeed ,
@@ -74,7 +73,8 @@ interface BranchToolbarProps {
7473 showGitControls : boolean ;
7574 draftId ?: DraftId ;
7675 onEnvModeChange : ( mode : EnvMode ) => void ;
77- effectiveEnvModeOverride ?: EnvMode ;
76+ /** The thread's env mode as ChatView resolves it. */
77+ envMode : EnvMode ;
7878 activeThreadBranchOverride ?: string | null ;
7979 onActiveThreadBranchOverrideChange ?: ( branch : string | null ) => void ;
8080 startFromOrigin : boolean ;
@@ -141,7 +141,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
141141 const workspaceLabel = forceNewWorktree
142142 ? resolveEnvModeLabel ( "worktree" )
143143 : envModeLocked
144- ? resolveLockedWorkspaceLabel ( activeWorktreePath )
144+ ? resolveLockedWorkspaceLabel ( activeWorktreePath , effectiveEnvMode )
145145 : effectiveEnvMode === "worktree"
146146 ? resolveEnvModeLabel ( "worktree" )
147147 : resolveCurrentWorkspaceLabel ( activeWorktreePath ) ;
@@ -511,7 +511,7 @@ export const BranchToolbar = memo(function BranchToolbar({
511511 showGitControls,
512512 draftId,
513513 onEnvModeChange,
514- effectiveEnvModeOverride ,
514+ envMode ,
515515 activeThreadBranchOverride,
516516 onActiveThreadBranchOverrideChange,
517517 startFromOrigin,
@@ -546,13 +546,7 @@ export const BranchToolbar = memo(function BranchToolbar({
546546 const activeWorktreePath = forceNewWorktree
547547 ? null
548548 : ( serverThread ?. worktreePath ?? draftThread ?. worktreePath ?? null ) ;
549- const effectiveEnvMode =
550- ( forceNewWorktree ? "worktree" : effectiveEnvModeOverride ) ??
551- resolveEffectiveEnvMode ( {
552- activeWorktreePath,
553- hasServerThread : serverThread !== null ,
554- draftThreadEnvMode : draftThread ?. envMode ,
555- } ) ;
549+ const effectiveEnvMode = forceNewWorktree ? "worktree" : envMode ;
556550 const envModeLocked = envLocked || ( serverThread !== null && activeWorktreePath !== null ) ;
557551
558552 // "Previous worktree" hops a draft into the most recently active worktree
@@ -720,11 +714,7 @@ export const BranchToolbar = memo(function BranchToolbar({
720714 threadId = { threadId }
721715 { ...( draftId ? { draftId } : { } ) }
722716 envLocked = { envLocked }
723- { ...( forceNewWorktree
724- ? { effectiveEnvModeOverride : "worktree" }
725- : effectiveEnvModeOverride
726- ? { effectiveEnvModeOverride }
727- : { } ) }
717+ effectiveEnvModeOverride = { effectiveEnvMode }
728718 { ...( activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : { } ) }
729719 { ...( onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : { } ) }
730720 startFromOrigin = { startFromOrigin }
0 commit comments