pi-hashline-edit-pro 4.3.9 → 4.4.0

package/src/replace-response.ts

@@ -1,10 +1,7 @@
-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, fmtDedupRow, type DiffSpan } from "./replace-diff";
+import { genDiff, genPatch, type DiffSpan } from "./replace-diff";
 import { visLines, clipLine } from "./utils";
-import { DEDUP_ANCHOR } from "./constants";
 
 export type TResult = {
 	content: Array<{ type: "text"; text: string }>;
@@ -37,7 +34,6 @@ export interface NoopInput {
 	snapshotId?: string;
 	editMeta: RMeta;
 	warnings: string[] | undefined;
-	boundaryRemovedLines?: number;
 }
 
 export interface SuccessInput {
@@ -49,8 +45,6 @@ export interface SuccessInput {
   warnings: string[] | undefined;
   snapshotId?: string;
   editMeta: RMeta;
-  boundaryDedupAbove?: string[];
-  boundaryDedupBelow?: string[];
   spans?: DiffSpan[];
 }
 
@@ -98,18 +92,12 @@ export function buildNoop(input: NoopInput, noopNoun = "Replacement"): TResult {
 		snapshotId,
 		editMeta,
 		warnings,
-		boundaryRemovedLines,
 	} = input;
 
 	const noopDetailsText = noopEdit
 		? `${noopNoun} for ${noopEdit.loc} is identical to current content:\n  ${noopEdit.loc}: ${clipLine(noopEdit.currentContent)}`
 		: "The edit produced identical content.";
-	const dedupNote =
-		boundaryRemovedLines !== undefined && boundaryRemovedLines > 0
-			? `\nBoundary dedup removed ${boundaryRemovedLines} line(s) that duplicated adjacent lines.`
-			: "";
-
-	const text = `No changes made to ${path}\nClassification: noop\n${noopDetailsText}${dedupNote}${warnBlock(warnings)}`;
+	const text = `No changes made to ${path}\nClassification: noop\n${noopDetailsText}${warnBlock(warnings)}`;
 
 	const metrics = buildMetrics({
 		classification: "noop",
@@ -131,80 +119,11 @@ export function buildNoop(input: NoopInput, noopNoun = "Replacement"): TResult {
 		},
 	};
 }
-export { fmtDedupRow };
-
-export function isDedupRow(line: string): boolean {
-  return line.startsWith(`${DEDUP_ANCHOR}${HASH_SEP}`);
-}
-
-export function isChangeRow(line: string): boolean {
-  return line.startsWith("+") || line.startsWith("-");
-}
-
-function capDedupRows(rows: string[], budget: number): { rows: string[]; bytes: number; omitted: number } {
-  const kept: string[] = [];
-  let bytes = 0;
-  for (const row of rows) {
-    const rowBytes = Buffer.byteLength(row, "utf-8") + 1;
-    if (bytes + rowBytes > budget) break;
-    kept.push(row);
-    bytes += rowBytes;
-  }
-  return { rows: kept, bytes, omitted: rows.length - kept.length };
-}
-
-function dedupOmissionNote(omitted: number, maxBytes: number): string {
-  return fmtDedupRow(`[${omitted} line(s) not shown again; output capped at ${formatSize(maxBytes)}.]`);
-}
-
-export function withDedupRows(diff: string, lineNumbers: (number | undefined)[], above: string[] | undefined, below: string[] | undefined, maxBytes = DEFAULT_MAX_BYTES): { diff: string; lineNumbers: (number | undefined)[] } {
-  const topAll = (above ?? []).map(fmtDedupRow);
-  const bottomAll = (below ?? []).map(fmtDedupRow);
-  if (topAll.length === 0 && bottomAll.length === 0) return { diff, lineNumbers };
-  const usedBytes = Buffer.byteLength(diff, "utf-8");
-  const fullBudget = Math.max(0, maxBytes - usedBytes);
-  const initialTop = capDedupRows(topAll, fullBudget);
-  const initialBottom = capDedupRows(bottomAll, Math.max(0, fullBudget - initialTop.bytes));
-  const anyOmitted = initialTop.omitted + initialBottom.omitted > 0;
-  const reserved = anyOmitted ? Buffer.byteLength(dedupOmissionNote(topAll.length + bottomAll.length, maxBytes), "utf-8") + 1 : 0;
-  const budget = Math.max(0, fullBudget - reserved);
-  const topCapped = anyOmitted ? capDedupRows(topAll, budget) : initialTop;
-  const bottomCapped = anyOmitted ? capDedupRows(bottomAll, Math.max(0, budget - topCapped.bytes)) : initialBottom;
-  const top = topCapped.rows;
-  const bottom = [...bottomCapped.rows];
-  const omitted = topCapped.omitted + bottomCapped.omitted;
-  if (omitted > 0) {
-    const note = dedupOmissionNote(omitted, maxBytes);
-    if (usedBytes + topCapped.bytes + bottomCapped.bytes + Buffer.byteLength(note, "utf-8") + 1 <= maxBytes) bottom.push(note);
-  }
-  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", diffContextLines = 1): TResult {
-  const { path, result, warnings, snapshotId, originalNormalized, originalHashes, editMeta, resultHashes, boundaryDedupAbove, boundaryDedupBelow, spans } = input;
+  const { path, result, warnings, snapshotId, originalNormalized, originalHashes, editMeta, resultHashes, spans } = input;
   const resultLines = visLines(result);
-  const baseDiff = genDiff(originalNormalized, result, diffContextLines, resultHashes, originalHashes, undefined, spans);
-  const diffResult = baseDiff.spanDedupEmitted
-    ? baseDiff
-    : withDedupRows(baseDiff.diff, baseDiff.lineNumbers, boundaryDedupAbove, boundaryDedupBelow);
+  const diffResult = genDiff(originalNormalized, result, diffContextLines, resultHashes, originalHashes, undefined, spans);
   const addedLines = editMeta.addedLines;
   const removedLines = editMeta.removedLines;
   const warningsBlock = warnBlock(warnings);
@@ -237,7 +156,7 @@ export function buildChanged(input: SuccessInput, verb = "replaced", diffContext
       patch: patchResult.patch,
       ...(patchResult.truncated ? { patchTruncated: true as const } : {}),
       firstChangedLine:
-        editMeta.firstChangedLine ?? baseDiff.firstChangedLine,
+        editMeta.firstChangedLine ?? diffResult.firstChangedLine,
       snapshotId,
       metrics,
       diffLineNumbers: diffResult.lineNumbers.map((line) => line ?? null),

package/src/replace.ts

@@ -22,7 +22,7 @@ import { applyEdit,
   type HEdit,
   type NEdit,
 } from "./hashline";
-import { withDedupRows, type RMetrics } from "./replace-response";
+import { type RMetrics } from "./replace-response";
 import {
   type RPreview,
   type RRState,
@@ -31,8 +31,8 @@ import { loadHashStore, type HashStore } from "./hash-store";
 import { adoptAnchors, servedForPath, withAnchorSession } from "./anchor-registry";
 import { resolveTarget } from "./fs-write";
 import { toCwd, toDisplayPath } from "./paths";
-import { queuedEdit, editToolBase, editRenderCallWrapper, editRenderResultWrapper, resolveEditTargetWithRequirement, throwIfStrictInput, getBoundaryDedupMode, withReplacePrompts, DEFAULT_EDIT_FLAGS, type EditToolFlags } from "./edit-common";
-import { commitEdit, dedupRowsFromFixes } from "./commit";
+import { queuedEdit, editToolBase, editRenderCallWrapper, editRenderResultWrapper, resolveEditTargetWithRequirement, throwIfStrictInput, withReplacePrompts, DEFAULT_EDIT_FLAGS, type EditToolFlags } from "./edit-common";
+import { commitEdit } from "./commit";
 import { batchMemberFor, executeBatchMember, noteBatchFailure } from "./batch";
 
 export { editToolSchema, type ReqParams, assertReq };
@@ -65,10 +65,6 @@ export interface PipelineResult {
   resultHashes: string[];
   totalAddedLines: number;
   totalRemovedLines: number;
-  boundaryRemovedLines: number;
-  boundaryRemovedLineTexts: string[];
-  boundaryDedupAbove: string[];
-  boundaryDedupBelow: string[];
   identity: FileIdentity;
   spans?: DiffSpan[];
 }
@@ -79,7 +75,6 @@ export interface ExecPipelineOptions {
   signal?: AbortSignal;
   store?: HashStore;
   noPersist?: boolean;
-  skipBoundaryDedup?: boolean;
   preloadedNorm?: NormFile;
 }
 
@@ -109,13 +104,12 @@ function countLineChanges(
   edit: HEdit,
   originalHashes: string[],
   isNoop: boolean,
-  removedAutoFixes: number,
 ): { totalAddedLines: number; totalRemovedLines: number } {
   if (isNoop) return { totalAddedLines: 0, totalRemovedLines: 0 };
   const span = hashSpan(originalHashes, edit.hash_bounds[0].hash, edit.hash_bounds[1].hash);
   const totalRemovedLines = span ? span[1] - span[0] + 1 : 0;
   return {
-    totalAddedLines: Math.max(0, edit.content_lines.length - removedAutoFixes),
+    totalAddedLines: edit.content_lines.length,
     totalRemovedLines,
   };
 }
@@ -149,9 +143,6 @@ export async function execPipeline(
   );
   const displayPath = toDisplayPath(cwd, absolutePath, targetPath);
 
-  const dedupMode = await getBoundaryDedupMode();
-  const effectiveSkipBoundaryDedup = options?.skipBoundaryDedup === true || dedupMode === "off";
-  const strictBoundaryDedup = options?.skipBoundaryDedup !== true && dedupMode === "strict";
   let anchorResult: ReturnType<typeof applyEdit>;
   try {
     anchorResult = applyEdit(
@@ -161,8 +152,6 @@ export async function execPipeline(
       originalHashes,
       displayPath,
       served,
-      effectiveSkipBoundaryDedup,
-      strictBoundaryDedup,
     );
   } catch (error) {
     await noteAnchorError(absolutePath, error, options?.noPersist);
@@ -181,10 +170,9 @@ export async function execPipeline(
   const warnings = [...editWarnings, ...(anchorResult.warnings ?? [])];
   await throwIfStrictInput(warnings);
   const { totalAddedLines, totalRemovedLines } = countLineChanges(
-    edit, originalHashes, isNoop, anchorResult.autoFixes?.length ?? 0,
+    edit, originalHashes, isNoop,
   );
 
-  const sortedFixes = dedupRowsFromFixes(anchorResult.autoFixes ?? []);
   const pipeSpan = isNoop ? undefined : spanForEdit(originalHashes, edit.hash_bounds[0].hash, edit.hash_bounds[1].hash, result);
   const pipeSpans = pipeSpan ? [pipeSpan] : undefined;
   return {
@@ -202,10 +190,6 @@ export async function execPipeline(
     originalHashes,
     totalAddedLines,
     totalRemovedLines,
-    boundaryRemovedLines: anchorResult.autoFixes?.length ?? 0,
-    boundaryRemovedLineTexts: sortedFixes.removedTexts,
-    boundaryDedupAbove: sortedFixes.above,
-    boundaryDedupBelow: sortedFixes.below,
     identity,
     ...(pipeSpans ? { spans: pipeSpans } : {}),
   };
@@ -219,7 +203,7 @@ export function previewFromPipe(pipe: PipelineResult): RPreview {
     };
   }
   const base = genDiff(pipe.originalNormalized, pipe.result, 4, pipe.resultHashes, pipe.originalHashes, undefined, pipe.spans);
-  return { diff: withDedupRows(base.diff, base.lineNumbers, pipe.boundaryDedupAbove, pipe.boundaryDedupBelow).diff, path: pipe.path };
+  return { diff: base.diff, path: pipe.path };
 }
 export function previewError(error: unknown): RPreview {
   return { error: error instanceof Error ? error.message : String(error) };
@@ -290,8 +274,6 @@ export function buildToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLAGS): ToolDef
           throw error;
         });
         return queuedEdit(targetPath, ctx.cwd, signal, async (absolutePath, mutationTargetPath) => {
-          const dedupMode = await getBoundaryDedupMode();
-          const strictBoundaryDedup = dedupMode === "strict";
           const member = batchMemberFor(_toolCallId);
           if (!member) {
             const pipe = await execPipeline(
@@ -324,8 +306,6 @@ export function buildToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLAGS): ToolDef
             signal,
             hedit: built.edit,
             extraWarnings: built.warnings,
-            skipBoundaryDedup: dedupMode === "off",
-            strictBoundaryDedup,
           });
         });
       });