@runminton/pi-tidy-tools 0.1.2 → 0.1.3

package/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## [0.1.3] - 2026-08-27
+
+### Added
+
+- Added `/tidy-bash`, `/tidy-edit`, and `/tidy-write` commands for toggling tool output.
+- Added `/tidy-key-debug` to inspect the next terminal key sequence.
+
+### Fixed
+
+- Normalized the legacy `ESC` + control-character form of `Ctrl+Alt+letter` shortcuts.
+
+### Documentation
+
+- Documented the new commands and keyboard input debugging steps.

package/README.md

@@ -28,6 +28,16 @@ A notification shows the current state on each toggle; press again to switch bac
 
 `bash` expands to the **complete output** in one keypress — it skips Pi's built-in 5-line tail preview. `edit` and `write` expand to Pi's **official default rendering**: they delegate to the official renderers, and whether the content itself is further expanded is still controlled by the global `Ctrl+O`, exactly as without this extension. Only `bash` ignores `Ctrl+O` in its expanded state.
 
+## Commands
+
+Use these commands when terminal shortcuts conflict or are not delivered:
+
+| Command | Tool |
+|---|---|
+| `/tidy-bash` | Toggle `bash` output |
+| `/tidy-edit` | Toggle `edit` output |
+| `/tidy-write` | Toggle `write` output |
+
 ## Usage
 
 Load the extension:
@@ -61,6 +71,7 @@ If a shortcut still does nothing on your machine, check:
 1. **Terminal or input method swallows the key.** Some terminals and IMEs (e.g. Chinese input methods, Windows Alt-menu accelerators) intercept `Ctrl+Alt+...` before Pi ever sees it. Try a different combination or a different terminal.
 2. **tmux / screen.** If Pi runs inside tmux with the default configuration, tmux's own key handling may interfere.
 3. **Custom keys.** The bindings are registered in `tidy-tools.ts` via `pi.registerShortcut(...)` — edit the key strings there to rebind. Pi's built-in global expansion (`Ctrl+O`, `app.tools.expand`) is configured separately via `~/.pi/agent/keybindings.json`.
+4. **Inspect the input.** Run `/tidy-key-debug`, then press one target shortcut. Pi shows the received bytes and any rewrite. If no notification appears, the terminal or input method consumed the key before Pi received it.
 
 ## Development
 

package/README.zh-CN.md

@@ -28,6 +28,16 @@
 
 `bash` 展开时**一次按键直接显示完整输出**——跳过 Pi 内置的 5 行尾部预览。`edit` 和 `write` 展开时使用 Pi **官方默认渲染**：委托给官方渲染器，内容本身是否进一步展开仍由全局 `Ctrl+O` 控制，与不装本扩展时完全一致。只有 `bash` 在展开状态下不受 `Ctrl+O` 影响。
 
+## 命令
+
+终端快捷键冲突或无法传入 Pi 时，使用这些命令：
+
+| 命令 | 工具 |
+|---|---|
+| `/tidy-bash` | 切换 `bash` 输出 |
+| `/tidy-edit` | 切换 `edit` 输出 |
+| `/tidy-write` | 切换 `write` 输出 |
+
 ## 使用方法
 
 加载扩展：
@@ -61,6 +71,7 @@ Pi 会在终端支持时协商 [Kitty 键盘协议](https://sw.kovidgoyal.net/ki
 1. **终端或输入法吞掉了按键。** 有些终端和输入法（例如中文输入法、Windows 的 Alt 菜单加速键）会在 Pi 收到按键之前把它拦截。换一个组合键或换一个终端试试。
 2. **tmux / screen。** 如果 Pi 运行在 tmux 默认配置里，tmux 自己的按键处理可能干扰。
 3. **自定义按键。** 绑定在 `tidy-tools.ts` 里通过 `pi.registerShortcut(...)` 注册——改那里的按键字符串即可重新绑定。Pi 内置的全局展开（`Ctrl+O`，即 `app.tools.expand`）则单独通过 `~/.pi/agent/keybindings.json` 配置。
+4. **检查输入。** 执行 `/tidy-key-debug`，再按一次目标快捷键。Pi 会显示收到的字节和改写结果。若没有通知，终端或输入法在 Pi 收到按键前已拦截它。
 
 ## 开发
 

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@runminton/pi-tidy-tools",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "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",
   "files": [
     "tidy-tools.ts",
     "README.md",
-    "README.zh-CN.md"
+    "README.zh-CN.md",
+    "CHANGELOG.md"
   ],
   "pi": {
     "extensions": [

package/tidy-tools.ts

@@ -180,8 +180,17 @@ const CTRL_CODE_TO_KEY: Record<number, string> = {
     2: "b", // Ctrl+B
 };
 const ALT_MODIFIER = 2;
+let debugNextTerminalInput = false;
 
 function convertCtrlAltSequence(data: string): string | undefined {
+    // Legacy terminals send Ctrl+Alt+letter as ESC followed by the Ctrl
+    // character. Pi deliberately ignores this form after Kitty negotiation,
+    // so normalize it before Pi's key matcher sees it.
+    if (data.length === 2 && data[0] === "\x1b") {
+        const key = CTRL_CODE_TO_KEY[data.charCodeAt(1)];
+        if (key) return `\x1b[${key.charCodeAt(0)};7u`; // 7 = Ctrl|Alt (1-indexed)
+    }
+
     const match = data.match(/^\x1b\[(\d+);(\d+)(?::(\d+))?u$/);
     if (!match) return undefined;
     const code = Number(match[1]);
@@ -455,6 +464,26 @@ export default function (pi: ExtensionAPI) {
         },
     );
 
+    pi.registerCommand("tidy-bash", {
+        description: "Toggle bash output expansion",
+        handler: async (_args, ctx) => toggleToolExpanded(ctx, "bash"),
+    });
+    pi.registerCommand("tidy-edit", {
+        description: "Toggle edit output expansion",
+        handler: async (_args, ctx) => toggleToolExpanded(ctx, "edit"),
+    });
+    pi.registerCommand("tidy-write", {
+        description: "Toggle write output expansion",
+        handler: async (_args, ctx) => toggleToolExpanded(ctx, "write"),
+    });
+    pi.registerCommand("tidy-key-debug", {
+        description: "Show the next raw terminal key sequence",
+        handler: async (_args, ctx) => {
+            debugNextTerminalInput = true;
+            ctx.ui.notify("Press one key to inspect its terminal sequence.", "info");
+        },
+    });
+
     // --- Per-tool expansion shortcuts, independent of the global Ctrl+O ---
     pi.registerShortcut("ctrl+alt+e", {
         description: "Toggle edit expansion",
@@ -472,8 +501,16 @@ export default function (pi: ExtensionAPI) {
     // Some terminals encode Ctrl+Alt+letter as a control-character CSI-u
     // sequence. Rewrite those three sequences before they reach the editor.
     pi.on("session_start", (_event, ctx) => {
-        ctx.ui.onTerminalInput?.((data) => {
+        ctx.ui.onTerminalInput((data) => {
             const converted = convertCtrlAltSequence(data);
+            if (debugNextTerminalInput) {
+                debugNextTerminalInput = false;
+                const bytes = [...data].map((char) => char.charCodeAt(0)).join(", ");
+                ctx.ui.notify(
+                    `raw: ${JSON.stringify(data)} [${bytes}]${converted ? ` → ${JSON.stringify(converted)}` : ""}`,
+                    "info",
+                );
+            }
             return converted ? { data: converted } : undefined;
         });
     });