Skip to content

Commit 9049825

Browse files
committed
fix(server): release late awaited completions when wake is discarded
1 parent 5fc504b commit 9049825

2 files changed

Lines changed: 22 additions & 9 deletions

File tree

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10734,6 +10734,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1073410734
"unawait",
1073510735
"query-closed",
1073610736
"wake-discarded",
10737+
"wake-discarded-late-completion",
1073710738
"task-stopped",
1073810739
] as const)(
1073910740
"holds only the background tasks the agent marks awaited through their wake: %s",
@@ -10860,14 +10861,27 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1086010861

1086110862
yield* harness.offerAndWait(wakeTurnInit);
1086210863
const continuation = yield* Queue.take(harness.continuationReceipts);
10863-
if (order === "wake-discarded") {
10864+
if (order === "wake-discarded-late-completion") {
10865+
yield* awaitBackgroundTasks({
10866+
providerThread: harness.providerThread,
10867+
taskIds: ["dev-server"],
10868+
awaited: true,
10869+
});
10870+
yield* Queue.take(harness.providerThreadReceipts);
10871+
yield* harness.offerAndWait(roster([], "00000000-0000-4000-8000-000000000305"));
10872+
yield* Queue.take(harness.providerThreadReceipts);
10873+
assert.lengthOf(harness.continuationRequests, 1);
10874+
}
10875+
if (order === "wake-discarded" || order === "wake-discarded-late-completion") {
1086410876
if (continuation.clearIfCurrent === undefined) {
1086510877
return yield* Effect.die("An awaited wake must release its hold when discarded.");
1086610878
}
1086710879
yield* continuation.clearIfCurrent();
10868-
assert.deepStrictEqual(marks(yield* nextRoster((tasks) => tasks.length === 1)), [
10869-
["dev-server", false],
10870-
]);
10880+
const remaining = yield* Queue.take(harness.providerThreadReceipts);
10881+
assert.deepStrictEqual(
10882+
marks(remaining.providerThread.pendingBackgroundTasks ?? []),
10883+
order === "wake-discarded-late-completion" ? [] : [["dev-server", false]],
10884+
);
1087110885
return;
1087210886
}
1087310887
yield* harness.runtime.startTurn(

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8944,7 +8944,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
89448944
threadId: route.threadId,
89458945
providerThreadId: route.providerThreadId,
89468946
});
8947-
const held = new Map(awaitedCompletionsByNativeThread.get(wakeInput.nativeThreadId));
8947+
const held = awaitedCompletionsByNativeThread.get(wakeInput.nativeThreadId) ?? new Map();
8948+
awaitedCompletionsByNativeThread.set(wakeInput.nativeThreadId, held);
89488949
yield* continuationRequests.offer({
89498950
threadId: route.threadId,
89508951
providerThreadId: route.providerThreadId,
@@ -8955,10 +8956,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
89558956
sdkMessageLock.withPermits(1)(
89568957
Effect.gen(function* () {
89578958
const current = awaitedCompletionsByNativeThread.get(wakeInput.nativeThreadId);
8958-
for (const [taskId, task] of held) {
8959-
if (current?.get(taskId) === task) current.delete(taskId);
8960-
}
8961-
if (held.size > 0) {
8959+
if (current === held) {
8960+
awaitedCompletionsByNativeThread.delete(wakeInput.nativeThreadId);
89628961
const active = yield* Ref.get(activeTurn);
89638962
yield* emitRosterUpdate(
89648963
wakeInput.nativeThreadId,

0 commit comments

Comments
 (0)