pi-pretty-tui 0.2.7 → 0.2.9

package/README.md

@@ -37,6 +37,14 @@ Displayed custom messages without their own renderer use one generic accent-colo
 
 Pi's direct internal `showStatus()` feedback is transient: it appears only in the status line above the editor, a newer status replaces it, and a ten-second timer removes it. It never enters the transcript or activity timeline and is cleared on reload. In clean mode, `Ctrl+T` and `Ctrl+O` only show short hints to click the corresponding disclosure; neither changes visibility or Pi's Thinking setting. In full and compact modes, both shortcuts keep Pi's native behaviour.
 
+Visible assistant text remains outside activity trees even when a later update to the same message introduces thinking. Repeated updates do not close a separate, subsequent tool group.
+
+`read` range labels accept numeric strings and omitted/null fields without concatenating line numbers; malformed range values omit the label. Expanded `edit` diffs use a fixed, right-aligned line-number gutter followed by a separate `+`/`-` column. Wrapped code aligns with the content column, preserving code indentation and theme diff colors.
+
+## Error presentation
+
+In clean mode, standalone errors keep their original title and complete text in a compact `✕ Error · reason` layout. Consecutive errors with exactly the same source type, title, and full text share one visible row with a dim `×2` / `×3` count. Other transcript components break the run; errors carrying thought/tool/visible-response content are not folded. This is UI-only: session records and original message components remain unchanged. Long errors wrap without an added preview truncation; full/compact modes keep native presentation.
+
 ## Codemode and nested tools
 
 In clean mode, tools that call other tools through Pi's nested execution API keep their own parent node. Expand the activity group to see each internal call, its status, compact arguments, duration, and result summary. Click an internal call to inspect its arguments and text result independently. Click its expanded body to collapse just that call. Script and script-output bodies also collapse their own sections when clicked. Tool calls use a `●` marker: dim while running, success-colored when successful, and error-colored when failed. Tool names use bold theme text. `[Script]` and `[Script output]` are separate disclosures; the nested parent title is informational and clicking it does not expand or collapse details. Use each section or child to expand and collapse its own details; `Ctrl+O` only shows a hint in clean mode. Extensions can still use Pi's `setToolsExpanded()` API for global control; local disclosures remain usable afterward, and another global API call resets the local overrides. Calls retain their start order even when they finish in parallel. A handled child failure remains marked as failed even if the script succeeds.
@@ -84,7 +92,7 @@ The suite covers live and restored activity timelines, retries and terminal stat
 
 ## Compatibility notice
 
-The current development and regression-test baseline is **Pi 1.1.0**. User chat bubbles support its direct Markdown layout, keeping their transparent background and content-sized width. Nested execution requires Pi 0.99.0 or later; this is a feature requirement, not a promise that every older Pi release is tested.
+The current development and regression-test baseline is **Pi 1.3.0**. User chat bubbles support its direct Markdown layout, keeping their transparent background and content-sized width. Nested execution requires Pi 0.99.0 or later; this is a feature requirement, not a promise that every older Pi release is tested.
 
 Tool rendering uses Pi's documented extension APIs. Active-tool state follows Pi's built-in execution transitions through its exported interactive components. Clean-mode thought details use the activity hierarchy's own disclosure state; full and compact modes retain Pi's built-in Thinking visibility control. Rendering native user messages as adaptive chat bubbles, rounding the native prompt editor, changing unordered-list markers, and enhancing fenced code blocks require reload-safe runtime patches because Pi does not currently expose public renderer hooks for those presentation details. Markdown enhancements are activated only while rendering user and assistant messages in the main transcript; Markdown created by extension overlays keeps Pi's native layout. Markdown parsing, syntax highlighting, and terminal semantic zones remain handled by Pi.
 

package/README.zh-CN.md

@@ -37,6 +37,14 @@ Pi 可能会提示内置工具被覆盖。这是正常现象：pi-pretty-tui 会
 
 Pi 内部直接调用 `showStatus()` 产生的反馈属于临时 UI 状态：它只显示在编辑器上方，新状态替换旧状态，并由十秒 timer 自动清除；它不会进入 transcript 或活动时间线，reload 时也会清除。在 clean 模式下，`Ctrl+T` 和 `Ctrl+O` 都只显示点击对应节点的简短提示，不改变内容可见性或 Pi 的 Thinking 设置。在 full 和 compact 模式下，两者保留 Pi 的原生行为。
 
