@@ -173,6 +173,7 @@ describe("ProviderCommandReactor", () => {
173173 readonly unreadableHistory ?: boolean ;
174174 readonly titleRegenerationCompletionDispatchFailures ?: number ;
175175 readonly titleRegenerationBeforeStart ?: "one" | "two" ;
176+ readonly startReactor ?: boolean ;
176177 readonly serverActivation ?: Effect . Effect < void > ;
177178 readonly beforeReadySessionDispatch ?: ( ) => Effect . Effect < void > ;
178179 readonly beforeTurnStartDispatch ?: ( ) => Effect . Effect < void > ;
@@ -191,6 +192,11 @@ describe("ProviderCommandReactor", () => {
191192 createdBaseDirs . add ( baseDir ) ;
192193 const { stateDir } = deriveServerPathsSync ( baseDir , undefined ) ;
193194 createdStateDirs . add ( stateDir ) ;
195+ const backgroundLiveness = ThreadBackgroundLiveness . make ( ) ;
196+ const backgroundLivenessLayer = Layer . succeed (
197+ ThreadBackgroundLiveness . ThreadBackgroundLivenessService ,
198+ backgroundLiveness ,
199+ ) ;
194200 const runtimeEventPubSub = Effect . runSync ( PubSub . unbounded < ProviderRuntimeEvent > ( ) ) ;
195201 const tryHandlePromptCommand = vi . fn < ProviderAuthService [ "Service" ] [ "tryHandlePromptCommand" ] > (
196202 input ?. tryHandlePromptCommandEffect ?? ( ( ) => Effect . succeed ( false ) ) ,
@@ -400,7 +406,7 @@ describe("ProviderCommandReactor", () => {
400406
401407 const orchestrationLayer = OrchestrationEngineLive . pipe (
402408 Layer . provide ( OrchestrationProjectionSnapshotQueryLive ) ,
403- Layer . provide ( ThreadBackgroundLiveness . layer ) ,
409+ Layer . provide ( backgroundLivenessLayer ) ,
404410 Layer . provide ( ThreadPlanProgress . layer ) ,
405411 Layer . provide ( OrchestrationProjectionPipelineLive ) ,
406412 Layer . provide ( OrchestrationEventStoreLive ) ,
@@ -409,7 +415,7 @@ describe("ProviderCommandReactor", () => {
409415 Layer . provide ( SqlitePersistenceMemory ) ,
410416 ) ;
411417 const projectionSnapshotLayer = OrchestrationProjectionSnapshotQueryLive . pipe (
412- Layer . provide ( ThreadBackgroundLiveness . layer ) ,
418+ Layer . provide ( backgroundLivenessLayer ) ,
413419 Layer . provide ( ThreadPlanProgress . layer ) ,
414420 Layer . provide ( RepositoryIdentityResolver . layer ) ,
415421 Layer . provide ( SqlitePersistenceMemory ) ,
@@ -488,6 +494,7 @@ describe("ProviderCommandReactor", () => {
488494 } ) ,
489495 ) ,
490496 Layer . provideMerge ( ServerSettingsService . layerTest ( ) ) ,
497+ Layer . provideMerge ( backgroundLivenessLayer ) ,
491498 Layer . provideMerge ( SqlitePersistenceMemory ) ,
492499 Layer . provideMerge ( ServerConfig . layerTest ( process . cwd ( ) , baseDir ) ) ,
493500 Layer . provideMerge ( NodeServices . layer ) ,
@@ -579,14 +586,18 @@ describe("ProviderCommandReactor", () => {
579586 }
580587
581588 scope = await Effect . runPromise ( Scope . make ( "sequential" ) ) ;
582- await Effect . runPromise (
583- reactor
584- . start ( )
585- . pipe (
586- Scope . provide ( scope ) ,
587- Effect . provideService ( ServerActivation , input ?. serverActivation ) ,
588- ) ,
589- ) ;
589+ const start = ( ) =>
590+ Effect . runPromise (
591+ reactor
592+ . start ( )
593+ . pipe (
594+ Scope . provide ( scope ! ) ,
595+ Effect . provideService ( ServerActivation , input ?. serverActivation ) ,
596+ ) ,
597+ ) ;
598+ if ( input ?. startReactor !== false ) {
599+ await start ( ) ;
600+ }
590601 const drain = ( ) => Effect . runPromise ( reactor . drain ) ;
591602
592603 return {
@@ -620,6 +631,8 @@ describe("ProviderCommandReactor", () => {
620631 generateThreadTitle,
621632 runtimeSessions,
622633 stateDir,
634+ backgroundLiveness,
635+ start,
623636 drain,
624637 runEffect,
625638 get titleRegenerationCompletionDispatchAttempts ( ) {
@@ -4130,6 +4143,56 @@ describe("ProviderCommandReactor", () => {
41304143 } ) ,
41314144 ) ;
41324145
4146+ effectIt . effect ( "skips a guarded stop when background work appears before execution" , ( ) =>
4147+ Effect . gen ( function * ( ) {
4148+ const harness = yield * Effect . promise ( ( ) => createHarness ( { startReactor : false } ) ) ;
4149+ const threadId = ThreadId . make ( "thread-1" ) ;
4150+ const now = "2026-01-01T00:00:00.000Z" ;
4151+ yield * harness . engine . dispatch ( {
4152+ type : "thread.session.set" ,
4153+ commandId : CommandId . make ( "cmd-session-set-before-guarded-stop" ) ,
4154+ threadId,
4155+ session : {
4156+ threadId,
4157+ status : "ready" ,
4158+ providerName : "codex" ,
4159+ providerInstanceId : ProviderInstanceId . make ( "codex" ) ,
4160+ runtimeMode : "approval-required" ,
4161+ activeTurnId : null ,
4162+ lastError : null ,
4163+ updatedAt : now ,
4164+ } ,
4165+ createdAt : now ,
4166+ } ) ;
4167+ const snapshotSequence = yield * harness . engine . latestSequence ;
4168+ yield * harness . engine . dispatch ( {
4169+ type : "thread.session.stop" ,
4170+ commandId : CommandId . make ( "cmd-guarded-stop-before-background" ) ,
4171+ threadId,
4172+ createdAt : now ,
4173+ onlyIfIdle : true ,
4174+ snapshotSequence,
4175+ expectedProviderName : ProviderDriverKind . make ( "codex" ) ,
4176+ } ) ;
4177+ harness . backgroundLiveness . recordTaskLiveness ( {
4178+ threadId,
4179+ taskId : "guarded-stop-background-task" ,
4180+ taskType : "subagent" ,
4181+ status : undefined ,
4182+ kind : "started" ,
4183+ } ) ;
4184+
4185+ yield * Effect . promise ( ( ) => harness . start ( ) ) ;
4186+ yield * Effect . promise ( ( ) => harness . drain ( ) ) ;
4187+
4188+ expect ( harness . stopSession ) . not . toHaveBeenCalled ( ) ;
4189+ const thread = yield * harness . snapshotQuery
4190+ . getThreadShellById ( threadId )
4191+ . pipe ( Effect . map ( Option . getOrThrow ) ) ;
4192+ expect ( thread . session ?. status ) . toBe ( "ready" ) ;
4193+ } ) ,
4194+ ) ;
4195+
41334196 effectIt . effect ( "stops a ready provider session after automatic settlement" , ( ) =>
41344197 Effect . gen ( function * ( ) {
41354198 const sessionStopped = yield * Deferred . make < void > ( ) ;
0 commit comments