@runminton/pi-tidy-tools 0.2.0 → 0.2.2

package/README.md

@@ -18,6 +18,8 @@ All three tools start **Collapsed**:
 
 Collapsed summaries are single-line per slot: one command line plus one output line (the count suffix is inline at the end of the output line).
 
+In Pi's fullscreen mode, left-click any tool block to toggle that row between its compact summary and full rendering. Click it again to collapse it. Each tool has only these two states; `bash` and `write` skip Pi's intermediate previews.
+
 ## Modes
 
 | Mode | Behavior |
@@ -25,7 +27,7 @@ Collapsed summaries are single-line per slot: one command line plus one output l
 | compact (default) | all three tools collapsed |
 | markdown (`/tidy-markdown` toggles) | `edit`/`write` on Markdown files (`.md`, `.mdx`, `.markdown`) expand to full content; everything else stays collapsed |
 
-Switching modes clears per-tool manual toggles and re-renders existing rows. The mode is not persisted across restarts.
+Switching modes clears shortcut state and row-local click state, then re-renders existing rows. The mode is not persisted across restarts.
 
 ## Shortcuts
 
@@ -37,7 +39,7 @@ On Mac press `Command+Option+letter` (verified; maps to the registered `Ctrl+Alt
 | `Command+Option+E` | `edit` | official rendering ↔ collapsed summary |
 | `Command+Option+W` | `write` | official rendering ↔ collapsed summary |
 
-A notification shows the current state on each toggle; press again to switch back.
+A shortcut toggles all existing rows of that tool type and clears their prior row-local click state. A notification shows the new state; press again to switch back.
 
 `bash` and `write` expand to the **complete output** in one keypress — they skip Pi's built-in previews (bash's 5-line tail preview, write's 10-line preview). `edit` expands to Pi's **official rendering** (it has no preview state). The global `Ctrl+O` tool expansion does not affect these three tools.
 
@@ -89,6 +91,15 @@ If a shortcut still does nothing on your machine, check:
 
 ## Changelog
 
+### 0.2.2
+
+- Cached collapsed bash output by terminal width to reduce repeated rendering work during TUI redraws with many tool calls
+
+### 0.2.1
+
+- Added per-block fullscreen clicking for bash/edit/write, toggling between compact and full rendering
+- Kept tool-wide shortcuts; a shortcut applies one state to all rows of that tool type
+
 ### 0.2.0
 
 - All three tools collapsed by default (edit/write used to expand)

package/README.zh-CN.md

@@ -18,6 +18,8 @@
 
 折叠摘要每槽单行：命令 1 行加输出 1 行（计数后缀内联在输出行尾）。
 
+在 Pi 的 fullscreen 模式下，左键点击任意一个工具块，可单独在紧凑摘要和完整渲染之间切换。再次点击即收起。三个工具都只有这两种状态；`bash` 和 `write` 不经过官方中间预览。
+
 ## 模式
 
 | 模式 | 行为 |
@@ -25,7 +27,7 @@
 | compact（默认） | 三工具全折叠 |
 | markdown（`/tidy-markdown` 切换） | Markdown 文件（`.md`、`.mdx`、`.markdown`）的 `edit`/`write` 展开全文，其余照样折叠 |
 
-切换模式会清空各工具的手动钉选并重渲染已有行。模式不持久化，重启后回到 compact。
+切换模式会清空快捷键状态和各工具块的点击状态，并重渲染已有行。模式不持久化，重启后回到 compact。
 
 ## 快捷键
 
@@ -37,7 +39,7 @@ Mac 上按 `Command+Option+字母`（实测有效，对应插件注册的 `Ctrl+
 | `Command+Option+E` | `edit` | 官方渲染 ↔ 折叠摘要 |
 | `Command+Option+W` | `write` | 官方渲染 ↔ 折叠摘要 |
 
-每次切换会弹出通知提示当前状态；再按一次切回。
+快捷键按工具类型切换所有已有工具块，并清除该工具之前的逐块点击状态。每次切换会弹出通知；再按一次切回。
 
 `bash` 和 `write` 展开时**一次按键直接显示完整输出**——跳过 Pi 内置预览（bash 的 5 行尾部预览、write 的 10 行预览）。`edit` 展开时使用 Pi **官方渲染**（它没有预览态）。全局 `Ctrl+O` 对这三个工具均无效。
 
@@ -89,6 +91,15 @@ Pi 会在终端支持时协商 [Kitty 键盘协议](https://sw.kovidgoyal.net/ki
 
 ## 更新日志
 
+### 0.2.2
+
+- 按终端宽度缓存 bash 折叠输出，降低多轮工具调用场景下 TUI 重绘开销
+
+### 0.2.1
+
+- 支持在 Pi fullscreen 模式下点击单个 bash/edit/write 工具块，在紧凑摘要和完整渲染之间切换
+- 保留工具级快捷键；快捷键会统一设置同类工具块
+
 ### 0.2.0 - 2026-09-05
 
 - 默认三工具全折叠（edit/write 原默认展开）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runminton/pi-tidy-tools",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Collapse bash/edit/write into one-line summaries in the pi TUI; expand the official rendering per tool with Ctrl+Alt+B/W/E.",
   "license": "MIT",
   "type": "module",

package/tidy-tools.ts

@@ -4,8 +4,9 @@
  * Overrides the TUI rendering of bash, edit and write while delegating
  * execution to the official implementations:
  * - Collapsed: show a small summary with an ellipsis for long content.
- * - Expanded: Ctrl+Alt+E (edit), Ctrl+Alt+W (write), Ctrl+Alt+B (bash)
- *   toggle each tool between collapsed and fully expanded rendering.
+ * - Expanded: click an individual tool block in fullscreen mode, or use
+ *   Ctrl+Alt+E (edit), Ctrl+Alt+W (write), Ctrl+Alt+B (bash) for all rows
+ *   of that tool, to toggle collapsed and fully expanded rendering.
  * - The global Ctrl+O tool expansion does not affect these three tools.
  * - Modes: compact (default, all three collapsed) and markdown
  *   (`/tidy-markdown` toggles; edit/write on Markdown files expand,
@@ -26,6 +27,7 @@ import type { EditToolDetails } from "@earendil-works/pi-coding-agent";
 import {
     Box,
     Container,
+    MouseRegion,
     Text,
     type Component,
     sliceByColumn,
@@ -131,6 +133,9 @@ class LimitedLinesText implements Component {
 }
 
 class CollapsedBashOutput implements Component {
+    private cachedWidth?: number;
+    private cachedLines?: string[];
+
     // 首行预览 + 计数后缀合并为 1 行，后缀常显。预览放不下时截断并加省略标记。
     constructor(
         private readonly preview: string,
@@ -139,6 +144,16 @@ class CollapsedBashOutput implements Component {
     ) {}
 
     render(width: number): string[] {
+        if (this.cachedLines !== undefined && this.cachedWidth === width) {
+            return this.cachedLines;
+        }
+        const lines = this.renderUncached(width);
+        this.cachedWidth = width;
+        this.cachedLines = lines;
+        return lines;
+    }
+
+    private renderUncached(width: number): string[] {
         if (!this.suffix) {
             return truncateRows(
                 wrapTextWithAnsi(this.preview, Math.max(1, width)),
@@ -167,7 +182,10 @@ class CollapsedBashOutput implements Component {
         return [visibleWidth(row) > width ? sliceByColumn(row, 0, width, true) : row];
     }
 
-    invalidate(): void {}
+    invalidate(): void {
+        this.cachedWidth = undefined;
+        this.cachedLines = undefined;
+    }
 }
 
 class CollapsedToolShell extends Box {
@@ -216,6 +234,9 @@ function getCollapsedBackground(isPartial: boolean, isError: boolean): string {
 let markdownMode = false;
 // 手动钉选：Ctrl+Alt+? 或 /tidy-<tool> 设置，优先于模式默认；切换模式时清空。
 const manualExpanded = new Map<string, boolean>();
+// Per-tool revisions let a mode or tool-wide toggle replace row-local clicks
+// without disturbing clicked rows belonging to the other tools.
+const expansionRevisions = new Map<string, number>();
 
 function isMarkdownPath(value: unknown): boolean {
     if (typeof value !== "string") return false;
@@ -239,8 +260,34 @@ function modeDefaultExpanded(name: string, args: any): boolean {
     return false;
 }
 
-function isToolExpanded(name: string, args: any): boolean {
-    return manualExpanded.get(name) ?? modeDefaultExpanded(name, args);
+interface RowExpansionState {
+    revision: number;
+    override?: boolean;
+}
+
+function getRowExpansionState(name: string, context: any): RowExpansionState {
+    const revision = expansionRevisions.get(name) ?? 0;
+    let state = context.state.tidyExpansion as RowExpansionState | undefined;
+    if (!state || state.revision !== revision) {
+        state = { revision };
+        context.state.tidyExpansion = state;
+    }
+    return state;
+}
+
+function isToolExpanded(name: string, args: any, context: any): boolean {
+    const rowState = getRowExpansionState(name, context);
+    return rowState.override ?? manualExpanded.get(name) ?? modeDefaultExpanded(name, args);
+}
+
+function makeToolClickable(component: Component, name: string, args: any, context: any): Component {
+    return new MouseRegion(component, (event) => {
+        if (event.type !== "click" || event.button !== "left") return undefined;
+        const rowState = getRowExpansionState(name, context);
+        rowState.override = !isToolExpanded(name, args, context);
+        context.invalidate();
+        return { handled: true };
+    });
 }
 
 // Some terminals (Kitty keyboard protocol flag-1 mode) encode Ctrl+letter as
@@ -286,6 +333,7 @@ function refreshToolRows(ctx: ExtensionContext): void {
 
 function toggleToolExpanded(ctx: ExtensionContext, name: string): void {
     manualExpanded.set(name, !(manualExpanded.get(name) ?? modeBaseExpanded(name)));
+    expansionRevisions.set(name, (expansionRevisions.get(name) ?? 0) + 1);
     refreshToolRows(ctx);
     ctx.ui.notify(`${name}: ${manualExpanded.get(name) ? "expanded" : "collapsed"}`, "info");
 }
@@ -350,8 +398,8 @@ function registerCollapsibleTool(
 
         renderCall(args, theme, context) {
             const def = getDef(context.cwd);
-            if (isToolExpanded(def.name, args) && def.renderCall) {
-                return def.renderCall(
+            if (isToolExpanded(def.name, args, context) && def.renderCall) {
+                const component = def.renderCall(
                     args as never,
                     theme as never,
                     // One-key full expansion: skip the official preview so
@@ -362,9 +410,10 @@ function registerCollapsibleTool(
                         lastComponent: undefined,
                     } as never,
                 );
+                return makeToolClickable(component, def.name, args, context);
             }
             const component = collapsedCall(args, theme);
-            if (!usesSelfShell) return component;
+            if (!usesSelfShell) return makeToolClickable(component, def.name, args, context);
 
             const shell = getCollapsedToolShell(
                 context.state,
@@ -372,21 +421,22 @@ function registerCollapsibleTool(
                 getCollapsedBackground(context.isPartial, context.isError),
             );
             shell.setCall(component);
-            return shell;
+            return makeToolClickable(shell, def.name, args, context);
         },
 
         renderResult(result, options, theme, context) {
             const def = getDef(context.cwd);
-            if (isToolExpanded(def.name, context.args) && def.renderResult) {
-                return def.renderResult(
+            if (isToolExpanded(def.name, context.args, context) && def.renderResult) {
+                const component = def.renderResult(
                     result as never,
                     { ...options, ...(forceFullExpansion ? { expanded: true } : {}) } as never,
                     theme as never,
                     { ...context, lastComponent: undefined } as never,
                 );
+                return makeToolClickable(component, def.name, context.args, context);
             }
             const component = collapsedResult(result, options, theme, context);
-            if (!usesSelfShell) return component;
+            if (!usesSelfShell) return makeToolClickable(component, def.name, context.args, context);
 
             const shell = getCollapsedToolShell(
                 context.state,
@@ -436,16 +486,17 @@ export default function (pi: ExtensionAPI) {
         },
 
         renderCall(args, theme, context) {
-            if (isToolExpanded("bash", args)) {
+            if (isToolExpanded("bash", args, context)) {
                 const def = getBashDef(context.cwd);
                 if (def.renderCall) {
-                    return def.renderCall(
+                    const component = def.renderCall(
                         args as never,
                         theme as never,
                         // One-key full expansion for bash: skip the official
                         // preview so Ctrl+Alt+B shows the complete output.
                         { ...context, expanded: true, lastComponent: undefined } as never,
                     );
+                    return makeToolClickable(component, "bash", args, context);
                 }
             }
 
@@ -455,18 +506,18 @@ export default function (pi: ExtensionAPI) {
             const timeoutSuffix = timeout ? theme.fg("muted", ` (timeout ${timeout}s)`) : "";
             const renderedCommand = theme.fg("toolTitle", theme.bold(`$ ${command}`)) + timeoutSuffix;
 
-            return new LimitedLinesText(
+            return makeToolClickable(new LimitedLinesText(
                 renderedCommand,
                 MAX_COLLAPSED_COMMAND_LINES,
                 theme.fg("muted", "..."),
-            );
+            ), "bash", args, context);
         },
 
         renderResult(result, options, theme, context) {
-            if (isToolExpanded("bash", context.args)) {
+            if (isToolExpanded("bash", context.args, context)) {
                 const def = getBashDef(context.cwd);
                 if (def.renderResult) {
-                    return def.renderResult(
+                    const component = def.renderResult(
                         result as never,
                         // One-key full expansion for bash: skip the official
                         // preview so Ctrl+Alt+B shows the complete output.
@@ -474,9 +525,11 @@ export default function (pi: ExtensionAPI) {
                         theme as never,
                         { ...context, lastComponent: undefined } as never,
                     );
+                    return makeToolClickable(component, "bash", context.args, context);
                 }
             }
 
+            const clickable = (component: Component) => makeToolClickable(component, "bash", context.args, context);
             const output = expandTabs(errorText(result).trim().replace(/\r/g, ""));
             const allLines = output.split("\n");
             const first = allLines[0] ?? "";
@@ -487,32 +540,32 @@ export default function (pi: ExtensionAPI) {
             // 失败输出同样压成 1 行：红色首行 + 内联计数，与成功态同形。
             if (context.isError) {
                 if (!first) {
-                    return new CollapsedBashOutput(
+                    return clickable(new CollapsedBashOutput(
                         theme.fg("error", "failed"),
                         "",
                         theme.fg("muted", "..."),
-                    );
+                    ));
                 }
-                return new CollapsedBashOutput(
+                return clickable(new CollapsedBashOutput(
                     theme.fg("error", first),
                     moreSuffix,
                     theme.fg("muted", "..."),
-                );
+                ));
             }
             // Preview only the first line. Wrapping the full output on every
             // frame is what made the TUI lag with large outputs.
             if (!first) {
-                return new CollapsedBashOutput(
+                return clickable(new CollapsedBashOutput(
                     theme.fg("muted", "(no output)"),
                     "",
                     theme.fg("muted", "..."),
-                );
+                ));
             }
-            return new CollapsedBashOutput(
+            return clickable(new CollapsedBashOutput(
                 theme.fg("toolOutput", first),
                 moreSuffix,
                 theme.fg("muted", "..."),
-            );
+            ));
         },
     });
 
@@ -589,6 +642,9 @@ export default function (pi: ExtensionAPI) {
         handler: async (_args, ctx) => {
             markdownMode = !markdownMode;
             manualExpanded.clear();
+            for (const name of ["bash", "edit", "write"]) {
+                expansionRevisions.set(name, (expansionRevisions.get(name) ?? 0) + 1);
+            }
             refreshToolRows(ctx);
             ctx.ui.notify(`markdown mode: ${markdownMode ? "on" : "off"}`, "info");
         },