@@ -137,6 +137,9 @@ function makeHarness(options: HarnessOptions = {}) {
137137 const runSetup = vi . fn (
138138 options . runSetup ?? ( ( ) => Effect . succeed ( { status : "no-script" as const } ) ) ,
139139 ) ;
140+ const closeTerminal = vi . fn (
141+ ( _input : Parameters < TerminalManager . TerminalManager [ "Service" ] [ "close" ] > [ 0 ] ) => Effect . void ,
142+ ) ;
140143 const generateBranchName = vi . fn (
141144 options . generateBranchName ?? ( ( ) => Effect . succeed ( { branch : "generated-branch" } ) ) ,
142145 ) ;
@@ -146,7 +149,7 @@ function makeHarness(options: HarnessOptions = {}) {
146149 const externalServices = Layer . mergeAll (
147150 WorktreeSetupTracker . layer ,
148151 Layer . mock ( ProjectCloneTracker . ProjectCloneTracker ) ( { get : ( ) => Effect . succeed ( null ) } ) ,
149- Layer . mock ( TerminalManager . TerminalManager ) ( { close : ( ) => Effect . void } ) ,
152+ Layer . mock ( TerminalManager . TerminalManager ) ( { close : closeTerminal } ) ,
150153 Layer . succeed ( ProjectService . ProjectService , {
151154 create : ( ) => Effect . die ( "unused" ) ,
152155 bootstrap : ( ) => Effect . die ( "unused" ) ,
@@ -233,6 +236,7 @@ function makeHarness(options: HarnessOptions = {}) {
233236 generateBranchName,
234237 generateThreadTitle,
235238 runSetup,
239+ closeTerminal,
236240 } ;
237241}
238242
@@ -2237,6 +2241,52 @@ it.effect("cancels tracked setup before provider work is released", () =>
22372241 } ) ,
22382242) ;
22392243
2244+ it . effect ( "cancelling setup in an empty repository stops its script in the project folder" , ( ) =>
2245+ Effect . gen ( function * ( ) {
2246+ const entered = yield * Deferred . make < void > ( ) ;
2247+ const harness = makeHarness ( {
2248+ hasCommit : ( ) => Effect . succeed ( false ) ,
2249+ runSetup : ( input ) =>
2250+ Deferred . succeed ( entered , undefined ) . pipe (
2251+ Effect . as ( {
2252+ status : "started" as const ,
2253+ async : false ,
2254+ scriptId : "setup" ,
2255+ scriptName : "Setup" ,
2256+ scriptCommand : "vp install" ,
2257+ terminalId : "setup" ,
2258+ cwd : input . worktreePath ,
2259+ completion : Effect . never ,
2260+ } ) ,
2261+ ) ,
2262+ } ) ;
2263+ yield * Effect . gen ( function * ( ) {
2264+ const launches = yield * ThreadLaunch . ThreadLaunchService ;
2265+ const tracker = yield * WorktreeSetupTracker . WorktreeSetupTracker ;
2266+ const launched = yield * launches . launch (
2267+ launchInput ( {
2268+ command : "launch:cancel-empty-repo" ,
2269+ thread : "thread:cancel-empty-repo" ,
2270+ message : "Start" ,
2271+ workspace : { type : "worktree" , baseRef : "main" } ,
2272+ } ) ,
2273+ ) ;
2274+ yield * Deferred . await ( entered ) ;
2275+ yield * waitUntil ( ( ) =>
2276+ tracker
2277+ . get ( launched . threadId )
2278+ . pipe ( Effect . map ( ( setup ) => setup ?. setupScript ?. terminalId === "setup" ) ) ,
2279+ ) ;
2280+ assert . isTrue ( yield * tracker . cancel ( launched . threadId ) ) ;
2281+ assert . deepInclude ( harness . closeTerminal . mock . calls [ 0 ] ?. [ 0 ] , {
2282+ threadId : launched . threadId ,
2283+ terminalId : "setup" ,
2284+ } ) ;
2285+ assert . equal ( harness . removeWorktree . mock . calls . length , 0 ) ;
2286+ } ) . pipe ( Effect . provide ( harness . layer ) ) ;
2287+ } ) ,
2288+ ) ;
2289+
22402290it . effect . each ( [ 0 , 1 ] ) ( "releases an async setup before its completion with exit %s" , ( exitCode ) =>
22412291 Effect . gen ( function * ( ) {
22422292 const completion = yield * Deferred . make < { exitCode : number | null ; durationMs : number } > ( ) ;
0 commit comments