diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index d0dda62b1ff20..5dc0ddb775a14 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -7802,6 +7802,80 @@ describe("ClaudeAdapterV2 background wake turns", () => { ), ); + it("reads long or structured Claude text as an answer, not a short progress note", () => { + assert.isFalse(ClaudeAdapterV2.claudeTextReadsAsAnswer("Now checking the deploy log.")); + assert.isFalse(ClaudeAdapterV2.claudeTextReadsAsAnswer("- one\n- two")); + assert.isTrue(ClaudeAdapterV2.claudeTextReadsAsAnswer("x".repeat(400))); + assert.isTrue( + ClaudeAdapterV2.claudeTextReadsAsAnswer( + "## Shadow mode\n\nIt never places a bid, so it produces no sales or cost result for our choices at all.\n- It checks that our bids stay sane every day.\n- It shows where we disagree.", + ), + ); + }); + + it.effect.each([ + { setting: "1", expected: "final_answer" }, + { setting: undefined, expected: undefined }, + ])( + "tags a finished Claude answer as final_answer only when the setting is $setting", + ({ setting, expected }) => + Effect.gen(function* () { + const harness = yield* makeWakeHarnessWithOptions( + setting === undefined + ? {} + : { environment: { [ClaudeAdapterV2.CLAUDE_ANSWERS_VISIBLE_ENV]: setting } }, + ); + yield* harness.runtime.startTurn( + makeClaudeTestTurnInput({ + threadId: harness.threadId, + providerThread: harness.providerThread, + now: yield* DateTime.now, + attemptId: RunAttemptId.make(`answer-phase-${setting ?? "off"}`), + text: "Explain shadow mode", + attachments: [], + }), + ); + const answer = `## Shadow mode\n\n${"It never places a bid. ".repeat(20)}`; + yield* Queue.offer( + harness.sdkMessages, + claudeSdkFrame({ + type: "assistant", + uuid: "answer-snapshot", + session_id: WAKE_NATIVE_SESSION, + parent_tool_use_id: null, + message: { + id: "answer-message", + model: "claude-opus-5-5", + content: [{ type: "text", text: answer }], + }, + }), + ); + yield* Queue.offer( + harness.sdkMessages, + makeResultFrame({ uuid: "answer-result", result: "" }), + ); + yield* Queue.take(harness.terminalReceipts); + const replies = harness.events.flatMap((event) => + event.type === "turn_item.updated" && event.turnItem.type === "assistant_message" + ? [event.turnItem] + : [], + ); + const last = replies.at(-1); + assert.equal(last?.status, "completed"); + assert.equal(last?.type === "assistant_message" ? last.phase : undefined, expected); + }).pipe( + Effect.scoped, + Effect.provide( + Layer.mergeAll( + IdAllocator.layer, + McpProviderSessions.layer, + NodeServices.layer, + NodeCrypto.layer, + ), + ), + ), + ); + // regression: #17270 root text_delta frames stream the reply before the block's snapshot it.effect("streams Claude assistant text deltas before the completed snapshot", () => Effect.gen(function* () { diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index edb8ef01301a9..b75576dfb2747 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -4815,6 +4815,21 @@ function providerFailureFromApiRetry(message: SDKAPIRetryMessage): Orchestration }); } +export const CLAUDE_ANSWERS_VISIBLE_ENV = "T3CODE_CLAUDE_ANSWERS_VISIBLE"; + +/** + * Claude has no answer phase, so clients fold every message but a turn's last under "Worked for". + * An answer followed by more work (a tool, a question card) then disappears. Opt-in: tag a finished + * message that reads as an answer, not a one-line progress note, as final_answer so it stays out. + */ +export function claudeTextReadsAsAnswer(text: string): boolean { + const trimmed = text.trim(); + return ( + trimmed.length >= 400 || + (trimmed.length >= 150 && /^(?:#{1,6} |[-*] |\d+\. |\|)/m.test(trimmed)) + ); +} + function buildAssistantArtifacts(input: { readonly idAllocator: IdAllocator.IdAllocatorV2["Service"]; readonly turnInput: ProviderAdapter.ProviderAdapterV2TurnInput; @@ -4827,6 +4842,7 @@ function buildAssistantArtifacts(input: { readonly completedAt: DateTime.Utc; // A streamed message keeps its first timestamp across updates. readonly createdAt?: DateTime.Utc; + readonly answersVisible?: boolean; }): { readonly node: OrchestrationV2ExecutionNode; readonly message: OrchestrationV2ConversationMessage; @@ -4904,6 +4920,9 @@ function buildAssistantArtifacts(input: { messageId, text: input.text, streaming, + ...(!streaming && input.answersVisible === true && claudeTextReadsAsAnswer(input.text) + ? { phase: "final_answer" as const } + : {}), }, }; } @@ -9047,6 +9066,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( }) { const ordinal = yield* resolveItemOrdinal(input.context, input.nativeItemId); const artifacts = buildAssistantArtifacts({ + answersVisible: adapterOptions.environment[CLAUDE_ANSWERS_VISIBLE_ENV] === "1", idAllocator, turnInput: input.context.input, providerTurnId: input.context.providerTurnId, @@ -9302,6 +9322,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( input.context.assistant.fallbackNativeItemId, ); const artifacts = buildAssistantArtifacts({ + answersVisible: adapterOptions.environment[CLAUDE_ANSWERS_VISIBLE_ENV] === "1", idAllocator, turnInput: input.context.input, providerTurnId: input.context.providerTurnId,