@wrongstack/tools 0.300.0 → 0.301.0

package/dist/patch.js

@@ -3,10 +3,11 @@ import { spawn } from "node:child_process";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path2 from "node:path";
-import { buildChildEnv } from "@wrongstack/core/utils";
+import { buildChildEnv, toErrorMessage } from "@wrongstack/core/utils";
 
 // 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) {
@@ -33,13 +34,46 @@ 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);
+}
 
 // src/patch.ts
 var patchTool = {
   name: "patch",
   category: "Filesystem",
   description: "Apply a unified diff (patch) to the project. This is the correct tool when you have a diff that needs to be applied precisely, including handling of rejects.",
-  usageHint: "Best used when you already have a diff (from generation, external source, or previous step).\n- Use `dry_run: true` to see what would happen without modifying files.\n- On failure it creates .rej and .orig files for manual review.\nOften cleaner than many small `edit` operations for larger changes.",
+  usageHint: "Best used when you already have a diff (from generation, external source, or previous step).\n- Use `dry_run: true` to see what would happen without modifying files.\n- Applied with `--merge`: a conflicting hunk writes git-style conflict\n  markers (<<<<<<< / ======= / >>>>>>>) INTO the file and reports failure.\n  It does NOT create .rej/.orig files. `files` lists what changed on disk\n  even when the patch failed, so read those back before retrying.\nOften cleaner than many small `edit` operations for larger changes.",
   selection: {
     doNotUseWhen: "you do not already have a unified diff or only need one precise replacement.",
     useInstead: ["edit"]
@@ -65,31 +99,50 @@ var patchTool = {
   },
   async execute(input, ctx, opts) {
     if (!input?.patch) throw new Error("patch: patch content is required");
-    const dir = input.directory ? safeResolve(input.directory, ctx) : ctx.cwd;
     const strip = Math.max(1, input.strip ?? 1);
     const dryRun = input.dry_run ?? false;
+    const refuse = (message) => ({
+      applied: 0,
+      rejected: 1,
+      files: [],
+      dry_run: dryRun,
+      message
+    });
+    let dir;
+    try {
+      dir = input.directory ? await safeResolveReal(input.directory, ctx) : ctx.cwd;
+    } catch (err) {
+      return refuse(`patch refused: ${toErrorMessage(err)}`);
+    }
+    const realRoot = await fs.realpath(ctx.projectRoot).catch(() => path2.resolve(ctx.projectRoot));
     const targets = extractDiffTargets(input.patch);
     const resolvedTargets = [];
     for (const t of targets) {
-      const stripped = stripPathComponents(t, strip);
+      const stripped = stripPathComponents(t.raw, strip);
       if (!stripped) continue;
+      if (path2.isAbsolute(stripped)) {
+        return refuse(`patch refused: target "${t.raw}" strips to absolute path`);
+      }
       const candidate = path2.resolve(dir, stripped);
-      const rel = path2.relative(ctx.projectRoot, candidate);
+      let real;
+      try {
+        real = await resolveRealInsideRoot(candidate, ctx);
+      } catch (err) {
+        return refuse(`patch refused: target "${t.raw}" ${toErrorMessage(err)}`);
+      }
+      const rel = path2.relative(realRoot, real);
       if (rel.startsWith("..") || path2.isAbsolute(rel)) {
-        return {
-          applied: 0,
-          rejected: 1,
-          files: [],
-          dry_run: dryRun,
-          message: `patch refused: target "${t}" resolves outside project root`
-        };
+        return refuse(`patch refused: target "${t.raw}" resolves outside project root`);
       }
-      resolvedTargets.push(candidate);
+      resolvedTargets.push({ raw: t.raw, deleted: t.deleted, abs: real });
     }
     const beforeContents = /* @__PURE__ */ new Map();
+    const beforeExisted = /* @__PURE__ */ new Set();
     if (!dryRun) {
       for (const target of resolvedTargets) {
-        beforeContents.set(target, await readTextForTracking(target));
+        const existed = (await fs.stat(target.abs).catch(() => null))?.isFile() ?? false;
+        if (existed) beforeExisted.add(target.abs);
+        beforeContents.set(target.abs, await readTextForTracking(target.abs));
       }
     }
     const tmpDir = await fs.mkdtemp(path2.join(os.tmpdir(), ".wstack_patch_"));
@@ -99,32 +152,70 @@ var patchTool = {
       const patchFile = path2.join(tmpDir, "in.diff");
       await fs.writeFile(patchFile, input.patch, { mode: 384 });
       const args = [`-p${strip}`, "--merge", ...dryRun ? ["--dry-run"] : [], "-i", patchFile];
-      const result = await runPatch(args, dir, opts.signal);
-      if (result.exitCode !== 0 && !dryRun) {
-        return {
-          applied: 0,
-          rejected: 1,
-          files: [],
-          dry_run: dryRun,
-          message: `patch failed: ${result.stderr || result.stdout}`
-        };
-      }
-      const patched = extractPatchedFiles(result.stdout);
+      const result = await runPatch(args, dir, opts.signal, {
+        patchFile,
+        strip,
+        dryRun
+      });
+      const touched = [];
       if (!dryRun) {
         for (const target of resolvedTargets) {
-          const before = beforeContents.get(target) ?? null;
-          const after = await readTextForTracking(target);
+          const abs = target.abs;
+          const before = beforeContents.get(abs) ?? null;
+          const stat2 = await fs.stat(abs).catch(() => null);
+          if (!stat2?.isFile()) {
+            if (beforeExisted.has(abs)) {
+              touched.push(abs);
+              ctx.session?.recordFileChange?.({
+                path: abs,
+                action: "deleted",
+                before,
+                after: null
+              });
+            }
+            continue;
+          }
+          const after = await readTextForTracking(abs);
           if (after === null || after === before) continue;
-          const stat2 = await fs.stat(target).catch(() => null);
-          if (stat2) ctx.recordRead?.(target, stat2.mtimeMs, "write", sha256hex(after));
+          touched.push(abs);
+          ctx.recordRead?.(abs, stat2.mtimeMs, "write", sha256hex(after));
           ctx.session?.recordFileChange?.({
-            path: target,
+            path: abs,
             action: before === null ? "created" : "modified",
             before,
             after
           });
         }
       }
+      if (result.exitCode !== 0) {
+        if (!dryRun) {
+          const partial = touched.length > 0 ? ` ${touched.length} file(s) were still modified on disk and have been recorded for rewind: ${touched.map((p) => path2.relative(realRoot, p) || p).join(", ")}.` : "";
+          return {
+            applied: touched.length,
+            rejected: 1,
+            // Normalize to relative-to-realRoot for API consistency with the
+            // success path (which returns GNU patch's dir-relative names).
+            // `touched` entries are realpaths from resolveRealInsideRoot, and
+            // realRoot is also a realpath, so path.relative is like-for-like.
+            files: touched.map((p) => path2.relative(realRoot, p) || p),
+            dry_run: dryRun,
+            message: `patch failed: ${result.stderr || result.stdout}${partial}`
+          };
+        }
+        const wouldPatch = extractPatchedFiles(result.stdout);
+        return {
+          applied: wouldPatch.length,
+          rejected: 1,
+          files: wouldPatch,
+          dry_run: dryRun,
+          message: `patch preview: would conflict \u2014 ${result.stderr || result.stdout}`
+        };
+      }
+      const patched = result.engine === "git" ? [
+        ...new Set(
+          resolvedTargets.map((target) => path2.relative(dir, target.abs) || target.abs)
+        )
+      ] : extractPatchedFiles(result.stdout);
       return {
         applied: patched.length,
         rejected: 0,
@@ -152,27 +243,86 @@ async function readTextForTracking(absPath) {
 }
 function extractDiffTargets(patch) {
   const out = [];
-  const re = /^\+\+\+\s+([^\t\r\n]+)/gm;
-  for (const m of patch.matchAll(re)) {
-    const raw = m[1];
-    if (!raw) continue;
-    const target = raw.length > 4096 ? raw.slice(0, 4096).trim() : raw.trim();
-    if (!target || target === "/dev/null") continue;
-    out.push(target);
+  const clean = (raw) => {
+    if (!raw) return "";
+    return (raw.length > 4096 ? raw.slice(0, 4096) : raw).trim();
+  };
+  let lastOld;
+  let inHunk = false;
+  let oldLinesLeft = 0;
+  let newLinesLeft = 0;
+  for (const line of patch.split(/\r?\n/)) {
+    const hunkMatch = /^@@ -\d+(?:,(\d+))? \+\d+(?:,(\d+))? @@/.exec(line);
+    if (hunkMatch) {
+      inHunk = true;
+      oldLinesLeft = hunkMatch[1] ? Number(hunkMatch[1]) : 1;
+      newLinesLeft = hunkMatch[2] ? Number(hunkMatch[2]) : 1;
+      lastOld = void 0;
+      continue;
+    }
+    if (inHunk) {
+      const ch = line[0];
+      if (ch === "-") oldLinesLeft--;
+      else if (ch === "+") newLinesLeft--;
+      else if (ch === " " || ch === void 0) {
+        oldLinesLeft--;
+        newLinesLeft--;
+      }
+      if (oldLinesLeft <= 0 && newLinesLeft <= 0) inHunk = false;
+      continue;
+    }
+    const oldMatch = /^---\s+([^\t\r\n]+)/.exec(line);
+    if (oldMatch) {
+      lastOld = clean(oldMatch[1]);
+      continue;
+    }
+    const newMatch = /^\+\+\+\s+([^\t\r\n]+)/.exec(line);
+    if (!newMatch) continue;
+    const newTarget = clean(newMatch[1]);
+    if (newTarget && newTarget !== "/dev/null") {
+      out.push({ raw: newTarget, deleted: false });
+    } else if (lastOld && lastOld !== "/dev/null") {
+      out.push({ raw: lastOld, deleted: true });
+    }
+    lastOld = void 0;
   }
   return out;
 }
 function stripPathComponents(p, strip) {
-  const parts = p.replace(/\\/g, "/").split("/").filter((s) => s !== "" && s !== ".");
-  if (parts.length <= strip) return void 0;
-  return parts.slice(strip).join("/");
+  const s = p.replace(/\\/g, "/");
+  let idx = 0;
+  for (let i = 0; i < strip; i++) {
+    while (idx < s.length && s[idx] !== "/") idx++;
+    let hadSlash = false;
+    while (idx < s.length && s[idx] === "/") {
+      idx++;
+      hadSlash = true;
+    }
+    if (!hadSlash) return void 0;
+  }
+  return s.slice(idx) || void 0;
+}
+function runPatch(args, cwd, signal, fallback) {
+  return runPatchProcess("patch", args, cwd, signal).then(async (result) => {
+    if (!result.unavailable) return { ...result, engine: "patch" };
+    const gitArgs = [
+      "apply",
+      "--unsafe-paths",
+      `-p${fallback.strip}`,
+      "--verbose",
+      ...fallback.dryRun ? ["--check"] : [],
+      fallback.patchFile
+    ];
+    const gitResult = await runPatchProcess("git", gitArgs, cwd, signal);
+    return { ...gitResult, engine: "git" };
+  });
 }
-function runPatch(args, cwd, signal) {
+function runPatchProcess(command, args, cwd, signal) {
   return new Promise((resolve3) => {
     let stdout = "";
     let stderr = "";
     const env = { ...buildChildEnv(), LANG: "C", LC_ALL: "C" };
-    const child = spawn("patch", args, {
+    const child = spawn(command, args, {
       cwd,
       signal,
       env,
@@ -185,13 +335,24 @@ function runPatch(args, cwd, signal) {
     child.stderr?.on("data", (c) => {
       stderr += c.toString();
     });
-    child.on("close", (code) => resolve3({ exitCode: code ?? 1, stdout, stderr }));
-    child.on("error", (e) => resolve3({ exitCode: 1, stdout: "", stderr: e.message }));
+    child.on(
+      "close",
+      (code) => resolve3({ exitCode: code ?? 1, stdout, stderr, unavailable: false })
+    );
+    child.on(
+      "error",
+      (e) => resolve3({
+        exitCode: 1,
+        stdout: "",
+        stderr: e.message,
+        unavailable: e.code === "ENOENT"
+      })
+    );
   });
 }
 function extractPatchedFiles(output) {
   const files = [];
-  const re = /patching file (.+)/gi;
+  const re = /(?:patching|checking) file (.+)/gi;
   for (const m of output.matchAll(re)) {
     if (m[1]) files.push(m[1]);
   }

package/dist/read.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);
@@ -3128,9 +3136,9 @@ import * as path11 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();
@@ -5878,7 +5886,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) : path13.resolve(entrypoint);
+  const href = entrypoint instanceof URL ? entrypoint.href : entrypoint;
+  const cleanHref = href.split(/[?#]/, 1)[0] ?? href;
+  const file = cleanHref.startsWith("file:") ? fileURLToPath(cleanHref) : path13.resolve(cleanHref);
   try {
     const stat3 = fs9.statSync(file);
     if (buildIdCache?.file === file && buildIdCache.mtimeMs === stat3.mtimeMs && buildIdCache.size === stat3.size) {

package/dist/replace.js

@@ -27,6 +27,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" };
@@ -45,6 +120,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) {

package/dist/skill.js

@@ -1,6 +1,11 @@
 // src/skill.ts
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import {
+  missingRequiredRuntimeTools,
+  missingRuntimeCapabilities,
+  runtimeToolReferencesFromText
+} from "@wrongstack/core/agent-catalog";
 import { SKILL_LIMITS, stripFrontmatter } from "@wrongstack/core/skills";
 import { ToolValidationError } from "@wrongstack/core/types";
 var MAX_BODY_CHARS = SKILL_LIMITS.MAX_SKILL_BODY_CHARS;
@@ -44,12 +49,37 @@ function makeSkillTool(skillLoader) {
           field: "name"
         });
       }
+      const availableToolNames = (ctx?.catalogTools ?? ctx?.tools ?? []).map((tool) => tool.name);
+      const missingCapabilities = missingRuntimeCapabilities(
+        manifest.requiredCapabilities,
+        availableToolNames
+      );
+      const missingTools = missingRequiredRuntimeTools(manifest.requiredTools, availableToolNames);
+      if (missingCapabilities.length > 0 || missingTools.length > 0) {
+        throw new ToolValidationError({
+          message: `skill "${name}" is unavailable in this runtime; ` + [
+            missingCapabilities.length > 0 ? `missing capabilities: ${missingCapabilities.join(", ")}` : "",
+            missingTools.length > 0 ? `missing tools: ${missingTools.join(", ")}` : ""
+          ].filter(Boolean).join("; "),
+          field: "name"
+        });
+      }
       const dir = path.dirname(manifest.path);
       let loadedResource;
       if (input.resource?.trim()) {
         loadedResource = await loadResource(dir, input.resource.trim());
       }
       const raw = await skillLoader.readBody(name);
+      const missingBodyTools = missingRequiredRuntimeTools(
+        runtimeToolReferencesFromText(raw),
+        availableToolNames
+      );
+      if (missingBodyTools.length > 0) {
+        throw new ToolValidationError({
+          message: `skill "${name}" references unregistered tools: ${missingBodyTools.join(", ")}`,
+          field: "name"
+        });
+      }
       const body = stripFrontmatter(raw).trim().slice(0, MAX_BODY_CHARS);
       const resources = loadedResource ? [] : await listResources(dir);
       try {
@@ -108,9 +138,26 @@ async function loadResource(skillDir, rel) {
       field: "resource"
     });
   }
+  let realPath;
+  let realRoot;
+  try {
+    realRoot = await fs.realpath(root);
+    realPath = await fs.realpath(absPath);
+  } catch {
+    throw new ToolValidationError({
+      message: `skill: resource "${rel}" not readable`,
+      field: "resource"
+    });
+  }
+  if (realPath !== realRoot && !realPath.startsWith(realRoot + path.sep)) {
+    throw new ToolValidationError({
+      message: `skill: resource "${rel}" resolves outside the skill directory`,
+      field: "resource"
+    });
+  }
   let buf;
   try {
-    buf = await fs.readFile(absPath);
+    buf = await fs.readFile(realPath);
   } catch {
     throw new ToolValidationError({
       message: `skill: resource "${rel}" not readable`,
@@ -121,7 +168,9 @@ async function loadResource(skillDir, rel) {
   const truncated = raw.length > MAX_RESOURCE_CHARS;
   return {
     rel: norm,
-    absPath,
+    // The canonical path — the one actually opened, and the one a follow-up
+    // `bash` invocation should use.
+    absPath: realPath,
     content: truncated ? raw.slice(0, MAX_RESOURCE_CHARS) : raw,
     bytes: buf.length,
     truncated

package/dist/tool-help.js

@@ -31,7 +31,7 @@ var toolHelpTool = {
     const format = input.format ?? "short";
     const includeExamples = input.include_examples ?? false;
     if (input.tool) {
-      const tool = ctx.tools.find((t) => t.name === input.tool);
+      const tool = (ctx.catalogTools ?? ctx.tools).find((t) => t.name === input.tool);
       if (!tool) {
         return {
           tool: input.tool,
@@ -56,7 +56,7 @@ var toolHelpTool = {
         total: 1
       };
     }
-    const allTools = ctx.tools.map((t) => ({
+    const allTools = (ctx.catalogTools ?? ctx.tools).map((t) => ({
       name: t.name,
       description: t.description,
       usageHint: t.usageHint ?? "",

package/dist/tool-search.js

@@ -40,7 +40,7 @@ var toolSearchTool = {
   },
   async execute(input, ctx) {
     const limit = Math.min(input.limit ?? 20, 100);
-    const tools = ctx.tools;
+    const tools = ctx.catalogTools ?? ctx.tools;
     const query = input.query?.toLowerCase() ?? "";
     const filtered = tools.filter((t) => {
       if (query && !t.name.toLowerCase().includes(query) && !t.description.toLowerCase().includes(query)) {

package/dist/tool-tier.d.ts

@@ -1,5 +1,5 @@
-import type { ConcreteTokenSavingTier, Tool } from '@wrongstack/core/types';
 import type { ToolRegistry } from '@wrongstack/core/registry';
+import type { ConcreteTokenSavingTier, Tool } from '@wrongstack/core/types';
 /**
  * Select built-in tools for a concrete token-saving tier while preserving the
  * order and instances supplied by the caller.