@@ -2619,6 +2619,55 @@ it.effect("cancels tracked setup before provider work is released", () =>
26192619 } ) ,
26202620) ;
26212621
2622+ it . effect ( "stops an in-flight branch rename when tracked setup is cancelled" , ( ) =>
2623+ Effect . gen ( function * ( ) {
2624+ const setupEntered = yield * Deferred . make < void > ( ) ;
2625+ const branchNameStarted = yield * Deferred . make < void > ( ) ;
2626+ const allowBranchName = yield * Deferred . make < void > ( ) ;
2627+ const branchNameInterrupted = yield * Deferred . make < void > ( ) ;
2628+ const renameAttempted = yield * Deferred . make < void > ( ) ;
2629+ const harness = makeHarness ( {
2630+ renameBranch : ( input ) =>
2631+ Deferred . succeed ( renameAttempted , undefined ) . pipe ( Effect . as ( { branch : input . newBranch } ) ) ,
2632+ runSetup : ( ) => Deferred . succeed ( setupEntered , undefined ) . pipe ( Effect . andThen ( Effect . never ) ) ,
2633+ generateBranchName : ( ) =>
2634+ Deferred . succeed ( branchNameStarted , undefined ) . pipe (
2635+ Effect . andThen ( Deferred . await ( allowBranchName ) ) ,
2636+ Effect . as ( { branch : "generated-branch" } ) ,
2637+ Effect . onInterrupt ( ( ) => Deferred . succeed ( branchNameInterrupted , undefined ) ) ,
2638+ ) ,
2639+ } ) ;
2640+ yield * Effect . gen ( function * ( ) {
2641+ const launches = yield * ThreadLaunch . ThreadLaunchService ;
2642+ const tracker = yield * WorktreeSetupTracker . WorktreeSetupTracker ;
2643+ const threads = yield * ThreadManagement . ThreadManagementService ;
2644+ const launched = yield * launches . launch (
2645+ launchInput ( {
2646+ command : "launch:cancel-renaming" ,
2647+ thread : "thread:cancel-renaming" ,
2648+ message : "Start" ,
2649+ workspace : { type : "worktree" , baseRef : "main" } ,
2650+ } ) ,
2651+ ) ;
2652+ yield * Deferred . await ( setupEntered ) ;
2653+ yield * Deferred . await ( branchNameStarted ) ;
2654+ assert . isTrue ( yield * tracker . cancel ( launched . threadId ) ) ;
2655+ // Let a rename that survived the cancel finish, then check it never ran.
2656+ yield * Deferred . succeed ( allowBranchName , undefined ) ;
2657+ yield * Effect . raceFirst (
2658+ Deferred . await ( branchNameInterrupted ) ,
2659+ Deferred . await ( renameAttempted ) ,
2660+ ) ;
2661+ assert . isTrue (
2662+ yield * Deferred . isDone ( branchNameInterrupted ) ,
2663+ "the cancelled setup's branch rename kept running" ,
2664+ ) ;
2665+ assert . equal ( harness . renameBranch . mock . calls . length , 0 ) ;
2666+ assert . isNull ( ( yield * threads . getThreadProjection ( launched . threadId ) ) . thread . worktreePath ) ;
2667+ } ) . pipe ( Effect . provide ( harness . layer ) ) ;
2668+ } ) ,
2669+ ) ;
2670+
26222671it . effect . each ( [ 0 , 1 ] ) ( "releases an async setup before its completion with exit %s" , ( exitCode ) =>
26232672 Effect . gen ( function * ( ) {
26242673 const completion = yield * Deferred . make < { exitCode : number | null ; durationMs : number } > ( ) ;
0 commit comments