Skip to content

Commit 1e479b2

Browse files
Vantrongsclaude
andcommitted
fix(server): a buffered subagent start holds back only its own frames and launch result
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent f94f179 commit 1e479b2

2 files changed

Lines changed: 49 additions & 16 deletions

File tree

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6477,7 +6477,8 @@ describe("ClaudeAdapterV2 background wake turns", () => {
64776477
uuid: "00000000-0000-4000-8000-000000000974",
64786478
session_id: WAKE_NATIVE_SESSION,
64796479
}),
6480-
// The outer subagent's progress doesn't wait for the nested start.
6480+
// The outer subagent's progress and own work don't wait for the
6481+
// nested start.
64816482
claudeSdkFrame({
64826483
type: "system",
64836484
subtype: "task_progress",
@@ -6486,6 +6487,24 @@ describe("ClaudeAdapterV2 background wake turns", () => {
64866487
uuid: "00000000-0000-4000-8000-000000000984",
64876488
session_id: WAKE_NATIVE_SESSION,
64886489
}),
6490+
...makeSubagentAssistantFrames({
6491+
parentToolUseId: OUTER_TOOL_USE_ID,
6492+
uuid: "00000000-0000-4000-8000-000000000988",
6493+
messageId: "msg_idle_outer_working",
6494+
text: "OUTER_WORKING",
6495+
}),
6496+
]) {
6497+
yield* Queue.offer(harness.sdkMessages, frame);
6498+
}
6499+
yield* awaitUntil(
6500+
() =>
6501+
harness.events.some(
6502+
(event) => event.type === "message.updated" && event.message.text === "OUTER_WORKING",
6503+
),
6504+
"outer work while the nested start waits",
6505+
);
6506+
assert.lengthOf(harness.continuationRequests, 0);
6507+
for (const frame of [
64896508
...makeSubagentAssistantFrames({
64906509
parentToolUseId: NESTED_TOOL_USE_ID,
64916510
uuid: "00000000-0000-4000-8000-000000000975",
@@ -6570,7 +6589,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
65706589
assert.equal(nested?.parentNodeId, outer?.id);
65716590
assert.deepEqual(
65726591
subagentRouting(harness.events, []).assistantTexts(outer?.childThreadId ?? undefined),
6573-
["OUTER_DONE"],
6592+
["OUTER_WORKING", "OUTER_DONE"],
65746593
);
65756594
}).pipe(Effect.provide(Layer.merge(IdAllocator.layer, NodeServices.layer))),
65766595
),

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

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5626,28 +5626,42 @@ export function makeClaudeAdapterV2(
56265626
}
56275627
// A subagent's task_started still in the wake buffer registers or
56285628
// re-opens it only when a continuation drains it, and only that run
5629-
// stores the work that follows. Frames after it keep their order;
5630-
// progress only waits on its own subagent's start.
5631-
const bufferedStarts = new Set(
5632-
((yield* Ref.get(wakeBuffers)).get(nativeThreadId)?.messages ?? []).flatMap((entry) =>
5633-
entry.type === "system" &&
5634-
entry.subtype === "task_started" &&
5635-
!isClaudeNonSubagentTask(entry)
5636-
? [entry.task_id]
5637-
: [],
5638-
),
5629+
// stores the work that follows. So that subagent's own frames, and
5630+
// the result of the Agent call that launched it, wait behind it.
5631+
const bufferedStarts = (
5632+
(yield* Ref.get(wakeBuffers)).get(nativeThreadId)?.messages ?? []
5633+
).flatMap((entry) =>
5634+
entry.type === "system" &&
5635+
entry.subtype === "task_started" &&
5636+
!isClaudeNonSubagentTask(entry)
5637+
? [entry]
5638+
: [],
56395639
);
5640-
const isProgress = message.type === "system" && message.subtype === "task_progress";
5641-
if (isProgress ? bufferedStarts.has(message.task_id) : bufferedStarts.size > 0) {
5642-
return null;
5643-
}
56445640
const parentToolUseId = parentToolUseIdFromSdkMessage(message);
56455641
const taskId =
56465642
message.type === "system" && message.subtype === "task_progress"
56475643
? message.task_id
56485644
: parentToolUseId === null
56495645
? undefined
56505646
: (yield* Ref.get(sessionSubagentTaskIdsByToolUseId)).get(parentToolUseId);
5647+
const returnedToolUseIds = new Set(
5648+
[
5649+
...claudeToolResultBlocksFromAssistantMessage(message),
5650+
...claudeToolResultBlocksFromUserMessage(message),
5651+
].map((toolResult) => toolResult.tool_use_id),
5652+
);
5653+
if (
5654+
bufferedStarts.some(
5655+
(start) =>
5656+
start.task_id === taskId ||
5657+
// Without the launching call's id, any frame may be its result.
5658+
(start.tool_use_id === undefined
5659+
? returnedToolUseIds.size > 0
5660+
: returnedToolUseIds.has(start.tool_use_id)),
5661+
)
5662+
) {
5663+
return null;
5664+
}
56515665
const subagent =
56525666
taskId === undefined
56535667
? undefined

0 commit comments

Comments
 (0)