pi-hashline-edit-pro 0.16.12 → 0.16.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "0.16.12",
+  "version": "0.16.14",
   "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/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,7 +12,6 @@ import {
 	type BDupWarn,
 	type AutoFix,
 } from "./resolve";
-import { visLines } from "../utils";
 
 type LIdx = {
 	fileLines: string[];
@@ -306,13 +305,15 @@ export function applyEdits(
 			const edit = correctedEdits[bw.editIndex];
 			if (!edit) continue;
 			if (bw.kind === "trailing") {
-				const removed = edit.content_lines.pop();
-				if (removed !== undefined) {
+				const idx = lastNonEmptyIndex(edit.content_lines);
+				if (idx >= 0) {
+					const removed = edit.content_lines.splice(idx, 1)[0];
 					autoFixes.push({ kind: "trailing", editIndex: bw.editIndex, removedLine: removed });
 				}
 			} else {
-				const removed = edit.content_lines.shift();
-				if (removed !== undefined) {
+				const idx = firstNonEmptyIndex(edit.content_lines);
+				if (idx >= 0) {
+					const removed = edit.content_lines.splice(idx, 1)[0];
 					autoFixes.push({ kind: "leading", editIndex: bw.editIndex, removedLine: removed });
 				}
 			}

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";
@@ -94,7 +93,7 @@ export function fmtMismatch(
   const refList = notFound.map((m) => `"${m.ref.hash}"`).join(", ");
   if (notFound.length > 0) {
     out.push(
-      `[E_STALE_ANCHOR] ${notFound.length} stale anchor${notFound.length > 1 ? "s" : ""}${filePath ? ` in ${filePath}` : ""}: ${refList}. Call read() to get fresh anchors, then copy the 3-char HASH of the start and end of the range you are replacing into hash_range_inclusive of your next replace call.`
+      `[E_STALE_ANCHOR] ${notFound.length} stale anchor${notFound.length > 1 ? "s" : ""}${filePath ? ` in ${filePath}` : ""}: ${refList}. The file content has changed since those anchors were read. Call read() to get fresh anchors, then copy the 3-char HASH of the start and end of the range you are replacing into hash_range_inclusive of your next replace call.`
     );
   }
   if (ambiguous.length > 0) {
@@ -153,9 +152,19 @@ function assertItem(edit: Record<string, unknown>, index: number): void {
   if ("content_lines" in edit && !isStrArr(edit.content_lines)) {
     const val = edit.content_lines;
     if (typeof val === "string") {
-      throw new Error(CONTENT_LINES_NOT_STRING_MSG);
+      try {
+        const parsed = JSON.parse(val);
+        if (Array.isArray(parsed)) {
+          edit.content_lines = parsed;
+        } else {
+          throw new Error(CONTENT_LINES_NOT_STRING_MSG);
+        }
+      } catch {
+        throw new Error(CONTENT_LINES_NOT_STRING_MSG);
+      }
+    } else {
+      throw new Error(`[E_BAD_SHAPE] Edit ${index} field "content_lines" must be a string array.`);
     }
-    throw new Error(`[E_BAD_SHAPE] Edit ${index} field "content_lines" must be a string array.`);
   }
   if (!isStrPair(edit.hash_range_inclusive)) {
     throw new Error(
@@ -230,6 +239,7 @@ export function descEdit(edit: RHEdit): string {
 	return `replace ${edit.hash_range_inclusive[0].hash}-${edit.hash_range_inclusive[1].hash}`;
 }
 
+
 function checkBoundaryDup(
 	adjacentLine: string | undefined,
 	replacementEdge: string | undefined,
@@ -296,11 +306,11 @@ export function valEdits(
 		}
 		const endLine = endResolved.line;
 		const nextLine = fileLines[endLine];
-		const replacementLastLine = edit.content_lines.at(-1);
+		const replacementLastLine = lastNonEmpty(edit.content_lines);
 		const trailing = checkBoundaryDup(nextLine, replacementLastLine, "trailing", endLine, resolved.length);
 		if (trailing) boundaryWarnings.push(trailing);
 		const prevLine = fileLines[startResolved.line - 2];
-		const replacementFirstLine = edit.content_lines[0];
+		const replacementFirstLine = firstNonEmpty(edit.content_lines);
 		const leading = checkBoundaryDup(prevLine, replacementFirstLine, "leading", startResolved.line - 2, resolved.length);
 		if (leading) boundaryWarnings.push(leading);
 		resolved.push({

package/src/replace-normalize.ts

@@ -1,12 +1,19 @@
 import { isRec, has } from "./utils";
 import { CONTENT_LINES_NOT_STRING_MSG } from "./constants";
-function assertContentLinesNotString(
-	value: unknown,
-	label: string,
-): void {
-	if (typeof value === "string") {
-		throw new Error(CONTENT_LINES_NOT_STRING_MSG);
-	}
+
+function tryParseContentLines(record: Record<string, unknown>, key: string, label: string): void {
+  const val = record[key];
+  if (typeof val !== "string") return;
+  try {
+    const parsed = JSON.parse(val);
+    if (Array.isArray(parsed)) {
+      record[key] = parsed;
+      return;
+    }
+  } catch {
+    // fall through to error
+  }
+  throw new Error(CONTENT_LINES_NOT_STRING_MSG);
 }
 
 export function normalizeFilePath(record: Record<string, unknown>): void {
@@ -27,6 +34,17 @@ function normalizeField(
     record[to] = raw;
   } else if (isRec(raw)) {
     record[to] = [raw];
+  } else if (typeof raw === "string") {
+    try {
+      const parsed = JSON.parse(raw);
+      if (Array.isArray(parsed)) {
+        record[to] = parsed;
+      } else if (isRec(parsed)) {
+        record[to] = [parsed];
+      }
+    } catch {
+      // not valid JSON, leave as-is for downstream validation
+    }
   }
   if (from !== to) delete record[from];
 }
@@ -41,7 +59,7 @@ export function normReq(input: unknown): unknown {
   normalizeFilePath(record);
 
   if (has(record, "content_lines") && typeof record.content_lines === "string") {
-    assertContentLinesNotString(record.content_lines, "Top-level");
+    tryParseContentLines(record, "content_lines", "Top-level");
   }
 
   normalizeField(record, "changes", "changes");
@@ -51,7 +69,7 @@ export function normReq(input: unknown): unknown {
     for (let i = 0; i < record.changes.length; i++) {
       const item = record.changes[i];
       if (isRec(item) && has(item, "content_lines") && typeof item.content_lines === "string") {
-        assertContentLinesNotString(item.content_lines, `changes[${i}]`);
+        tryParseContentLines(item, "content_lines", `changes[${i}]`);
       }
     }
   }

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,12 +111,15 @@ interface PipelineResult {
   lastChangedLine?: number;
   originalHashes: string[];
   resultHashes: string[];
+  totalAddedLines: number;
+  totalRemovedLines: number;
 }
 
-const ROOT_KS = new Set(["path", "changes"]);
+const ROOT_KS = new Set(["path", "changes", "content_lines", "hash_range_inclusive"]);
 
 export function assertReq(
   request: unknown,
+  flat?: boolean
 ): asserts request is ReqParams {
   if (!isRec(request)) {
     throw new Error("[E_BAD_SHAPE] Edit request must be an object.");
@@ -137,10 +140,14 @@ export function assertReq(
   }
 
   if (!Array.isArray(request.changes)) {
+    if (flat) {
+      throw new Error(
+        '[E_BAD_SHAPE] Edit request requires both "content_lines" and "hash_range_inclusive" at the top level.',
+      );
+    }
     throw new Error('[E_BAD_SHAPE] Edit request requires a "changes" array. Each change is { content_lines: [...], hash_range_inclusive: ["<START>", "<END>"] }.');
   }
 }
-
 export async function execPipeline(
   params: ReqParams,
   cwd: string,
@@ -197,6 +204,21 @@ export async function execPipeline(
   }, 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,
@@ -211,16 +233,19 @@ export async function execPipeline(
     lastChangedLine: anchorResult.lastChangedLine,
     resultHashes,
     originalHashes,
+    totalAddedLines,
+    totalRemovedLines,
   };
 }
 
 export async function compPreview(
   request: unknown,
   cwd: string,
+  flat?: boolean
 ): Promise<RPreview> {
   try {
     const normalized = normReq(request);
-    assertReq(normalized);
+    assertReq(normalized, flat);
     const { path, originalNormalized, originalHashes, result, resultHashes } = await execPipeline(
       normalized,
       cwd,
@@ -260,6 +285,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;
@@ -267,50 +318,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,
   });
 
@@ -352,7 +373,7 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
           context.state.preview = undefined;
           const previewGeneration = (context.state.previewGeneration ?? 0) + 1;
           context.state.previewGeneration = previewGeneration;
-          compPreview(previewInput, context.cwd)
+          compPreview(previewInput, context.cwd, opts.flat)
             .then((preview) => {
               if (
                 context.state.argsKey === argsKey &&
@@ -443,6 +464,8 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
           firstChangedLine,
           lastChangedLine,
           resultHashes,
+          totalAddedLines,
+          totalRemovedLines,
         } = await execPipeline(
           normalizedParams,
           ctx.cwd,
@@ -465,6 +488,8 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
             editMeta: {
               editsAttempted,
               noopEditsCount: noopEdits?.length ?? 0,
+              addedLines: 0,
+              removedLines: 0,
             },
             warnings,
           });
@@ -495,6 +520,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;
+}