From ea189999efebeefa9e21edc481ccd7f26f8a297d Mon Sep 17 00:00:00 2001 From: Harshil Vasoya Date: Mon, 16 Nov 2026 15:17:33 +0530 Subject: [PATCH 1/3] chore : render answered user question outside agent steps --- .../containers/AssistantMessageContainer.tsx | 19 ++++++++++++++++++- .../src/containers/ToolCallContainer.tsx | 1 + .../src/utils/computeAgentStepsSplit.ts | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx b/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx index 2a7df0e9da..2d377f71d3 100644 --- a/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx +++ b/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx @@ -21,6 +21,7 @@ import { readParallelToolGroups, } from '../utils/parallelToolGroups.js'; import { loaderActivityKey, loaderActivityProgress, resolveLoaderLabel } from '../utils/resolveActivityLabel.js'; +import { ASK_USER_TOOL_NAME, getAskUserAnswerResult } from '../utils/toolCallParsing.js'; import { AgentStepsContainer } from './AgentStepsContainer.js'; import { AssistantLeafPartContainer } from './AssistantLeafPartContainer.js'; import { AssistantTextContainer } from './AssistantTextContainer.js'; @@ -83,7 +84,15 @@ export function AssistantMessageContainer() { isCancelled && !isSessionReplay && cancellationReason === TURN_CANCELLATION_REASON.CANCELLED_FOR_NEXT_TURN; const cancelledBanner = isCancelled && !hideCancelled ? cancellationLabel(cancellationReason) : undefined; - const { cutIndex, hasFinal, toolCount, thinkingCount } = computeAgentStepsSplit(parts, isMessageRunning); + const { cutIndex, hasFinal, toolCount, thinkingCount } = computeAgentStepsSplit( + parts.map(p => ({ + type: p.type, + text: p.type === 'text' ? p.text : undefined, + name: p.type === 'data' ? p.name : undefined, + hidden: isAnsweredAskUser(p), + })), + isMessageRunning, + ); // Built-in indicator modes hide the loader while reasoning streams; we want it there too. // Hide when resume is unavailable (message stays "running" but no events arrive) or the @@ -105,6 +114,8 @@ export function AssistantMessageContainer() { } if (index < cutIndex) { + // Answered user questions stay visible: render them outside the collapsible Agent steps. + if (isAnsweredAskUser(part)) return null; if (part.type === 'reasoning') { return ['group-agentSteps', 'group-reasoning']; } @@ -174,3 +185,9 @@ export function AssistantMessageContainer() { ); } + +function isAnsweredAskUser(part: PartState): boolean { + return ( + part.type === 'tool-call' && part.toolName === ASK_USER_TOOL_NAME && getAskUserAnswerResult(part.result) != null + ); +} diff --git a/packages/trueforge-ui/src/containers/ToolCallContainer.tsx b/packages/trueforge-ui/src/containers/ToolCallContainer.tsx index f08ab4a927..4395ba5b47 100644 --- a/packages/trueforge-ui/src/containers/ToolCallContainer.tsx +++ b/packages/trueforge-ui/src/containers/ToolCallContainer.tsx @@ -207,6 +207,7 @@ export const ToolCallContainer: ToolCallMessagePartComponent = part => { ]} onSubmit={() => {}} readOnly + className="mb-2" /> ); } diff --git a/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts b/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts index 81ce5a5903..d49683594e 100644 --- a/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts +++ b/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts @@ -5,6 +5,8 @@ export type AgentStepPart = { type: PartState['type']; text?: string; name?: string; + /** Rendered outside the Agent steps group (e.g. answered user questions); not counted. */ + hidden?: boolean; }; function isAgentStepPart(part: AgentStepPart): boolean { @@ -63,6 +65,8 @@ export function computeAgentStepsSplit(parts: readonly AgentStepPart[], isRunnin const part = parts[i]; if (!part) continue; + if (part.hidden) continue; + if (part.type === 'tool-call') { toolCount++; } else if (part.type === 'reasoning') { From 64ff8c62e3bf7384f549cff2995371ae5c9af322 Mon Sep 17 00:00:00 2001 From: Harshil Vasoya Date: Mon, 16 Nov 2026 17:24:29 +0530 Subject: [PATCH 2/3] fix : Keep answered user questions visible outside collapsed Agent steps and add countAgentSteps utility for accurate step counting. --- .changeset/keep-answered-questions-visible.md | 5 +++ .../containers/AssistantMessageContainer.tsx | 22 ++++++------ packages/trueforge-ui/src/index.ts | 2 +- .../src/utils/computeAgentStepsSplit.ts | 35 +++++++++---------- .../test/utils/computeAgentStepsSplit.test.ts | 20 ++++++++--- 5 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 .changeset/keep-answered-questions-visible.md diff --git a/.changeset/keep-answered-questions-visible.md b/.changeset/keep-answered-questions-visible.md new file mode 100644 index 0000000000..6381b0b0c0 --- /dev/null +++ b/.changeset/keep-answered-questions-visible.md @@ -0,0 +1,5 @@ +--- +"@truefoundry/trueforge-ui": patch +--- + +Keep answered user questions visible outside the collapsed Agent steps, without delaying the reply or repeating step counts. diff --git a/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx b/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx index 2d377f71d3..b7a8d4c260 100644 --- a/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx +++ b/packages/trueforge-ui/src/containers/AssistantMessageContainer.tsx @@ -14,7 +14,7 @@ import { withSessionProps } from '../analytics/sessionProps.js'; import { useSlowActivityLabel } from '../hooks/useSlowActivityLabel.js'; import { useOptionalShellMode } from '../server/ShellModeContext.js'; import { useSlot } from '../theme/SlotsProvider.js'; -import { computeAgentStepsSplit } from '../utils/computeAgentStepsSplit.js'; +import { computeAgentStepsSplit, countAgentSteps } from '../utils/computeAgentStepsSplit.js'; import { isParallelToolGroupPart, parallelGroupKeyForPart, @@ -84,15 +84,13 @@ export function AssistantMessageContainer() { isCancelled && !isSessionReplay && cancellationReason === TURN_CANCELLATION_REASON.CANCELLED_FOR_NEXT_TURN; const cancelledBanner = isCancelled && !hideCancelled ? cancellationLabel(cancellationReason) : undefined; - const { cutIndex, hasFinal, toolCount, thinkingCount } = computeAgentStepsSplit( - parts.map(p => ({ - type: p.type, - text: p.type === 'text' ? p.text : undefined, - name: p.type === 'data' ? p.name : undefined, - hidden: isAnsweredAskUser(p), - })), - isMessageRunning, - ); + const stepParts = parts.map(p => ({ + type: p.type, + text: p.type === 'text' ? p.text : undefined, + name: p.type === 'data' ? p.name : undefined, + hidden: isAnsweredAskUser(p), + })); + const { cutIndex, hasFinal } = computeAgentStepsSplit(stepParts, isMessageRunning); // Built-in indicator modes hide the loader while reasoning streams; we want it there too. // Hide when resume is unavailable (message stays "running" but no events arrive) or the @@ -147,12 +145,14 @@ export function AssistantMessageContainer() { {({ part, children }) => { switch (part.type) { - case 'group-agentSteps': + case 'group-agentSteps': { + const { toolCount, thinkingCount } = countAgentSteps(part.indices.flatMap(i => stepParts[i] ?? [])); return ( {children} ); + } case 'group-reasoning': return ; case 'text': { diff --git a/packages/trueforge-ui/src/index.ts b/packages/trueforge-ui/src/index.ts index 6fc7a719f2..f636dfa2cc 100644 --- a/packages/trueforge-ui/src/index.ts +++ b/packages/trueforge-ui/src/index.ts @@ -504,7 +504,7 @@ export type { SessionEventTimelineSegment, SessionEventType } from './utils/sess export type { SessionTurnView } from './utils/sessionTurnViews.js'; // Utils -export { computeAgentStepsSplit } from './utils/computeAgentStepsSplit.js'; +export { computeAgentStepsSplit, countAgentSteps } from './utils/computeAgentStepsSplit.js'; export type { AgentStepPart, AgentStepsSplitResult } from './utils/computeAgentStepsSplit.js'; export { findSubAgentAncestorsForApproval } from './utils/findApprovalAncestors.js'; export { getErrorMessage } from './utils/getErrorMessage.js'; diff --git a/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts b/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts index d49683594e..8729788553 100644 --- a/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts +++ b/packages/trueforge-ui/src/utils/computeAgentStepsSplit.ts @@ -10,6 +10,7 @@ export type AgentStepPart = { }; function isAgentStepPart(part: AgentStepPart): boolean { + if (part.hidden) return false; return ( part.type === 'tool-call' || part.type === 'reasoning' || @@ -20,8 +21,21 @@ function isAgentStepPart(part: AgentStepPart): boolean { export interface AgentStepsSplitResult { cutIndex: number; hasFinal: boolean; - toolCount: number; - thinkingCount: number; +} + +/** Counts per accordion, so groups split by a visible part do not repeat message-wide totals. */ +export function countAgentSteps(parts: readonly AgentStepPart[]): { toolCount: number; thinkingCount: number } { + let toolCount = 0; + let thinkingCount = 0; + for (const part of parts) { + if (part.hidden) continue; + if (part.type === 'tool-call') { + toolCount++; + } else if (part.type === 'reasoning') { + thinkingCount++; + } + } + return { toolCount, thinkingCount }; } export function computeAgentStepsSplit(parts: readonly AgentStepPart[], isRunning: boolean): AgentStepsSplitResult { @@ -59,25 +73,8 @@ export function computeAgentStepsSplit(parts: readonly AgentStepPart[], isRunnin const actualCutIndex = finalConfirmed ? cutIdx : parts.length; - let toolCount = 0; - let thinkingCount = 0; - for (let i = 0; i < actualCutIndex; i++) { - const part = parts[i]; - if (!part) continue; - - if (part.hidden) continue; - - if (part.type === 'tool-call') { - toolCount++; - } else if (part.type === 'reasoning') { - thinkingCount++; - } - } - return { cutIndex: actualCutIndex, hasFinal: finalConfirmed, - toolCount, - thinkingCount, }; } diff --git a/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts b/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts index 467a1f6b3d..8d5c25c25a 100644 --- a/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts +++ b/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { computeAgentStepsSplit, type AgentStepPart } from '@/index.js'; +import { computeAgentStepsSplit, countAgentSteps, type AgentStepPart } from '@/index.js'; function text(content: string): AgentStepPart { return { type: 'text', text: content }; @@ -24,7 +24,6 @@ describe('computeAgentStepsSplit', () => { const result = computeAgentStepsSplit(parts, true); expect(result.cutIndex).toBe(0); expect(result.hasFinal).toBe(true); - expect(result.toolCount).toBe(0); }); it('holds back short trailing text while running when tools precede it', () => { @@ -39,8 +38,7 @@ describe('computeAgentStepsSplit', () => { const result = computeAgentStepsSplit(parts, true); expect(result.hasFinal).toBe(true); expect(result.cutIndex).toBe(2); - expect(result.toolCount).toBe(1); - expect(result.thinkingCount).toBe(1); + expect(countAgentSteps(parts.slice(0, result.cutIndex))).toEqual({ toolCount: 1, thinkingCount: 1 }); }); it('confirms final when not running', () => { @@ -56,4 +54,18 @@ describe('computeAgentStepsSplit', () => { expect(result.hasFinal).toBe(false); expect(result.cutIndex).toBe(parts.length); }); + + it('does not hold back text after an answered question that is the only tool call', () => { + const parts = [{ ...tool(), hidden: true }, text('hi')]; + const result = computeAgentStepsSplit(parts, true); + expect(result.hasFinal).toBe(true); + expect(result.cutIndex).toBe(1); + }); + + it('excludes hidden parts from counts', () => { + expect(countAgentSteps([tool(), { ...tool(), hidden: true }, reasoning()])).toEqual({ + toolCount: 1, + thinkingCount: 1, + }); + }); }); From 4b7e0a8489492152ef4264f115d3fd78bcf86885 Mon Sep 17 00:00:00 2001 From: Harshil Vasoya Date: Mon, 16 Nov 2026 17:31:07 +0530 Subject: [PATCH 3/3] fix : remove countAgentSteps export from index and adjust test imports for clarity --- packages/trueforge-ui/src/index.ts | 2 +- .../trueforge-ui/test/utils/computeAgentStepsSplit.test.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/trueforge-ui/src/index.ts b/packages/trueforge-ui/src/index.ts index f636dfa2cc..6fc7a719f2 100644 --- a/packages/trueforge-ui/src/index.ts +++ b/packages/trueforge-ui/src/index.ts @@ -504,7 +504,7 @@ export type { SessionEventTimelineSegment, SessionEventType } from './utils/sess export type { SessionTurnView } from './utils/sessionTurnViews.js'; // Utils -export { computeAgentStepsSplit, countAgentSteps } from './utils/computeAgentStepsSplit.js'; +export { computeAgentStepsSplit } from './utils/computeAgentStepsSplit.js'; export type { AgentStepPart, AgentStepsSplitResult } from './utils/computeAgentStepsSplit.js'; export { findSubAgentAncestorsForApproval } from './utils/findApprovalAncestors.js'; export { getErrorMessage } from './utils/getErrorMessage.js'; diff --git a/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts b/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts index 8d5c25c25a..9701d56d25 100644 --- a/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts +++ b/packages/trueforge-ui/test/utils/computeAgentStepsSplit.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from 'vitest'; -import { computeAgentStepsSplit, countAgentSteps, type AgentStepPart } from '@/index.js'; +import { computeAgentStepsSplit, type AgentStepPart } from '@/index.js'; +import { countAgentSteps } from '@/utils/computeAgentStepsSplit.js'; function text(content: string): AgentStepPart { return { type: 'text', text: content };