pi-pretty-tui 0.3.2 → 0.3.4

package/README.md

@@ -38,6 +38,12 @@ Click activity rows, tool titles or thought entries to expand and collapse detai
 
 Settings persist across sessions. Disabling the extension restores Pi's native appearance.
 
+### Repeated errors
+
+In clean and compact, adjacent standalone errors can share the first complete error and a `[×2]` / `[×3]` count even when trace, request or correlation IDs change. Source type, title and surrounding text must match exactly; only standalone hexadecimal IDs (16–128 characters containing a letter) or UUIDs may differ. Short codes, numeric quantities and prefixed IDs such as `msg_...` / `rs_...` remain exact.
+
+Other transcript entries break the run; errors with thoughts, tool calls or visible answer text are not folded. In fullscreen, click the first error to expand or collapse the run. Expanded errors show every complete original error, aligned with the same prefix and without numbering; new retries preserve the expanded state. Session records remain unchanged. You can also use `/pretty-tui full` to see every occurrence and its original IDs.
+
 ## Copying
 
 Start Pi in **fullscreen mode** to use mouse controls:

package/README.zh-CN.md

@@ -38,6 +38,12 @@ pi install npm:pi-pretty-tui
 
 设置会持久保存。禁用插件后恢复 Pi 原生外观。
 
+### 重复错误
+
+clean 和 compact 中，相邻的独立错误即使 trace、request 或 correlation ID 不同，也可合并显示第一条完整错误及 `[×2]` / `[×3]` 次数。来源类型、标题和周围文本必须完全一致；仅独立的长十六进制 ID（16–128 位且含字母）或 UUID 可以变化。短错误码、纯数字值及 `msg_...` / `rs_...` 等带前缀的标识仍要求一致。
+
+其他会话条目会打断合并；带思考、工具调用或可见回答的错误不参与折叠。全屏模式下，点击第一条错误可展开或收起；展开后每条完整原始错误使用相同前缀、左侧对齐，不加序号，新追加的重复错误保留展开状态。会话记录保持不变，也可使用 `/pretty-tui full` 查看每次错误及原始 ID。
+
 ## 复制操作
 
 以 **fullscreen 全屏模式**启动 Pi，即可使用鼠标复制入口：

package/extensions/edit-diff.ts

