pi-repoprompt-cli 0.2.5 → 0.2.7

package/README.md

@@ -7,6 +7,7 @@ Provides two tools:
 - `rp_exec` — run `rp-cli -e <cmd>` against that binding (quiet defaults + output truncation)
 
 Optional:
+- Diff blocks in `rp_exec` output use `delta` when installed (honoring the user's global git/delta color config), with graceful fallback otherwise
 - [Gurpartap/pi-readcache](https://github.com/Gurpartap/pi-readcache)-like caching for `rp_exec` calls that read files (`read` / `cat` / `read_file`) to save on tokens
   - returns unchanged markers and diffs on repeat reads
 

package/extensions/repoprompt-cli/README.md

@@ -7,6 +7,8 @@ It provides two Pi tools:
 - `rp_bind` — bind to a specific RepoPrompt **window id** + **compose tab** (routing)
 - `rp_exec` — run `rp-cli -e <cmd>` against that binding
 
+Diff blocks in `rp_exec` output use `delta` when installed (honoring the user's global git/delta color config), with graceful fallback otherwise
+
 ## Optional: readcache for `rp_exec read`
 
 If enabled, `rp_exec` will apply [Gurpartap/pi-readcache](https://github.com/Gurpartap/pi-readcache)-like token savings for single-command file reads, returning:

package/extensions/repoprompt-cli/config.json.example

@@ -1,3 +1,3 @@
 {
-  "readcacheReadFile": true
+  "readcacheReadFile": false
 }

package/extensions/repoprompt-cli/index.ts

@@ -1,3 +1,5 @@
+import { spawnSync } from "node:child_process";
+
 import type { ExtensionAPI, ExtensionContext, ToolRenderResultOptions } from "@mariozechner/pi-coding-agent";
 import { highlightCode, Theme } from "@mariozechner/pi-coding-agent";
 import { Text } from "@mariozechner/pi-tui";
@@ -239,7 +241,7 @@ function hasPipeOutsideQuotes(script: string): boolean {
  * - Provide actionable error messages when blocked
  * - For best command parsing (AST-based), install `just-bash` >= 2; otherwise it falls back to a legacy splitter
  * - Syntax-highlight fenced code blocks in output (read, structure, etc.)
- * - Word-level diff highlighting for edit output
+ * - Delta-powered diff highlighting (with graceful fallback when delta is unavailable)
  */
 
 const DEFAULT_TIMEOUT_MS = 15 * 60 * 1000;
@@ -954,6 +956,88 @@ function parseFencedBlocks(text: string): FencedBlock[] {
   return blocks;
 }
 
+const ANSI_ESCAPE_RE = /\x1b\[[0-9;]*m/g;
+const DELTA_TIMEOUT_MS = 5000;
+const DELTA_MAX_BUFFER = 8 * 1024 * 1024;
+const DELTA_CACHE_MAX_ENTRIES = 200;
+
+let deltaAvailable: boolean | null = null;
+const deltaDiffCache = new Map<string, string | null>();
+
+function isDeltaInstalled(): boolean {
+  if (deltaAvailable !== null) {
+    return deltaAvailable;
+  }
+
+  const check = spawnSync("delta", ["--version"], {
+    stdio: "ignore",
+    timeout: 1000,
+  });
+
+  deltaAvailable = !check.error && check.status === 0;
+  return deltaAvailable;
+}
+
+function runDelta(diffText: string): string | null {
+  const result = spawnSync("delta", ["--color-only", "--paging=never"], {
+    encoding: "utf-8",
+    input: diffText,
+    timeout: DELTA_TIMEOUT_MS,
+    maxBuffer: DELTA_MAX_BUFFER,
+  });
+
+  if (result.error || result.status !== 0) {
+    return null;
+  }
+
+  return typeof result.stdout === "string" ? result.stdout : null;
+}
+
+function stripSyntheticHeader(deltaOutput: string): string {
+  const outputLines = deltaOutput.split("\n");
+  const bodyStart = outputLines.findIndex((line) => line.replace(ANSI_ESCAPE_RE, "").startsWith("@@"));
+
+  if (bodyStart >= 0) {
+    return outputLines.slice(bodyStart + 1).join("\n");
+  }
+
+  return deltaOutput;
+}
+
+function renderDiffBlockWithDelta(code: string): string | null {
+  if (!isDeltaInstalled()) {
+    return null;
+  }
+
+  const cached = deltaDiffCache.get(code);
+  if (cached !== undefined) {
+    return cached;
+  }
+
+  let rendered = runDelta(code);
+
+  if (!rendered) {
+    const syntheticDiff = [
+      "--- a/file",
+      "+++ b/file",
+      "@@ -1,1 +1,1 @@",
+      code,
+    ].join("\n");
+
+    const syntheticRendered = runDelta(syntheticDiff);
+    if (syntheticRendered) {
+      rendered = stripSyntheticHeader(syntheticRendered);
+    }
+  }
+
+  if (deltaDiffCache.size >= DELTA_CACHE_MAX_ENTRIES) {
+    deltaDiffCache.clear();
+  }
+
+  deltaDiffCache.set(code, rendered);
+  return rendered;
+}
+
 /**
  * Compute word-level diff with inverse highlighting on changed parts
  */
@@ -1005,6 +1089,11 @@ function renderIntraLineDiff(
  * Render diff lines with syntax highlighting (red/green, word-level inverse)
  */
 function renderDiffBlock(code: string, theme: Theme): string {
+  const deltaRendered = renderDiffBlockWithDelta(code);
+  if (deltaRendered !== null) {
+    return deltaRendered;
+  }
+
   const lines = code.split("\n");
   const result: string[] = [];
 
@@ -1094,7 +1183,7 @@ function renderDiffBlock(code: string, theme: Theme): string {
 
 /**
  * Render rp_exec output with syntax highlighting for fenced code blocks.
- * - ```diff blocks get word-level diff highlighting
+ * - ```diff blocks use delta when available, with word-level fallback
  * - Other fenced blocks get syntax highlighting via Pi's highlightCode
  * - Non-fenced content is rendered dim (no markdown parsing)
  */
@@ -1458,8 +1547,11 @@ export default function (pi: ExtensionAPI) {
         };
       }
 
-      const readRequest =
-        config.readcacheReadFile === true && rawJson !== true ? parseReadFileRequest(params.cmd) : null;
+      // Parse read-like commands to:
+      // - detect cacheable reads (when enabled)
+      // - strip wrapper-only args like bypass_cache=true even when caching is disabled
+      //   (so agents can safely use bypass_cache in instructions regardless of config)
+      const readRequest = parseReadFileRequest(params.cmd);
 
       const cmdToRun = readRequest ? readRequest.cmdToRun : params.cmd;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-repoprompt-cli",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Integrates RepoPrompt with Pi via RepoPrompt's `rp-cli` executable",
   "keywords": ["pi-package", "pi", "pi-coding-agent", "repoprompt"],
   "license": "MIT",