@@ -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"
0 commit comments