@wrongstack/tools 0.267.0 → 0.269.0

package/dist/index.js

@@ -711,13 +711,13 @@ async function globFiles(pattern, base, extraGlob) {
   return await globNative(pattern, base, extraGlob);
 }
 function checkRg() {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     try {
       const p = spawn("rg", ["--version"], { env: buildChildEnv(), stdio: "ignore", windowsHide: true });
-      p.on("error", () => resolve7(false));
-      p.on("close", (code) => resolve7(code === 0));
+      p.on("error", () => resolve6(false));
+      p.on("close", (code) => resolve6(code === 0));
     } catch {
-      resolve7(false);
+      resolve6(false);
     }
   });
 }
@@ -734,10 +734,10 @@ function spawnRgFind(pattern, base) {
     buf += chunk.toString();
   });
   return {
-    promise: new Promise((resolve7, reject) => {
+    promise: new Promise((resolve6, reject) => {
       child.on("error", reject);
       child.on("close", () => {
-        resolve7(buf.split("\n").filter(Boolean));
+        resolve6(buf.split("\n").filter(Boolean));
       });
     })
   };
@@ -943,13 +943,13 @@ var grepTool = {
   }
 };
 async function detectRg(signal) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     try {
       const p = spawn("rg", ["--version"], { env: buildChildEnv(), stdio: "ignore", signal, windowsHide: true });
-      p.on("error", () => resolve7(false));
-      p.on("close", (code) => resolve7(code === 0));
+      p.on("error", () => resolve6(false));
+      p.on("close", (code) => resolve6(code === 0));
     } catch {
-      resolve7(false);
+      resolve6(false);
     }
   });
 }
@@ -2024,10 +2024,10 @@ var bashTool = {
         queue.push(c);
       }
     };
