@pi-unipi/utility 0.2.7 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/utility",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Utility commands and tools for Pi coding agent — lifecycle, diagnostics, cache, analytics, display, batch execution",
   "type": "module",
   "license": "MIT",

package/src/diff/highlighter.ts

@@ -273,9 +273,8 @@ export async function getShikiHighlighter(): Promise<any> {
         ],
       });
       return shikiHighlighter;
-    } catch (err) {
+    } catch {
       // If Shiki fails to load, return null — we'll use plain text
-      console.warn("[pi-diff] Shiki highlighter failed to load:", err);
       shikiInitPromise = null;
       return null;
     }

package/src/diff/renderer.ts

@@ -3,12 +3,17 @@
  *
  * ANSI diff rendering: split (side-by-side) and unified (stacked) views.
  * Includes ANSI utilities, background injection, and adaptive wrapping.
+ *
+ * IMPORTANT: All output lines must be truncated to terminal width
+ * to prevent TUI crashes. Use fit() or truncateToTermWidth()
+ * before pushing lines.
  */
 
 import type { ParsedDiff, DiffLine } from "./parser.js";
 import type { DiffColors } from "./theme.js";
 import { hexToBgAnsi, hexToFgAnsi } from "./theme.js";
 import { hlBlock, detectLanguage } from "./highlighter.js";
+import { truncateToWidth as piTruncateToWidth, visibleWidth as piVisibleWidth } from "@mariozechner/pi-tui";
 
 // ─── Constants ──────────────────────────────────────────────────────────────────
 
