pi-pretty-tui 0.3.4 → 0.3.6

package/README.md

@@ -58,9 +58,25 @@ pi --tui-mode fullscreen
 
 Dragging selects text rather than copying a whole message. Links keep their normal behavior; image attachments are not included in text copies.
 
+**Message copy** controls user-message click-to-copy and the final-answer `[Copy]` button.
+**Code block copy** controls snippet `[Copy]` buttons independently.
+Both are on by default. Open `/pretty-tui` → **Copy settings** to configure message, code-block and selection copying, or use:
+
+```text
+/pretty-tui message-copy off
+/pretty-tui message-copy on
+/pretty-tui code-block-copy off
+/pretty-tui code-block-copy on
+```
+
+Toggling either option saves the setting and reloads Pi.
+The `messageCopy` and `codeBlockCopy` booleans are stored in `pretty-tui.json` in Pi's agent directory, alongside `selectionCopy`.
+Disabling message copying keeps the response duration and status; disabling code-block copying keeps code frames, highlighting and content.
+Neither option changes selection copying.
+
 ### Optional border-free selection
 
-Enable **Selection copy** in `/pretty-tui`, or run:
+Enable **Selection copy** in `/pretty-tui` → **Copy settings**, or run:
 
 ```text
 /pretty-tui selection-copy on
@@ -73,7 +89,7 @@ In regular mode, the terminal handles selection and copying, so this option has
 
 ## Notes
 
-- Tested with **Pi 1.5.0**. Future Pi updates may require compatibility fixes.
+- Tested with **Pi 1.5.1**. Future Pi updates may require compatibility fixes.
 - Keeps Pi's native input behavior and tool execution, including third-party tool implementations.
 - Nested-tool text details are saved with sessions for restoration and may be truncated. Session files can contain sensitive tool output.
 - See [Releases](https://github.com/ykn0309/pi-pretty-tui/releases) for changes and contributor acknowledgments.

package/README.zh-CN.md

@@ -58,9 +58,25 @@ pi --tui-mode fullscreen
 
 拖动鼠标按选区处理，不触发整条消息复制。链接保留正常行为；文本复制不包含图片附件。
 
+**Message copy** 控制用户消息点击复制和最终回答的 `[Copy]` 按钮。
+**Code block copy** 独立控制代码块的 `[Copy]` 按钮。
+两项均默认开启。在 `/pretty-tui` → **Copy settings** 子菜单中统一配置消息、代码块和选区复制，也可运行：
+
+```text
+/pretty-tui message-copy off
+/pretty-tui message-copy on
+/pretty-tui code-block-copy off
+/pretty-tui code-block-copy on
+```
+
+切换任一选项会保存设置并自动重载 Pi。
+布尔值 `messageCopy` 和 `codeBlockCopy` 与 `selectionCopy` 一起保存在 Pi agent 目录下的 `pretty-tui.json` 中。
+关闭消息复制仍保留回答耗时和状态；关闭代码块复制仍保留边框、语法高亮和内容。
+两项均不影响选区复制。
+
 ### 可选的无边框选区复制
 
-在 `/pretty-tui` 中切换 **Selection copy**，或运行：
+在 `/pretty-tui` → **Copy settings** 中切换 **Selection copy**，或运行：
 
 ```text
 /pretty-tui selection-copy on
@@ -73,7 +89,7 @@ regular 非全屏模式由终端处理选择与复制，开启此选项也不会
 
 ## 必要说明
 
-- 当前已在 **Pi 1.5.0** 上测试；未来 Pi 更新可能需要适配。
+- 当前已在 **Pi 1.5.1** 上测试；未来 Pi 更新可能需要适配。
 - 保留 Pi 原生输入行为和工具执行逻辑，包括第三方工具实现。
 - 嵌套工具的文本详情会随会话保存以便恢复，内容可能截断；会话文件可能包含工具输出中的敏感信息。
 - 版本变更与贡献者致谢见 [Releases](https://github.com/ykn0309/pi-pretty-tui/releases)。

package/extensions/edit-diff.ts

@@ -1,5 +1,5 @@
 import { getLanguageFromPath, highlightCode } from "@earendil-works/pi-coding-agent";
-import { sliceByColumn, visibleWidth } from "@earendil-works/pi-tui";
+import { mixColors, sliceByColumn, visibleWidth } from "@earendil-works/pi-tui";
 
 type Range = [number, number];
 type Row = { marker: string; number?: string; text: string; styled: string; changes: Range[] };
@@ -82,13 +82,16 @@ export function editDiffLayout(theme: any, diff: string, path?: string) {
     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 changeBackground = background && theme.colors?.[background] && theme.colors?.[color]
+      ? mixColors(theme.colors[background], theme.colors[color], 0.3) : undefined;
     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);
+      // A stronger theme-derived background preserves syntax foregrounds and
+      // avoids adding font emphasis to the changed graphemes.
+      content += changeBackground && theme.style ? theme.style(changed, { bg: changeBackground }) : paint(changed);
       cursor = end;
     }
     content += sliceByColumn(row.styled, cursor, Math.max(0, width - cursor));

