Skip to content

Commit 30fbbcd

Browse files
committed
fix(server): run release tool-call cleanup off the subscriber's fiber
The cleanup ran in the subscriber stream's finalizer, so a released run's failure write waited for it and a handoff continuation could queue behind the still-running run.
1 parent 363e5aa commit 30fbbcd

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎apps/server/src/orchestration-v2/ProviderSessionManager.test.ts‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3016,21 +3016,24 @@ it.effect.each(["detach", "stream failure", "provider stop", "early close"] as c
30163016
}
30173017
yield* Queue.end(queue);
30183018
}
3019-
yield* eventSink.stream({ threadId, afterSequence }).pipe(
3020-
Stream.filter(
3021-
({ event }) =>
3022-
event.type === "turn-item.updated" &&
3023-
event.payload.id === seededToolCalls.cutOff.id &&
3024-
event.payload.status === "interrupted",
3025-
),
3026-
Stream.take(1),
3027-
Stream.runDrain,
3028-
);
3019+
const interrupts = (count: number) =>
3020+
eventSink.stream({ threadId, afterSequence }).pipe(
3021+
Stream.filter(
3022+
({ event }) =>
3023+
event.type === "turn-item.updated" &&
3024+
event.payload.id === seededToolCalls.cutOff.id &&
3025+
event.payload.status === "interrupted",
3026+
),
3027+
Stream.take(count),
3028+
Stream.runDrain,
3029+
);
3030+
yield* interrupts(1);
30293031
yield* Deferred.succeed(resume, undefined);
30303032
assert.equal(
30313033
Exit.isFailure(yield* Fiber.join(consumer)),
30323034
release !== "provider stop" && release !== "early close",
30333035
);
3036+
yield* interrupts(2);
30343037

30353038
assert.isTrue(Option.isNone(yield* manager.get(providerSessionId)));
30363039
assert.deepStrictEqual(yield* rosters, [[], ["dev-server"]]);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,11 +2013,12 @@ export const layerWithOptions = (
20132013
? Queue.clear(queue).pipe(Effect.andThen(Queue.end(queue)), Effect.asVoid)
20142014
: Effect.void,
20152015
),
2016+
// Detached so the consumer's run failure is not ordered behind release cleanup.
20162017
Effect.andThen(
20172018
Effect.suspend(() => {
20182019
const cleanup = subscriberReleaseCleanup.get(queue);
20192020
subscriberReleaseCleanup.delete(queue);
2020-
return cleanup ?? Effect.void;
2021+
return cleanup === undefined ? Effect.void : Effect.forkDetach(cleanup);
20212022
}),
20222023
),
20232024
);

0 commit comments

Comments
 (0)