pi-hashline-edit-pro 0.16.13 → 0.16.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "0.16.13",
+  "version": "0.16.15",
   "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/file-kind.ts

@@ -31,9 +31,6 @@ export type LFile =
   | { kind: "text"; text: string; hadUtf8DecodeErrors?: true }
   | { kind: "binary"; description: string };
 
-function hasNull(buffer: Uint8Array): boolean {
-  return buffer.includes(0);
-}
 
 export async function loadFileKindAndText(
   filePath: string,
@@ -82,12 +79,7 @@ export async function loadFileKindAndText(
         description: detectedMimeType,
       };
     }
-    if (hasNull(sample)) {
-      return {
-        kind: "binary",
-        description: "null bytes detected",
-      };
-    }
+
 
     const decoder = new TextDecoder("utf-8");
     const fatalDecoder = new TextDecoder("utf-8", { fatal: true });
@@ -121,17 +113,10 @@ export async function loadFileKindAndText(
       }
 
       const chunk = buffer.subarray(0, chunkBytesRead);
-      if (hasNull(chunk)) {
-        return {
-          kind: "binary",
-          description: "null bytes detected",
-        };
-      }
       noteUtf8Err(chunk);
       parts.push(decoder.decode(chunk, { stream: true }));
       position += chunkBytesRead;
     }
-
     noteUtf8Err();
     parts.push(decoder.decode());
 

package/src/hashline/apply.ts

