pi-hashline-edit-pro 4.3.2 → 4.3.4

package/src/hash-store.ts

@@ -3,7 +3,7 @@ import { existsSync } from "node:fs";
 import { chmod, readFile, rename, mkdir, stat } from "node:fs/promises";
 import { hashStorePath, hashStoreDir, legacyHashStorePath } from "./paths";
 import { errCode, isRec, splitLines } from "./utils";
-import { initHasher, contentChecksum } from "./hashline/hasher";
+import { initHasher, contentChecksum, lineChecksum } from "./hashline/hasher";
 import { HASH_STORE_VERSION, HASH_STORE_BUSY_TIMEOUT } from "./constants";
 import {
   isValidHashList,
@@ -22,6 +22,7 @@ import { snapshotCache, cacheSnapshot, SNAPSHOT_CACHE_LIMIT } from "./hash-store
 export { isValidHashList, parseHashList, parseStoredHashes, isCorruptionError };
 export { SNAPSHOT_CACHE_LIMIT };
 export const STORE_NOT_OPEN_MESSAGE = "Hash store is not open; transactional update aborted";
+export const STORE_SHUT_DOWN_MESSAGE = "Hash store was shut down while it was opening; call loadHashStore again.";
 
 type SqlParams = (string | number | null)[];
 
@@ -143,15 +144,16 @@ export interface UndoRecord {
 let cachedDb: { path: string; db: RawDb; stmts: Prepared } | null = null;
 let opening: { path: string; promise: Promise<HashStore> } | null = null;
 let exitHandlerRegistered = false;
+let storeEpoch = 0;
+const liveDbs = new Set<RawDb>();
 
 function openDb(storePath: string): { db: RawDb; stmts: Prepared } {
   const db = openDbFn(storePath);
+  liveDbs.add(db);
   try {
     return buildStore(db);
   } catch (error) {
-    try {
-      db.close();
-    } catch {}
+    shutdownDb(db);
     throw error;
   }
 }
@@ -259,11 +261,15 @@ async function quarantineStore(storePath: string): Promise<void> {
 }
 
 function shutdownDb(db: RawDb): void {
+  if (!liveDbs.delete(db)) return;
   try {
     db.exec("PRAGMA wal_checkpoint(TRUNCATE)");
   } catch {
   }
-  db.close();
+  try {
+    db.close();
+  } catch {
+  }
 }
 
 async function openStore(storePath: string): Promise<HashStore> {
@@ -271,6 +277,7 @@ async function openStore(storePath: string): Promise<HashStore> {
     return { stmts: cachedDb.stmts, engine: sqliteEngine };
   }
   if (cachedDb) shutdownHashStore();
+  const epoch = storeEpoch;
   await initHasher();
   await mkdir(hashStoreDir(), { recursive: true, mode: 0o700 });
   if (process.platform !== "win32") {
@@ -327,6 +334,10 @@ async function openStore(storePath: string): Promise<HashStore> {
       console.error("Hash store migration failed; continuing without legacy import:", error);
     }
   }
+  if (storeEpoch !== epoch) {
+    shutdownDb(db);
+    throw new Error(STORE_SHUT_DOWN_MESSAGE);
+  }
   cachedDb = { path: storePath, db, stmts };
 
   if (!exitHandlerRegistered) {
@@ -352,17 +363,20 @@ export function loadHashStore(): Promise<HashStore> {
     return opening.promise;
   }
   const promise = openStore(storePath).finally(() => {
-    if (opening?.path === storePath) opening = null;
+    if (opening?.promise === promise) opening = null;
   });
   opening = { path: storePath, promise };
   return promise;
 }
 
 export function shutdownHashStore(): void {
+  storeEpoch += 1;
   if (cachedDb) {
     shutdownDb(cachedDb.db);
     cachedDb = null;
   }
+  for (const db of [...liveDbs]) shutdownDb(db);
+  opening = null;
   snapshotCache.clear();
 }
 
@@ -426,7 +440,7 @@ async function migrateLegacy(db: RawDb): Promise<void> {
       contentChecksum(value.content),
       splitLines(value.content).length,
       JSON.stringify(value.hashes),
-      "",
+      JSON.stringify(splitLines(value.content).map(lineChecksum)),
       Date.now(),
     ]);
   }

package/src/hashline/apply.ts

@@ -179,7 +179,7 @@ export function planEdit(
 ): PlannedEdit {
   const signal = options?.signal;
   abortIf(signal);
-  const fileLines = options?.baseFileLines ?? buildIdx(content).fileLines;
+  const fileLines = options?.baseFileLines ?? splitLines(content);
   const lineIndex = { fileLines };
   const fileHashes = precomputedHashes;
   const warnings: string[] = [];

package/src/hashline/hash.ts

@@ -1,8 +1,8 @@
-import { splitLines, truncateToBytes, getCached } from "../utils";
-import { MAX_HASH_SOURCE_BYTES } from "../constants";
+import { splitLines, getCached } from "../utils";
 import { loadHashStore, type HashStore } from "../hash-store";
 import { allocateFileAnchors } from "../anchor-registry";
-import { xxh32, initHasher, contentChecksum } from "./hasher";
+import { xxh32, initHasher, canon, hashSource, lineChecksum } from "./hasher";
+export { canon, hashSource, lineChecksum };
 import { HASH_LEN, ANCHOR_COUNT, anchorAt, HASH_CLASS, HASH_RUN } from "./alphabet";
 export { initHasher, HASH_LEN, HASH_CLASS, HASH_RUN };
 
@@ -48,18 +48,6 @@ export function stripRowPrefix(line: string): StrippedRow {
 	return { text: line, kind: null, hash: undefined };
 }
 
-export function canon(line: string): string {
-	return line.replace(/\r/g, "").trimEnd();
-}
-
-export function hashSource(line: string): string {
-	return truncateToBytes(canon(line), MAX_HASH_SOURCE_BYTES);
-}
-
-export function lineChecksum(line: string): string {
-	return contentChecksum(hashSource(line));
-}
-
 const BITSET_WORDS = Math.ceil(HASH_SPACE / 32);
 
 function getBit(bits: Uint32Array, idx: number): boolean {

package/src/hashline/hasher.ts

@@ -1,4 +1,6 @@
 import xxhash from "xxhash-wasm";
+import { truncateToBytes } from "../utils";
+import { MAX_HASH_SOURCE_BYTES } from "../constants";
 
 export type Hasher = {
 	h32(input: string, seed?: number): number;
@@ -30,4 +32,16 @@ export function xxh32(input: string, seed = 0): number {
 
 export function contentChecksum(content: string): string {
 	return getH().h64ToString(content);
-}
+}
+
+export function canon(line: string): string {
+  return line.replace(/\r/g, "").trimEnd();
+}
+
+export function hashSource(line: string): string {
+  return truncateToBytes(canon(line), MAX_HASH_SOURCE_BYTES);
+}
+
+export function lineChecksum(line: string): string {
+  return contentChecksum(hashSource(line));
+}

package/src/insert.ts

@@ -17,7 +17,7 @@ export { assertInsertReq, type InsertReq };
 
 const insertAnchorSchema = Type.String({
   description:
-    'Bare 4-char anchor from a read row (the text before the `│` separator), never the row content. A pasted diff row or `anchor│` prefix is stripped with a warning. The anchor line is preserved; lines go after or before it.',
+    'Bare 4-char anchor from a served anchor│content row (the text before the `│` separator), never the row content. A pasted diff row or `anchor│` prefix is stripped with a warning. The anchor line is preserved; lines go after or before it.',
 });
 
 const insertDirectionSchema = Type.Union(

package/src/paths.ts

@@ -1,5 +1,5 @@
 import { homedir } from "node:os";
-import { isAbsolute, resolve as resolvePath, join, dirname } from "node:path";
+import { isAbsolute, relative, resolve as resolvePath, join, dirname } from "node:path";
 
 
 function homeBase(): string {
@@ -50,3 +50,7 @@ export function toCwd(filePath: string, cwd: string): string {
   const expanded = expand(filePath);
   return isAbsolute(expanded) ? expanded : resolvePath(cwd, expanded);
 }
+
+export function toDisplayPath(cwd: string, absolutePath: string, fallback?: string): string {
+  return relative(cwd, absolutePath).replace(/\\/g, "/") || (fallback ?? absolutePath);
+}

package/src/payload-contract.ts

@@ -14,12 +14,12 @@ const replacementLinesSchema = Type.Array(
 
 const removeFromSchema = Type.String({
   description:
-    "Bare 4-char anchor from a read row (the text before the `│` separator), never the row content. Marks the FIRST line to remove (inclusive)",
+    "Bare 4-char anchor from a served anchor│content row (the text before the `│` separator), never the row content. Marks the FIRST line to remove (inclusive)",
 });
 
 const removeToSchema = Type.String({
   description:
-    "Bare 4-char anchor from a read row (the text before the `│` separator), never the row content. Marks the LAST line to remove (inclusive)",
+    "Bare 4-char anchor from a served anchor│content row (the text before the `│` separator), never the row content. Marks the LAST line to remove (inclusive)",
 });
 const pathRequiredSchema = Type.String({
   description:

package/src/read.ts

@@ -17,8 +17,11 @@ import { abortIf, makePrepareArguments, numberedRead, visLines, splitLines } fro
 import { loadP, loadGuide } from "./prompts";
 import { withReadPrompts, DEFAULT_EDIT_FLAGS, type EditToolFlags } from "./edit-common";
 import { valAccess } from "./validation";
-import { withAnchorSession } from "./anchor-registry";
+import { readConfig } from "./config";
+import { resolveTarget } from "./fs-write";
+import { withAnchorSession, servedForPath } from "./anchor-registry";
 import { serveRows } from "./served";
+import { getAutoReadAllSnapshot } from "./auto-read-all-state";
 import { Text } from "@earendil-works/pi-tui";
 const R_DESC = loadP("../prompts/read.md");
 const R_SNIPPET = loadP("../prompts/read-snippet.md");
@@ -210,6 +213,22 @@ export function regRead(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FL
 
 				abortIf(signal);
 				await valAccess(absolutePath, rawPath);
+                const autoReadAllMode = (await readConfig()).autoReadAll ?? "off";
+                if (autoReadAllMode !== "off") {
+                  const canonical = await resolveTarget(absolutePath).catch(() => undefined);
+                  if (canonical !== undefined) {
+                    const stored = getAutoReadAllSnapshot(canonical);
+                    if (stored !== undefined) {
+                      const current = await safeSnapId(canonical, "auto-read-all guard");
+                      if (current !== undefined && current === stored) {
+                        const served = servedForPath(canonical);
+                        if (served !== undefined && served.size > 0) {
+                          throw new Error(`[E_AUTO_READ_ALL] ${rawPath} is unchanged since this session's start-of-session auto-read, so the attached content is still exact. Read succeeds on files that have changed since the full auto read.`);
+                        }
+                      }
+                    }
+                  }
+                }
 
 				abortIf(signal);
 				const file = await loadFileKindAndText(absolutePath, { maxLines: MAX_HASH_LINES, displayPath: rawPath });

package/src/replace-undo.ts

@@ -13,6 +13,7 @@ import { genDiff, genPatch, spansFromHashes } from "./replace-diff";
 import { getDiffContextLines } from "./config";
 import { cntDiff, errCode, makePrepareArguments, splitLines } from "./utils";
 import { loadP, loadGuide } from "./prompts";
+import { withUndoPrompts, DEFAULT_EDIT_FLAGS, type EditToolFlags } from "./edit-common";
 import { buildMetrics } from "./replace-response";
 import { renderEditResult, fmtCall } from "./replace-render";
 import { Text } from "@earendil-works/pi-tui";
@@ -102,13 +103,18 @@ function fallbackFileMode(): number {
   return 0o666 & ~process.umask();
 }
 
-export function regUndo(pi: ExtensionAPI): void {
+export function regUndo(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FLAGS): void {
+  const prompted = withUndoPrompts({
+    description: loadP("../prompts/undo-last-change.md"),
+    snippet: loadP("../prompts/undo-last-change-snippet.md"),
+    guidelines: loadGuide("../prompts/undo-last-change-guidelines.md"),
+  }, flags);
   pi.registerTool({
     name: "undo_last_change",
     label: "Undo Last Change",
-    description: loadP("../prompts/undo-last-change.md"),
-    promptSnippet: loadP("../prompts/undo-last-change-snippet.md"),
-    promptGuidelines: loadGuide("../prompts/undo-last-change-guidelines.md"),
+    description: prompted.description,
+    promptSnippet: prompted.snippet,
+    promptGuidelines: prompted.guidelines,
     prepareArguments: makePrepareArguments(),
     parameters: Type.Object({
       path: Type.String({

package/src/replace.ts

@@ -3,7 +3,6 @@ import type {
   ToolDefinition,
 } from "@earendil-works/pi-coding-agent";
 import { constants } from "node:fs";
-import { relative } from "node:path";
 import {
   genDiff,
   type DiffSpan,
@@ -31,7 +30,7 @@ import {
 import { loadHashStore, type HashStore } from "./hash-store";
 import { adoptAnchors, servedForPath, withAnchorSession } from "./anchor-registry";
 import { resolveTarget } from "./fs-write";
-import { toCwd } from "./paths";
+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 { batchMemberFor, executeBatchMember, noteBatchFailure } from "./batch";
@@ -148,7 +147,7 @@ export async function execPipeline(
   const { normalized: originalNormalized, bom, originalEnding, fileHashes: originalHashes, hadUtf8DecodeErrors, absolutePath, identity } = await readNormFile(
     targetPath, cwd, { signal: options?.signal, accessMode: options?.accessMode, maxLines: MAX_HASH_LINES, store: hashStore, noPersist: options?.noPersist, allocation: options?.noPersist ? "shadow" : "real", preloadedNorm: options?.preloadedNorm },
   );
-  const displayPath = relative(cwd, absolutePath).replace(/\\/g, "/") || targetPath;
+  const displayPath = toDisplayPath(cwd, absolutePath, targetPath);
 
   const dedupMode = await getBoundaryDedupMode();
   const effectiveSkipBoundaryDedup = options?.skipBoundaryDedup === true || dedupMode === "off";

package/src/utils.ts

@@ -20,6 +20,14 @@ export function normalizeAnchors(record: Record<string, unknown>): void {
     record.remove_to = record.replace_to;
     delete record.replace_to;
   }
+  if (typeof record.remove_from !== "string" && typeof record.from === "string") {
+    record.remove_from = record.from;
+    delete record.from;
+  }
+  if (typeof record.remove_to !== "string" && typeof record.to === "string") {
+    record.remove_to = record.to;
+    delete record.to;
+  }
 }
 
 export function normalizeRequest(input: unknown): unknown {
@@ -137,7 +145,7 @@ export function isHashRow(line: string): boolean {
 	return /^[A-Za-z0-9]{4}│/.test(line);
 }
 
-function gutterWidth(max: number, fallback: number): number {
+export function gutterWidth(max: number, fallback: number): number {
 	return String(max || fallback).length;
 }