+即使同一消息的后续更新才加入思考，可见 assistant 正文也保持在活动树之外；重复更新不会关闭后续独立的工具活动组。
+
+`read` 行范围标签正确处理数字字符串及省略/null 参数，不再拼接出错误行号；无效范围值不显示范围标签。展开的 `edit` diff 使用固定宽度、右对齐的左侧行号栏，`+`/`-` 独占一列；长代码续行与正文列对齐，保留代码缩进及主题 diff 配色。
+
+## 错误展示
+
+clean 模式下，独立错误保留原始标题和完整内容，以紧凑的 `✕ Error · 原因` 展示。来源类型、标题及完整内容完全一致的相邻错误合为一条可见行，并使用暗色 `×2` / `×3` 标识次数。其他 transcript 组件会打断计数；包含思考、工具或可见回答的错误不参与合并。合并仅影响 UI，不删除或修改会话记录及原始消息组件。长错误完整换行，不增加预览截断；full/compact 模式保留原生展示。
+
 ## Codemode 与嵌套工具
 
 clean 模式下，通过 Pi 嵌套执行 API 调用其他工具的工具保留自己的父节点。展开活动组后，会显示各内部调用的状态、紧凑参数、耗时和结果摘要；点击某个内部调用，可以独立展开其参数和文本结果；点击展开后的正文可收起该调用，脚本和脚本输出正文也可点击收起各自区块。工具统一使用 `●` 圆点：运行中为主题暗色，成功与失败分别为主题成功色与错误色；工具名使用正文色加粗。`[Script]` 和 `[Script output]` 分别控制脚本与汇总输出；嵌套父工具标题仅用于展示，点击不会展开或折叠详情。各区块或子调用通过自己的入口独立展开/收起，`Ctrl+O` 在 clean 模式下只显示提示。扩展仍可通过 Pi 的 `setToolsExpanded()` API 全局控制，之后也可局部展开/收起；再次调用全局 API 会重置局部状态。并行调用按照启动顺序排列，不会随完成顺序跳动。即使脚本捕获错误后成功，失败的子调用仍会明确标记。
@@ -84,7 +92,7 @@ npm test
 
 ## 兼容性说明
 
-当前开发与回归测试基线为 **Pi 1.1.0**。用户气泡已适配该版本直接使用 Markdown 的布局，保留透明背景与按内容自适应的宽度。嵌套执行需要 Pi 0.99.0 及以后；这是功能要求，不代表每个旧版都经过测试。
+当前开发与回归测试基线为 **Pi 1.3.0**。用户气泡已适配该版本直接使用 Markdown 的布局，保留透明背景与按内容自适应的宽度。嵌套执行需要 Pi 0.99.0 及以后；这是功能要求，不代表每个旧版都经过测试。
 
 工具渲染使用 Pi 的公开扩展 API。活动工具状态通过 Pi 导出的交互组件跟随其内置执行状态变化；clean 模式的 thought 详情使用活动时间线自身的展开状态，full 和 compact 模式则保留 Pi 内置的 Thinking 可见性控制。由于 Pi 目前没有为这些展示细节提供公开渲染钩子，自适应的原生用户消息气泡、原生输入编辑器圆角、无序列表标记和围栏代码块增强需要使用可安全重载的运行时补丁。Markdown 增强仅在渲染主 transcript 中的用户消息和助手回复时启用；扩展 overlay 创建的 Markdown 保持 Pi 原生布局。Markdown 解析、语法高亮和终端语义区域仍由 Pi 处理。
 

package/extensions/index.ts

@@ -100,6 +100,32 @@ export default function prettyTui(pi: ExtensionAPI) {
   const mouseClickHitTests = new WeakMap<object, (event: any) => boolean>();
   let currentTui: any;
   let currentPromptEditor: any;
+  let errorChatContainer: any;
+  const runtimeErrorDescriptors = new WeakMap<object, { source: string; title: string; content: string }>();
+  const errorDescriptor = (component: any) => {
+    const runtime = runtimeErrorDescriptors.get(component);
+    if (runtime) return runtime;
+    if (!(component instanceof AssistantMessageComponent)) return undefined;
+    const message = (component as any).lastMessage;
+    if (message?.stopReason !== "error" || (message.content ?? []).some((item: any) =>
+      item.type === "toolCall" || item.type === "thinking" || item.type === "text" && item.text?.length)) return undefined;
+    return { source: "assistant:error", title: "Error", content: String(message.errorMessage ?? "") };
+  };
+  const errorRun = (component: any) => {
+    const children: any[] = errorChatContainer?.children ?? [];
+    const index = children.indexOf(component);
+    const descriptor = errorDescriptor(component);
+    const same = (other: any) => {
+      const value = errorDescriptor(other);
+      return descriptor && value && value.source === descriptor.source &&
+        value.title === descriptor.title && value.content === descriptor.content;
+    };
+    if (index < 0 || !descriptor) return { hidden: false, count: 1, compact: false };
+    let count = 1;
+    while (index + count < children.length && same(children[index + count])) count++;
+    return { hidden: index > 0 && Boolean(same(children[index - 1])), count,
+      compact: index > 0 && Boolean(errorDescriptor(children[index - 1])) };
+  };
   const runningColor = (theme: any, text: string): string =>
     typeof currentPromptEditor?.borderColor === "function"
       ? currentPromptEditor.borderColor(text)
@@ -553,7 +579,31 @@ export default function prettyTui(pi: ExtensionAPI) {
     );
   };
 
