Skip to content

Commit dbbec13

Browse files
committed
fix(server): wake late subscribers after runtime teardown
Wake an idle event source from the exact runtime close signal before event processing, preserving guarded reconciliation writes and runtimes without an external close observer. Cover retained-runtime startup after completed release and subscription between teardown broadcast and a held scope finalizer. Both must settle failed without native calls, retained ownership, or an open subscription.
1 parent a9e9f71 commit dbbec13

2 files changed

Lines changed: 55 additions & 2 deletions

File tree

‎apps/server/src/orchestration-v2/ProviderStartStop.integration.test.ts‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,12 @@ it.effect.each([
5757
"manager-release-interrupt",
5858
"provider-stopped",
5959
"stream-ended",
60+
"released-before-subscribe",
61+
"released-during-subscribe",
6062
] as const)("Stop crosses native start: %s", (scenario) =>
6163
Effect.scoped(
6264
Effect.gen(function* () {
65+
const scope = yield* Effect.scope;
6366
const cwd = yield* checkpointWorkspace(`start-stop-${scenario}`);
6467
const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event, Cause.Done>();
6568
const entered = yield* Deferred.make<void>();
@@ -76,6 +79,12 @@ it.effect.each([
7679
const releaseTerminal = yield* Deferred.make<void>();
7780
const ownedWait = yield* Deferred.make<void>();
7881
const beforeOwnership = yield* Deferred.make<void>();
82+
const closeHeld = yield* Deferred.make<void>();
83+
const releaseClose = yield* Deferred.make<void>();
84+
const lateSubscribed = yield* Deferred.make<void>();
85+
const lateSubscriptionClosed = yield* Deferred.make<void>();
86+
const lateSubscription =
87+
scenario === "released-before-subscribe" || scenario === "released-during-subscribe";
7988
const driver = ProviderDriverKind.make("codex");
8089
const instanceId = ProviderInstanceId.make("codex");
8190
const modelSelection = { instanceId, model: "synthetic" };
@@ -97,6 +106,12 @@ it.effect.each([
97106
planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
98107
openSession: (input) =>
99108
Effect.gen(function* () {
109+
if (scenario === "released-during-subscribe")
110+
yield* Effect.addFinalizer(() =>
111+
Deferred.succeed(closeHeld, undefined).pipe(
112+
Effect.andThen(Deferred.await(releaseClose)),
113+
),
114+
);
100115
const now = yield* DateTime.now;
101116
const startTurn: ProviderAdapter.ProviderAdapterV2SessionRuntime["startTurn"] = (
102117
turn,
@@ -281,6 +296,7 @@ it.effect.each([
281296
const outbox = yield* EffectOutbox.EffectOutboxV2;
282297
const execution = yield* RunExecutionService.RunExecutionServiceV2;
283298
const threads = yield* ThreadManagementService.ThreadManagementService;
299+
const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
284300
yield* orchestrator.dispatch({
285301
type: "thread.create",
286302
commandId: CommandId.make("create"),
@@ -310,6 +326,33 @@ it.effect.each([
310326
const originalStart = execution.startRootRun;
311327
let staleInput: RunExecutionService.RunExecutionServiceV2StartRootRunInput | undefined;
312328
using _beforeOwnership = vi.spyOn(execution, "startRootRun").mockImplementation((input) => {
329+
if (lateSubscription)
330+
return Effect.gen(function* () {
331+
const released = yield* manager
332+
.release({ providerSessionId: input.providerSessionId, reason: "manual_shutdown" })
333+
.pipe(Effect.orDie, Effect.forkIn(scope));
334+
if (scenario === "released-before-subscribe") yield* Fiber.join(released);
335+
else yield* Deferred.await(closeHeld);
336+
const startup = yield* originalStart({
337+
...input,
338+
session: {
339+
...input.session,
340+
subscribeEvents: input.session.subscribeEvents!.pipe(
341+
Effect.map((subscription) => ({
342+
...subscription,
343+
close: subscription.close.pipe(
344+
Effect.tap(() => Deferred.succeed(lateSubscriptionClosed, undefined)),
345+
),
346+
})),
347+
Effect.tap(() => Deferred.succeed(lateSubscribed, undefined)),
348+
),
349+
},
350+
}).pipe(Effect.forkIn(scope));
351+
yield* Deferred.await(lateSubscribed);
352+
yield* Deferred.succeed(releaseClose, undefined);
353+
yield* Fiber.join(released);
354+
yield* Fiber.join(startup);
355+
});
313356
if (scenario === "unsupported-compact") {
314357
const session = { ...input.session };
315358
delete session.compactThread;
@@ -341,7 +384,11 @@ it.effect.each([
341384
});
342385
yield* send("first");
343386
const startup = yield* worker.drain(1).pipe(Effect.forkScoped);
344-
if (scenario === "unsupported-compact" || scenario === "prompt-refusal") {
387+
if (
388+
scenario === "unsupported-compact" ||
389+
scenario === "prompt-refusal" ||
390+
lateSubscription
391+
) {
345392
yield* Fiber.join(startup);
346393
const failed = yield* orchestrator.getThreadProjection(threadId);
347394
const run = failed.runs[0]!;
@@ -359,6 +406,7 @@ it.effect.each([
359406
);
360407
assert.equal(starts, 0);
361408
assert.deepEqual(interrupts, []);
409+
if (lateSubscription) assert.isTrue(yield* Deferred.isDone(lateSubscriptionClosed));
362410
return;
363411
}
364412
if (scenario === "before-ownership") {

‎apps/server/src/orchestration-v2/RunExecutionService.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,12 @@ export const layer: Layer.Layer<
15541554
// Ends once the root turn and the children it drives settle. Background commands such
15551555
// as a dev server keep this consumer alive afterwards and must not pin preview focus.
15561556
const endPreviewActivity = yield* previewAgentActivity.begin(input.run.threadId);
1557-
const providerEventFiber = yield* eventSubscription.events.pipe(
1557+
// Only an out-of-stream closure observer needs to wake an idle subscription.
1558+
const providerEvents =
1559+
input.session.onSessionClosed === undefined
1560+
? eventSubscription.events
1561+
: eventSubscription.events.pipe(Stream.interruptWhen(Deferred.await(sessionClosed)));
1562+
const providerEventFiber = yield* providerEvents.pipe(
15581563
Stream.mapEffect((event) =>
15591564
Effect.gen(function* () {
15601565
if (

0 commit comments

Comments
 (0)