Skip to content

Commit 74af644

Browse files
PR Batch Testerclaude
andcommitted
fix(claude): Steer reaches Claude at once while a command runs, without killing it
A steer sent while Claude ran a command waited until the command returned. Now the steer moves root-thread commands to the background, like Ctrl+B in Claude Code, so Claude reads the steer right away and the command keeps running. A command too new to move (its task registers about three seconds in) moves once its task starts, until a result shows Claude read the steer. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 5753207 commit 74af644

5 files changed

Lines changed: 232 additions & 1 deletion

File tree

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

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,7 @@ describe("ClaudeAdapterV2 Auto-accept edits", () => {
10281028
setModel: () => Effect.void,
10291029
setPermissionMode: () => Effect.void,
10301030
stopTask: () => Effect.void,
1031+
backgroundTasks: () => Effect.succeed(false),
10311032
interrupt: Effect.void,
10321033
close: Effect.void,
10331034
};
@@ -1188,6 +1189,7 @@ const captureSdkExecutablePaths = Effect.fn("captureSdkExecutablePaths")(functio
11881189
setModel: () => Effect.void,
11891190
setPermissionMode: () => Effect.void,
11901191
stopTask: () => Effect.void,
1192+
backgroundTasks: () => Effect.succeed(false),
11911193
interrupt: Effect.void,
11921194
close: Effect.void,
11931195
};
@@ -1308,6 +1310,7 @@ describe("ClaudeAdapterV2 resume compaction", () => {
13081310
setModel: () => Effect.void,
13091311
setPermissionMode: () => Effect.void,
13101312
stopTask: () => Effect.void,
1313+
backgroundTasks: () => Effect.succeed(false),
13111314
interrupt: Effect.void,
13121315
close: Effect.void,
13131316
};
@@ -1534,6 +1537,7 @@ describe("ClaudeAdapterV2 attachments", () => {
15341537
setModel: () => Effect.void,
15351538
setPermissionMode: () => Effect.void,
15361539
stopTask: () => Effect.void,
1540+
backgroundTasks: () => Effect.succeed(false),
15371541
interrupt: Effect.void,
15381542
close: Effect.void,
15391543
}),
@@ -1679,6 +1683,7 @@ describe("ClaudeAdapterV2 attachments", () => {
16791683
setModel: () => Effect.void,
16801684
setPermissionMode: () => Effect.void,
16811685
stopTask: () => Effect.void,
1686+
backgroundTasks: () => Effect.succeed(false),
16821687
interrupt: Effect.void,
16831688
close: Effect.void,
16841689
};
@@ -1774,6 +1779,7 @@ describe("ClaudeAdapterV2 native fork", () => {
17741779
setModel: () => Effect.void,
17751780
setPermissionMode: () => Effect.void,
17761781
stopTask: () => Effect.void,
1782+
backgroundTasks: () => Effect.succeed(false),
17771783
interrupt: Effect.void,
17781784
close: Effect.void,
17791785
};
@@ -2066,6 +2072,7 @@ describe("ClaudeAdapterV2 native session identity", () => {
20662072
setModel: () => Effect.void,
20672073
setPermissionMode: () => Effect.void,
20682074
stopTask: () => Effect.void,
2075+
backgroundTasks: () => Effect.succeed(false),
20692076
interrupt: Effect.void,
20702077
close: Effect.void,
20712078
};
@@ -2318,6 +2325,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
23182325
readonly close?: (sdkMessages: Queue.Queue<SDKMessage>) => Effect.Effect<void>;
23192326
readonly interrupt?: Effect.Effect<void>;
23202327
readonly stopTask?: (taskId: string) => Effect.Effect<void>;
2328+
readonly backgroundTasks?: (toolUseId: string) => Effect.Effect<boolean>;
23212329
readonly environment?: NodeJS.ProcessEnv;
23222330
readonly subagentLaunchToolUseId?: string;
23232331
readonly nativeSessionId?: string;
@@ -2396,6 +2404,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
23962404
setModel: () => Effect.void,
23972405
setPermissionMode: () => Effect.void,
23982406
stopTask: options?.stopTask ?? (() => Effect.void),
2407+
backgroundTasks: options?.backgroundTasks ?? (() => Effect.succeed(false)),
23992408
interrupt: Effect.void,
24002409
close: Queue.shutdown(processMessages),
24012410
};
@@ -2429,6 +2438,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
24292438
permissionModeChanges.push(mode);
24302439
}),
24312440
stopTask: options?.stopTask ?? (() => Effect.void),
2441+
backgroundTasks: options?.backgroundTasks ?? (() => Effect.succeed(false)),
24322442
interrupt: options?.interrupt ?? Effect.void,
24332443
close: options?.close?.(sdkMessages) ?? Effect.void,
24342444
};
@@ -3027,6 +3037,140 @@ describe("ClaudeAdapterV2 background wake turns", () => {
30273037
),
30283038
);
30293039

3040+
it.effect.each([true, false])(
3041+
"a steer moves running root commands to the background, registered at steer %s",
3042+
(registered) =>
3043+
Effect.scoped(
3044+
Effect.gen(function* () {
3045+
// The CLI registers a foreground command's task about three seconds
3046+
// in; before that, backgroundTasks matches nothing.
3047+
const backgrounded = yield* Queue.unbounded<string>();
3048+
const registeredTasks = new Set<string>(registered ? ["toolu-running"] : []);
3049+
const harness = yield* makeWakeHarnessWithOptions({
3050+
backgroundTasks: (toolUseId) =>
3051+
Queue.offer(backgrounded, toolUseId).pipe(Effect.as(registeredTasks.has(toolUseId))),
3052+
});
3053+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
3054+
const attemptId = RunAttemptId.make("attempt-steer-background");
3055+
const input = makeClaudeTestTurnInput({
3056+
threadId: harness.threadId,
3057+
providerThread: harness.providerThread,
3058+
now: yield* DateTime.now,
3059+
attemptId,
3060+
text: "Run the slow suite.",
3061+
attachments: [],
3062+
});
3063+
yield* harness.runtime.startTurn(input);
3064+
const toolUse = (uuid: string, id: string) =>
3065+
claudeSdkFrame({
3066+
type: "assistant",
3067+
uuid,
3068+
session_id: WAKE_NATIVE_SESSION,
3069+
parent_tool_use_id: null,
3070+
message: {
3071+
id: `message-${id}`,
3072+
model: "claude-sonnet-5-5",
3073+
content: [{ type: "tool_use", id, name: "Bash", input: { command: "vp test" } }],
3074+
},
3075+
});
3076+
const taskStarted = (uuid: string, toolUseId: string) =>
3077+
claudeSdkFrame({
3078+
type: "system",
3079+
subtype: "task_started",
3080+
task_id: `task-${toolUseId}`,
3081+
tool_use_id: toolUseId,
3082+
description: "Run the suite",
3083+
is_backgrounded: false,
3084+
task_type: "local_bash",
3085+
uuid,
3086+
session_id: WAKE_NATIVE_SESSION,
3087+
});
3088+
yield* harness.offerAndWait(
3089+
toolUse("00000000-0000-4000-8000-000000000911", "toolu-running"),
3090+
);
3091+
3092+
yield* harness.runtime.steerTurn({
3093+
threadId: harness.threadId,
3094+
runId: input.runId,
3095+
providerThread: harness.providerThread,
3096+
providerTurnId: idAllocator.derive.providerTurn({
3097+
driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
3098+
nativeTurnId: `turn:${attemptId}`,
3099+
}),
3100+
message: {
3101+
createdBy: "user",
3102+
creationSource: "web",
3103+
messageId: MessageId.make("message-steer-background"),
3104+
text: "Skip the e2e tests.",
3105+
attachments: [],
3106+
},
3107+
});
3108+
// Offered first, so the steer is queued when the tool call returns.
3109+
assert.equal(harness.offeredMessages[1]?.priority, "now");
3110+
assert.equal(yield* Queue.take(backgrounded), "toolu-running");
3111+
if (!registered) {
3112+
registeredTasks.add("toolu-running");
3113+
yield* harness.offerAndWait(
3114+
taskStarted("00000000-0000-4000-8000-000000000912", "toolu-running"),
3115+
);
3116+
assert.equal(yield* Queue.take(backgrounded), "toolu-running");
3117+
}
3118+
3119+
yield* Queue.offer(
3120+
harness.sdkMessages,
3121+
claudeSdkFrame({
3122+
type: "user",
3123+
uuid: "00000000-0000-4000-8000-000000000913",
3124+
session_id: WAKE_NATIVE_SESSION,
3125+
parent_tool_use_id: null,
3126+
message: {
3127+
role: "user",
3128+
content: [
3129+
{
3130+
type: "tool_result",
3131+
tool_use_id: "toolu-running",
3132+
content:
3133+
"Command was manually backgrounded by user with ID: task-toolu-running.",
3134+
},
3135+
],
3136+
},
3137+
}),
3138+
);
3139+
yield* Queue.offer(
3140+
harness.sdkMessages,
3141+
makeResultFrame({
3142+
uuid: "00000000-0000-4000-8000-000000000914",
3143+
result: "",
3144+
terminalReason: "aborted_tools",
3145+
}),
3146+
);
3147+
// Claude has read the steer: its own later commands keep running.
3148+
yield* harness.offerAndWait(
3149+
toolUse("00000000-0000-4000-8000-000000000915", "toolu-later"),
3150+
);
3151+
yield* harness.offerAndWait(
3152+
taskStarted("00000000-0000-4000-8000-000000000916", "toolu-later"),
3153+
);
3154+
assert.isTrue(Option.isNone(yield* Queue.poll(backgrounded)));
3155+
3156+
yield* Queue.offer(
3157+
harness.sdkMessages,
3158+
makeResultFrame({
3159+
uuid: "00000000-0000-4000-8000-000000000917",
3160+
result: "Skipped the e2e tests.",
3161+
}),
3162+
);
3163+
const terminal = yield* Queue.take(harness.terminalReceipts);
3164+
assert.equal(terminal.status, "completed");
3165+
assert.lengthOf(harness.terminalEvents(), 1);
3166+
}).pipe(
3167+
Effect.provide(
3168+
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3169+
),
3170+
),
3171+
),
3172+
);
3173+
30303174
it.effect("announces usage-limit pauses once per window and again on a new turn", () =>
30313175
Effect.gen(function* () {
30323176
const harness = yield* makeWakeHarness;
@@ -4871,6 +5015,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
48715015
setModel: () => Effect.void,
48725016
setPermissionMode: () => Effect.void,
48735017
stopTask: () => Effect.void,
5018+
backgroundTasks: () => Effect.succeed(false),
48745019
interrupt: Effect.void,
48755020
// The first CLI process keeps streaming until the test ends
48765021
// it, so Stop stays parked waiting for it to exit.
@@ -5131,6 +5276,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
51315276
setModel: () => Effect.void,
51325277
setPermissionMode: () => Effect.void,
51335278
stopTask: () => Effect.void,
5279+
backgroundTasks: () => Effect.succeed(false),
51345280
interrupt: Effect.void,
51355281
close: Queue.shutdown(queue),
51365282
};
@@ -6711,6 +6857,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
67116857
close: (sdkMessages) =>
67126858
Deferred.await(closeGate).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
67136859
stopTask: () => Effect.void,
6860+
backgroundTasks: () => Effect.succeed(false),
67146861
interrupt: Deferred.succeed(interruptStarted, undefined),
67156862
});
67166863
const idAllocator = yield* IdAllocator.IdAllocatorV2;
@@ -6773,6 +6920,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
67736920
close: (sdkMessages) =>
67746921
Deferred.await(closeGate).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
67756922
stopTask: () => Effect.void,
6923+
backgroundTasks: () => Effect.succeed(false),
67766924
interrupt: Deferred.succeed(interruptStarted, undefined),
67776925
});
67786926
const idAllocator = yield* IdAllocator.IdAllocatorV2;
@@ -9858,6 +10006,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
985810006
setModel: () => Effect.void,
985910007
setPermissionMode: () => Effect.void,
986010008
stopTask: () => Effect.void,
10009+
backgroundTasks: () => Effect.succeed(false),
986110010
interrupt: Effect.void,
986210011
// End this process stream so openQuery can replace it.
986310012
close: Queue.shutdown(sdkMessages),
@@ -10048,6 +10197,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1004810197
setModel: () => Effect.void,
1004910198
setPermissionMode: () => Effect.void,
1005010199
stopTask: () => Effect.void,
10200+
backgroundTasks: () => Effect.succeed(false),
1005110201
interrupt: Effect.void,
1005210202
close: Queue.shutdown(sdkMessages),
1005310203
};
@@ -10290,6 +10440,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1029010440
setModel: () => Effect.void,
1029110441
setPermissionMode: () => Effect.void,
1029210442
stopTask: () => Effect.void,
10443+
backgroundTasks: () => Effect.succeed(false),
1029310444
interrupt: Effect.void,
1029410445
close: Queue.shutdown(sdkMessages),
1029510446
};
@@ -10489,6 +10640,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1048910640
setModel: () => Effect.void,
1049010641
setPermissionMode: () => Effect.void,
1049110642
stopTask: () => Effect.void,
10643+
backgroundTasks: () => Effect.succeed(false),
1049210644
interrupt: Effect.void,
1049310645
close: Queue.shutdown(sdkMessages),
1049410646
};
@@ -10672,6 +10824,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1067210824
setModel: () => Effect.void,
1067310825
setPermissionMode: () => Effect.void,
1067410826
stopTask: () => Effect.void,
10827+
backgroundTasks: () => Effect.succeed(false),
1067510828
interrupt: Effect.void,
1067610829
close: Queue.shutdown(sdkMessages),
1067710830
};
@@ -10811,6 +10964,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1081110964
setModel: () => Effect.void,
1081210965
setPermissionMode: () => Effect.void,
1081310966
stopTask: () => Effect.void,
10967+
backgroundTasks: () => Effect.succeed(false),
1081410968
interrupt: Effect.void,
1081510969
close: Queue.shutdown(sdkMessages),
1081610970
};

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

Lines changed: 7 additions & 1 deletion
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
@@ -795,7 +796,7 @@ function makeReplayQueryRunner(
795796
return frame;
796797
};
797798

798-
const replayEffect = (tryEffect: () => void) =>
799+
const replayEffect = <A>(tryEffect: () => A) =>
799800
Effect.try({
800801
try: tryEffect,
801802
catch: (cause) => replayQueryRunnerError(transcript, cause),
@@ -830,6 +831,11 @@ 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+
return false;
838+
}),
833839
interrupt: replayEffect(() => {
834840
assertNextOutboundFrame({ type: "query.interrupt" });
835841
}),

0 commit comments

Comments
 (0)