-    const next = () => new Promise((resolve7) => {
+    const next = () => new Promise((resolve6) => {
       const c = queue.shift();
-      if (c) resolve7(c);
-      else resolveNext = resolve7;
+      if (c) resolve6(c);
+      else resolveNext = resolve6;
     });
     let lastFlush = Date.now();
     const flush = () => {
@@ -2323,26 +2323,26 @@ var execTool = {
         allowed: false
       };
     }
-    const requestedCwd = input.cwd ? path.resolve(ctx.projectRoot, input.cwd) : ctx.cwd;
-    const rel = path.relative(ctx.projectRoot, requestedCwd);
-    if (rel.startsWith("..") || path.isAbsolute(rel)) {
+    let cwd;
+    try {
+      cwd = input.cwd ? await safeResolveReal(input.cwd, ctx) : await safeResolveReal(ctx.cwd, ctx);
+    } catch {
       return {
         command: cmd,
         args,
         stdout: "",
-        stderr: `cwd "${input.cwd}" resolves outside project root`,
+        stderr: `cwd "${input.cwd ?? ctx.cwd}" resolves outside project root`,
         exitCode: 1,
         truncated: false,
         allowed: false
       };
     }
-    const cwd = requestedCwd;
     const signal = opts.signal;
     return runCommand(cmd, args, cwd, timeout, signal, ctx.session?.id);
   }
 };
 function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     let stdout = "";
     let stderr = "";
     let killed = false;
@@ -2397,7 +2397,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
       const exitCode = killed ? 124 : code ?? 1;
       registry.afterCall(durationMs, exitCode !== 0);
       const spooled = spool.finalize();
-      resolve7({
+      resolve6({
         command: cmd,
         args,
         stdout: normalizeCommandOutput(stdout) + (spooled ? spoolNote(spooled) : ""),
@@ -2413,7 +2413,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
       if (typeof pid === "number") registry.unregister(pid);
       registry.afterCall(Date.now() - startedAt, true);
       spool.finalize();
-      resolve7({
+      resolve6({
         command: cmd,
         args,
         stdout: normalizeCommandOutput(stdout),
@@ -3499,7 +3499,7 @@ function buildArgs(input) {
   }
 }
 function runGit(args, cwd, signal) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     let stdout = "";
     let stderr = "";
     const child = spawn("git", args, {
@@ -3520,7 +3520,7 @@ function runGit(args, cwd, signal) {
       }
     });
     child.on("error", (err) => {
-      resolve7({
+      resolve6({
         command: args[0],
         stdout: normalizeCommandOutput(stdout),
         stderr: err.message,
@@ -3529,7 +3529,7 @@ function runGit(args, cwd, signal) {
       });
     });
     child.on("close", (code) => {
-      resolve7({
+      resolve6({
         command: args[0],
         stdout: normalizeCommandOutput(stdout),
         stderr: normalizeCommandOutput(stderr),
@@ -3629,7 +3629,7 @@ function stripPathComponents(p, strip) {
   return parts.slice(strip).join("/");
 }
 function runPatch(args, cwd, signal) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     let stdout = "";
     let stderr = "";
     const env = { ...buildChildEnv(), LANG: "C", LC_ALL: "C" };
@@ -3640,8 +3640,8 @@ function runPatch(args, cwd, signal) {
     child.stderr?.on("data", (c) => {
       stderr += c.toString();
     });
-    child.on("close", (code) => resolve7({ exitCode: code ?? 1, stdout, stderr }));
-    child.on("error", (e) => resolve7({ exitCode: 1, stdout: "", stderr: e.message }));
+    child.on("close", (code) => resolve6({ exitCode: code ?? 1, stdout, stderr }));
+    child.on("error", (e) => resolve6({ exitCode: 1, stdout: "", stderr: e.message }));
   });
 }
 function extractPatchedFiles(output) {
@@ -3727,8 +3727,8 @@ var jsonTool = {
     };
   }
 };
-function query(data, path21) {
-  const parts = path21.replace(/\[(\d+)\]/g, ".$1").split(".").filter(Boolean);
+function query(data, path20) {
+  const parts = path20.replace(/\[(\d+)\]/g, ".$1").split(".").filter(Boolean);
   let current = data;
   for (const part of parts) {
     if (current === null || current === void 0) return void 0;
@@ -3869,7 +3869,7 @@ function findGitDir2(cwd) {
   return null;
 }
 function runGit2(args, cwd, signal) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     let stdout = "";
     let stderr = "";
     const child = spawn("git", args, {
@@ -3885,8 +3885,8 @@ function runGit2(args, cwd, signal) {
     child.stderr?.on("data", (c) => {
       stderr += c.toString();
     });
-    child.on("close", (code) => resolve7({ stdout, stderr, exitCode: code ?? 0 }));
-    child.on("error", (e) => resolve7({ stdout: "", stderr: e.message, exitCode: 1 }));
+    child.on("close", (code) => resolve6({ stdout, stderr, exitCode: code ?? 0 }));
+    child.on("error", (e) => resolve6({ stdout: "", stderr: e.message, exitCode: 1 }));
   });
 }
 async function fileDiff(input, ctx, _signal) {
@@ -4204,8 +4204,8 @@ async function* spawnStream(opts) {
   try {
     for (; ; ) {
       while (queue.length === 0) {
-        await new Promise((resolve7) => {
-          waiter = resolve7;
+        await new Promise((resolve6) => {
+          waiter = resolve6;
         });
       }
       const chunk = queue.shift();
@@ -4997,7 +4997,7 @@ var outdatedTool = {
   }
 };
 function runOutdated(manager, args, cwd, signal) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     let stdout = "";
     let stderr = "";
     const MAX = 1e5;
@@ -5013,10 +5013,10 @@ function runOutdated(manager, args, cwd, signal) {
     });
     child.on("close", (code) => {
       const result = parseOutdatedOutput(stdout, code ?? 0);
-      resolve7(result);
+      resolve6(result);
     });
     child.on("error", (e) => {
-      resolve7({
+      resolve6({
         exit_code: 1,
         packages: [],
         total: 0,
@@ -5142,7 +5142,7 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
     };
   }
   args.push("--timestamps", service);
-  return new Promise((resolve7) => {
+  return new Promise((resolve6) => {
     let stdout = "";
     let stderr = "";
     const MAX = 2e5;
@@ -5158,7 +5158,7 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve7(result);
+      resolve6(result);
     };
     const child = spawn("docker", args, { cwd, signal, env: buildChildEnv(), stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
     const timer = setTimeout(() => {
@@ -5193,7 +5193,7 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
 }
 var DOCKER_LOGS_TIMEOUT_MS = 3e3;
 var MAX_TAIL_LINES = 1e5;
-async function fileLogs(path21, lines, filterRe, stream) {
+async function fileLogs(path20, lines, filterRe, stream) {
   const { createInterface } = await import('node:readline');
   const { createReadStream } = await import('node:fs');
   const entries = [];
@@ -5202,7 +5202,7 @@ async function fileLogs(path21, lines, filterRe, stream) {
   let writeIdx = 0;
   let totalLines = 0;
   const rl = createInterface({
-    input: createReadStream(path21),
+    input: createReadStream(path20),
     crlfDelay: Number.POSITIVE_INFINITY
   });
   for await (const line of rl) {
@@ -5223,7 +5223,7 @@ async function fileLogs(path21, lines, filterRe, stream) {
     if (parsed) entries.push(parsed);
   }
   return {
-    source: path21,
+    source: path20,
     entries,
     total: entries.length,
     truncated: totalLines > effLines,
@@ -6534,7 +6534,7 @@ var IndexStore = class {
           throw new LockError(`SQLite lock conflict after ${MAX_LOCK_RETRIES} retries: ${msg}`);
         }
         const delay = Math.min(
-          LOCK_RETRY_BASE_DELAY_MS * Math.pow(2, attempt),
+          LOCK_RETRY_BASE_DELAY_MS * 2 ** attempt,
           LOCK_RETRY_MAX_DELAY_MS
         );
         sleepSync(delay);
@@ -6827,14 +6827,15 @@ var IndexStore = class {
     if (!query2.trim()) {
       return { results: candidates.slice(0, limit), total: candidates.length };
     }
+    const candidateById = new Map(candidates.map((c) => [c.id, c]));
     const bm25 = buildBm25Index(
       candidates.map((c) => ({ id: c.id, text: buildIndexableText(c.name, c.signature, c.docComment) }))
     );
-    const scored = bm25.score(query2, (id) => candidates.some((c) => c.id === id));
+    const scored = bm25.score(query2, (id) => candidateById.has(id));
     scored.sort((a, b) => b.score - a.score);
     const qTokens = tokenise(query2);
     const results = scored.slice(0, limit).map(({ id, score }) => {
-      const c = expectDefined(candidates.find((cand) => cand.id === id));
+      const c = expectDefined(candidateById.get(id));
       return { ...c, score, snippet: bm25.extractSnippet(id, qTokens) };
     });
     return { results, total: candidates.length };
@@ -8251,8 +8252,9 @@ async function loadGitignoreMatcher(projectRoot) {
 
 // src/codebase-index/indexer.ts
 var YIELD_EVERY_N = 50;
+var PARALLEL_BATCH = 20;
 function yieldEventLoop() {
-  return new Promise((resolve7) => setImmediate(resolve7));
+  return new Promise((resolve6) => setImmediate(resolve6));
 }
 function throwIfAborted(signal) {
   if (!signal?.aborted) return;
@@ -8384,97 +8386,111 @@ async function runIndexerWithStore(store, opts) {
   if (!force) {
     for (const meta of store.getAllFileMetas()) existingMeta.set(meta.file, meta);
   }
-  for (let fi = 0; fi < files.length; fi++) {
-    const file = expectDefined(files[fi]);
-    opts.onProgress?.(fi + 1, files.length);
-    if (fi > 0 && fi % YIELD_EVERY_N === 0) {
+  for (let batchStart = 0; batchStart < files.length; batchStart += PARALLEL_BATCH) {
+    const batchEnd = Math.min(batchStart + PARALLEL_BATCH, files.length);
+    const batchFiles = files.slice(batchStart, batchEnd);
+    opts.onProgress?.(batchEnd, files.length);
+    if (batchStart > 0 && batchStart % YIELD_EVERY_N === 0) {
       await yieldEventLoop();
       throwIfAborted(signal);
     }
-    let stat11;
-    try {
-      const statOpts = signal ? { signal } : {};
-      stat11 = await fs4.stat(file, statOpts);
-    } catch (e) {
-      if (isAbortError(e)) throw e;
-      store.deleteFile(file);
-      continue;
-    }
-    if (!stat11.isFile()) continue;
-    const lang = detectLang(file);
-    if (!lang) continue;
-    const meta = existingMeta.get(file);
-    if (!force && meta && meta.mtimeMs === Math.floor(stat11.mtimeMs)) {
-      langStats[lang] = (langStats[lang] ?? 0) + meta.symbolCount;
-      symbolsIndexed += meta.symbolCount;
-      filesIndexed++;
-      continue;
-    }
-    store.deleteRefsForFile(file);
-    store.deleteSymbolsForFile(file);
-    let content;
-    try {
-      content = await fs4.readFile(file, { encoding: "utf8", signal });
-    } catch (e) {
-      if (isAbortError(e)) throw e;
-      errors.push(`read error: ${file}: ${e instanceof Error ? e.message : String(e)}`);
-      continue;
-    }
-    let parsed;
-    try {
-      parsed = await parseFile(file, content, lang);
-    } catch (e) {
-      errors.push(`parse error: ${file}: ${e instanceof Error ? e.message : String(e)}`);
-      continue;
-    }
-    if (parsed.symbols.length === 0) {
-      store.upsertFile({
-        file,
-        lang,
-        mtimeMs: Math.floor(stat11.mtimeMs),
-        symbolCount: 0,
-        lastIndexed: Date.now()
-      });
-      filesIndexed++;
-      continue;
-    }
-    const nextId = store.getMaxSymbolId() + 1;
-    const symbolsWithIds = parsed.symbols.map((s, i) => ({ ...s, id: nextId + i }));
-    store.insertSymbols(symbolsWithIds, nextId);
-    const count = symbolsWithIds.length;
-    symbolsIndexed += count;
-    langStats[lang] = (langStats[lang] ?? 0) + count;
-    if (parsed.refs && parsed.refs.length > 0) {
-      const refsByLine = /* @__PURE__ */ new Map();
-      for (const r of parsed.refs) {
-        let arr = refsByLine.get(r.line);
-        if (!arr) {
-          arr = [];
-          refsByLine.set(r.line, arr);
+    const statOpts = signal ? { signal } : {};
+    const statReadParse = await Promise.allSettled(
+      batchFiles.map(async (file) => {
+        let stat11;
+        try {
+          stat11 = await fs4.stat(file, statOpts);
+        } catch (e) {
+          if (isAbortError(e)) throw e;
+          return { file, stat: null, lang: "", parsed: null, error: `stat error: ${e instanceof Error ? e.message : String(e)}` };
         }
-        arr.push(r);
-      }
-      const batch = [];
-      for (const sym of symbolsWithIds) {
-        const symRefs = refsByLine.get(sym.line);
-        if (symRefs) {
-          for (const r of symRefs) {
-            batch.push({ ...r, fromId: sym.id });
-          }
+        if (!stat11.isFile()) return { file, stat: stat11, lang: "", parsed: null };
+        const lang = detectLang(file);
+        if (!lang) return { file, stat: stat11, lang: "", parsed: null };
+        const meta = existingMeta.get(file);
+        if (!force && meta && meta.mtimeMs === Math.floor(stat11.mtimeMs)) {
+          return { file, stat: stat11, lang, parsed: null, skippedMeta: meta };
+        }
+        let content;
+        try {
+          content = await fs4.readFile(file, { encoding: "utf8", signal });
+        } catch (e) {
+          if (isAbortError(e)) throw e;
+          return { file, stat: stat11, lang, parsed: null, error: `read error: ${e instanceof Error ? e.message : String(e)}` };
         }
+        let parsed;
+        try {
+          parsed = await parseFile(file, content, lang);
+        } catch (e) {
+          return { file, stat: stat11, lang, parsed: null, error: `parse error: ${e instanceof Error ? e.message : String(e)}` };
+        }
+        return { file, stat: stat11, lang, parsed, content };
+      })
+    );
+    for (let fi = 0; fi < statReadParse.length; fi++) {
+      const settled = statReadParse[fi];
+      const file = expectDefined(batchFiles[fi]);
+      if (settled.status === "rejected") {
+        const err = settled.reason;
+        if (err instanceof Error && isAbortError(err)) throw err;
+        errors.push(`batch error: ${file}: ${err instanceof Error ? err.message : String(err)}`);
+        continue;
+      }
+      const result = settled.value;
+      if (result.error) {
+        if (result.stat) store.deleteFile(file);
+        if (result.error.includes("error:")) errors.push(result.error);
+        continue;
       }
-      if (batch.length > 0) {
-        store.insertRefsBatch(batch);
+      const { stat: stat11, lang, parsed } = result;
+      if (result.skippedMeta) {
+        langStats[lang] = (langStats[lang] ?? 0) + result.skippedMeta.symbolCount;
+        symbolsIndexed += result.skippedMeta.symbolCount;
+        filesIndexed++;
+        continue;
       }
+      if (!lang || !parsed) {
+        if (lang) {
+          store.upsertFile({ file, lang, mtimeMs: Math.floor(stat11.mtimeMs), symbolCount: 0, lastIndexed: Date.now() });
+          filesIndexed++;
+        }
+        continue;
+      }
+      store.deleteRefsForFile(file);
+      store.deleteSymbolsForFile(file);
+      if (parsed.symbols.length === 0) {
+        store.upsertFile({ file, lang, mtimeMs: Math.floor(stat11.mtimeMs), symbolCount: 0, lastIndexed: Date.now() });
+        filesIndexed++;
+        continue;
+      }
+      const nextId = store.getMaxSymbolId() + 1;
+      const symbolsWithIds = parsed.symbols.map((s, i) => ({ ...s, id: nextId + i }));
+      store.insertSymbols(symbolsWithIds, nextId);
+      const count = symbolsWithIds.length;
+      symbolsIndexed += count;
+      langStats[lang] = (langStats[lang] ?? 0) + count;
+      if (parsed.refs && parsed.refs.length > 0) {
+        const refsByLine = /* @__PURE__ */ new Map();
+        for (const r of parsed.refs) {
+          let arr = refsByLine.get(r.line);
+          if (!arr) {
+            arr = [];
+            refsByLine.set(r.line, arr);
+          }
+          arr.push(r);
+        }
+        const batch = [];
+        for (const sym of symbolsWithIds) {
+          const symRefs = refsByLine.get(sym.line);
+          if (symRefs) {
+            for (const r of symRefs) batch.push({ ...r, fromId: sym.id });
+          }
+        }
+        if (batch.length > 0) store.insertRefsBatch(batch);
+      }
+      store.upsertFile({ file, lang, mtimeMs: Math.floor(stat11.mtimeMs), symbolCount: count, lastIndexed: Date.now() });
+      filesIndexed++;
     }
-    store.upsertFile({
-      file,
-      lang,
-      mtimeMs: Math.floor(stat11.mtimeMs),
-      symbolCount: count,
-      lastIndexed: Date.now()
-    });
-    filesIndexed++;
   }
   for (const [file_] of existingMeta) {
     try {
@@ -8656,7 +8672,7 @@ function shutdownCodebaseIndexHost() {
 function callIndexOp(op, args, opts) {
   const w = ensureWorker();
   if (!w) return callInline(op, args, opts);
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve6, reject) => {
     const id = nextRpcId++;
     const timer = setTimeout(() => {
       pending.delete(id);
@@ -8679,7 +8695,7 @@ function callIndexOp(op, args, opts) {
     pending.set(id, {
       resolve: (v) => {
         cleanup();
-        resolve7(v);
+        resolve6(v);
       },
       reject: (e) => {
         cleanup();