pi-hashline-edit-pro 2.8.3 → 2.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "type": "module",
   "description": "Hash-anchored read/replace/insert/grep tools for pi-coding-agent. Every line gets a unique 3-char hash (A-Za-z0-9) that stays stable across edits; stale or ambiguous anchors are rejected, never fuzzy-matched. Undo persists across restarts.",
   "main": "index.ts",

package/prompts/undo-last-change-guidelines.md

@@ -1,2 +1,2 @@
 - `undo_last_change`: only the last `replace`/`insert` per file can be undone; a successful `write` clears it, so call immediately after a bad diff (look for `-anchor│` lines you wanted to keep).
-- `undo_last_change`: if the file changed after the edit you get `[E_UNDO_STALE]` — the record is kept, so undo again after the file matches the edited state; if the file was deleted it is restored.
+- `undo_last_change`: if the file changed after the edit you get `[E_UNDO_STALE]` — nothing is reverted and the record is kept; do not modify the file to force an undo, verify with `read` and stop; if the file was deleted it is restored.

package/prompts/undo-last-change.md

@@ -1 +1 @@
-Undo the last `replace` or `insert` on a file, restoring previous content, BOM and line endings. Use after a bad edit when the diff showed wrong lines removed. If the file was deleted, it is restored; if changed elsewhere, you get `[E_UNDO_STALE]` and the record is kept so you can retry after restoring the edited state. If output says truncated, use `read` to see full file.
+Undo the last `replace` or `insert` on a file, restoring previous content, BOM and line endings. Use after a bad edit when the diff showed wrong lines removed. If the file was deleted, it is restored; if changed elsewhere, you get `[E_UNDO_STALE]`, nothing is reverted, and the record is kept — do not modify the file to make an undo possible; call `read` to verify the current state and stop. If output says truncated, use `read` to see full file.

package/src/commit.ts

@@ -1,5 +1,5 @@
 import type { PipelineResult } from "./replace";
-import { abortIf } from "./utils";
+import { abortIf, clipLine } from "./utils";
 import { buildChanged, buildNoop, type RMeta, type TResult } from "./replace-response";
 import { saveUndo } from "./replace-undo";
 import { safeSnapId } from "./file-reader";
@@ -22,6 +22,12 @@ export interface CommitMeta {
   onNoopDedup?: () => void;
 }
 
+function boundaryDedupWarning(lineTexts: string[]): string {
+  const quoted = lineTexts.map((line) => `"${clipLine(line, 80)}"`).join(", ");
+  const plural = lineTexts.length > 1;
+  return `Boundary dedup: ${quoted} already ${plural ? "exist" : "exists"} next to the edited range, so ${plural ? "they were" : "it was"} not added again. Use insert only if you truly want ${plural ? "duplicates" : "a duplicate"}.`;
+}
+
 export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promise<TResult> {
   const { path, absolutePath, mutationTargetPath, signal } = meta;
   const warnings = [...(meta.prefixWarnings ?? []), ...pipe.warnings];
@@ -54,6 +60,9 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
       "Non-UTF-8 bytes were shown as U+FFFD; this edit rewrote the file as UTF-8.",
     );
   }
