pi-hashline-edit-pro 3.0.1 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "type": "module",
   "description": "Hash-anchored read/replace/insert/grep tools for pi-coding-agent. Every line gets a unique 4-char tokenizer-friendly anchor that stays stable across edits; stale or ambiguous anchors are rejected, never fuzzy-matched. Undo persists across restarts.",
   "main": "index.ts",

package/prompts/replace-guidelines.md

@@ -1,4 +1,5 @@
 - `replace`: use the same anchor for `remove_from` and `remove_to` to change one line.
 - `replace`: `replacement_lines` takes bare lines without `│`; `[""]` is one blank line; pasted `anchor│` prefixes are stripped automatically.
 - `replace`: keep the range tight — only lines that actually change — and copy leading spaces exactly.
-- `replace`: post-edit diff `+anchor│`/` anchor│` rows are fresh anchors for the next edit — no new `read` needed. One edit per turn; check the diff before the next edit on that file.
+- `replace`: post-edit diff `+anchor│`/` anchor│` rows are fresh anchors for the next edit — no new `read` needed. One edit per turn; check the diff before the next edit on that file.
+- `replace`: if `replacement_lines` re-include the boundary line adjacent to the range, it is deduplicated automatically, shown as `dedup│content` rows in the diff (not editable, never use `dedup` as an anchor).

package/src/commit.ts

@@ -1,5 +1,7 @@
 import type { PipelineResult } from "./replace";
-import { abortIf, clipLine } from "./utils";
+import { abortIf } from "./utils";
+import { DEDUP_ANCHOR } from "./constants";
+import { HASH_SEP } from "./hashline";
 import { buildChanged, buildNoop, type RMeta, type TResult } from "./replace-response";
 import { saveUndo } from "./replace-undo";
 import { safeSnapId } from "./file-reader";
