pi-hashline-edit-pro 0.15.2 → 0.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "description": "Strict hashline read/replace tool for pi-coding-agent with hash-anchored edits (3-char, 18-bit, perfect hashing)",
   "main": "index.ts",
   "repository": {

package/src/replace-diff.ts

@@ -45,10 +45,19 @@ export function genDiff(
   newContent: string,
   contextLines = 2,
   newContentHashes?: string[],
+  oldHashes?: string[],
 ): { diff: string; firstChangedLine: number | undefined } {
+  // Run Diff.diffLines on raw content only (no hash annotations) so that
+  // lines whose content is identical are never reported as changed even
+  // when their hash differs due to collision resolution or position
+  // tracking. Hashes are used purely for display via fmtDiffLine.
+  const oldLines = oldContent.split("\n");
+  const newLines = newContent.split("\n");
+  const effectiveOldHashes = oldHashes ?? _lineHashesPure(oldContent);
+  const effectiveNewHashes = newContentHashes ?? _lineHashesPure(newContent);
+
   const parts = Diff.diffLines(oldContent, newContent);
   const output: string[] = [];
-  const effectiveNewHashes = newContentHashes ?? _lineHashesPure(newContent);
   let oldLineNum = 1;
   let newLineNum = 1;
   let lastWasChange = false;
@@ -58,18 +67,17 @@ export function genDiff(
     const part = parts[i]!;
     const raw = part.value.split("\n");
     if (raw[raw.length - 1] === "") raw.pop();
+    const displayLines = raw;
 
     if (part.added || part.removed) {
       if (firstChangedLine === undefined) firstChangedLine = newLineNum;
-      for (const line of raw) {
+      for (let k = 0; k < displayLines.length; k++) {
         if (part.added) {
           const hash = effectiveNewHashes[newLineNum - 1];
-          output.push(fmtDiffLine("+", line, hash));
+          output.push(fmtDiffLine("+", displayLines[k]!, hash));
           newLineNum++;
         } else {
-          output.push(
-            fmtDiffLine("-", line, undefined),
-          );
+          output.push(fmtDiffLine("-", displayLines[k]!, undefined));
           oldLineNum++;
         }
       }
@@ -80,44 +88,43 @@ export function genDiff(
     const nextPartIsChange =
       i < parts.length - 1 && (parts[i + 1]!.added || parts[i + 1]!.removed);
     if (lastWasChange || nextPartIsChange) {
-      let linesToShow = raw;
+      let linesToShow = displayLines;
       let skipStart = 0;
       let skipEnd = 0;
       let skipMiddle = 0;
 
       if (!lastWasChange) {
-        skipStart = Math.max(0, raw.length - contextLines);
-        linesToShow = raw.slice(skipStart);
-      } else if (nextPartIsChange && raw.length > contextLines * 2) {
-        const tail = raw.slice(-contextLines);
-        linesToShow = [...raw.slice(0, contextLines), "__ELLIPSIS__", ...tail];
-        skipMiddle = raw.length - contextLines * 2;
+        skipStart = Math.max(0, displayLines.length - contextLines);
+        linesToShow = displayLines.slice(skipStart);
+      } else if (nextPartIsChange && displayLines.length > contextLines * 2) {
+        const tail = displayLines.slice(-contextLines);
+        linesToShow = [...displayLines.slice(0, contextLines), "__ELLIPSIS__", ...tail];
+        skipMiddle = displayLines.length - contextLines * 2;
       } else if (linesToShow.length > contextLines) {
         skipEnd = linesToShow.length - contextLines;
         linesToShow = linesToShow.slice(0, contextLines);
       }
 
       if (skipStart > 0) {
-        output.push(` ...`);
+        output.push(" ...");
         oldLineNum += skipStart;
         newLineNum += skipStart;
       }
       for (const line of linesToShow) {
         if (line === "__ELLIPSIS__") {
-          output.push(` ...`);
+          output.push(" ...");
           oldLineNum += skipMiddle;
           newLineNum += skipMiddle;
           continue;
         }
         const hash = effectiveNewHashes[newLineNum - 1];
         output.push(fmtDiffLine(" ", line, hash));
-
         oldLineNum++;
         newLineNum++;
       }
     } else {
-      oldLineNum += raw.length;
-      newLineNum += raw.length;
+      oldLineNum += displayLines.length;
+      newLineNum += displayLines.length;
     }
     lastWasChange = false;
   }

package/src/replace-flat.ts

@@ -238,6 +238,7 @@ export function buildToolDef(): ToolDef {
 
         const {
           originalNormalized,
+          originalHashes,
           result,
           bom,
           originalEnding,
@@ -294,13 +295,13 @@ export function buildToolDef(): ToolDef {
         const successInput = {
           path,
           originalNormalized,
+          originalHashes,
           result,
           resultHashes,
           warnings,
           snapshotId: updatedSnapshotId,
           editMeta,
         };
-
         return buildChanged(successInput);
       });
     },

package/src/replace-response.ts

@@ -40,13 +40,14 @@ export interface NoopInput {
 }
 
 export interface SuccessInput {
-	path: string;
-	originalNormalized: string;
-	result: string;
-	resultHashes: string[];
-	warnings: string[] | undefined;
-	snapshotId: string;
-	editMeta: RMeta;
+  path: string;
+  originalNormalized: string;
+  originalHashes: string[];
+  result: string;
+  resultHashes: string[];
+  warnings: string[] | undefined;
+  snapshotId: string;
+  editMeta: RMeta;
 }
 
 function cntDiff(diff: string, marker: "+" | "-"): number {
@@ -139,39 +140,39 @@ export function buildNoop(input: NoopInput): TResult {
 }
 
 export function buildChanged(input: SuccessInput): TResult {
-	const { path, result, warnings, snapshotId, originalNormalized, editMeta, resultHashes } = input;
-
-	const resultLines = visLines(result);
-	const diffResult = genDiff(originalNormalized, result, 2, resultHashes);
-	const addedLines = cntDiff(diffResult.diff, "+");
-	const removedLines = cntDiff(diffResult.diff, "-");
-	const warningsBlock = warnBlock(warnings);
-	const successPrefix = `Successfully replaced in ${path}.`;
-	const text = resultLines.length === 0
-		? "File is empty. Use replace to insert content."
-		: warningsBlock
-			? `${successPrefix}${warningsBlock}`
-			: successPrefix;
-
-	const metrics = buildM({
-		classification: "applied",
-		editsAttempted: editMeta.editsAttempted,
-		noopEditsCount: editMeta.noopEditsCount,
-		warningsCount: warnings?.length ?? 0,
-		firstChangedLine: editMeta.firstChangedLine,
-		lastChangedLine: editMeta.lastChangedLine,
-		addedLines,
-		removedLines,
-	});
-
-	return {
-		content: [{ type: "text", text }],
-		details: {
-			diff: diffResult.diff,
-			firstChangedLine:
-				editMeta.firstChangedLine ?? diffResult.firstChangedLine,
-			snapshotId,
-			metrics,
-		},
-	};
+  const { path, result, warnings, snapshotId, originalNormalized, originalHashes, editMeta, resultHashes } = input;
+
+  const resultLines = visLines(result);
+  const diffResult = genDiff(originalNormalized, result, 2, resultHashes, originalHashes);
+  const addedLines = cntDiff(diffResult.diff, "+");
+  const removedLines = cntDiff(diffResult.diff, "-");
+  const warningsBlock = warnBlock(warnings);
+  const successPrefix = `Successfully replaced in ${path}.`;
+  const text = resultLines.length === 0
+    ? "File is empty. Use replace to insert content."
+    : warningsBlock
+      ? `${successPrefix}${warningsBlock}`
+      : successPrefix;
+
+  const metrics = buildM({
+    classification: "applied",
+    editsAttempted: editMeta.editsAttempted,
+    noopEditsCount: editMeta.noopEditsCount,
+    warningsCount: warnings?.length ?? 0,
+    firstChangedLine: editMeta.firstChangedLine,
+    lastChangedLine: editMeta.lastChangedLine,
+    addedLines,
+    removedLines,
+  });
+
+  return {
+    content: [{ type: "text", text }],
+    details: {
+      diff: diffResult.diff,
+      firstChangedLine:
+        editMeta.firstChangedLine ?? diffResult.firstChangedLine,
+      snapshotId,
+      metrics,
+    },
+  };
 }

package/src/replace.ts

@@ -101,7 +101,7 @@ interface PipelineResult {
   noopEdits?: { editIndex: number; loc: string; currentContent: string }[];
   firstChangedLine?: number;
   lastChangedLine?: number;
-  originalHashes?: string[];
+  originalHashes: string[];
   resultHashes: string[];
 }
 
@@ -228,7 +228,7 @@ export async function compPreview(
   try {
     const normalized = normReq(request);
     assertReq(normalized);
-    const { path, originalNormalized, result, resultHashes } = await execPipeline(
+    const { path, originalNormalized, originalHashes, result, resultHashes } = await execPipeline(
       normalized,
       cwd,
       constants.R_OK,
@@ -240,7 +240,7 @@ export async function compPreview(
       };
     }
 
-    return { diff: genDiff(originalNormalized, result, 4, resultHashes).diff };
+    return { diff: genDiff(originalNormalized, result, 4, resultHashes, originalHashes).diff };
   } catch (error: unknown) {
     return { error: error instanceof Error ? error.message : String(error) };
   }
@@ -391,6 +391,7 @@ export function buildToolDef(): ToolDef {
 
         const {
           originalNormalized,
+          originalHashes,
           result,
           bom,
           originalEnding,
@@ -449,13 +450,13 @@ export function buildToolDef(): ToolDef {
         const successInput = {
           path,
           originalNormalized,
+          originalHashes,
           result,
           resultHashes,
           warnings,
           snapshotId: updatedSnapshotId,
           editMeta,
         };
-
         return buildChanged(successInput);
       });
     },