@@ -9292,59 +9292,84 @@ describe("ClaudeAdapterV2 background wake turns", () => {
92929292 ),
92939293 );
92949294
9295- it.effect("ends a subagent's open call when the CLI exits while the root turn is idle", () =>
9296- Effect.scoped(
9297- Effect.gen(function* () {
9298- const TOOL_USE_ID = "toolu-idle-exit";
9299- const BASH = "toolu-idle-exit-bash";
9300- const harness = yield* makeWakeHarness;
9301- const now = yield* DateTime.now;
9302- const bashStatuses = () =>
9303- harness.events.flatMap((event) =>
9304- event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
9305- ? [`${event.turnItem.type}:${event.turnItem.status}`]
9306- : [],
9295+ it.effect.each(["exit", "Stop"] as const)(
9296+ "settles a plain background subagent and its open call on %s after the root turn completes",
9297+ (reason) =>
9298+ Effect.scoped(
9299+ Effect.gen(function* () {
9300+ const TOOL_USE_ID = "toolu-idle-exit";
9301+ const BASH = "toolu-idle-exit-bash";
9302+ const harness = yield* makeWakeHarnessWithOptions({ close: Queue.shutdown });
9303+ const now = yield* DateTime.now;
9304+ const bashStatuses = () =>
9305+ harness.events.flatMap((event) =>
9306+ event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
9307+ ? [`${event.turnItem.type}:${event.turnItem.status}`]
9308+ : [],
9309+ );
9310+ yield* harness.runtime.startTurn(
9311+ makeClaudeTestTurnInput({
9312+ threadId: harness.threadId,
9313+ providerThread: harness.providerThread,
9314+ now,
9315+ attemptId: RunAttemptId.make("attempt-claude-idle-exit"),
9316+ text: "Audit in the background.",
9317+ attachments: [],
9318+ }),
93079319 );
9308- yield* harness.runtime.startTurn(
9309- makeClaudeTestTurnInput({
9310- threadId: harness.threadId,
9311- providerThread: harness.providerThread,
9312- now,
9313- attemptId: RunAttemptId.make("attempt-claude-idle-exit"),
9314- text: "Audit in the background.",
9315- attachments: [],
9316- }),
9317- );
9318- for (const frame of [
9319- makeSubagentTaskStartedFrame({
9320- taskId: "task-idle-exit",
9321- toolUseId: TOOL_USE_ID,
9322- uuid: "00000000-0000-4000-8000-000000000981",
9323- }),
9324- ...makeSubagentAssistantFrames({
9320+ yield* harness.offerAndWait(
9321+ makeSubagentTaskStartedFrame({
9322+ taskId: "task-idle-exit",
9323+ toolUseId: TOOL_USE_ID,
9324+ uuid: "00000000-0000-4000-8000-000000000981",
9325+ }),
9326+ );
9327+ const started = yield* Queue.take(harness.subagentReceipts);
9328+ assert.equal(started.subagent.status, "running");
9329+ for (const frame of makeSubagentAssistantFrames({
93259330 parentToolUseId: TOOL_USE_ID,
93269331 uuid: "00000000-0000-4000-8000-000000000982",
93279332 bashToolUseId: BASH,
9328- }),
9329- makeResultFrame({
9330- uuid: "00000000-0000-4000-8000-000000000983",
9331- result: "Auditing in the background.",
9332- }),
9333- ]) {
9334- yield* Queue.offer(harness.sdkMessages, frame);
9335- }
9336- yield* awaitUntil(() => harness.terminalEvents().length === 1, "launch turn terminal");
9337- assert.deepEqual(bashStatuses(), ["command_execution:running"]);
9333+ })) {
9334+ yield* harness.offerAndWait(frame);
9335+ }
9336+ yield* harness.offerAndWait(
9337+ makeResultFrame({
9338+ uuid: "00000000-0000-4000-8000-000000000983",
9339+ result: "Auditing in the background.",
9340+ }),
9341+ );
9342+ const terminal = yield* Queue.take(harness.terminalReceipts);
9343+ assert.equal(terminal.status, "completed");
9344+ assert.isTrue(yield* harness.hasPendingBackgroundWork);
9345+ assert.deepEqual(bashStatuses(), ["command_execution:running"]);
93389346
9339- yield* Queue.shutdown(harness.sdkMessages);
9340- yield* awaitUntil(() => bashStatuses().length === 2, "call ended");
9341- assert.deepEqual(bashStatuses(), ["command_execution:running", "command_execution:failed"]);
9342- }).pipe(
9343- Effect.provide(
9344- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9347+ if (reason === "Stop") {
9348+ yield* harness.runtime.interruptTurn({
9349+ providerThread: harness.providerThread,
9350+ providerTurnId: terminal.providerTurnId,
9351+ requestRuntimeRestart: true,
9352+ });
9353+ } else {
9354+ yield* Queue.shutdown(harness.sdkMessages);
9355+ }
9356+ let ended = yield* Queue.take(harness.subagentReceipts);
9357+ while (ended.subagent.status === "running") {
9358+ ended = yield* Queue.take(harness.subagentReceipts);
9359+ }
9360+ assert.equal(ended.subagent.nativeTaskRef?.nativeId, "task-idle-exit");
9361+ assert.equal(ended.subagent.status, reason === "Stop" ? "cancelled" : "failed");
9362+ assert.isFalse(yield* harness.hasPendingBackgroundWork);
9363+ assert.deepEqual(bashStatuses(), [
9364+ "command_execution:running",
9365+ reason === "Stop" ? "command_execution:interrupted" : "command_execution:failed",
9366+ ]);
9367+ }).pipe(
9368+ Effect.provide(
9369+ Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9370+ ),
93459371 ),
93469372 ),
9347- ),
93489373 );
93499374
93509375 it.effect("ends a subagent's open call when Stop's close of the CLI times out", () =>
0 commit comments