Skip to content

Commit a0863d0

Browse files
fix(server): answered wake frames no longer hold a Claude continuation open
Dropping buffered init frames was not enough: a buffered root assistant frame from the same wake still marked the replayed continuation as an open native wake, so its 2-minute deadline never armed. Mark every frame buffered when a user turn starts as answered and keep them out of the nativeWakeStarted check, leaving the buffered output intact for replay. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9fe8638 commit a0863d0

2 files changed

Lines changed: 80 additions & 81 deletions

File tree

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

Lines changed: 74 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -9261,78 +9261,85 @@ describe("ClaudeAdapterV2 background wake turns", () => {
92619261
),
92629262
);
92639263

9264-
it.effect("settles a continuation whose opened wake turn a user turn already answered", () =>
9265-
Effect.scoped(
9266-
Effect.gen(function* () {
9267-
const harness = yield* makeWakeHarness;
9268-
const now = yield* DateTime.now;
9264+
it.effect.each(["live in the user turn", "buffered before the user turn"] as const)(
9265+
"settles a continuation whose opened wake turn a user turn already answered: assistant %s",
9266+
(assistantFrame) =>
9267+
Effect.scoped(
9268+
Effect.gen(function* () {
9269+
const harness = yield* makeWakeHarness;
9270+
const now = yield* DateTime.now;
92699271

9270-
yield* harness.runtime.startTurn(
9271-
makeClaudeTestTurnInput({
9272-
threadId: harness.threadId,
9273-
providerThread: harness.providerThread,
9274-
now,
9275-
attemptId: RunAttemptId.make("attempt-claude-wake-answered-1"),
9276-
text: "Run the build in the background.",
9277-
attachments: [],
9278-
}),
9279-
);
9280-
yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
9281-
yield* Queue.offer(harness.sdkMessages, turnOneResult);
9282-
yield* harness.awaitTerminal(1);
9283-
yield* harness.offerAndWait(wakeNotification);
9284-
yield* harness.offerAndWait(wakeTurnInit);
9285-
assert.lengthOf(harness.continuationRequests, 1);
9272+
yield* harness.runtime.startTurn(
9273+
makeClaudeTestTurnInput({
9274+
threadId: harness.threadId,
9275+
providerThread: harness.providerThread,
9276+
now,
9277+
attemptId: RunAttemptId.make("attempt-claude-wake-answered-1"),
9278+
text: "Run the build in the background.",
9279+
attachments: [],
9280+
}),
9281+
);
9282+
yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
9283+
yield* Queue.offer(harness.sdkMessages, turnOneResult);
9284+
yield* harness.awaitTerminal(1);
9285+
yield* harness.offerAndWait(wakeNotification);
9286+
yield* harness.offerAndWait(wakeTurnInit);
9287+
if (assistantFrame === "buffered before the user turn") {
9288+
yield* harness.offerAndWait(wakeAssistant);
9289+
}
9290+
assert.lengthOf(harness.continuationRequests, 1);
92869291

9287-
yield* harness.runtime.startTurn(
9288-
makeClaudeTestTurnInput({
9289-
threadId: harness.threadId,
9290-
providerThread: harness.providerThread,
9291-
now,
9292-
attemptId: RunAttemptId.make("attempt-claude-wake-answered-2"),
9293-
text: "How is the build going?",
9294-
attachments: [],
9295-
providerTurnOrdinal: 2,
9296-
}),
9297-
);
9298-
yield* harness.until(() => harness.offeredMessages.length === 2);
9299-
yield* Queue.offer(harness.sdkMessages, wakeAssistant);
9300-
yield* Queue.offer(
9301-
harness.sdkMessages,
9302-
makeResultFrame({
9303-
uuid: "00000000-0000-4000-8000-000000000105",
9304-
result: "The build passed; nothing else pending.",
9305-
}),
9306-
);
9307-
yield* harness.awaitTerminal(2);
9308-
assert.equal(harness.terminalEvents()[1]?.status, "completed");
9292+
yield* harness.runtime.startTurn(
9293+
makeClaudeTestTurnInput({
9294+
threadId: harness.threadId,
9295+
providerThread: harness.providerThread,
9296+
now,
9297+
attemptId: RunAttemptId.make("attempt-claude-wake-answered-2"),
9298+
text: "How is the build going?",
9299+
attachments: [],
9300+
providerTurnOrdinal: 2,
9301+
}),
9302+
);
9303+
yield* harness.until(() => harness.offeredMessages.length === 2);
9304+
if (assistantFrame === "live in the user turn") {
9305+
yield* Queue.offer(harness.sdkMessages, wakeAssistant);
9306+
}
9307+
yield* Queue.offer(
9308+
harness.sdkMessages,
9309+
makeResultFrame({
9310+
uuid: "00000000-0000-4000-8000-000000000105",
9311+
result: "The build passed; nothing else pending.",
9312+
}),
9313+
);
9314+
yield* harness.awaitTerminal(2);
9315+
assert.equal(harness.terminalEvents()[1]?.status, "completed");
93099316

9310-
yield* harness.runtime.startTurn(
9311-
makeClaudeTestTurnInput({
9312-
threadId: harness.threadId,
9313-
providerThread: harness.providerThread,
9314-
now,
9315-
attemptId: RunAttemptId.make("attempt-claude-wake-answered-3"),
9316-
text: "Background task completed.",
9317-
attachments: [],
9318-
providerTurnOrdinal: 3,
9319-
messageCreatedBy: "agent",
9320-
messageCreationSource: "provider",
9321-
}),
9322-
);
9323-
yield* TestClock.adjust("3 minutes");
9324-
assert.lengthOf(
9325-
harness.terminalEvents(),
9326-
3,
9327-
"the continuation for an already-answered wake never settled",
9328-
);
9329-
assert.equal(harness.terminalEvents()[2]?.status, "completed");
9330-
}).pipe(
9331-
Effect.provide(
9332-
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9317+
yield* harness.runtime.startTurn(
9318+
makeClaudeTestTurnInput({
9319+
threadId: harness.threadId,
9320+
providerThread: harness.providerThread,
9321+
now,
9322+
attemptId: RunAttemptId.make("attempt-claude-wake-answered-3"),
9323+
text: "Background task completed.",
9324+
attachments: [],
9325+
providerTurnOrdinal: 3,
9326+
messageCreatedBy: "agent",
9327+
messageCreationSource: "provider",
9328+
}),
9329+
);
9330+
yield* TestClock.adjust("3 minutes");
9331+
assert.lengthOf(
9332+
harness.terminalEvents(),
9333+
3,
9334+
"the continuation for an already-answered wake never settled",
9335+
);
9336+
assert.equal(harness.terminalEvents()[2]?.status, "completed");
9337+
}).pipe(
9338+
Effect.provide(
9339+
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9340+
),
93339341
),
93349342
),
9335-
),
93369343
);
93379344

93389345
it.effect("ignores a zero-turn task-notification origin result during a normal user turn", () =>

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4622,6 +4622,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
46224622
>();
46234623
// Buffered idle outcomes must not settle a resumed child again.
46244624
const appliedSubagentOutcomes = new WeakSet<SDKMessage>();
4625+
// A user turn ends any native wake turn buffered before it; replaying those frames must not hold a continuation open.
4626+
const wakeFramesAnsweredByUserTurn = new WeakSet<SDKMessage>();
46254627
// Subagent frames can precede the task_started that registers their owner.
46264628
const pendingSubagentFramesByToolUseId = yield* Ref.make(
46274629
new Map<string, ReadonlyArray<SDKMessage>>(),
@@ -9208,7 +9210,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
92089210
if (
92099211
context?.promptUuid === null &&
92109212
liveQuery?.query === input.query &&
9211-
isClaudeRootTurnFrame(message)
9213+
isClaudeRootTurnFrame(message) &&
9214+
!wakeFramesAnsweredByUserTurn.has(message)
92129215
) {
92139216
context.nativeWakeStarted = true;
92149217
}
@@ -10124,19 +10127,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1012410127
if (userMessage !== null) {
1012510128
yield* attachTurn;
1012610129
yield* startUserTurnForWakeReports(nativeThreadId);
10127-
// This turn ends any native turn a buffered init opened, so the init no longer proves a wake is open.
10128-
yield* Ref.update(wakeBuffers, (current) => {
10129-
const entry = current.get(nativeThreadId);
10130-
if (entry === undefined) return current;
10131-
const messages = entry.messages.filter(
10132-
(buffered) => !isClaudeTurnStartMessage(buffered),
10133-
);
10134-
if (messages.length === entry.messages.length) return current;
10135-
const next = new Map(current);
10136-
if (messages.length === 0) next.delete(nativeThreadId);
10137-
else next.set(nativeThreadId, { ...entry, messages });
10138-
return next;
10139-
});
10130+
const buffered = (yield* Ref.get(wakeBuffers)).get(nativeThreadId)?.messages ?? [];
10131+
for (const message of buffered) wakeFramesAnsweredByUserTurn.add(message);
1014010132
yield* Effect.uninterruptibleMask((restore) =>
1014110133
restore(
1014210134
querySession.query.offer(userMessage, () => {

0 commit comments

Comments
 (0)