pi-hashline-edit-pro 6.4.5 → 6.4.6

package/README.md

@@ -482,12 +482,12 @@ Full reference:
 | `[E_UNDO_NONE]` | `undo_last_change` found no recorded edit for the file. Nothing was changed; make an edit first. |
 | `[E_RANGE_STALE]` | A line in the replaced range no longer matches what was last shown (the file changed on disk, or the line was never shown; a pure deletion checks only its first and last line). The edit was refused; the current range is returned with fresh anchors. |
 | `[E_FILE_TOO_LARGE]` | The file exceeds the 1,353,139-line hashline limit or the 100MB size limit. |
-| `[E_REGISTRY]` | The anchor registry was not initialized; a serve or edit ran outside an initialized session. |
+| `[E_REGISTRY]` | The anchor registry was not initialized, or the session's registry was released because the session was replaced or reloaded; a serve or edit ran without a usable session. Retry the operation in the current session. |
 | `[E_STORE_UNAVAILABLE]` | No SQLite runtime could be loaded: the host exposes neither `node:sqlite` (Node 22.19+) nor `bun:sqlite`. The pi release binary's bundled Bun lacks `node:sqlite`; run pi under Node or a Bun build that ships SQLite. |
 | `[E_WRITE_HASH_ECHO]` | A `write` `content` line reproduces a served row for this file (a bare `anchor│` read row, a `+anchor│`, ` anchor│`, or `-anchor│` diff row, or a `lineNumber:│ anchor│content` grep row). The write is refused, file byte-identical; retry with bare content (remove the copied anchors). |
 | `[E_PATH_CHANGED]` | A write target changed identity after it was read; the write was refused to avoid following a swapped symlink or overwriting a replacement file. |
 | `[E_BATCH_OVERLAP]` | Batched edit calls target overlapping ranges; the whole batch was refused. One `before` plus one `after` insert on the same anchor line is not an overlap. Retry with disjoint ranges. |