@@ -1,4 +1,4 @@
-import { abortIf } from "../utils";
+import { abortIf, visLines, lastNonEmptyIndex, firstNonEmptyIndex } from "../utils";
 import { _lineHashesPure, HASH_SEP } from "./hash";
 import {
 	valEdits,
@@ -12,21 +12,6 @@ import {
 	type BDupWarn,
 	type AutoFix,
 } from "./resolve";
-import { visLines } from "../utils";
-
-function lastNonEmptyIndex(lines: string[]): number {
-	for (let i = lines.length - 1; i >= 0; i--) {
-		if (lines[i]!.length > 0) return i;
-	}
-	return -1;
-}
-
-function firstNonEmptyIndex(lines: string[]): number {
-	for (let i = 0; i < lines.length; i++) {
-		if (lines[i]!.length > 0) return i;
-	}
-	return -1;
-}
 
 type LIdx = {
 	fileLines: string[];
@@ -267,7 +252,7 @@ export function fmtBoundaryWarning(params: {
 
 export function applyEdits(
 	content: string,
-	edits: import("./resolve").HEdit[],
+	edits: HEdit[],
 	signal?: AbortSignal,
 	precomputedHashes?: string[],
 	filePath?: string,
@@ -312,7 +297,7 @@ export function applyEdits(
 	let autoFixes: AutoFix[] | undefined;
 	if (boundaryWarnings.length > 0) {
 		autoFixes = [];
-		const correctedEdits: import("./resolve").HEdit[] = edits.map(e => ({
+		const correctedEdits: HEdit[] = edits.map(e => ({
 			...e,
 			content_lines: [...e.content_lines],
 		}));

package/src/hashline/hash.ts

@@ -166,6 +166,7 @@ function mapStableHashes(
       }
     }
 
+    if (removedHashes?.has(candidates[bestIdx]!.hash)) continue;
     const match = candidates.splice(bestIdx, 1)[0]!;
     newHashes[i] = match.hash;
     used.add(match.hash);

package/src/hashline/resolve.ts

@@ -1,5 +1,4 @@
-import { abortIf } from "../utils";
-import { rejectUnknownFields } from "../utils";
+import { abortIf, rejectUnknownFields, lastNonEmpty, firstNonEmpty } from "../utils";
 import { HL_BARE_PREFIX_RE } from "./hash";
 import { parseHashRef, parseText, type Anchor } from "./parse";
 import { CONTENT_LINES_NOT_STRING_MSG } from "../constants";
@@ -240,19 +239,6 @@ export function descEdit(edit: RHEdit): string {
 	return `replace ${edit.hash_range_inclusive[0].hash}-${edit.hash_range_inclusive[1].hash}`;
 }
 
-function lastNonEmpty(lines: string[]): string | undefined {
-	for (let i = lines.length - 1; i >= 0; i--) {
-		if (lines[i]!.length > 0) return lines[i]!;
-	}
-	return undefined;
-}
-
-function firstNonEmpty(lines: string[]): string | undefined {
-	for (let i = 0; i < lines.length; i++) {
-		if (lines[i]!.length > 0) return lines[i]!;
-	}
-	return undefined;
-}
 
 function checkBoundaryDup(
 	adjacentLine: string | undefined,

package/src/prompts.ts

@@ -4,7 +4,7 @@ export function loadP(relativePath: string, replacements?: Record<string, string
   let content = readFileSync(new URL(relativePath, import.meta.url), "utf-8").trim();
   if (replacements) {
     for (const [key, value] of Object.entries(replacements)) {
-      content = content.replaceAll(`{{${key}}}`, value);
+      content = content.split(`{{${key}}}`).join(value);
     }
   }
   return content;
@@ -14,7 +14,7 @@ export function loadGuide(relativePath: string, replacements?: Record<string, st
   let content = readFileSync(new URL(relativePath, import.meta.url), "utf-8");
   if (replacements) {
     for (const [key, value] of Object.entries(replacements)) {
-      content = content.replaceAll(`{{${key}}}`, value);
+      content = content.split(`{{${key}}}`).join(value);
     }
   }
   return content

package/src/replace-response.ts

@@ -19,10 +19,12 @@ export type RMetrics = {
 };
 
 export type RMeta = {
-	editsAttempted: number;
-	noopEditsCount: number;
-	firstChangedLine?: number;
-	lastChangedLine?: number;
+  editsAttempted: number;
+  noopEditsCount: number;
+  firstChangedLine?: number;
+  lastChangedLine?: number;
+  addedLines: number;
+  removedLines: number;
 };
 
 type NEditEntry = {
@@ -131,8 +133,8 @@ export function buildChanged(input: SuccessInput): TResult {
 
   const resultLines = visLines(result);
   const diffResult = genDiff(originalNormalized, result, 2, resultHashes, originalHashes);
-  const addedLines = cntDiff(diffResult.diff, "+");
-  const removedLines = cntDiff(diffResult.diff, "-");
+  const addedLines = editMeta.addedLines;
+  const removedLines = editMeta.removedLines;
   const warningsBlock = warnBlock(warnings);
   const successPrefix = `Successfully replaced in ${path}.`;
   const lineSummary = addedLines > 0 || removedLines > 0

package/src/replace.ts

@@ -111,6 +111,8 @@ interface PipelineResult {
   lastChangedLine?: number;
   originalHashes: string[];
   resultHashes: string[];
+  totalAddedLines: number;
+  totalRemovedLines: number;
 }
 
 const ROOT_KS = new Set(["path", "changes", "content_lines", "hash_range_inclusive"]);
@@ -165,12 +167,10 @@ export async function execPipeline(
 
   const hashStore = store ?? await loadHashStore();
 
-  const { normalized: originalNormalized, bom, originalEnding, fileHashes: originalHashes, hadUtf8DecodeErrors } = await readNormFile(
+  const { normalized: originalNormalized, bom, originalEnding, fileHashes: originalHashes, hadUtf8DecodeErrors, absolutePath } = await readNormFile(
     path, cwd, signal, accessMode, undefined, MAX_HASH_LINES, hashStore,
   );
 
-  const absolutePath = toCwd(path, cwd);
-  const resolvedPath = await resolveTarget(absolutePath);
   const resolved = resEdits(toolEdits);
   const anchorResult = applyEdits(
     originalNormalized,
@@ -195,13 +195,28 @@ export async function execPipeline(
     }
   }
 
-  const resultHashes = await lineHashes(result, resolvedPath, {
+  const resultHashes = await lineHashes(result, absolutePath, {
     content: originalNormalized,
     hashes: originalHashes,
     removedHashes,
   }, hashStore);
 
   const warnings = [...(anchorResult.warnings ?? [])];
+
+  let totalAddedLines = 0;
+  let totalRemovedLines = 0;
+  const noopIndices = new Set(anchorResult.noopEdits?.map((n) => n.editIndex) ?? []);
+  for (let i = 0; i < resolved.length; i++) {
+    if (noopIndices.has(i)) continue;
+    const edit = resolved[i]!;
+    const startLine = originalHashes.indexOf(edit.hash_range_inclusive[0].hash);
+    const endLine = originalHashes.indexOf(edit.hash_range_inclusive[1].hash);
+    if (startLine >= 0 && endLine >= 0) {
+      totalRemovedLines += endLine - startLine + 1;
+    }
+    totalAddedLines += edit.content_lines.length;
+  }
+
   return {
     path,
     toolEdits,
@@ -216,6 +231,8 @@ export async function execPipeline(
     lastChangedLine: anchorResult.lastChangedLine,
     resultHashes,
     originalHashes,
+    totalAddedLines,
+    totalRemovedLines,
   };
 }
 
@@ -266,6 +283,32 @@ export function reuseMarkdown(context: any, content: string, theme: any): Markdo
   m.setText(content);
   return m;
 }
+const MODE_CFG = {
+  flat: {
+    desc: " Only one edit per call. The `hash_range_inclusive` and `content_lines` fields sit at the top level of the request object.",
+    examples: [
+      "", "Single line:", "{ \"content_lines\": [\"const x = 1;\"], \"hash_range_inclusive\": [\"MQX\", \"MQX\"], \"path\": \"src/main.ts\" }", "", "Range replace:", "{ \"content_lines\": [\"function greet() {\", \"  return 1;\", \"}\"], \"hash_range_inclusive\": [\"ZPM\", \"VRW\"], \"path\": \"src/main.ts\" }",
+    ].join("\n"),
+    rules: "",
+    requestStructure: [
+      "Flat mode:", "```json", "{ \"content_lines\": [...], \"hash_range_inclusive\": [\"aB3\", \"xY7\"], \"path\": \"...\" }", "```",
+    ].join("\n"),
+    prefix: "one edit per call (flat mode)",
+    guidePrefix: "- Use `replace` with HASH anchors for all file changes. Only one edit per call.",
+  },
+  bulk: {
+    desc: "\n\nPut all operations on one file in a single `replace` call. Stack every region into the `changes` array, even when they are far apart. Anchors within one call must all come from the same pre-edit read; the runtime applies them atomically against that one snapshot.",
+    examples: [
+      "", "Single line:", "{ \"changes\": [{ \"content_lines\": [\"const x = 1;\"], \"hash_range_inclusive\": [\"MQX\", \"MQX\"] }], \"path\": \"src/main.ts\" }", "", "Range replace:", "{ \"changes\": [{ \"content_lines\": [\"function greet() {\", \"  return 1;\", \"}\"], \"hash_range_inclusive\": [\"ZPM\", \"VRW\"] }], \"path\": \"src/main.ts\" }",
+    ].join("\n"),
+    rules: "- Multiple edits in one call must not overlap. Overlapping ranges are rejected with [E_EDIT_CONFLICT].",
+    requestStructure: [
+      "Bulk mode (default):", "```json", "{ \"changes\": [{ \"content_lines\": [...], \"hash_range_inclusive\": [\"aB3\", \"xY7\"] }], \"path\": \"...\" }", "```",
+    ].join("\n"),
+    prefix: "batching all changes to a file in one call",
+    guidePrefix: "- Use `replace` with HASH anchors for all file changes; batch every change to one file into a single `replace` call.",
+  },
+} as const;
 
 export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolDef {
   const autoRead = opts.autoRead ?? false;
@@ -273,50 +316,20 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
     ? "Anchors are provided automatically after write and replace operations when auto-read is enabled."
     : "Call `read` to get fresh anchors for follow-up edits.";
 
-  const modeDesc = opts.flat
-    ? " Only one edit per call. The `hash_range_inclusive` and `content_lines` fields sit at the top level of the request object."
-    : "\n\nPut all operations on one file in a single `replace` call. Stack every region into the `changes` array, even when they are far apart. Anchors within one call must all come from the same pre-edit read; the runtime applies them atomically against that one snapshot.";
-
-  const modeExamples = opts.flat
-    ? [
-        "", "Single line:", "{ \"content_lines\": [\"const x = 1;\"], \"hash_range_inclusive\": [\"MQX\", \"MQX\"], \"path\": \"src/main.ts\" }", "", "Range replace:", "{ \"content_lines\": [\"function greet() {\", \"  return 1;\", \"}\"], \"hash_range_inclusive\": [\"ZPM\", \"VRW\"], \"path\": \"src/main.ts\" }",
-      ].join("\n")
-    : [
-        "", "Single line:", "{ \"changes\": [{ \"content_lines\": [\"const x = 1;\"], \"hash_range_inclusive\": [\"MQX\", \"MQX\"] }], \"path\": \"src/main.ts\" }", "", "Range replace:", "{ \"changes\": [{ \"content_lines\": [\"function greet() {\", \"  return 1;\", \"}\"], \"hash_range_inclusive\": [\"ZPM\", \"VRW\"] }], \"path\": \"src/main.ts\" }",
-      ].join("\n")
-
-  const modeRules = opts.flat
-    ? ""
-    : "- Multiple edits in one call must not overlap. Overlapping ranges are rejected with [E_EDIT_CONFLICT]."
-
-  const modeRequestStructure = opts.flat
-    ? [
-        "Flat mode:", "```json", "{ \"content_lines\": [...], \"hash_range_inclusive\": [\"aB3\", \"xY7\"], \"path\": \"...\" }", "```",
-      ].join("\n")
-    : [
-        "Bulk mode (default):", "```json", "{ \"changes\": [{ \"content_lines\": [...], \"hash_range_inclusive\": [\"aB3\", \"xY7\"] }], \"path\": \"...\" }", "```",
-      ].join("\n")
-
-  const modePrefix = opts.flat
-    ? "one edit per call (flat mode)"
-    : "batching all changes to a file in one call"
-
-  const modeGuidePrefix = opts.flat
-    ? "- Use `replace` with HASH anchors for all file changes. Only one edit per call."
-    : "- Use `replace` with HASH anchors for all file changes; batch every change to one file into a single `replace` call."
+  const cfg = MODE_CFG[opts.flat ? "flat" : "bulk"];
 
   const E_DESC = loadP("../prompts/replace.md", {
-    MODE_DESCRIPTION: modeDesc,
-    MODE_EXAMPLES: modeExamples,
-    MODE_RULES: modeRules,
-    MODE_REQUEST_STRUCTURE: modeRequestStructure,
+    MODE_DESCRIPTION: cfg.desc,
+    MODE_EXAMPLES: cfg.examples,
+    MODE_RULES: cfg.rules,
+    MODE_REQUEST_STRUCTURE: cfg.requestStructure,
     AUTO_READ_GUIDANCE: readGuidance,
   });
   const E_SNIPPET = loadP("../prompts/replace-snippet.md", {
-    MODE_PREFIX: modePrefix,
+    MODE_PREFIX: cfg.prefix,
   });
   const E_GUIDE = loadGuide("../prompts/replace-guidelines.md", {
-    MODE_PREFIX: modeGuidePrefix,
+    MODE_PREFIX: cfg.guidePrefix,
     AUTO_READ_GUIDANCE: readGuidance,
   });
 
@@ -449,6 +462,8 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
           firstChangedLine,
           lastChangedLine,
           resultHashes,
+          totalAddedLines,
+          totalRemovedLines,
         } = await execPipeline(
           normalizedParams,
           ctx.cwd,
@@ -471,6 +486,8 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
             editMeta: {
               editsAttempted,
               noopEditsCount: noopEdits?.length ?? 0,
+              addedLines: 0,
+              removedLines: 0,
             },
             warnings,
           });
@@ -501,6 +518,8 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
           noopEditsCount: noopEdits?.length ?? 0,
           firstChangedLine,
           lastChangedLine,
+          addedLines: totalAddedLines,
+          removedLines: totalRemovedLines,
         };
 
         const successInput = {

package/src/utils.ts

@@ -52,3 +52,27 @@ export function errCode(error: unknown): string | undefined {
 	}
 	return undefined;
 }
+
+export function lastNonEmptyIndex(lines: string[]): number {
+	for (let i = lines.length - 1; i >= 0; i--) {
+		if (lines[i]!.length > 0) return i;
+	}
+	return -1;
+}
+
+export function firstNonEmptyIndex(lines: string[]): number {
+	for (let i = 0; i < lines.length; i++) {
+		if (lines[i]!.length > 0) return i;
+	}
+	return -1;
+}
+
+export function lastNonEmpty(lines: string[]): string | undefined {
+	const idx = lastNonEmptyIndex(lines);
+	return idx >= 0 ? lines[idx] : undefined;
+}
+
+export function firstNonEmpty(lines: string[]): string | undefined {
+	const idx = firstNonEmptyIndex(lines);
+	return idx >= 0 ? lines[idx] : undefined;
+}