-  const renderPendingActivityUpdate = (member: ActivityMember, width: number): string[] => {
+  const renderStandaloneError = (member: ActivityMember, width: number, component?: any): string[] => {
+    const run = component ? errorRun(component) : { hidden: false, count: 1, compact: false };
+    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));
+    }
+    return [...(run.compact ? [] : [""]), ...rows.map((line) => truncateToWidth(line, Math.max(1, width), ""))];
+  };
+
+  const renderPendingActivityUpdate = (member: ActivityMember, width: number, component?: any): string[] => {
+    if (member.updateSeverity === "error" && member.updateTitle !== "Response truncated") {
+      return renderStandaloneError(member, width, component);
+    }
     const theme = defaultActivityTheme();
     const title = truncateToWidth(member.updateTitle ?? "Update", Math.max(1, width - 2), "…");
     const style = activityUpdateStyle(member, theme);
@@ -572,8 +622,9 @@ export default function prettyTui(pi: ExtensionAPI) {
     group: ActivityGroup,
     member: ActivityMember,
     width: number,
+    component?: any,
   ): string[] => {
-    if (!activityGroupCollapsible(group)) return renderPendingActivityUpdate(member, width);
+    if (!activityGroupCollapsible(group)) return renderPendingActivityUpdate(member, width, component);
     const position = activityMemberPosition(group, member);
     if (!activityGroupRevealed(group)) {
       return position.first
@@ -1242,7 +1293,7 @@ export default function prettyTui(pi: ExtensionAPI) {
         const terminalGroup = activityTimeline.groupForMember(terminalMember.id);
         if (!terminalGroup) return originalRender.call(this, width);
         activityUpdateComponents.set(terminalMember.id, this);
-        return renderActivityUpdateProjection(terminalGroup, terminalMember, width);
+        return renderActivityUpdateProjection(terminalGroup, terminalMember, width, this);
       }
 
       const key = assistantMessageKey(message);
@@ -1507,10 +1558,14 @@ export default function prettyTui(pi: ExtensionAPI) {
     const group = activityTimeline.groupForMember(member.id);
     if (!group || !mode.chatContainer?.addChild) return false;
     const component: Component = {
-      render: (width: number) => renderActivityUpdateProjection(group, member, width),
+      render: (width: number) => renderActivityUpdateProjection(group, member, width, component),
       invalidate() {},
       handleMouse: (event: any) => handleActivityUpdateMouse(group, member, event),
     } as Component;
+    if (severity === "error") runtimeErrorDescriptors.set(component, {
+      source: "runtime:error", title, content,
+    });
+    errorChatContainer = mode.chatContainer;
     activityUpdateComponents.set(member.id, component);
     mode.chatContainer.addChild(component);
     mode.ui?.requestRender?.();
@@ -1569,6 +1624,7 @@ export default function prettyTui(pi: ExtensionAPI) {
 
     const patchedRenderSessionEntries = function (this: any, entries: any[], options?: any) {
       currentTui = this.ui;
+      errorChatContainer = this.chatContainer;
       fullscreenTui = currentTui?.mode === "fullscreen";
       // buildContextEntries() prepends the latest compaction for model context,
       // while Pi's live compaction UI appends it chronologically. Keep reloads
@@ -1674,6 +1730,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     // calling sites, rather than depend on private chat-container children or
     // instanceof checks (these can be wrapped or come from another module).
     const patchedAddMessageToChat = function (this: any, message: any, ...args: any[]) {
+      errorChatContainer = this.chatContainer;
       if (message?.role === "assistant") cacheMessageContexts.set(this, message);
       else cacheMessageContexts.delete(this);
       return originalAddMessageToChat.call(this, message, ...args);
@@ -1874,6 +1931,7 @@ export default function prettyTui(pi: ExtensionAPI) {
 
     pi.on("session_shutdown", () => {
       fullscreenTui = false;
+      errorChatContainer = undefined;
       currentTui = undefined;
       clearLatestActivityStatus();
       currentExtensionUi = undefined;
@@ -2404,6 +2462,22 @@ export default function prettyTui(pi: ExtensionAPI) {
   const nonEmptyLines = (value: string): number =>
     value ? value.split("\n").filter((line) => line.length > 0).length : 0;
 
+  // Normalize display values only; null means omitted, as in native Pi labels.
+  // Malformed values hide the range rather than inventing line numbers.
+  const readLineRange = (offset: unknown, limit: unknown): string => {
+    if (offset == null && limit == null) return "";
+    const parse = (value: unknown): number | undefined => {
+      if (typeof value === "string" && value.trim() !== "") value = Number(value);
+      return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+    };
+    const start = offset == null ? 1 : parse(offset);
+    if (start === undefined) return "";
+    if (limit == null) return ` · lines ${start}+`;
+    const count = parse(limit);
+    if (count === undefined) return "";
+    return ` · lines ${start}–${start + count - 1}`;
+  };
+
   type DisplayValue = string | (() => string);
   type DisplayRow = {
     prefix: DisplayValue;
@@ -2490,6 +2564,28 @@ 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,
@@ -2498,6 +2594,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     error = false,
     summaryIsStyled = false,
     outputStyle: (line: string) => string = (line) => theme.fg("dim", line),
+    outputLayout?: (line: string) => DisplayRow,
   ) => {
     const rows: DisplayRow[] = [{
       prefix: theme.fg("dim", "└  "),
@@ -2512,10 +2609,11 @@ export default function prettyTui(pi: ExtensionAPI) {
       const omitted = lines.length - shown.length;
       for (let index = 0; index < shown.length; index++) {
         const isLast = index === shown.length - 1 && omitted === 0;
+        const layout = outputLayout?.(shown[index]);
         rows.push({
-          prefix: theme.fg("dim", isLast ? "   └ " : "   │ "),
-          continuation: isLast ? "     " : theme.fg("dim", "   │ "),
-          content: outputStyle(shown[index] || " "),
+          prefix: theme.fg("dim", isLast ? "   └ " : "   │ ") + (layout?.prefix ?? ""),
+          continuation: (isLast ? "     " : theme.fg("dim", "   │ ")) + (layout?.continuation ?? ""),
+          content: layout?.content ?? outputStyle(shown[index] || " "),
         });
       }
       if (omitted > 0) {
@@ -3840,7 +3938,15 @@ export default function prettyTui(pi: ExtensionAPI) {
 
   const closeAtAssistantBoundary = (message: any, activity: string): boolean => {
     const key = assistantMessageKey(message);
-    if (assistantBoundaryKeys.has(key)) return false;
+    if (assistantBoundaryKeys.has(key)) {
+      // A later snapshot can introduce thinking after text already sealed this
+      // message. Seal that newly-created thought group too, but do not let
+      // repeated text updates close a different, subsequent tool group.
+      const thought = activityTimeline.memberForThinking(key);
+      const thoughtGroup = thought ? activityTimeline.groupForMember(thought.id) : undefined;
+      if (!thoughtGroup || activityTimeline.currentGroup()?.id !== thoughtGroup.id ||
+        activityTimeline.isSettled(thoughtGroup.id)) return false;
+    }
     assistantBoundaryKeys.add(key);
     cleanRun.activity = activity;
     finishCleanGroup(activity);
@@ -4123,9 +4229,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, readLabel, context.toolCallId);
-      const range = args.offset || args.limit
-        ? ` · lines ${args.offset ?? 1}${args.limit ? `–${(args.offset ?? 1) + args.limit - 1}` : "+"}`
-        : "";
+      const range = readLineRange(args.offset, args.limit);
       return call(theme, readLabel, `${args.path}${range}`, context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
@@ -4236,6 +4340,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,
       );
     },
   } as any);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-pretty-tui",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "A beautiful, polished TUI for the Pi coding agent",
   "license": "MIT",
   "author": "Kainan Yang <ykn0309@whu.edu.cn>",
@@ -39,8 +39,8 @@
     "@earendil-works/pi-tui": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "1.1.0",
-    "@earendil-works/pi-tui": "1.1.0",
+    "@earendil-works/pi-coding-agent": "1.3.0",
+    "@earendil-works/pi-tui": "1.3.0",
     "@types/node": "^24.0.0",
     "jiti": "^2.7.0",
     "typescript": "^5.9.0"