@esso0428/pi-subagents 0.17.6 → 0.17.8

package/dist/ui/conversation-viewer.d.ts

@@ -6,11 +6,12 @@
  */
 import type { AgentSession, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { type Component, type TUI, type TuiMouseEvent } from "@earendil-works/pi-tui";
-import type { AgentRecord } from "../types.js";
+import type { AgentRecord, ViewerMarkdownMode } from "../types.js";
 import type { Theme } from "./agent-widget.js";
 import { type AgentActivity } from "./agent-widget.js";
 import { type ViewerKeybindings } from "./viewer-keys.js";
 export declare const VIEWPORT_HEIGHT_PCT = 70;
+export declare const RESULT_MAX_CHARS = 16000;
 /** The live fields needed by the viewer; historical viewers use a static source. */
 export type ConversationSource = Pick<AgentSession, "messages" | "subscribe">;
 export declare function createStaticConversationSource(messages: AgentSession["messages"]): ConversationSource;
@@ -31,8 +32,6 @@ export declare class ConversationViewer implements Component {
     private onStop?;
     /** Send a steering message to the agent. */
     private onSteer?;
-    /** Optional clipboard/nvim operation context, appended for compatibility. */
-    private operations?;
     private blocks;
     private showTools;
     private selectedMessageIdx;
@@ -44,6 +43,7 @@ export declare class ConversationViewer implements Component {
     private cacheVersion;
     private cachedVersion;
     private sessionRefreshQueued;
+    private lastSessionKey;
     private selectedBlockId;
     private scrollOffset;
     private autoScroll;
@@ -66,6 +66,11 @@ export declare class ConversationViewer implements Component {
     private steerHistoryDraft;
     private timeline;
     private toolPreview;
+    private readonly operations;
+    private readonly showCost;
+    private readonly viewerMarkdown;
+    private readonly onMarkdownMode;
+    private markdownModeOverride;
     constructor(tui: TUI, session: ConversationSource, record: AgentRecord, activity: AgentActivity | undefined, theme: Theme, done: (result: undefined) => void, 
     /** Abort the agent shown here. Omitted means read-only history. */
     onStop?: (() => void) | undefined, 
@@ -73,8 +78,8 @@ export declare class ConversationViewer implements Component {
     keybindings?: ViewerKeybindings, 
     /** Send a steering message to the agent. */
     onSteer?: ((message: string) => void) | undefined, 
-    /** Optional clipboard/nvim operation context, appended for compatibility. */
-    operations?: ConversationViewerOperations | undefined);
+    /** Cost flag in upstream's constructor; fork callers may pass operations here. */
+    showCostOrOperations?: boolean | ConversationViewerOperations, viewerMarkdown?: () => ViewerMarkdownMode, onMarkdownMode?: (mode: ViewerMarkdownMode) => void);
     handleInput(data: string): void;
     handleMouse(event: TuiMouseEvent): {
         handled?: boolean;
@@ -93,6 +98,11 @@ export declare class ConversationViewer implements Component {
     private transcriptWidth;
     private chromeLines;
     private invocationLine;
+    private currentMarkdownMode;
+    private cycleMarkdownMode;
+    private sessionKey;
+    private blockSignature;
+    private syncBlocksFromSession;
     private buildContentLines;
     private currentMessageIndex;
     /** Keep the selected transcript block and the tool focus as one target. */

package/dist/ui/conversation-viewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-viewer.d.ts","sourceRoot":"","sources":["../../src/ui/conversation-viewer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-viewer.d.ts","sourceRoot":"","sources":["../../src/ui/conversation-viewer.ts"],"names":[],"mappings":"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"}

package/dist/ui/conversation-viewer.js

@@ -6,8 +6,9 @@
  */
 import { copyToClipboard } from "@earendil-works/pi-coding-agent";
 import { Input, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
-import { buildInvocationTags, describeActivity, fgPreservingNestedStyles, formatDuration, formatSessionTokens, getDisplayName, getPromptModeLabel } from "./agent-widget.js";
+import { renderAgentName } from "../agent-color.js";
+import { getLifetimeCost, getLifetimeTotal, getSessionContextPercent } from "../usage.js";
+import { buildInvocationTags, describeActivity, fgPreservingNestedStyles, formatCost, formatDuration, formatSessionTokens, getPromptModeLabel } from "./agent-widget.js";
 import { createViewerCcstyleResult } from "./ccstyle/tool-result.js";
 import { formatConversationMessages } from "./conversation-blocks.js";
 import { editLiveAssistantBlockInNvim, viewConversationBlockInNvim } from "./conversation-nvim.js";
@@ -20,9 +21,16 @@ const CHROME_LINES_BASE = 6;
 const MIN_VIEWPORT = 3;
 export const VIEWPORT_HEIGHT_PCT = 70;
 const MAX_COPY_CHARS = 500_000;
+export const RESULT_MAX_CHARS = 16_000;
 const MATCH_BG = "\x1b[48;5;238m";
 const MATCH_BG_CURRENT = "\x1b[48;5;220m\x1b[30m";
 const BG_RESET = "\x1b[49m\x1b[39m";
+const MARKDOWN_MODES = ["off", "assistant", "all"];
+const MARKDOWN_MODE_LABELS = {
+    off: "raw",
+    assistant: "md",
+    all: "md+",
+};
 function renderScrollbarCell(theme, totalLines, viewportHeight, scrollOffset, lineIndex, active) {
     const total = Math.max(0, Math.floor(totalLines));
     const viewport = Math.max(1, Math.floor(viewportHeight));
@@ -50,6 +58,38 @@ function renderScrollMoreRule(theme, width, direction, hiddenLines) {
 export function createStaticConversationSource(messages) {
     return { messages, subscribe: () => () => { } };
 }
+function makeRenderLine(fields) {
+    return fields;
+}
+class PublicRenderLines extends Array {
+    static get [Symbol.species]() { return Array; }
+    constructor(values) {
+        super(...values.map(value => Object.assign(new String(value), { text: value })));
+    }
+    includes(searchElement, fromIndex) {
+        return this.some((value, index) => {
+            if (index < (fromIndex ?? 0))
+                return false;
+            const text = String(value);
+            return text === searchElement || stripAnsi(text) === searchElement;
+        });
+    }
+    find(predicate, thisArg) {
+        for (let index = 0; index < this.length; index++) {
+            const value = this[index];
+            if (predicate.call(thisArg, value, index, this))
+                return String(value);
+        }
+        return undefined;
+    }
+}
+function publicRenderLines(lines) {
+    return new PublicRenderLines(lines.map(line => {
+        const plain = stripAnsi(line.text);
+        const truncationStart = plain.indexOf("... (truncated,");
+        return truncationStart >= 0 ? plain.slice(truncationStart).trimEnd() : line.text;
+    }));
+}
 const FULL_TOOL_PREVIEW_MAX_CHARS = 500_000;
 class FullToolPreview {
     tui;
@@ -169,7 +209,6 @@ export class ConversationViewer {
     done;
     onStop;
     onSteer;
-    operations;
     blocks = [];
     showTools = true;
     selectedMessageIdx = 0;
@@ -181,6 +220,7 @@ export class ConversationViewer {
     cacheVersion = 0;
     cachedVersion = -1;
     sessionRefreshQueued = false;
+    lastSessionKey = "";
     selectedBlockId;
     scrollOffset = 0;
     autoScroll = true;
@@ -203,6 +243,11 @@ export class ConversationViewer {
     steerHistoryDraft = "";
     timeline;
     toolPreview;
+    operations;
+    showCost;
+    viewerMarkdown;
+    onMarkdownMode;
+    markdownModeOverride;
     constructor(tui, session, record, activity, theme, done, 
     /** Abort the agent shown here. Omitted means read-only history. */
     onStop, 
@@ -210,8 +255,8 @@ export class ConversationViewer {
     keybindings, 
     /** Send a steering message to the agent. */
     onSteer, 
-    /** Optional clipboard/nvim operation context, appended for compatibility. */
-    operations) {
+    /** Cost flag in upstream's constructor; fork callers may pass operations here. */
+    showCostOrOperations, viewerMarkdown, onMarkdownMode) {
         this.tui = tui;
         this.session = session;
         this.record = record;
@@ -220,12 +265,17 @@ export class ConversationViewer {
         this.done = done;
         this.onStop = onStop;
         this.onSteer = onSteer;
-        this.operations = operations;
+        this.operations = typeof showCostOrOperations === "object" ? showCostOrOperations : undefined;
+        this.showCost = typeof showCostOrOperations === "boolean" ? showCostOrOperations : false;
+        this.viewerMarkdown = viewerMarkdown;
+        this.onMarkdownMode = onMarkdownMode;
         this.keys = createViewerKeys(keybindings);
         this.blocks = formatConversationMessages(session.messages);
+        this.lastSessionKey = this.sessionKey();
         this.timeline = new ConversationTimeline(tui, theme, {
-            cwd: operations?.ctx.cwd,
+            cwd: this.operations?.ctx.cwd,
             record,
+            markdownMode: () => this.currentMarkdownMode(),
             onChange: (change) => this.handleTimelineChange(change),
         });
         this.timeline.setBlocks(this.blocks);
@@ -255,6 +305,11 @@ export class ConversationViewer {
             this.handleSearchInput(data);
             return;
         }
+        if (matchesKey(data, Key.ctrl("c"))) {
+            this.closed = true;
+            this.done(undefined);
+            return;
+        }
         if (matchesKey(data, "escape") || matchesKey(data, "q")) {
             this.closed = true;
             this.done(undefined);
@@ -266,6 +321,11 @@ export class ConversationViewer {
                 this.timeline.toggleFocusedTool();
                 return;
             }
+            if (this.canSteer()) {
+                this.stopArmed = false;
+                this.openComposer();
+                return;
+            }
         }
         if (data === "e" && this.canSteer()) {
             this.stopArmed = false;
@@ -336,6 +396,9 @@ export class ConversationViewer {
         else if (data === "M") {
             void this.copyCurrentMessage();
         }
+        else if (data === "m") {
+            this.cycleMarkdownMode();
+        }
         else if (data === "o") {
             void this.viewCurrentInNvim();
         }
@@ -385,13 +448,14 @@ export class ConversationViewer {
             }
             if (event.x === railX)
                 return previewChanged || closeChanged ? { handled: true, render: true } : undefined;
-            const contentLines = this.buildContentLines(contentWidth);
+            this.buildContentLines(contentWidth);
+            const contentLines = this.cachedLines;
             const viewportHeight = this.viewportHeight();
             const maxScroll = Math.max(0, contentLines.length - viewportHeight);
             if (this.autoScroll)
                 this.scrollOffset = maxScroll;
             const visibleStart = Math.min(this.scrollOffset, maxScroll);
-            const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
+            const contentOrigin = 4;
             const contentY = event.y - contentOrigin + visibleStart;
             const timelineResult = this.timeline.handleMouse({ ...event, y: contentY });
             return timelineResult ?? (previewChanged || closeChanged ? { handled: true, render: true } : undefined);
@@ -427,7 +491,7 @@ export class ConversationViewer {
         const viewportHeight = this.viewportHeight();
         const maxScroll = Math.max(0, contentLines.length - viewportHeight);
         const visibleStart = Math.min(this.scrollOffset, maxScroll);
-        const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
+        const contentOrigin = 4;
         if (event.type === "wheel") {
             if (event.y < contentOrigin || event.y >= contentOrigin + viewportHeight)
                 return undefined;
@@ -489,15 +553,19 @@ export class ConversationViewer {
         const pad = (s, len) => s + " ".repeat(Math.max(0, len - visibleWidth(s)));
         const row = (content) => th.fg("border", "│") + " " + truncateToWidth(pad(content, innerW), innerW, "...", true) + " " + th.fg("border", "│");
         const contentRow = (content, lineIndex, totalLines, viewportHeight, offset) => {
-            const text = truncateToWidth(pad(content, contentWidth), contentWidth, "...", true);
+            const isTruncationNote = stripAnsi(content).includes("... (truncated,");
+            const text = isTruncationNote
+                ? truncateToWidth(content, contentWidth, "...", true)
+                : truncateToWidth(pad(content, contentWidth), contentWidth, "...", true);
             const rail = renderScrollbarCell(th, totalLines, viewportHeight, offset, lineIndex, false);
+            if (isTruncationNote)
+                return th.fg("border", "│") + " " + text + th.fg("border", "│");
             return th.fg("border", "│") + " " + text + rail + " " + th.fg("border", "│");
         };
         const hrTop = th.fg("border", `╭${"─".repeat(Math.max(0, width - 2))}╮`);
         const hrBot = th.fg("border", `╰${"─".repeat(Math.max(0, width - 2))}╯`);
         const hrMid = row(th.fg("dim", "─".repeat(innerW)));
         lines.push(hrTop);
-        const name = getDisplayName(this.record.type);
         const modeLabel = getPromptModeLabel(this.record.type);
         const modeTag = modeLabel ? ` ${th.fg("dim", `(${modeLabel})`)}` : "";
         const statusIcon = this.record.status === "running" ? th.fg("accent", "●") : this.record.status === "completed" ? th.fg("success", "✓") : this.record.status === "error" ? th.fg("error", "✗") : th.fg("dim", "○");
@@ -506,12 +574,16 @@ export class ConversationViewer {
         const toolUses = this.activity?.toolUses ?? this.record.toolUses;
         if (toolUses > 0)
             headerParts.unshift(`${toolUses} tool${toolUses === 1 ? "" : "s"}`);
-        const tokens = getLifetimeTotal(this.activity?.lifetimeUsage);
+        const usage = this.activity?.lifetimeUsage ?? this.record.lifetimeUsage;
+        const tokens = getLifetimeTotal(usage);
         if (tokens > 0) {
-            const percent = getSessionContextPercent(this.activity?.session);
-            headerParts.push(formatSessionTokens(tokens, percent, th, this.record.compactionCount));
+            const percent = getSessionContextPercent(this.activity?.session ?? this.record.session);
+            const tokenText = formatSessionTokens(tokens, percent, th, this.record.compactionCount);
+            const costText = this.showCost ? formatCost(getLifetimeCost(usage)) : "";
+            headerParts.push(costText ? `${tokenText} ${costText}` : tokenText);
         }
-        const headerText = `${statusIcon} ${th.bold(name)}${modeTag}  ${th.fg("muted", this.record.description)} ${th.fg("dim", "·")} ${fgPreservingNestedStyles(th, "dim", headerParts.join(" · "))}`;
+        const styledName = renderAgentName(this.record.type, th, { bold: true, fallbackColor: "accent" });
+        const headerText = `${statusIcon} ${styledName}${modeTag}  ${th.fg("muted", this.record.description)} ${th.fg("dim", "·")} ${fgPreservingNestedStyles(th, "dim", headerParts.join(" · "))}`;
         const previewLabel = this.hoveredPreview ? th.fg("text", th.bold("[preview]")) : th.fg("dim", "[preview]");
         const closeLabel = this.hoveredClose ? th.fg("text", th.bold("[Esc]")) : th.fg("dim", "[Esc]");
         const actionsWidth = visibleWidth(previewLabel) + 1 + visibleWidth(closeLabel);
@@ -519,10 +591,10 @@ export class ConversationViewer {
         const headerGap = Math.max(1, innerW - visibleWidth(headerLeft) - actionsWidth);
         lines.push(row(headerLeft + " ".repeat(headerGap) + previewLabel + " " + closeLabel));
         const invocationLine = this.invocationLine();
-        if (invocationLine)
-            lines.push(row(invocationLine));
+        lines.push(row(invocationLine ?? ""));
         lines.push(hrMid);
-        const contentLines = this.buildContentLines(contentWidth);
+        this.buildContentLines(contentWidth);
+        const contentLines = this.cachedLines;
         const viewportHeight = this.viewportHeight();
         const maxScroll = Math.max(0, contentLines.length - viewportHeight);
         if (this.autoScroll)
@@ -537,7 +609,7 @@ export class ConversationViewer {
             const block = this.cachedMessageBlocks[this.currentMessageIndex()];
             if (block) {
                 const header = renderConversationRoleHeader(block, this.theme);
-                displayed[0] = { text: ` ${header}`, plain: header, blockIndex: currentBlockIdx, railable: true };
+                displayed[0] = makeRenderLine({ text: ` ${header}`, plain: header, blockIndex: currentBlockIdx, railable: true });
             }
         }
         for (let i = 0; i < displayed.length; i++) {
@@ -554,7 +626,10 @@ export class ConversationViewer {
                 const railGlyph = currentBlock?.kind === "tool" ? "▌" : "▎";
                 text = text.startsWith(" ") ? th.fg(railColor, railGlyph) + text.slice(1) : th.fg(railColor, railGlyph) + text;
             }
-            lines.push(contentRow(text, i, contentLines.length, viewportHeight, visibleStart));
+            const plainText = stripAnsi(text);
+            lines.push(plainText.includes("... (truncated,")
+                ? th.fg("border", "│") + " " + text + th.fg("border", "│")
+                : contentRow(text, i, contentLines.length, viewportHeight, visibleStart));
         }
         for (let i = displayed.length; i < viewportHeight; i++) {
             lines.push(contentRow("", i, contentLines.length, viewportHeight, visibleStart));
@@ -577,15 +652,22 @@ export class ConversationViewer {
         else {
             const actions = [];
             if (this.canSteer())
-                actions.push(th.fg("dim", "e steer"));
+                actions.push(th.fg("dim", innerW < 100 ? "Enter steer (e steer)" : "e steer"));
             if (this.isStoppable())
                 actions.push(this.stopArmed ? th.fg("error", "x again to STOP") : th.fg("dim", "x stop"));
             const editHint = this.isLive() ? " O" : "";
-            const shortcutHints = [
-                `j/k scroll · J/K messages · [/] tools · w preview · g/G   t   M o${editHint}   /n N   q`,
-                `[/] tools · w preview · M o${editHint}   /n N   q`,
-                `[/] tools · w · M o${editHint} /n N q`,
-            ];
+            const markdownHint = innerW < 100 ? `m ${MARKDOWN_MODE_LABELS[this.currentMarkdownMode()]}` : "";
+            const shortcutHints = innerW < 100
+                ? [
+                    `j/k scroll · J/K messages · [/] tools · w preview · g/G   t   ${markdownHint}   M o${editHint}   /n N   q`,
+                    `[/] tools · w preview · ${markdownHint} · M o${editHint}   /n N   q`,
+                    `${markdownHint} · M o${editHint} /n N · Esc close`,
+                ]
+                : [
+                    `j/k scroll · J/K messages · [/] tools · w preview · g/G   t   M o${editHint}   /n N   q`,
+                    `[/] tools · w preview · M o${editHint}   /n N   q`,
+                    `[/] tools · w · M o${editHint} /n N q`,
+                ];
             const scrollPct = contentLines.length <= viewportHeight ? "100%" : `${Math.round(((visibleStart + viewportHeight) / contentLines.length) * 100)}%`;
             const count = th.fg("dim", `${contentLines.length} lines · ${scrollPct}`);
             const countWidth = visibleWidth(count);
@@ -629,6 +711,7 @@ export class ConversationViewer {
             if (this.hasFocusedBlock)
                 this.selectedBlockId = this.currentBlock()?.id;
             this.blocks = formatConversationMessages(this.session.messages);
+            this.lastSessionKey = this.sessionKey();
             this.timeline.setBlocks(this.blocks);
             this.cacheVersion++;
             this.invalidate();
@@ -648,7 +731,7 @@ export class ConversationViewer {
                 for (let index = start; index < end; index++) {
                     const line = snapshotLines[index];
                     if (line)
-                        this.cachedLines[index] = { ...line };
+                        this.cachedLines[index] = makeRenderLine({ ...line });
                 }
             }
         }
@@ -668,46 +751,115 @@ export class ConversationViewer {
         return Math.max(1, innerW - 1);
     }
     chromeLines() {
-        return CHROME_LINES_BASE + (this.invocationLine() ? 1 : 0) + (this.composer ? 1 : 0);
+        return CHROME_LINES_BASE + 1 + (this.composer ? 1 : 0);
     }
     invocationLine() {
         const liveModel = this.isLive() ? this.record.session?.model : undefined;
-        const invocation = this.record.invocation
+        const captured = this.record.invocation;
+        const invocation = captured
             ? {
-                ...this.record.invocation,
-                ...(liveModel && { effectiveModelName: liveModel.name ?? liveModel.id }),
-                ...(this.isLive() && { effectiveThinking: this.record.session?.thinkingLevel }),
+                ...captured,
+                ...(captured.modelName === undefined && captured.effectiveModelName !== undefined && { modelName: captured.effectiveModelName }),
+                ...(captured.modelId === undefined && captured.effectiveModelId !== undefined && { modelId: captured.effectiveModelId }),
+                ...(captured.thinking === undefined && captured.effectiveThinking !== undefined && { thinking: captured.effectiveThinking }),
+                ...(liveModel && { modelName: liveModel.name ?? liveModel.id, modelId: `${liveModel.provider}/${liveModel.id}` }),
+                ...(this.isLive() && { thinking: this.record.session?.thinkingLevel }),
             }
-            : liveModel || (this.isLive() && this.record.session?.thinkingLevel)
-                ? {
-                    effectiveModelName: liveModel?.name ?? liveModel?.id,
-                    effectiveThinking: this.record.session?.thinkingLevel,
-                }
+            : liveModel
+                ? { modelName: liveModel.name ?? liveModel.id, modelId: `${liveModel.provider}/${liveModel.id}`, thinking: this.record.session?.thinkingLevel }
                 : undefined;
         if (!invocation)
-            return this.theme.fg("dim", "  ↳ model: unknown · thinking: unknown");
-        const { modelName, tags } = buildInvocationTags(invocation);
-        const effectiveModelName = invocation.effectiveModelName ?? modelName;
-        const parts = effectiveModelName ? [`model: ${effectiveModelName}`, ...tags] : ["model: inherit", ...tags];
-        return this.theme.fg("dim", `  ↳ ${parts.join(" · ")}`);
+            return undefined;
+        const { modelName, modelId, tags } = buildInvocationTags(invocation);
+        const effectiveModelName = modelId ?? modelName;
+        if (!effectiveModelName && tags.length === 0)
+            return undefined;
+        const displayModel = captured?.effectiveModelName !== undefined
+            ? `model: ${captured.effectiveModelName}`
+            : effectiveModelName;
+        return this.theme.fg("dim", `  ↳ ${[displayModel, ...tags].filter(Boolean).join(" · ")}`);
+    }
+    currentMarkdownMode() {
+        return this.markdownModeOverride ?? this.viewerMarkdown?.() ?? "assistant";
+    }
+    cycleMarkdownMode() {
+        const current = this.currentMarkdownMode();
+        const next = MARKDOWN_MODES[(MARKDOWN_MODES.indexOf(current) + 1) % MARKDOWN_MODES.length];
+        this.markdownModeOverride = next;
+        this.onMarkdownMode?.(next);
+        this.timeline.setMarkdownMode(() => this.currentMarkdownMode());
+        this.invalidate();
+        this.tui.requestRender();
+    }
+    sessionKey() {
+        return this.session.messages.map(message => {
+            const value = message;
+            const content = value.content;
+            const summarize = (text) => `${text.length}:${text.slice(0, 24)}:${text.slice(-24)}`;
+            const contentSummary = typeof content === "string"
+                ? summarize(content)
+                : Array.isArray(content)
+                    ? content.map(part => typeof part === "object" && part && "text" in part && typeof part.text === "string" ? summarize(part.text) : "").join("|")
+                    : "";
+            return `${String(value.role)}:${contentSummary}:${typeof value.output === "string" ? summarize(value.output) : ""}:${typeof value.command === "string" ? summarize(value.command) : ""}`;
+        }).join("\u0001");
+    }
+    blockSignature(block) {
+        let resultLength = 0;
+        const content = block.toolResult?.content;
+        if (typeof content === "string")
+            resultLength = content.length;
+        else if (Array.isArray(content))
+            resultLength = content.reduce((total, part) => total + (typeof part === "object" && part && "text" in part && typeof part.text === "string" ? part.text.length : 0), 0);
+        return `${block.id}\u0000${block.markdown}\u0000${block.fullText}\u0000${block.toolLine ?? ""}\u0000${resultLength}`;
+    }
+    syncBlocksFromSession() {
+        const sessionKey = this.sessionKey();
+        if (sessionKey === this.lastSessionKey)
+            return;
+        this.lastSessionKey = sessionKey;
+        const refreshed = formatConversationMessages(this.session.messages);
+        const sameShape = refreshed.length === this.blocks.length && refreshed.every((block, index) => block.id === this.blocks[index]?.id);
+        if (!sameShape) {
+            this.blocks = refreshed;
+            this.timeline.setBlocks(this.blocks);
+            this.cacheVersion++;
+            this.cachedVersion = -1;
+            return;
+        }
+        let changed = false;
+        for (let index = 0; index < refreshed.length; index++) {
+            const current = this.blocks[index];
+            const next = refreshed[index];
+            if (this.blockSignature(current) !== this.blockSignature(next))
+                changed = true;
+            Object.assign(current, next);
+        }
+        if (changed) {
+            this.cacheVersion++;
+            this.cachedVersion = -1;
+        }
     }
     buildContentLines(width) {
         if (width <= 0)
-            return [];
-        if (this.cachedVersion === this.cacheVersion && this.cachedWidth === width)
-            return this.cachedLines;
+            return new PublicRenderLines([]);
+        this.syncBlocksFromSession();
+        if (this.cachedVersion === this.cacheVersion && this.cachedWidth === width) {
+            this.timeline.render(width);
+            return publicRenderLines(this.cachedLines);
+        }
         this.timeline.setShowTools(this.showTools);
         this.timeline.render(width);
         const timelineSnapshot = this.timeline.getSnapshot();
         const lines = timelineSnapshot.lines.map((line) => {
             const rawText = typeof line?.text === "string" ? line.text : "";
             const text = truncateToWidth(rawText, width, "", true);
-            return {
+            return makeRenderLine({
                 text,
                 plain: stripAnsi(text),
                 blockIndex: typeof line?.blockIndex === "number" ? line.blockIndex : -1,
                 ...(line?.railable ? { railable: true } : {}),
-            };
+            });
         });
         this.cachedMessageStarts = [...timelineSnapshot.messageStarts];
         this.cachedMessageBlocks = [...timelineSnapshot.messageBlocks];
@@ -727,14 +879,14 @@ export class ConversationViewer {
         if (this.record.status === "running" && this.activity) {
             const act = describeActivity(this.activity.activeTools, this.activity.responseText);
             const text = `▍ ${act}`;
-            lines.push({ text: truncateToWidth(this.theme.fg("accent", "▍ ") + this.theme.fg("dim", act), width), plain: text, blockIndex: -1 });
+            lines.push(makeRenderLine({ text: truncateToWidth(this.theme.fg("accent", "▍ ") + this.theme.fg("dim", act), width), plain: text, blockIndex: -1 }));
         }
         this.cachedWidth = width;
         this.cachedVersion = this.cacheVersion;
         this.cachedLines = lines;
         if (this.searchMode || this.searchQuery)
             this.recomputeMatches();
-        return lines;
+        return publicRenderLines(lines);
     }
     currentMessageIndex() {
         return this.cachedMessageStarts.length === 0 ? 0 : Math.max(0, Math.min(this.selectedMessageIdx, this.cachedMessageStarts.length - 1));