@@ -22,10 +24,10 @@ 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.`;
+function boundaryDedupWarning(count: number): string {
+  const noun = count === 1 ? "1 line" : `${count} lines`;
+  const row = count === 1 ? "row" : "rows";
+  return `Boundary dedup: ${noun} not added again (see ${DEDUP_ANCHOR}${HASH_SEP} ${row}).`;
 }
 
 export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promise<TResult> {
@@ -61,7 +63,7 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     );
   }
   if (pipe.boundaryRemovedLineTexts.length > 0) {
-    warnings.push(boundaryDedupWarning(pipe.boundaryRemovedLineTexts));
+    warnings.push(boundaryDedupWarning(pipe.boundaryRemovedLineTexts.length));
   }
 
   abortIf(signal);
@@ -109,6 +111,8 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     warnings,
     snapshotId: updatedSnapshotId,
     editMeta,
+    boundaryDedupAbove: pipe.boundaryDedupAbove,
+    boundaryDedupBelow: pipe.boundaryDedupBelow,
   };
   const changed = buildChanged(successInput, meta.verb);
   if (changed.details.diff) {

package/src/constants.ts

@@ -12,3 +12,5 @@ export const HASH_STORE_BUSY_TIMEOUT = 1000;
 export const HASH_STORE_VERSION = 7;
 export const NEW_CONTENT_NOT_ARRAY_MSG =
   `[E_BAD_SHAPE] "replacement_lines" must be an array of strings, one per line (use [] to delete).`;
+
+export const DEDUP_ANCHOR = "dedup";

package/src/replace-response.ts

@@ -1,7 +1,10 @@
+import { formatSize, DEFAULT_MAX_BYTES } from "@earendil-works/pi-coding-agent";
 import type { NEdit } from "./hashline";
+import { HASH_SEP } from "./hashline";
 import type { ReplaceDetails } from "./replace";
 import { genDiff, genPatch } from "./replace-diff";
 import { visLines, clipLine } from "./utils";
+import { DEDUP_ANCHOR } from "./constants";
 
 export type TResult = {
 	content: Array<{ type: "text"; text: string }>;
@@ -46,6 +49,8 @@ export interface SuccessInput {
   warnings: string[] | undefined;
   snapshotId?: string;
   editMeta: RMeta;
+  boundaryDedupAbove?: string[];
+  boundaryDedupBelow?: string[];
 }
 
 
@@ -124,11 +129,47 @@ export function buildNoop(input: NoopInput, noopNoun = "Replacement"): TResult {
 		},
 	};
 }
+export function fmtDedupRow(line: string): string {
+  const row = `${DEDUP_ANCHOR}${HASH_SEP}${line}`;
+  if (Buffer.byteLength(row, "utf-8") <= DEFAULT_MAX_BYTES) return row;
+  const size = formatSize(Buffer.byteLength(row, "utf-8"));
+  const limit = formatSize(DEFAULT_MAX_BYTES);
+  return `${DEDUP_ANCHOR}${HASH_SEP}[Row is ${size}, exceeds ${limit}; content not shown. Use read to see the full line.]`;
+}
+
+export function isChangeRow(line: string): boolean {
+  return line.startsWith("+") || line.startsWith("-");
+}
+
+export function withDedupRows(diff: string, lineNumbers: (number | undefined)[], above: string[] | undefined, below: string[] | undefined): { diff: string; lineNumbers: (number | undefined)[] } {
+  const top = (above ?? []).map(fmtDedupRow);
+  const bottom = (below ?? []).map(fmtDedupRow);
+  if (top.length === 0 && bottom.length === 0) return { diff, lineNumbers };
+  if (diff.length === 0) return { diff: [...top, ...bottom].join("\n"), lineNumbers: [...lineNumbers, ...[...top, ...bottom].map(() => undefined)] };
+  const lines = diff.split("\n");
+  let first = -1;
+  let last = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (isChangeRow(lines[i]!)) {
+      if (first < 0) first = i;
+      last = i;
+    }
+  }
+  if (first < 0) return { diff: `${diff}\n${[...top, ...bottom].join("\n")}`, lineNumbers: [...lineNumbers, ...[...top, ...bottom].map(() => undefined)] };
+  const out = [...lines];
+  const nums = [...lineNumbers];
+  out.splice(last + 1, 0, ...bottom);
+  nums.splice(last + 1, 0, ...bottom.map(() => undefined));
+  out.splice(first, 0, ...top);
+  nums.splice(first, 0, ...top.map(() => undefined));
+  return { diff: out.join("\n"), lineNumbers: nums };
+}
 
 export function buildChanged(input: SuccessInput, verb = "replaced"): TResult {
-  const { path, result, warnings, snapshotId, originalNormalized, originalHashes, editMeta, resultHashes } = input;
+  const { path, result, warnings, snapshotId, originalNormalized, originalHashes, editMeta, resultHashes, boundaryDedupAbove, boundaryDedupBelow } = input;
   const resultLines = visLines(result);
-  const diffResult = genDiff(originalNormalized, result, 1, resultHashes, originalHashes);
+  const baseDiff = genDiff(originalNormalized, result, 1, resultHashes, originalHashes);
+  const diffResult = withDedupRows(baseDiff.diff, baseDiff.lineNumbers, boundaryDedupAbove, boundaryDedupBelow);
   const addedLines = editMeta.addedLines;
   const removedLines = editMeta.removedLines;
   const warningsBlock = warnBlock(warnings);
@@ -161,7 +202,7 @@ export function buildChanged(input: SuccessInput, verb = "replaced"): TResult {
       patch: patchResult.patch,
       ...(patchResult.truncated ? { patchTruncated: true as const } : {}),
       firstChangedLine:
-        editMeta.firstChangedLine ?? diffResult.firstChangedLine,
+        editMeta.firstChangedLine ?? baseDiff.firstChangedLine,
       snapshotId,
       metrics,
       diffLineNumbers: diffResult.lineNumbers,

package/src/replace.ts

@@ -23,7 +23,7 @@ import { applyEdit,
   type NEdit,
 } from "./hashline";
 import { commitEdit } from "./commit";
-import type { RMetrics } from "./replace-response";
+import { withDedupRows, type RMetrics } from "./replace-response";
 import {
   type RPreview,
   type RRState,
@@ -64,6 +64,8 @@ export interface PipelineResult {
   hadBoundaryDedup: boolean;
   boundaryRemovedLines: number;
   boundaryRemovedLineTexts: string[];
+  boundaryDedupAbove: string[];
+  boundaryDedupBelow: string[];
   identity: FileIdentity;
 }
 
@@ -216,6 +218,9 @@ export async function execPipeline(
     edit, originalHashes, isNoop, anchorResult.autoFixes?.length ?? 0,
   );
 
+  const sortedFixes = [...(anchorResult.autoFixes ?? [])].sort((a, b) => a.removedLineIndex - b.removedLineIndex);
+  const aboveFixes = sortedFixes.filter((fix) => fix.kind === "leading" || fix.kind === "last-new-before");
+  const belowFixes = sortedFixes.filter((fix) => fix.kind === "trailing" || fix.kind === "first-new-after");
   return {
     path,
     originalNormalized,
@@ -233,7 +238,9 @@ export async function execPipeline(
     totalRemovedLines,
     hadBoundaryDedup: (anchorResult.autoFixes?.length ?? 0) > 0,
     boundaryRemovedLines: anchorResult.autoFixes?.length ?? 0,
-    boundaryRemovedLineTexts: anchorResult.autoFixes?.map((fix) => fix.removedLine) ?? [],
+    boundaryRemovedLineTexts: sortedFixes.map((fix) => fix.removedLine),
+    boundaryDedupAbove: aboveFixes.map((fix) => fix.removedLine),
+    boundaryDedupBelow: belowFixes.map((fix) => fix.removedLine),
     identity,
   };
 }
@@ -244,7 +251,8 @@ export function previewFromPipe(pipe: PipelineResult): RPreview {
       error: `No changes made to ${pipe.path}. The edit produced identical content.`,
     };
   }
-  return { diff: genDiff(pipe.originalNormalized, pipe.result, 4, pipe.resultHashes, pipe.originalHashes).diff };
+  const base = genDiff(pipe.originalNormalized, pipe.result, 4, pipe.resultHashes, pipe.originalHashes);
+  return { diff: withDedupRows(base.diff, base.lineNumbers, pipe.boundaryDedupAbove, pipe.boundaryDedupBelow).diff };
 }
 export function previewError(error: unknown): RPreview {
   return { error: error instanceof Error ? error.message : String(error) };