pi-hashline-edit-pro 2.6.4 → 2.7.0

package/src/replace.ts

@@ -1,4 +1,3 @@
-import { Markdown, Text } from "@earendil-works/pi-tui";
 import type {
   ExtensionAPI,
   ToolDefinition,
@@ -8,13 +7,12 @@ import { Type } from "typebox";
 import { constants } from "fs";
 import {
   genDiff,
-  restoreEndings,
   type LineEnding,
 } from "./replace-diff";
-import { readNormFile, safeSnapId } from "./file-reader";
+import { readNormFile, type NormFile } from "./file-reader";
 import { normReq } from "./replace-normalize";
 import { isRec, rejectUnknownFields, abortIf, makePrepareArguments } from "./utils";
-import { resolveTarget, writeAtomic } from "./fs-write";
+import { resolveTarget } from "./fs-write";
 import { applyEdit,
   lineHashes,
   resEdit,
@@ -26,33 +24,24 @@ import { applyEdit,
   type NEdit,
 } from "./hashline";
 import { toCwd } from "./paths";
+import type { RMetrics } from "./replace-response";
 import {
-  buildChanged,
-  buildNoop,
-  type RMeta,
-  type RMetrics,
-} from "./replace-response";
-import {
-  buildAppliedText,
-  mkMdTheme,
-  fmtCall,
-  fmtResultMd,
-  getPreviewInput,
-  getResultText,
-  isApplied,
+  makeRenderCall,
+  renderEditResult,
   type RPreview,
   type RRState,
 } from "./replace-render";
+export { reuseText, reuseMarkdown } from "./replace-render";
 import { loadP, loadGuide } from "./prompts";
-import { saveUndo } from "./replace-undo";
 import { loadHashStore, findSnapshotPaths, type HashStore } from "./hash-store";
-import { getServed, recordServedSafe, recordServedDiffSafe } from "./served";
+import { getServed, recordServedSafe } from "./served";
 import { noopPayloadKey, markBoundaryNoop, consumeBoundaryBypass, clearBoundaryBypass } from "./boundary-bypass";
+import { commitEdit } from "./commit";
 
 const replacementLinesSchema = Type.Array(
   Type.String({
     description:
-      "One replacement line. Each element is exactly one line; do not embed \\n inside an element — use separate elements.",
+      "One replacement line. Each element is exactly one line; do not embed \\n inside an element: use separate elements.",
   }),
   {
     description:
@@ -61,16 +50,16 @@ const replacementLinesSchema = Type.Array(
 );
 
 const removeFromSchema = Type.String({
-  description: "Bare 3-char HASH only (e.g. \"aB3\") — copy just the hash from the leftmost column of a read row like `aB3│content`; never the line content. Marks the FIRST line to remove (inclusive)",
+  description: "Bare 3-char HASH only (e.g. \"aB3\"): copy just the hash from the leftmost column of a read row like `aB3│content`; never the line content. Marks the FIRST line to remove (inclusive)",
 });
 
 const removeToSchema = Type.String({
-  description: "Bare 3-char HASH only (e.g. \"aB3\") — copy just the hash from the leftmost column of a read row like `aB3│content`; never the line content. Marks the LAST line to remove (inclusive)",
+  description: "Bare 3-char HASH only (e.g. \"aB3\"): copy just the hash from the leftmost column of a read row like `aB3│content`; never the line content. Marks the LAST line to remove (inclusive)",
 });
 
 export const editToolSchema = Type.Object(
   {
-    path: Type.Optional(Type.String({ description: "Path to edit. Required — always provide it explicitly; it is only auto-resolved from the anchors as a fallback when omitted by mistake." })),
+    path: Type.Optional(Type.String({ description: "Path to edit. Required: always provide it explicitly; it is only auto-resolved from the anchors as a fallback when omitted by mistake." })),
     remove_from: removeFromSchema,
     remove_to: removeToSchema,
     replacement_lines: replacementLinesSchema,
@@ -93,7 +82,7 @@ export type ReplaceDetails = {
   metrics?: RMetrics;
 };
 
-interface PipelineResult {
+export interface PipelineResult {
   path: string;
   originalNormalized: string;
   result: string;
@@ -109,10 +98,9 @@ interface PipelineResult {
   totalAddedLines: number;
   totalRemovedLines: number;
   hadBoundaryDedup: boolean;
+  boundaryRemovedLines: number;
 }
 
-const PREVIEW_DEBOUNCE_MS = 150;
-
 const ROOT_KS = new Set(["path", "remove_from", "remove_to", "replacement_lines"]);
 
 export function assertReq(
@@ -135,7 +123,7 @@ export function assertReq(
     request.replacement_lines.some((line) => typeof line !== "string")
   ) {
     throw new Error(
-      '[E_BAD_SHAPE] Edit request requires "remove_from", "remove_to", and "replacement_lines" at the top level. replacement_lines must be an array of strings, one element per line (use [] to delete).',
+      '[E_BAD_SHAPE] Edit request requires "remove_from", "remove_to", and "replacement_lines" (array of strings, one per line; use [] to delete).',
     );
   }
 }
@@ -165,12 +153,12 @@ async function resolveMissingPath(
   if (matches.length === 1) {
     return {
       path: matches[0]!,
-      warning: `[E_BAD_SHAPE] Autocorrected: missing "path" resolved to ${matches[0]} — the only file whose stored hashes contain both anchors.`,
+      warning: `[E_BAD_SHAPE] Autocorrected: missing "path" resolved to ${matches[0]}.`,
     };
   }
   if (matches.length > 1) {
     throw new Error(
-      `[E_BAD_SHAPE] Edit request requires a non-empty "path" string; the anchors match multiple known files: ${matches.join(", ")}. Include the intended path.`,
+      `[E_BAD_SHAPE] Edit request requires a non-empty "path" string; the anchors match multiple known files: ${matches.join(", ")}.`,
     );
   }
   return undefined;
@@ -182,6 +170,7 @@ export interface ExecPipelineOptions {
   store?: HashStore;
   noPersist?: boolean;
   skipBoundaryDedup?: boolean;
+  preloadedNorm?: NormFile;
 }
 
 function collectRemovedHashes(
@@ -242,7 +231,7 @@ export async function execPipeline(
 
   const hashStore = options?.store ?? await loadHashStore();
   const { normalized: originalNormalized, bom, originalEnding, fileHashes: originalHashes, hadUtf8DecodeErrors, absolutePath } = await readNormFile(
-    path, cwd, { signal: options?.signal, accessMode: options?.accessMode, maxLines: MAX_HASH_LINES, store: hashStore, noPersist: options?.noPersist },
+    path, cwd, { signal: options?.signal, accessMode: options?.accessMode, maxLines: MAX_HASH_LINES, store: hashStore, noPersist: options?.noPersist, preloadedNorm: options?.preloadedNorm },
   );
 
   const served = await getServed(hashStore, absolutePath);
@@ -303,6 +292,7 @@ export async function execPipeline(
     totalAddedLines,
     totalRemovedLines,
     hadBoundaryDedup: (anchorResult.autoFixes?.length ?? 0) > 0,
+    boundaryRemovedLines: anchorResult.autoFixes?.length ?? 0,
   };
 }
 
@@ -336,21 +326,6 @@ type ToolDef = ToolDefinition<
   RRState
 > & { renderShell?: "default" | "self" };
 
-export function reuseText(context: any, content: string): Text {
-  const t = context.lastComponent instanceof Text
-    ? context.lastComponent
-    : new Text("", 0, 0);
-  t.setText(content);
-  return t;
-}
-
-export 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 E_DESC = loadP("../prompts/replace.md");
@@ -367,107 +342,17 @@ export function buildToolDef(): ToolDef {
     promptGuidelines: E_GUIDE,
     prepareArguments: makePrepareArguments(),
     renderShell: "default",
-    renderCall(args, theme, context) {
-      const previewInput = getPreviewInput(args);
-      const cancelPendingPreview = () => {
-        if (context.state.previewTimer) {
-          clearTimeout(context.state.previewTimer);
-          context.state.previewTimer = undefined;
-        }
-      };
-      if (context.executionStarted) {
-        cancelPendingPreview();
-        context.state.argsKey = undefined;
-        context.state.preview = undefined;
-        context.state.previewGeneration =
-          (context.state.previewGeneration ?? 0) + 1;
-      } else if (!context.argsComplete || !previewInput) {
-        cancelPendingPreview();
-        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) {
-          cancelPendingPreview();
-          context.state.argsKey = argsKey;
-          context.state.preview = undefined;
-          const previewGeneration = (context.state.previewGeneration ?? 0) + 1;
-          context.state.previewGeneration = previewGeneration;
-          context.state.previewTimer = setTimeout(() => {
-            context.state.previewTimer = undefined;
-            compPreview(args, 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();
-                }
-              });
-          }, PREVIEW_DEBOUNCE_MS);
-        }
-      }
-      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;
-    },
-
+    renderCall: makeRenderCall(compPreview),
     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) {
-        if (renderState.previewTimer) {
-          clearTimeout(renderState.previewTimer);
-          renderState.previewTimer = undefined;
-        }
-        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);
+      return renderEditResult(
+        result as {
+          content?: Array<{ type: string; text?: string }>;
+          details?: ReplaceDetails;
+        },
+        isPartial,
+        theme,
+        context,
+      );
     },
 
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
@@ -486,111 +371,24 @@ export function buildToolDef(): ToolDef {
       const boundaryBypass = consumeBoundaryBypass(mutationTargetPath, noopPayload);
       return withFileMutationQueue(mutationTargetPath, async () => {
         abortIf(signal);
-
-        const {
-          originalNormalized,
-          originalHashes,
-          result,
-          bom,
-          originalEnding,
-          hadUtf8DecodeErrors,
-          warnings,
-          noopEdit,
-          firstChangedLine,
-          lastChangedLine,
-          resultHashes,
-          hadBoundaryDedup,
-          totalAddedLines,
-          totalRemovedLines,
-        } = await execPipeline(
+        const pipe = await execPipeline(
           normalizedParams,
           ctx.cwd,
           { accessMode: constants.R_OK | constants.W_OK, signal, skipBoundaryDedup: boundaryBypass },
         );
-
-        if (resolution) {
-          warnings.unshift(resolution.warning);
-        }
-        if (boundaryBypass && originalNormalized !== result) {
-          warnings.push("[E_BOUNDARY_BYPASS] Boundary dedup was off for this call. Boundary dedup is now restored.");
-        }
-
-        const editsAttempted = 1;
-        if (originalNormalized === result) {
-          const noopSnapshotId = await safeSnapId(absolutePath, "noop edit");
-          if (hadBoundaryDedup) {
-            markBoundaryNoop(mutationTargetPath, noopPayload);
-          }
-          return buildNoop({
-            path,
-            noopEdit,
-            snapshotId: noopSnapshotId,
-            editMeta: {
-              editsAttempted,
-              noopEditsCount: noopEdit ? 1 : 0,
-              addedLines: 0,
-              removedLines: 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);
-        const undo = await saveUndo(mutationTargetPath, {
-          content: originalNormalized,
-          bom,
-          originalEnding,
-          hashes: originalHashes,
-          resultContent: result,
-        });
-        if (!undo.persisted) {
-          throw new Error(
-            `[E_UNDO_UNAVAILABLE] Cannot persist undo history to the hash store; the edit was NOT applied and ${path} is unchanged. Retry the replace, or use write if the store cannot be recovered.`
-          );
-        }
-        try {
-          abortIf(signal);
-          await writeAtomic(
-            absolutePath,
-            bom + restoreEndings(result, originalEnding),
-          );
-        } catch (error) {
-          await undo.restore();
-          throw error;
-        }
-        clearBoundaryBypass(mutationTargetPath);
-        const updatedSnapshotId = await safeSnapId(absolutePath, "post-edit");
-
-        const editMeta: RMeta = {
-          editsAttempted,
-          noopEditsCount: noopEdit ? 1 : 0,
-          firstChangedLine,
-          lastChangedLine,
-          addedLines: totalAddedLines,
-          removedLines: totalRemovedLines,
-        };
-
-        const successInput = {
+        const appliedWarnings = boundaryBypass
+          ? ["[E_BOUNDARY_BYPASS] Boundary dedup was off for this call and is back on."]
+          : [];
+        return commitEdit(pipe, {
           path,
-          originalNormalized,
-          originalHashes,
-          result,
-          resultHashes,
-          warnings,
-          snapshotId: updatedSnapshotId,
-          editMeta,
-        };
-        const changed = buildChanged(successInput);
-        if (changed.details.diff) {
-          await recordServedDiffSafe(mutationTargetPath, changed.details.diff, "post-edit diff", new Set(resultHashes));
-        }
-        return changed;
+          absolutePath,
+          mutationTargetPath,
+          signal,
+          prefixWarnings: resolution ? [resolution.warning] : [],
+          appliedWarnings,
+          onApplied: () => clearBoundaryBypass(mutationTargetPath),
+          onNoopDedup: () => markBoundaryNoop(mutationTargetPath, noopPayload),
+        });
       });
     },
   };

package/src/validation.ts

@@ -38,7 +38,7 @@ export function valKind(file: LFile, path: string): asserts file is { kind: "tex
 	}
 	if (file.kind === "too_large") {
 		throw new Error(
-			`[E_FILE_TOO_LARGE] File is too large: ${path} (${file.description}). Hashline editing targets source-sized files; for very large files use write or a non-line-based approach.`,
+			`[E_FILE_TOO_LARGE] File is too large: ${path} (${file.description}). For very large files, use write.`,
 		);
 	}
 }

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

@@ -1,2 +0,0 @@
-- `undo_last_replace`: reverts only the most recent replace on the file — any write to the file clears the undo history, so call it immediately after a bad replace. A replace is bad when its post-edit diff shows `-HASH│` rows for lines you meant to keep (a closing brace, import, or declaration).
-- `undo_last_replace`: when auto-read shows the post-edit diff, its `+HASH│` and ` HASH│` rows are the fresh anchors for the restored file, so follow-up edits can anchor on the diff without re-reading.

package/prompts/undo-last-replace-snippet.md

@@ -1 +0,0 @@
-Undo the last replace on a file

package/prompts/undo-last-replace.md

@@ -1 +0,0 @@
-Undo the last replace on a file, reverting it to its previous state. Use when a replace produced incorrect results (e.g., wrong content, duplicated lines, broken syntax).