Skip to content

Commit 6929b91

Browse files
committed
test(server): make detach request race checkpoint explicit
1 parent ff12227 commit 6929b91

1 file changed

Lines changed: 20 additions & 8 deletions

File tree

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2825,11 +2825,20 @@ it.effect.each(["approval_request", "user_input_request"] as const)(
28252825
now,
28262826
});
28272827
yield* eventSink.write({
2828-
events: request.events.map((event) =>
2829-
event.type === "turn-item.updated" && requestType === "user_input_request"
2830-
? { ...event, payload: { ...event.payload, type: requestType, questions: [] } }
2831-
: event,
2832-
),
2828+
events: request.events.map((event) => {
2829+
if (requestType === "user_input_request") {
2830+
if (event.type === "runtime-request.updated")
2831+
return { ...event, payload: { ...event.payload, kind: "user_input" } };
2832+
if (event.type === "node.updated")
2833+
return { ...event, payload: { ...event.payload, kind: requestType } };
2834+
if (event.type === "turn-item.updated")
2835+
return {
2836+
...event,
2837+
payload: { ...event.payload, type: requestType, questions: [] },
2838+
};
2839+
}
2840+
return event;
2841+
}),
28332842
});
28342843
return request;
28352844
}),
@@ -2908,6 +2917,7 @@ it.effect(
29082917
const state = yield* Ref.make(emptyState);
29092918
const incomingWriteStarted = yield* Deferred.make<void>();
29102919
const releaseIncomingWrite = yield* Deferred.make<void>();
2920+
const detachProjectionStarted = yield* Deferred.make<void>();
29112921
const incomingCommitted = yield* Ref.make(false);
29122922
const requestReadStates = yield* Ref.make<ReadonlyArray<boolean>>([]);
29132923
const threadId = ThreadId.make("detach_request_race");
@@ -2944,10 +2954,11 @@ it.effect(
29442954
return ProjectionStore.ProjectionStoreV2.of({
29452955
...delegate,
29462956
getThreadRecords: (requestedThreadId, fields, options) => {
2947-
// The fixture has no provider turns. Keep this read synchronous so
2948-
// fork's immediate start reaches the request permit before returning.
29492957
if (fields.some((field) => field === "providerThreads")) {
2950-
return Effect.succeed({ providerThreads: [], providerTurns: [] } as never);
2958+
// This read precedes the request permit, which the incoming write holds.
2959+
return Deferred.succeed(detachProjectionStarted, undefined).pipe(
2960+
Effect.as({ providerThreads: [], providerTurns: [] } as never),
2961+
);
29512962
}
29522963
if (
29532964
requestedThreadId === threadId &&
@@ -3010,6 +3021,7 @@ it.effect(
30103021
const detach = yield* manager
30113022
.detach({ providerSessionId, threadId })
30123023
.pipe(Effect.forkScoped({ startImmediately: true }));
3024+
yield* Deferred.await(detachProjectionStarted);
30133025
yield* Deferred.succeed(releaseIncomingWrite, undefined);
30143026
yield* Fiber.join(detach);
30153027
assert.deepEqual(yield* Ref.get(requestReadStates), [true]);

0 commit comments

Comments
 (0)