The best way to control Claude Code, Codex and more from any computer or phone
fix(server): a resumed Claude subagent keeps its earlier result (#34663)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
ahalekelly committed
Nov 18, 2026 at 01:08 UTC
316c3256a3a09cef7ed68914ebe74c7183ac08e1
2 files changed
+48
-13
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+31
-10
@@ -18427,11 +18427,14 @@ describe("ClaudeAdapterV2 background wake turns", () => {
18427
yield* startTurn(1, false);
18428
for (const frame of [
18429
roster([agentEntry("run-1")]),
18430
- makeSubagentTaskStartedFrame({
18431
- taskId: TASK_ID,
18432
- toolUseId: LAUNCH,
18433
- uuid: "00000000-0000-4000-8000-000000016101",
18434
- }),
18430
+ {
18431
+ ...makeSubagentTaskStartedFrame({
18432
+ taskId: TASK_ID,
18433
+ toolUseId: LAUNCH,
18434
+ uuid: "00000000-0000-4000-8000-000000016101",
18435
+ }),
18436
+ run_id: "run-1",
18437
+ },
18438
makeResultFrame({ uuid: "00000000-0000-4000-8000-000000016102", result: "LAUNCHED" }),
18439
]) {
18440
yield* harness.offerAndWait(frame);
@@ -18483,11 +18486,14 @@ describe("ClaudeAdapterV2 background wake turns", () => {
18486
}),
18487
roster([]),
18488
roster([agentEntry("run-2")]),
18486
- makeSubagentTaskStartedFrame({
18487
- taskId: TASK_ID,
18488
- toolUseId: LAUNCH,
18489
- uuid: "00000000-0000-4000-8000-000000016107",
18490
- }),
18489
+ {
18490
+ ...makeSubagentTaskStartedFrame({
18491
+ taskId: TASK_ID,
18492
+ toolUseId: LAUNCH,
18493
+ uuid: "00000000-0000-4000-8000-000000016107",
18494
+ }),
18495
+ run_id: "run-2",
18496
+ },
18497
]) {
18498
yield* harness.offerAndWait(frame);
18499
}
@@ -18545,6 +18551,21 @@ describe("ClaudeAdapterV2 background wake turns", () => {
18551
);
18552
yield* harness.until(() => subagentUpdates().at(-1)?.result === "DONE");
18553
assert.equal(subagentUpdates().at(-1)?.status, "completed");
18554
+ yield* harness.until(() =>
18555
+ harness.events.some(
18556
+ (event) => event.type === "message.updated" && event.message.text === "DONE",
18557
+ ),
18558
+ );
18559
+ const childMessageTexts = new Map<string, string>();
18560
+ for (const event of harness.events) {
18561
+ if (event.type === "message.updated" && event.message.threadId === routing.childThreadId) {
18562
+ childMessageTexts.set(event.message.id, event.message.text);
18563
+ }
18564
+ }
18565
+ assert.deepEqual(
18566
+ [...childMessageTexts.values()].filter((text) => text === "WAITING" || text === "DONE"),
18567
+ ["WAITING", "DONE"],
18568
+ );
18569
}).pipe(
18570
Effect.provide(
18571
Layer.mergeAll(
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+17
-3
@@ -5119,6 +5119,8 @@ interface ActiveClaudeSubagent {
5119
readonly runToolUseId: string | null;
5120
readonly effort: string | undefined;
5121
nextChildItemOrdinal: number;
5122
+ // Keyed on Claude's per-run id so a resumed run's result never replaces an earlier one.
5123
+ resultNativeItemId: string;
5124
resultItemOrdinal: number | null;
5125
lastAssistantText: string | null;
5126
lastAssistantMessageId: string | null;
@@ -7374,6 +7376,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
7376
runToolUseId: launchToolUseId,
7377
effort: undefined,
7378
nextChildItemOrdinal: 100,
7379
+ resultNativeItemId: `task:${resume.taskId}:result`,
7380
resultItemOrdinal: null,
7381
lastAssistantText: null,
7382
lastAssistantMessageId: null,
@@ -7919,6 +7922,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
7922
"running" | "completed" | "failed" | "cancelled"
7923
>;
7924
readonly reopen?: boolean;
7925
+ readonly nativeRunId?: string;
7926
readonly nativeOutcome?: Extract<
7927
SDKMessage,
7928
{ readonly type: "system"; readonly subtype: "task_notification" }
@@ -8090,7 +8094,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
8094
childThread: existingSubagent?.childThread ?? null,
8095
effort,
8096
nextChildItemOrdinal: existingSubagent?.nextChildItemOrdinal ?? 100,
8093
- resultItemOrdinal: existingSubagent?.resultItemOrdinal ?? null,
8097
+ resultNativeItemId:
8098
+ existingSubagent === undefined
8099
+ ? `${nativeItemId}:result`
8100
+ : isReopen && input.nativeRunId !== undefined
8101
+ ? `${nativeItemId}:result:${input.nativeRunId}`
8102
+ : existingSubagent.resultNativeItemId,
8103
+ resultItemOrdinal: isReopen ? null : (existingSubagent?.resultItemOrdinal ?? null),
8104
lastAssistantText:
8105
input.reopen === true ? null : (existingSubagent?.lastAssistantText ?? null),
8106
lastAssistantMessageId:
@@ -8301,11 +8311,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
8311
input.status !== "running" &&
8312
!resultAlreadyShown
8313
) {
8304
- const resultNativeItemId = `${nativeItemId}:result`;
8314
const resultItemOrdinal = subagent.resultItemOrdinal ?? ++subagent.nextChildItemOrdinal;
8315
subagent.resultItemOrdinal = resultItemOrdinal;
8316
yield* emitSubagentConversationMessage({
8308
- nativeItemId: resultNativeItemId,
8317
+ nativeItemId: subagent.resultNativeItemId,
8318
threadId: childThreadId,
8319
rootNodeId: childRootNodeId,
8320
role: "assistant",
@@ -9873,6 +9882,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
9882
new Map(current).set(message.task_id, {
9883
...registered,
9884
confirmedOutcome: undefined,
9885
+ ...(message.run_id === undefined
9886
+ ? {}
9887
+ : { resultNativeItemId: `task:${message.task_id}:result:${message.run_id}` }),
9888
+ resultItemOrdinal: null,
9889
task: {
9890
...priorTask,
9891
status: "running",
@@ -11354,6 +11367,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
11367
title: message.description,
11368
status: "running",
11369
reopen: true,
11370
+ ...(message.run_id === undefined ? {} : { nativeRunId: message.run_id }),
11371
});
11372
yield* Ref.update(wakeBuffers, (current) => {
11373
const entry = current.get(liveQuery.nativeThreadId);