-| `[E_OP_ABORTED]` | A batch-level failure aborted the edit before writing (the base read failed, a cross-file member could not be prepared, the file changed or was deleted during the batch, or the composed result exceeded a limit). Nothing was written; a call whose own request is invalid is left out of the batch instead. Fix the cause and retry, otherwise call `read` for fresh anchors and retry. The abort names the failing call and its error code when one is known. |
+| `[E_OP_ABORTED]` | The edit was aborted before writing: the file changed or was deleted after it was read (a single edit or a cross-file move reports the file; a batch reports the batch and the failing call), the base read failed, a cross-file member could not be prepared, or the composed result exceeded a limit. Nothing was written; a call whose own request is invalid is left out of the batch instead. Fix the cause and retry, otherwise call `read` for fresh anchors and retry. The batch abort names the failing call and its error code when one is known. |
 | `[E_GREP_FAILED]` | `grep` could not start ripgrep or ripgrep exited with an error (for example a pattern with backreferences or look-around, which ripgrep's regex engine does not support); the message carries ripgrep's output. Retry with `literal: true` or simplify the pattern. |
 | `[E_GREP_TIMEOUT]` | `grep` timed out after 10 seconds; narrow `path` or simplify `pattern` and retry. |
 

package/index.ts

@@ -33,7 +33,7 @@ import {
   setDisableOnModelsFromText,
 } from "./src/config";
 import { loadHashStore, pruneMissing } from "./src/hash-store";
-import { type AnchorSessionContext, initRegistry, gcRegistrySidecars, clearRegistry, freeAnchors, freeAnchorsForPaths, sessionKeyFor, withAnchorSession, releaseRegistrySession, formatAnchorReclaimNotice, takeReclaimedPaths } from "./src/anchor-registry";
+import { type AnchorSessionContext, initRegistry, gcRegistrySidecars, clearRegistry, freeAnchors, freeAnchorsForPaths, sessionKeyFor, sessionContextReadable, withAnchorSession, releaseRegistrySession, formatAnchorReclaimNotice, takeReclaimedPaths } from "./src/anchor-registry";
 import { serveRows } from "./src/served";
 import { finalizeTurn, planAssistantMessage } from "./src/batch";
 import { currentEditFlags } from "./src/edit-common";
@@ -154,14 +154,7 @@ export default function (pi: ExtensionAPI): void {
     const key = sessionKeyFor(ctx);
     const entry: PendingRegistrySession = {
       key,
-      alive: () => {
-        try {
-          void ctx?.sessionManager;
-          return true;
-        } catch {
-          return false;
-        }
-      },
+      alive: () => sessionContextReadable(ctx),
     };
     const index = key === undefined ? -1 : pendingRegistrySessions.findIndex((candidate) => candidate.key === key);
     if (index >= 0) pendingRegistrySessions[index] = entry;
@@ -174,7 +167,8 @@ export default function (pi: ExtensionAPI): void {
     releaseRegistrySession(key);
   }
 
-  async function withRegistrySession<T>(ctx: AnchorSessionContext | undefined, fn: () => Promise<T> | T): Promise<T> {
+  async function withRegistrySession<T>(ctx: AnchorSessionContext | undefined, fn: () => Promise<T> | T): Promise<T | undefined> {
+    if (!sessionContextReadable(ctx)) return undefined;
     captureRegistrySession(ctx);
     return withAnchorSession(ctx, fn);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "6.4.5",
+  "version": "6.4.6",
   "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/src/anchor-registry.ts

@@ -406,7 +406,7 @@ async function ensureRegistryForKey(key: string, sessionFile: string | undefined
   try {
     await promise;
   } finally {
-    pendingInits.delete(key);
+    if (pendingInits.get(key) === promise) pendingInits.delete(key);
   }
 }
 
@@ -435,6 +435,15 @@ function sessionFileFor(ctx: AnchorSessionContext | undefined): string | undefin
   return typeof sessionFile === "string" && sessionFile.length > 0 ? sessionFile : undefined;
 }
 
+export function sessionContextReadable(ctx: AnchorSessionContext | undefined): boolean {
+  try {
+    void ctx?.sessionManager;
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export async function withAnchorSession<T>(ctx: AnchorSessionContext | undefined, fn: () => Promise<T> | T): Promise<T> {
   const key = sessionKeyFor(ctx);
   if (key === undefined) return fn();
@@ -712,6 +721,9 @@ export function ownersForPath(path: string): Map<string, string> {
 export function ensureRegistry(): void {
   const key = activeKey();
   if (key && registries.has(key)) return;
+  if (sessionScope.getStore() !== undefined) {
+    throw new Error("[E_REGISTRY] The anchor registry for this session is no longer available; the session was replaced or reloaded. Retry the operation in the new session.");
+  }
   initRegistry(undefined).catch(() => undefined);
 }
 
@@ -973,8 +985,18 @@ export async function allocateFileAnchors(
     if (previousState && snapshotMatchesAllocation(registry, path, previousState.contentChecksum)) {
       prevAnchors = previousState.anchors;
       prevChecksums = previousState.checksums;
-      if (!prevChecksums && previousState.contentChecksum === contentChecksum(content)) {
-        prevChecksums = checksums;
+      if (!prevChecksums) {
+        if (previousState.contentChecksum === contentChecksum(content)) {
+          prevChecksums = checksums;
+        } else if (!shadow) {
+          const state = current();
+          const stale = state && prevAnchors ? prevAnchors.filter((anchor) => state.owned.get(anchor)?.path === path) : [];
+          if (state && stale.length > 0) {
+            const usedAt = state.lastUsedAt.get(path);
+            freeAnchors(path, stale);
+            if (usedAt !== undefined) state.lastUsedAt.set(path, usedAt);
+          }
+        }
       }
     }
   }

package/src/batch.ts

@@ -505,7 +505,7 @@ function batchPlaceholder(member: PlannedMember, piece: BatchPiece, snapshotId:
     edits_noop: piece.noop ? 1 : 0,
     warnings: 0,
     classification: piece.noop ? "noop" : "applied",
-    ...(piece.noop ? {} : { added_lines: added, removed_lines: piece.end - piece.start + 1 }),
+    ...(piece.noop ? {} : { added_lines: added, removed_lines: Math.max(0, piece.end - piece.start + 1 - piece.foldedLines) }),
   };
   const structuredContent: EditStructured = {
     ok: true,
@@ -1102,7 +1102,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
   let added = 0;
   let removed = 0;
   for (const piece of appliedPieces) {
-    removed += piece.end - piece.start + 1;
+    removed += Math.max(0, piece.end - piece.start + 1 - piece.foldedLines);
     added += Math.max(0, piece.newLines.length - piece.foldedLines);
   }
   const verb = batchVerb(runtime);

package/src/commit.ts

@@ -14,6 +14,28 @@ import { spanForEdit } from "./replace";
 import { restoreEndings, stripBOM, toLF, type LineEnding } from "./normalize";
 import { applyEndingOverrides, joinSeparators, separatorsForSpans } from "./line-endings";
 import { toEditVerb } from "./structured";
+export type FileStateSinceRead = "unchanged" | "deleted" | "changed";
+
+export async function fileStateSinceRead(
+  mutationTargetPath: string,
+  displayPath: string,
+  expectedNormalized: string,
+  signal?: AbortSignal,
+): Promise<FileStateSinceRead> {
+  abortIf(signal);
+  let raw: string | undefined;
+  try {
+    raw = await readFile(mutationTargetPath, "utf-8");
+  } catch (error) {
+    const code = errCode(error);
+    if (code === "ENOENT") raw = undefined;
+    else if (code === "EACCES" || code === "EPERM") throw new Error(`[E_ACCESS] File is not readable: ${displayPath}`);
+    else if (code === "ELOOP") throw new Error(`[E_ACCESS] Too many symbolic links while resolving: ${displayPath}`);
+    else throw mapIoError(error, "read", displayPath);
+  }
+  if (raw === undefined) return "deleted";
+  return toLF(stripBOM(raw).text) === expectedNormalized ? "unchanged" : "changed";
+}
 export interface CommitMeta {
   editAnchors?: [string, string];
   anchorCarry?: number;
@@ -91,21 +113,11 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     );
   }
 
-  abortIf(signal);
-  let currentRaw: string | undefined;
-  try {
-    currentRaw = await readFile(mutationTargetPath, "utf-8");
-  } catch (error) {
-    const code = errCode(error);
-    if (code === "ENOENT") currentRaw = undefined;
-    else if (code === "EACCES" || code === "EPERM") throw new Error(`[E_ACCESS] File is not readable: ${path}`);
-    else if (code === "ELOOP") throw new Error(`[E_ACCESS] Too many symbolic links while resolving: ${path}`);
-    else throw mapIoError(error, "read", path);
-  }
-  if (currentRaw === undefined) {
+  const state = await fileStateSinceRead(mutationTargetPath, path, pipe.originalNormalized, signal);
+  if (state === "deleted") {
     throw new Error(`[E_OP_ABORTED] Edit aborted: the file was deleted after the edit started.`);
   }
-  if (toLF(stripBOM(currentRaw).text) !== pipe.originalNormalized) {
+  if (state === "changed") {
     throw new Error(`[E_OP_ABORTED] Edit aborted: the file changed after the edit started. Call read for fresh anchors and retry.`);
   }
   const undo = await saveUndo(mutationTargetPath, {
@@ -141,7 +153,7 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     firstChangedLine: pipe.firstChangedLine,
     lastChangedLine: pipe.lastChangedLine,
     addedLines: Math.max(0, pipe.totalAddedLines - (meta.foldedAnchorLines ?? 0)),
-    removedLines: pipe.totalRemovedLines,
+    removedLines: Math.max(0, pipe.totalRemovedLines - (meta.foldedAnchorLines ?? 0)),
   };
 
   let resultHashes: string[];

package/src/copy-move.ts

@@ -3,7 +3,7 @@ import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateHead, withFil
 import { Type } from "typebox";
 import { constants } from "node:fs";
 import { execPipeline, noteAnchorError, previewFromPipe, previewError, type PipelineResult, type ReplaceDetails } from "./replace";
-import { commitEdit } from "./commit";
+import { commitEdit, fileStateSinceRead } from "./commit";
 import { readNormFile, safeSnapId, type NormFile } from "./file-reader";
 import { preEditSnapshotFor } from "./pre-edit-snapshot";
 import {
@@ -377,6 +377,17 @@ async function commitMovePair(input: {
     warnings.push("Non-UTF-8 bytes were shown as U+FFFD; this edit rewrote the file as UTF-8.");
   }
 
+  const destinationState = await fileStateSinceRead(input.destination.mutationTargetPath, input.destination.displayPath, input.destination.pipe.originalNormalized, input.signal);
+  if (destinationState !== "unchanged") {
+    const verb = destinationState === "deleted" ? "was deleted" : "changed";
+    throw new Error(`[E_OP_ABORTED] Edit aborted: ${input.destination.displayPath} ${verb} after the move started. Call read for fresh anchors and retry.`);
+  }
+  const sourceState = await fileStateSinceRead(input.source.mutationTargetPath, input.source.displayPath, input.source.pipe.originalNormalized, input.signal);
+  if (sourceState !== "unchanged") {
+    const verb = sourceState === "deleted" ? "was deleted" : "changed";
+    throw new Error(`[E_OP_ABORTED] Edit aborted: ${input.source.displayPath} ${verb} after the move started. Call read for fresh anchors and retry.`);
+  }
+
   const undoDestination = await saveUndo(input.destination.mutationTargetPath, pairEntry(input.destination.pipe, destinationSeparators));
   if (!undoDestination.persisted) {
     throw new Error(`[E_UNDO_UNAVAILABLE] Could not persist undo history for ${input.destination.displayPath}. Nothing was written.`);
@@ -451,7 +462,7 @@ async function commitMovePair(input: {
       firstChangedLine: input.destination.pipe.firstChangedLine,
       lastChangedLine: input.destination.pipe.lastChangedLine,
       addedLines: Math.max(0, input.destination.pipe.totalAddedLines - input.destination.foldedAnchorLines),
-      removedLines: input.destination.pipe.totalRemovedLines,
+      removedLines: Math.max(0, input.destination.pipe.totalRemovedLines - input.destination.foldedAnchorLines),
     },
     ...(destinationSpan !== undefined ? { spans: [destinationSpan] } : {}),
   }, "moved", contextLines);

package/src/write-hook.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { HASH_CLASS } from "./hashline/alphabet";
 import { HASH_SEP } from "./hashline/hash";
-import { servedForPath, withAnchorSession } from "./anchor-registry";
+import { sessionContextReadable, servedForPath, withAnchorSession, type AnchorSessionContext } from "./anchor-registry";
 import { resolveInCwd } from "./fs-write";
 import { abortIf, splitLines, isRec } from "./utils";
 import type { ModelLike } from "./model-gate";
@@ -31,8 +31,12 @@ export async function servedHashEchoDenial(rawPath: string, content: string, cwd
   return `[E_WRITE_HASH_ECHO] Refused write to ${rawPath}: line ${echo.line} contains the copied ${echo.hash}${HASH_SEP} anchor served for this file. Remove the copied anchors and retry.`;
 }
 
+function withReadableSession<T>(ctx: AnchorSessionContext | undefined, fn: () => Promise<T> | T): Promise<T | undefined> {
+  return sessionContextReadable(ctx) ? withAnchorSession(ctx, fn) : Promise.resolve(undefined);
+}
+
 export function registerWriteHook(pi: ExtensionAPI, isModelDisabled?: (model: ModelLike | undefined) => boolean): void {
-  pi.on("tool_call", async (event, ctx) => withAnchorSession(ctx, async () => {
+  pi.on("tool_call", async (event, ctx) => withReadableSession(ctx, async () => {
     if (event.toolName !== "write") return;
     if (isModelDisabled?.(ctx.model)) return;
     const input = event.input as Record<string, unknown> | undefined;