Skip to content

Commit 0f55d6b

Browse files
PR Batch Testerclaude
andcommitted
fix(server): steering no longer ends running subagents
A steer could end the thread's native subagents in two ways: - Claude: steers go in with priority "now", which cancels the root turn's running tool calls. A subagent launched in the foreground is one of them. The adapter now moves the root's running subagents to the background first, so the steer is answered and the subagent keeps going. - Codex (and OpenCode): a steer whose model selection differed from the running turn's in any way was turned into interrupt-and-restart, which interrupts every descendant subagent turn. A selection the provider applies on its next turn now joins the turn as a steer and waits for the next turn, as it already did for Claude. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 42160f2 commit 0f55d6b

6 files changed

Lines changed: 314 additions & 82 deletions

File tree

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

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,7 @@ describe("ClaudeAdapterV2 Auto-accept edits", () => {
10281028
offer: () => Effect.void,
10291029
setModel: () => Effect.void,
10301030
setPermissionMode: () => Effect.void,
1031+
backgroundTasks: () => Effect.succeed(false),
10311032
stopTask: () => Effect.void,
10321033
interrupt: Effect.void,
10331034
close: Effect.void,
@@ -1188,6 +1189,7 @@ const captureSdkExecutablePaths = Effect.fn("captureSdkExecutablePaths")(functio
11881189
offer: () => Effect.void,
11891190
setModel: () => Effect.void,
11901191
setPermissionMode: () => Effect.void,
1192+
backgroundTasks: () => Effect.succeed(false),
11911193
stopTask: () => Effect.void,
11921194
interrupt: Effect.void,
11931195
close: Effect.void,
@@ -1308,6 +1310,7 @@ describe("ClaudeAdapterV2 resume compaction", () => {
13081310
offer: () => Effect.void,
13091311
setModel: () => Effect.void,
13101312
setPermissionMode: () => Effect.void,
1313+
backgroundTasks: () => Effect.succeed(false),
13111314
stopTask: () => Effect.void,
13121315
interrupt: Effect.void,
13131316
close: Effect.void,
@@ -1534,6 +1537,7 @@ describe("ClaudeAdapterV2 attachments", () => {
15341537
}),
15351538
setModel: () => Effect.void,
15361539
setPermissionMode: () => Effect.void,
1540+
backgroundTasks: () => Effect.succeed(false),
15371541
stopTask: () => Effect.void,
15381542
interrupt: Effect.void,
15391543
close: Effect.void,
@@ -1679,6 +1683,7 @@ describe("ClaudeAdapterV2 attachments", () => {
16791683
offer: () => Effect.void,
16801684
setModel: () => Effect.void,
16811685
setPermissionMode: () => Effect.void,
1686+
backgroundTasks: () => Effect.succeed(false),
16821687
stopTask: () => Effect.void,
16831688
interrupt: Effect.void,
16841689
close: Effect.void,
@@ -1774,6 +1779,7 @@ describe("ClaudeAdapterV2 native fork", () => {
17741779
offer: () => Effect.void,
17751780
setModel: () => Effect.void,
17761781
setPermissionMode: () => Effect.void,
1782+
backgroundTasks: () => Effect.succeed(false),
17771783
stopTask: () => Effect.void,
17781784
interrupt: Effect.void,
17791785
close: Effect.void,
@@ -2066,6 +2072,7 @@ describe("ClaudeAdapterV2 native session identity", () => {
20662072
offer: () => Effect.void,
20672073
setModel: () => Effect.void,
20682074
setPermissionMode: () => Effect.void,
2075+
backgroundTasks: () => Effect.succeed(false),
20692076
stopTask: () => Effect.void,
20702077
interrupt: Effect.void,
20712078
close: Effect.void,
@@ -2321,6 +2328,9 @@ describe("ClaudeAdapterV2 background wake turns", () => {
23212328
readonly stopTask?: (
23222329
taskId: string,
23232330
) => Effect.Effect<void, ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError>;
2331+
readonly backgroundTasks?: (
2332+
toolUseId: string,
2333+
) => Effect.Effect<boolean, ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError>;
23242334
readonly environment?: NodeJS.ProcessEnv;
23252335
readonly subagentLaunchToolUseId?: string;
23262336
readonly nativeSessionId?: string;
@@ -2398,6 +2408,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
23982408
}),
23992409
setModel: () => Effect.void,
24002410
setPermissionMode: () => Effect.void,
2411+
backgroundTasks: options?.backgroundTasks ?? (() => Effect.succeed(false)),
24012412
stopTask: options?.stopTask ?? (() => Effect.void),
24022413
interrupt: Effect.void,
24032414
close: Queue.shutdown(processMessages),
@@ -2431,6 +2442,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
24312442
Effect.sync(() => {
24322443
permissionModeChanges.push(mode);
24332444
}),
2445+
backgroundTasks: options?.backgroundTasks ?? (() => Effect.succeed(false)),
24342446
stopTask: options?.stopTask ?? (() => Effect.void),
24352447
interrupt: options?.interrupt ?? Effect.void,
24362448
close: options?.close?.(sdkMessages) ?? Effect.void,
@@ -4869,6 +4881,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
48694881
offer: () => Effect.void,
48704882
setModel: () => Effect.void,
48714883
setPermissionMode: () => Effect.void,
4884+
backgroundTasks: () => Effect.succeed(false),
48724885
stopTask: () => Effect.void,
48734886
interrupt: Effect.void,
48744887
// The first CLI process keeps streaming until the test ends
@@ -5129,6 +5142,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
51295142
offer: () => Effect.void,
51305143
setModel: () => Effect.void,
51315144
setPermissionMode: () => Effect.void,
5145+
backgroundTasks: () => Effect.succeed(false),
51325146
stopTask: () => Effect.void,
51335147
interrupt: Effect.void,
51345148
close: Queue.shutdown(queue),
@@ -10220,6 +10234,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1022010234
offer: () => Effect.void,
1022110235
setModel: () => Effect.void,
1022210236
setPermissionMode: () => Effect.void,
10237+
backgroundTasks: () => Effect.succeed(false),
1022310238
stopTask: () => Effect.void,
1022410239
interrupt: Effect.void,
1022510240
// End this process stream so openQuery can replace it.
@@ -10410,6 +10425,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1041010425
offer: () => Effect.void,
1041110426
setModel: () => Effect.void,
1041210427
setPermissionMode: () => Effect.void,
10428+
backgroundTasks: () => Effect.succeed(false),
1041310429
stopTask: () => Effect.void,
1041410430
interrupt: Effect.void,
1041510431
close: Queue.shutdown(sdkMessages),
@@ -10652,6 +10668,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1065210668
offer: () => Effect.void,
1065310669
setModel: () => Effect.void,
1065410670
setPermissionMode: () => Effect.void,
10671+
backgroundTasks: () => Effect.succeed(false),
1065510672
stopTask: () => Effect.void,
1065610673
interrupt: Effect.void,
1065710674
close: Queue.shutdown(sdkMessages),
@@ -10853,6 +10870,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1085310870
offer: () => Effect.void,
1085410871
setModel: () => Effect.void,
1085510872
setPermissionMode: () => Effect.void,
10873+
backgroundTasks: () => Effect.succeed(false),
1085610874
stopTask: () => Effect.void,
1085710875
interrupt: Effect.void,
1085810876
close: Queue.shutdown(sdkMessages),
@@ -11036,6 +11054,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1103611054
offer: () => Effect.void,
1103711055
setModel: () => Effect.void,
1103811056
setPermissionMode: () => Effect.void,
11057+
backgroundTasks: () => Effect.succeed(false),
1103911058
stopTask: () => Effect.void,
1104011059
interrupt: Effect.void,
1104111060
close: Queue.shutdown(sdkMessages),
@@ -11175,6 +11194,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1117511194
offer: () => Effect.void,
1117611195
setModel: () => Effect.void,
1117711196
setPermissionMode: () => Effect.void,
11197+
backgroundTasks: () => Effect.succeed(false),
1117811198
stopTask: () => Effect.void,
1117911199
interrupt: Effect.void,
1118011200
close: Queue.shutdown(sdkMessages),
@@ -13776,6 +13796,153 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1377613796
),
1377713797
);
1377813798

13799+
it.effect.each([{ backgroundingFails: false }, { backgroundingFails: true }])(
13800+
"moves the root's foreground subagents to the background before a steer (fails=$backgroundingFails)",
13801+
({ backgroundingFails }) =>
13802+
Effect.scoped(
13803+
Effect.gen(function* () {
13804+
const FOREGROUND_TOOL_USE_ID = "toolu-steer-foreground";
13805+
const NESTED_TOOL_USE_ID = "toolu-steer-nested";
13806+
const FINISHED_TOOL_USE_ID = "toolu-steer-finished";
13807+
const calls: Array<string> = [];
13808+
const harness = yield* makeWakeHarnessWithOptions({
13809+
backgroundTasks: (toolUseId) =>
13810+
Effect.sync(() => calls.push(toolUseId)).pipe(
13811+
Effect.andThen(
13812+
backgroundingFails
13813+
? Effect.fail(
13814+
new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
13815+
method: "backgroundTasks",
13816+
cause: new Error("Background tasks are disabled in this session."),
13817+
}),
13818+
)
13819+
: Effect.succeed(true),
13820+
),
13821+
),
13822+
});
13823+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
13824+
const attemptId = RunAttemptId.make("attempt-steer-foreground-subagent");
13825+
const input = makeClaudeTestTurnInput({
13826+
threadId: harness.threadId,
13827+
providerThread: harness.providerThread,
13828+
now: yield* DateTime.now,
13829+
attemptId,
13830+
text: "Audit the repo with a subagent.",
13831+
attachments: [],
13832+
});
13833+
yield* harness.runtime.startTurn(input);
13834+
const foregroundTaskStarted = (task: {
13835+
readonly taskId: string;
13836+
readonly toolUseId: string;
13837+
readonly uuid: string;
13838+
}) =>
13839+
claudeSdkFrame({
13840+
type: "system",
13841+
subtype: "task_started",
13842+
task_id: task.taskId,
13843+
tool_use_id: task.toolUseId,
13844+
description: task.taskId,
13845+
subagent_type: "general-purpose",
13846+
is_backgrounded: false,
13847+
task_type: "local_agent",
13848+
prompt: "Audit.",
13849+
uuid: task.uuid,
13850+
session_id: WAKE_NATIVE_SESSION,
13851+
});
13852+
for (const frame of [
13853+
foregroundTaskStarted({
13854+
taskId: "task-steer-finished",
13855+
toolUseId: FINISHED_TOOL_USE_ID,
13856+
uuid: "00000000-0000-4000-8000-000000000a01",
13857+
}),
13858+
makeSubagentNotificationFrame({
13859+
taskId: "task-steer-finished",
13860+
toolUseId: FINISHED_TOOL_USE_ID,
13861+
summary: "Finished before the steer.",
13862+
uuid: "00000000-0000-4000-8000-000000000a02",
13863+
}),
13864+
foregroundTaskStarted({
13865+
taskId: "task-steer-foreground",
13866+
toolUseId: FOREGROUND_TOOL_USE_ID,
13867+
uuid: "00000000-0000-4000-8000-000000000a03",
13868+
}),
13869+
claudeSdkFrame({
13870+
type: "assistant",
13871+
message: {
13872+
model: "claude-sonnet-4-6",
13873+
id: "msg_steer_nested_launch",
13874+
type: "message",
13875+
role: "assistant",
13876+
content: [
13877+
{
13878+
type: "tool_use",
13879+
id: NESTED_TOOL_USE_ID,
13880+
name: "Agent",
13881+
input: { description: "Nested check", prompt: "Check." },
13882+
},
13883+
],
13884+
},
13885+
parent_tool_use_id: FOREGROUND_TOOL_USE_ID,
13886+
uuid: "00000000-0000-4000-8000-000000000a04",
13887+
session_id: WAKE_NATIVE_SESSION,
13888+
}),
13889+
foregroundTaskStarted({
13890+
taskId: "task-steer-nested",
13891+
toolUseId: NESTED_TOOL_USE_ID,
13892+
uuid: "00000000-0000-4000-8000-000000000a05",
13893+
}),
13894+
]) {
13895+
yield* Queue.offer(harness.sdkMessages, frame);
13896+
}
13897+
const latestSubagent = (taskId: string) =>
13898+
harness.events
13899+
.flatMap((event) =>
13900+
event.type === "subagent.updated" &&
13901+
event.subagent.nativeTaskRef?.nativeId === taskId
13902+
? [event.subagent]
13903+
: [],
13904+
)
13905+
.at(-1);
13906+
yield* awaitUntil(
13907+
() =>
13908+
latestSubagent("task-steer-nested")?.status === "running" &&
13909+
latestSubagent("task-steer-foreground")?.status === "running" &&
13910+
latestSubagent("task-steer-finished")?.status === "completed",
13911+
"subagents registered",
13912+
);
13913+
13914+
const offered = harness.offeredMessages.length;
13915+
yield* harness.runtime.steerTurn({
13916+
threadId: harness.threadId,
13917+
runId: input.runId,
13918+
providerThread: harness.providerThread,
13919+
providerTurnId: idAllocator.derive.providerTurn({
13920+
driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
13921+
nativeTurnId: `turn:${attemptId}`,
13922+
}),
13923+
message: {
13924+
createdBy: "user",
13925+
creationSource: "web",
13926+
messageId: MessageId.make("message-steer-foreground-subagent"),
13927+
text: "Also check the docs.",
13928+
attachments: [],
13929+
},
13930+
});
13931+
13932+
// Only the root's running subagent moves: the nested one follows its
13933+
// owner and the finished one has nothing left to move. A refused move
13934+
// still lets the steer through.
13935+
assert.deepEqual(calls, [FOREGROUND_TOOL_USE_ID]);
13936+
assert.equal(harness.offeredMessages.length, offered + 1);
13937+
assert.equal(harness.offeredMessages.at(-1)?.priority, "now");
13938+
}).pipe(
13939+
Effect.provide(
13940+
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13941+
),
13942+
),
13943+
),
13944+
);
13945+
1377913946
describe("native goals", () => {
1378013947
const syntheticFrame = (uuid: string, text: string) =>
1378113948
claudeSdkFrame({

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ interface ClaudeSubagentFoundFrame {
243243

244244
type ClaudeOutboundFrame =
245245
| { readonly type: "query.stop_task"; readonly taskId: string }
246+
| { readonly type: "query.background_tasks"; readonly toolUseId: string }
246247
| ClaudeQueryOpenFrame
247248
| ClaudePromptOfferFrame
248249
| ClaudeQuerySetModelFrame
@@ -830,6 +831,10 @@ function makeReplayQueryRunner(
830831
replayEffect(() => {
831832
assertNextOutboundFrame({ type: "query.stop_task", taskId });
832833
}),
834+
backgroundTasks: (toolUseId) =>
835+
replayEffect(() => {
836+
assertNextOutboundFrame({ type: "query.background_tasks", toolUseId });
837+
}).pipe(Effect.as(true)),
833838
interrupt: replayEffect(() => {
834839
assertNextOutboundFrame({ type: "query.interrupt" });
835840
}),

0 commit comments

Comments
 (0)