From 401f13f1bc501f4e269713e89983282682ae33b1 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Mon, 16 Nov 2026 17:45:11 +0000 Subject: [PATCH 1/6] test(server): a Claude turn that goes silent after its prompt starts stays running (#37708) Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index cf533de93e4d6..33acff8ee1acd 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -15224,6 +15224,68 @@ describe("ClaudeAdapterV2 background wake turns", () => { ), ); + // regression: #37708 a gateway that holds the request open leaves Claude silent after "requesting" + it.effect( + "does not keep a turn silently running after Claude accepts its prompt and goes quiet", + () => + Effect.gen(function* () { + const harness = yield* makeWakeHarness; + const now = yield* DateTime.now; + yield* harness.runtime.startTurn( + makeClaudeTestTurnInput({ + threadId: harness.threadId, + providerThread: harness.providerThread, + now, + attemptId: RunAttemptId.make("attempt-claude-silent-after-started"), + text: "start again", + attachments: [], + }), + ); + // Captured from Claude Code 2.1.325 against a gateway that never answers /v1/messages. + for (const [index, state] of (["queued", "started"] as const).entries()) { + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "command_lifecycle", + command_uuid: harness.promptUuid(0), + state, + uuid: `00000000-0000-4000-8000-00000000079${index}`, + session_id: WAKE_NATIVE_SESSION, + }), + ); + } + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "system", + subtype: "status", + status: "requesting", + uuid: "00000000-0000-4000-8000-000000000792", + session_id: WAKE_NATIVE_SESSION, + }), + ); + assert.lengthOf(harness.terminalEvents(), 0); + + yield* TestClock.adjust("1 hour"); + yield* yieldTicks(50); + const surfaced = + harness.terminalEvents().length > 0 || + harness.events.some( + (event) => + event.type === "turn_item.updated" && + (event.turnItem.type === "system_notice" || event.turnItem.type === "error"), + ); + assert.isTrue(surfaced, "an hour of silence after the prompt started surfaced nothing"); + }).pipe( + Effect.provide( + Layer.mergeAll( + IdAllocator.layer, + McpProviderSessions.layer, + NodeServices.layer, + NodeCrypto.layer, + ), + ), + ), + ); + // regression: #17531 a mod that holds a tool behind a focused pane must fail the turn, not hang it it.effect.each([ { case: "fails a turn whose mod requests focus for a pane T3 cannot show", focus: true }, From e16958878e14655055a5260ce5a0a22f9d95f472 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Mon, 16 Nov 2026 18:05:59 +0000 Subject: [PATCH 2/6] fix(server): a Claude request that gets no answer fails after 10 minutes instead of running forever Fixes pingdotgg/t3code#37708 Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.ts | 110 +++++++++++++----- 1 file changed, 80 insertions(+), 30 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index fa8d3684f0f23..b474c23fe20a6 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -4949,6 +4949,8 @@ function formatClaudeUsageLimitWait(waitMs: number): string { interface ActiveClaudeTurnContext { retryBudgetFailure?: OrchestrationV2ProviderFailure; + // Set by a `requesting` status and cleared by the turn's next frame. + unansweredRequestSince?: DateTime.Utc | undefined; readonly queryPolicy: ClaudeRuntimeQueryPolicy; readonly input: ProviderAdapter.ProviderAdapterV2TurnInput; readonly autoCompactWindow: string; @@ -6397,40 +6399,72 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( : undefined; }); const retry = yield* isCurrentRetry; - // A user Stop already in flight keeps its interrupted outcome. - if ( - retry === undefined || - (yield* Ref.get(interruptedTurns)).has(context.providerTurnId) - ) - return; - context.retryBudgetFailure = { ...retry.failure, retryable: false }; - const liveQuery = yield* Ref.get(queryContext); - yield* interruptTurn({ - providerThread: context.input.providerThread, - providerTurnId: context.providerTurnId, - }).pipe( - Effect.timeoutOption(CLAUDE_STOP_CONFIRM_TIMEOUT_MS), - Effect.catch((cause) => - Effect.logWarning("orchestration-v2.claude-retry-budget-stop-failed", { cause }), - ), - ); - if (liveQuery === null || (yield* isCurrentRetry) === undefined) return; - // The CLI did not confirm the stop; settle the turn without it. - const ownedLiveQuery = yield* Ref.modify(queryContext, (current) => - current?.query === liveQuery.query ? [true, null] : [false, current], - ); - if (!ownedLiveQuery) return; - liveQuery.stopping = true; - yield* liveQuery.query.close.pipe( - Effect.timeoutOption(CLAUDE_STOP_CONFIRM_TIMEOUT_MS), - Effect.ignore, + if (retry === undefined) return; + yield* failStalledTurn( + context, + { ...retry.failure, retryable: false }, + Effect.map(isCurrentRetry, (current) => current !== undefined), ); - yield* finalizeActiveTurnAfterQueryExit(liveQuery); - yield* endSubagentCallsOfClosedQuery(liveQuery.nativeThreadId, "interrupted"); - yield* Deferred.succeed(liveQuery.closed, undefined); }, ); + // Partial messages are on, so a live request streams within seconds of `requesting`. + // A gateway can hold it open without ever letting the CLI time out and retry. + const failUnansweredRequest = Effect.fn("ClaudeAdapterV2.failUnansweredRequest")(function* ( + context: ActiveClaudeTurnContext, + since: DateTime.Utc, + ) { + const isUnanswered = Effect.map( + Ref.get(activeTurn), + (active) => active === context && context.unansweredRequestSince === since, + ); + if (!(yield* isUnanswered)) return; + yield* failStalledTurn( + context, + makeProviderFailure({ + class: "transport_error", + code: "claude_request_unanswered", + message: `Claude sent nothing for ${PROVIDER_RETRY_BUDGET_MS / 60_000} minutes after sending its request. The API or a gateway in front of it is not responding.`, + retryable: false, + }), + isUnanswered, + ); + }); + + const failStalledTurn = Effect.fn("ClaudeAdapterV2.failStalledTurn")(function* ( + context: ActiveClaudeTurnContext, + failure: OrchestrationV2ProviderFailure, + stillStalled: Effect.Effect, + ) { + // A user Stop already in flight keeps its interrupted outcome. + if ((yield* Ref.get(interruptedTurns)).has(context.providerTurnId)) return; + context.retryBudgetFailure = failure; + const liveQuery = yield* Ref.get(queryContext); + yield* interruptTurn({ + providerThread: context.input.providerThread, + providerTurnId: context.providerTurnId, + }).pipe( + Effect.timeoutOption(CLAUDE_STOP_CONFIRM_TIMEOUT_MS), + Effect.catch((cause) => + Effect.logWarning("orchestration-v2.claude-retry-budget-stop-failed", { cause }), + ), + ); + if (liveQuery === null || !(yield* stillStalled)) return; + // The CLI did not confirm the stop; settle the turn without it. + const ownedLiveQuery = yield* Ref.modify(queryContext, (current) => + current?.query === liveQuery.query ? [true, null] : [false, current], + ); + if (!ownedLiveQuery) return; + liveQuery.stopping = true; + yield* liveQuery.query.close.pipe( + Effect.timeoutOption(CLAUDE_STOP_CONFIRM_TIMEOUT_MS), + Effect.ignore, + ); + yield* finalizeActiveTurnAfterQueryExit(liveQuery); + yield* endSubagentCallsOfClosedQuery(liveQuery.nativeThreadId, "interrupted"); + yield* Deferred.succeed(liveQuery.closed, undefined); + }); + const rememberProviderThread = /* Provider events include streaming deltas; avoid a span for each update. */ Effect.fnUntraced(function* (providerThread: OrchestrationV2ProviderThread) { @@ -10556,6 +10590,22 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( } return; } + if (context === (yield* Ref.get(activeTurn))) { + if ( + message.type === "system" && + message.subtype === "status" && + message.status === "requesting" + ) { + const since = yield* DateTime.now; + context.unansweredRequestSince = since; + yield* failUnansweredRequest(context, since).pipe( + Effect.delay(PROVIDER_RETRY_BUDGET_MS), + Effect.forkIn(sessionScope), + ); + } else { + context.unansweredRequestSince = undefined; + } + } const focusedPlugin = claudeFocusRequestedPanePlugin(message); if (focusedPlugin !== null && context === (yield* Ref.get(activeTurn))) { yield* Effect.logWarning("orchestration-v2.claude-mod-pane-focus-unsupported", { From cafe8ea523b93c3b18b325edf946f08faf078ac6 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Mon, 16 Nov 2026 18:19:49 +0000 Subject: [PATCH 3/6] fix(server): a Claude prompt that starts and then goes silent fails after 10 minutes The watchdog now also starts on the prompt's command_lifecycle started frame, the sequence recorded in pingdotgg/t3code#37708, not only on status: requesting. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 93 ++++++++++--------- .../Adapters/ClaudeAdapterV2.ts | 16 ++-- 2 files changed, 57 insertions(+), 52 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index 33acff8ee1acd..c77cc7418967e 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -15225,34 +15225,36 @@ describe("ClaudeAdapterV2 background wake turns", () => { ); // regression: #37708 a gateway that holds the request open leaves Claude silent after "requesting" - it.effect( - "does not keep a turn silently running after Claude accepts its prompt and goes quiet", - () => - Effect.gen(function* () { - const harness = yield* makeWakeHarness; - const now = yield* DateTime.now; - yield* harness.runtime.startTurn( - makeClaudeTestTurnInput({ - threadId: harness.threadId, - providerThread: harness.providerThread, - now, - attemptId: RunAttemptId.make("attempt-claude-silent-after-started"), - text: "start again", - attachments: [], + it.effect.each([ + { case: "after the prompt starts", requesting: false }, + { case: "after a request goes out", requesting: true }, + ])("does not keep a turn silently running when Claude goes quiet $case", ({ requesting }) => + Effect.gen(function* () { + const harness = yield* makeWakeHarness; + const now = yield* DateTime.now; + yield* harness.runtime.startTurn( + makeClaudeTestTurnInput({ + threadId: harness.threadId, + providerThread: harness.providerThread, + now, + attemptId: RunAttemptId.make("attempt-claude-silent-after-started"), + text: "start again", + attachments: [], + }), + ); + // Captured from Claude Code 2.1.325 against a gateway that never answers /v1/messages. + for (const [index, state] of (["queued", "started"] as const).entries()) { + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "command_lifecycle", + command_uuid: harness.promptUuid(0), + state, + uuid: `00000000-0000-4000-8000-00000000079${index}`, + session_id: WAKE_NATIVE_SESSION, }), ); - // Captured from Claude Code 2.1.325 against a gateway that never answers /v1/messages. - for (const [index, state] of (["queued", "started"] as const).entries()) { - yield* harness.offerAndWait( - claudeSdkFrame({ - type: "command_lifecycle", - command_uuid: harness.promptUuid(0), - state, - uuid: `00000000-0000-4000-8000-00000000079${index}`, - session_id: WAKE_NATIVE_SESSION, - }), - ); - } + } + if (requesting) { yield* harness.offerAndWait( claudeSdkFrame({ type: "system", @@ -15262,28 +15264,29 @@ describe("ClaudeAdapterV2 background wake turns", () => { session_id: WAKE_NATIVE_SESSION, }), ); - assert.lengthOf(harness.terminalEvents(), 0); + } + assert.lengthOf(harness.terminalEvents(), 0); - yield* TestClock.adjust("1 hour"); - yield* yieldTicks(50); - const surfaced = - harness.terminalEvents().length > 0 || - harness.events.some( - (event) => - event.type === "turn_item.updated" && - (event.turnItem.type === "system_notice" || event.turnItem.type === "error"), - ); - assert.isTrue(surfaced, "an hour of silence after the prompt started surfaced nothing"); - }).pipe( - Effect.provide( - Layer.mergeAll( - IdAllocator.layer, - McpProviderSessions.layer, - NodeServices.layer, - NodeCrypto.layer, - ), + yield* TestClock.adjust("1 hour"); + yield* yieldTicks(50); + const surfaced = + harness.terminalEvents().length > 0 || + harness.events.some( + (event) => + event.type === "turn_item.updated" && + (event.turnItem.type === "system_notice" || event.turnItem.type === "error"), + ); + assert.isTrue(surfaced, "an hour of silence after the prompt started surfaced nothing"); + }).pipe( + Effect.provide( + Layer.mergeAll( + IdAllocator.layer, + McpProviderSessions.layer, + NodeServices.layer, + NodeCrypto.layer, ), ), + ), ); // regression: #17531 a mod that holds a tool behind a focused pane must fail the turn, not hang it diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index b474c23fe20a6..caf864c2c6226 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -4949,7 +4949,7 @@ function formatClaudeUsageLimitWait(waitMs: number): string { interface ActiveClaudeTurnContext { retryBudgetFailure?: OrchestrationV2ProviderFailure; - // Set by a `requesting` status and cleared by the turn's next frame. + // Set when the prompt starts or a request goes out; cleared by the turn's next frame. unansweredRequestSince?: DateTime.Utc | undefined; readonly queryPolicy: ClaudeRuntimeQueryPolicy; readonly input: ProviderAdapter.ProviderAdapterV2TurnInput; @@ -6408,8 +6408,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( }, ); - // Partial messages are on, so a live request streams within seconds of `requesting`. - // A gateway can hold it open without ever letting the CLI time out and retry. + // Partial messages are on, so a started prompt or a sent request streams within seconds. + // A gateway can hold the request open without ever letting the CLI time out and retry. const failUnansweredRequest = Effect.fn("ClaudeAdapterV2.failUnansweredRequest")(function* ( context: ActiveClaudeTurnContext, since: DateTime.Utc, @@ -6424,7 +6424,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( makeProviderFailure({ class: "transport_error", code: "claude_request_unanswered", - message: `Claude sent nothing for ${PROVIDER_RETRY_BUDGET_MS / 60_000} minutes after sending its request. The API or a gateway in front of it is not responding.`, + message: `Claude sent nothing for ${PROVIDER_RETRY_BUDGET_MS / 60_000} minutes. The API or a gateway in front of it is not responding.`, retryable: false, }), isUnanswered, @@ -10591,10 +10591,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( return; } if (context === (yield* Ref.get(activeTurn))) { + const lifecycle = claudePromptLifecycle(message); if ( - message.type === "system" && - message.subtype === "status" && - message.status === "requesting" + (message.type === "system" && + message.subtype === "status" && + message.status === "requesting") || + (lifecycle?.state === "started" && lifecycle.uuid === context.promptUuid) ) { const since = yield* DateTime.now; context.unansweredRequestSince = since; From f083f14518e34611958628da09ce0240c7800f25 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Mon, 16 Nov 2026 18:46:34 +0000 Subject: [PATCH 4/6] fix(server): earlier background tasks no longer keep a silent Claude prompt running Subagent and task_* frames no longer clear the unanswered-request watchdog, and once the watchdog sends its stop, forced settlement depends only on the turn still being active. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 132 ++++++++++-------- .../Adapters/ClaudeAdapterV2.ts | 9 +- 2 files changed, 83 insertions(+), 58 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index c77cc7418967e..59307809ff6a2 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -15226,67 +15226,87 @@ describe("ClaudeAdapterV2 background wake turns", () => { // regression: #37708 a gateway that holds the request open leaves Claude silent after "requesting" it.effect.each([ - { case: "after the prompt starts", requesting: false }, - { case: "after a request goes out", requesting: true }, - ])("does not keep a turn silently running when Claude goes quiet $case", ({ requesting }) => - Effect.gen(function* () { - const harness = yield* makeWakeHarness; - const now = yield* DateTime.now; - yield* harness.runtime.startTurn( - makeClaudeTestTurnInput({ - threadId: harness.threadId, - providerThread: harness.providerThread, - now, - attemptId: RunAttemptId.make("attempt-claude-silent-after-started"), - text: "start again", - attachments: [], - }), - ); - // Captured from Claude Code 2.1.325 against a gateway that never answers /v1/messages. - for (const [index, state] of (["queued", "started"] as const).entries()) { - yield* harness.offerAndWait( - claudeSdkFrame({ - type: "command_lifecycle", - command_uuid: harness.promptUuid(0), - state, - uuid: `00000000-0000-4000-8000-00000000079${index}`, - session_id: WAKE_NATIVE_SESSION, - }), - ); - } - if (requesting) { - yield* harness.offerAndWait( - claudeSdkFrame({ - type: "system", - subtype: "status", - status: "requesting", - uuid: "00000000-0000-4000-8000-000000000792", - session_id: WAKE_NATIVE_SESSION, + { case: "after the prompt starts", requesting: false, backgroundProgress: false }, + { case: "after a request goes out", requesting: true, backgroundProgress: false }, + { + case: "while an earlier background task reports progress", + requesting: false, + backgroundProgress: true, + }, + ])( + "does not keep a turn silently running when Claude goes quiet $case", + ({ requesting, backgroundProgress }) => + Effect.gen(function* () { + const harness = yield* makeWakeHarness; + const now = yield* DateTime.now; + yield* harness.runtime.startTurn( + makeClaudeTestTurnInput({ + threadId: harness.threadId, + providerThread: harness.providerThread, + now, + attemptId: RunAttemptId.make("attempt-claude-silent-after-started"), + text: "start again", + attachments: [], }), ); - } - assert.lengthOf(harness.terminalEvents(), 0); + // Captured from Claude Code 2.1.325 against a gateway that never answers /v1/messages. + for (const [index, state] of (["queued", "started"] as const).entries()) { + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "command_lifecycle", + command_uuid: harness.promptUuid(0), + state, + uuid: `00000000-0000-4000-8000-00000000079${index}`, + session_id: WAKE_NATIVE_SESSION, + }), + ); + } + if (requesting) { + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "system", + subtype: "status", + status: "requesting", + uuid: "00000000-0000-4000-8000-000000000792", + session_id: WAKE_NATIVE_SESSION, + }), + ); + } + if (backgroundProgress) { + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "system", + subtype: "task_progress", + task_id: "earlier-background-task", + description: "Earlier background task", + usage: { total_tokens: 1, tool_uses: 0, duration_ms: 1 }, + uuid: "00000000-0000-4000-8000-000000000793", + session_id: WAKE_NATIVE_SESSION, + }), + ); + } + assert.lengthOf(harness.terminalEvents(), 0); - yield* TestClock.adjust("1 hour"); - yield* yieldTicks(50); - const surfaced = - harness.terminalEvents().length > 0 || - harness.events.some( - (event) => - event.type === "turn_item.updated" && - (event.turnItem.type === "system_notice" || event.turnItem.type === "error"), - ); - assert.isTrue(surfaced, "an hour of silence after the prompt started surfaced nothing"); - }).pipe( - Effect.provide( - Layer.mergeAll( - IdAllocator.layer, - McpProviderSessions.layer, - NodeServices.layer, - NodeCrypto.layer, + yield* TestClock.adjust("1 hour"); + yield* yieldTicks(50); + const surfaced = + harness.terminalEvents().length > 0 || + harness.events.some( + (event) => + event.type === "turn_item.updated" && + (event.turnItem.type === "system_notice" || event.turnItem.type === "error"), + ); + assert.isTrue(surfaced, "an hour of silence after the prompt started surfaced nothing"); + }).pipe( + Effect.provide( + Layer.mergeAll( + IdAllocator.layer, + McpProviderSessions.layer, + NodeServices.layer, + NodeCrypto.layer, + ), ), ), - ), ); // regression: #17531 a mod that holds a tool behind a focused pane must fail the turn, not hang it diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index caf864c2c6226..08e73322ca8fa 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -6427,7 +6427,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( message: `Claude sent nothing for ${PROVIDER_RETRY_BUDGET_MS / 60_000} minutes. The API or a gateway in front of it is not responding.`, retryable: false, }), - isUnanswered, + // Once the stop is sent, a frame clearing the silence must not skip forced settlement. + Effect.map(Ref.get(activeTurn), (active) => active === context), ); }); @@ -10604,7 +10605,11 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( Effect.delay(PROVIDER_RETRY_BUDGET_MS), Effect.forkIn(sessionScope), ); - } else { + } else if ( + // Background tasks from earlier turns keep streaming while the root request hangs. + Reflect.get(message, "parent_tool_use_id") == null && + !(message.type === "system" && message.subtype.startsWith("task_")) + ) { context.unansweredRequestSince = undefined; } } From 9ad11b74a874d9f6ada62b58c1a9472ccb44ce75 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Mon, 16 Nov 2026 19:02:47 +0000 Subject: [PATCH 5/6] fix(server): a long forked skill is not failed as a silent Claude request A task_started frame is this turn's own progress, so it clears the unanswered-request watchdog; progress, update and notification frames from earlier background tasks still do not. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 21 +++++++++++++++++-- .../Adapters/ClaudeAdapterV2.ts | 9 ++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index 59307809ff6a2..acec96026e74c 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -15228,6 +15228,7 @@ describe("ClaudeAdapterV2 background wake turns", () => { it.effect.each([ { case: "after the prompt starts", requesting: false, backgroundProgress: false }, { case: "after a request goes out", requesting: true, backgroundProgress: false }, + { case: "while a skill it forked runs", requesting: false, forkedTask: true }, { case: "while an earlier background task reports progress", requesting: false, @@ -15235,7 +15236,7 @@ describe("ClaudeAdapterV2 background wake turns", () => { }, ])( "does not keep a turn silently running when Claude goes quiet $case", - ({ requesting, backgroundProgress }) => + ({ requesting, backgroundProgress = false, forkedTask = false }) => Effect.gen(function* () { const harness = yield* makeWakeHarness; const now = yield* DateTime.now; @@ -15285,6 +15286,18 @@ describe("ClaudeAdapterV2 background wake turns", () => { }), ); } + if (forkedTask) { + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "system", + subtype: "task_started", + task_id: "forked-skill-task", + description: "Forked skill", + uuid: "00000000-0000-4000-8000-000000000794", + session_id: WAKE_NATIVE_SESSION, + }), + ); + } assert.lengthOf(harness.terminalEvents(), 0); yield* TestClock.adjust("1 hour"); @@ -15296,7 +15309,11 @@ describe("ClaudeAdapterV2 background wake turns", () => { event.type === "turn_item.updated" && (event.turnItem.type === "system_notice" || event.turnItem.type === "error"), ); - assert.isTrue(surfaced, "an hour of silence after the prompt started surfaced nothing"); + if (forkedTask) { + assert.lengthOf(harness.terminalEvents(), 0, "a long forked skill was failed as silence"); + } else { + assert.isTrue(surfaced, "an hour of silence after the prompt started surfaced nothing"); + } }).pipe( Effect.provide( Layer.mergeAll( diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index 08e73322ca8fa..0f267678abbe3 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -10606,9 +10606,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( Effect.forkIn(sessionScope), ); } else if ( - // Background tasks from earlier turns keep streaming while the root request hangs. + // Background tasks from earlier turns keep streaming while the root request hangs; + // a task this turn starts (a forked skill) is the turn's own progress. Reflect.get(message, "parent_tool_use_id") == null && - !(message.type === "system" && message.subtype.startsWith("task_")) + !( + message.type === "system" && + message.subtype.startsWith("task_") && + message.subtype !== "task_started" + ) ) { context.unansweredRequestSince = undefined; } From 6eea8212c8eeee28e9b6c6e4266a6dd991885a03 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Mon, 16 Nov 2026 19:18:15 +0000 Subject: [PATCH 6/6] fix(server): a nested task an earlier background agent starts does not hide a silent Claude prompt Only the root starts depth-1 tasks, so only those task_started frames clear the unanswered-request watchdog. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/ClaudeAdapterV2.test.ts | 20 ++++++++++++++++++- .../Adapters/ClaudeAdapterV2.ts | 6 +++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index acec96026e74c..b2b27327b66dc 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -15229,6 +15229,11 @@ describe("ClaudeAdapterV2 background wake turns", () => { { case: "after the prompt starts", requesting: false, backgroundProgress: false }, { case: "after a request goes out", requesting: true, backgroundProgress: false }, { case: "while a skill it forked runs", requesting: false, forkedTask: true }, + { + case: "while an earlier background agent starts a nested task", + requesting: false, + nestedTaskStarted: true, + }, { case: "while an earlier background task reports progress", requesting: false, @@ -15236,7 +15241,7 @@ describe("ClaudeAdapterV2 background wake turns", () => { }, ])( "does not keep a turn silently running when Claude goes quiet $case", - ({ requesting, backgroundProgress = false, forkedTask = false }) => + ({ requesting, backgroundProgress = false, forkedTask = false, nestedTaskStarted = false }) => Effect.gen(function* () { const harness = yield* makeWakeHarness; const now = yield* DateTime.now; @@ -15286,6 +15291,19 @@ describe("ClaudeAdapterV2 background wake turns", () => { }), ); } + if (nestedTaskStarted) { + yield* harness.offerAndWait( + claudeSdkFrame({ + type: "system", + subtype: "task_started", + task_id: "earlier-nested-task", + description: "Nested task of an earlier background agent", + spawn_depth: 2, + uuid: "00000000-0000-4000-8000-000000000795", + session_id: WAKE_NATIVE_SESSION, + }), + ); + } if (forkedTask) { yield* harness.offerAndWait( claudeSdkFrame({ diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index 0f267678abbe3..34d81c88d3559 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -10606,13 +10606,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( Effect.forkIn(sessionScope), ); } else if ( - // Background tasks from earlier turns keep streaming while the root request hangs; - // a task this turn starts (a forked skill) is the turn's own progress. + // Background tasks from earlier turns keep streaming while the root request hangs. + // Only the root starts depth-1 tasks, so such a start (a forked skill) is this turn's. Reflect.get(message, "parent_tool_use_id") == null && !( message.type === "system" && message.subtype.startsWith("task_") && - message.subtype !== "task_started" + !(message.subtype === "task_started" && (message.spawn_depth ?? 1) <= 1) ) ) { context.unansweredRequestSince = undefined;