Skip to content

Commit 2283284

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 second run's report replaced the first in the child thread. Each reopen now gets its own result item keyed by the resume's tool use id. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent cd8fc91 commit 2283284

2 files changed

Lines changed: 29 additions & 3 deletions

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17764,6 +17764,18 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1776417764
);
1776517765
assert.lengthOf(resumedWorkIndexes, 1);
1776617766
assert.isAbove(resumedWorkIndexes[0] ?? -1, reopenIndex);
17767+
const latestMessageTexts = new Map<string, string>();
17768+
for (const event of harness.events) {
17769+
if (event.type === "message.updated") {
17770+
latestMessageTexts.set(event.message.id, event.message.text);
17771+
}
17772+
}
17773+
assert.deepEqual(
17774+
[...latestMessageTexts.values()].filter(
17775+
(text) => text === FIRST_SUMMARY || text === SECOND_SUMMARY,
17776+
),
17777+
[FIRST_SUMMARY, SECOND_SUMMARY],
17778+
);
1776717779
assert.isFalse(yield* harness.hasPendingBackgroundWork);
1776817780
}).pipe(
1776917781
Effect.provide(

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4639,6 +4639,8 @@ interface ActiveClaudeSubagent {
46394639
readonly runToolUseId: string | null;
46404640
readonly effort: string | undefined;
46414641
nextChildItemOrdinal: number;
4642+
// Each run's result is its own child message, so a resume never overwrites the earlier answer.
4643+
resultNativeItemId: string;
46424644
resultItemOrdinal: number | null;
46434645
lastAssistantText: string | null;
46444646
lastAssistantMessageId: string | null;
@@ -6591,6 +6593,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
65916593
runToolUseId: launchToolUseId,
65926594
effort: undefined,
65936595
nextChildItemOrdinal: 100,
6596+
resultNativeItemId: `task:${resume.taskId}:result`,
65946597
resultItemOrdinal: null,
65956598
lastAssistantText: null,
65966599
lastAssistantMessageId: null,
@@ -7228,7 +7231,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
72287231
childThread: existingSubagent?.childThread ?? null,
72297232
effort,
72307233
nextChildItemOrdinal: existingSubagent?.nextChildItemOrdinal ?? 100,
7231-
resultItemOrdinal: existingSubagent?.resultItemOrdinal ?? null,
7234+
resultNativeItemId:
7235+
existingSubagent === undefined
7236+
? `${nativeItemId}:result`
7237+
: isReopen && input.toolUseId !== undefined
7238+
? `${nativeItemId}:result:${input.toolUseId}`
7239+
: existingSubagent.resultNativeItemId,
7240+
resultItemOrdinal: isReopen ? null : (existingSubagent?.resultItemOrdinal ?? null),
72327241
lastAssistantText:
72337242
input.reopen === true ? null : (existingSubagent?.lastAssistantText ?? null),
72347243
lastAssistantMessageId:
@@ -7439,11 +7448,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
74397448
input.status !== "running" &&
74407449
!resultAlreadyShown
74417450
) {
7442-
const resultNativeItemId = `${nativeItemId}:result`;
74437451
const resultItemOrdinal = subagent.resultItemOrdinal ?? ++subagent.nextChildItemOrdinal;
74447452
subagent.resultItemOrdinal = resultItemOrdinal;
74457453
yield* emitSubagentConversationMessage({
7446-
nativeItemId: resultNativeItemId,
7454+
nativeItemId: subagent.resultNativeItemId,
74477455
threadId: childThreadId,
74487456
rootNodeId: childRootNodeId,
74497457
role: "assistant",
@@ -8934,6 +8942,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
89348942
return new Map(current).set(message.task_id, {
89358943
...registered,
89368944
confirmedOutcome: undefined,
8945+
...(message.tool_use_id === undefined
8946+
? {}
8947+
: {
8948+
resultNativeItemId: `task:${message.task_id}:result:${message.tool_use_id}`,
8949+
}),
8950+
resultItemOrdinal: null,
89378951
task: {
89388952
...priorTask,
89398953
status: "running",

0 commit comments

Comments
 (0)