pi-agent-flow 2.0.0 → 2.0.2

package/dist/tui/render-utils.js

@@ -34,23 +34,20 @@ export function formatFlowTypeName(type) {
         return lower.slice(0, targetWidth);
     return lower.padEnd(targetWidth, " ");
 }
-/** Format tokens-per-second to a 5-char display (e.g., " 42.3", "    -"). */
-function formatTps(value) {
+/** Format tokens-per-second to a display string. */
+export function formatTps(value) {
     if (!value || value <= 0)
-        return "    -";
-    return value.toFixed(1).padStart(5);
+        return "-----";
+    return `${value.toFixed(1).padStart(5)} t/s`;
 }
 export function italic(text) {
     return `\x1b[3m${text}\x1b[23m`;
 }
-export function formatCompactTokenPair(usage) {
-    return `▲ ${formatFixedTokens(usage.input || 0)} ·`;
-}
 export function formatCompactStats(usage, model, maxWidth, options = {}) {
     const tokenParts = [`▲ ${formatFixedTokens(usage.input || 0)}`];
-    let runtimeParts = [`tps: ${formatTps(usage.smoothedTps)}`];
+    let runtimeParts = [formatTps(usage.smoothedTps)];
     if (!options.skipContext) {
-        runtimeParts.push(`ctx: ${formatFixedTokens(usage.contextTokens || 0)}`);
+        runtimeParts.push(formatFixedTokens(usage.contextTokens || 0));
     }
     const parts = options.skipTokens ? runtimeParts : [...tokenParts, ...runtimeParts];
     const displayModel = options.hideModel ? undefined : (model ? model.replace(/^[^/]+\//, "").toLowerCase() : undefined);
@@ -61,7 +58,8 @@ export function formatCompactStats(usage, model, maxWidth, options = {}) {
         if (visibleLength(narrow) <= maxWidth)
             return narrow;
         // Drop context tokens next.
-        const withoutContext = parts.filter((part) => !part.startsWith("ctx:"));
+        const tpsOnly = [formatTps(usage.smoothedTps)];
+        const withoutContext = options.skipTokens ? tpsOnly : [...tokenParts, ...tpsOnly];
         narrow = withoutContext.join(" - ");
         if (visibleLength(narrow) <= maxWidth)
             return narrow;
@@ -86,6 +84,34 @@ export function formatCountdown(ms) {
     const seconds = totalSeconds % 60;
     return `${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
 }
+export function formatModelLabel(model, maxTail = 10) {
+    if (!model)
+        return "";
+    const parts = model.split("/");
+    if (parts.length < 2)
+        return model.toLowerCase();
+    const provider = parts[0];
+    const modelPath = parts.slice(1).join("/").toLowerCase();
+    const shortened = modelPath.length > maxTail ? "..." + modelPath.slice(-maxTail) : modelPath;
+    return `${provider}/${shortened}`;
+}
+export function formatCountdownRemaining(deadlineAtMs) {
+    if (typeof deadlineAtMs !== "number")
+        return undefined;
+    const remaining = deadlineAtMs - Date.now();
+    if (remaining < 0)
+        return undefined;
+    return formatCountdown(remaining);
+}
+export function formatContextLabel(ctxTokens, maxCtxTokens) {
+    if (maxCtxTokens === undefined) {
+        return formatFixedTokens(ctxTokens).trim();
+    }
+    if (ctxTokens === 0) {
+        return `-----/${formatFixedTokens(maxCtxTokens).trim()}`;
+    }
+    return `${formatFixedTokens(ctxTokens).trim()}/${formatFixedTokens(maxCtxTokens).trim()}`;
+}
 /** Regex matching ANSI escape sequences. */
 const ANSI_RE = /\x1b\[[0-9;]*m/g;
 /** Return the visible (ANSI-stripped) character count. */

package/dist/tui/render-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-utils.js","sourceRoot":"","sources":["../../src/tui/render-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render-utils.js","sourceRoot":"","sources":["../../src/tui/render-utils.ts"],"names":[],"mappings":"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"}

package/dist/tui/render.d.ts

@@ -9,6 +9,15 @@ import type { SingleResult } from "../types/flow.js";
 /** Reset the anonymous counter — call in tests for deterministic ids. */
 export declare function resetAnonymousFlowIdCounter(): void;
 import { type FlowColorConfig, type FlowTheme } from "./flow-colors.js";
+/** Single segment of a multi-part header with its original plain length and style. */
+export interface HeaderSegment {
+    text: string;
+    style: (text: string) => string;
+}
+/** Reconstruct multi-segment ANSI styles on a flat string by splitting at
+ *  original segment boundaries and re-applying each segment's style function.
+ */
+export declare function reconstructHeader(content: string, segments: HeaderSegment[]): string;
 export declare function renderFlowCall(args: Record<string, any>, theme: FlowTheme, config?: FlowColorConfig): Container | Text;
 export declare function renderFlowResult(result: {
     content: Array<{

package/dist/tui/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/tui/render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,SAAS,EAAoB,IAAI,EAAiB,MAAM,sBAAsB,CAAC;AAExF,OAAO,KAAK,EACX,YAAY,EAGZ,MAAM,kBAAkB,CAAC;AAyB1B,yEAAyE;AACzE,wBAAgB,2BAA2B,IAAI,IAAI,CAElD;AAeD,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,SAAS,EAGf,MAAM,kBAAkB,CAAC;AA6G1B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAsBtH;AAMD,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,EAC9E,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,SAAS,EAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,MAAM,CAAC,EAAE,eAAe,GACtB,SAAS,GAAG,IAAI,CAyGlB;AAMD,wBAAgB,sBAAsB,CACrC,CAAC,EAAE,YAAY,EACf,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,SAAS,EAChB,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,eAAe,GACtB,SAAS,GAAG,IAAI,CAalB"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/tui/render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,SAAS,EAAoB,IAAI,EAAiB,MAAM,sBAAsB,CAAC;AAExF,OAAO,KAAK,EACX,YAAY,EAEZ,MAAM,kBAAkB,CAAC;AAyB1B,yEAAyE;AACzE,wBAAgB,2BAA2B,IAAI,IAAI,CAElD;AAeD,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,SAAS,EAGf,MAAM,kBAAkB,CAAC;AAkG1B,sFAAsF;AACtF,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAapF;AAOD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAsBtH;AAMD,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,EAC9E,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,SAAS,EAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,MAAM,CAAC,EAAE,eAAe,GACtB,SAAS,GAAG,IAAI,CAyGlB;AAMD,wBAAgB,sBAAsB,CACrC,CAAC,EAAE,YAAY,EACf,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,SAAS,EAChB,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,eAAe,GACtB,SAAS,GAAG,IAAI,CAalB"}

package/dist/tui/render.js

@@ -31,7 +31,7 @@ function getLiveTextWithFallback(id) {
     const fallbackId = id.includes("#") ? "collapsed" + id.slice(id.indexOf("#")) : "collapsed";
     return getLiveText(fallbackId);
 }
-import { formatCompactStats, formatCompactTokenPair, formatCountdown, formatFlowTypeName, lowerFirstWord, truncateChars, tailText, getTruncationBudget, visibleLength, stripAnsi } 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;
@@ -118,10 +118,23 @@ function sectionHeader(label) {
     const right = "─".repeat(Math.ceil(side));
     return `${left} ${label} ${right}`;
 }
-function getLiveCountdown(r) {
-    if (r.exitCode !== -1 || typeof r.deadlineAtMs !== "number")
-        return undefined;
-    return formatCountdown(r.deadlineAtMs - Date.now());
+/** Reconstruct multi-segment ANSI styles on a flat string by splitting at
+ *  original segment boundaries and re-applying each segment's style function.
+ */
+export function reconstructHeader(content, segments) {
+    let offset = 0;
+    const parts = [];
+    for (const seg of segments) {
+        const len = seg.text.length;
+        if (offset >= content.length)
+            break;
+        parts.push(seg.style(content.slice(offset, offset + len)));
+        offset += len;
+    }
+    if (offset < content.length) {
+        parts.push(content.slice(offset));
+    }
+    return parts.join("");
 }
 // ---------------------------------------------------------------------------
 // renderFlowCall — shown while the flow is being invoked
@@ -280,15 +293,21 @@ export function renderSingleFlowResult(r, expanded, theme, streamingText, toolCa
 function renderFlowExpanded(r, icon, error, displayItems, flowOutput, theme, id, now, isComplete, streamingText, config) {
     const mdTheme = getMarkdownTheme();
     const container = new Container();
-    // Header: uppercase type name with dots, no icon, no source
     const typeName = formatFlowTypeName(r.type);
     let header = applyRole("flowName", typeName, theme, config);
-    if (error && r.stopReason)
-        header += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
-    const plainHeader = typeName + (error && r.stopReason ? ` [${r.stopReason}]` : "");
+    const errorSegment = error && r.stopReason ? ` [${r.stopReason}]` : "";
+    if (errorSegment)
+        header += ` ${theme.fg("error", errorSegment)}`;
+    const plainHeader = typeName + errorSegment;
+    const headerSegments = [
+        { text: typeName, style: (s) => applyRole("flowName", s, theme, config) },
+    ];
+    if (errorSegment) {
+        headerSegments.push({ text: errorSegment, style: (s) => theme.fg("error", s) });
+    }
     container.addChild(new DynamicScrambleText(header, () => {
         const result = scrambleManager.updateText(id, 'header', plainHeader, Date.now(), isComplete);
-        return result.isAnimating ? applyRole("flowName", result.content, theme, config) : header;
+        return result.isAnimating ? reconstructHeader(result.content, headerSegments) : header;
     }));
     if (error && r.errorMessage) {
         container.addChild(new Text(scrambleManager.renderStatic(theme.fg("error", `Error: ${r.errorMessage}`)), 0, 0));
@@ -431,44 +450,55 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
     const container = new Container();
     const maxWidth = process.stdout.columns ?? 80;
     const typeName = formatCollapsedFlowHeaderTypeName(r.type);
-    const modelLabel = r.model ? r.model.replace(/^[^/]+\//, "").toLowerCase() : "";
+    const modelLabel = formatModelLabel(r.model);
     const headerPrefixLen = visibleLength(typeName) + visibleLength(modelLabel ? `    ${modelLabel} · ` : "    ");
-    const stats = formatCompactStats(r.usage, r.model, Math.max(maxWidth - headerPrefixLen, 20), { skipTokens: true, skipContext: true, hideModel: true });
     const isComplete = r.exitCode !== -1;
+    // Build header stats: ctxLabel · t/s
+    const statsParts = [];
+    if (r.maxContextTokens !== undefined || r.usage.contextTokens > 0) {
+        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 tpsMatch = stats.match(/tps:\s*(\S+)/);
-    let displayStats = stats;
-    if (tpsMatch) {
-        const scrambledTps = scrambleManager.updateTps(id, tpsMatch[1], now, isComplete, true);
-        if (scrambledTps !== tpsMatch[1]) {
-            displayStats = stats.replace(tpsMatch[1], scrambledTps);
-        }
-    }
-    let header = `${applyRole("flowName", typeName, theme, config)}${applyRole("modelName", modelLabel ? `    ${modelLabel} · ` : "    ", theme, config)}${applyRole("stats", displayStats, theme, config)}`;
-    if (error && r.stopReason)
-        header += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
-    // Scramble header on first render; show full styled header when complete
-    const plainHeader = typeName + (modelLabel ? `    ${modelLabel} · ` : "    ") + stripAnsi(displayStats) + (error && r.stopReason ? ` [${r.stopReason}]` : "");
+    const tpsNum = tpsFormatted.slice(0, -4); // remove " t/s" suffix
+    if (r.usage.smoothedTps && r.usage.smoothedTps > 0) {
+        const scrambledTps = scrambleManager.updateTps(id, tpsNum, now, isComplete, true);
+        if (scrambledTps !== tpsNum) {
+            displayStats = displayStats.replace(`${tpsNum} t/s`, `${scrambledTps} t/s`);
+        }
+    }
+    const modelSegment = modelLabel ? `    ${modelLabel} · ` : "    ";
+    const statsSegment = stripAnsi(displayStats);
+    const errorSegment = error && r.stopReason ? ` [${r.stopReason}]` : "";
+    let header = `${applyRole("flowName", typeName, theme, config)}${applyRole("modelName", modelSegment, theme, config)}${applyRole("stats", displayStats, theme, config)}`;
+    if (errorSegment)
+        header += ` ${theme.fg("error", errorSegment)}`;
+    const plainHeader = typeName + modelSegment + statsSegment + errorSegment;
+    const headerSegments = [
+        { text: typeName, style: (s) => applyRole("flowName", s, theme, config) },
+        { text: modelSegment, style: (s) => applyRole("modelName", s, theme, config) },
+        { text: statsSegment, style: (s) => applyRole("stats", s, theme, config) },
+    ];
+    if (errorSegment) {
+        headerSegments.push({ text: errorSegment, style: (s) => theme.fg("error", s) });
+    }
     container.addChild(new DynamicScrambleText(header, () => {
         const result = scrambleManager.updateText(id, 'header', plainHeader, Date.now(), isComplete, true);
-        return result.isAnimating ? applyRole("flowName", result.content, theme, config) : header;
+        return result.isAnimating ? reconstructHeader(result.content, headerSegments) : header;
     }, true));
     // aim: line — glitch on text change
     if (r.aim) {
-        const countdown = getLiveCountdown(r);
         const aimTree = "├─";
-        const aimLabel = countdown
-            ? ` aim ▸ ${countdown} · `
-            : ` aim ▸ `;
+        const aimLabel = ` aim ▸ `;
         const aimPrefix = `${aimTree}${aimLabel}`;
         const budget = getTruncationBudget(visibleLength(aimPrefix));
         const displayAim = truncateChars(lowerFirstWord(r.aim), budget);
         container.addChild(new DynamicScrambleText(`${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", aimLabel, theme, config)}${applyRole("aimContent", displayAim, theme, config)}`, () => {
             const now = Date.now();
-            const freshCountdown = getLiveCountdown(r);
-            const freshAimLabel = freshCountdown
-                ? ` aim ▸ ${freshCountdown} · `
-                : ` aim ▸ `;
+            const freshAimLabel = ` aim ▸ `;
             const freshAimPrefix = `${aimTree}${freshAimLabel}`;
             const freshBudget = getTruncationBudget(visibleLength(freshAimPrefix));
             const freshText = truncateChars(lowerFirstWord(r.aim), freshBudget);
@@ -480,31 +510,21 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
     const lastTool = getLastToolCall(r.messages);
     const actStr = lastTool ? formatFlowToolCall(lastTool.name, lastTool.args, theme.fg.bind(theme)) : "[n/a]";
     const actTree = "├─";
-    const actLabel = ` act ▸ ${r.usage.toolCalls} · `;
+    const actLabel = ` cmd ▸ `;
     const prefixStub = `${actTree}${actLabel}`;
     const budget = getTruncationBudget(visibleLength(prefixStub));
     const actFullText = stripAnsi(lowerFirstWord(actStr));
-    const initialActContent = actFullText.length > budget ? actFullText.slice(0, budget) : actFullText;
+    const initialActContent = actFullText.length > budget ? tailText(actFullText, budget) : actFullText;
     container.addChild(new DynamicScrambleText(`${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole("actContent", initialActContent, theme, config)}`, () => {
         const now = Date.now();
-        const displayAct = truncateChars(actFullText, budget);
+        const displayAct = tailText(actFullText, budget);
         const actContent = scrambleManager.updateAct(id, displayAct, now, isComplete, true).content;
-        let actKpi = String(r.usage.toolCalls);
-        const scrambledActKpi = scrambleManager.updateActKpi(id, actKpi, now, isComplete, true);
-        if (scrambledActKpi !== actKpi) {
-            actKpi = scrambledActKpi;
-        }
-        const actLabel = ` act ▸ ${actKpi} · `;
+        const actLabel = ` cmd ▸ `;
         const actPrefix = `${actTree}${actLabel}`;
         return `${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole("actContent", actContent, theme, config)}`;
     }, true));
     // msg: line (last assistant text or streaming)
-    let msgKpi = formatCompactTokenPair(r.usage);
-    const scrambledMsgKpi = scrambleManager.updateMsgKpi(id, msgKpi, now, isComplete, false);
-    if (scrambledMsgKpi !== msgKpi) {
-        msgKpi = scrambledMsgKpi;
-    }
-    const msgPrefixStub = `└─ msg ▸ ${msgKpi} `;
+    const msgPrefixStub = `└─ msg ▸ `;
     const msgBudget = getTruncationBudget(visibleLength(msgPrefixStub));
     let rawMsg;
     let useError = false;
@@ -534,16 +554,11 @@ function renderFlowCollapsed(r, icon, error, flowOutput, theme, streamingText, t
         ? tailText(rawMsg, msgBudget)
         : truncateChars(rawMsg, msgBudget);
     const msgTree = "└─";
-    const msgLabel = ` msg ▸ ${msgKpi} `;
+    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", initialMsgContent, theme, config)}`, () => {
         const now = Date.now();
-        let msgKpi = formatCompactTokenPair(r.usage);
-        const scrambledMsgKpi = scrambleManager.updateMsgKpi(id, msgKpi, now, isComplete, false);
-        if (scrambledMsgKpi !== msgKpi) {
-            msgKpi = scrambledMsgKpi;
-        }
-        const msgLabel = ` msg ▸ ${msgKpi} `;
+        const msgLabel = ` msg ▸ `;
         const msgPrefix = `${msgTree}${msgLabel}`;
         const freshRawMsg = (r.exitCode === -1 ? getLiveTextWithFallback(id) : undefined) ?? rawMsg;
         const needsTail = r.exitCode === -1 || streamingText != null;
@@ -677,49 +692,61 @@ function renderActivityPanel(results, theme, baseId, config) {
         const isLast = i === results.length - 1;
         const flowId = `${idPrefix}#${i}`;
         const typeName = formatCollapsedFlowHeaderTypeName(r.type);
-        const modelLabel = r.model ? r.model.replace(/^[^/]+\//, "").toLowerCase() : "";
+        const modelLabel = formatModelLabel(r.model);
         const headerPrefix = isLast ? "└─" : "├─";
         const headerPrefixLen = visibleLength(headerPrefix) + 1 + visibleLength(typeName) + visibleLength(modelLabel ? `    ${modelLabel} · ` : "    ");
-        const stats = formatCompactStats(r.usage, r.model, Math.max(maxWidth - headerPrefixLen, 20), { skipTokens: true, skipContext: true, hideModel: true });
-        // Flash TPS value when it changes
-        const tpsMatch = stats.match(/tps:\s*(\S+)/);
+        // Build header stats: ctxLabel · t/s
+        const statsParts = [];
+        if (r.maxContextTokens !== undefined || r.usage.contextTokens > 0) {
+            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 flowComplete = r.exitCode !== -1;
-        let displayStats = stats;
-        if (tpsMatch) {
-            const scrambledTps = scrambleManager.updateTps(flowId, tpsMatch[1], now, flowComplete, true);
-            if (scrambledTps !== tpsMatch[1]) {
-                displayStats = stats.replace(tpsMatch[1], scrambledTps);
+        // 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 scrambledTps = scrambleManager.updateTps(flowId, tpsNum, now, flowComplete, true);
+            if (scrambledTps !== tpsNum) {
+                displayStats = displayStats.replace(`${tpsNum} t/s`, `${scrambledTps} t/s`);
             }
         }
         const error = isFlowError(r);
-        // Header line
-        let headerLine = `${applyRole("treeChars", headerPrefix, theme, config)} ${applyRole("flowName", typeName, theme, config)}${applyRole("modelName", modelLabel ? `    ${modelLabel} · ` : "    ", theme, config)}${applyRole("stats", displayStats, theme, config)}`;
-        if (error && r.stopReason) {
-            headerLine += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
+        const modelSegment = modelLabel ? `    ${modelLabel} · ` : "    ";
+        const statsSegment = stripAnsi(displayStats);
+        const errorSegment = error && r.stopReason ? ` [${r.stopReason}]` : "";
+        let headerLine = `${applyRole("treeChars", headerPrefix, theme, config)} ${applyRole("flowName", typeName, theme, config)}${applyRole("modelName", modelSegment, theme, config)}${applyRole("stats", displayStats, theme, config)}`;
+        if (errorSegment) {
+            headerLine += ` ${theme.fg("error", errorSegment)}`;
+        }
+        const plainHeader = headerPrefix + " " + typeName + modelSegment + statsSegment + errorSegment;
+        const headerSegments = [
+            { text: headerPrefix + " ", style: (s) => applyRole("treeChars", s, theme, config) },
+            { text: typeName, style: (s) => applyRole("flowName", s, theme, config) },
+            { text: modelSegment, style: (s) => applyRole("modelName", s, theme, config) },
+            { text: statsSegment, style: (s) => applyRole("stats", s, theme, config) },
+        ];
+        if (errorSegment) {
+            headerSegments.push({ text: errorSegment, style: (s) => theme.fg("error", s) });
         }
-        const plainHeader = headerPrefix + " " + typeName + (modelLabel ? `    ${modelLabel} · ` : "    ") + stripAnsi(displayStats) + (error && r.stopReason ? ` [${r.stopReason}]` : "");
         container.addChild(new DynamicScrambleText(headerLine, () => {
             const result = scrambleManager.updateText(flowId, 'header', plainHeader, Date.now(), flowComplete, true);
-            return result.isAnimating ? applyRole("flowName", result.content, theme, config) : headerLine;
+            return result.isAnimating ? reconstructHeader(result.content, headerSegments) : headerLine;
         }, true));
         // Continuation indent for sub-lines
         const indent = isLast ? "   " : "│  ";
         // aim: line — glitch on text change
         if (r.aim) {
-            const countdown = getLiveCountdown(r);
             const aimTree = indent + "├─";
-            const aimLabel = countdown
-                ? ` aim ▸ ${countdown} · `
-                : ` aim ▸ `;
+            const aimLabel = ` aim ▸ `;
             const aimPrefix = `${aimTree}${aimLabel}`;
             const budget = getTruncationBudget(visibleLength(aimPrefix));
             const displayAim = truncateChars(lowerFirstWord(r.aim), budget);
             container.addChild(new DynamicScrambleText(`${applyRole("treeChars", aimTree, theme, config)}${applyRole("prefixLabel", aimLabel, theme, config)}${applyRole("aimContent", displayAim, theme, config)}`, () => {
                 const now = Date.now();
-                const freshCountdown = getLiveCountdown(r);
-                const freshAimLabel = freshCountdown
-                    ? ` aim ▸ ${freshCountdown} · `
-                    : ` aim ▸ `;
+                const freshAimLabel = ` aim ▸ `;
                 const freshAimPrefix = `${aimTree}${freshAimLabel}`;
                 const freshBudget = getTruncationBudget(visibleLength(freshAimPrefix));
                 const freshText = truncateChars(lowerFirstWord(r.aim), freshBudget);
@@ -731,33 +758,23 @@ function renderActivityPanel(results, theme, baseId, config) {
         const lastTool = getLastToolCall(r.messages);
         const actStr = lastTool ? formatFlowToolCall(lastTool.name, lastTool.args, theme.fg.bind(theme)) : "[n/a]";
         const actTree = `${indent}├─`;
-        const actLabel = ` act ▸ ${r.usage.toolCalls} · `;
+        const actLabel = ` cmd ▸ `;
         const prefixStub = `${actTree}${actLabel}`;
         const budget = getTruncationBudget(visibleLength(prefixStub));
         const actFullText = stripAnsi(lowerFirstWord(actStr));
-        const initialActContent = actFullText.length > budget ? actFullText.slice(0, budget) : actFullText;
+        const initialActContent = actFullText.length > budget ? tailText(actFullText, budget) : actFullText;
         container.addChild(new DynamicScrambleText(`${applyRole("treeChars", actTree, theme, config)}${applyRole("prefixLabel", actLabel, theme, config)}${applyRole("actContent", initialActContent, theme, config)}`, () => {
             const now = Date.now();
-            let actKpi = String(r.usage.toolCalls);
-            const scrambledActKpi = scrambleManager.updateActKpi(flowId, actKpi, now, flowComplete, false);
-            if (scrambledActKpi !== actKpi) {
-                actKpi = scrambledActKpi;
-            }
-            const actLabel = ` act ▸ ${actKpi} · `;
+            const actLabel = ` cmd ▸ `;
             const actPrefix = `${actTree}${actLabel}`;
             const freshBudget = getTruncationBudget(visibleLength(actPrefix));
-            const displayAct = truncateChars(actFullText, freshBudget);
+            const displayAct = 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("actContent", actContent, theme, config)}`;
         }, true));
         // msg: line (live streaming text or last assistant text)
-        let msgKpi = formatCompactTokenPair(r.usage);
-        const scrambledMsgKpi = scrambleManager.updateMsgKpi(flowId, msgKpi, now, flowComplete, false);
-        if (scrambledMsgKpi !== msgKpi) {
-            msgKpi = scrambledMsgKpi;
-        }
         const msgTree = `${indent}└─`;
-        const msgLabel = ` msg ▸ ${msgKpi} `;
+        const msgLabel = ` msg ▸ `;
         const msgPrefixStub = `${msgTree}${msgLabel}`;
         const msgBudget = getTruncationBudget(visibleLength(msgPrefixStub));
         const liveText = r.exitCode === -1 ? r.streamingText : undefined;
@@ -782,12 +799,7 @@ function renderActivityPanel(results, theme, baseId, config) {
         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", initialDisplayMsg, theme, config)}`, () => {
             const now = Date.now();
-            let msgKpi = formatCompactTokenPair(r.usage);
-            const scrambledMsgKpi = scrambleManager.updateMsgKpi(flowId, msgKpi, now, flowComplete, false);
-            if (scrambledMsgKpi !== msgKpi) {
-                msgKpi = scrambledMsgKpi;
-            }
-            const msgLabel = ` msg ▸ ${msgKpi} `;
+            const msgLabel = ` msg ▸ `;
             const msgPrefix = `${msgTree}${msgLabel}`;
             const freshBudget = getTruncationBudget(visibleLength(msgPrefix));
             const freshRawMsg = flowComplete ? rawMsg : (getLiveTextWithFallback(flowId) ?? rawMsg);