@wrongstack/tools 0.300.0 → 0.302.0

package/dist/codebase-index/index.js

@@ -995,16 +995,23 @@ function looksBinary(content) {
   }
   return bad / sample.length > 0.1;
 }
-function lineColAt(content, index) {
-  let line = 1;
-  let lastNl = -1;
-  for (let i = 0; i < index && i < content.length; i++) {
-    if (content.charCodeAt(i) === 10) {
-      line++;
-      lastNl = i;
-    }
+function newlineOffsets2(content) {
+  const offsets = [];
+  for (let i = 0; i < content.length; i++) {
+    if (content.charCodeAt(i) === 10) offsets.push(i);
+  }
+  return offsets;
+}
+function lineColAt(offsets, index) {
+  let low = 0;
+  let high = offsets.length;
+  while (low < high) {
+    const mid = low + high >>> 1;
+    if ((offsets[mid] ?? 0) < index) low = mid + 1;
+    else high = mid;
   }
-  return { line, col: index - lastNl };
+  const lastNl = low > 0 ? offsets[low - 1] : -1;
+  return { line: low + 1, col: index - lastNl };
 }
 function parseGeneric(opts) {
   const { file, lang } = opts;
@@ -1017,6 +1024,7 @@ function parseGeneric(opts) {
   const patterns = patternsFor(lang);
   const symbols = [];
   const seen = /* @__PURE__ */ new Set();
+  const nlOffsets = newlineOffsets2(content);
   for (const pattern of patterns) {
     const re = new RegExp(pattern.re.source, pattern.re.flags.includes("g") ? pattern.re.flags : `${pattern.re.flags}g`);
     re.lastIndex = 0;
@@ -1030,7 +1038,7 @@ function parseGeneric(opts) {
       if (!/^[A-Za-z_#.@/\w][\w.\-:/#!?]*$/.test(name) && lang !== "md" && lang !== "toml") {
         continue;
       }
-      const { line, col } = lineColAt(content, match.index);
+      const { line, col } = lineColAt(nlOffsets, match.index ?? 0);
       const key = `${name}\0${line}\0${pattern.kind}`;
       if (seen.has(key)) continue;
       seen.add(key);
@@ -2228,9 +2236,9 @@ import * as path4 from "node:path";
 // src/codebase-index/bm25.ts
 var K1 = 1.5;
 var B = 0.75;
+var TOKENISE_RE = new RegExp("[^\\p{L}\\p{N}$']", "gu");
 function tokenise(text) {
-  const sanitised = text.replace(/[^\p{L}\p{N}$'_]/gu, " ").replace(/_/g, " ");
-  return sanitised.toLowerCase().split(" ").filter(Boolean);
+  return text.replace(TOKENISE_RE, " ").toLowerCase().trim().split(/\s+/).filter(Boolean);
 }
 function splitName(name) {
   return name.replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([\p{L}])(\d)/gu, "$1 $2").replace(/(\d)([\p{L}])/gu, "$1 $2").replace(/[_-]+/g, " ").trim();
@@ -4745,7 +4753,9 @@ var PROJECT_INDEX_SERVER_METADATA_FILE = "server.json";
 var PROJECT_INDEX_SERVER_SOCKET_DIR = `wsci-v${PROJECT_INDEX_SERVER_PROTOCOL_VERSION}`;
 var buildIdCache;
 function projectIndexServerBuildId(entrypoint) {
-  const file = entrypoint instanceof URL || entrypoint.startsWith("file:") ? fileURLToPath(entrypoint) : path5.resolve(entrypoint);
+  const href = entrypoint instanceof URL ? entrypoint.href : entrypoint;
+  const cleanHref = href.split(/[?#]/, 1)[0] ?? href;
+  const file = cleanHref.startsWith("file:") ? fileURLToPath(cleanHref) : path5.resolve(cleanHref);
   try {
     const stat2 = fs4.statSync(file);
     if (buildIdCache?.file === file && buildIdCache.mtimeMs === stat2.mtimeMs && buildIdCache.size === stat2.size) {

package/dist/codebase-index/project-server.js

@@ -996,16 +996,23 @@ function looksBinary(content) {
   }
   return bad / sample.length > 0.1;
 }
-function lineColAt(content, index) {
-  let line = 1;
-  let lastNl = -1;
-  for (let i = 0; i < index && i < content.length; i++) {
-    if (content.charCodeAt(i) === 10) {
-      line++;
-      lastNl = i;
-    }
+function newlineOffsets2(content) {
+  const offsets = [];
+  for (let i = 0; i < content.length; i++) {
+    if (content.charCodeAt(i) === 10) offsets.push(i);
+  }
+  return offsets;
+}
+function lineColAt(offsets, index) {
+  let low = 0;
+  let high = offsets.length;
+  while (low < high) {
+    const mid = low + high >>> 1;
+    if ((offsets[mid] ?? 0) < index) low = mid + 1;
+    else high = mid;
   }
-  return { line, col: index - lastNl };
+  const lastNl = low > 0 ? offsets[low - 1] : -1;
+  return { line: low + 1, col: index - lastNl };
 }
 function parseGeneric(opts) {
   const { file, lang } = opts;
@@ -1018,6 +1025,7 @@ function parseGeneric(opts) {
   const patterns = patternsFor(lang);
   const symbols = [];
   const seen = /* @__PURE__ */ new Set();
+  const nlOffsets = newlineOffsets2(content);
   for (const pattern of patterns) {
     const re = new RegExp(pattern.re.source, pattern.re.flags.includes("g") ? pattern.re.flags : `${pattern.re.flags}g`);
     re.lastIndex = 0;
@@ -1031,7 +1039,7 @@ function parseGeneric(opts) {
       if (!/^[A-Za-z_#.@/\w][\w.\-:/#!?]*$/.test(name) && lang !== "md" && lang !== "toml") {
         continue;
       }
-      const { line, col } = lineColAt(content, match.index);
+      const { line, col } = lineColAt(nlOffsets, match.index ?? 0);
       const key = `${name}\0${line}\0${pattern.kind}`;
       if (seen.has(key)) continue;
       seen.add(key);
@@ -2987,9 +2995,9 @@ import * as path10 from "node:path";
 // src/codebase-index/bm25.ts
 var K1 = 1.5;
 var B = 0.75;
+var TOKENISE_RE = new RegExp("[^\\p{L}\\p{N}$']", "gu");
 function tokenise(text) {
-  const sanitised = text.replace(/[^\p{L}\p{N}$'_]/gu, " ").replace(/_/g, " ");
-  return sanitised.toLowerCase().split(" ").filter(Boolean);
+  return text.replace(TOKENISE_RE, " ").toLowerCase().trim().split(/\s+/).filter(Boolean);
 }
 function splitName(name) {
   return name.replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([\p{L}])(\d)/gu, "$1 $2").replace(/(\d)([\p{L}])/gu, "$1 $2").replace(/[_-]+/g, " ").trim();
@@ -5837,7 +5845,9 @@ var PROJECT_INDEX_SERVER_METADATA_FILE = "server.json";
 var PROJECT_INDEX_SERVER_SOCKET_DIR = `wsci-v${PROJECT_INDEX_SERVER_PROTOCOL_VERSION}`;
 var buildIdCache;
 function projectIndexServerBuildId(entrypoint) {
-  const file = entrypoint instanceof URL || entrypoint.startsWith("file:") ? fileURLToPath(entrypoint) : path12.resolve(entrypoint);
+  const href = entrypoint instanceof URL ? entrypoint.href : entrypoint;
+  const cleanHref = href.split(/[?#]/, 1)[0] ?? href;
+  const file = cleanHref.startsWith("file:") ? fileURLToPath(cleanHref) : path12.resolve(cleanHref);
   try {
     const stat2 = fs9.statSync(file);
     if (buildIdCache?.file === file && buildIdCache.mtimeMs === stat2.mtimeMs && buildIdCache.size === stat2.size) {

package/dist/codebase-index/worker.js

@@ -992,16 +992,23 @@ function looksBinary(content) {
   }
   return bad / sample.length > 0.1;
 }
-function lineColAt(content, index) {
-  let line = 1;
-  let lastNl = -1;
-  for (let i = 0; i < index && i < content.length; i++) {
-    if (content.charCodeAt(i) === 10) {
-      line++;
-      lastNl = i;
-    }
+function newlineOffsets2(content) {
+  const offsets = [];
+  for (let i = 0; i < content.length; i++) {
+    if (content.charCodeAt(i) === 10) offsets.push(i);
+  }
+  return offsets;
+}
+function lineColAt(offsets, index) {
+  let low = 0;
+  let high = offsets.length;
+  while (low < high) {
+    const mid = low + high >>> 1;
+    if ((offsets[mid] ?? 0) < index) low = mid + 1;
+    else high = mid;
   }
-  return { line, col: index - lastNl };
+  const lastNl = low > 0 ? offsets[low - 1] : -1;
+  return { line: low + 1, col: index - lastNl };
 }
 function parseGeneric(opts) {
   const { file, lang } = opts;
@@ -1014,6 +1021,7 @@ function parseGeneric(opts) {
   const patterns = patternsFor(lang);
   const symbols = [];
   const seen = /* @__PURE__ */ new Set();
+  const nlOffsets = newlineOffsets2(content);
   for (const pattern of patterns) {
     const re = new RegExp(pattern.re.source, pattern.re.flags.includes("g") ? pattern.re.flags : `${pattern.re.flags}g`);
     re.lastIndex = 0;
@@ -1027,7 +1035,7 @@ function parseGeneric(opts) {
       if (!/^[A-Za-z_#.@/\w][\w.\-:/#!?]*$/.test(name) && lang !== "md" && lang !== "toml") {
         continue;
       }
-      const { line, col } = lineColAt(content, match.index);
+      const { line, col } = lineColAt(nlOffsets, match.index ?? 0);
       const key = `${name}\0${line}\0${pattern.kind}`;
       if (seen.has(key)) continue;
       seen.add(key);
@@ -2974,9 +2982,9 @@ import * as path10 from "node:path";
 // src/codebase-index/bm25.ts
 var K1 = 1.5;
 var B = 0.75;
+var TOKENISE_RE = new RegExp("[^\\p{L}\\p{N}$']", "gu");
 function tokenise(text) {
-  const sanitised = text.replace(/[^\p{L}\p{N}$'_]/gu, " ").replace(/_/g, " ");
-  return sanitised.toLowerCase().split(" ").filter(Boolean);
+  return text.replace(TOKENISE_RE, " ").toLowerCase().trim().split(/\s+/).filter(Boolean);
 }
 function splitName(name) {
   return name.replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([\p{L}])(\d)/gu, "$1 $2").replace(/(\d)([\p{L}])/gu, "$1 $2").replace(/[_-]+/g, " ").trim();

package/dist/format.js

@@ -792,7 +792,7 @@ function getProcessRegistry() {
 // src/_spawn-stream.ts
 var isWin = process.platform === "win32";
 async function* spawnStream(opts) {
-  const max = opts.maxBytes ?? 2e5;
+  const max = opts.maxBytes ?? 999999999;
   const flushAt = opts.flushBytes ?? 4 * 1024;
   const maxQueue = opts.maxQueueSize ?? 500;
   const maxQueueBytes = opts.maxQueueBytes ?? 1024 * 1024;

package/dist/git.js

@@ -291,11 +291,8 @@ function buildArgs(input) {
         ...input.branch.startsWith("-") || input.branch.includes(" --") ? [] : [input.branch]
       ] : ["branch"];
     case "checkout":
-      return [
-        "checkout",
-        ...input.branch ? ["--", input.branch] : [],
-        ...files.length ? ["--", ...files] : []
-      ];
+      if (files.length) return ["checkout", "--", ...files];
+      return input.branch ? ["checkout", input.branch, "--"] : ["checkout"];
     case "stash":
       return input.message ? ["stash", "push", "-m", input.message] : ["stash", "push"];
     case "push":

package/dist/glob.js

@@ -138,7 +138,7 @@ async function safeResolveReal(input, ctx) {
 }
 
 // src/glob.ts
-var DEFAULT_IGNORE = DEFAULT_WALK_IGNORE_DIRS;
+var DEFAULT_IGNORE = new Set(DEFAULT_WALK_IGNORE_DIRS);
 var WALK_CONCURRENCY = 16;
 var globTool = {
   name: "glob",
@@ -217,7 +217,7 @@ var globTool = {
       const matchedFiles = [];
       for (const e of entries) {
         const name = e.name;
-        if (DEFAULT_IGNORE.includes(name)) continue;
+        if (DEFAULT_IGNORE.has(name)) continue;
         const rel = relPrefix ? `${relPrefix}/${name}` : name;
         const full = path3.join(dir, name);
         if (e.isDirectory()) {

package/dist/grep.js

@@ -40,6 +40,81 @@ var DANGEROUS_PATTERNS = [
   // Greedy quantifier inside lookahead/lookbehind — (?!.*a+)
   /[([][^)\]]*[+*][^)\]]*[)\]][^)]*\?\??/
 ];
+function hasAmbiguousQuantifiedAlternation(pattern) {
+  for (let i = 0; i < pattern.length; i++) {
+    if (pattern[i] !== "(") continue;
+    if (i > 0 && pattern[i - 1] === "\\") continue;
+    let depth = 0;
+    let inClass = false;
+    let j = i;
+    for (; j < pattern.length; j++) {
+      const ch = pattern[j];
+      if (ch === "\\") {
+        j++;
+        continue;
+      }
+      if (inClass) {
+        if (ch === "]") inClass = false;
+        continue;
+      }
+      if (ch === "[") {
+        inClass = true;
+        continue;
+      }
+      if (ch === "(") depth++;
+      else if (ch === ")") {
+        depth--;
+        if (depth === 0) break;
+      }
+    }
+    if (j >= pattern.length) return false;
+    const next = pattern[j + 1];
+    if (next !== "+" && next !== "*" && next !== "{") continue;
+    let inner = pattern.slice(i + 1, j);
+    inner = inner.replace(/^\?(?::|<?[=!])/u, "");
+    const branches = [];
+    let current = "";
+    let d = 0;
+    let cls = false;
+    for (let k = 0; k < inner.length; k++) {
+      const ch = inner[k];
+      if (ch === "\\") {
+        current += ch + (inner[k + 1] ?? "");
+        k++;
+        continue;
+      }
+      if (cls) {
+        if (ch === "]") cls = false;
+        current += ch;
+        continue;
+      }
+      if (ch === "[") {
+        cls = true;
+        current += ch;
+        continue;
+      }
+      if (ch === "(") d++;
+      if (ch === ")") d--;
+      if (ch === "|" && d === 0) {
+        branches.push(current);
+        current = "";
+        continue;
+      }
+      current += ch;
+    }
+    branches.push(current);
+    if (branches.length < 2) continue;
+    for (let a = 0; a < branches.length; a++) {
+      for (let b = a + 1; b < branches.length; b++) {
+        const x = branches[a];
+        const y = branches[b];
+        if (x === "" || y === "") return true;
+        if (x === y || x.startsWith(y) || y.startsWith(x)) return true;
+      }
+    }
+  }
+  return false;
+}
 function compileUserRegex(pattern, flags) {
   if (typeof pattern !== "string") {
     return { ok: false, reason: "pattern must be a string" };
@@ -58,6 +133,12 @@ function compileUserRegex(pattern, flags) {
       };
     }
   }
+  if (hasAmbiguousQuantifiedAlternation(pattern)) {
+    return {
+      ok: false,
+      reason: "pattern quantifies an alternation with overlapping branches \u2014 rewrite so no two branches can match the same text"
+    };
+  }
   try {
     return { ok: true, regex: new RegExp(pattern, flags) };
   } catch (err) {
@@ -73,6 +154,7 @@ function capSubject(line) {
 }
 
 // src/_util.ts
+import * as fsp from "node:fs/promises";
 import * as path from "node:path";
 import * as Core from "@wrongstack/core/utils";
 function resolvePath(input, ctx) {
@@ -96,6 +178,39 @@ 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;
+    }
+    if (isInsideAny(real, realRoots)) {
+      return pendingTail.length > 0 ? path.join(real, ...pendingTail) : real;
+    }
+    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 isBinaryBuffer(buf) {
   const len = Math.min(buf.length, 8192);
   for (let i = 0; i < len; i++) {
@@ -160,7 +275,7 @@ async function loadGitignoreMatcher(projectRoot) {
 }
 
 // src/grep.ts
-var DEFAULT_IGNORE = DEFAULT_WALK_IGNORE_DIRS;
+var DEFAULT_IGNORE = new Set(DEFAULT_WALK_IGNORE_DIRS);
 var NATIVE_SCAN_CONCURRENCY = 32;
 var NATIVE_READ_CHUNK_BYTES = 64 * 1024;
 var NATIVE_MAX_FILE_BYTES = 1e6;
@@ -233,7 +348,7 @@ var grepTool = {
         field: "pattern"
       });
     }
-    const base = input.path ? safeResolve(input.path, ctx) : ctx.cwd;
+    const base = input.path ? await safeResolveReal(input.path, ctx) : ctx.cwd;
     const mode = input.output_mode ?? "content";
     const limit = Math.max(1, Math.min(input.limit ?? 200, 2e3));
     const validation = compileUserRegex(input.pattern, input.case_insensitive ? "i" : "");
@@ -558,7 +673,7 @@ async function runNative(input, base, mode, limit, signal) {
     const subdirs = [];
     for (const e of entries) {
       if (stopped) return;
-      if (DEFAULT_IGNORE.includes(e.name)) continue;
+      if (DEFAULT_IGNORE.has(e.name)) continue;
       if (e.isSymbolicLink()) continue;
       const rel = relPrefix ? `${relPrefix}/${e.name}` : e.name;
       const full = path3.join(dir, e.name);

package/dist/index.d.ts

@@ -30,6 +30,7 @@ export { lintTool } from './lint.js';
 export { logsTool } from './logs.js';
 export { forgetTool, relatedMemoryTool, rememberTool, searchMemoryTool } from './memory.js';
 export { createModeTool } from './mode.js';
+export { nextStepsTool } from './next-steps-tool.js';
 export { outdatedTool } from './outdated.js';
 export { builtinToolsPack } from './pack.js';
 export { patchTool } from './patch.js';