Skip to content

Commit 5af464a

Browse files
ahalekellyclaude
andcommitted
fix(server): keep each resumed Claude subagent run's result
A resumed subagent reused its first run's result message id, so the next run's report replaced the earlier one in the child thread. Each reopen now gets its own result item keyed on Claude's per-run run_id, which also covers self-resumes that reuse the launch's tool_use_id. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 74573fc commit 5af464a

2 files changed

Lines changed: 48 additions & 13 deletions

File tree

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

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16345,11 +16345,14 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1634516345
yield* startTurn(1, false);
1634616346
for (const frame of [
1634716347
roster([agentEntry("run-1")]),
16348-
makeSubagentTaskStartedFrame({
16349-
taskId: TASK_ID,
16350-
toolUseId: LAUNCH,
16351-
uuid: "00000000-0000-4000-8000-000000016101",
16352-
}),
16348+
{
16349+
...makeSubagentTaskStartedFrame({
16350+
taskId: TASK_ID,
16351+
toolUseId: LAUNCH,
16352+
uuid: "00000000-0000-4000-8000-000000016101",
16353+
}),
16354+
run_id: "run-1",
16355+
},
1635316356
makeResultFrame({ uuid: "00000000-0000-4000-8000-000000016102", result: "LAUNCHED" }),
1635416357
]) {
1635516358
yield* harness.offerAndWait(frame);
@@ -16401,11 +16404,14 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1640116404
}),
1640216405
roster([]),
1640316406
roster([agentEntry("run-2")]),
16404-
makeSubagentTaskStartedFrame({
16405-
taskId: TASK_ID,
16406-
toolUseId: LAUNCH,
16407-
uuid: "00000000-0000-4000-8000-000000016107",
16408-
}),
16407+
{
16408+
...makeSubagentTaskStartedFrame({
16409+
taskId: TASK_ID,
16410+
toolUseId: LAUNCH,
16411+
uuid: "00000000-0000-4000-8000-000000016107",
16412+
}),
16413+
run_id: "run-2",
16414+
},
1640916415
]) {
1641016416
yield* harness.offerAndWait(frame);
1641116417
}
@@ -16463,6 +16469,21 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1646316469
);
1646416470
yield* harness.until(() => subagentUpdates().at(-1)?.result === "DONE");
1646516471
assert.equal(subagentUpdates().at(-1)?.status, "completed");
16472+
yield* harness.until(() =>
16473+
harness.events.some(
16474+
(event) => event.type === "message.updated" && event.message.text === "DONE",
16475+
),
16476+
);
16477+
const childMessageTexts = new Map<string, string>();
16478+
for (const event of harness.events) {
16479+
if (event.type === "message.updated" && event.message.threadId === routing.childThreadId) {
16480+
childMessageTexts.set(event.message.id, event.message.text);
16481+
}
16482+
}
16483+
assert.deepEqual(
16484+
[...childMessageTexts.values()].filter((text) => text === "WAITING" || text === "DONE"),
16485+
["WAITING", "DONE"],
16486+
);
1646616487
}).pipe(
1646716488
Effect.provide(
1646816489
Layer.mergeAll(

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4813,6 +4813,8 @@ interface ActiveClaudeSubagent {
48134813
readonly runToolUseId: string | null;
48144814
readonly effort: string | undefined;
48154815
nextChildItemOrdinal: number;
4816+
// Keyed on Claude's per-run id so a resumed run's result never replaces an earlier one.
4817+
resultNativeItemId: string;
48164818
resultItemOrdinal: number | null;
48174819
lastAssistantText: string | null;
48184820
lastAssistantMessageId: string | null;
@@ -6891,6 +6893,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
68916893
runToolUseId: launchToolUseId,
68926894
effort: undefined,
68936895
nextChildItemOrdinal: 100,
6896+
resultNativeItemId: `task:${resume.taskId}:result`,
68946897
resultItemOrdinal: null,
68956898
lastAssistantText: null,
68966899
lastAssistantMessageId: null,
@@ -7372,6 +7375,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
73727375
"running" | "completed" | "failed" | "cancelled"
73737376
>;
73747377
readonly reopen?: boolean;
7378+
readonly nativeRunId?: string;
73757379
readonly nativeOutcome?: Extract<
73767380
SDKMessage,
73777381
{ readonly type: "system"; readonly subtype: "task_notification" }
@@ -7528,7 +7532,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
75287532
childThread: existingSubagent?.childThread ?? null,
75297533
effort,
75307534
nextChildItemOrdinal: existingSubagent?.nextChildItemOrdinal ?? 100,
7531-
resultItemOrdinal: existingSubagent?.resultItemOrdinal ?? null,
7535+
resultNativeItemId:
7536+
existingSubagent === undefined
7537+
? `${nativeItemId}:result`
7538+
: isReopen && input.nativeRunId !== undefined
7539+
? `${nativeItemId}:result:${input.nativeRunId}`
7540+
: existingSubagent.resultNativeItemId,
7541+
resultItemOrdinal: isReopen ? null : (existingSubagent?.resultItemOrdinal ?? null),
75327542
lastAssistantText:
75337543
input.reopen === true ? null : (existingSubagent?.lastAssistantText ?? null),
75347544
lastAssistantMessageId:
@@ -7739,11 +7749,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
77397749
input.status !== "running" &&
77407750
!resultAlreadyShown
77417751
) {
7742-
const resultNativeItemId = `${nativeItemId}:result`;
77437752
const resultItemOrdinal = subagent.resultItemOrdinal ?? ++subagent.nextChildItemOrdinal;
77447753
subagent.resultItemOrdinal = resultItemOrdinal;
77457754
yield* emitSubagentConversationMessage({
7746-
nativeItemId: resultNativeItemId,
7755+
nativeItemId: subagent.resultNativeItemId,
77477756
threadId: childThreadId,
77487757
rootNodeId: childRootNodeId,
77497758
role: "assistant",
@@ -9281,6 +9290,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
92819290
new Map(current).set(message.task_id, {
92829291
...registered,
92839292
confirmedOutcome: undefined,
9293+
...(message.run_id === undefined
9294+
? {}
9295+
: { resultNativeItemId: `task:${message.task_id}:result:${message.run_id}` }),
9296+
resultItemOrdinal: null,
92849297
task: {
92859298
...priorTask,
92869299
status: "running",
@@ -10689,6 +10702,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1068910702
title: message.description,
1069010703
status: "running",
1069110704
reopen: true,
10705+
...(message.run_id === undefined ? {} : { nativeRunId: message.run_id }),
1069210706
});
1069310707
yield* Ref.update(wakeBuffers, (current) => {
1069410708
const entry = current.get(liveQuery.nativeThreadId);

0 commit comments

Comments
 (0)