@esso0428/pi-subagents 0.17.15 → 0.17.17

package/src/ui/conversation-viewer.ts

@@ -8,11 +8,10 @@
 import type { AgentSession, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { copyToClipboard } from "@earendil-works/pi-coding-agent";
 import { type Component, Input, Key, matchesKey, type TUI, type TuiMouseEvent, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { renderAgentName } from "../agent-color.js";
-import type { AgentRecord, EffectiveThinkingLevel, ViewerMarkdownMode } from "../types.js";
-import { getLifetimeCost, getLifetimeTotal, getSessionContextPercent } from "../usage.js";
+import type { AgentRecord } from "../types.js";
+import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
 import type { Theme } from "./agent-widget.js";
-import { type AgentActivity, buildInvocationTags, describeActivity, fgPreservingNestedStyles, formatCost, formatDuration, formatSessionTokens, getPromptModeLabel } from "./agent-widget.js";
+import { type AgentActivity, buildInvocationTags, describeActivity, fgPreservingNestedStyles, formatDuration, formatSessionTokens, getDisplayName, getPromptModeLabel } from "./agent-widget.js";
 import { createViewerCcstyleResult } from "./ccstyle/tool-result.js";
 import { type ConversationBlock, formatConversationMessages } from "./conversation-blocks.js";
 import { editLiveAssistantBlockInNvim, viewConversationBlockInNvim } from "./conversation-nvim.js";
@@ -26,16 +25,9 @@ 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: readonly ViewerMarkdownMode[] = ["off", "assistant", "all"];
-const MARKDOWN_MODE_LABELS: Record<ViewerMarkdownMode, string> = {
-  off: "raw",
-  assistant: "md",
-  all: "md+",
-};
 
 function renderScrollbarCell(
   theme: Theme,
@@ -86,42 +78,6 @@ export function createStaticConversationSource(
 
 type RenderLine = TimelineRenderLine;
 
-function makeRenderLine(fields: TimelineRenderLine): RenderLine {
-  return fields;
-}
-
-class PublicRenderLines extends Array<string> {
-  static get [Symbol.species](): ArrayConstructor { return Array; }
-
-  constructor(values: readonly string[]) {
-    super(...values.map(value => Object.assign(new String(value), { text: value }) as unknown as string));
-  }
-
-  override includes(searchElement: string, fromIndex?: number): boolean {
-    return this.some((value, index) => {
-      if (index < (fromIndex ?? 0)) return false;
-      const text = String(value);
-      return text === searchElement || stripAnsi(text) === searchElement;
-    });
-  }
-
-  find(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: unknown): string | undefined {
-    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: readonly RenderLine[]): PublicRenderLines {
-  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 implements Component {
@@ -256,7 +212,6 @@ export class ConversationViewer implements Component {
   private cacheVersion = 0;
   private cachedVersion = -1;
   private sessionRefreshQueued = false;
-  private lastSessionKey = "";
   private selectedBlockId: string | undefined;
   private scrollOffset = 0;
   private autoScroll = true;
@@ -279,11 +234,6 @@ export class ConversationViewer implements Component {
   private steerHistoryDraft = "";
   private timeline: ConversationTimeline;
   private toolPreview: FullToolPreview | undefined;
-  private readonly operations: ConversationViewerOperations | undefined;
-  private readonly showCost: boolean;
-  private readonly viewerMarkdown: (() => ViewerMarkdownMode) | undefined;
-  private readonly onMarkdownMode: ((mode: ViewerMarkdownMode) => void) | undefined;
-  private markdownModeOverride: ViewerMarkdownMode | undefined;
 
   constructor(
     private tui: TUI,
@@ -298,22 +248,14 @@ export class ConversationViewer implements Component {
     keybindings?: ViewerKeybindings,
     /** Send a steering message to the agent. */
     private onSteer?: (message: string) => void,
-    /** Cost flag in upstream's constructor; fork callers may pass operations here. */
-    showCostOrOperations?: boolean | ConversationViewerOperations,
-    viewerMarkdown?: () => ViewerMarkdownMode,
-    onMarkdownMode?: (mode: ViewerMarkdownMode) => void,
+    /** Optional clipboard/nvim operation context, appended for compatibility. */
+    private operations?: ConversationViewerOperations,
   ) {
-    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: this.operations?.ctx.cwd,
+      cwd: operations?.ctx.cwd,
       record,
-      markdownMode: () => this.currentMarkdownMode(),
       onChange: (change) => this.handleTimelineChange(change),
     });
     this.timeline.setBlocks(this.blocks);
@@ -343,11 +285,6 @@ export class ConversationViewer implements Component {
       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);
@@ -359,11 +296,6 @@ export class ConversationViewer implements Component {
         this.timeline.toggleFocusedTool();
         return;
       }
-      if (this.canSteer()) {
-        this.stopArmed = false;
-        this.openComposer();
-        return;
-      }
     }
     if (data === "e" && this.canSteer()) {
       this.stopArmed = false;
@@ -420,8 +352,6 @@ export class ConversationViewer implements Component {
       this.gotoMatch(-1);
     } else if (data === "M") {
       void this.copyCurrentMessage();
-    } else if (data === "m") {
-      this.cycleMarkdownMode();
     } else if (data === "o") {
       void this.viewCurrentInNvim();
     } else if (data === "O" && this.isLive()) {
@@ -464,13 +394,12 @@ export class ConversationViewer implements Component {
         return previewChanged || closeChanged ? { handled: true, render: true } : undefined;
       }
       if (event.x === railX) return previewChanged || closeChanged ? { handled: true, render: true } : undefined;
-      this.buildContentLines(contentWidth);
-      const contentLines = this.cachedLines;
+      const contentLines = this.buildContentLines(contentWidth);
       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 = 4;
+      const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
       const contentY = event.y - contentOrigin + visibleStart;
       const timelineResult = this.timeline.handleMouse({ ...event, y: contentY });
       return timelineResult ?? (previewChanged || closeChanged ? { handled: true, render: true } : undefined);
@@ -505,7 +434,7 @@ export class ConversationViewer implements Component {
     const viewportHeight = this.viewportHeight();
     const maxScroll = Math.max(0, contentLines.length - viewportHeight);
     const visibleStart = Math.min(this.scrollOffset, maxScroll);
-    const contentOrigin = 4;
+    const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
     if (event.type === "wheel") {
       if (event.y < contentOrigin || event.y >= contentOrigin + viewportHeight) return undefined;
       this.scrollBy(Math.trunc(event.wheelDelta ?? 0));
@@ -562,12 +491,8 @@ export class ConversationViewer implements Component {
     const pad = (s: string, len: number) => s + " ".repeat(Math.max(0, len - visibleWidth(s)));
     const row = (content: string) => th.fg("border", "│") + " " + truncateToWidth(pad(content, innerW), innerW, "...", true) + " " + th.fg("border", "│");
     const contentRow = (content: string, lineIndex: number, totalLines: number, viewportHeight: number, offset: number) => {
-      const isTruncationNote = stripAnsi(content).includes("... (truncated,");
-      const text = isTruncationNote
-        ? truncateToWidth(content, contentWidth, "...", true)
-        : truncateToWidth(pad(content, contentWidth), contentWidth, "...", true);
+      const text = 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))}╮`);
@@ -575,6 +500,7 @@ export class ConversationViewer implements Component {
     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", "○");
@@ -582,16 +508,12 @@ export class ConversationViewer implements Component {
     const headerParts: string[] = [duration];
     const toolUses = this.activity?.toolUses ?? this.record.toolUses;
     if (toolUses > 0) headerParts.unshift(`${toolUses} tool${toolUses === 1 ? "" : "s"}`);
-    const usage = this.activity?.lifetimeUsage ?? this.record.lifetimeUsage;
-    const tokens = getLifetimeTotal(usage);
+    const tokens = getLifetimeTotal(this.activity?.lifetimeUsage);
     if (tokens > 0) {
-      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 percent = getSessionContextPercent(this.activity?.session);
+      headerParts.push(formatSessionTokens(tokens, percent, th, this.record.compactionCount));
     }
-    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 headerText = `${statusIcon} ${th.bold(name)}${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);
@@ -599,11 +521,10 @@ export class ConversationViewer implements Component {
     const headerGap = Math.max(1, innerW - visibleWidth(headerLeft) - actionsWidth);
     lines.push(row(headerLeft + " ".repeat(headerGap) + previewLabel + " " + closeLabel));
     const invocationLine = this.invocationLine();
-    lines.push(row(invocationLine ?? ""));
+    if (invocationLine) lines.push(row(invocationLine));
     lines.push(hrMid);
 
-    this.buildContentLines(contentWidth);
-    const contentLines = this.cachedLines;
+    const contentLines = this.buildContentLines(contentWidth);
     const viewportHeight = this.viewportHeight();
     const maxScroll = Math.max(0, contentLines.length - viewportHeight);
     if (this.autoScroll) this.scrollOffset = maxScroll;
@@ -617,7 +538,7 @@ export class ConversationViewer implements Component {
       const block = this.cachedMessageBlocks[this.currentMessageIndex()];
       if (block) {
         const header = renderConversationRoleHeader(block, this.theme);
-        displayed[0] = makeRenderLine({ text: ` ${header}`, plain: header, blockIndex: currentBlockIdx, railable: true });
+        displayed[0] = { text: ` ${header}`, plain: header, blockIndex: currentBlockIdx, railable: true };
       }
     }
     for (let i = 0; i < displayed.length; i++) {
@@ -633,10 +554,7 @@ export class ConversationViewer implements Component {
         const railGlyph = currentBlock?.kind === "tool" ? "▌" : "▎";
         text = text.startsWith(" ") ? th.fg(railColor, railGlyph) + text.slice(1) : th.fg(railColor, railGlyph) + text;
       }
-      const plainText = stripAnsi(text);
-      lines.push(plainText.includes("... (truncated,")
-        ? th.fg("border", "│") + " " + text + th.fg("border", "│")
-        : contentRow(text, i, contentLines.length, viewportHeight, visibleStart));
+      lines.push(contentRow(text, i, contentLines.length, viewportHeight, visibleStart));
     }
     for (let i = displayed.length; i < viewportHeight; i++) {
       lines.push(contentRow("", i, contentLines.length, viewportHeight, visibleStart));
@@ -657,21 +575,14 @@ export class ConversationViewer implements Component {
       lines.push(row(truncateToWidth(th.fg("accent", query) + th.fg("dim", matchCount) + hints, innerW, "...", true)));
     } else {
       const actions: string[] = [];
-      if (this.canSteer()) actions.push(th.fg("dim", innerW < 100 ? "Enter steer (e steer)" : "e steer"));
+      if (this.canSteer()) actions.push(th.fg("dim", "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 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 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 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);
@@ -712,7 +623,6 @@ export class ConversationViewer implements Component {
       if (this.closed) return;
       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();
@@ -731,7 +641,7 @@ export class ConversationViewer implements Component {
         const end = Math.min(this.cachedLines.length, start + Math.max(0, range.height));
         for (let index = start; index < end; index++) {
           const line = snapshotLines[index];
-          if (line) this.cachedLines[index] = makeRenderLine({ ...line });
+          if (line) this.cachedLines[index] = { ...line };
         }
       }
     }
@@ -755,119 +665,45 @@ export class ConversationViewer implements Component {
   }
 
   private chromeLines(): number {
-    return CHROME_LINES_BASE + 1 + (this.composer ? 1 : 0);
+    return CHROME_LINES_BASE + (this.invocationLine() ? 1 : 0) + (this.composer ? 1 : 0);
   }
 
   private invocationLine(): string | undefined {
     const liveModel = this.isLive() ? this.record.session?.model : undefined;
-    const captured = this.record.invocation as (AgentRecord["invocation"] & {
-      effectiveModelName?: string;
-      effectiveModelId?: string;
-      effectiveThinking?: EffectiveThinkingLevel;
-    }) | undefined;
-    const invocation = captured
+    const invocation = this.record.invocation
       ? {
-          ...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 }),
+          ...this.record.invocation,
+          ...(liveModel && { effectiveModelName: liveModel.name ?? liveModel.id }),
+          ...(this.isLive() && { effectiveThinking: this.record.session?.thinkingLevel }),
         }
-      : liveModel
-        ? { modelName: liveModel.name ?? liveModel.id, modelId: `${liveModel.provider}/${liveModel.id}`, thinking: this.record.session?.thinkingLevel }
+      : liveModel || (this.isLive() && this.record.session?.thinkingLevel)
+        ? {
+            effectiveModelName: liveModel?.name ?? liveModel?.id,
+            effectiveThinking: this.record.session?.thinkingLevel,
+          }
         : undefined;
-    if (!invocation) 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(" · ")}`);
+    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(" · ")}`);
   }
 
-  private currentMarkdownMode(): ViewerMarkdownMode {
-    return this.markdownModeOverride ?? this.viewerMarkdown?.() ?? "assistant";
-  }
-
-  private cycleMarkdownMode(): void {
-    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();
-  }
-
-  private sessionKey(): string {
-    return this.session.messages.map(message => {
-      const value = message as unknown as { role?: unknown; content?: unknown; output?: unknown; command?: unknown };
-      const content = value.content;
-      const summarize = (text: string): string => `${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");
-  }
-
-  private blockSignature(block: ConversationBlock): string {
-    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}`;
-  }
-
-  private syncBlocksFromSession(): void {
-    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;
-    }
-  }
-
-  private buildContentLines(width: number): PublicRenderLines {
-    if (width <= 0) return new PublicRenderLines([]);
-    this.syncBlocksFromSession();
-    if (this.cachedVersion === this.cacheVersion && this.cachedWidth === width) {
-      this.timeline.render(width);
-      return publicRenderLines(this.cachedLines);
-    }
+  private buildContentLines(width: number): RenderLine[] {
+    if (width <= 0) return [];
+    if (this.cachedVersion === this.cacheVersion && this.cachedWidth === width) return this.cachedLines;
     this.timeline.setShowTools(this.showTools);
     this.timeline.render(width);
     const timelineSnapshot = this.timeline.getSnapshot();
     const lines: RenderLine[] = timelineSnapshot.lines.map((line) => {
       const rawText = typeof line?.text === "string" ? line.text : "";
       const text = truncateToWidth(rawText, width, "", true);
-      return makeRenderLine({
+      return {
         text,
         plain: stripAnsi(text),
         blockIndex: typeof line?.blockIndex === "number" ? line.blockIndex : -1,
         ...(line?.railable ? { railable: true } : {}),
-      });
+      };
     });
     this.cachedMessageStarts = [...timelineSnapshot.messageStarts];
     this.cachedMessageBlocks = [...timelineSnapshot.messageBlocks];
@@ -887,13 +723,13 @@ export class ConversationViewer implements Component {
     if (this.record.status === "running" && this.activity) {
       const act = describeActivity(this.activity.activeTools, this.activity.responseText);
       const text = `▍ ${act}`;
-      lines.push(makeRenderLine({ text: truncateToWidth(this.theme.fg("accent", "▍ ") + this.theme.fg("dim", act), width), plain: text, blockIndex: -1 }));
+      lines.push({ 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 publicRenderLines(lines);
+    return lines;
   }
 
   private currentMessageIndex(): number {

package/src/ui/schedule-menu.ts

@@ -11,7 +11,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import type { SubagentScheduler } from "../schedule.js";
 import type { ScheduledSubagent } from "../types.js";
-import { selectItem } from "./select-item.js";
 
 /** Format an ISO timestamp as relative time ("in 4h", "2d ago", "—"). */
 function relTime(iso: string | undefined, now = Date.now()): string {
@@ -86,16 +85,16 @@ export async function showSchedulesMenu(
     return;
   }
 
-  // Numbered + item-paired: two jobs whose names agree in the first 18
-  // characters format identically, and matching the returned string back
-  // against a parallel label array cancelled whichever came first.
-  const job = await selectItem(
-    ctx.ui,
+  const labels = jobs.map(j => formatJob(j, scheduler));
+  const choice = await ctx.ui.select(
     `Scheduled jobs (${jobs.length}) — select to cancel`,
-    jobs,
-    j => formatJob(j, scheduler),
+    labels,
   );
-  if (!job) return;
+  if (!choice) return;
+
+  const idx = labels.indexOf(choice);
+  if (idx < 0) return;
+  const job = jobs[idx];
 
   const ok = await ctx.ui.confirm(`Cancel "${job.name}"?`, formatDetails(job, scheduler));
   if (!ok) return;

package/src/usage.ts

@@ -6,126 +6,19 @@
  * stats-derived sum). cacheRead is excluded because each turn's cacheRead is
  * the cumulative cached prefix re-read on that one call — summing across
  * turns counts the prefix N times. See issue #38.
- *
- * That exclusion is about this *display* total, not about what was billed: the
- * prefix really is re-read and re-charged on every call. So `cacheRead` is
- * accumulated here anyway, kept out of `getLifetimeTotal` and used only where
- * billing is the question — reporting to the parent session, whose own messages
- * pi counts the same way (`addUsageToTotals`). Reporting 0 there would make a
- * subagent's rows count differently from every other row in one total.
- *
- * `cost` is a plain sum for the same reason: it is what pi charged for that one
- * message (`usage.cost.total`, priced from the model's rates), not a cumulative
- * figure. Both are optional because a model with no pricing data reports no
- * cost, and because every accumulator predates them; absent reads as 0.
  */
-export type LifetimeUsage = { input: number; output: number; cacheWrite: number; cacheRead?: number; cost?: number };
+export type LifetimeUsage = { input: number; output: number; cacheWrite: number };
 
-/**
- * Sum of lifetime *token* components for DISPLAY, or 0 if undefined.
- * Deliberately excludes `cacheRead` (see above) and `cost` — that is money, not
- * tokens, and lives on the same object only because it accumulates on the same
- * events.
- */
+/** Sum of lifetime usage components, or 0 if undefined. */
 export function getLifetimeTotal(u?: LifetimeUsage): number {
   return u ? u.input + u.output + u.cacheWrite : 0;
 }
 
-/** Accumulated cost in USD, or 0 when unpriced/undefined. */
-export function getLifetimeCost(u?: LifetimeUsage): number {
-  return u?.cost ?? 0;
-}
-
 /** Add a usage delta into a target accumulator (mutates target). */
 export function addUsage(into: LifetimeUsage, delta: LifetimeUsage): void {
   into.input += delta.input;
   into.output += delta.output;
   into.cacheWrite += delta.cacheWrite;
-  if (delta.cacheRead) into.cacheRead = (into.cacheRead ?? 0) + delta.cacheRead;
-  if (delta.cost) into.cost = (into.cost ?? 0) + delta.cost;
-}
-
-/**
- * A pi `Usage`. Rebuilt here rather than imported so this module stays
- * dependency-free for tests; the fields are pi's, and every one of them must be
- * present: pi's `addUsageToTotals` dereferences `usage.cost.total` with no
- * guard, so a partial object throws inside pi rather than at the call site.
- *
- * This is pi's convention for spend in anything handed to a consumer — every
- * extension-facing payload that carries it takes the whole object
- * (`ToolResultEvent`, `ToolResultEventResult`, `AssistantMessage`, …), never a
- * flattened cost. Pi flattens only in computed read APIs it expects you to
- * render, like `SessionStats`. So both places we hand usage to someone else —
- * `AgentToolResult.usage` and the `subagents:completed` / `subagents:failed`
- * events — carry this, and gain whatever pi adds to `Usage` for free.
- */
-export type ReportedUsage = {
-  input: number;
-  output: number;
-  cacheRead: number;
-  cacheWrite: number;
-  totalTokens: number;
-  cost: { input: number; output: number; cacheRead: number; cacheWrite: number; total: number };
-};
-
-/**
- * Render an accumulator as a pi `Usage`, or undefined when nothing was spent —
- * callers attach nothing rather than a zero, so a consumer can tell "spent
- * nothing" from "never ran".
- *
- * `cacheRead` IS included, unlike in `getLifetimeTotal`: pi sums it across a
- * session's own assistant messages, and the prefix genuinely is re-read and
- * re-billed on every call. Only `total` is populated on the cost breakdown; pi
- * reads nothing else from it, and the per-kind split is not tracked.
- */
-export function toReportedUsage(u: LifetimeUsage): ReportedUsage | undefined {
-  const { input, output, cacheWrite, cacheRead = 0, cost = 0 } = u;
-  if (input === 0 && output === 0 && cacheWrite === 0 && cacheRead === 0 && cost === 0) return undefined;
-  return {
-    input,
-    output,
-    cacheRead,
-    cacheWrite,
-    totalTokens: input + output + cacheRead + cacheWrite,
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: cost },
-  };
-}
-
-/**
- * Subagent spend that the parent session has not been told about yet.
- *
- * Subagents run in their own pi sessions, so none of what they spend appears in
- * the parent's `getSessionStats()`. Pi does aggregate `toolResult.usage` into
- * those stats, though — so the way back into the parent's footer and `/cost` is
- * to hang the spend on a tool result. Background and scheduled agents finish
- * between tool calls with nothing to hang it on, hence a pool: every assistant
- * message lands here as it happens, and the next tool result we return carries
- * whatever has accumulated.
- *
- * Drain empties it, so each message is reported exactly once no matter how many
- * results are returned or how many agents were running.
- */
-export class PendingUsagePool {
-  private pending: LifetimeUsage = { input: 0, output: 0, cacheWrite: 0, cacheRead: 0, cost: 0 };
-  private dirty = false;
-
-  add(delta: LifetimeUsage): void {
-    addUsage(this.pending, delta);
-    this.dirty = true;
-  }
-
-  /**
-   * Take everything accumulated so far as a pi `Usage`, resetting the pool.
-   * Returns undefined when nothing is pending, so callers can leave the tool
-   * result untouched rather than attaching a zero.
-   */
-  drain(): ReportedUsage | undefined {
-    if (!this.dirty) return undefined;
-    const drained = toReportedUsage(this.pending);
-    this.pending = { input: 0, output: 0, cacheWrite: 0, cacheRead: 0, cost: 0 };
-    this.dirty = false;
-    return drained;
-  }
 }
 
 /** Minimal shape we read from upstream `getSessionStats()`. */