@@ -32,7 +32,7 @@ import { writeTextToClipboard } from "../hooks/useCopyToClipboard";
3232import { readLocalApi } from "../localApi" ;
3333import { useOpenPrLink } from "../lib/openPullRequestLink" ;
3434import { usePaginatedBranches } from "../state/queries" ;
35- import { useProject , useQuietThreadShell } from "../state/entities" ;
35+ import { readThreadShell , useProject , useQuietThreadShell } from "../state/entities" ;
3636import { useEnvironmentQuery } from "../state/query" ;
3737import { readEnvironmentScope , useEnvironmentScope } from "~/state/session" ;
3838import { threadEnvironment } from "../state/threads" ;
@@ -46,6 +46,7 @@ import { getSourceControlPresentation } from "../sourceControlPresentation";
4646import { useComposerMenuProps } from "./chat/composerEventScope" ;
4747import {
4848 deriveLocalBranchNameFromRemoteRef ,
49+ isWorktreeChangeBlocked ,
4950 resolveBranchTriggerLabel ,
5051 resolveBranchToolbarPrBranch ,
5152 resolveBranchSelectionTarget ,
@@ -90,6 +91,8 @@ interface BranchToolbarBranchSelectorProps {
9091 onComposerFocusRequest ?: ( ) => void ;
9192}
9293
94+ const WORKTREE_CHANGE_BLOCKED_MESSAGE = "Stop the current turn to switch worktrees." ;
95+
9396function toBranchActionErrorMessage ( error : unknown ) : string {
9497 return error instanceof Error ? error . message : "An error occurred." ;
9598}
@@ -153,7 +156,9 @@ export function BranchToolbarBranchSelector({
153156 : ( serverThread ?. branch ?? draftThread ?. branch ?? null ) ;
154157 const activeWorktreePath = forceNewWorktree
155158 ? null
156- : ( serverThread ?. worktreePath ?? draftThread ?. worktreePath ?? null ) ;
159+ : serverThread
160+ ? serverThread . worktreePath
161+ : ( draftThread ?. worktreePath ?? null ) ;
157162 const activeProjectCwd = activeProject ?. workspaceRoot ?? null ;
158163 const branchCwd = activeWorktreePath ?? activeProjectCwd ;
159164 const hasServerThread = serverThread !== null ;
@@ -167,6 +172,10 @@ export function BranchToolbarBranchSelector({
167172 draftThreadEnvMode : draftThread ?. envMode ,
168173 } ) ;
169174
175+ const readLatestThreadState = ( ) =>
176+ readThreadShell ( threadRef ) ??
177+ serverThread ?? { runtime : null , worktreePath : activeWorktreePath } ;
178+
170179 const setThreadBranch = (
171180 branch : string | null ,
172181 worktreePath : string | null ,
@@ -177,8 +186,22 @@ export function BranchToolbarBranchSelector({
177186 ! activeProject ||
178187 ( hasServerThread && ! readEnvironmentScope ( environmentId , AuthOrchestrationOperateScope ) )
179188 )
180- return ;
181- if ( serverSession && worktreePath !== activeWorktreePath ) {
189+ return false ;
190+ const latest = readLatestThreadState ( ) ;
191+ if ( automatic && ( latest . runtime || latest . worktreePath ) ) return false ;
192+ if (
193+ isWorktreeChangeBlocked ( {
194+ runtime : latest . runtime ,
195+ currentWorktreePath : latest . worktreePath ,
196+ nextWorktreePath : worktreePath ,
197+ } )
198+ ) {
199+ toastManager . add (
200+ stackedThreadToast ( { type : "warning" , title : WORKTREE_CHANGE_BLOCKED_MESSAGE } ) ,
201+ ) ;
202+ return false ;
203+ }
204+ if ( latest . runtime && worktreePath !== latest . worktreePath ) {
182205 void stopThreadSession ( {
183206 environmentId,
184207 input : { threadId : activeThreadId } ,
@@ -197,7 +220,7 @@ export function BranchToolbarBranchSelector({
197220 }
198221 if ( hasServerThread ) {
199222 onActiveThreadBranchOverrideChange ?.( branch ) ;
200- return ;
223+ return true ;
201224 }
202225 const nextDraftEnvMode = resolveDraftEnvModeAfterBranchChange ( {
203226 nextWorktreePath : worktreePath ,
@@ -211,6 +234,7 @@ export function BranchToolbarBranchSelector({
211234 environmentSelection : automatic ? ( draftThread ?. environmentSelection ?? "auto" ) : "manual" ,
212235 projectRef : scopeProjectRef ( environmentId , activeProject . id ) ,
213236 } ) ;
237+ return true ;
214238 } ;
215239
216240 const [ isBranchMenuOpen , setIsBranchMenuOpen ] = useState ( false ) ;
@@ -244,6 +268,20 @@ export function BranchToolbarBranchSelector({
244268 const prReference = parsePullRequestReference ( trimmedBranchQuery ) ;
245269 const isSelectingWorktreeBase =
246270 effectiveEnvMode === "worktree" && ! envLocked && ! activeWorktreePath ;
271+ const isWorktreeChangeBlockedForRef = ( refName : VcsRef ) =>
272+ activeProjectCwd !== null &&
273+ isWorktreeChangeBlocked ( {
274+ runtime : serverSession ,
275+ currentWorktreePath : serverThread ? serverThread . worktreePath : activeWorktreePath ,
276+ nextWorktreePath : isSelectingWorktreeBase
277+ ? null
278+ : resolveBranchSelectionTarget ( {
279+ activeProjectCwd,
280+ activeProjectCheckoutRoot,
281+ activeWorktreePath,
282+ refName,
283+ } ) . nextWorktreePath ,
284+ } ) ;
247285 const checkoutPullRequestItemValue =
248286 canChangeThreadBranch && prReference && onCheckoutPullRequestRequest
249287 ? `__checkout_pull_request__:${ prReference } `
@@ -386,20 +424,30 @@ export function BranchToolbarBranchSelector({
386424 const selectBranch = ( refName : VcsRef ) => {
387425 if ( ! canUpdateThreadBranch || ! branchCwd || ! activeProjectCwd || isBranchActionPending ) return ;
388426
427+ const latest = readLatestThreadState ( ) ;
389428 if ( isSelectingWorktreeBase ) {
429+ if ( latest . worktreePath ) return ;
390430 setThreadBranch ( refName . name , null ) ;
391431 setIsBranchMenuOpen ( false ) ;
392432 onComposerFocusRequest ?.( ) ;
393433 return ;
394434 }
395-
396435 const selectionTarget = resolveBranchSelectionTarget ( {
397436 activeProjectCwd,
398437 activeProjectCheckoutRoot,
399- activeWorktreePath,
438+ activeWorktreePath : latest . worktreePath ,
400439 refName,
401440 } ) ;
402441
442+ if (
443+ isWorktreeChangeBlocked ( {
444+ runtime : latest . runtime ,
445+ currentWorktreePath : latest . worktreePath ,
446+ nextWorktreePath : selectionTarget . nextWorktreePath ,
447+ } )
448+ )
449+ return ;
450+
403451 if ( selectionTarget . reuseExistingWorktree ) {
404452 setThreadBranch ( refName . name , selectionTarget . nextWorktreePath ) ;
405453 setIsBranchMenuOpen ( false ) ;
@@ -428,8 +476,11 @@ export function BranchToolbarBranchSelector({
428476 const nextBranchName = refName . isRemote
429477 ? ( checkoutResult . value . refName ?? selectedBranchName )
430478 : selectedBranchName ;
431- setOptimisticBranch ( nextBranchName ) ;
432- setThreadBranch ( nextBranchName , selectionTarget . nextWorktreePath ) ;
479+ setOptimisticBranch (
480+ setThreadBranch ( nextBranchName , selectionTarget . nextWorktreePath )
481+ ? nextBranchName
482+ : previousBranch ,
483+ ) ;
433484 return ;
434485 }
435486 setOptimisticBranch ( previousBranch ) ;
@@ -465,8 +516,10 @@ export function BranchToolbarBranchSelector({
465516 } ,
466517 } ) ;
467518 if ( createBranchResult . _tag === "Success" ) {
468- setOptimisticBranch ( createBranchResult . value . refName ) ;
469- setThreadBranch ( createBranchResult . value . refName , activeWorktreePath ) ;
519+ const nextBranchName = createBranchResult . value . refName ;
520+ setOptimisticBranch (
521+ setThreadBranch ( nextBranchName , activeWorktreePath ) ? nextBranchName : previousBranch ,
522+ ) ;
470523 return ;
471524 }
472525 setOptimisticBranch ( previousBranch ) ;
@@ -641,7 +694,8 @@ export function BranchToolbarBranchSelector({
641694 activeProjectCheckoutRoot,
642695 activeWorktreePath,
643696 refName,
644- } ) . reuseExistingWorktree ) )
697+ } ) . reuseExistingWorktree ) ) ||
698+ isWorktreeChangeBlockedForRef ( refName )
645699 }
646700 onClick = { ( ) => selectPickerItem ( itemValue ) }
647701 onContextMenu = { ( event ) => handleBranchContextMenu ( event , itemValue ) }
@@ -663,6 +717,11 @@ export function BranchToolbarBranchSelector({
663717 isFetchingNextPage = { isFetchingNextPage }
664718 onLoadNext = { branchRefState . loadNext }
665719 statusText = { branchStatusText }
720+ notice = {
721+ refs . some ( ( refName ) => isWorktreeChangeBlockedForRef ( refName ) )
722+ ? WORKTREE_CHANGE_BLOCKED_MESSAGE
723+ : null
724+ }
666725 renderItem = { renderPickerItem }
667726 getItemType = { ( item ) =>
668727 item === checkoutPullRequestItemValue
0 commit comments