@@ -36,64 +41,21 @@ export function strip(s: string): string {
 
 /**
  * Get the visible width of a string (excluding ANSI escapes).
- * Handles CJK characters (width 2) and emoji.
+ * Delegates to pi-tui's ANSI-aware implementation for correctness.
  */
 export function visibleWidth(s: string): number {
-  const stripped = strip(s);
-  let width = 0;
-  for (const char of stripped) {
-    const code = char.codePointAt(0)!;
-    // CJK Unified Ideographs, CJK Compatibility, etc.
-    if (
-      (code >= 0x4e00 && code <= 0x9fff) ||
-      (code >= 0x3000 && code <= 0x30ff) ||
-      (code >= 0xff00 && code <= 0xffef) ||
-      (code >= 0xf900 && code <= 0xfaff) ||
-      (code >= 0x2e80 && code <= 0x2eff) ||
-      (code >= 0x3400 && code <= 0x4dbf) ||
-      (code >= 0x20000 && code <= 0x2a6df)
-    ) {
-      width += 2;
-    } else if (code > 0xffff) {
-      // Surrogate pairs / emoji — typically width 2
-      width += 2;
-    } else {
-      width += 1;
-    }
-  }
-  return width;
+  return piVisibleWidth(s);
 }
 
 /**
  * Fit a string to a target width, padding or truncating as needed.
- * Preserves ANSI state across truncation.
+ * Uses pi-tui's ANSI-aware truncation for correctness.
  */
 export function fit(s: string, targetWidth: number): string {
   const vw = visibleWidth(s);
   if (vw === targetWidth) return s;
   if (vw > targetWidth) {
-    // Truncate — find the cut point
-    let width = 0;
-    let i = 0;
-    const stripped = strip(s);
-    for (; i < stripped.length && width < targetWidth; i++) {
-      const code = stripped.codePointAt(i)!;
-      width += (code >= 0x4e00 && code <= 0x9fff) || code > 0xffff ? 2 : 1;
-    }
-    // Find the corresponding position in the original (with ANSI) string
-    let strippedIdx = 0;
-    let origIdx = 0;
-    while (origIdx < s.length && strippedIdx < i) {
-      if (s[origIdx] === "\x1b") {
-        // Skip ANSI sequence
-        while (origIdx < s.length && s[origIdx] !== "m") origIdx++;
-        origIdx++;
-      } else {
-        strippedIdx++;
-        origIdx++;
-      }
-    }
-    return s.substring(0, origIdx) + "\x1b[0m";
+    return piTruncateToWidth(s, targetWidth, "");
   }
   // Pad
   return s + " ".repeat(targetWidth - vw);
@@ -198,6 +160,17 @@ export function termW(): number {
   }
 }
 
+/**
+ * Truncate a line to terminal width using pi-tui's ANSI-aware truncation.
+ * Prevents TUI crash when rendered lines exceed terminal width.
+ * Accounts for rendering overhead from Box nesting (~6 chars).
+ */
+export function truncateToTermWidth(line: string): string {
+  const maxW = Math.max(20, termW() - 6);
+  if (piVisibleWidth(line) <= maxW) return line;
+  return piTruncateToWidth(line, maxW, "…");
+}
+
 // ─── Background Injection ───────────────────────────────────────────────────────
 
 /**
@@ -313,16 +286,16 @@ export function renderUnified(
 
     switch (line.type) {
       case "hunk":
-        lines.push(`${hunkFg}${line.content}${reset}`);
+        lines.push(truncateToTermWidth(`${hunkFg}${line.content}${reset}`));
         break;
       case "add":
-        lines.push(`${addBg}${addFg}+${reset}${addBg} ${lnum(null, 4)} ${lnum(line.newLine, 4)} │ ${line.content}${reset}`);
+        lines.push(truncateToTermWidth(`${addBg}${addFg}+${reset}${addBg} ${lnum(null, 4)} ${lnum(line.newLine, 4)} │ ${line.content}${reset}`));
         break;
       case "remove":
-        lines.push(`${remBg}${remFg}-${reset}${remBg} ${lnum(line.oldLine, 4)} ${lnum(null, 4)} │ ${line.content}${reset}`);
+        lines.push(truncateToTermWidth(`${remBg}${remFg}-${reset}${remBg} ${lnum(line.oldLine, 4)} ${lnum(null, 4)} │ ${line.content}${reset}`));
         break;
       case "context":
-        lines.push(` ${headerFg}${lnum(line.oldLine, 4)} ${lnum(line.newLine, 4)}${reset} │ ${line.content}`);
+        lines.push(truncateToTermWidth(` ${headerFg}${lnum(line.oldLine, 4)} ${lnum(line.newLine, 4)}${reset} │ ${line.content}`));
         break;
     }
   }
@@ -411,7 +384,7 @@ export function renderSplit(
   for (let i = 0; i < leftLines.length; i++) {
     const left = leftLines[i];
     const right = rightLines[i];
-    lines.push(`${left} │ ${right}`);
+    lines.push(truncateToTermWidth(`${left} │ ${right}`));
   }
 
   if (truncated) {

package/src/diff/wrapper.ts

@@ -12,10 +12,11 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type { ExtensionAPI, ToolDefinition, AgentToolResult } from "@mariozechner/pi-coding-agent";
+import { visibleWidth as piVisibleWidth, truncateToWidth as piTruncateToWidth } from "@mariozechner/pi-tui";
 import { readDiffSettings } from "./settings.js";
 import { parseDiff } from "./parser.js";
 import { resolveDiffColors, applyDiffPalette } from "./theme.js";
-import { renderSplit, renderUnified, termW, SPLIT_MIN_WIDTH } from "./renderer.js";
+import { renderSplit, renderUnified, termW, SPLIT_MIN_WIDTH, truncateToTermWidth } from "./renderer.js";
 import { detectLanguageFromPath, hlBlock, MAX_HL_CHARS } from "./highlighter.js";
 
 // ─── Types ──────────────────────────────────────────────────────────────────────
@@ -157,7 +158,15 @@ export function registerEnhancedWriteTool(pi: ExtensionAPI, cwd: string): void {
     renderResult(result: any, _options: any, theme: any): any {
       const details = result?.details as DiffToolDetails | undefined;
       if (!details || !details.diff || !details.diff.lines || details.diff.lines.length === 0) {
-        return null as any;
+        // Error or empty-diff case: render the message from result.content so the
+        // user sees "Could not find text to replace..." etc. Never return null here
+        // because Container.render() will crash on null child.
+        const msg = result?.content?.[0]?.text ?? "";
+        return {
+          setText: () => {},
+          text: msg,
+          render: (width: number) => (width > 0 ? [msg.slice(0, width)] : [msg]),
+        } as any;
       }
 
       try {
@@ -169,14 +178,34 @@ export function registerEnhancedWriteTool(pi: ExtensionAPI, cwd: string): void {
           ? renderSplit(details.diff, details.language, max, dc)
           : renderUnified(details.diff, details.language, max, dc);
 
-        // Return a simple component-like object with text
+        // Split into lines and cache for width-aware rendering.
+        // Each line is already truncated to terminal width by
+        // truncateToTermWidth() in the renderer, but we also
+        // respect the width parameter from Box.render().
+        const cachedLines = rendered.split("\n");
+
         return {
           setText: () => {},
           text: rendered,
-          render: () => rendered.split("\n"),
+          render: (width: number) => {
+            // If width is provided, re-truncate lines that
+            // still exceed it (e.g., inside nested Boxes)
+            const maxW = width > 0 ? width : tw;
+            return cachedLines.map((line: string) => {
+              if (piVisibleWidth(line) > maxW) {
+                return piTruncateToWidth(line, maxW, "…");
+              }
+              return line;
+            });
+          },
         } as any;
       } catch {
-        return null as any;
+        const fallback = "(diff rendering failed)";
+        return {
+          setText: () => {},
+          text: fallback,
+          render: (width: number) => (width > 0 ? [fallback.slice(0, width)] : [fallback]),
+        } as any;
       }
     },
   });
@@ -262,7 +291,15 @@ export function registerEnhancedEditTool(pi: ExtensionAPI, cwd: string): void {
     renderResult(result: any, _options: any, theme: any): any {
       const details = result?.details as DiffToolDetails | undefined;
       if (!details || !details.diff || !details.diff.lines || details.diff.lines.length === 0) {
-        return null as any;
+        // Error or empty-diff case: render the message from result.content so the
+        // user sees "Could not find text to replace..." etc. Never return null here
+        // because Container.render() will crash on null child.
+        const msg = result?.content?.[0]?.text ?? "";
+        return {
+          setText: () => {},
+          text: msg,
+          render: (width: number) => (width > 0 ? [msg.slice(0, width)] : [msg]),
+        } as any;
       }
 
       try {
@@ -274,13 +311,28 @@ export function registerEnhancedEditTool(pi: ExtensionAPI, cwd: string): void {
           ? renderSplit(details.diff, details.language, max, dc)
           : renderUnified(details.diff, details.language, max, dc);
 
+        const cachedLines = rendered.split("\n");
+
         return {
           setText: () => {},
           text: rendered,
-          render: () => rendered.split("\n"),
+          render: (width: number) => {
+            const maxW = width > 0 ? width : tw;
+            return cachedLines.map((line: string) => {
+              if (piVisibleWidth(line) > maxW) {
+                return piTruncateToWidth(line, maxW, "…");
+              }
+              return line;
+            });
+          },
         } as any;
       } catch {
-        return null as any;
+        const fallback = "(diff rendering failed)";
+        return {
+          setText: () => {},
+          text: fallback,
+          render: (width: number) => (width > 0 ? [fallback.slice(0, width)] : [fallback]),
+        } as any;
       }
     },
   });