Skip to content

Commit 1f8ac9b

Browse files
committed
fix(server): subscribe before provider reactor startup returns
1 parent ceae5b6 commit 1f8ac9b

8 files changed

Lines changed: 73 additions & 2 deletions

‎apps/server/src/orchestration/Layers/OrchestrationEngine.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
387387
return {
388388
readEvents,
389389
dispatch,
390+
subscribeDomainEvents: PubSub.subscribe(eventPubSub).pipe(Effect.map(Stream.fromSubscription)),
390391
// Each access creates a fresh PubSub subscription so that multiple
391392
// consumers (wsServer, ProviderRuntimeIngestion, CheckpointReactor, etc.)
392393
// each independently receive all domain events.

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts"
6161
import * as NodeServices from "@effect/platform-node/NodeServices";
6262
import * as Clock from "effect/Clock";
6363
import { ServerSettingsService } from "../../serverSettings.ts";
64+
import { ServerActivation } from "../../serverActivation.ts";
6465
import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";
6566
import * 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>();

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,9 @@ const make = Effect.gen(function* () {
15541554
}
15551555
});
15561556

1557-
yield* forkParked(Stream.runForEach(orchestrationEngine.streamDomainEvents, processEvent));
1557+
// Subscribe before returning, even while event handling waits for server activation.
1558+
const domainEvents = yield* orchestrationEngine.subscribeDomainEvents;
1559+
yield* forkParked(Stream.runForEach(domainEvents, processEvent));
15581560

15591561
// The domain event stream is hot, so work pending before this reactor
15601562
// starts cannot be resumed. Correlated completions only clear the request

‎apps/server/src/orchestration/Services/OrchestrationEngine.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import type {
1717
} from "@t3tools/contracts";
1818
import * as Context from "effect/Context";
1919
import type * as Effect from "effect/Effect";
20+
import type * as Scope from "effect/Scope";
2021
import type * as Stream from "effect/Stream";
2122

2223
import type { OrchestrationDispatchError } from "../Errors.ts";
@@ -64,6 +65,16 @@ export interface OrchestrationEngineShape {
6465
*/
6566
readonly streamDomainEvents: Stream.Stream<OrchestrationEvent>;
6667

68+
/**
69+
* Acquire a domain-event subscription before starting a consumer.
70+
* The subscription is ready when this effect returns and closes with the scope.
71+
*/
72+
readonly subscribeDomainEvents: Effect.Effect<
73+
Stream.Stream<OrchestrationEvent>,
74+
never,
75+
Scope.Scope
76+
>;
77+
6778
/**
6879
* The latest sequence reflected in the engine's authoritative command read
6980
* model (0 if none). Used to gauge how far behind a resuming client is before

‎apps/server/src/orchestration/Services/ProviderCommandReactor.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export interface ProviderCommandReactorShape {
1919
*
2020
* The returned effect must be run in a scope so all worker fibers can be
2121
* finalized on shutdown.
22+
* It subscribes before returning. Event handling waits for server activation.
2223
*
2324
* Filters orchestration domain events to provider-intent types before
2425
* processing.

‎apps/server/src/relay/AgentAwarenessRelay.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
474474
readEvents: () => Stream.empty,
475475
dispatch: () => Effect.succeed({ sequence: 1 }),
476476
streamDomainEvents: Stream.fromQueue(events),
477+
subscribeDomainEvents: Effect.succeed(Stream.fromQueue(events)),
477478
latestSequence: Effect.succeed(0),
478479
} satisfies OrchestrationEngineShape;
479480

@@ -666,6 +667,7 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
666667
readEvents: () => Stream.empty,
667668
dispatch: () => Effect.succeed({ sequence: 1 }),
668669
streamDomainEvents: Stream.fromQueue(events),
670+
subscribeDomainEvents: Effect.succeed(Stream.fromQueue(events)),
669671
latestSequence: Effect.succeed(0),
670672
} satisfies OrchestrationEngineShape),
671673
Layer.succeed(ProjectionSnapshotQuery, {

‎apps/server/src/serverRuntimeStartup.reconcile.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ const runReconciliation = (input: {
8484
readEvents: () => Stream.empty,
8585
dispatch: input.dispatch,
8686
streamDomainEvents: Stream.empty,
87+
subscribeDomainEvents: Effect.succeed(Stream.empty),
8788
latestSequence: Effect.succeed(0),
8889
}),
8990
Effect.provide(NodeServices.layer),
@@ -289,6 +290,7 @@ it.effect("does not fail startup when the live provider session inventory cannot
289290
readEvents: () => Stream.empty,
290291
dispatch: () => Effect.die("unused"),
291292
streamDomainEvents: Stream.empty,
293+
subscribeDomainEvents: Effect.succeed(Stream.empty),
292294
latestSequence: Effect.succeed(0),
293295
}),
294296
Effect.provide(NodeServices.layer),

‎apps/server/src/serverRuntimeStartup.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
179179
Effect.as({ sequence: 1 }),
180180
),
181181
streamDomainEvents: Stream.empty,
182+
subscribeDomainEvents: Effect.succeed(Stream.empty),
182183
latestSequence: Effect.succeed(0),
183184
} satisfies OrchestrationEngine.OrchestrationEngineService["Service"]),
184185
Effect.provide(NodeServices.layer),
@@ -224,6 +225,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
224225
Effect.as({ sequence: 1 }),
225226
),
226227
streamDomainEvents: Stream.empty,
228+
subscribeDomainEvents: Effect.succeed(Stream.empty),
227229
latestSequence: Effect.succeed(0),
228230
} satisfies OrchestrationEngine.OrchestrationEngineService["Service"]),
229231
Effect.provide(NodeServices.layer),
@@ -275,6 +277,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
275277
Effect.as({ sequence: 1 }),
276278
),
277279
streamDomainEvents: Stream.empty,
280+
subscribeDomainEvents: Effect.succeed(Stream.empty),
278281
latestSequence: Effect.succeed(0),
279282
} satisfies OrchestrationEngine.OrchestrationEngineService["Service"]),
280283
Effect.provideService(Crypto.Crypto, {

0 commit comments

Comments
 (0)