package/extensions/index.ts

@@ -37,12 +37,15 @@ import {
   copyToClipboard,
   getAgentDir,
   getMarkdownTheme,
+  getLanguageFromPath,
+  highlightCode,
   type ExtensionAPI,
 } from "@earendil-works/pi-coding-agent";
 import {
   type Component,
   Markdown,
   stripTerminalSequences,
+  sliceByColumn,
   truncateToWidth,
   TuiAltScreen,
   type TuiMouseEvent,
@@ -71,6 +74,8 @@ const RESPONSE_FOOTER_ENTRY_TYPE = "pretty-tui-response-footer";
 type PrettyTuiConfig = {
   enabled?: boolean;
   mode?: PrettyTuiMode;
+  messageCopy?: boolean;
+  codeBlockCopy?: boolean;
   /** Exclude plugin decoration from fullscreen selections. Opt-in. */
   selectionCopy?: boolean;
   /** "native" keeps Pi's flags-only strong and emphasis. Read when the extension loads. */
@@ -114,6 +119,8 @@ export default function prettyTui(pi: ExtensionAPI) {
   const configPath = join(getAgentDir(), "pretty-tui.json");
   let config = loadConfig(configPath);
   const activeForSession = config.enabled !== false;
+  const messageCopyEnabled = config.messageCopy !== false;
+  const codeBlockCopyEnabled = config.codeBlockCopy !== false;
   const configuredMode = config.mode ?? config.bash?.mode;
   let renderMode: PrettyTuiMode = configuredMode === "full" || configuredMode === "compact" || configuredMode === "clean"
     ? configuredMode
@@ -763,6 +770,10 @@ export default function prettyTui(pi: ExtensionAPI) {
         { value: "full", label: "full", description: "Full tool details and output" },
         { value: "compact", label: "compact", description: "Concise summaries for all built-in tools" },
         { value: "clean", label: "clean", description: "Group supported tools into Running/Done status" },
+        { value: "message-copy on", label: "message-copy on", description: "Enable user-message and final-answer copying and reload" },
+        { value: "message-copy off", label: "message-copy off", description: "Disable user-message and final-answer copying and reload" },
+        { value: "code-block-copy on", label: "code-block-copy on", description: "Show code-block Copy controls and reload" },
+        { value: "code-block-copy off", label: "code-block-copy off", description: "Hide code-block Copy controls and reload" },
         { value: "selection-copy on", label: "selection-copy on", description: "Copy selected text without UI borders in fullscreen mode; enable and reload" },
         { value: "selection-copy off", label: "selection-copy off", description: "Restore native selection copying and reload" },
         { value: "status", label: "status", description: "Show the current settings" },
@@ -772,25 +783,32 @@ export default function prettyTui(pi: ExtensionAPI) {
     },
     handler: async (args, ctx) => {
       let requested = args.trim().toLowerCase();
+      if (!requested && !ctx.hasUI) requested = "status";
 
-      if (!requested) {
-        if (!ctx.hasUI) {
-          ctx.ui.notify(
-            `pi-pretty-tui: ${config.enabled !== false ? "enabled" : "disabled"} · mode: ${renderMode} · selection copy: ${config.selectionCopy === true ? "on" : "off"}`,
-            "info",
-          );
-          return;
-        }
+      while (!requested) {
         const enabled = `Enabled — ${config.enabled !== false ? "on" : "off"}`;
         const full = `Full — full tool details and output${renderMode === "full" ? " (current)" : ""}`;
         const compact = `Compact — concise tool summaries and nested calls${renderMode === "compact" ? " (current)" : ""}`;
         const clean = `Clean — group supported tools into Running/Done status${renderMode === "clean" ? " (current)" : ""}`;
         const selectionCopy = `Selection copy — ${config.selectionCopy === true ? "on" : "off"} · copy text without UI borders (fullscreen, experimental)`;
-        const selected = await ctx.ui.select("pi-pretty-tui settings", [enabled, full, compact, clean, selectionCopy]);
+        const messageCopy = `Message copy — ${config.messageCopy !== false ? "on" : "off"} · user messages and final answers`;
+        const codeBlockCopy = `Code block copy — ${config.codeBlockCopy !== false ? "on" : "off"} · code-block Copy controls`;
+        const copySettings = "Copy settings — message, code block and selection copying";
+        const selected = await ctx.ui.select("pi-pretty-tui settings", [enabled, full, compact, clean, copySettings]);
         if (!selected) return;
-        requested = selected === selectionCopy
-          ? config.selectionCopy === true ? "selection-copy off" : "selection-copy on"
-          : selected === enabled
+        if (selected === copySettings) {
+          const back = "Back";
+          const copy = await ctx.ui.select("Copy settings", [messageCopy, codeBlockCopy, selectionCopy, back]);
+          if (!copy) return;
+          if (copy === back) continue;
+          requested = copy === messageCopy
+            ? config.messageCopy !== false ? "message-copy off" : "message-copy on"
+            : copy === codeBlockCopy
+              ? config.codeBlockCopy !== false ? "code-block-copy off" : "code-block-copy on"
+              : config.selectionCopy === true ? "selection-copy off" : "selection-copy on";
+          continue;
+        }
+        requested = selected === enabled
           ? config.enabled !== false ? "disable" : "enable"
           : selected === full
             ? "full"
@@ -801,21 +819,26 @@ export default function prettyTui(pi: ExtensionAPI) {
 
       if (requested === "status") {
         ctx.ui.notify(
-          `pi-pretty-tui: ${config.enabled !== false ? "enabled" : "disabled"} · mode: ${renderMode} · selection copy: ${config.selectionCopy === true ? "on" : "off"}`,
+          `pi-pretty-tui: ${config.enabled !== false ? "enabled" : "disabled"} · mode: ${renderMode} · message copy: ${config.messageCopy !== false ? "on" : "off"} · code block copy: ${config.codeBlockCopy !== false ? "on" : "off"} · selection copy: ${config.selectionCopy === true ? "on" : "off"}`,
           "info",
         );
         return;
       }
-      if (requested === "selection-copy on" || requested === "selection-copy off") {
-        const selectionCopy = requested.endsWith(" on");
+      const copySetting = /^(message-copy|code-block-copy|selection-copy) (on|off)$/.exec(requested);
+      if (copySetting) {
+        const key = copySetting[1] === "message-copy" ? "messageCopy"
+          : copySetting[1] === "code-block-copy" ? "codeBlockCopy" : "selectionCopy";
+        const enabled = copySetting[2] === "on";
         try {
-          saveConfig({ ...config, selectionCopy });
+          saveConfig({ ...config, [key]: enabled });
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
-          ctx.ui.notify(`Could not save selection-copy setting: ${message}`, "error");
+          ctx.ui.notify(`Could not save ${copySetting[1]} setting: ${message}`, "error");
           return;
         }
-        ctx.ui.notify(`Border-free selection copying ${selectionCopy ? "enabled" : "disabled"}; reloading…`, "info");
+        const label = key === "messageCopy" ? "Message copying"
+          : key === "codeBlockCopy" ? "Code-block copying" : "Border-free selection copying";
+        ctx.ui.notify(`${label} ${enabled ? "enabled" : "disabled"}; reloading…`, "info");
         try { await ctx.reload(); }
         catch (error) {
           const message = error instanceof Error ? error.message : String(error);
@@ -846,7 +869,7 @@ export default function prettyTui(pi: ExtensionAPI) {
         }
       }
       if (requested !== "full" && requested !== "compact" && requested !== "clean") {
-        ctx.ui.notify("Usage: /pretty-tui [enable|disable|full|compact|clean|status|selection-copy on|selection-copy off]", "error");
+        ctx.ui.notify("Usage: /pretty-tui [enable|disable|full|compact|clean|status|message-copy on|message-copy off|code-block-copy on|code-block-copy off|selection-copy on|selection-copy off]", "error");
         return;
       }
 
@@ -1122,7 +1145,7 @@ export default function prettyTui(pi: ExtensionAPI) {
             }));
             if (result?.handled) return result;
           }
-          if (fullscreenTui && event.type === "click" && event.button === "left" && userText.trim()) {
+          if (messageCopyEnabled && fullscreenTui && event.type === "click" && event.button === "left" && userText.trim()) {
             copyTranscriptText(userText);
             return { handled: true };
           }
@@ -1134,8 +1157,17 @@ export default function prettyTui(pi: ExtensionAPI) {
       };
 
       const bubbleClickHitTest = (event: any) => {
-        if (!fullscreenTui || !userText.trim()) return false;
+        if (!fullscreenTui) return false;
         const measured = layout(event.width);
+        if (!messageCopyEnabled || !userText.trim()) {
+          return mouseClickHitTests.get(markdown)?.({
+            ...event,
+            x: event.x - measured.leftPad - (measured.framed ? 2 : 0),
+            y: event.y - (measured.framed ? 1 : 0),
+            width: measured.contentWidth,
+            height: measured.body.length,
+          }) ?? false;
+        }
         return event.x >= measured.leftPad && event.x < measured.leftPad + measured.frameWidth &&
           event.y >= 0 && event.y < measured.body.length + (measured.framed ? 2 : 0);
       };
@@ -2420,7 +2452,7 @@ export default function prettyTui(pi: ExtensionAPI) {
 
     const patchedRender = function (this: any, width: number): string[] {
       const scoped = transcriptMarkdownActive();
-      mouseClickHitTests.set(this, (event) => fullscreenTui &&
+      mouseClickHitTests.set(this, (event) => codeBlockCopyEnabled && fullscreenTui &&
         this[transcriptMarkdownStateKey] === true &&
         (this[codeBlockRegionsKey] ?? []).some((region: any) =>
           event.y === region.y && event.x >= region.xStart && event.x < region.xEnd));
@@ -2576,7 +2608,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       }
 
       const copyLabel = "[Copy]";
-      const showCopyButton = fullscreenTui && maxWidth >= 18;
+      const showCopyButton = codeBlockCopyEnabled && fullscreenTui && maxWidth >= 18;
       const topSuffix = showCopyButton ? ` ${copyLabel} ╮` : "╮";
       const rawLanguage = typeof token.lang === "string" ? token.lang.trim() : "";
       const language = rawLanguage.split(/\s+/, 1)[0] || "code";
@@ -2648,7 +2680,7 @@ export default function prettyTui(pi: ExtensionAPI) {
         delete this[codeBlockRegionsKey];
         return originalHandleMouse?.call(this, event);
       }
-      if (event.button === "left" && (event.type === "press" || event.type === "click")) {
+      if (codeBlockCopyEnabled && fullscreenTui && event.button === "left" && (event.type === "press" || event.type === "click")) {
         const region = (this[codeBlockRegionsKey] ?? []).find(
           (candidate: any) =>
             event.y === candidate.y && event.x >= candidate.xStart && event.x < candidate.xEnd,
@@ -2828,8 +2860,22 @@ export default function prettyTui(pi: ExtensionAPI) {
 
         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));
+        const corner = renderMode === "clean" ? stripTerminalSequences(prefix).indexOf("└") : -1;
+        if (corner >= 0 && wrapped.length > 1) {
+          // Close the branch on the final physical row, not the first row of
+          // a logical source line that may wrap or contain explicit newlines.
+          const column = visibleWidth(stripTerminalSequences(prefix).slice(0, corner));
+          const guide = (symbol: string) => sliceByColumn(continuation, 0, column) +
+            defaultActivityTheme().fg("dim", symbol) +
+            sliceByColumn(continuation, column + 1, Math.max(0, visibleWidth(continuation) - column - 1));
+          rendered.push(prefix.replace("└", "│") + paint(wrapped[0] ?? ""));
+          for (let index = 1; index < wrapped.length; index++) {
+            rendered.push(guide(index === wrapped.length - 1 ? "└" : "│") + paint(wrapped[index]));
+          }
+        } else {
+          rendered.push(prefix + paint(wrapped[0] ?? ""));
+          for (const line of wrapped.slice(1)) rendered.push(continuation + paint(line));
+        }
       }
 
       return rendered;
@@ -2850,7 +2896,8 @@ export default function prettyTui(pi: ExtensionAPI) {
       if (renderMode === "compact") return name === "bash" ? theme.fg("toolTitle", "$ ") : "";
       return theme.fg(color, "● ");
     },
-    continuation: renderMode === "compact" && name !== "bash" ? "" : "  ",
+    continuation: renderMode === "clean" && expanded ? theme.fg("dim", "│ ") :
+      renderMode === "compact" && name !== "bash" ? "" : "  ",
     content: renderMode === "compact" ? theme.fg("muted", detail) :
       theme.fg("text", theme.bold(name)) +
       theme.fg("dim", "(") +
@@ -3569,7 +3616,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       const dimPhase = responseRunStartedAt !== undefined &&
         Math.floor(Math.max(0, Date.now() - responseRunStartedAt) / RUNNING_DOT_INTERVAL_MS) % 2 === 1;
       const color = currentActivity === "done"
-        ? collapsedDone ? "dim" : "success"
+        ? collapsedDone ? "dim" : "text"
         : dimPhase ? "dim" : "accent";
       return currentActivity !== "done" && !dimPhase
         ? runningColor(theme, "● ")
@@ -3580,7 +3627,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       const currentActivity = typeof activity === "function" ? activity() : activity;
       const label = currentActivity === "done" ? "Done" : "Running";
       const color = label === "Done"
-        ? collapsedDone ? "dim" : "success"
+        ? collapsedDone ? "dim" : "text"
         : "accent";
       const detailColor = label === "Done" && collapsedDone ? "dim" : "text";
       const title = label === "Running"
@@ -3787,14 +3834,14 @@ export default function prettyTui(pi: ExtensionAPI) {
     return {
       render(width: number): string[] {
         const data = entry.data;
-        mouseClickHitTests.set(this, (event) => fullscreenTui && copyStart >= 0 &&
+        mouseClickHitTests.set(this, (event) => messageCopyEnabled && fullscreenTui && copyStart >= 0 &&
           event.y === 0 && event.x >= copyStart && event.x < copyStart + copyWidth);
         if (!data || width <= 0) return [];
         copyStart = -1;
         copyWidth = 0;
         const answer = data.answerEntryId ? responseAnswerTexts.get(data.answerEntryId) ?? "" : "";
         const copyLabel = "[Copy]";
-        const showCopy = fullscreenTui && Boolean(answer.trim()) && width >= 30;
+        const showCopy = messageCopyEnabled && fullscreenTui && Boolean(answer.trim()) && width >= 30;
         const duration = formatResponseDuration(data.durationMs);
         const statusText = data.outcome === "stopped"
           ? `⚠ Stopped after ${duration}`
@@ -3820,7 +3867,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       },
       handleMouse(event: TuiMouseEvent) {
         if (
-          copyStart < 0 ||
+          !messageCopyEnabled || !fullscreenTui || copyStart < 0 ||
           event.button !== "left" ||
           (event.type !== "press" && event.type !== "click") ||
           event.y !== 0 ||
@@ -4652,7 +4699,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, writeLabel, context.toolCallId);
       const content = typeof args.content === "string" ? args.content : "";
       const path = String(args.path ?? "");
-      if (useCompactToolView(context.toolCallId, context.expanded)) {
+      if (renderMode === "clean" || useCompactToolView(context.toolCallId, context.expanded)) {
         const lines = content.replace(/\t/g, "    ").split("\n");
         while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
         const total = lines.length;
@@ -4665,6 +4712,33 @@ export default function prettyTui(pi: ExtensionAPI) {
       if (hideCleanTool(context.toolCallId, options.expanded, context.executionStarted)) return hiddenToolResult(context, options, output);
       if (options.isPartial) return partialResult(context, theme, "Writing…");
       const failed = completeStatus(context);
+      if (renderMode === "clean") {
+        if (failed) return result(theme, "Write failed", output, options.expanded, true);
+        const status = output ? `Written · ${output}` : "Written";
+        const rows: DisplayRow[] = [{
+          prefix: theme.fg("dim", "└  "), continuation: "   ",
+          content: theme.fg("toolOutput", status),
+        }];
+        if (options.expanded) {
+          const content = typeof context.args?.content === "string" ? context.args.content : "";
+          const source = content.replace(/\r\n|\r/g, "\n").replace(/\t/g, "    ").split("\n");
+          // A final newline terminates the last line; additional blank lines
+          // are actual file content and retain their own line numbers.
+          if (source.at(-1) === "") source.pop();
+          let highlighted: string[];
+          try { highlighted = highlightCode(source.join("\n"), getLanguageFromPath(String(context.args?.path ?? ""))); }
+          catch { highlighted = source; }
+          const digits = String(source.length).length;
+          for (let index = 0; index < source.length; index++) {
+            rows.push({
+              prefix: theme.fg("dim", index === source.length - 1 ? "   └ " : "   │ ") + theme.fg("dim", `${String(index + 1).padStart(digits)} `),
+              continuation: (index === source.length - 1 ? "     " : theme.fg("dim", "   │ ")) + " ".repeat(digits + 1),
+              content: highlighted[index] ?? source[index],
+            });
+          }
+        }
+        return block(rows);
+      }
       return result(
         theme,
         failed ? output.split("\n")[0] || "Write failed" : "Written",

package/package.json

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