From a844f667523003273cd31d08fd67442ec2843989 Mon Sep 17 00:00:00 2001 From: ScriptedAlchemy Date: Thu, 19 Nov 2026 17:23:12 -0800 Subject: [PATCH 1/2] test(server): Claude wake on a new session must prompt A continuation turn that starts a new Claude session has nothing to drain. This case fails on main: Claude receives no prompt. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index 68c88dec019b0..f54a36db6fa63 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -17766,7 +17766,18 @@ describe("ClaudeAdapterV2 background wake turns", () => { ), ); - it.effect("settles a continuation turn immediately when no wake output is buffered", () => + it.effect.each([ + { + name: "settles a continuation turn immediately when no wake output is buffered", + nativeThreadHasTurns: true, + prompted: false, + }, + { + name: "prompts with a continuation's text when it starts a new Claude session", + nativeThreadHasTurns: false, + prompted: true, + }, + ])("$name", ({ nativeThreadHasTurns, prompted }) => Effect.gen(function* () { const harness = yield* makeWakeHarness; const now = yield* DateTime.now; @@ -17777,13 +17788,22 @@ describe("ClaudeAdapterV2 background wake turns", () => { providerThread: harness.providerThread, now, attemptId: RunAttemptId.make("attempt-claude-wake-3"), - text: "Background task completed.", + text: "Recovered history\n\nBackground task completed.", attachments: [], + nativeThreadHasTurns, messageCreatedBy: "agent", messageCreationSource: "provider", }), ); + if (prompted) { + assert.lengthOf(harness.offeredMessages, 1); + assert.include( + JSON.stringify(harness.offeredMessages[0]?.message.content), + "Recovered history", + ); + return; + } yield* harness.awaitTerminal(1); assert.equal(harness.terminalEvents()[0]?.status, "completed"); assert.lengthOf(harness.offeredMessages, 0); From 7c022f452e3f6b43b6556dcee629371ae130a167 Mon Sep 17 00:00:00 2001 From: ScriptedAlchemy Date: Thu, 19 Nov 2026 17:23:42 -0800 Subject: [PATCH 2/2] fix(server): Claude wake turns no longer strand new sessions A background wake that landed on a new Claude session sent no prompt, so Claude never saved the conversation. T3 still counted the turn, so the next switch to Claude resumed a missing conversation and failed with "could not find this conversation". The handoff history inlined into the wake was lost too. A wake that would start a new session now runs as a prompted turn. Resume and this check share one predicate. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.ts | 46 +++++++++++++++---- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index ddb974531a952..ba2d49e1b4d65 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -12838,6 +12838,21 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( live.selection = selection; }); + const shouldResumeNativeSession = Effect.fn("ClaudeAdapterV2.shouldResumeNativeSession")( + function* ( + turnInput: ProviderAdapter.ProviderAdapterV2TurnInput, + nativeThreadId: string, + resumeSessionAt: string | undefined, + ) { + // Idle release loses openedNativeThreads; persisted turns still require resume to avoid "already in use". + return ( + resumeSessionAt !== undefined || + (yield* Ref.get(openedNativeThreads)).has(nativeThreadId) || + (turnInput.nativeThreadHasTurns ?? turnInput.providerTurnOrdinal > 1) + ); + }, + ); + const openQuery = Effect.fnUntraced(function* ( turnInput: ProviderAdapter.ProviderAdapterV2TurnInput, nativeThreadId: string, @@ -12981,12 +12996,11 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( } } - const openedWithResume = (yield* Ref.get(openedNativeThreads)).has(nativeThreadId); - // Idle release loses openedNativeThreads; persisted turns still require resume to avoid "already in use". - const hasPersistedProviderTurn = - turnInput.nativeThreadHasTurns ?? turnInput.providerTurnOrdinal > 1; - const shouldResume = - resumeSessionAt !== undefined || openedWithResume || hasPersistedProviderTurn; + const shouldResume = yield* shouldResumeNativeSession( + turnInput, + nativeThreadId, + resumeSessionAt, + ); const gitHubReadGate = Option.isSome(serverSettings) ? yield* serverSettings.value.getSettings.pipe( Effect.map((settings) => settings.enableAgentGitHubReadGate), @@ -13258,10 +13272,26 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( }); const startTurn = Effect.fn("ClaudeAdapterV2.startTurn")( - function* (turnInput: ProviderAdapter.ProviderAdapterV2TurnInput) { + function* (requestedTurn: ProviderAdapter.ProviderAdapterV2TurnInput) { modelCatalog = yield* loadModelCatalog; const startedAt = yield* DateTime.now; - const nativeThreadId = yield* getNativeThreadId(turnInput.providerThread); + const nativeThreadId = yield* getNativeThreadId(requestedTurn.providerThread); + const live = yield* Ref.get(queryContext); + // A new session has no wake output to drain, and Claude saves no conversation it was never prompted with. + const continuationStartsSession = + isClaudeProviderContinuationTurn(requestedTurn) && + !(live?.nativeThreadId === nativeThreadId && !live.stopping) && + !(yield* shouldResumeNativeSession( + requestedTurn, + nativeThreadId, + yield* getNativeConversationHeadId(requestedTurn.providerThread), + )); + const turnInput = continuationStartsSession + ? { + ...requestedTurn, + message: { ...requestedTurn.message, creationSource: "server" as const }, + } + : requestedTurn; const nativeTurnId = `turn:${turnInput.attemptId}`; // Use fresh uuids: native sessions can outlive this database, and Claude skips previously recorded prompts. const promptUuid = isClaudeProviderContinuationTurn(turnInput)