@esso0428/pi-subagents 0.15.13 → 0.15.15

package/src/ui/conversation-viewer.ts

@@ -7,7 +7,7 @@
 
 import type { ExtensionAPI, ExtensionContext, AgentSession } from "@earendil-works/pi-coding-agent";
 import { copyToClipboard } from "@earendil-works/pi-coding-agent";
-import { Text, type Component, Input, Key, matchesKey, type TUI, type TuiMouseEvent, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { type Component, Input, Key, matchesKey, type TUI, type TuiMouseEvent, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { AgentRecord } from "../types.js";
 import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
 import type { Theme } from "./agent-widget.js";
@@ -18,44 +18,65 @@ import { renderConversationRoleHeader } from "./conversation-role.js";
 import { editLiveAssistantBlockInNvim, viewConversationBlockInNvim } from "./conversation-nvim.js";
 import { findConversationMatches, highlightConversationLine, nearestConversationMatchAfter, nearestConversationMatchBefore, stripAnsi, type ConversationMatch } from "./conversation-search.js";
 import { createViewerKeys, type ViewerKeybindings, type ViewerKeys } from "./viewer-keys.js";
-import { formatToolInputArgs, textFromResult } from "./ccstyle/tool-result.js";
+import { createViewerCcstyleResult } from "./ccstyle/tool-result.js";
 
 /** Base lines consumed by the overlay: borders, header, separator and footer. */
 const CHROME_LINES_BASE = 6;
+const MIN_VIEWPORT = 3;
+export const VIEWPORT_HEIGHT_PCT = 70;
+const MAX_COPY_CHARS = 500_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";
+
+/** The live fields needed by the viewer; historical viewers use a static source. */
+export type ConversationSource = Pick<AgentSession, "messages" | "subscribe">;
+
+export function createStaticConversationSource(
+  messages: AgentSession["messages"],
+): ConversationSource {
+  return { messages, subscribe: () => () => {} };
+}
+
+type RenderLine = TimelineRenderLine;
+
 const FULL_TOOL_PREVIEW_MAX_CHARS = 500_000;
 
 class FullToolPreview implements Component {
-  private readonly text: Text;
   private scrollOffset = 0;
   private pageSize = 1;
   private totalLines = 1;
+  private pendingTop = false;
   private hoveredClose = false;
 
   constructor(
     private readonly tui: TUI,
     private readonly theme: Theme,
     private readonly title: string,
-    content: string,
+    private readonly body: Component,
     private readonly done: (result: undefined) => void,
-  ) {
-    this.text = new Text(content || "(empty)", 0, 0);
-  }
+  ) {}
 
   handleInput(data: string): void {
     if (matchesKey(data, Key.escape) || matchesKey(data, "q")) {
       this.done(undefined);
       return;
     }
-    const delta = matchesKey(data, Key.up) ? -1 : matchesKey(data, Key.down) ? 1 :
-      matchesKey(data, "pageUp") ? -this.pageSize : matchesKey(data, "pageDown") ? this.pageSize :
-        matchesKey(data, Key.home) ? -this.totalLines : matchesKey(data, Key.end) ? this.totalLines : 0;
-    if (delta !== 0) {
-      this.scrollTo(this.scrollOffset + delta);
+    if (data === "g") {
+      if (this.pendingTop) this.scrollTo(0);
+      this.pendingTop = true;
+      return;
     }
+    const delta = data === "j" || matchesKey(data, Key.down) ? 1 :
+      data === "k" || matchesKey(data, Key.up) ? -1 :
+      matchesKey(data, "pageUp") ? -this.pageSize : matchesKey(data, "pageDown") ? this.pageSize :
+      matchesKey(data, Key.home) ? -this.totalLines : data === "G" || matchesKey(data, Key.end) ? this.totalLines : 0;
+    this.pendingTop = false;
+    if (delta !== 0) this.scrollTo(this.scrollOffset + delta);
   }
 
   handleMouse(event: TuiMouseEvent): { handled?: boolean; capture?: boolean; render?: boolean } | undefined {
-    const closeHit = event.y === 1 && event.x >= Math.max(0, event.width - 7) && event.x < event.width;
+    const closeHit = event.y === 1 && event.x >= Math.max(0, event.width - 7) && event.x < Math.max(0, event.width - 1);
     if (event.type === "move") {
       if (closeHit === this.hoveredClose) return undefined;
       this.hoveredClose = closeHit;
@@ -81,7 +102,7 @@ class FullToolPreview implements Component {
     const bodyWidth = Math.max(1, inner - 1);
     const terminalRows = Math.max(1, this.tui.terminal.rows);
     const viewport = Math.max(1, Math.min(30, Math.floor(terminalRows * 0.8), terminalRows - 6));
-    const wrapped = this.text.render(bodyWidth);
+    const wrapped = this.body.render(bodyWidth);
     this.totalLines = wrapped.length;
     this.pageSize = viewport;
     this.scrollOffset = Math.min(this.scrollOffset, Math.max(0, this.totalLines - this.pageSize));
@@ -92,8 +113,8 @@ class FullToolPreview implements Component {
       return clipped + " ".repeat(Math.max(0, rowWidth - visibleWidth(clipped)));
     };
     const close = this.theme.fg(this.hoveredClose ? "text" : "dim", "[esc]");
-    const header = `${this.theme.bold(this.theme.fg("accent", this.title))}`;
-    const status = `${this.scrollOffset + 1}-${Math.min(this.totalLines, this.scrollOffset + this.pageSize)} / ${this.totalLines} lines · ↑↓ PgUp/PgDn Home/End · [esc] close`;
+    const header = this.theme.bold(this.theme.fg("accent", this.title));
+    const status = `${this.scrollOffset + 1}-${Math.min(this.totalLines, this.scrollOffset + this.pageSize)} / ${this.totalLines} lines · j/k gg/G ↑↓ PgUp/PgDn · [esc] close`;
     return [
       border(`╭${"─".repeat(inner)}╮`),
       `${border("│")}${pad(` ${header}`, inner - visibleWidth(close))}${close}${border("│")}`,
@@ -106,7 +127,7 @@ class FullToolPreview implements Component {
   }
 
   invalidate(): void {
-    this.text.invalidate();
+    this.body.invalidate();
   }
 
   private scrollTo(offset: number): void {
@@ -116,23 +137,6 @@ class FullToolPreview implements Component {
     this.tui.requestRender();
   }
 }
-const MIN_VIEWPORT = 3;
-export const VIEWPORT_HEIGHT_PCT = 70;
-const MAX_COPY_CHARS = 500_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";
-
-/** The live fields needed by the viewer; historical viewers use a static source. */
-export type ConversationSource = Pick<AgentSession, "messages" | "subscribe">;
-
-export function createStaticConversationSource(
-  messages: AgentSession["messages"],
-): ConversationSource {
-  return { messages, subscribe: () => () => {} };
-}
-
-type RenderLine = TimelineRenderLine;
 
 /** Optional operations are appended so all existing constructor call sites stay valid. */
 export interface ConversationViewerOperations {
@@ -145,6 +149,7 @@ export class ConversationViewer implements Component {
   private blocks: ConversationBlock[] = [];
   private showTools = true;
   private selectedMessageIdx = 0;
+  private hasFocusedBlock = false;
   private cachedWidth = 0;
   private cachedLines: RenderLine[] = [];
   private cachedMessageStarts: number[] = [];
@@ -221,12 +226,6 @@ export class ConversationViewer implements Component {
     }
     if (matchesKey(data, "enter")) {
       this.buildContentLines(this.lastInnerW || 80);
-      const current = this.currentBlock();
-      if (current?.kind === "tool" && current.toolCallId) {
-        this.timeline.setFocusedToolCallId(current.toolCallId);
-        this.timeline.toggleFocusedTool();
-        return;
-      }
       if (this.timeline.isToolFocused()) {
         this.timeline.toggleFocusedTool();
         return;
@@ -301,8 +300,9 @@ export class ConversationViewer implements Component {
       this.scrollBy(viewportHeight);
     } else if (matchesKey(data, "home")) {
       this.scrollOffset = 0;
-      this.selectedMessageIdx = 0;
+      this.setFocusFromMessageIndex(0);
       this.autoScroll = false;
+      this.invalidate();
       this.tui.requestRender();
     } else if (matchesKey(data, "end")) {
       this.scrollToBottom();
@@ -318,17 +318,14 @@ export class ConversationViewer implements Component {
     if (event.type === "move") {
       const closeChanged = closeHit !== this.hoveredClose;
       this.hoveredClose = closeHit;
-      if (this.composer || this.searchMode) {
-        return closeChanged ? { handled: true, render: true } : undefined;
-      }
+      if (this.composer || this.searchMode) return closeChanged ? { handled: true, render: true } : undefined;
       const contentLines = this.buildContentLines(innerW);
       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 contentY = event.y - contentOrigin + visibleStart;
-      // Forward moves outside the content too so a previously hovered tool
-      // hint is cleared when the pointer returns to the header/footer.
       const timelineResult = this.timeline.handleMouse({ ...event, y: contentY });
       return timelineResult ?? (closeChanged ? { handled: true, render: true } : undefined);
     }
@@ -346,33 +343,42 @@ export class ConversationViewer implements Component {
     const maxScroll = Math.max(0, contentLines.length - viewportHeight);
     const visibleStart = Math.min(this.scrollOffset, maxScroll);
     const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
-
     if (event.type === "wheel") {
       if (event.y < contentOrigin || event.y >= contentOrigin + viewportHeight) return undefined;
-      const delta = Math.trunc(event.wheelDelta ?? 0);
-      if (delta === 0) return { handled: true, render: false };
-      this.scrollBy(delta);
+      this.scrollBy(Math.trunc(event.wheelDelta ?? 0));
       return { handled: true, render: true };
     }
-
     const contentY = event.y - contentOrigin + visibleStart;
     if (contentY < 0 || contentY >= contentLines.length) return undefined;
+    // Rows have one leading space and one trailing space inside the frame.
+    // Neither padding nor the frame itself is a focus target.
+    if ((event.type === "click" || event.type === "press") && (event.x < 2 || event.x >= 2 + innerW)) return undefined;
     const result = this.timeline.handleMouse({ ...event, y: contentY });
-    if (result?.handled) {
-      if (event.type === "click") {
+    if (result?.handled && event.type === "click") {
+      let selected = result.focusedBlockIndex;
+      if (selected === undefined) {
         const focusedTool = this.timeline.getFocusedToolCallId();
-        const refreshed = this.timeline.getSnapshot();
-        const selected = refreshed.messageBlocks.findIndex((block) => block.toolCallId === focusedTool);
-        if (selected >= 0) this.selectedMessageIdx = selected;
-        this.cacheVersion++;
+        selected = this.timeline.getSnapshot().messageBlocks.findIndex((block) => block.toolCallId === focusedTool);
+      }
+      if (selected !== undefined && selected >= 0) {
+        this.buildContentLines(innerW);
+        this.setFocusFromMessageIndex(selected);
+        this.autoScroll = false;
+        this.scrollTargetIntoView(selected);
         this.invalidate();
         this.tui.requestRender();
       }
-      return result;
     }
     return result;
   }
 
+  private isCloseButtonHit(x: number, y: number, innerW: number): boolean {
+    if (y !== 1) return false;
+    const labelWidth = visibleWidth("[esc]");
+    const labelStart = 2 + Math.max(0, innerW - labelWidth);
+    return x >= labelStart && x < 2 + innerW;
+  }
+
   render(width: number): string[] {
     if (width < 6) return [];
     const th = this.theme;
@@ -490,13 +496,6 @@ export class ConversationViewer implements Component {
     return lines;
   }
 
-  private isCloseButtonHit(x: number, y: number, innerW: number): boolean {
-    if (y !== 1) return false;
-    const labelWidth = visibleWidth("[esc]");
-    const labelStart = 2 + Math.max(0, innerW - labelWidth);
-    return x >= labelStart && x < 2 + innerW;
-  }
-
   invalidate(): void {
     this.cachedWidth = 0;
     this.cachedLines = [];
@@ -566,6 +565,16 @@ export class ConversationViewer implements Component {
     return this.cachedMessageStarts.length === 0 ? 0 : Math.max(0, Math.min(this.selectedMessageIdx, this.cachedMessageStarts.length - 1));
   }
 
+  /** Keep the selected transcript block and the tool focus as one target. */
+  private setFocusFromMessageIndex(index: number): boolean {
+    if (index < 0 || index >= this.cachedMessageBlocks.length) return false;
+    this.selectedMessageIdx = index;
+    this.hasFocusedBlock = true;
+    const block = this.cachedMessageBlocks[index];
+    this.timeline.setFocusedToolCallId(block.kind === "tool" ? block.toolCallId : undefined);
+    return true;
+  }
+
   private currentBlockGlobalIndex(): number {
     const block = this.cachedMessageBlocks[this.currentMessageIndex()];
     return block ? this.blocks.indexOf(block) : -1;
@@ -598,33 +607,27 @@ export class ConversationViewer implements Component {
     if (messageIndices.length === 0) return;
     const current = this.currentMessageIndex();
     const currentPosition = messageIndices.indexOf(current);
-    let precedingPosition = -1;
-    for (let index = 0; index < messageIndices.length; index++) {
-      if (messageIndices[index] < current) precedingPosition = index;
-    }
-    const basePosition = currentPosition >= 0
-      ? currentPosition
-      : dir > 0
-        ? messageIndices.findIndex((index) => index > current)
-        : precedingPosition;
-    const position = basePosition < 0 ? (dir > 0 ? 0 : messageIndices.length - 1) : basePosition + dir;
+    const precedingPosition = messageIndices.reduce((last, index, position) => index < current ? position : last, -1);
+    const nextPosition = messageIndices.findIndex((index) => index > current);
+    const position = currentPosition >= 0
+      ? currentPosition + dir
+      : dir > 0 ? nextPosition : precedingPosition;
     if (position < 0 || position >= messageIndices.length) return;
     const target = messageIndices[position];
-    this.selectedMessageIdx = target;
-    this.timeline.setFocusedToolCallId(undefined);
+    this.setFocusFromMessageIndex(target);
     this.scrollOffset = Math.min(this.cachedMessageStarts[target], Math.max(0, this.cachedLines.length - this.viewportHeight()));
     this.autoScroll = false;
+    this.invalidate();
     this.tui.requestRender();
   }
 
   private moveToolFocus(direction: 1 | -1): void {
     if (!this.timeline.moveFocus(direction)) return;
     const focused = this.timeline.getFocusedToolCallId();
-    const refreshed = this.timeline.getSnapshot();
-    const index = refreshed.messageBlocks.findIndex((block) => block.toolCallId === focused);
+    this.buildContentLines(this.lastInnerW || 80);
+    const index = this.cachedMessageBlocks.findIndex((block) => block.toolCallId === focused);
     if (index >= 0) {
-      this.selectedMessageIdx = index;
-      this.buildContentLines(this.lastInnerW || 80);
+      this.setFocusFromMessageIndex(index);
       this.autoScroll = false;
       this.scrollTargetIntoView(index);
     }
@@ -639,23 +642,17 @@ export class ConversationViewer implements Component {
       .filter((index): index is number => index >= 0);
     if (toolIndices.length === 0) return;
 
-    const focusedId = this.timeline.getFocusedToolCallId();
-    const focusedIndex = focusedId
-      ? this.cachedMessageBlocks.findIndex((block) => block.toolCallId === focusedId)
-      : -1;
-    const current = focusedIndex >= 0 ? focusedIndex : this.currentMessageIndex();
-    const target = focusedIndex < 0
+    const current = this.currentMessageIndex();
+    const resolvedTarget = !this.hasFocusedBlock
       ? direction > 0 ? toolIndices[0] : toolIndices[toolIndices.length - 1]
       : direction > 0
         ? toolIndices.find((index) => index > current)
         : [...toolIndices].reverse().find((index) => index < current);
-    if (target === undefined) return;
+    if (resolvedTarget === undefined) return;
 
-    const block = this.cachedMessageBlocks[target];
-    this.selectedMessageIdx = target;
+    this.setFocusFromMessageIndex(resolvedTarget);
     this.autoScroll = false;
-    this.scrollTargetIntoView(target);
-    this.timeline.setFocusedToolCallId(block.toolCallId);
+    this.scrollTargetIntoView(resolvedTarget);
     this.invalidate();
     this.tui.requestRender();
   }
@@ -672,58 +669,55 @@ export class ConversationViewer implements Component {
 
   private openFocusedToolPreview(): void {
     this.buildContentLines(this.lastInnerW || 80);
-    const block = this.currentBlock();
+    const focusedToolCallId = this.timeline.getFocusedToolCallId();
+    const block = focusedToolCallId
+      ? this.cachedMessageBlocks.find((candidate) => candidate.toolCallId === focusedToolCallId)
+      : this.currentBlock();
     const custom = this.operations?.ctx?.ui?.custom;
     if (block?.kind !== "tool" || typeof custom !== "function") return;
 
-    const input = formatToolInputArgs(block.args ?? block.toolArguments, FULL_TOOL_PREVIEW_MAX_CHARS);
-    const result = block.toolResult ?? block.result;
-    const output = result
-      ? textFromResult(result, true, FULL_TOOL_PREVIEW_MAX_CHARS)
-      : "(no result yet)";
-    const content = [
-      "Input",
-      "=====",
-      input || "(empty)",
-      "",
-      "Output",
-      "======",
-      output || "(empty)",
-    ].join("\n");
-    const title = `${block.toolName || "Tool"} · full preview`;
-
-    void custom.call(this.operations!.ctx.ui, (tui, overlayTheme, _keybindings, done) =>
-      new FullToolPreview(tui, overlayTheme as Theme, title, content, done), {
-        overlay: true,
-        overlayOptions: {
-          anchor: "center",
-          width: "85%",
-          minWidth: 50,
-          maxHeight: "80%",
-          margin: 2,
-        },
-      }).catch(() => undefined);
+    const toolName = block.toolName || "tool";
+    const args = block.args ?? block.toolArguments;
+    const result = block.toolResult ?? block.result ?? { content: [] };
+    const title = `${toolName} · full preview`;
+    void custom.call(this.operations!.ctx.ui, (tui, overlayTheme, _keybindings, done) => {
+      const body = createViewerCcstyleResult(
+        toolName,
+        result,
+        { expanded: true, isError: result.isError === true },
+        overlayTheme,
+        { args, maxChars: FULL_TOOL_PREVIEW_MAX_CHARS, diffConfig: { expandedPreviewMaxLines: Number.MAX_SAFE_INTEGER } },
+      );
+      return new FullToolPreview(tui, overlayTheme as Theme, title, body, done);
+    }, {
+      overlay: true,
+      overlayOptions: { anchor: "center", width: "85%", minWidth: 50, maxHeight: "80%", margin: 2 },
+    }).catch(() => undefined);
   }
 
   private scrollBy(delta: number): void {
     const max = Math.max(0, this.cachedLines.length - this.viewportHeight());
     this.scrollOffset = Math.max(0, Math.min(max, this.scrollOffset + delta));
-    this.selectedMessageIdx = this.messageIndexForOffset(this.scrollOffset);
+    const selected = this.messageIndexForOffset(this.scrollOffset);
+    this.setFocusFromMessageIndex(selected);
     this.autoScroll = this.scrollOffset >= max;
+    this.invalidate();
     this.tui.requestRender();
   }
 
   private scrollToTop(): void {
     this.scrollOffset = 0;
-    this.selectedMessageIdx = 0;
+    this.setFocusFromMessageIndex(0);
     this.autoScroll = false;
+    this.invalidate();
     this.tui.requestRender();
   }
 
   private scrollToBottom(): void {
     this.scrollOffset = Math.max(0, this.cachedLines.length - this.viewportHeight());
-    this.selectedMessageIdx = Math.max(0, this.cachedMessageStarts.length - 1);
+    this.setFocusFromMessageIndex(Math.max(0, this.cachedMessageStarts.length - 1));
     this.autoScroll = true;
+    this.invalidate();
     this.tui.requestRender();
   }
 
@@ -773,8 +767,9 @@ export class ConversationViewer implements Component {
     if (!match) return;
     const max = Math.max(0, this.cachedLines.length - this.viewportHeight());
     this.scrollOffset = Math.max(0, Math.min(max, match.lineIdx - Math.floor(this.viewportHeight() / 2)));
-    this.selectedMessageIdx = this.messageIndexForOffset(this.scrollOffset);
+    this.setFocusFromMessageIndex(this.messageIndexForOffset(this.scrollOffset));
     this.autoScroll = false;
+    this.invalidate();
   }
 
   private async copyCurrentMessage(): Promise<void> {

package/src/write-execution.ts

@@ -9,8 +9,6 @@ export const MAX_COMPARABLE_WRITE_BYTES = 512_000;
 export const MAX_WRITE_METADATA_ENTRIES = 100;
 
 export interface DurableWriteDetails {
-  /** Persisted so history can distinguish create vs overwrite without file access. */
-  fileExistedBeforeWrite?: boolean;
   diff?: string;
   patch?: string;
   firstChangedLine?: number;
@@ -108,10 +106,7 @@ function durableDetails(
   content: string,
 ): DurableWriteDetails {
   if (metadata.diffUnavailableReason) {
-    return {
-      fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
-      diffUnavailableReason: metadata.diffUnavailableReason,
-    };
+    return { diffUnavailableReason: metadata.diffUnavailableReason };
   }
   const previousContent = metadata.previousContent ?? "";
   const diffResult = generateDiffString(previousContent, content);
@@ -121,7 +116,6 @@ function durableDetails(
     return { diffUnavailableReason: `durable diff exceeds ${MAX_DURABLE_DIFF_BYTES} bytes` };
   }
   return {
-    fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
     diff: diffResult.diff,
     patch,
     firstChangedLine: diffResult.firstChangedLine,

package/test/ui/agent-widget.test.ts

@@ -0,0 +1,123 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { AgentManager } from "../../src/agent-manager.js";
+import {
+  AgentWidget,
+  getWidgetLineBudget,
+  MAX_WIDGET_LINES,
+  type AgentActivity,
+  type Theme,
+} from "../../src/ui/agent-widget.js";
+import type { AgentRecord } from "../../src/types.js";
+
+const theme: Theme = {
+  fg: (_color, text) => text,
+  bold: (text) => text,
+};
+
+const managers: AgentManager[] = [];
+
+afterEach(() => {
+  for (const manager of managers.splice(0)) manager.dispose();
+});
+
+function makeRecord(overrides: Partial<AgentRecord> = {}): AgentRecord {
+  return {
+    id: "agent-1",
+    type: "Explore",
+    description: "Inspect the repository",
+    status: "completed",
+    toolUses: 0,
+    startedAt: 1_000,
+    completedAt: 2_000,
+    lifetimeUsage: { input: 0, output: 0, cacheWrite: 0 },
+    compactionCount: 0,
+    ...overrides,
+  };
+}
+
+function renderWidget(
+  records: AgentRecord[],
+  rows = 24,
+  activity = new Map<string, AgentActivity>(),
+  mode: "all" | "background" | "off" = "all",
+) {
+  const manager = { listAgents: () => records } as unknown as AgentManager;
+  const widget = new AgentWidget(manager, activity, () => mode);
+  const tui = { terminal: { columns: 200, rows } };
+  const render = () => (widget as any).renderWidget(tui, theme) as string[];
+  return { render, widget };
+}
+
+describe("AgentWidget live records", () => {
+  it("keeps restored history in the live widget and manager history", () => {
+    const manager = new AgentManager();
+    managers.push(manager);
+    manager.restoreCompleted([makeRecord({ id: "history", description: "restored history" })]);
+
+    const widget = new AgentWidget(manager, new Map(), () => "all");
+    const tui = { terminal: { columns: 120, rows: 24 } };
+
+    expect((widget as any).renderWidget(tui, theme).join("\n")).toContain("restored history");
+    expect(manager.listAgents().map(record => record.id)).toEqual(["history"]);
+    expect(manager.getRecord("history")).toBeDefined();
+  });
+
+  it("keeps a live completed record visible after markFinished", () => {
+    const record = makeRecord({ id: "live", description: "live completion" });
+    const { render, widget } = renderWidget([record]);
+
+    widget.markFinished(record.id);
+
+    expect(render().join("\n")).toContain("live completion");
+  });
+
+  it("normalizes multiline rows and bounds output by the responsive ceiling", () => {
+    const running = makeRecord({
+      id: "running",
+      status: "running",
+      completedAt: undefined,
+      description: "running\nsecond line",
+    });
+    const finished = makeRecord({
+      id: "finished",
+      description: "finished\nsecond line",
+    });
+    const extraFinished = Array.from({ length: 10 }, (_, i) => makeRecord({
+      id: `finished-${i}`,
+      description: `extra ${i}`,
+    }));
+    const activity = new Map<string, AgentActivity>([
+      [running.id, {
+        activeTools: new Map(),
+        toolUses: 0,
+        responseText: "activity\nsecond line",
+        turnCount: 1,
+        lifetimeUsage: { input: 0, output: 0, cacheWrite: 0 },
+      }],
+    ]);
+    const rows = 9;
+    const { render } = renderWidget([running, finished, ...extraFinished], rows, activity);
+    const lines = render();
+
+    expect(lines.every(line => !/[\r\n]/.test(line))).toBe(true);
+    expect(lines.length).toBeLessThanOrEqual(getWidgetLineBudget(rows));
+    expect(lines.length).toBeLessThanOrEqual(MAX_WIDGET_LINES);
+    expect(lines.join("\n")).toContain("running second line");
+    expect(lines.some(line => line.includes("more"))).toBe(true);
+  });
+
+  it("counts queued records in the overflow indicator on short terminals", () => {
+    const running = makeRecord({ id: "running", status: "running", completedAt: undefined });
+    const queued = makeRecord({ id: "queued", status: "queued", completedAt: undefined });
+    const { render } = renderWidget([running, queued], 6);
+
+    const output = render().join("\\n");
+    expect(output).toContain("+2 more");
+    expect(output).toContain("1 queued");
+  });
+
+  it("reserves editor space on short terminals while retaining the widget ceiling", () => {
+    expect(getWidgetLineBudget(9)).toBe(5);
+    expect(getWidgetLineBudget(100)).toBe(MAX_WIDGET_LINES);
+  });
+});

package/test/ui/conversation-diff.test.ts

@@ -4,7 +4,7 @@ import {
   renderEditDiffResult,
   renderWriteDiffResult,
 } from "../../src/ui/ccstyle/diff/diff-renderer.js";
-import { createViewerCcstyleResult, renderRichToolResult } from "../../src/ui/ccstyle/tool-result.js";
+import { renderRichToolResult } from "../../src/ui/ccstyle/tool-result.js";
 import { DEFAULT_TOOL_DISPLAY_CONFIG } from "../../src/ui/ccstyle/diff/types.js";
 
 const theme = {
@@ -66,33 +66,6 @@ describe("viewer-local ccstyle diff renderer", () => {
     expect(rendered).not.toContain("later");
   });
 
-  it("reads tool-hint hover state at render time", () => {
-    let hovered = false;
-    const component = createViewerCcstyleResult("read", {
-      content: [{ type: "text", text: "one\ntwo" }],
-    }, { expanded: false, isHovered: () => hovered }, theme, {
-      args: { path: "file.txt" },
-      isHovered: () => hovered,
-    });
-
-    expect(component?.render(100).join("\n")).not.toContain("<text>click to show more</text>");
-    hovered = true;
-    expect(component?.render(100).join("\n")).toContain("<text>click to show more</text>");
-  });
-
-  it("labels persisted overwrites correctly without reading the current file", () => {
-    const component = renderRichToolResult("write", {
-      content: [{ type: "text", text: "Successfully wrote" }],
-      details: {
-        diff: "-1 old\n+1 new",
-        patch: "--- file.txt\n+++ file.txt\n@@ -1,1 +1,1 @@\n-old\n+new\n",
-      },
-    }, { expanded: false }, theme, { args: { path: "file.txt", content: "new\n" } });
-
-    expect(component?.render(100).join("\\n")).toContain("overwritten");
-    expect(component?.render(100).join("\\n")).toContain("click to show more");
-  });
-
   it("returns an explicit unavailable row instead of an empty success card", () => {
     const component = renderRichToolResult("write", {
       content: [{ type: "text", text: "Successfully wrote" }],