@@ -0,0 +1,103 @@
+import { getLanguageFromPath, highlightCode } from "@earendil-works/pi-coding-agent";
+import { sliceByColumn, visibleWidth } from "@earendil-works/pi-tui";
+
+type Range = [number, number];
+type Row = { marker: string; number?: string; text: string; styled: string; changes: Range[] };
+const segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
+const graphemes = (text: string) => Array.from(segmenter.segment(text), part => part.segment);
+
+// Bounded grapheme LCS: long/unrelated lines fall back to highlighting their
+// changed middle. Neither path splits emoji, combining marks or surrogate pairs.
+function changedRanges(before: string, after: string): [Range[], Range[]] {
+  const a = graphemes(before), b = graphemes(after);
+  let start = 0;
+  while (start < a.length && start < b.length && a[start] === b[start]) start++;
+  let endA = a.length, endB = b.length;
+  while (endA > start && endB > start && a[endA - 1] === b[endB - 1]) { endA--; endB--; }
+  const removed: Range[] = [], added: Range[] = [];
+  const range = (parts: string[], from: number, to: number): Range =>
+    [visibleWidth(parts.slice(0, from).join("")), visibleWidth(parts.slice(0, to).join(""))];
+  const n = endA - start, m = endB - start;
+  if (!n || !m || n * m > 65536) {
+    if (n) removed.push(range(a, start, endA));
+    if (m) added.push(range(b, start, endB));
+    return [removed, added];
+  }
+  const matrix = Array.from({ length: n + 1 }, () => new Uint32Array(m + 1));
+  for (let i = n - 1; i >= 0; i--) for (let j = m - 1; j >= 0; j--)
+    matrix[i][j] = a[start + i] === b[start + j] ? matrix[i + 1][j + 1] + 1 : Math.max(matrix[i + 1][j], matrix[i][j + 1]);
+  let i = 0, j = 0;
+  while (i < n || j < m) {
+    if (i < n && j < m && a[start + i] === b[start + j]) { i++; j++; }
+    else if (i < n && (j === m || matrix[i + 1][j] >= matrix[i][j + 1])) {
+      removed.push(range(a, start + i, start + i + 1));
+      i++;
+    } else {
+      added.push(range(b, start + j, start + j + 1));
+      j++;
+    }
+  }
+  const merge = (ranges: Range[]) => ranges.reduce<Range[]>((result, next) => {
+    const previous = result[result.length - 1];
+    if (previous && previous[1] === next[0]) previous[1] = next[1];
+    else result.push(next);
+    return result;
+  }, []);
+  return [merge(removed), merge(added)];
+}
+
+export function editDiffLayout(theme: any, diff: string, path?: string) {
+  const rows: Row[] = diff.split("\n").map(line => {
+    const match = /^([ +\-]) *(\d+) (.*)$/.exec(line);
+    const marker = match?.[1] ?? (line.startsWith("+") && !line.startsWith("+++") ? "+" : line.startsWith("-") && !line.startsWith("---") ? "-" : " ");
+    const text = (match ? match[3] : /^\s+\.\.\.$/.test(line) ? "..." : line).replace(/\t/g, "   ");
+    return { marker, number: match?.[2], text, styled: text, changes: [] };
+  });
+  // Highlight old/new snippets separately so removed code cannot corrupt the
+  // syntax state of the new side. Keep all highlighting in the host's theme.
+  const language = path ? getLanguageFromPath(path) : undefined;
+  for (const excluded of ["+", "-"]) {
+    const side = rows.filter(row => row.marker !== excluded);
+    let styled: string[];
+    try { styled = highlightCode(side.map(row => row.text).join("\n"), language); }
+    catch { styled = side.map(row => row.text); }
+    side.forEach((row, index) => {
+      if (row.marker !== " " || excluded === "+") row.styled = styled[index] ?? row.text;
+    });
+  }
+  for (let index = 0; index < rows.length;) {
+    if (rows[index].marker !== "-") { index++; continue; }
+    const removed: Row[] = [], added: Row[] = [];
+    while (rows[index]?.marker === "-") removed.push(rows[index++]);
+    while (rows[index]?.marker === "+") added.push(rows[index++]);
+    // Do not guess a line pairing when a replacement changes the line count.
+    if (removed.length === added.length) removed.forEach((row, i) => {
+      [row.changes, added[i].changes] = changedRanges(row.text, added[i].text);
+    });
+  }
+  const numberWidth = rows.reduce((width, row) => Math.max(width, row.number?.length ?? 0), 1);
+  let index = 0;
+  return (_line: string) => {
+    const row = rows[index++];
+    const color = row.marker === "+" ? "toolDiffAdded" : row.marker === "-" ? "toolDiffRemoved" : "toolDiffContext";
+    const background = row.marker === "+" ? "toolSuccessBg" : row.marker === "-" ? "toolErrorBg" : undefined;
+    const paint = (text: string) => background && theme.bg ? theme.bg(background, text) : text;
+    const width = visibleWidth(row.text);
+    let content = "", cursor = 0;
+    for (const [start, end] of row.changes) {
+      content += sliceByColumn(row.styled, cursor, start - cursor);
+      const changed = sliceByColumn(row.styled, start, end - start);
+      // Underline + bold preserve syntax foreground colors, unlike inverse.
+      content += theme.underline ? theme.underline(theme.bold(changed)) : theme.bold(changed);
+      cursor = end;
+    }
+    content += sliceByColumn(row.styled, cursor, Math.max(0, width - cursor));
+    const gutter = row.number ? `${row.number.padStart(numberWidth)} ${row.marker} ` : " ".repeat(numberWidth + 3);
+    return {
+      prefix: paint(theme.fg(color, gutter)),
+      continuation: paint(" ".repeat(numberWidth + 3)),
+      content,
+      background: background ? paint : undefined,
+    };
+  };
+}

package/extensions/index.ts

@@ -8,6 +8,7 @@ import {
   type InlineToken,
 } from "./markdown-emphasis.js";
 import { gapRowsAfterBlock, renderSpacedList } from "./markdown-spacing.js";
