Skip to content

Commit ff06982

Browse files
fix(server): two wakes absorbed behind a Claude Monitor event both settle
A root frame clears the absorbed marker, so when a Monitor continuation leaves a later wake buffered the marker is always that later wake's. The split drain now keeps it in every such case, and reads its own absorption from its end frame alone. Co-Authored-By: Claude Fable 5.2 <[email protected]>
1 parent 6fc0f85 commit ff06982

2 files changed

Lines changed: 41 additions & 35 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11499,13 +11499,15 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1149911499
// Claude 2.1.323 wakes a session per Monitor event with only init, assistant and a
1150011500
// task-notification result; just the Monitor's end sends a task_notification frame.
1150111501
it.effect.each([
11502-
{ laterWake: "ends with its own result" },
11503-
{ laterWake: "is absorbed by a user turn" },
11502+
{ monitorWake: "ends with its own result", laterWake: "ends with its own result" },
11503+
{ monitorWake: "ends with its own result", laterWake: "is absorbed by a user turn" },
11504+
{ monitorWake: "is absorbed by a user turn", laterWake: "is absorbed by a user turn" },
1150411505
] as const)(
11505-
"tags a Claude Monitor event wake as a monitor update (later wake $laterWake)",
11506-
({ laterWake }) =>
11506+
"tags a Claude Monitor event wake as a monitor update (it $monitorWake, later wake $laterWake)",
11507+
({ monitorWake, laterWake }) =>
1150711508
Effect.gen(function* () {
1150811509
const absorbed = laterWake === "is absorbed by a user turn";
11510+
const monitorWakeAbsorbed = monitorWake === "is absorbed by a user turn";
1150911511
const harness = yield* makeWakeHarness;
1151011512
const now = yield* DateTime.now;
1151111513
const taskId = "bi5kfx7xp";
@@ -11594,13 +11596,35 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1159411596
{ source: { kind: "monitor" }, outcome: "updated" },
1159511597
);
1159611598

11599+
let settled = 1;
11600+
// Claude folds a prompt into the wake turn it already opened, so one result ends both.
11601+
const absorbWithUserTurn = Effect.fnUntraced(function* (result: SDKMessage) {
11602+
settled += 1;
11603+
yield* harness.runtime.startTurn(
11604+
makeClaudeTestTurnInput({
11605+
threadId: harness.threadId,
11606+
providerThread: harness.providerThread,
11607+
now,
11608+
attemptId: RunAttemptId.make(`attempt-claude-monitor-event-user-${settled}`),
11609+
text: "Any survivors yet?",
11610+
attachments: [],
11611+
providerTurnOrdinal: settled,
11612+
}),
11613+
);
11614+
yield* harness.until(() => harness.offeredMessages.length === settled);
11615+
yield* Queue.offer(harness.sdkMessages, result);
11616+
yield* harness.awaitTerminal(settled);
11617+
});
11618+
const monitorWakeResult = makeResultFrame({
11619+
uuid: "00000000-0000-4000-8000-000000000906",
11620+
result: "Covered. Waiting for the rest.",
11621+
...(monitorWakeAbsorbed ? {} : { origin: { kind: "task-notification" } as const }),
11622+
});
11623+
if (monitorWakeAbsorbed) yield* absorbWithUserTurn(monitorWakeResult);
11624+
else yield* harness.offerAndWait(monitorWakeResult);
11625+
1159711626
// A wake buffered behind the queued Monitor continuation must not run under its tag.
1159811627
for (const frame of [
11599-
makeResultFrame({
11600-
uuid: "00000000-0000-4000-8000-000000000906",
11601-
result: "Covered. Waiting for the rest.",
11602-
origin: { kind: "task-notification" },
11603-
}),
1160411628
claudeSdkFrame({
1160511629
type: "system",
1160611630
subtype: "init",
@@ -11618,25 +11642,8 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1161811642
uuid: "00000000-0000-4000-8000-000000000909",
1161911643
result: absorbed ? "No survivors yet." : "Scheduled answer.",
1162011644
});
11621-
if (absorbed) {
11622-
yield* harness.runtime.startTurn(
11623-
makeClaudeTestTurnInput({
11624-
threadId: harness.threadId,
11625-
providerThread: harness.providerThread,
11626-
now,
11627-
attemptId: RunAttemptId.make("attempt-claude-monitor-event-user"),
11628-
text: "Any survivors yet?",
11629-
attachments: [],
11630-
providerTurnOrdinal: 2,
11631-
}),
11632-
);
11633-
yield* harness.until(() => harness.offeredMessages.length === 2);
11634-
yield* Queue.offer(harness.sdkMessages, laterResult);
11635-
yield* harness.awaitTerminal(2);
11636-
} else {
11637-
yield* harness.offerAndWait(laterResult);
11638-
}
11639-
const settled = absorbed ? 2 : 1;
11645+
if (absorbed) yield* absorbWithUserTurn(laterResult);
11646+
else yield* harness.offerAndWait(laterResult);
1164011647
const assistantTexts = () =>
1164111648
harness.events.flatMap((event) =>
1164211649
event.type === "message.updated" && event.message.role === "assistant"

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12682,13 +12682,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1268212682
updated.delete(nativeThreadId);
1268312683
return updated;
1268412684
});
12685-
// A split wake that a user turn ended gets no result of its own.
12686-
const wakeAbsorbed =
12687-
(yield* Ref.get(absorbedWakes)).has(nativeThreadId) ||
12688-
(leavesLaterWake && latch?.end?.type !== "result");
12689-
// After this wake's own result, the absorption recorded is the later wake's.
12690-
if (!leavesLaterWake || latch?.end?.type !== "result")
12691-
yield* forgetAbsorbedWake(nativeThreadId);
12685+
// A root frame clears the absorbed marker, so behind a split it is the later wake's
12686+
// and stays; the split wake was absorbed when its end is not a result.
12687+
const wakeAbsorbed = leavesLaterWake
12688+
? latch?.end?.type !== "result"
12689+
: (yield* Ref.get(absorbedWakes)).has(nativeThreadId);
12690+
if (!leavesLaterWake) yield* forgetAbsorbedWake(nativeThreadId);
1269212691
if (drained.length === 0) {
1269312692
const completedAt = yield* DateTime.now;
1269412693
yield* finalizeActiveTurn({ context, status: "completed", completedAt });

0 commit comments

Comments
 (0)