gsd-pi 2.16.0 → 2.17.0

package/packages/pi-coding-agent/src/core/tools/edit-diff.ts

@@ -2,15 +2,11 @@
  * Shared diff computation utilities for the edit tool.
  * Used by both edit.ts (for execution) and tool-execution.ts (for preview rendering).
  *
- * Hot-path functions (fuzzyFindText, normalizeForFuzzyMatch, generateDiffString)
- * delegate to the native Rust engine for performance on large files.
+ * These helpers intentionally stay in JavaScript. Issue #453 showed that
+ * post-tool preview paths must not depend on the native addon because a native
+ * hang there can wedge the entire interactive session after a successful tool run.
  */
 
-import {
-	fuzzyFindText as nativeFuzzyFindText,
-	generateDiff as nativeGenerateDiff,
-	normalizeForFuzzyMatch as nativeNormalizeForFuzzyMatch,
-} from "@gsd/native";
 import { constants } from "fs";
 import { access, readFile } from "fs/promises";
 import { resolveToCwd } from "./path-utils.js";
@@ -32,14 +28,23 @@ export function restoreLineEndings(text: string, ending: "\r\n" | "\n"): string
 }
 
 /**
- * Normalize text for fuzzy matching (native Rust implementation).
+ * Normalize text for fuzzy matching.
  * - Strip trailing whitespace from each line
  * - Normalize smart quotes to ASCII equivalents
  * - Normalize Unicode dashes/hyphens to ASCII hyphen
  * - Normalize special Unicode spaces to regular space
  */
 export function normalizeForFuzzyMatch(text: string): string {
-	return nativeNormalizeForFuzzyMatch(text);
+	return text
+		.replace(/\r\n/g, "\n")
+		.replace(/\r/g, "\n")
+		.replace(/[“”]/g, '"')
+		.replace(/[‘’]/g, "'")
+		.replace(/[‐‑‒–—−]/g, "-")
+		.replace(/[\u00A0\u1680\u2000-\u200A\u202F\u205F\u3000]/g, " ")
+		.split("\n")
+		.map((line) => line.replace(/[ \t]+$/g, ""))
+		.join("\n");
 }
 
 export interface FuzzyMatchResult {
@@ -59,14 +64,44 @@ export interface FuzzyMatchResult {
 }
 
 /**
- * Find oldText in content, trying exact match first, then fuzzy match
- * (native Rust implementation).
+ * Find oldText in content, trying exact match first, then fuzzy match.
  *
  * When fuzzy matching is used, the returned contentForReplacement is the
  * fuzzy-normalized version of the content.
  */
 export function fuzzyFindText(content: string, oldText: string): FuzzyMatchResult {
-	return nativeFuzzyFindText(content, oldText);
+	const exactIndex = content.indexOf(oldText);
+	if (exactIndex !== -1) {
+		return {
+			found: true,
+			index: exactIndex,
+			matchLength: oldText.length,
+			usedFuzzyMatch: false,
+			contentForReplacement: content,
+		};
+	}
+
+	const normalizedContent = normalizeForFuzzyMatch(content);
+	const normalizedOldText = normalizeForFuzzyMatch(oldText);
+	const fuzzyIndex = normalizedContent.indexOf(normalizedOldText);
+
+	if (fuzzyIndex === -1) {
+		return {
+			found: false,
+			index: -1,
+			matchLength: 0,
+			usedFuzzyMatch: false,
+			contentForReplacement: content,
+		};
+	}
+
+	return {
+		found: true,
+		index: fuzzyIndex,
+		matchLength: normalizedOldText.length,
+		usedFuzzyMatch: true,
+		contentForReplacement: normalizedContent,
+	};
 }
 
 /** Strip UTF-8 BOM if present, return both the BOM (if any) and the text without it */
@@ -75,20 +110,81 @@ export function stripBom(content: string): { bom: string; text: string } {
 }
 
 /**
- * Generate a unified diff string with line numbers and context
- * (native Rust implementation using Myers' algorithm via the `similar` crate).
+ * Generate a unified diff string with line numbers and context.
  *
  * Returns both the diff string and the first changed line number (in the new file).
+ * Only lines within `contextLines` of a change are included (like unified diff).
  */
 export function generateDiffString(
 	oldContent: string,
 	newContent: string,
 	contextLines = 4,
 ): { diff: string; firstChangedLine: number | undefined } {
-	const result = nativeGenerateDiff(oldContent, newContent, contextLines);
+	const ops = buildLineDiff(oldContent, newContent);
+	let firstChangedLine: number | undefined;
+
+	// First pass: assign line numbers and find changed indices
+	const annotated: { op: LineDiffOp; oldLine: number; newLine: number }[] = [];
+	let oldLine = 1;
+	let newLine = 1;
+	const changedIndices: number[] = [];
+
+	for (let idx = 0; idx < ops.length; idx++) {
+		const op = ops[idx];
+		annotated.push({ op, oldLine, newLine });
+
+		if (op.type !== "context") {
+			changedIndices.push(idx);
+			if (firstChangedLine === undefined) {
+				firstChangedLine = newLine;
+			}
+		}
+
+		if (op.type === "remove") {
+			oldLine += 1;
+		} else if (op.type === "add") {
+			newLine += 1;
+		} else {
+			oldLine += 1;
+			newLine += 1;
+		}
+	}
+
+	// Build set of indices to include (changes + surrounding context)
+	const includeSet = new Set<number>();
+	for (const ci of changedIndices) {
+		for (let k = Math.max(0, ci - contextLines); k <= Math.min(ops.length - 1, ci + contextLines); k++) {
+			includeSet.add(k);
+		}
+	}
+
+	const maxLine = Math.max(oldLine - 1, newLine - 1, 1);
+	const lineNumberWidth = String(maxLine).length;
+	const rendered: string[] = [];
+	let lastIncluded = -1;
+
+	for (let idx = 0; idx < annotated.length; idx++) {
+		if (!includeSet.has(idx)) continue;
+
+		// Insert separator when there's a gap between included regions
+		if (lastIncluded !== -1 && idx > lastIncluded + 1) {
+			rendered.push("...");
+		}
+		lastIncluded = idx;
+
+		const { op, oldLine: ol, newLine: nl } = annotated[idx];
+		if (op.type === "context") {
+			rendered.push(` ${String(nl).padStart(lineNumberWidth, " ")} ${op.line}`);
+		} else if (op.type === "remove") {
+			rendered.push(`-${String(ol).padStart(lineNumberWidth, " ")} ${op.line}`);
+		} else {
+			rendered.push(`+${String(nl).padStart(lineNumberWidth, " ")} ${op.line}`);
+		}
+	}
+
 	return {
-		diff: result.diff,
-		firstChangedLine: result.firstChangedLine ?? undefined,
+		diff: rendered.join("\n"),
+		firstChangedLine,
 	};
 }
 
@@ -101,6 +197,138 @@ export interface EditDiffError {
 	error: string;
 }
 
+type LineDiffOp =
+	| { type: "context"; line: string }
+	| { type: "remove"; line: string }
+	| { type: "add"; line: string };
+
+function splitLines(text: string): string[] {
+	const lines = text.split("\n");
+	if (lines.length > 0 && lines.at(-1) === "") {
+		lines.pop();
+	}
+	return lines;
+}
+
+/**
+ * Maximum number of cells (oldLines * newLines) before we switch from the
+ * full LCS DP algorithm to a simpler linear-scan diff. This prevents OOM
+ * on large files (e.g. 10k lines would need a 100M-cell matrix).
+ */
+const MAX_DP_CELLS = 4_000_000; // ~32 MB for 64-bit numbers
+
+function buildLineDiff(oldContent: string, newContent: string): LineDiffOp[] {
+	const oldLines = splitLines(oldContent);
+	const newLines = splitLines(newContent);
+
+	const cells = (oldLines.length + 1) * (newLines.length + 1);
+	if (cells > MAX_DP_CELLS) {
+		return buildLineDiffLinear(oldLines, newLines);
+	}
+
+	return buildLineDiffLCS(oldLines, newLines);
+}
+
+/**
+ * Full LCS-based diff using O(n*m) DP table. Produces optimal diffs but
+ * is only safe for files where n*m <= MAX_DP_CELLS.
+ */
+function buildLineDiffLCS(oldLines: string[], newLines: string[]): LineDiffOp[] {
+	const dp: number[][] = Array.from({ length: oldLines.length + 1 }, () =>
+		Array<number>(newLines.length + 1).fill(0),
+	);
+
+	for (let i = oldLines.length - 1; i >= 0; i--) {
+		for (let j = newLines.length - 1; j >= 0; j--) {
+			if (oldLines[i] === newLines[j]) {
+				dp[i][j] = dp[i + 1][j + 1] + 1;
+			} else {
+				dp[i][j] = Math.max(dp[i + 1][j], dp[i][j + 1]);
+			}
+		}
+	}
+
+	const ops: LineDiffOp[] = [];
+	let i = 0;
+	let j = 0;
+
+	while (i < oldLines.length && j < newLines.length) {
+		if (oldLines[i] === newLines[j]) {
+			ops.push({ type: "context", line: oldLines[i] });
+			i += 1;
+			j += 1;
+			continue;
+		}
+
+		if (dp[i + 1][j] >= dp[i][j + 1]) {
+			ops.push({ type: "remove", line: oldLines[i] });
+			i += 1;
+		} else {
+			ops.push({ type: "add", line: newLines[j] });
+			j += 1;
+		}
+	}
+
+	while (i < oldLines.length) {
+		ops.push({ type: "remove", line: oldLines[i] });
+		i += 1;
+	}
+
+	while (j < newLines.length) {
+		ops.push({ type: "add", line: newLines[j] });
+		j += 1;
+	}
+
+	return ops;
+}
+
+/**
+ * Linear-time fallback diff for large files. Matches common prefix/suffix,
+ * then treats the remaining middle as a bulk remove+add. Not optimal but
+ * O(n+m) in both time and space.
+ */
+function buildLineDiffLinear(oldLines: string[], newLines: string[]): LineDiffOp[] {
+	const ops: LineDiffOp[] = [];
+
+	// Match common prefix
+	let prefixLen = 0;
+	const minLen = Math.min(oldLines.length, newLines.length);
+	while (prefixLen < minLen && oldLines[prefixLen] === newLines[prefixLen]) {
+		prefixLen++;
+	}
+
+	// Match common suffix (not overlapping with prefix)
+	let suffixLen = 0;
+	while (
+		suffixLen < minLen - prefixLen &&
+		oldLines[oldLines.length - 1 - suffixLen] === newLines[newLines.length - 1 - suffixLen]
+	) {
+		suffixLen++;
+	}
+
+	// Emit prefix context
+	for (let i = 0; i < prefixLen; i++) {
+		ops.push({ type: "context", line: oldLines[i] });
+	}
+
+	// Emit removed lines from the middle
+	for (let i = prefixLen; i < oldLines.length - suffixLen; i++) {
+		ops.push({ type: "remove", line: oldLines[i] });
+	}
+
+	// Emit added lines from the middle
+	for (let j = prefixLen; j < newLines.length - suffixLen; j++) {
+		ops.push({ type: "add", line: newLines[j] });
+	}
+
+	// Emit suffix context
+	for (let i = oldLines.length - suffixLen; i < oldLines.length; i++) {
+		ops.push({ type: "context", line: oldLines[i] });
+	}
+
+	return ops;
+}
+
 /**
  * Compute the diff for an edit operation without applying it.
  * Used for preview rendering in the TUI before the tool executes.

package/packages/pi-coding-agent/src/modes/interactive/theme/theme.ts

@@ -11,6 +11,11 @@ import {
 } from "@gsd/native";
 import { getCustomThemesDir, getThemesDir } from "../../../config.js";
 
+// Issue #453: native preview highlighting can wedge the entire interactive
+// session after a successful file tool. Keep the safer plain-text path as the
+// default and allow native highlighting only as an explicit opt-in.
+const NATIVE_TUI_HIGHLIGHT_ENABLED = process.env.GSD_ENABLE_NATIVE_TUI_HIGHLIGHT === "1";
+
 // ============================================================================
 // Types & Schema
 // ============================================================================
@@ -955,6 +960,10 @@ function getHighlightColors(t: Theme): HighlightColors {
  * Returns array of highlighted lines.
  */
 export function highlightCode(code: string, lang?: string): string[] {
+	if (!NATIVE_TUI_HIGHLIGHT_ENABLED) {
+		return code.split("\n");
+	}
+
 	const validLang = lang && supportsLanguage(lang) ? lang : null;
 	try {
 		return nativeHighlightCode(code, validLang, getHighlightColors(theme)).split("\n");
@@ -1051,6 +1060,10 @@ export function getMarkdownTheme(): MarkdownTheme {
 		underline: (text: string) => theme.underline(text),
 		strikethrough: (text: string) => chalk.strikethrough(text),
 		highlightCode: (code: string, lang?: string): string[] => {
+			if (!NATIVE_TUI_HIGHLIGHT_ENABLED) {
+				return code.split("\n").map((line) => theme.fg("mdCodeBlock", line));
+			}
+
 			const validLang = lang && supportsLanguage(lang) ? lang : null;
 			try {
 				return nativeHighlightCode(code, validLang, getHighlightColors(theme)).split("\n");

package/pkg/dist/modes/interactive/theme/theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/theme.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAmG/E,MAAM,MAAM,UAAU,GACnB,QAAQ,GACR,QAAQ,GACR,cAAc,GACd,aAAa,GACb,SAAS,GACT,OAAO,GACP,SAAS,GACT,OAAO,GACP,KAAK,GACL,MAAM,GACN,cAAc,GACd,iBAAiB,GACjB,mBAAmB,GACnB,oBAAoB,GACpB,WAAW,GACX,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,WAAW,GACX,QAAQ,GACR,aAAa,GACb,mBAAmB,GACnB,SAAS,GACT,eAAe,GACf,MAAM,GACN,cAAc,GACd,eAAe,GACf,iBAAiB,GACjB,iBAAiB,GACjB,eAAe,GACf,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,cAAc,GACd,cAAc,GACd,YAAY,GACZ,gBAAgB,GAChB,mBAAmB,GACnB,aAAa,GACb,iBAAiB,GACjB,aAAa,GACb,gBAAgB,GAChB,cAAc,GACd,eAAe,GACf,UAAU,CAAC;AAEd,MAAM,MAAM,OAAO,GAChB,YAAY,GACZ,eAAe,GACf,iBAAiB,GACjB,eAAe,GACf,eAAe,GACf,aAAa,CAAC;AAEjB,KAAK,SAAS,GAAG,WAAW,GAAG,UAAU,CAAC;AA4L1C,qBAAa,KAAK;IACjB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,IAAI,CAAY;gBAGvB,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,EAC7C,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,EAC1C,IAAI,EAAE,SAAS,EACf,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAO;IAerD,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAM3C,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAMxC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI1B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI5B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI/B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI7B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAInC,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM;IAMpC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;IAMjC,YAAY,IAAI,SAAS;IAIzB,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM;IAoB/G,sBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM;CAGjD;AAqBD,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAe7C;AAED,MAAM,WAAW,SAAS;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,2BAA2B,IAAI,SAAS,EAAE,CA6BzD;AA6FD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK,CAI5E;AAWD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAM9D;AA8BD,eAAO,MAAM,KAAK,EAAE,KAMlB,CAAC;AAWH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAOzD;AAED,wBAAgB,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG,IAAI,CAclF;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,GAAE,OAAe,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAqB3G;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,KAAK,GAAG,IAAI,CAO3D;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAExD;AA4DD,wBAAgB,gBAAgB,IAAI,IAAI,CAKvC;AAoDD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAqBjF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAGxD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CA4BA;AA+BD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAOnE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAkExE;AAED,wBAAgB,gBAAgB,IAAI,aAAa,CAyBhD;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAQpD;AAED,wBAAgB,cAAc,IAAI,WAAW,CAK5C;AAED,wBAAgB,oBAAoB,IAAI,OAAO,aAAa,EAAE,iBAAiB,CAQ9E"}
+{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/theme.ts"],"names":[],"mappings":"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"}

package/pkg/dist/modes/interactive/theme/theme.js

@@ -5,6 +5,10 @@ import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";
 import { highlightCode as nativeHighlightCode, supportsLanguage, } from "@gsd/native";
 import { getCustomThemesDir, getThemesDir } from "../../../config.js";
+// Issue #453: native preview highlighting can wedge the entire interactive
+// session after a successful file tool. Keep the safer plain-text path as the
+// default and allow native highlighting only as an explicit opt-in.
+const NATIVE_TUI_HIGHLIGHT_ENABLED = process.env.GSD_ENABLE_NATIVE_TUI_HIGHLIGHT === "1";
 // ============================================================================
 // Types & Schema
 // ============================================================================
@@ -798,6 +802,9 @@ function getHighlightColors(t) {
  * Returns array of highlighted lines.
  */
 export function highlightCode(code, lang) {
+    if (!NATIVE_TUI_HIGHLIGHT_ENABLED) {
+        return code.split("\n");
+    }
     const validLang = lang && supportsLanguage(lang) ? lang : null;
     try {
         return nativeHighlightCode(code, validLang, getHighlightColors(theme)).split("\n");
@@ -892,6 +899,9 @@ export function getMarkdownTheme() {
         underline: (text) => theme.underline(text),
         strikethrough: (text) => chalk.strikethrough(text),
         highlightCode: (code, lang) => {
+            if (!NATIVE_TUI_HIGHLIGHT_ENABLED) {
+                return code.split("\n").map((line) => theme.fg("mdCodeBlock", line));
+            }
             const validLang = lang && supportsLanguage(lang) ? lang : null;
             try {
                 return nativeHighlightCode(code, validLang, getHighlightColors(theme)).split("\n");