@@ -55,6 +55,7 @@ import {
5555import { ProviderAuthService } from "../../provider/Services/ProviderAuthService.ts" ;
5656import { makeProviderRegistryLayer } from "../../provider/testUtils/providerRegistryMock.ts" ;
5757import { TextGeneration } from "../../textGeneration/TextGeneration.ts" ;
58+ import { TerminalManager } from "../../terminal/Manager.ts" ;
5859import * as RepositoryIdentityResolver from "../../project/RepositoryIdentityResolver.ts" ;
5960import { OrchestrationEngineLive } from "./OrchestrationEngine.ts" ;
6061import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts" ;
@@ -307,6 +308,7 @@ describe("ProviderCommandReactor", () => {
307308 } ) ,
308309 ) ;
309310 const pruneWorktrees = vi . fn ( ( _ : { readonly cwd : string } ) => Effect . void ) ;
311+ const closeIdleTerminals = vi . fn ( ( _ : { readonly threadId : string } ) => Effect . void ) ;
310312 const createWorktree = vi . fn (
311313 ( input : { readonly refName : string ; readonly path : string | null } ) =>
312314 Effect . succeed ( { worktree : { path : input . path ?? "" , refName : input . refName } } ) ,
@@ -490,6 +492,7 @@ describe("ProviderCommandReactor", () => {
490492 generateThreadTitle,
491493 } ) ,
492494 ) ,
495+ Layer . provideMerge ( Layer . mock ( TerminalManager ) ( { closeIdle : closeIdleTerminals } ) ) ,
493496 Layer . provideMerge ( ServerSettingsService . layerTest ( ) ) ,
494497 Layer . provideMerge ( SqlitePersistenceMemory ) ,
495498 Layer . provideMerge ( ServerConfig . layerTest ( process . cwd ( ) , baseDir ) ) ,
@@ -621,6 +624,7 @@ describe("ProviderCommandReactor", () => {
621624 renameBranch,
622625 pruneWorktrees,
623626 createWorktree,
627+ closeIdleTerminals,
624628 refreshStatus,
625629 generateBranchName,
626630 generateThreadTitle,
@@ -4339,6 +4343,77 @@ describe("ProviderCommandReactor", () => {
43394343 expect ( thread ?. settledOverride ) . toBe ( "settled" ) ;
43404344 expect ( thread ?. session ?. status ) . toBe ( "stopped" ) ;
43414345 expect ( thread ?. session ?. providerInstanceId ) . toBe ( ProviderInstanceId . make ( "codex_work" ) ) ;
4346+ expect ( harness . closeIdleTerminals ) . toHaveBeenCalledWith ( {
4347+ threadId : ThreadId . make ( "thread-1" ) ,
4348+ } ) ;
43424349 } ) ,
43434350 ) ;
4351+
4352+ effectIt . effect ( "closes idle terminals when a thread without a session settles" , ( ) =>
4353+ Effect . gen ( function * ( ) {
4354+ const harness = yield * Effect . promise ( ( ) => createHarness ( ) ) ;
4355+ const terminalsClosed = yield * Deferred . make < void > ( ) ;
4356+ harness . closeIdleTerminals . mockImplementation ( ( ) =>
4357+ Deferred . succeed ( terminalsClosed , undefined ) . pipe ( Effect . asVoid ) ,
4358+ ) ;
4359+
4360+ yield * harness . engine . dispatch ( {
4361+ type : "thread.settle" ,
4362+ commandId : CommandId . make ( "cmd-settle-without-session" ) ,
4363+ threadId : ThreadId . make ( "thread-1" ) ,
4364+ } ) ;
4365+ yield * Deferred . await ( terminalsClosed ) ;
4366+ yield * Effect . promise ( ( ) => harness . drain ( ) ) ;
4367+
4368+ expect ( harness . closeIdleTerminals ) . toHaveBeenCalledWith ( {
4369+ threadId : ThreadId . make ( "thread-1" ) ,
4370+ } ) ;
4371+ expect ( harness . stopSession ) . not . toHaveBeenCalled ( ) ;
4372+ } ) ,
4373+ ) ;
4374+
4375+ effectIt . effect (
4376+ "keeps terminals when the thread is un-settled before its settle event runs" ,
4377+ ( ) =>
4378+ Effect . gen ( function * ( ) {
4379+ const harness = yield * Effect . promise ( ( ) => createHarness ( ) ) ;
4380+ const threadId = ThreadId . make ( "thread-1" ) ;
4381+ const firstCloseStarted = yield * Deferred . make < void > ( ) ;
4382+ const releaseFirstClose = yield * Deferred . make < void > ( ) ;
4383+ harness . closeIdleTerminals . mockImplementationOnce ( ( ) =>
4384+ Deferred . succeed ( firstCloseStarted , undefined ) . pipe (
4385+ Effect . andThen ( Deferred . await ( releaseFirstClose ) ) ,
4386+ ) ,
4387+ ) ;
4388+
4389+ yield * harness . engine . dispatch ( {
4390+ type : "thread.settle" ,
4391+ commandId : CommandId . make ( "cmd-settle-first" ) ,
4392+ threadId,
4393+ } ) ;
4394+ // The reactor is busy with the first settle while the user changes their mind.
4395+ yield * Deferred . await ( firstCloseStarted ) ;
4396+ yield * harness . engine . dispatch ( {
4397+ type : "thread.unsettle" ,
4398+ commandId : CommandId . make ( "cmd-unsettle-first" ) ,
4399+ threadId,
4400+ reason : "user" ,
4401+ } ) ;
4402+ yield * harness . engine . dispatch ( {
4403+ type : "thread.settle" ,
4404+ commandId : CommandId . make ( "cmd-settle-second" ) ,
4405+ threadId,
4406+ } ) ;
4407+ yield * harness . engine . dispatch ( {
4408+ type : "thread.unsettle" ,
4409+ commandId : CommandId . make ( "cmd-unsettle-second" ) ,
4410+ threadId,
4411+ reason : "user" ,
4412+ } ) ;
4413+ yield * Deferred . succeed ( releaseFirstClose , undefined ) ;
4414+ yield * Effect . promise ( ( ) => harness . drain ( ) ) ;
4415+
4416+ expect ( harness . closeIdleTerminals ) . toHaveBeenCalledTimes ( 1 ) ;
4417+ } ) ,
4418+ ) ;
43444419} ) ;
0 commit comments