Skip to content

Commit aad1557

Browse files
fix(server): an earlier turn's nested subagent keeps its card when its call returns while idle
While the root is idle, a running subagent's frames go through the turn that settled last. That turn's own subagent map never saw a nested subagent an earlier turn launched, so the nested Agent call's tool_result missed it and became a generic tool row with empty input in the outer subagent's thread. The tool-result loop now resolves the subagent through the session registry. The tracked-call guard still keeps a SendMessage acknowledgement from ending the subagent it resumes. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 681afcd commit aad1557

2 files changed

Lines changed: 134 additions & 1 deletion

File tree

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

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6611,6 +6611,136 @@ describe("ClaudeAdapterV2 background wake turns", () => {
66116611
),
66126612
);
66136613

6614+
it.effect("ends an earlier turn's nested subagent while the root turn is idle", () =>
6615+
Effect.scoped(
6616+
Effect.gen(function* () {
6617+
const OUTER_TASK_ID = "task-earlier-outer";
6618+
const OUTER_TOOL_USE_ID = "toolu-earlier-outer";
6619+
const NESTED_TASK_ID = "task-earlier-nested";
6620+
const NESTED_TOOL_USE_ID = "toolu-earlier-nested";
6621+
const harness = yield* makeWakeHarness;
6622+
const now = yield* DateTime.now;
6623+
const userTurn = (attemptId: string, providerTurnOrdinal: number) =>
6624+
harness.runtime.startTurn(
6625+
makeClaudeTestTurnInput({
6626+
threadId: harness.threadId,
6627+
providerThread: harness.providerThread,
6628+
now,
6629+
attemptId: RunAttemptId.make(attemptId),
6630+
text: "Keep auditing.",
6631+
attachments: [],
6632+
providerTurnOrdinal,
6633+
}),
6634+
);
6635+
// Turn 1 launches the outer subagent, which starts a nested one.
6636+
yield* userTurn("attempt-claude-earlier-nested-1", 1);
6637+
for (const frame of [
6638+
makeSubagentTaskStartedFrame({
6639+
taskId: OUTER_TASK_ID,
6640+
toolUseId: OUTER_TOOL_USE_ID,
6641+
uuid: "00000000-0000-4000-8000-000000000a01",
6642+
}),
6643+
claudeSdkFrame({
6644+
type: "assistant",
6645+
message: {
6646+
model: "claude-sonnet-4-6",
6647+
id: "msg_earlier_nested_launch",
6648+
type: "message",
6649+
role: "assistant",
6650+
content: [
6651+
{
6652+
type: "tool_use",
6653+
id: NESTED_TOOL_USE_ID,
6654+
name: "Agent",
6655+
input: { description: "Nested check", prompt: "Reply with NESTED_OK" },
6656+
},
6657+
],
6658+
},
6659+
parent_tool_use_id: OUTER_TOOL_USE_ID,
6660+
uuid: "00000000-0000-4000-8000-000000000a02",
6661+
session_id: WAKE_NATIVE_SESSION,
6662+
}),
6663+
claudeSdkFrame({
6664+
type: "system",
6665+
subtype: "task_started",
6666+
task_id: NESTED_TASK_ID,
6667+
tool_use_id: NESTED_TOOL_USE_ID,
6668+
description: "Nested check",
6669+
subagent_type: "general-purpose",
6670+
is_backgrounded: false,
6671+
spawn_depth: 2,
6672+
task_type: "local_agent",
6673+
prompt: "Reply with NESTED_OK",
6674+
uuid: "00000000-0000-4000-8000-000000000a03",
6675+
session_id: WAKE_NATIVE_SESSION,
6676+
}),
6677+
makeResultFrame({
6678+
uuid: "00000000-0000-4000-8000-000000000a04",
6679+
result: "Auditing in the background.",
6680+
}),
6681+
]) {
6682+
yield* Queue.offer(harness.sdkMessages, frame);
6683+
}
6684+
yield* awaitUntil(() => harness.terminalEvents().length === 1, "first turn terminal");
6685+
// A later turn settles, so its context, which never saw the nested
6686+
// launch, is the one the root's idle frames go through.
6687+
yield* userTurn("attempt-claude-earlier-nested-2", 2);
6688+
yield* Queue.offer(
6689+
harness.sdkMessages,
6690+
makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000a05", result: "Still on it." }),
6691+
);
6692+
yield* awaitUntil(() => harness.terminalEvents().length === 2, "second turn terminal");
6693+
6694+
// The nested subagent ends and its Agent call returns while the root
6695+
// is idle. The outer subagent's next message marks when both are handled.
6696+
for (const frame of [
6697+
makeSubagentNotificationFrame({
6698+
taskId: NESTED_TASK_ID,
6699+
toolUseId: NESTED_TOOL_USE_ID,
6700+
summary: "NESTED_OK",
6701+
uuid: "00000000-0000-4000-8000-000000000a06",
6702+
}),
6703+
makeSubagentToolResultFrame({
6704+
parentToolUseId: OUTER_TOOL_USE_ID,
6705+
uuid: "00000000-0000-4000-8000-000000000a07",
6706+
toolUseId: NESTED_TOOL_USE_ID,
6707+
}),
6708+
...makeSubagentAssistantFrames({
6709+
parentToolUseId: OUTER_TOOL_USE_ID,
6710+
uuid: "00000000-0000-4000-8000-000000000a08",
6711+
text: "OUTER_AFTER_NESTED",
6712+
}),
6713+
]) {
6714+
yield* Queue.offer(harness.sdkMessages, frame);
6715+
}
6716+
yield* awaitUntil(
6717+
() =>
6718+
harness.events.some(
6719+
(event) =>
6720+
event.type === "message.updated" && event.message.text === "OUTER_AFTER_NESTED",
6721+
),
6722+
"outer work after the nested call returns",
6723+
);
6724+
6725+
// The nested Agent call is the nested subagent, never a plain tool row.
6726+
assert.isFalse(
6727+
harness.events.some(
6728+
(event) =>
6729+
event.type === "turn_item.updated" &&
6730+
event.turnItem.nativeItemRef?.nativeId === NESTED_TOOL_USE_ID,
6731+
),
6732+
);
6733+
const nested = harness.events.findLast(
6734+
(event) =>
6735+
event.type === "subagent.updated" &&
6736+
event.subagent.nativeTaskRef?.nativeId === NESTED_TASK_ID,
6737+
);
6738+
assert.equal(nested?.type === "subagent.updated" && nested.subagent.status, "completed");
6739+
assert.lengthOf(harness.continuationRequests, 0);
6740+
}).pipe(Effect.provide(Layer.merge(IdAllocator.layer, NodeServices.layer))),
6741+
),
6742+
);
6743+
66146744
it.effect("ends a subagent's open call when the CLI exits while the root turn is idle", () =>
66156745
Effect.scoped(
66166746
Effect.gen(function* () {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6340,7 +6340,10 @@ export function makeClaudeAdapterV2(
63406340
}
63416341

63426342
for (const { toolResult, output } of claudeToolResultEntriesFromMessage(message)) {
6343-
const subagent = context.subagentsByToolUseId.get(toolResult.tool_use_id);
6343+
// Session scope: while the root is idle, this context is the turn
6344+
// that settled last, which never saw a subagent an earlier turn
6345+
// launched (a nested one whose Agent call returns now).
6346+
const subagent = yield* resolveSubagentByToolUseId(context, toolResult.tool_use_id);
63446347
// A resume task_started reuses the resuming tool call's
63456348
// tool_use_id (e.g. SendMessage), whose tool_result only
63466349
// acknowledges delivery. Only the Agent launch's tool_result may

0 commit comments

Comments
 (0)