The best way to control Claude Code, Codex and more from any computer or phone
fix(server): deliver child results to running Claude turns (#39528)
Shlok Sheth committed
Nov 19, 2026 at 22:15 UTC
be9176761ce2f6597013678b4538c772ae507400
2 files changed
+27
-27
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+1
-1
@@ -594,7 +594,7 @@ export const ClaudeProviderCapabilitiesV2 = {
594
supportsInterrupt: true,
595
supportsNativeResume: true,
596
supportsActiveSteering: true,
597
- activeSteeringInterruptsTools: true,
597
+ activeSteeringInterruptsTools: false,
598
supportsSteeringByInterruptRestart: false,
599
supportsQueuedMessages: true,
600
terminalStatusQuality: "strong",
apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts
+26
-26
@@ -402,10 +402,10 @@ it.effect.each(deliveries)(
402
assert.equal(steer.inputIntent, "promoted_queued_to_steer");
403
}
404
yield* worker.drain();
405
- const explicitSteer =
406
- delivery === "user steering" || delivery === "promoted queued message";
405
+ const queuesBehindActiveTurn = delivery === "scheduled message";
406
assert.equal(batchAbort.signal.aborted, false);
408
- assert.equal(offers.length, explicitSteer ? 2 : 1);
407
+ assert.lengthOf(offers, queuesBehindActiveTurn ? 1 : 2);
408
+ if (!queuesBehindActiveTurn) assert.equal(offers[1]?.priority, "next");
409
const finished = yield* watch(
410
(event) =>
411
event.type === "run.updated" &&
@@ -415,12 +415,17 @@ it.effect.each(deliveries)(
415
yield* Queue.offer(sdkMessages, toolResult("build", false));
416
for (const id of statusIds)
417
yield* Queue.offer(sdkMessages, toolResult(id, batchAbort.signal.aborted));
418
- yield* Queue.offer(sdkMessages, result("completed", false));
418
+ yield* Queue.offer(
419
+ sdkMessages,
420
+ delivery === "child completion"
421
+ ? frame({ ...result("completed", false), user_message_uuid: offers[1]!.uuid })
422
+ : result("completed", false),
423
+ );
424
yield* Fiber.join(finished);
425
yield* worker.drain();
426
yield* orchestrator.resumeQueuedRuns;
427
yield* worker.drain();
423
- if (!explicitSteer) {
428
+ if (queuesBehindActiveTurn) {
429
const queued = (yield* orchestrator.getThreadProjection(threadId)).runs[1]!;
430
const noticeFinished = yield* watch(
431
(event) =>
@@ -428,18 +433,9 @@ it.effect.each(deliveries)(
433
event.payload.id === queued.id &&
434
event.payload.status === "waiting",
435
);
431
- const delivered =
432
- delivery === "child completion"
433
- ? yield* watch(
434
- (event) =>
435
- event.type === "subagent.updated" &&
436
- event.payload.completionDelivery?.state === "delivered",
437
- )
438
- : null;
436
yield* Queue.offer(sdkMessages, result("notice-completed", false));
437
yield* Fiber.join(noticeFinished);
438
yield* worker.drain();
442
- if (delivered !== null) yield* Fiber.join(delivered);
439
}
440
const after = yield* orchestrator.getThreadProjection(threadId);
441
const reads = after.turnItems.filter((item) =>
@@ -451,19 +447,23 @@ it.effect.each(deliveries)(
447
assert.equal(read.toolNonExecutionKind, undefined);
448
assert.equal(read.type === "dynamic_tool" && read.output === refusal, false);
449
}
454
- assert.equal(offers.length, 2);
450
+ assert.lengthOf(offers, 2);
451
assert.equal(offers.filter((offer) => offer.priority === "now").length, 0);
456
- if (!explicitSteer) {
457
- assert.equal(after.runs.length, 2);
458
- if (delivery === "child completion") {
459
- assert.equal(after.messages.filter((message) => message.id === messageId).length, 1);
460
- assert.equal(after.subagents[0]?.completionDelivery?.state, "delivered");
461
- } else {
462
- assert.equal(
463
- after.messages.filter((message) => message.scheduledTaskId !== undefined).length,
464
- 1,
465
- );
466
- }
452
+ if (delivery === "child completion") {
453
+ assert.lengthOf(after.runs, 1);
454
+ assert.deepEqual(
455
+ after.messages
456
+ .filter((message) => message.id === messageId)
457
+ .map((message) => message.runId),
458
+ [parent.id],
459
+ );
460
+ assert.equal(after.subagents[0]?.completionDelivery?.state, "delivered");
461
+ } else if (queuesBehindActiveTurn) {
462
+ assert.lengthOf(after.runs, 2);
463
+ assert.equal(
464
+ after.messages.filter((message) => message.scheduledTaskId !== undefined).length,
465
+ 1,
466
+ );
467
}
468
yield* orchestrator.recoverDelegatedTasks;
469
yield* orchestrator.resumeQueuedRuns;