@wrongstack/tools 0.306.2 → 0.306.4

package/dist/patch.js

@@ -55,8 +55,9 @@ async function resolveRealInsideRoot(absPath, ctx) {
       }
       throw err;
     }
-    if (isInsideAny(real, realRoots)) {
-      return pendingTail.length > 0 ? path.join(real, ...pendingTail) : real;
+    const candidate = pendingTail.length > 0 ? path.join(real, ...pendingTail) : real;
+    if (isInsideAny(candidate, realRoots)) {
+      return candidate;
     }
     throw new Error(
       `Path "${absPath}" resolves through a symlink outside project root "${realRoots[0]}"`

package/dist/read.js

@@ -2753,8 +2753,9 @@ async function resolveRealInsideRoot(absPath, ctx) {
       }
       throw err;
     }
-    if (isInsideAny(real, realRoots)) {
-      return pendingTail.length > 0 ? path.join(real, ...pendingTail) : real;
+    const candidate = pendingTail.length > 0 ? path.join(real, ...pendingTail) : real;
+    if (isInsideAny(candidate, realRoots)) {
+      return candidate;
     }
     throw new Error(
       `Path "${absPath}" resolves through a symlink outside project root "${realRoots[0]}"`
@@ -2858,6 +2859,7 @@ var indexCircuitBreaker = new IndexCircuitBreaker();
 // src/codebase-index/indexer.ts
 import { expectDefined as expectDefined5 } from "@wrongstack/core/utils";
 import { execFile } from "node:child_process";
+import { createHash as createHash2 } from "node:crypto";
 import * as fs9 from "node:fs/promises";
 import { availableParallelism } from "node:os";
 import * as path13 from "node:path";
@@ -4178,6 +4180,85 @@ function runSqliteWithRetry(fn) {
   throw lastError;
 }
 
+// src/codebase-index/vector-search.ts
+var RRF_K = 60;
+var VECTOR_DIMENSIONS = 384;
+var NGRAM_SIZE = 3;
+function embedText(text) {
+  const vec = new Float32Array(VECTOR_DIMENSIONS);
+  const normalized = text.toLowerCase().trim();
+  if (normalized.length < NGRAM_SIZE) {
+    const padded = ` ${normalized} `.slice(0, Math.max(NGRAM_SIZE, normalized.length + 2));
+    for (let i = 0; i <= padded.length - NGRAM_SIZE; i++) {
+      const ngram = padded.slice(i, i + NGRAM_SIZE);
+      const bucket = hashNgram(ngram) % VECTOR_DIMENSIONS;
+      vec[bucket] += 1;
+    }
+  } else {
+    for (let i = 0; i <= normalized.length - NGRAM_SIZE; i++) {
+      const ngram = normalized.slice(i, i + NGRAM_SIZE);
+      const bucket = hashNgram(ngram) % VECTOR_DIMENSIONS;
+      vec[bucket] += 1;
+    }
+  }
+  let norm = 0;
+  for (let i = 0; i < VECTOR_DIMENSIONS; i++) {
+    norm += vec[i] * vec[i];
+  }
+  norm = Math.sqrt(norm);
+  if (norm > 0) {
+    for (let i = 0; i < VECTOR_DIMENSIONS; i++) {
+      vec[i] /= norm;
+    }
+  }
+  return vec;
+}
+function hashNgram(str) {
+  let hash = 2166136261;
+  for (let i = 0; i < str.length; i++) {
+    hash ^= str.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return hash >>> 0;
+}
+function cosineSimilarity(a, b) {
+  let dot = 0;
+  const len = Math.min(a.length, b.length);
+  for (let i = 0; i < len; i++) {
+    dot += a[i] * b[i];
+  }
+  return dot;
+}
+function encodeVector(vec) {
+  return Buffer.from(vec.buffer, vec.byteOffset, vec.byteLength);
+}
+function decodeVector(buf) {
+  const view = new DataView(
+    buf.buffer,
+    buf.byteOffset,
+    buf.byteLength
+  );
+  const copy = new Float32Array(buf.byteLength / 4);
+  for (let i = 0; i < copy.length; i++) {
+    copy[i] = view.getFloat32(i * 4, true);
+  }
+  return copy;
+}
+function reciprocalRankFusion(bm25Ranks, vectorRanks, k = RRF_K) {
+  const allIds = /* @__PURE__ */ new Set([...bm25Ranks.keys(), ...vectorRanks.keys()]);
+  const scored = [];
+  for (const id of allIds) {
+    const bm25Rank = bm25Ranks.get(id);
+    const vecRank = vectorRanks.get(id);
+    let score = 0;
+    if (bm25Rank !== void 0) score += 1 / (k + bm25Rank);
+    if (vecRank !== void 0) score += 1 / (k + vecRank);
+    scored.push([id, score]);
+  }
+  scored.sort((a, b) => b[1] - a[1]);
+  return scored;
+}
+
 // src/codebase-index/writer-admin.ts
 import * as fs7 from "node:fs";
 import * as path11 from "node:path";
@@ -5237,90 +5318,19 @@ var StorePool = class {
   }
 };
 
-// src/codebase-index/vector-search.ts
-var RRF_K = 60;
-var VECTOR_DIMENSIONS = 384;
-var NGRAM_SIZE = 3;
-function embedText(text) {
-  const vec = new Float32Array(VECTOR_DIMENSIONS);
-  const normalized = text.toLowerCase().trim();
-  if (normalized.length < NGRAM_SIZE) {
-    const padded = ` ${normalized} `.slice(0, Math.max(NGRAM_SIZE, normalized.length + 2));
-    for (let i = 0; i <= padded.length - NGRAM_SIZE; i++) {
-      const ngram = padded.slice(i, i + NGRAM_SIZE);
-      const bucket = hashNgram(ngram) % VECTOR_DIMENSIONS;
-      vec[bucket] += 1;
-    }
-  } else {
-    for (let i = 0; i <= normalized.length - NGRAM_SIZE; i++) {
-      const ngram = normalized.slice(i, i + NGRAM_SIZE);
-      const bucket = hashNgram(ngram) % VECTOR_DIMENSIONS;
-      vec[bucket] += 1;
-    }
-  }
-  let norm = 0;
-  for (let i = 0; i < VECTOR_DIMENSIONS; i++) {
-    norm += vec[i] * vec[i];
-  }
-  norm = Math.sqrt(norm);
-  if (norm > 0) {
-    for (let i = 0; i < VECTOR_DIMENSIONS; i++) {
-      vec[i] /= norm;
-    }
-  }
-  return vec;
-}
-function hashNgram(str) {
-  let hash = 2166136261;
-  for (let i = 0; i < str.length; i++) {
-    hash ^= str.charCodeAt(i);
-    hash = Math.imul(hash, 16777619);
-  }
-  return hash >>> 0;
-}
-function cosineSimilarity(a, b) {
-  let dot = 0;
-  const len = Math.min(a.length, b.length);
-  for (let i = 0; i < len; i++) {
-    dot += a[i] * b[i];
-  }
-  return dot;
-}
-function encodeVector(vec) {
-  return Buffer.from(vec.buffer, vec.byteOffset, vec.byteLength);
-}
-function decodeVector(buf) {
-  const view = new DataView(
-    buf.buffer,
-    buf.byteOffset,
-    buf.byteLength
-  );
-  const copy = new Float32Array(buf.byteLength / 4);
-  for (let i = 0; i < copy.length; i++) {
-    copy[i] = view.getFloat32(i * 4, true);
-  }
-  return copy;
-}
-function reciprocalRankFusion(bm25Ranks, vectorRanks, k = RRF_K) {
-  const allIds = /* @__PURE__ */ new Set([...bm25Ranks.keys(), ...vectorRanks.keys()]);
-  const scored = [];
-  for (const id of allIds) {
-    const bm25Rank = bm25Ranks.get(id);
-    const vecRank = vectorRanks.get(id);
-    let score = 0;
-    if (bm25Rank !== void 0) score += 1 / (k + bm25Rank);
-    if (vecRank !== void 0) score += 1 / (k + vecRank);
-    scored.push([id, score]);
-  }
-  scored.sort((a, b) => b[1] - a[1]);
-  return scored;
-}
-
 // src/codebase-index/writer.ts
 var DB_FILE2 = "index.db";
 var MAX_STATEMENT_CACHE = 128;
 var IndexStore = class _IndexStore {
   db;
+  /**
+   * True while an index run owns one outer SQLite transaction. Individual
+   * writer methods normally protect themselves with BEGIN/COMMIT, but during
+   * a refresh they join this transaction so readers observe either the last
+   * completed index or the next completed index, never an in-between batch.
+   */
+  atomicIndexUpdateActive = false;
+  writeSavepointSequence = 0;
   /** Absolute path to this project's index directory. */
   indexDir;
   /**
@@ -5401,6 +5411,51 @@ var IndexStore = class _IndexStore {
   runWithRetry(fn) {
     return runSqliteWithRetry(fn);
   }
+  /** Run a complete index mutation as one WAL-visible publication. */
+  async runAtomicIndexUpdate(job) {
+    if (this.atomicIndexUpdateActive) return job();
+    this.runWithRetry(() => this.db.exec("BEGIN IMMEDIATE"));
+    this.atomicIndexUpdateActive = true;
+    try {
+      const result = await job();
+      this.db.exec("COMMIT");
+      return result;
+    } catch (error) {
+      try {
+        this.db.exec("ROLLBACK");
+      } catch {
+      }
+      throw error;
+    } finally {
+      this.atomicIndexUpdateActive = false;
+    }
+  }
+  /**
+   * Begin a method-local transaction. Inside an atomic index publication a
+   * SAVEPOINT preserves the old per-batch rollback boundary, which is needed
+   * when commitBatch falls back to per-file writes after one batch fails.
+   */
+  beginWriteTransaction() {
+    if (this.atomicIndexUpdateActive) {
+      const savepoint = `index_write_${++this.writeSavepointSequence}`;
+      this.db.exec(`SAVEPOINT ${savepoint}`);
+      return savepoint;
+    }
+    this.db.exec("BEGIN IMMEDIATE");
+    return null;
+  }
+  commitWriteTransaction(savepoint) {
+    if (savepoint) this.db.exec(`RELEASE SAVEPOINT ${savepoint}`);
+    else this.db.exec("COMMIT");
+  }
+  rollbackWriteTransaction(savepoint) {
+    if (savepoint) {
+      this.db.exec(`ROLLBACK TO SAVEPOINT ${savepoint}`);
+      this.db.exec(`RELEASE SAVEPOINT ${savepoint}`);
+    } else {
+      this.db.exec("ROLLBACK");
+    }
+  }
   /**
    * Mirror the in-process language→family map into SQLite.
    *
@@ -5635,7 +5690,7 @@ var IndexStore = class _IndexStore {
   insertSymbols(symbols) {
     this.invalidateBm25();
     return this.runWithRetry(() => {
-      this.db.exec("BEGIN IMMEDIATE");
+      const ownsTransaction = this.beginWriteTransaction();
       try {
         let nextId = this.allocateSymbolIds(symbols.length);
         const result = [];
@@ -5662,7 +5717,9 @@ var IndexStore = class _IndexStore {
           }
           vectorRows.push({
             id,
-            vector: encodeVector(embedText(s.text || buildIndexableText(s.name, s.signature, s.docComment)))
+            vector: encodeVector(
+              embedText(s.text || buildIndexableText(s.name, s.signature, s.docComment))
+            )
           });
           result.push({ ...s, id });
         }
@@ -5680,10 +5737,10 @@ var IndexStore = class _IndexStore {
             vectorRows
           );
         }
-        this.db.exec("COMMIT");
+        this.commitWriteTransaction(ownsTransaction);
         return result;
       } catch (err) {
-        this.db.exec("ROLLBACK");
+        this.rollbackWriteTransaction(ownsTransaction);
         throw err;
       }
     });
@@ -5691,7 +5748,7 @@ var IndexStore = class _IndexStore {
   deleteSymbolsForFile(file) {
     this.invalidateBm25();
     this.runWithRetry(() => {
-      this.db.exec("BEGIN IMMEDIATE");
+      const ownsTransaction = this.beginWriteTransaction();
       try {
         const affectedNames = this.invalidateIncomingRefsForFiles([file]);
         if (this.ftsAvailable) {
@@ -5706,9 +5763,9 @@ var IndexStore = class _IndexStore {
         }
         this.stmt("DELETE FROM symbols WHERE file_fk = ?").run(file);
         this.resolveRefsForNamesUnsafe(affectedNames);
-        this.db.exec("COMMIT");
+        this.commitWriteTransaction(ownsTransaction);
       } catch (error) {
-        this.db.exec("ROLLBACK");
+        this.rollbackWriteTransaction(ownsTransaction);
         throw error;
       }
     });
@@ -5721,7 +5778,7 @@ var IndexStore = class _IndexStore {
   deleteFile(file) {
     this.invalidateBm25();
     this.runWithRetry(() => {
-      this.db.exec("BEGIN IMMEDIATE");
+      const ownsTransaction = this.beginWriteTransaction();
       try {
         const affectedNames = this.invalidateIncomingRefsForFiles([file]);
         if (this.ftsAvailable) {
@@ -5740,9 +5797,9 @@ var IndexStore = class _IndexStore {
         this.stmt("DELETE FROM symbols WHERE file_fk = ?").run(file);
         this.stmt("DELETE FROM files WHERE file = ?").run(file);
         this.resolveRefsForNamesUnsafe(affectedNames);
-        this.db.exec("COMMIT");
+        this.commitWriteTransaction(ownsTransaction);
       } catch (err) {
-        this.db.exec("ROLLBACK");
+        this.rollbackWriteTransaction(ownsTransaction);
         throw err;
       }
     });
@@ -6129,7 +6186,7 @@ var IndexStore = class _IndexStore {
   clearAll() {
     this.invalidateBm25();
     this.runWithRetry(() => {
-      this.db.exec("BEGIN IMMEDIATE");
+      const ownsTransaction = this.beginWriteTransaction();
       try {
         this.db.exec("DROP TABLE IF EXISTS refs");
         this.db.exec("DROP TABLE IF EXISTS symbols");
@@ -6137,15 +6194,15 @@ var IndexStore = class _IndexStore {
         this.db.exec("DROP TABLE IF EXISTS metadata");
         if (this.ftsAvailable) this.db.exec("DROP TABLE IF EXISTS symbols_fts");
         this.db.exec("DROP TABLE IF EXISTS symbol_vectors");
-        this.db.exec("COMMIT");
         this.stmtCache.clear();
         this.initSchema();
         this.stmt("INSERT OR REPLACE INTO metadata(key, value) VALUES (?, ?)").run(
           _IndexStore.NEXT_SYMBOL_ID_KEY,
           "1"
         );
+        this.commitWriteTransaction(ownsTransaction);
       } catch (err) {
-        this.db.exec("ROLLBACK");
+        this.rollbackWriteTransaction(ownsTransaction);
         throw err;
       }
     });
@@ -6207,7 +6264,7 @@ var IndexStore = class _IndexStore {
     }
     this.invalidateBm25();
     return this.runWithRetry(() => {
-      this.db.exec("BEGIN IMMEDIATE");
+      const ownsTransaction = this.beginWriteTransaction();
       try {
         const affectedNames = /* @__PURE__ */ new Set();
         for (const entry of entries) {
@@ -6268,7 +6325,9 @@ var IndexStore = class _IndexStore {
             }
             vectorRows.push({
               id,
-              vector: encodeVector(embedText(s.text || buildIndexableText(s.name, s.signature, s.docComment)))
+              vector: encodeVector(
+                embedText(s.text || buildIndexableText(s.name, s.signature, s.docComment))
+              )
             });
             const inserted = { ...s, id };
             allInserted.push(inserted);
@@ -6313,10 +6372,10 @@ var IndexStore = class _IndexStore {
           );
         }
         this.resolveRefsForNamesUnsafe(affectedNames);
-        this.db.exec("COMMIT");
+        this.commitWriteTransaction(ownsTransaction);
         return allInserted;
       } catch (err) {
-        this.db.exec("ROLLBACK");
+        this.rollbackWriteTransaction(ownsTransaction);
         throw err;
       }
     });
@@ -6393,7 +6452,7 @@ var IndexStore = class _IndexStore {
   replaceEmptyFile(meta) {
     this.invalidateBm25();
     this.runWithRetry(() => {
-      this.db.exec("BEGIN IMMEDIATE");
+      const ownsTransaction = this.beginWriteTransaction();
       try {
         const affectedNames = this.invalidateIncomingRefsForFiles([meta.file]);
         if (this.ftsAvailable) {
@@ -6428,9 +6487,9 @@ var IndexStore = class _IndexStore {
           meta.lastIndexed
         );
         this.resolveRefsForNamesUnsafe(affectedNames);
-        this.db.exec("COMMIT");
+        this.commitWriteTransaction(ownsTransaction);
       } catch (err) {
-        this.db.exec("ROLLBACK");
+        this.rollbackWriteTransaction(ownsTransaction);
         throw err;
       }
     });
@@ -6623,6 +6682,10 @@ var DEFAULT_IGNORE_FILES = /* @__PURE__ */ new Set(["package-lock.json", "pnpm-l
 var INDEXABLE_EXTENSION_SET = new Set(INDEXABLE_EXTENSIONS);
 var MAX_INDEX_FILE_BYTES = 5 * 1024 * 1024;
 var MAX_GIT_FILE_LIST_BYTES = 64 * 1024 * 1024;
+var GIT_SNAPSHOT_METADATA_KEY = "git_discovery_snapshot";
+var IndexSourceChangedError = class extends Error {
+  name = "IndexSourceChangedError";
+};
 function isWithinProject(projectRoot, file) {
   const rel = path13.relative(projectRoot, file);
   return rel !== "" && !rel.startsWith(`..${path13.sep}`) && rel !== ".." && !path13.isAbsolute(rel);
@@ -6659,7 +6722,7 @@ async function findGitSourceFiles(projectRoot, ignore, signal) {
     if (normalizeComparablePath(topLevel) !== normalizeComparablePath(projectRoot)) return null;
     throwIfAborted(signal);
     const ignoreSet = /* @__PURE__ */ new Set([...DEFAULT_IGNORE, ...ignore]);
-    const [output, statusOutput] = await Promise.all([
+    const [output, statusOutput, stagedOutput] = await Promise.all([
       gitOutput(projectRoot, ["ls-files", "--cached", "--others", "--exclude-standard", "-z"]),
       gitOutput(projectRoot, [
         "status",
@@ -6667,7 +6730,8 @@ async function findGitSourceFiles(projectRoot, ignore, signal) {
         "-z",
         "--untracked-files=all",
         "--ignored=no"
-      ])
+      ]),
+      gitOutput(projectRoot, ["ls-files", "--stage", "-z"])
     ]);
     throwIfAborted(signal);
     const dirty = /* @__PURE__ */ new Set();
@@ -6697,9 +6761,17 @@ async function findGitSourceFiles(projectRoot, ignore, signal) {
       const ext = path13.extname(relative3).toLowerCase();
       if (INDEXABLE_EXTENSION_SET.has(ext) || detectLang(full) !== null) files.push(full);
     }
+    const snapshot = createHash2("sha256").update(stagedOutput).update("\0").update(statusOutput);
+    const indexedFiles = new Set(files);
+    for (const dirtyFile of [...dirty].sort()) {
+      if (!indexedFiles.has(dirtyFile) || deleted.has(dirtyFile)) continue;
+      snapshot.update("\0").update(dirtyFile).update("\0");
+      snapshot.update(xxhash64String(await fs9.readFile(dirtyFile, "utf8")));
+    }
     return {
       files,
-      trustedUnchanged: new Set(files.filter((file) => !dirty.has(file)))
+      trustedUnchanged: new Set(files.filter((file) => !dirty.has(file))),
+      snapshotKey: snapshot.digest("hex")
     };
   } catch {
     return null;
@@ -6712,7 +6784,8 @@ async function findSourceFiles(projectRoot, ignore, isGitIgnored, signal) {
       files: gitFiles.files,
       complete: true,
       errors: [],
-      trustedUnchanged: gitFiles.trustedUnchanged
+      trustedUnchanged: gitFiles.trustedUnchanged,
+      snapshotKey: gitFiles.snapshotKey
     };
   }
   const results = [];
@@ -6799,6 +6872,17 @@ async function resolveProjectRelations(store, projectRoot, opts) {
   }
 }
 async function runIndexerWithStore(store, opts) {
+  let result;
+  try {
+    result = await store.runAtomicIndexUpdate(() => runIndexerAtomic(store, opts));
+  } catch (error) {
+    if (!(error instanceof IndexSourceChangedError)) throw error;
+    result = await store.runAtomicIndexUpdate(() => runIndexerAtomic(store, opts));
+  }
+  if (!opts.files) store.compactIfNeeded();
+  return result;
+}
+async function runIndexerAtomic(store, opts) {
   const { projectRoot, langs, ignore = [], signal } = opts;
   const relationGraphVersion = "2";
   const refResolutionVersion = "2";
@@ -6818,6 +6902,7 @@ async function runIndexerWithStore(store, opts) {
   let discoveredFiles = null;
   let discoveryComplete = true;
   let trustedUnchanged;
+  let discoverySnapshotKey;
   if (opts.files && opts.files.length > 0) {
     files = opts.files.map((f) => path13.resolve(projectRoot, f)).filter((f) => {
       if (!isWithinProject(projectRoot, f)) return false;
@@ -6831,6 +6916,7 @@ async function runIndexerWithStore(store, opts) {
     discoveryComplete = discovery.complete;
     discoveredFiles = new Set(files);
     trustedUnchanged = discovery.trustedUnchanged;
+    discoverySnapshotKey = discovery.snapshotKey;
   }
   if (langs && langs.length > 0) {
     const langSet = new Set(langs);
@@ -6844,6 +6930,8 @@ async function runIndexerWithStore(store, opts) {
   if (!force) {
     for (const meta of store.getAllFileMetas()) existingMeta.set(meta.file, meta);
   }
+  const snapshotTrusted = !force && discoverySnapshotKey !== void 0 && store.getMetadata(GIT_SNAPSHOT_METADATA_KEY) === discoverySnapshotKey;
+  if (!snapshotTrusted) trustedUnchanged = void 0;
   const totalFilesForProgress = files.length;
   let filesPreSkipped = 0;
   if (!force && trustedUnchanged) {
@@ -6906,9 +6994,6 @@ async function runIndexerWithStore(store, opts) {
             };
           }
           const meta = existingMeta.get(file);
-          if (!force && meta && meta.mtimeMs === Math.floor(stat3.mtimeMs)) {
-            return { file, stat: stat3, lang, parsed: null, skippedMeta: meta };
-          }
           let content;
           try {
             content = await fs9.readFile(file, { encoding: "utf8", signal });
@@ -7137,9 +7222,18 @@ async function runIndexerWithStore(store, opts) {
   });
   store.setMetadata("ref_resolution_version", refResolutionVersion);
   store.setMetadata("relation_graph_version", relationGraphVersion);
+  const completeProjectScope = !opts.files && (!langs || langs.length === 0) && (!opts.ignore || opts.ignore.length === 0);
+  if (completeProjectScope && discoverySnapshotKey !== void 0) {
+    const finalSnapshot = await findGitSourceFiles(projectRoot, ignore, signal);
+    if (!finalSnapshot || finalSnapshot.snapshotKey !== discoverySnapshotKey) {
+      throw new IndexSourceChangedError(
+        "Project files changed during indexing; retrying before publishing the generation."
+      );
+    }
+    store.setMetadata(GIT_SNAPSHOT_METADATA_KEY, errors.length === 0 ? discoverySnapshotKey : "");
+  }
   if (!opts.files || filesIndexed >= 50) store.optimize();
   store.setLastIndexed(Date.now());
-  if (!opts.files) store.compactIfNeeded();
   const durationMs = Date.now() - startMs;
   return {
     filesIndexed,
@@ -7272,7 +7366,7 @@ function decodeBinaryFrame(payload) {
 }
 
 // src/codebase-index/project-server-endpoint.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import * as fs10 from "node:fs";
 import * as os3 from "node:os";
 import * as path14 from "node:path";
@@ -7290,7 +7384,7 @@ function projectIndexServerBuildId(entrypoint) {
     if (buildIdCache?.file === file && buildIdCache.mtimeMs === stat3.mtimeMs && buildIdCache.size === stat3.size) {
       return buildIdCache.buildId;
     }
-    const buildId = createHash2("sha256").update(fs10.readFileSync(file)).digest("hex").slice(0, 24);
+    const buildId = createHash3("sha256").update(fs10.readFileSync(file)).digest("hex").slice(0, 24);
     buildIdCache = { file, mtimeMs: stat3.mtimeMs, size: stat3.size, buildId };
     return buildId;
   } catch {
@@ -7303,7 +7397,7 @@ function normalizeLocalPath(value) {
 }
 function projectIndexServerKey(projectRoot, indexDir) {
   const resolvedIndexDir = normalizeLocalPath(resolveIndexDir(projectRoot, indexDir));
-  return createHash2("sha256").update(resolvedIndexDir).digest("hex").slice(0, 24);
+  return createHash3("sha256").update(resolvedIndexDir).digest("hex").slice(0, 24);
 }
 function projectIndexServerEndpoint(projectRoot, indexDir) {
   const key = projectIndexServerKey(projectRoot, indexDir);
@@ -8192,6 +8286,13 @@ function callIndexOp(op, args, opts) {
   });
 }
 async function callInline(op, args, opts) {
+  if (op !== "index" && _indexing) {
+    const error = new Error(
+      "Codebase index refresh in progress; retry after the completed generation is published."
+    );
+    error.name = "IndexRefreshInProgressError";
+    throw error;
+  }
   const ac = new AbortController();
   const onOuterAbort = () => ac.abort(opts.signal?.reason ?? new Error("Indexing cancelled"));
   if (opts.signal?.aborted) onOuterAbort();

package/dist/replace.js

@@ -139,6 +139,7 @@ var MAX_SUBJECT_LEN = 64 * 1024;
 
 // src/_util.ts
 import { createHash } from "node:crypto";
+import * as fsp from "node:fs/promises";
 import * as path from "node:path";
 import * as Core from "@wrongstack/core/utils";
 function sha256hex(content) {
@@ -165,6 +166,40 @@ function ensureInsideRoot(absPath, ctx) {
 function safeResolve(input, ctx) {
   return ensureInsideRoot(resolvePath(input, ctx), ctx);
 }
+async function resolveRealInsideRoot(absPath, ctx) {
+  if (ctx.allowOutsideProjectRoot) return absPath;
+  const realRoots = await Promise.all(
+    allowedRoots(ctx).map((r) => fsp.realpath(r).catch(() => path.resolve(r)))
+  );
+  let probe = absPath;
+  const pendingTail = [];
+  for (; ; ) {
+    let real;
+    try {
+      real = await fsp.realpath(probe);
+    } catch (err) {
+      if (err.code === "ENOENT") {
+        const parent = path.dirname(probe);
+        if (parent === probe) return absPath;
+        pendingTail.unshift(path.basename(probe));
+        probe = parent;
+        continue;
+      }
+      throw err;
+    }
+    const candidate = pendingTail.length > 0 ? path.join(real, ...pendingTail) : real;
+    if (isInsideAny(candidate, realRoots)) {
+      return candidate;
+    }
+    throw new Error(
+      `Path "${absPath}" resolves through a symlink outside project root "${realRoots[0]}"`
+    );
+  }
+}
+async function safeResolveReal(input, ctx) {
+  const abs = safeResolve(input, ctx);
+  return await resolveRealInsideRoot(abs, ctx);
+}
 function truncateDiffPayload(diff, maxBytes) {
   const total = Buffer.byteLength(diff, "utf8");
   if (total <= maxBytes) return { text: diff, truncated: false };
@@ -408,7 +443,7 @@ async function resolveFiles(filesInput, ctx, extraGlob) {
   const parts = normalized.split(",").map((s) => s.trim()).filter(Boolean);
   const resolved = [];
   for (const p of parts) {
-    const absPath = safeResolve(p, ctx);
+    const absPath = await safeResolveReal(p, ctx);
     if (extraGlob && !passesExtraGlob(extraGlob, path2.basename(absPath), absPath)) continue;
     const stat2 = await fs.stat(absPath).catch(() => null);
     if (stat2?.isFile()) {