Skip to content

Commit 2254f83

Browse files
committed
fix(server): preserve stale delegated task results across wake turns
1 parent 7e565c5 commit 2254f83

7 files changed

Lines changed: 344 additions & 149 deletions

File tree

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

Lines changed: 109 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10206,7 +10206,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1020610206
);
1020710207

1020810208
it.effect(
10209-
"uses task_started as an incremental roster fallback and clears on empty snapshot",
10209+
"uses task_started as an incremental roster fallback and clears internal work on empty snapshot",
1021010210
() =>
1021110211
Effect.scoped(
1021210212
Effect.gen(function* () {
@@ -10324,13 +10324,13 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1032410324
),
1032510325
);
1032610326

10327-
yield* Queue.offer(harness.sdkMessages, emptyRoster);
10328-
yield* harness.until(() =>
10329-
providerThreadRosterEvents(harness.events).some(
10330-
(event) =>
10331-
event.providerThread.status === "idle" &&
10332-
(event.providerThread.pendingBackgroundTasks?.length ?? 0) === 0,
10333-
),
10327+
yield* harness.offerAndWait(emptyRoster);
10328+
assert.include(
10329+
(
10330+
providerThreadRosterEvents(harness.events).at(-1)?.providerThread
10331+
.pendingBackgroundTasks ?? []
10332+
).map((task) => task.taskId),
10333+
WAKE_TASK_ID,
1033410334
);
1033510335
assert.isFalse(yield* harness.hasPendingBackgroundWork);
1033610336
}).pipe(
@@ -10408,9 +10408,6 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1040810408
["dev-server", false],
1040910409
],
1041010410
);
10411-
yield* Queue.offer(harness.sdkMessages, turnOneResult);
10412-
yield* Queue.take(harness.terminalReceipts);
10413-
1041410411
// A replacing level rebuilds every entry; the mark must survive it.
1041510412
yield* Queue.offer(
1041610413
harness.sdkMessages,
@@ -10464,6 +10461,8 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1046410461
[WAKE_TASK_ID, false],
1046510462
],
1046610463
);
10464+
yield* Queue.offer(harness.sdkMessages, turnOneResult);
10465+
yield* Queue.take(harness.terminalReceipts);
1046710466
}).pipe(
1046810467
Effect.provide(
1046910468
Layer.mergeAll(
@@ -12677,6 +12676,105 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1267712676
),
1267812677
);
1267912678

12679+
it.effect.each(["none", "before", "after"] as const)(
12680+
"keeps an exited background command on the roster until its wake run starts (empty level %s notification)",
12681+
(emptyLevel) =>
12682+
Effect.scoped(
12683+
Effect.gen(function* () {
12684+
const harness = yield* makeWakeHarness;
12685+
const now = yield* DateTime.now;
12686+
const wakeAttemptId = RunAttemptId.make("attempt-claude-wake-roster-2");
12687+
const emptyRoster = claudeSdkFrame({
12688+
type: "system",
12689+
subtype: "background_tasks_changed",
12690+
tasks: [],
12691+
uuid: "00000000-0000-4000-8000-000000000204",
12692+
session_id: WAKE_NATIVE_SESSION,
12693+
});
12694+
12695+
yield* harness.runtime.startTurn(
12696+
makeClaudeTestTurnInput({
12697+
threadId: harness.threadId,
12698+
providerThread: harness.providerThread,
12699+
now,
12700+
attemptId: RunAttemptId.make("attempt-claude-wake-roster-1"),
12701+
text: "Run the build in the background.",
12702+
attachments: [],
12703+
}),
12704+
);
12705+
yield* harness.offerAndWait(wakeTaskStarted);
12706+
const awaitBackgroundTasks = harness.runtime.awaitBackgroundTasks;
12707+
assert.isDefined(awaitBackgroundTasks);
12708+
yield* awaitBackgroundTasks!({
12709+
providerThread: harness.providerThread,
12710+
taskIds: [WAKE_TASK_ID],
12711+
awaited: true,
12712+
});
12713+
yield* Queue.offer(harness.sdkMessages, turnOneResult);
12714+
yield* harness.awaitTerminal(1);
12715+
const afterFirstTurn = harness.events.length;
12716+
if (emptyLevel === "before") yield* harness.offerAndWait(emptyRoster);
12717+
yield* harness.offerAndWait(wakeNotification);
12718+
if (emptyLevel === "after") yield* harness.offerAndWait(emptyRoster);
12719+
// Query replacement reads the internal roster, which the exit already cleared.
12720+
assert.isFalse(yield* harness.hasPendingBackgroundWork);
12721+
yield* harness.offerAndWait(wakeTurnInit);
12722+
yield* harness.runtime.startTurn(
12723+
makeClaudeTestTurnInput({
12724+
threadId: harness.threadId,
12725+
providerThread: harness.providerThread,
12726+
now,
12727+
attemptId: wakeAttemptId,
12728+
text: "Background task completed.",
12729+
attachments: [],
12730+
providerTurnOrdinal: 2,
12731+
messageCreatedBy: "agent",
12732+
messageCreationSource: "provider",
12733+
}),
12734+
);
12735+
yield* harness.offerAndWait(wakeAssistant);
12736+
yield* harness.offerAndWait(wakeResult);
12737+
yield* harness.awaitTerminal(2);
12738+
12739+
const wakeStart = harness.events.findIndex(
12740+
(event) =>
12741+
event.type === "provider_turn.updated" &&
12742+
event.providerTurn.runAttemptId === wakeAttemptId,
12743+
);
12744+
assert.isAbove(wakeStart, -1);
12745+
const rosters = harness.events.flatMap((event, index) =>
12746+
event.type === "provider_thread.updated" &&
12747+
event.providerThread.id === harness.providerThread.id &&
12748+
index >= afterFirstTurn
12749+
? [
12750+
{
12751+
beforeWake: index < wakeStart,
12752+
taskIds: (event.providerThread.pendingBackgroundTasks ?? []).map((task) => [
12753+
task.taskId,
12754+
task.awaited === true,
12755+
]),
12756+
},
12757+
]
12758+
: [],
12759+
);
12760+
assert.deepEqual(
12761+
rosters.filter((roster) => roster.beforeWake).map((roster) => roster.taskIds),
12762+
rosters.filter((roster) => roster.beforeWake).map(() => [[WAKE_TASK_ID, true]]),
12763+
);
12764+
assert.deepEqual(rosters.at(-1)?.taskIds, []);
12765+
}).pipe(
12766+
Effect.provide(
12767+
Layer.mergeAll(
12768+
IdAllocator.layer,
12769+
McpProviderSessions.layer,
12770+
NodeServices.layer,
12771+
NodeCrypto.layer,
12772+
),
12773+
),
12774+
),
12775+
),
12776+
);
12777+
1268012778
it.effect.each([true, false])(
1268112779
"carries a rejected wake rate limit into the continuation failure (event=%s)",
1268212780
(standaloneEvent) =>

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5718,6 +5718,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
57185718
readonly nativeThreadId: string;
57195719
readonly providerThread: OrchestrationV2ProviderThread;
57205720
readonly status?: OrchestrationV2ProviderThread["status"];
5721+
readonly owedWakeTasks?: ReadonlyArray<OrchestrationV2PendingBackgroundTask>;
57215722
}) {
57225723
const roster = rosterForNativeThread(
57235724
yield* Ref.get(pendingBackgroundTasksByNativeThread),
@@ -5732,7 +5733,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
57325733
...input.providerThread,
57335734
providerSessionId: session.id,
57345735
...(input.status === undefined ? {} : { status: input.status }),
5735-
pendingBackgroundTasks: claudePendingBackgroundTasksFromRoster(roster, awaitedTaskIds),
5736+
pendingBackgroundTasks: [
5737+
...claudePendingBackgroundTasksFromRoster(roster, awaitedTaskIds),
5738+
...(input.owedWakeTasks ?? []).filter((task) => !roster.has(task.taskId)),
5739+
],
57365740
...(goalsByNativeThread.has(input.nativeThreadId)
57375741
? { goal: goalsByNativeThread.get(input.nativeThreadId) ?? null }
57385742
: {}),
@@ -8696,13 +8700,28 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
86968700
if (baseThread === undefined) {
86978701
return;
86988702
}
8703+
// An exited task still owes its wake turn; publishing an empty roster settles the
8704+
// delegated task with the previous turn's interim answer before that wake starts.
8705+
const owedWakeTasks: OrchestrationV2PendingBackgroundTask[] = [];
8706+
if (activeContext === null) {
8707+
for (const task of baseThread.pendingBackgroundTasks ?? []) {
8708+
if (yield* isKnownOpaqueBackgroundTaskOnNativeThread(nativeThreadId, task.taskId)) {
8709+
owedWakeTasks.push(task);
8710+
}
8711+
}
8712+
}
86998713
const status =
87008714
activeContext === null
87018715
? ("idle" as const)
87028716
: baseThread.status === "idle"
87038717
? ("active" as const)
87048718
: baseThread.status;
8705-
yield* emitProviderThreadRoster({ nativeThreadId, providerThread: baseThread, status });
8719+
yield* emitProviderThreadRoster({
8720+
nativeThreadId,
8721+
providerThread: baseThread,
8722+
status,
8723+
owedWakeTasks,
8724+
});
87068725
});
87078726

87088727
const applyBackgroundTaskRosterMessage = Effect.fnUntraced(function* (input: {

0 commit comments

Comments
 (0)