pi-hashline-edit-pro 0.15.3 → 0.15.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "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/replace-diff.ts

@@ -47,22 +47,16 @@ export function genDiff(
   newContentHashes?: string[],
   oldHashes?: string[],
 ): { diff: string; firstChangedLine: number | undefined } {
-  // Annotate each line with its hash so Diff.diffLines can distinguish
-  // identical lines at different positions. The \0 separator cannot appear
-  // in valid text file content.
+  // Run Diff.diffLines on raw content only (no hash annotations) so that
+  // lines whose content is identical are never reported as changed even
+  // when their hash differs due to collision resolution or position
+  // tracking. Hashes are used purely for display via fmtDiffLine.
   const oldLines = oldContent.split("\n");
-  const effectiveOldHashes = oldHashes ?? _lineHashesPure(oldContent);
-  const annotatedOld = oldLines
-    .map((line, i) => `${line}\0${effectiveOldHashes[i] ?? ""}`)
-    .join("\n");
-
   const newLines = newContent.split("\n");
+  const effectiveOldHashes = oldHashes ?? _lineHashesPure(oldContent);
   const effectiveNewHashes = newContentHashes ?? _lineHashesPure(newContent);
-  const annotatedNew = newLines
-    .map((line, i) => `${line}\0${effectiveNewHashes[i] ?? ""}`)
-    .join("\n");
 
-  const parts = Diff.diffLines(annotatedOld, annotatedNew);
+  const parts = Diff.diffLines(oldContent, newContent);
   const output: string[] = [];
   let oldLineNum = 1;
   let newLineNum = 1;
@@ -73,11 +67,7 @@ export function genDiff(
     const part = parts[i]!;
     const raw = part.value.split("\n");
     if (raw[raw.length - 1] === "") raw.pop();
-    // Strip \0hash annotation from each line for display
-    const displayLines = raw.map((l) => {
-      const nullIdx = l.indexOf("\0");
-      return nullIdx >= 0 ? l.slice(0, nullIdx) : l;
-    });
+    const displayLines = raw;
 
     if (part.added || part.removed) {
       if (firstChangedLine === undefined) firstChangedLine = newLineNum;
@@ -116,13 +106,13 @@ export function genDiff(
       }
 
       if (skipStart > 0) {
-        output.push(` ...`);
+        output.push(" ...");
         oldLineNum += skipStart;
         newLineNum += skipStart;
       }
       for (const line of linesToShow) {
         if (line === "__ELLIPSIS__") {
-          output.push(` ...`);
+          output.push(" ...");
           oldLineNum += skipMiddle;
           newLineNum += skipMiddle;
           continue;

package/src/replace-flat.ts

@@ -1,313 +1,17 @@
-import { Markdown, Text } from "@earendil-works/pi-tui";
 import type {
   ExtensionAPI,
-  ToolDefinition,
 } from "@earendil-works/pi-coding-agent";
-import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { constants } from "fs";
 import {
-  genDiff,
-  restoreEndings,
-} from "./replace-diff";
-import { readNormFile } from "./file-reader";
-import { normReq } from "./replace-normalize";
-import { isRec } from "./utils";
-import { MAX_HASH_LINES } from "./constants";
-import { resolveTarget, writeAtomic } from "./fs-write";
-import {
-  applyEdits,
-  resEdits,
-  type HTEdit,
-} from "./hashline";
-import { toCwd } from "./path-utils";
-import { abortIf } from "./runtime";
-import { fileSnap } from "./snapshot";
-import {
-  buildChanged,
-  buildNoop,
-  type RMeta,
-  type RMetrics,
-} from "./replace-response";
-import {
-  buildAppliedText,
-  mkMdTheme,
-  fmtCall,
-  fmtResultMd,
-  getPreviewInput,
-  getResultText,
-  isApplied,
-  type RPreview,
-  type RRState,
-} from "./replace-render";
-import { loadP, loadGuide } from "./prompts";
-import { execPipeline, compPreview, type ReplaceDetails } from "./replace";
-import { readAutoReadSync } from "./config";
-
-const contentLinesSchema = Type.Array(Type.String(), {
-  description:
-    "literal replacement file content, one string per line. Must not include the HASH│ prefix from read output.",
-});
-
-const hashRangeInclSchema = Type.Array(
-  Type.String({ description: "anchor (3-char HASH)" }),
-  {
-    description: "inclusive hash range to replace [start_hash, end_hash]. Each element must be the 3-character hash anchor only; do not include the │ separator or line content.",
-    minItems: 2,
-    maxItems: 2,
-  },
-);
-
-/**
- * Flat-mode schema: hash_range_inclusive and content_lines are at the top
- * level instead of inside a "changes" array. Only a single edit is supported
- * per call (no bulk changes).
- */
-export const flatEditToolSchema = Type.Object(
-  {
-    path: Type.String({ description: "path" }),
-    hash_range_inclusive: hashRangeInclSchema,
-    content_lines: contentLinesSchema,
-  },
-  { additionalProperties: false },
-);
-
-type ToolDef = ToolDefinition<
-  typeof flatEditToolSchema,
-  ReplaceDetails,
-  RRState
-> & { renderShell?: "default" | "self" };
-
-function reuseText(context: any, content: string): Text {
-  const t = context.lastComponent instanceof Text
-    ? context.lastComponent
-    : new Text("", 0, 0);
-  t.setText(content);
-  return t;
-}
-
-function reuseMarkdown(context: any, content: string, theme: any): Markdown {
-  const m = context.lastComponent instanceof Markdown
-    ? context.lastComponent
-    : new Markdown("", 0, 0, mkMdTheme(theme));
-  m.setText(content);
-  return m;
-}
-
-export function buildToolDef(): ToolDef {
-  const autoRead = readAutoReadSync();
-  const readGuidance = autoRead
-    ? "Anchors are provided automatically after write operations when auto-read is enabled."
-    : "Call `read` to get fresh anchors for follow-up edits.";
-
-  const E_DESC = loadP("../prompts/replace-flat.md", {
-    AUTO_READ_GUIDANCE: readGuidance,
-  });
-  const E_SNIPPET = loadP("../prompts/replace-flat-snippet.md");
-  const E_GUIDE = loadGuide("../prompts/replace-flat-guidelines.md", {
-    AUTO_READ_GUIDANCE: readGuidance,
-  });
-
-  return {
-    name: "replace",
-    label: "Replace",
-    description: E_DESC,
-    parameters: flatEditToolSchema,
-    promptSnippet: E_SNIPPET,
-    promptGuidelines: E_GUIDE,
-    prepareArguments: (args: unknown) => {
-      // Minimal normalization: file_path → path, JSON string parsing.
-      // The flat-to-canonical conversion happens in execute().
-      if (!isRec(args)) return args as any;
-      const record = { ...args };
-      if (typeof record.path !== "string" && typeof record.file_path === "string") {
-        record.path = record.file_path;
-        delete record.file_path;
-      }
-      if (typeof record.hash_range_inclusive === "string") {
-        try { record.hash_range_inclusive = JSON.parse(record.hash_range_inclusive as string); } catch { /* keep as-is */ }
-      }
-      if (typeof record.content_lines === "string") {
-        try { record.content_lines = JSON.parse(record.content_lines as string); } catch { /* keep as-is */ }
-      }
-      return record as any;
-    },
-    renderShell: "default",
-    renderCall(args, theme, context) {
-      const previewInput = getPreviewInput(args);
-      if (context.executionStarted) {
-        context.state.argsKey = undefined;
-        context.state.preview = undefined;
-        context.state.previewGeneration =
-          (context.state.previewGeneration ?? 0) + 1;
-      } else if (!context.argsComplete || !previewInput) {
-        context.state.argsKey = undefined;
-        context.state.preview = undefined;
-        context.state.previewGeneration =
-          (context.state.previewGeneration ?? 0) + 1;
-      } else {
-        const argsKey = JSON.stringify(previewInput);
-        if (context.state.argsKey !== argsKey) {
-          context.state.argsKey = argsKey;
-          context.state.preview = undefined;
-          const previewGeneration = (context.state.previewGeneration ?? 0) + 1;
-          context.state.previewGeneration = previewGeneration;
-          compPreview(previewInput, context.cwd)
-            .then((preview) => {
-              if (
-                context.state.argsKey === argsKey &&
-                context.state.previewGeneration === previewGeneration
-              ) {
-                context.state.preview = preview;
-                context.invalidate();
-              }
-            })
-            .catch((err: unknown) => {
-              if (
-                context.state.argsKey === argsKey &&
-                context.state.previewGeneration === previewGeneration
-              ) {
-                context.state.preview = {
-                  error: err instanceof Error ? err.message : String(err),
-                };
-                context.invalidate();
-              }
-            });
-        }
-      }
-      const text =
-        (context.lastComponent as Text | undefined) ?? new Text("", 0, 0);
-      text.setText(
-        fmtCall(
-          getPreviewInput(args) ?? undefined,
-          context.state as RRState,
-          context.expanded,
-          theme,
-        ),
-      );
-      return text;
-    },
-
-    renderResult(result, { isPartial }, theme, context) {
-      if (isPartial) {
-        return reuseText(context, theme.fg("warning", "Editing..."));
-      }
-
-      const typedResult = result as {
-        content?: Array<{ type: string; text?: string }>;
-        details?: ReplaceDetails;
-      };
-      const renderedText = getResultText(typedResult);
-
-      const renderState = context.state as RRState | undefined;
-      if (renderState) {
-        renderState.preview = undefined;
-        renderState.previewGeneration = (renderState.previewGeneration ?? 0) + 1;
-      }
-
-      if (context.isError) {
-        return renderedText
-          ? reuseText(context, `\n${theme.fg("error", renderedText)}`)
-          : new Text("", 0, 0);
-      }
-
-      if (isApplied(typedResult.details)) {
-        const appliedText = buildAppliedText(renderedText, typedResult.details, theme);
-        return appliedText ? reuseText(context, appliedText) : new Text("", 0, 0);
-      }
-
-      if (!renderedText) return new Text("", 0, 0);
-      return reuseMarkdown(context, fmtResultMd(renderedText), theme);
-    },
-
-    async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-      // Wrap flat params into canonical shape for the pipeline
-      const canonical = normReq({
-        path: params.path,
-        changes: [{
-          hash_range_inclusive: params.hash_range_inclusive,
-          content_lines: params.content_lines,
-        }],
-      });
-      const normalizedParams = canonical as { path: string; changes: HTEdit[] };
-      const path = normalizedParams.path;
-      const absolutePath = toCwd(path, ctx.cwd);
-      const mutationTargetPath = await resolveTarget(absolutePath);
-      return withFileMutationQueue(mutationTargetPath, async () => {
-        abortIf(signal);
-
-        const {
-          originalNormalized,
-          originalHashes,
-          result,
-          bom,
-          originalEnding,
-          hadUtf8DecodeErrors,
-          warnings,
-          noopEdits,
-          firstChangedLine,
-          lastChangedLine,
-          resultHashes,
-        } = await execPipeline(
-          normalizedParams,
-          ctx.cwd,
-          constants.R_OK | constants.W_OK,
-          signal,
-        );
-
-        const editsAttempted = 1; // flat mode: exactly one edit per call
-
-        if (originalNormalized === result) {
-          const noopSnapshotId = (await fileSnap(absolutePath)).snapshotId;
-          return buildNoop({
-            path,
-            noopEdits,
-            snapshotId: noopSnapshotId,
-            editMeta: {
-              editsAttempted,
-              noopEditsCount: noopEdits?.length ?? 0,
-            },
-            warnings,
-          });
-        }
-
-        if (hadUtf8DecodeErrors) {
-          warnings.push(
-            "Non-UTF-8 bytes were shown as U+FFFD; this edit rewrote the file as UTF-8.",
-          );
-        }
-
-        abortIf(signal);
-        await writeAtomic(
-          absolutePath,
-          bom + restoreEndings(result, originalEnding),
-        );
-        const updatedSnapshotId = (await fileSnap(absolutePath))
-          .snapshotId;
+  buildToolDef,
+  flatEditToolSchema,
+} from "./replace";
 
-        const editMeta: RMeta = {
-          editsAttempted,
-          noopEditsCount: noopEdits?.length ?? 0,
-          firstChangedLine,
-          lastChangedLine,
-        };
+export { flatEditToolSchema };
 
-        const successInput = {
-          path,
-          originalNormalized,
-          originalHashes,
-          result,
-          resultHashes,
-          warnings,
-          snapshotId: updatedSnapshotId,
-          editMeta,
-        };
-        return buildChanged(successInput);
-      });
-    },
-  };
+export function buildToolDefFlat() {
+  return buildToolDef({ flat: true });
 }
 
 export function regReplaceFlat(pi: ExtensionAPI): void {
-  pi.registerTool(buildToolDef());
+  pi.registerTool(buildToolDef({ flat: true }));
 }

package/src/replace.ts

@@ -75,6 +75,20 @@ export const editToolSchema = Type.Object(
   { additionalProperties: false },
 );
 
+/**
+ * Flat-mode schema: hash_range_inclusive and content_lines are at the top
+ * level instead of inside a "changes" array. Only a single edit is supported
+ * per call (no bulk changes).
+ */
+export const flatEditToolSchema = Type.Object(
+  {
+    path: Type.String({ description: "path" }),
+    hash_range_inclusive: hashRangeInclSchema,
+    content_lines: contentLinesSchema,
+  },
+  { additionalProperties: false },
+);
+
 export type ReqParams = {
   path: string;
   changes: HTEdit[];
@@ -101,7 +115,7 @@ interface PipelineResult {
   noopEdits?: { editIndex: number; loc: string; currentContent: string }[];
   firstChangedLine?: number;
   lastChangedLine?: number;
-  originalHashes?: string[];
+  originalHashes: string[];
   resultHashes: string[];
 }
 
@@ -165,11 +179,23 @@ export async function execPipeline(
 
   const result = anchorResult.content;
 
-  // Collect hashes targeted by the edit for hash-aware diff disambiguation
+  // Collect hashes targeted by the edit for hash-aware diff disambiguation.
+  // Include every hash in the replaced range, not just the boundary anchors,
+  // so that a surviving line whose content is identical to an interior line
+  // of the edit is not matched to a removed hash.
+  // Use originalHashes.indexOf to find line numbers since resEdits returns
+  // HEdit[] (Anchor = { hash }) not RHEdit[] (RAnchor = { line, hash }).
   const removedHashes = new Set<string>();
   for (const edit of resolved) {
-    removedHashes.add(edit.hash_range_inclusive[0].hash);
-    removedHashes.add(edit.hash_range_inclusive[1].hash);
+    const startHash = edit.hash_range_inclusive[0].hash;
+    const endHash = edit.hash_range_inclusive[1].hash;
+    const startLine = originalHashes.indexOf(startHash);
+    const endLine = originalHashes.indexOf(endHash);
+    if (startLine >= 0 && endLine >= 0) {
+      for (let i = startLine; i <= endLine; i++) {
+        removedHashes.add(originalHashes[i]!);
+      }
+    }
   }
 
   // Compute stable result hashes using hash-aware preservation
@@ -247,12 +273,12 @@ export async function compPreview(
 }
 
 type ToolDef = ToolDefinition<
-  typeof editToolSchema,
+  any,
   ReplaceDetails,
   RRState
 > & { renderShell?: "default" | "self" };
 
-function reuseText(context: any, content: string): Text {
+export function reuseText(context: any, content: string): Text {
   const t = context.lastComponent instanceof Text
     ? context.lastComponent
     : new Text("", 0, 0);
@@ -260,7 +286,7 @@ function reuseText(context: any, content: string): Text {
   return t;
 }
 
-function reuseMarkdown(context: any, content: string, theme: any): Markdown {
+export function reuseMarkdown(context: any, content: string, theme: any): Markdown {
   const m = context.lastComponent instanceof Markdown
     ? context.lastComponent
     : new Markdown("", 0, 0, mkMdTheme(theme));
@@ -268,29 +294,49 @@ function reuseMarkdown(context: any, content: string, theme: any): Markdown {
   return m;
 }
 
-export function buildToolDef(): ToolDef {
+export function buildToolDef(opts: { flat: boolean }): ToolDef {
   const autoRead = readAutoReadSync();
   const readGuidance = autoRead
     ? "Anchors are provided automatically after write operations when auto-read is enabled."
     : "Call `read` to get fresh anchors for follow-up edits.";
 
-  const E_DESC = loadP("../prompts/replace-bulk.md", {
+  const E_DESC = loadP(opts.flat ? "../prompts/replace-flat.md" : "../prompts/replace-bulk.md", {
     AUTO_READ_GUIDANCE: readGuidance,
   });
-  const E_SNIPPET = loadP("../prompts/replace-bulk-snippet.md");
-  const E_GUIDE = loadGuide("../prompts/replace-bulk-guidelines.md", {
+  const E_SNIPPET = loadP(opts.flat ? "../prompts/replace-flat-snippet.md" : "../prompts/replace-bulk-snippet.md");
+  const E_GUIDE = loadGuide(opts.flat ? "../prompts/replace-flat-guidelines.md" : "../prompts/replace-bulk-guidelines.md", {
     AUTO_READ_GUIDANCE: readGuidance,
   });
 
+  const parameters = opts.flat ? flatEditToolSchema : editToolSchema;
+
   return {
     name: "replace",
     label: "Replace",
     description: E_DESC,
-    parameters: editToolSchema,
+    parameters,
     promptSnippet: E_SNIPPET,
     promptGuidelines: E_GUIDE,
-    prepareArguments: (args: unknown) =>
-      normReq(args) as ReqParams,
+    prepareArguments: opts.flat
+      ? (args: unknown) => {
+          // Minimal normalization: file_path → path, JSON string parsing.
+          // The flat-to-canonical conversion happens in execute().
+          if (!isRec(args)) return args as any;
+          const record = { ...args };
+          if (typeof record.path !== "string" && typeof record.file_path === "string") {
+            record.path = record.file_path;
+            delete record.file_path;
+          }
+          if (typeof record.hash_range_inclusive === "string") {
+            try { record.hash_range_inclusive = JSON.parse(record.hash_range_inclusive as string); } catch { /* keep as-is */ }
+          }
+          if (typeof record.content_lines === "string") {
+            try { record.content_lines = JSON.parse(record.content_lines as string); } catch { /* keep as-is */ }
+          }
+          return record as any;
+        }
+      : (args: unknown) =>
+          normReq(args) as ReqParams,
     renderShell: "default",
     renderCall(args, theme, context) {
       const previewInput = getPreviewInput(args);
@@ -380,9 +426,18 @@ export function buildToolDef(): ToolDef {
     },
 
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-      const normalized = normReq(params);
-      assertReq(normalized);
-      const normalizedParams = normalized;
+      // Flat mode: wrap top-level fields into a single-element changes array.
+      // Bulk mode: use params as-is after normReq normalization.
+      const canonical = opts.flat
+        ? normReq({
+            path: (params as any).path,
+            changes: [{
+              hash_range_inclusive: (params as any).hash_range_inclusive,
+              content_lines: (params as any).content_lines,
+            }],
+          })
+        : normReq(params);
+      const normalizedParams = canonical as { path: string; changes: HTEdit[] };
       const path = normalizedParams.path;
       const absolutePath = toCwd(path, ctx.cwd);
       const mutationTargetPath = await resolveTarget(absolutePath);
@@ -408,9 +463,11 @@ export function buildToolDef(): ToolDef {
           signal,
         );
 
-        const editsAttempted = Array.isArray(normalizedParams.changes)
-          ? normalizedParams.changes.length
-          : 0;
+        const editsAttempted = opts.flat
+          ? 1
+          : Array.isArray(normalizedParams.changes)
+            ? normalizedParams.changes.length
+            : 0;
 
         if (originalNormalized === result) {
           const noopSnapshotId = (await fileSnap(absolutePath)).snapshotId;
@@ -464,5 +521,5 @@ export function buildToolDef(): ToolDef {
 }
 
 export function regReplace(pi: ExtensionAPI): void {
-  pi.registerTool(buildToolDef());
+  pi.registerTool(buildToolDef({ flat: false }));
 }