@@ -61,6 +61,7 @@ import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts"
6161import * as NodeServices from "@effect/platform-node/NodeServices" ;
6262import * as Clock from "effect/Clock" ;
6363import { ServerSettingsService } from "../../serverSettings.ts" ;
64+ import { ServerActivation } from "../../serverActivation.ts" ;
6465import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts" ;
6566import * as GitWorkflowService from "../../git/GitWorkflowService.ts" ;
6667
@@ -150,6 +151,7 @@ describe("ProviderCommandReactor", () => {
150151 readonly requiresNewThreadForModelChange ?: boolean ;
151152 readonly titleRegenerationCompletionDispatchFailures ?: number ;
152153 readonly titleRegenerationBeforeStart ?: "one" | "two" ;
154+ readonly serverActivation ?: Effect . Effect < void > ;
153155 readonly interruptTurnEffect ?: ( ) => Effect . Effect < void , ProviderAdapterRequestError > ;
154156 readonly stopSessionEffect ?: ( ) => Effect . Effect < void , ProviderAdapterRequestError > ;
155157 readonly startSessionEffect ?: (
@@ -395,6 +397,7 @@ describe("ProviderCommandReactor", () => {
395397 get streamDomainEvents ( ) {
396398 return engine . streamDomainEvents ;
397399 } ,
400+ subscribeDomainEvents : engine . subscribeDomainEvents ,
398401 latestSequence : engine . latestSequence ,
399402 } satisfies OrchestrationEngineService [ "Service" ] ;
400403 } ) ,
@@ -500,7 +503,14 @@ describe("ProviderCommandReactor", () => {
500503 }
501504
502505 scope = await Effect . runPromise ( Scope . make ( "sequential" ) ) ;
503- await Effect . runPromise ( reactor . start ( ) . pipe ( Scope . provide ( scope ) ) ) ;
506+ await Effect . runPromise (
507+ reactor
508+ . start ( )
509+ . pipe (
510+ Scope . provide ( scope ) ,
511+ Effect . provideService ( ServerActivation , input ?. serverActivation ) ,
512+ ) ,
513+ ) ;
504514 const drain = ( ) => Effect . runPromise ( reactor . drain ) ;
505515
506516 return {
@@ -568,6 +578,45 @@ describe("ProviderCommandReactor", () => {
568578 expect ( thread ?. session ?. runtimeMode ) . toBe ( "approval-required" ) ;
569579 } ) ;
570580
581+ effectIt . effect ( "retains a turn dispatched immediately after start until activation" , ( ) =>
582+ Effect . gen ( function * ( ) {
583+ const activation = yield * Deferred . make < void > ( ) ;
584+ const started = yield * Deferred . make < ProviderSession > ( ) ;
585+ const harness = yield * Effect . promise ( ( ) =>
586+ createHarness ( {
587+ serverActivation : Deferred . await ( activation ) ,
588+ startSessionEffect : ( session ) =>
589+ Deferred . succeed ( started , session ) . pipe ( Effect . as ( session ) ) ,
590+ } ) ,
591+ ) ;
592+
593+ yield * harness . engine . dispatch ( {
594+ type : "thread.turn.start" ,
595+ commandId : CommandId . make ( "cmd-turn-start-before-activation" ) ,
596+ threadId : ThreadId . make ( "thread-1" ) ,
597+ message : {
598+ messageId : MessageId . make ( "message-before-activation" ) ,
599+ role : "user" ,
600+ text : "Start after activation" ,
601+ attachments : [ ] ,
602+ } ,
603+ interactionMode : DEFAULT_PROVIDER_INTERACTION_MODE ,
604+ runtimeMode : "approval-required" ,
605+ createdAt : "2026-01-01T00:00:00.000Z" ,
606+ } ) ;
607+ expect ( yield * Deferred . isDone ( started ) ) . toBe ( false ) ;
608+
609+ yield * Deferred . succeed ( activation , undefined ) ;
610+ const session = yield * Deferred . await ( started ) ;
611+ yield * Effect . promise ( ( ) => harness . drain ( ) ) ;
612+ expect ( session . threadId ) . toBe ( ThreadId . make ( "thread-1" ) ) ;
613+ expect ( harness . sendTurn . mock . calls [ 0 ] ?. [ 0 ] ) . toMatchObject ( {
614+ threadId : ThreadId . make ( "thread-1" ) ,
615+ input : "Start after activation" ,
616+ } ) ;
617+ } ) ,
618+ ) ;
619+
571620 effectIt . effect ( "projects starting before a slow provider session finishes" , ( ) =>
572621 Effect . gen ( function * ( ) {
573622 const releaseStart = yield * Deferred . make < void > ( ) ;
0 commit comments