+  if (pipe.boundaryRemovedLineTexts.length > 0) {
+    warnings.push(boundaryDedupWarning(pipe.boundaryRemovedLineTexts));
+  }
 
   abortIf(signal);
   const undo = await saveUndo(mutationTargetPath, {

package/src/hashline/parse.ts

@@ -53,6 +53,23 @@ function parseRef(ref: string): Anchor {
 
 export const parseHashRef = parseRef;
 
+const JSON_ENVELOPE_RE = /^\s*\["(.*)"\]\.\s*$/;
+
+function unwrapJsonEnvelope(line: string, warnings?: string[]): string {
+  const match = line.match(JSON_ENVELOPE_RE);
+  if (!match) return line;
+  const withoutDot = line.trim().slice(0, -1);
+  try {
+    JSON.parse(withoutDot);
+    return line;
+  } catch {
+    warnings?.push(
+      '[E_BAD_SHAPE] Unwrapped JSON array syntax from a replacement_lines element.',
+    );
+    return match[1]!;
+  }
+}
+
 export function parseText(edit: string[], warnings?: string[]): string[] {
   if (!Array.isArray(edit) || edit.some((line) => typeof line !== "string")) {
     throw new Error(NEW_CONTENT_NOT_ARRAY_MSG);
@@ -60,13 +77,14 @@ export function parseText(edit: string[], warnings?: string[]): string[] {
   const out: string[] = [];
   let split = false;
   for (const line of edit) {
-    const normalized = line.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-    if (normalized !== line) split = true;
+    const unwrapped = unwrapJsonEnvelope(line, warnings);
+    const normalized = unwrapped.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+    if (normalized !== unwrapped) split = true;
     out.push(...normalized.split("\n"));
   }
   if (split) {
     warnings?.push(
-      "[E_BAD_SHAPE] Autocorrected: split embedded newlines in replacement_lines into separate lines.",
+      "[E_BAD_SHAPE] replacement_lines contained embedded newlines; split into one line each.",
     );
   }
   return out;

package/src/hashline/resolve.ts

@@ -195,7 +195,7 @@ export function stripAnchorRow(
 			: match[1] === "-"
 				? 'leading "-" marker'
 				: '"anchor│" prefix';
-	warnings?.push(`[E_BAD_REF] Stripped ${marker} from ${entryLabel} "${trimmed}".`);
+	warnings?.push(`[E_BAD_REF] Stripped ${marker} from ${entryLabel} "${clipLine(trimmed, 48)}".`);
 	return match[2]!;
 }
 
@@ -240,13 +240,8 @@ export function stripBarePrefixes(
 	const locations = stripped
 		.map((s) => `replacement_lines line ${s.lineIndex + 1}`)
 		.join(", ");
-	const matchedCount = stripped.filter((s) => s.matched).length;
-	const guidance =
-		matchedCount === 0
-			? " Verify it was pasted from read output."
-			: "";
 	warnings.push(
-		`[E_BARE_HASH_PREFIX] Stripped "anchor│" prefix from ${locations}.${guidance}`
+		`[E_BARE_HASH_PREFIX] Stripped "anchor│" prefix from ${locations}.`
 	);
 	return { ...edit, content_lines: contentLines };
 }
@@ -290,7 +285,7 @@ export function swapReversedRanges(
 		return edit;
 	}
 	warnings.push(
-		`[E_BAD_OP] Autocorrected: remove_from/remove_to were reversed; swapped them.`
+		`[E_BAD_OP] Swapped reversed remove_from/remove_to.`
 	);
 	return { ...edit, hash_bounds: [endRef, startRef] as [Anchor, Anchor] };
 }

package/src/replace-response.ts

@@ -100,7 +100,7 @@ export function buildNoop(input: NoopInput, noopNoun = "Replacement"): TResult {
 		: "The edit produced identical content.";
 	const dedupNote =
 		boundaryRemovedLines !== undefined && boundaryRemovedLines > 0
-			? `\nBoundary dedup removed ${boundaryRemovedLines} line(s) from the replacement. Send the same edit again to apply it literally.`
+			? `\nBoundary dedup removed ${boundaryRemovedLines} line(s); resend the same edit to apply it literally.`
 			: "";
 
 	const text = `No changes made to ${path}\nClassification: noop\n${noopDetailsText}${dedupNote}${warnBlock(warnings)}`;

package/src/replace-undo.ts

@@ -146,7 +146,7 @@ export function regUndo(pi: ExtensionAPI): void {
             content: [
               {
                 type: "text",
-                text: `[E_UNDO_STALE] Cannot undo last change on ${path}: the file changed after the edit. The undo record is kept; once the file matches the edited state again, undo_last_change will succeed. Call read() to inspect the current state.`
+                text: `[E_UNDO_STALE] Cannot undo last change on ${path}: the file was modified after the edit, so nothing was reverted. The current content already contains your applied edit plus that external change and is most likely the correct state. Do not modify the file to make an undo possible and do not revert your own edit. The undo record is kept. Call read() to verify the current state, then stop.`
               },
             ],
             isError: true,

package/src/replace.ts

@@ -63,6 +63,7 @@ export interface PipelineResult {
   totalRemovedLines: number;
   hadBoundaryDedup: boolean;
   boundaryRemovedLines: number;
+  boundaryRemovedLineTexts: string[];
   identity: FileIdentity;
 }
 
@@ -91,7 +92,7 @@ async function resolveMissingPath(
   if (matches.length === 1) {
     return {
       path: matches[0]!,
-      warning: `[E_BAD_SHAPE] Autocorrected: missing "path" resolved to ${matches[0]}.`,
+      warning: `[E_BAD_SHAPE] Missing "path" resolved to ${matches[0]}.`,
     };
   }
   if (matches.length > 1) {
@@ -226,6 +227,7 @@ export async function execPipeline(
     totalRemovedLines,
     hadBoundaryDedup: (anchorResult.autoFixes?.length ?? 0) > 0,
     boundaryRemovedLines: anchorResult.autoFixes?.length ?? 0,
+    boundaryRemovedLineTexts: anchorResult.autoFixes?.map((fix) => fix.removedLine) ?? [],
     identity,
   };
 }