pi-agent-flow 2.0.7 → 2.0.9

package/dist/tui/render.js

@@ -24,6 +24,14 @@ function getAnonymousFlowId() {
 export function resetAnonymousFlowIdCounter() {
     anonFlowIdCounter = 0;
 }
+function getContentRole(baseRole, text, useError) {
+    if (useError)
+        return "msgError";
+    if (["[awaiting...]", "[n/a]", "[skipped]", "[approved]", "[finished]"].includes(text)) {
+        return "placeholder";
+    }
+    return baseRole;
+}
 function getLiveTextWithFallback(id) {
     const value = getLiveText(id);
     if (value !== undefined)
@@ -31,7 +39,7 @@ function getLiveTextWithFallback(id) {
     const fallbackId = id.includes("#") ? "collapsed" + id.slice(id.indexOf("#")) : "collapsed";
     return getLiveText(fallbackId);
 }
-import { formatCompactStats, formatFlowTypeName, lowerFirstWord, truncateChars, tailText, getTruncationBudget, visibleLength, stripAnsi, formatModelLabel, formatContextLabel, formatTps, italic } from "./render-utils.js";
+import { formatCompactStats, formatFlowTypeName, lowerFirstWord, truncateChars, tailText, getTruncationBudget, visibleLength, stripAnsi, formatModelLabel, formatContextLabel, formatTps } from "./render-utils.js";
 function shortenPath(p) {
     const home = os.homedir();
     return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
@@ -395,12 +403,14 @@ export function renderFlowResult(result, expanded, theme, args, config) {
                 type: flowRequest.type || "unknown",
                 agentSource: "user",
                 intent: flowRequest.intent || "Processing...",
-                aim: flowRequest.aim || flowRequest.intent || "Processing...",
+                aim: flowRequest.aim ?? flowRequest.intent ?? "Processing...",
                 acceptance: flowRequest.acceptance,
                 exitCode: -1, // In progress
                 messages: [],
                 stderr: "",
                 usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0, toolCalls: 0 },
+                ...(flowRequest.model ? { model: flowRequest.model } : {}),
+                ...(flowRequest.maxContextTokens !== undefined ? { maxContextTokens: flowRequest.maxContextTokens } : {}),
             };
             const ghostId = resolvedToolCallId || 'ghost';
             if (expanded) {
@@ -473,140 +483,6 @@ export function renderFlowResult(result, expanded, theme, args, config) {
     return container;
 }
 // ---------------------------------------------------------------------------
-// Trace rendering — simplified, no model, inline stats
-// ---------------------------------------------------------------------------
-export function renderTraceCall(_args, _theme, _config) {
-    // Trace call frame is invisible — the result frame shows 'trace    <aim>'.
-    // Returning an empty Container avoids a duplicate 'trace' line.
-    return new Container();
-}
-export function renderTraceResult(result, expanded, theme, args, config) {
-    const details = result.details;
-    const streamingText = result.content?.[0]?.type === "text" ? result.content[0].text : undefined;
-    // Resolve id (same pattern as renderFlowResult)
-    let resolvedToolCallId;
-    if (args?.state) {
-        const s = args.state;
-        resolvedToolCallId = s.__widgetId;
-        if (!resolvedToolCallId) {
-            resolvedToolCallId = result._toolCallId || args?.toolCallId || args?.id;
-            if (!resolvedToolCallId) {
-                resolvedToolCallId = getAnonymousFlowId();
-            }
-            s.__widgetId = resolvedToolCallId;
-        }
-    }
-    else {
-        resolvedToolCallId = result._toolCallId || args?.toolCallId || args?.id;
-    }
-    const id = resolvedToolCallId || "trace";
-    const now = Date.now();
-    let container = new Container();
-    // Get the SingleResult
-    let r;
-    if (details?.results && details.results.length > 0) {
-        r = details.results[0];
-    }
-    const isComplete = r ? isFlowStatusComplete(r) : false;
-    // Header line: ● trace · <aim> · <stats>
-    const typeName = formatFlowTypeName("trace");
-    const aimText = r?.aim || r?.intent || streamingText || "trace";
-    const initialDot = r ? flowStatusIcon(r, theme) : theme.fg("success", "●");
-    const dotPlaceholder = stripAnsi(initialDot) + " ";
-    const statsParts = [];
-    if (r) {
-        if (r.maxContextTokens !== undefined || r.usage.contextTokens > 0) {
-            statsParts.push(formatContextLabel(r.usage.contextTokens, r.maxContextTokens));
-        }
-        statsParts.push(formatTps(r.usage.smoothedTps));
-    }
-    const displayStats = statsParts.length > 0 ? " · " + statsParts.join(" · ") : "";
-    const statsPlain = stripAnsi(displayStats);
-    const headerPlain = `${dotPlaceholder}${typeName}${statsPlain}`;
-    const headerSegments = [
-        { text: dotPlaceholder, style: (_s) => (r ? getScintillatingStatusDot(r, theme, Date.now(), id) : initialDot) + " " },
-        { text: typeName, style: (s) => applyRole("flowName", s, theme, config) },
-    ];
-    if (statsPlain) {
-        headerSegments.push({ text: displayStats, style: (s) => applyRole("stats", s, theme, config) });
-    }
-    container.addChild(new DynamicScrambleText(`${initialDot} ${applyRole("flowName", typeName, theme, config)}${applyRole("stats", displayStats, theme, config)}`, () => {
-        const now2 = Date.now();
-        const result2 = scrambleManager.updateText(id, "header", headerPlain, now2, isComplete, true);
-        return reconstructHeader(result2.content, headerSegments);
-    }, true));
-    // Cmd line: └─ cmd ▸ <last tool call>
-    const actTree = "└─";
-    const actLabel = ` cmd ▸ `;
-    if (r?.messages && r.messages.length > 0) {
-        const lastTool = getLastToolCall(r.messages);
-        const actStr = lastTool ? formatFlowToolCall(lastTool.name, lastTool.args, theme.fg.bind(theme)) : "[n/a]";
-        const actFullText = stripAnsi(lowerFirstWord(actStr));
-        const actInitial = `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole("actContent", italic(actFullText), theme, config)}`;
-        container.addChild(new DynamicScrambleText(actInitial, () => {
-            const now2 = Date.now();
-            const freshAct = lastTool ? formatFlowToolCall(lastTool.name, lastTool.args, theme.fg.bind(theme)) : "[n/a]";
-            const freshPlain = stripAnsi(lowerFirstWord(freshAct));
-            const result2 = scrambleManager.updateAct(id, freshPlain, now2, isComplete, true);
-            const content = result2.content;
-            return `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole("actContent", italic(content), theme, config)}`;
-        }, true));
-    }
-    else {
-        // No messages yet — show awaiting
-        const actInitial = `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole("prefixLabel", "[awaiting...]", theme, config)}`;
-        container.addChild(new DynamicScrambleText(actInitial, () => {
-            const now2 = Date.now();
-            const plain = "[awaiting...]";
-            const result2 = scrambleManager.updateAct(id, plain, now2, isComplete, true);
-            const content = result2.content;
-            return `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole((r && isFlowAwaiting(r)) ? "prefixLabel" : "actContent", italic(content), theme, config)}`;
-        }, true));
-    }
-    // Expanded view: add full output
-    if (expanded) {
-        const flowOutput = streamingText;
-        if (flowOutput) {
-            container.addChild(new Spacer(1));
-            container.addChild(new Markdown(flowOutput, 0, 0, getMarkdownTheme()));
-        }
-    }
-    // In-place mutation pattern (same as renderFlowResult)
-    if (args?.state) {
-        const s = args.state;
-        if (!s.__rootContainer) {
-            if (container instanceof Container) {
-                s.__rootContainer = container;
-            }
-            else {
-                const root = new Container();
-                root.addChild(container);
-                s.__rootContainer = root;
-            }
-        }
-        else if (container !== s.__rootContainer) {
-            const root = s.__rootContainer;
-            root.clear();
-            if (container instanceof Container) {
-                const children = [...container.children];
-                for (const child of children) {
-                    root.addChild(child);
-                }
-            }
-            else {
-                root.addChild(container);
-            }
-            root.invalidate();
-            container = root;
-        }
-    }
-    if (isComplete) {
-        scrambleManager.completeFlow(id);
-    }
-    runScrambleTimer(args, id);
-    return container;
-}
-// ---------------------------------------------------------------------------
 // Single flow result
 // ---------------------------------------------------------------------------
 export function renderSingleFlowResult(r, expanded, theme, streamingText, toolCallId, config) {
@@ -735,16 +611,17 @@ function renderFlowExpanded(r, icon, error, displayItems, flowOutput, theme, id,
     }
     // Output: animate streaming text; show clean markdown when complete
     if (isFlowAwaiting(r)) {
-        container.addChild(new Text(applyRole("prefixLabel", "[awaiting...]", theme, config), 0, 0));
+        container.addChild(new Text(applyRole("placeholder", "[awaiting...]", theme, config), 0, 0));
     }
     else if (!isComplete && streamingText != null) {
         const msgBudget = getTruncationBudget(0);
         const displayMsg = tailText(stripAnsi(streamingText), msgBudget);
-        container.addChild(new DynamicScrambleText(displayMsg, () => {
+        container.addChild(new DynamicScrambleText(applyRole("msgContent", displayMsg, theme, config), () => {
             const budget = getTruncationBudget(0);
             const freshStreamingText = getLiveTextWithFallback(id) ?? streamingText;
             const text = tailText(stripAnsi(freshStreamingText), budget);
-            return scrambleManager.updateMsg(id, text, Date.now(), isComplete, undefined, true).content;
+            const result = scrambleManager.updateMsg(id, text, Date.now(), isComplete, undefined, true);
+            return result.isAnimating ? applyRole("msgContent", result.content, theme, config) : applyRole("msgContent", text, theme, config);
         }));
     }
     else if (flowOutput) {
@@ -798,12 +675,13 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
         const ctxLabel = formatContextLabel(r.usage.contextTokens, r.maxContextTokens);
         statsParts.push(ctxLabel);
     }
-    const tpsFormatted = formatTps(r.usage.smoothedTps);
-    statsParts.push(tpsFormatted);
     let displayStats = statsParts.join(" · ");
-    // Flash TPS value when it changes
-    const tpsNum = tpsFormatted.slice(0, -4); // remove " t/s" suffix
     if (r.usage.smoothedTps && r.usage.smoothedTps > 0) {
+        const tpsFormatted = formatTps(r.usage.smoothedTps);
+        statsParts.push(tpsFormatted);
+        displayStats = statsParts.join(" · ");
+        // Flash TPS value when it changes
+        const tpsNum = tpsFormatted.slice(0, -4); // remove " t/s" suffix
         const scrambledTps = scrambleManager.updateTps(id, tpsNum, now, isComplete, true);
         if (scrambledTps !== tpsNum) {
             displayStats = displayStats.replace(`${tpsNum} t/s`, `${scrambledTps} t/s`);
@@ -833,20 +711,20 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
         return reconstructHeader(result.content, headerSegments);
     }, true));
     // aim: line — glitch on text change
-    if (r.aim) {
+    if (r.aim && r.type !== "trace") {
         const aimTree = "├─";
         const aimLabel = ` aim ▸ `;
         const aimPrefix = `${aimTree}${aimLabel}`;
         const budget = getTruncationBudget(visibleLength(aimPrefix));
         const displayAim = isFlowAwaiting(r) ? "[awaiting...]" : truncateChars(lowerFirstWord(r.aim), budget);
-        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", aimLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "aimContent", italic(displayAim), theme, config)}`, () => {
+        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", aimLabel, theme, config)}${applyRole(getContentRole("aimContent", displayAim), displayAim, theme, config)}`, () => {
             const now = Date.now();
             const freshAimLabel = ` aim ▸ `;
             const freshAimPrefix = `${aimTree}${freshAimLabel}`;
             const freshBudget = getTruncationBudget(visibleLength(freshAimPrefix));
             const freshText = isFlowAwaiting(r) ? "[awaiting...]" : truncateChars(lowerFirstWord(r.aim), freshBudget);
             const result = scrambleManager.updateAim(id, freshText, now, isComplete, true);
-            return `${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", freshAimLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "aimContent", italic(result.content), theme, config)}`;
+            return `${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", freshAimLabel, theme, config)}${applyRole(getContentRole("aimContent", freshText), result.content, theme, config)}`;
         }, true));
     }
     // act: line (last tool call with count)
@@ -859,14 +737,14 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
     const budget = getTruncationBudget(visibleLength(prefixStub));
     const actFullText = stripAnsi(lowerFirstWord(actStr));
     const initialActContent = isFlowAwaiting(r) ? "[n/a]" : (actFullText.length > budget ? tailText(actFullText, budget) : actFullText);
-    container.addChild(new DynamicScrambleText(`${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "actContent", italic(initialActContent), theme, config)}`, () => {
+    container.addChild(new DynamicScrambleText(`${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(getContentRole("actContent", initialActContent), initialActContent, theme, config)}`, () => {
         const now = Date.now();
         const actLabel = ` cmd ▸ `;
         const actPrefix = `${actTree}${actLabel}`;
         const freshBudget = getTruncationBudget(visibleLength(actPrefix));
         const displayAct = isFlowAwaiting(r) ? "[n/a]" : tailText(actFullText, freshBudget);
         const actContent = scrambleManager.updateAct(id, displayAct, now, isComplete, true).content;
-        return `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "actContent", italic(actContent), theme, config)}`;
+        return `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(getContentRole("actContent", displayAct), actContent, theme, config)}`;
     }, true));
     // msg: line (last assistant text or streaming) — full mode only
     if (!isLite) {
@@ -910,7 +788,7 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
         const msgTree = "└─";
         const msgLabel = ` msg ▸ `;
         const initialMsgPrefix = `${msgTree}${msgLabel}`;
-        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(useError ? "msgError" : "msgContent", italic(initialMsgContent), theme, config)}`, () => {
+        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(getContentRole("msgContent", initialMsgContent, useError), initialMsgContent, theme, config)}`, () => {
             const now = Date.now();
             const msgLabel = ` msg ▸ `;
             const msgPrefix = `${msgTree}${msgLabel}`;
@@ -931,7 +809,7 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
             }
             const displayMsg = needsTail ? tailText(freshRawMsg, msgBudget) : truncateChars(freshRawMsg, msgBudget);
             const result = scrambleManager.updateMsg(id, displayMsg, now, isComplete, undefined, true);
-            return `${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(useError ? "msgError" : "msgContent", italic(result.content), theme, config)}`;
+            return `${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(getContentRole("msgContent", freshRawMsg, useError), result.content, theme, config)}`;
         }, true));
     }
     if (isComplete) {
@@ -1003,17 +881,18 @@ function renderMultiFlowExpanded(results, successCount, icon, theme, baseId, now
         }
         // Output: animate streaming text; show clean markdown when complete
         if (isFlowAwaiting(r)) {
-            container.addChild(new Text(applyRole("prefixLabel", "[awaiting...]", theme, config), 0, 0));
+            container.addChild(new Text(applyRole("placeholder", "[awaiting...]", theme, config), 0, 0));
         }
         else if (!isComplete && r.streamingText != null) {
             const streamingRaw = r.streamingText;
             const msgBudget = getTruncationBudget(0);
             const displayMsg = tailText(stripAnsi(streamingRaw), msgBudget);
-            container.addChild(new DynamicScrambleText(displayMsg, () => {
+            container.addChild(new DynamicScrambleText(applyRole("msgContent", displayMsg, theme, config), () => {
                 const budget = getTruncationBudget(0);
                 const freshStreamingText = getLiveTextWithFallback(flowId) ?? streamingRaw;
                 const text = tailText(stripAnsi(freshStreamingText), budget);
-                return scrambleManager.updateMsg(flowId, text, Date.now(), isComplete, undefined, true).content;
+                const result = scrambleManager.updateMsg(flowId, text, Date.now(), isComplete, undefined, true);
+                return result.isAnimating ? applyRole("msgContent", result.content, theme, config) : applyRole("msgContent", text, theme, config);
             }));
         }
         else if (flowOutput) {
@@ -1168,17 +1047,18 @@ function renderFlowHeader(container, r, flowId, headerPrefix, theme, now, config
             const ctxLabel = formatContextLabel(r.usage.contextTokens, r.maxContextTokens);
             statsParts.push(ctxLabel);
         }
-        const tpsFormatted = formatTps(r.usage.smoothedTps);
-        statsParts.push(tpsFormatted);
         let displayStats = statsParts.join(" · ");
-        const tpsNum = tpsFormatted.slice(0, -4); // remove " t/s" suffix
         if (r.usage.smoothedTps && r.usage.smoothedTps > 0) {
+            const tpsFormatted = formatTps(r.usage.smoothedTps);
+            statsParts.push(tpsFormatted);
+            displayStats = statsParts.join(" · ");
+            const tpsNum = tpsFormatted.slice(0, -4); // remove " t/s" suffix
             const scrambledTps = scrambleManager.updateTps(flowId, tpsNum, now, flowComplete, true);
             if (scrambledTps !== tpsNum) {
                 displayStats = displayStats.replace(`${tpsNum} t/s`, `${scrambledTps} t/s`);
             }
         }
-        const modelSegment = modelLabel ? ` · ${modelLabel}` : "";
+        const modelSegment = modelLabel ? `  ${modelLabel}` : "";
         const statsSegment = ` · ${displayStats}`;
         const statsPlain = stripAnsi(statsSegment);
         headerLine = `${applyRole("treeChars", headerPrefix, theme, config)} ${initialDot} ${applyRole("flowName", typeName, theme, config)}${applyRole("modelName", modelSegment, theme, config)}${applyRole("stats", statsSegment, theme, config)}`;
@@ -1201,20 +1081,20 @@ function renderFlowBody(container, r, flowId, indent, theme, now, config) {
     const isComplete = isFlowStatusComplete(r);
     const flowComplete = isComplete;
     // aim: line — glitch on text change
-    if (r.aim) {
+    if (r.aim && r.type !== "trace") {
         const aimTree = indent + "├─";
         const aimLabel = ` aim ▸ `;
         const aimPrefix = `${aimTree}${aimLabel}`;
         const budget = getTruncationBudget(visibleLength(aimPrefix));
         const displayAim = isFlowAwaiting(r) ? "[awaiting...]" : truncateChars(lowerFirstWord(r.aim), budget);
-        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", aimLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "aimContent", italic(displayAim), theme, config)}`, () => {
+        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", aimLabel, theme, config)}${applyRole(getContentRole("aimContent", displayAim), displayAim, theme, config)}`, () => {
             const now = Date.now();
             const freshAimLabel = ` aim ▸ `;
             const freshAimPrefix = `${aimTree}${freshAimLabel}`;
             const freshBudget = getTruncationBudget(visibleLength(freshAimPrefix));
             const freshText = isFlowAwaiting(r) ? "[awaiting...]" : truncateChars(lowerFirstWord(r.aim), freshBudget);
             const result = scrambleManager.updateAim(flowId, freshText, now, flowComplete, true);
-            return `${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", freshAimLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "aimContent", italic(result.content), theme, config)}`;
+            return `${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", freshAimLabel, theme, config)}${applyRole(getContentRole("aimContent", freshText), result.content, theme, config)}`;
         }, true));
     }
     // act: line (last tool call with count)
@@ -1227,14 +1107,14 @@ function renderFlowBody(container, r, flowId, indent, theme, now, config) {
     const budget = getTruncationBudget(visibleLength(prefixStub));
     const actFullText = stripAnsi(lowerFirstWord(actStr));
     const initialActContent = isFlowAwaiting(r) ? "[n/a]" : (actFullText.length > budget ? tailText(actFullText, budget) : actFullText);
-    container.addChild(new DynamicScrambleText(`${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "actContent", italic(initialActContent), theme, config)}`, () => {
+    container.addChild(new DynamicScrambleText(`${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(getContentRole("actContent", initialActContent), initialActContent, theme, config)}`, () => {
         const now = Date.now();
         const actLabel = ` cmd ▸ `;
         const actPrefix = `${actTree}${actLabel}`;
         const freshBudget = getTruncationBudget(visibleLength(actPrefix));
         const displayAct = isFlowAwaiting(r) ? "[n/a]" : tailText(actFullText, freshBudget);
         const actContent = scrambleManager.updateAct(flowId, displayAct, now, flowComplete, true).content;
-        return `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(isFlowAwaiting(r) ? "prefixLabel" : "actContent", italic(actContent), theme, config)}`;
+        return `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole(getContentRole("actContent", displayAct), actContent, theme, config)}`;
     }, true));
     // msg: line (live streaming text or last assistant text) — full mode only
     if (!isLite) {
@@ -1255,12 +1135,15 @@ function renderFlowBody(container, r, flowId, indent, theme, now, config) {
                 rawMsg = stripAnsi(r.errorMessage);
                 useError = true;
             }
-            else if (r.pingPongMeta && r.pingPongMeta.finalVerdict === "pass") {
+            else if ((r.pingPongMeta?.finalVerdict === "pass" || r.structuredOutput?.verdict === "pass") && r.type === "audit") {
                 rawMsg = "[approved]";
             }
-            else {
+            else if (r.type === "audit" && !r.structuredOutput?.summary && !getFlowOutput(r.messages)) {
                 rawMsg = "[finished]";
             }
+            else {
+                rawMsg = stripAnsi(r.structuredOutput?.summary ?? getFlowOutput(r.messages) ?? getFlowSummaryText(r)) || "[n/a]";
+            }
         }
         else {
             const liveMsgText = isFlowRunning(r) ? getLiveTextWithFallback(flowId) : undefined;
@@ -1290,7 +1173,7 @@ function renderFlowBody(container, r, flowId, indent, theme, now, config) {
         }
         const initialNeedsTail = !isFlowAwaiting(r) && isFlowRunning(r) && (r.streamingText != null || getLiveTextWithFallback(flowId) != null);
         const initialDisplayMsg = initialNeedsTail ? tailText(rawMsg, msgBudget) : truncateChars(rawMsg, msgBudget);
-        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(useError ? "msgError" : "msgContent", italic(initialDisplayMsg), theme, config)}`, () => {
+        container.addChild(new DynamicScrambleText(`${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(getContentRole("msgContent", initialDisplayMsg, useError), initialDisplayMsg, theme, config)}`, () => {
             const now = Date.now();
             const msgLabel = ` msg ▸ `;
             const msgPrefix = `${msgTree}${msgLabel}`;
@@ -1311,7 +1194,7 @@ function renderFlowBody(container, r, flowId, indent, theme, now, config) {
             }
             const displayMsg = needsTail ? tailText(freshRawMsg, msgBudget) : truncateChars(freshRawMsg, msgBudget);
             const result = scrambleManager.updateMsg(flowId, displayMsg, now, flowComplete, undefined, true);
-            return `${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(useError ? "msgError" : "msgContent", italic(result.content), theme, config)}`;
+            return `${applyRole("treeChars", msgTree, theme, config)}${applyRole("prefixLabel", msgLabel, theme, config)}${applyRole(getContentRole("msgContent", freshRawMsg, useError), result.content, theme, config)}`;
         }, true));
     }
 }