@d3ara1n/pi-hashline-edit 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-hashline-edit",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "type": "module",
   "description": "Hashline-style file editing for pi — line-anchored edits verified by content hash, replacing oldText/newText matching",
   "keywords": [

package/src/pi/edit-tool.ts

@@ -1,8 +1,8 @@
 /**
  * Override edit: hashline ops via structured `edits` (LINE#HASH anchors).
  *
- * Each op in `edits` references line anchors copied from read output (or from a
- * prior edit's "Updated anchors"). The core verifies each anchor live against
+ * Each op in `edits` references line anchors copied from read / grep / replace output
+ * (or from a prior edit's "Updated anchors"). The core verifies each anchor live against
  * the current file content — no snapshot, no global stale check: a cited line
  * that changed (or was misremembered) fails its own anchor; unchanged lines
  * elsewhere never block the edit. Legacy oldText/newText is not accepted — the
@@ -32,25 +32,41 @@ import { getState } from "./state.ts";
 /** Cap on the number of updated anchors returned inline (bounds token cost for large inserts). */
 const MAX_ANCHOR_LINES = 40;
 
-const anchorSchema = Type.Object({
-	line: Type.Number({ description: "1-based line number" }),
-	hash: Type.String({ description: "Line content hash copied from read output (the #HASH after the line number)" }),
-});
+/** `{line, hash}` anchor pair as an op field, described per use. */
+function anchorRef(description: string) {
+	return Type.Optional(
+		Type.Object(
+			{
+				line: Type.Number({ description: "1-based line number" }),
+				hash: Type.String({ description: "Line content hash copied from read output (the #HASH after the line number)" }),
+			},
+			{ description },
+		),
+	);
+}
 
 const editOpSchema = Type.Object({
 	op: Type.Union(
 		[
-			Type.Literal("replace"),
-			Type.Literal("delete"),
-			Type.Literal("insert_after"),
-			Type.Literal("insert_before"),
-			Type.Literal("append"),
-			Type.Literal("prepend"),
+			Type.Literal("replace", { description: "Replace the cited line(s) with `body`." }),
+			Type.Literal("delete", { description: "Delete the cited line(s)." }),
+			Type.Literal("insert_after", {
+				description: "Insert `body` immediately after the anchor line — the anchor line is kept as-is; do NOT copy it into `body`.",
+			}),
+			Type.Literal("insert_before", {
+				description: "Insert `body` immediately before the anchor line — the anchor line is kept as-is; do NOT copy it into `body`.",
+			}),
+			Type.Literal("append", { description: "Append `body` at the end of the file." }),
+			Type.Literal("prepend", { description: "Prepend `body` at the start of the file." }),
 		],
 		{ description: "Operation kind" },
 	),
-	anchor: Type.Optional(anchorSchema),
-	end: Type.Optional(anchorSchema),
+	anchor: anchorRef(
+		"First line of the range (replace/delete) or the insertion point (insert_after/insert_before).",
+	),
+	end: anchorRef(
+		"Last line of the range to replace/delete, inclusive: the op touches exactly [anchor..end]. Omit only for a single-line change (end == anchor). A multi-line change that forgets `end` succeeds silently with the rest of the intended range left in the file — a corrupted file, not an error.",
+	),
 	body: Type.Optional(Type.Array(Type.String(), { description: "New content lines (required for replace/insert/append/prepend; omit for delete)" })),
 });
 
@@ -180,12 +196,13 @@ export function makeEditOverride(cwd: string) {
 		name: "edit" as const,
 		label: "edit",
 		description:
-			"Edit a file via hashline ops (LINE#HASH anchors, content-verified). Each op in `edits` references line anchors from your latest read or edit result.",
+		"Edit a file via hashline ops (LINE#HASH anchors, content-verified). Each op in `edits` references line anchors from your latest read, grep, replace, or edit result.",
 		promptSnippet: "Edit files via hashline ops (edits[] with LINE#HASH anchors from read)",
 		promptGuidelines: [
 			"Pass `edits`: an array of ops. Each op = {op, anchor?, end?, body?}.",
+		"Prefer one `edit` with multiple ops for several changes to the same file, rather than several separate `edit` calls.",
 			"op ∈ replace | delete | insert_after | insert_before | append | prepend.",
-			"anchor & end = {line, hash} copied from your latest read or edit result (the `#HASH` after each line number). replace/delete take anchor (+ optional end for a range); insert_after/insert_before take anchor; append/prepend take neither.",
+		"anchor & end = {line, hash} copied from your latest read, grep, replace, or edit result (the `#HASH` after each line number); grep's `-C` context lines are anchored and editable too. replace/delete take anchor (+ optional end for a range); insert_after/insert_before take anchor; append/prepend take neither.",
 			"body = string[] of new content lines (required for replace/insert/append/prepend; omit for delete).",
 			"A successful edit returns `Updated anchors` for the changed lines — use those (not stale line numbers) for the next edit to the same file; re-read only if you need lines outside that set.",
 		],

package/src/pi/replace-tool.ts

@@ -283,10 +283,16 @@ async function runReplace(
 		}
 	}
 
-	const { diff, firstChangedLine } = generateDiffString(currentText, newText);
+	// generateDiffString / generateUnifiedPatch split on \n, so raw CRLF content would
+	// leave a trailing \r on every diff line — the TUI line-wrapper (wrapTextWithAnsi)
+	// then emits a spurious blank line per diff line. Normalize to LF for diff/patch
+	// only; the disk write above already preserved the original line endings.
+	const oldLf = currentText.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+	const newLf = newText.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+	const { diff, firstChangedLine } = generateDiffString(oldLf, newLf);
 	const details: EditToolDetails = {
 		diff,
-		patch: generateUnifiedPatch(displayPath, currentText, newText),
+		patch: generateUnifiedPatch(displayPath, oldLf, newLf),
 		firstChangedLine,
 	};