+import { editDiffLayout } from "./edit-diff.js";
 import { ThoughtPresentation } from "./thought-presentation.js";
 import { isThirdPartyTool, renderToolProjection, THIRD_PARTY_TOOL, toolLabel, type ToolProjection } from "./tool-presentation.js";
 import { NestedTools, NESTED_SNAPSHOT_ENTRY } from "./nested-tools.js";
@@ -89,6 +90,24 @@ const loadConfig = (path: string): PrettyTuiConfig => {
   }
 };
 
+/** Stable text affixes around opaque IDs, without fuzzy similarity chaining. */
+const errorAffixKey = (text: string): string => {
+  const parts: (string | ["hex" | "uuid"])[] = [];
+  let cursor = 0;
+  // Whole tokens only: keep semantic identifiers such as msg_<hex> and
+  // rs_<hex>, short codes, ordinary words, and numeric quantities exact.
+  const opaqueId = /(?<![\w-])(?:[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}|[\da-f]{16,128})(?![\w-])/giu;
+  for (const match of text.matchAll(opaqueId)) {
+    const kind = match[0].includes("-") ? "uuid" : "hex";
+    if (kind === "hex" && !/[a-f]/iu.test(match[0])) continue;
+    parts.push(text.slice(cursor, match.index), [kind]);
+    cursor = match.index + match[0].length;
+  }
+  parts.push(text.slice(cursor));
+  // Typed slots cannot collide with a literal placeholder in an error.
+  return JSON.stringify(parts);
+};
+
 /** Polished user messages, tool calls, and list rendering for Pi's TUI. */
 export default function prettyTui(pi: ExtensionAPI) {
   const cwd = process.cwd();
@@ -111,6 +130,21 @@ export default function prettyTui(pi: ExtensionAPI) {
   let currentPromptEditor: any;
   let errorChatContainer: any;
   const runtimeErrorDescriptors = new WeakMap<object, { source: string; title: string; content: string }>();
+  const expandedErrorRuns = new WeakSet<object>();
+  const errorDisclosureRows = new WeakMap<object, { start: number; end: number }>();
+  const errorDisclosureHit = (component: object, event: any) => {
+    const rows = errorDisclosureRows.get(component);
+    return renderMode !== "full" && Boolean(rows && event.y >= rows.start && event.y < rows.end);
+  };
+  const handleErrorDisclosureMouse = (component: object, event: any) => {
+    if (event.button !== "left" || !errorDisclosureHit(component, event)) return undefined;
+    if (event.type === "press") return { handled: true };
+    if (event.type !== "click") return undefined;
+    if (expandedErrorRuns.has(component)) expandedErrorRuns.delete(component);
+    else expandedErrorRuns.add(component);
+    currentTui?.requestRender?.();
+    return { handled: true };
+  };
   const errorDescriptor = (component: any) => {
     const runtime = runtimeErrorDescriptors.get(component);
     if (runtime) return runtime;
@@ -124,15 +158,21 @@ export default function prettyTui(pi: ExtensionAPI) {
     const children: any[] = errorChatContainer?.children ?? [];
     const index = children.indexOf(component);
     const descriptor = errorDescriptor(component);
+    const key = descriptor && errorAffixKey(descriptor.content);
     const same = (other: any) => {
       const value = errorDescriptor(other);
       return descriptor && value && value.source === descriptor.source &&
-        value.title === descriptor.title && value.content === descriptor.content;
+        value.title === descriptor.title && errorAffixKey(value.content) === key;
     };
     if (index < 0 || !descriptor) return { hidden: false, count: 1, compact: false };
+    // Only the visible run head needs a count; hidden retries must not rescan
+    // the whole suffix and repeatedly fingerprint every later error.
+    const hidden = index > 0 && Boolean(same(children[index - 1]));
     let count = 1;
-    while (index + count < children.length && same(children[index + count])) count++;
-    return { hidden: index > 0 && Boolean(same(children[index - 1])), count,
+    if (!hidden) {
+      while (index + count < children.length && same(children[index + count])) count++;
+    }
+    return { hidden, count,
       compact: index > 0 && Boolean(errorDescriptor(children[index - 1])) };
   };
   const runningColor = (theme: any, text: string): string =>
@@ -157,14 +197,14 @@ export default function prettyTui(pi: ExtensionAPI) {
   let latestActivityStatusGeneration = 0;
   const renderLatestActivityStatus = (status: LatestActivityStatus, width: number, theme: any): string => {
     const severity = status.severity ?? "status";
-    const icon = severity === "error" ? "✕" : severity === "success" ? "✓" : "◇";
+    const icon = severity === "error" ? "✕ " : severity === "success" ? "✓ " : "";
     const color = severity === "error"
       ? "error"
       : severity === "success"
         ? "success"
         : "dim";
     const detail = status.detail?.trim() ? ` — ${status.detail.trim()}` : "";
-    return truncateToWidth(` ${theme.fg(color, `${icon} ${status.title}`)}${theme.fg("dim", detail)}`, Math.max(1, width), "…");
+    return truncateToWidth(` ${theme.fg(color, `${icon}${status.title}`)}${theme.fg("dim", detail)}`, Math.max(1, width), "…");
   };
   const refreshLatestActivityWidget = () => {
     if (!currentExtensionUi?.setWidget) return;
@@ -603,30 +643,54 @@ export default function prettyTui(pi: ExtensionAPI) {
     );
   };
 
-  const renderStandaloneError = (member: ActivityMember, width: number, component?: any): string[] => {
+  const renderStandaloneAlert = (member: ActivityMember, width: number, component?: any): string[] => {
     const run = component && renderMode !== "full" ? errorRun(component) : { hidden: false, count: 1, compact: false };
+    if (component) errorDisclosureRows.delete(component);
     if (run.hidden) return [];
     const theme = defaultActivityTheme();
     const style = activityUpdateStyle(member, theme);
     const original = component ? errorDescriptor(component) : undefined;
-    const title = stripTerminalSequences(original?.title ?? member.updateTitle ?? "Error");
-    const content = stripTerminalSequences(original?.content || member.updateContent || "");
-    const heading = style.icon + style.title(title);
-    const prefix = heading + (content ? theme.fg("dim", " · ") : "");
-    const text = prefix + theme.fg("muted", content) + (run.count > 1 ? theme.fg("dim", ` ×${run.count}`) : "");
-    // Wrap rather than truncate; all original detail lines remain accessible.
-    const continuation = " ".repeat(Math.min(visibleWidth(prefix), Math.max(0, Math.floor(width / 3))));
-    const rows: string[] = [];
-    for (const line of text.split("\n")) {
-      const wrapped = wrapTextWithAnsi(line, Math.max(1, width - visibleWidth(continuation)));
-      rows.push(...wrapped.map((row, index) => (rows.length || index ? continuation : "") + row));
+    const renderError = (titleText: string, contentText: string, count = 1): string[] => {
+      const title = stripTerminalSequences(titleText);
+      const content = stripTerminalSequences(contentText);
+      const heading = style.icon + style.title(title);
+      const prefix = heading + (content ? theme.fg("dim", " · ") : "");
+      const text = prefix + theme.fg("muted", content) + (count > 1 ? theme.fg("dim", component && expandedErrorRuns.has(component) ? " [Collapse]" : ` [×${count}]`) : "");
+      // Wrap rather than truncate; all original detail lines remain accessible.
+      // A single-line notification can be entirely its title. Indenting by
+      // that title's length wastes most of the viewport on every continuation.
+      const continuation = " ".repeat(Math.min(2, Math.max(0, width - 1)));
+      const rows: string[] = [];
+      for (const line of text.split("\n")) {
+        const wrapped = wrapTextWithAnsi(line, Math.max(1, width - visibleWidth(continuation)));
+        rows.push(...wrapped.map((row, index) => (rows.length || index ? continuation : "") + row));
+      }
+      return rows.map((line) => truncateToWidth(line, Math.max(1, width), ""));
+    };
+    const rows = [
+      ...(run.compact ? [] : [""]),
+      ...renderError(original?.title ?? member.updateTitle ?? "Error", original?.content || member.updateContent || "", run.count),
+    ];
+    if (component && run.count > 1) {
+      errorDisclosureRows.set(component, { start: run.compact ? 0 : 1, end: rows.length });
+      mouseClickHitTests.set(component, (event) => errorDisclosureHit(component, event));
+      if (expandedErrorRuns.has(component)) {
+        // The visible head owns the expanded projection. Original retry
+        // components stay untouched and hidden, and only the head counts them.
+        const children = errorChatContainer?.children ?? [];
+        const index = children.indexOf(component);
+        for (const retry of children.slice(index + 1, index + run.count)) {
+          const descriptor = errorDescriptor(retry);
+          if (descriptor) rows.push(...renderError(descriptor.title, descriptor.content));
+        }
+      }
     }
-    return [...(run.compact ? [] : [""]), ...rows.map((line) => truncateToWidth(line, Math.max(1, width), ""))];
+    return rows;
   };
 
   const renderPendingActivityUpdate = (member: ActivityMember, width: number, component?: any): string[] => {
-    if (member.updateSeverity === "error" && member.updateTitle !== "Response truncated") {
-      return renderStandaloneError(member, width, component);
+    if (member.updateSeverity === "error" || member.updateSeverity === "warning") {
+      return renderStandaloneAlert(member, width, component);
     }
     const theme = defaultActivityTheme();
     const title = truncateToWidth(member.updateTitle ?? "Update", Math.max(1, width - 2), "…");
@@ -1405,10 +1469,15 @@ export default function prettyTui(pi: ExtensionAPI) {
       }
       if (renderMode === "compact") {
         const terminal = assistantTerminalUpdate(this[originalMessageKey] ?? this.lastMessage);
-        if (terminal) output.push(...renderPendingActivityUpdate(terminal, width, this));
+        if (terminal) {
+          const offset = output.length;
+          output.push(...renderPendingActivityUpdate(terminal, width, this));
+          const disclosure = errorDisclosureRows.get(this);
+          if (disclosure) errorDisclosureRows.set(this, { start: disclosure.start + offset, end: disclosure.end + offset });
+        }
       }
       panelAssistantViews.set(this, { rows, width: innerWidth, height: nativeLines.length });
-      mouseClickHitTests.set(this, (event) => thoughtRows.has(event.y));
+      mouseClickHitTests.set(this, (event) => thoughtRows.has(event.y) || errorDisclosureHit(this, event));
       return renderMode === "compact" && width < 8
         ? output.map((line) => isNativeImageRow(line) ? line : truncateToWidth(line, Math.max(1, width), "")) : output;
     };
@@ -1457,6 +1526,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     };
 
     const renderAssistantTranscript = function (this: any, width: number): string[] {
+      errorDisclosureRows.delete(this);
       const message = this[originalMessageKey] ?? this.lastMessage;
       if (
         message &&
@@ -1582,6 +1652,11 @@ export default function prettyTui(pi: ExtensionAPI) {
     };
 
     const handleAssistantTranscriptMouse = function (this: any, event: any) {
+      if (errorDescriptor(this)) {
+        patchedRender.call(this, event.width);
+        const disclosure = handleErrorDisclosureMouse(this, event);
+        if (disclosure) return disclosure;
+      }
       const message = this[originalMessageKey] ?? this.lastMessage;
       if (renderMode !== "clean") {
         patchedRender.call(this, event.width);
@@ -1750,7 +1825,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     const component: Component = {
       render: (width: number) => renderActivityUpdateProjection(group, member, width, component),
       invalidate() {},
-      handleMouse: (event: any) => handleActivityUpdateMouse(group, member, event),
+      handleMouse: (event: any) => handleErrorDisclosureMouse(component, event) ?? handleActivityUpdateMouse(group, member, event),
     } as Component;
     if (severity === "error") runtimeErrorDescriptors.set(component, {
       source: "runtime:error", title, content,
@@ -2725,6 +2800,8 @@ export default function prettyTui(pi: ExtensionAPI) {
     prefix: DisplayValue;
     continuation?: DisplayValue;
     content: DisplayValue;
+    singleLine?: boolean;
+    background?: (text: string) => string;
   };
 
   /**
@@ -2738,14 +2815,21 @@ export default function prettyTui(pi: ExtensionAPI) {
       for (const row of rows) {
         const prefix = typeof row.prefix === "function" ? row.prefix() : row.prefix;
         const content = typeof row.content === "function" ? row.content() : row.content;
+        if (row.singleLine) {
+          const inline = content.replace(/\r\n|\r|\n/g, " ");
+          rendered.push(truncateToWidth(prefix + inline, Math.max(1, width), "…"));
+          continue;
+        }
         const rawContinuation = row.continuation ?? " ".repeat(visibleWidth(prefix));
         const continuation = typeof rawContinuation === "function" ? rawContinuation() : rawContinuation;
         const prefixWidth = Math.max(visibleWidth(prefix), visibleWidth(continuation));
         const contentWidth = Math.max(1, width - prefixWidth);
         const wrapped = wrapTextWithAnsi(content || " ", contentWidth);
 
-        rendered.push(prefix + (wrapped[0] ?? ""));
-        for (const line of wrapped.slice(1)) rendered.push(continuation + line);
+        const paint = (line: string) => row.background
+          ? row.background(line + " ".repeat(Math.max(0, contentWidth - visibleWidth(line)))) : line;
+        rendered.push(prefix + paint(wrapped[0] ?? ""));
+        for (const line of wrapped.slice(1)) rendered.push(continuation + paint(line));
       }
 
       return rendered;
@@ -2758,7 +2842,8 @@ export default function prettyTui(pi: ExtensionAPI) {
     context.state.compactToolStatus = status;
   };
 
-  const callRow = (theme: any, name: string, detail: string, state: any): DisplayRow => ({
+  const callRow = (theme: any, name: string, detail: string, state: any, expanded = false): DisplayRow => ({
+    singleLine: renderMode === "clean" && !expanded,
     prefix: () => {
       const status = (state.compactToolStatus ?? "running") as ToolStatus;
       const color = status === "success" ? "success" : status === "error" ? "error" : "dim";
@@ -2769,12 +2854,12 @@ export default function prettyTui(pi: ExtensionAPI) {
     content: renderMode === "compact" ? theme.fg("muted", detail) :
       theme.fg("text", theme.bold(name)) +
       theme.fg("dim", "(") +
-      theme.fg("muted", detail) +
+      theme.fg(renderMode === "clean" && expanded ? "text" : "muted", detail) +
       theme.fg("dim", ")"),
   });
 
-  const call = (theme: any, name: string, detail: string, state: any) =>
-    block([callRow(theme, name, detail, state)]);
+  const call = (theme: any, name: string, detail: string, state: any, expanded = false) =>
+    block([callRow(theme, name, detail, state, expanded)]);
 
   const writeCall = (theme: any, name: string, path: string, content: string, expanded: boolean, state: any) => {
     const lines = content.replace(/\t/g, "    ").split("\n");
@@ -2784,7 +2869,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     const shown = lines.slice(0, expanded ? total : 10);
     const remaining = total - shown.length;
     const rows: DisplayRow[] = [
-      callRow(theme, name, `${path} · ${total} ${total === 1 ? "line" : "lines"}`, state),
+      callRow(theme, name, `${path} · ${total} ${total === 1 ? "line" : "lines"}`, state, expanded),
     ];
 
     for (let index = 0; index < shown.length; index++) {
@@ -2807,28 +2892,6 @@ export default function prettyTui(pi: ExtensionAPI) {
     return block(rows);
   };
 
-  // Pi diffs encode the marker before the padded line number. Move it into
-  // its own column and keep the whole gutter out of content word wrapping.
-  const editDiffLayout = (theme: any, diff: string): ((line: string) => DisplayRow) => {
-    const parse = (line: string) => /^([ +\-]) *(\d+) (.*)$/.exec(line);
-    const numberWidth = diff.split("\n").reduce((width, line) => Math.max(width, parse(line)?.[2].length ?? 0), 1);
-    const gutterWidth = numberWidth + 3;
-    return (line) => {
-      const match = parse(line);
-      const marker = match?.[1] ?? (
-        line.startsWith("+") && !line.startsWith("+++") ? "+" :
-        line.startsWith("-") && !line.startsWith("---") ? "-" : " "
-      );
-      const color = marker === "+" ? "toolDiffAdded" : marker === "-" ? "toolDiffRemoved" : "toolDiffContext";
-      const gutter = match ? `${match[2].padStart(numberWidth)} ${marker} ` : " ".repeat(gutterWidth);
-      return {
-        prefix: theme.fg(color, gutter),
-        continuation: " ".repeat(gutterWidth),
-        content: theme.fg(color, match ? match[3] : /^\s+\.\.\.$/.test(line) ? "..." : line),
-      };
-    };
-  };
-
   const result = (
     theme: any,
     summary: string,
@@ -2857,6 +2920,7 @@ export default function prettyTui(pi: ExtensionAPI) {
           prefix: theme.fg("dim", isLast ? "   └ " : "   │ ") + (layout?.prefix ?? ""),
           continuation: (isLast ? "     " : theme.fg("dim", "   │ ")) + (layout?.continuation ?? ""),
           content: layout?.content ?? outputStyle(shown[index] || " "),
+          background: layout?.background,
         });
       }
       if (omitted > 0) {
@@ -4464,7 +4528,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     renderCall(args: any, theme: any, context: any) {
       if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, readLabel, context.toolCallId);
       const range = readLineRange(args.offset, args.limit);
-      return call(theme, readLabel, `${args.path}${range}`, context.state);
+      return call(theme, readLabel, `${args.path}${range}`, context.state, context.expanded);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -4500,9 +4564,9 @@ export default function prettyTui(pi: ExtensionAPI) {
         const detail = omitted > 0
           ? `${firstLine} … (${omitted} more ${omitted === 1 ? "line" : "lines"})`
           : firstLine;
-        return call(theme, bashLabel, detail, context.state);
+        return call(theme, bashLabel, detail, context.state, context.expanded);
       }
-      return call(theme, bashLabel, command, context.state);
+      return call(theme, bashLabel, command, context.state, context.expanded);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -4544,7 +4608,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     renderCall(args: any, theme: any, context: any) {
       if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, editLabel, context.toolCallId);
       const count = Array.isArray(args.edits) ? ` · ${args.edits.length} changes` : "";
-      return call(theme, editLabel, `${args.path}${count}`, context.state);
+      return call(theme, editLabel, `${args.path}${count}`, context.state, context.expanded);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -4574,7 +4638,7 @@ export default function prettyTui(pi: ExtensionAPI) {
           if (line.startsWith("-") && !line.startsWith("---")) return theme.fg("toolDiffRemoved", line);
           return theme.fg("toolDiffContext", line);
         },
-        !failed && diff ? editDiffLayout(theme, diff) : undefined,
+        !failed && diff ? editDiffLayout(theme, diff, context.args?.path) : undefined,
       );
     },
   } as any);
@@ -4592,7 +4656,7 @@ export default function prettyTui(pi: ExtensionAPI) {
         const lines = content.replace(/\t/g, "    ").split("\n");
         while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
         const total = lines.length;
-        return call(theme, writeLabel, `${path} · ${total} ${total === 1 ? "line" : "lines"}`, context.state);
+        return call(theme, writeLabel, `${path} · ${total} ${total === 1 ? "line" : "lines"}`, context.state, context.expanded);
       }
       return writeCall(theme, writeLabel, path, content, context.expanded, context.state);
     },
@@ -4620,7 +4684,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, grepLabel, context.toolCallId);
       const where = args.path ? ` · ${args.path}` : "";
       const glob = args.glob ? ` · ${args.glob}` : "";
-      return call(theme, grepLabel, `${args.pattern}${where}${glob}`, context.state);
+      return call(theme, grepLabel, `${args.pattern}${where}${glob}`, context.state, context.expanded);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -4639,7 +4703,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
       if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, findLabel, context.toolCallId);
-      return call(theme, findLabel, `${args.pattern}${args.path ? ` · ${args.path}` : ""}`, context.state);
+      return call(theme, findLabel, `${args.pattern}${args.path ? ` · ${args.path}` : ""}`, context.state, context.expanded);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -4658,7 +4722,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
       if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, lsLabel, context.toolCallId);
-      return call(theme, lsLabel, args.path ?? ".", context.state);
+      return call(theme, lsLabel, args.path ?? ".", context.state, context.expanded);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-pretty-tui",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "A beautiful, polished TUI for the Pi coding agent",
   "license": "MIT",
   "author": "Kainan Yang <ykn0309@whu.edu.cn>",