pi-pretty-tui 0.3.4 → 0.3.5

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,
@@ -2828,8 +2831,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 +2867,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 +3587,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 +3598,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"
@@ -4652,7 +4670,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 +4683,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.5",
   "description": "A beautiful, polished TUI for the Pi coding agent",
   "license": "MIT",
   "author": "Kainan Yang <ykn0309@whu.edu.cn>",