token-goat 2.9.29 → 2.9.31

package/dist/{token-goat-chunk-PKRWMHVP.mjs → token-goat-chunk-YHVDKQBR.mjs}

@@ -1,103 +1,149 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
 import {
-  ABSENT_PIN,
   CONTENT_MAX_INPUT_CHARS,
-  ConfinementIdentityError,
+  checkSemanticReadiness,
   compressText,
   createHandoff,
-  fileIdentity,
-  findSpecSeparator,
-  parseColonLineSpec,
-  parseLineRange,
-  pinKey,
   resolveHandoff,
   retrieveText,
   runBrief,
   runChanged,
   runExports,
-  runGrep,
   runImports,
   runOutline,
-  runRead,
   runRefs,
   runSection,
   runSemantic,
   runSkeleton,
   runSymbol,
-  statThroughHandle,
+  statThroughHandle
+} from "./token-goat-chunk-VIHGGGEI.mjs";
+import "./token-goat-chunk-YKB6AQG3.mjs";
+import "./token-goat-chunk-COPNXRJM.mjs";
+import {
+  ABSENT_PIN,
+  ConfinementIdentityError,
+  expandSpecPath,
+  fileIdentity,
+  pinKey,
+  resolveProjectConfinement,
+  runGrep,
+  runRead,
+  specFilePart,
   withPinnedReads
-} from "./token-goat-chunk-NMBWLRHW.mjs";
-import "./token-goat-chunk-VZQEWRVH.mjs";
-import "./token-goat-chunk-PQ53BSCF.mjs";
+} from "./token-goat-chunk-4SC7UJYV.mjs";
+import "./token-goat-chunk-QQTWJY2O.mjs";
+import "./token-goat-chunk-EC5F37F4.mjs";
 import {
   buildProjectMap,
   formatProjectMap,
-  getDirtyPathsFor,
   getEmbeddingCoverage,
   getProjectIndexCounts,
-  isWorkerRunning,
+  isIndexEmptyForProject,
   mapLookupBytesSaved
-} from "./token-goat-chunk-RTMVLHWX.mjs";
-import "./token-goat-chunk-L7H3U27L.mjs";
-import "./token-goat-chunk-RRNZMM3A.mjs";
-import "./token-goat-chunk-E5TK5DNO.mjs";
-import "./token-goat-chunk-ZER6EAXZ.mjs";
-import "./token-goat-chunk-EUSDXRXU.mjs";
-import "./token-goat-chunk-H5J3C56Q.mjs";
-import "./token-goat-chunk-TDUT2CL6.mjs";
+} from "./token-goat-chunk-ZNMNUPAZ.mjs";
+import "./token-goat-chunk-32ZOY4N5.mjs";
+import "./token-goat-chunk-SOAFZNNZ.mjs";
+import "./token-goat-chunk-M52KPT3C.mjs";
+import "./token-goat-chunk-CJLS3CDL.mjs";
+import "./token-goat-chunk-2UPZGKKY.mjs";
+import "./token-goat-chunk-5RG5SBL6.mjs";
+import "./token-goat-chunk-DOWRSMWO.mjs";
+import "./token-goat-chunk-VWZA2H4P.mjs";
+import "./token-goat-chunk-N5LSOVSU.mjs";
+import "./token-goat-chunk-OBOFIHKN.mjs";
+import "./token-goat-chunk-QH7YVYOY.mjs";
+import "./token-goat-chunk-NOSS5VWY.mjs";
+import "./token-goat-chunk-NMD42SFQ.mjs";
+import "./token-goat-chunk-SAMFDIS2.mjs";
+import "./token-goat-chunk-4SMRO4TO.mjs";
+import "./token-goat-chunk-WBA5SKT4.mjs";
+import "./token-goat-chunk-MNWKPRAL.mjs";
+import {
+  getDirtyPathsFor
+} from "./token-goat-chunk-CIMQ2BB3.mjs";
+import "./token-goat-chunk-WDH44VAU.mjs";
 import {
   claudeConfigDir
-} from "./token-goat-chunk-ONXH6NZ5.mjs";
-import "./token-goat-chunk-O6I2XU4P.mjs";
-import "./token-goat-chunk-D4ETHJD6.mjs";
-import "./token-goat-chunk-52NSDWYY.mjs";
-import "./token-goat-chunk-2WOUYWLM.mjs";
+} from "./token-goat-chunk-BPGCUMR7.mjs";
+import "./token-goat-chunk-KQBLRPBN.mjs";
+import "./token-goat-chunk-4ZBFWLXF.mjs";
+import "./token-goat-chunk-C75NA7PL.mjs";
+import {
+  displaySafeFailureText
+} from "./token-goat-chunk-CBIQ7WTD.mjs";
+import "./token-goat-chunk-P6VGNTQT.mjs";
+import "./token-goat-chunk-76FGDLRO.mjs";
+import "./token-goat-chunk-GL3ETKSC.mjs";
+import "./token-goat-chunk-OXFMP75N.mjs";
+import {
+  embeddingsDepsAvailable
+} from "./token-goat-chunk-NISNMD7T.mjs";
+import "./token-goat-chunk-EVMZJ27Z.mjs";
+import "./token-goat-chunk-IK2DRMFX.mjs";
+import "./token-goat-chunk-5Y6ZYL6U.mjs";
+import "./token-goat-chunk-4NAPX7BA.mjs";
 import {
   recordStat,
   savedTokensFromBytes
-} from "./token-goat-chunk-CIQ2FTY3.mjs";
-import "./token-goat-chunk-SE6E4BKJ.mjs";
-import "./token-goat-chunk-DNSPXQXQ.mjs";
+} from "./token-goat-chunk-U4WHMG6Y.mjs";
+import {
+  getDb,
+  pathSuffixClause
+} from "./token-goat-chunk-GVB2MUST.mjs";
+import "./token-goat-chunk-XB5KKOCG.mjs";
+import "./token-goat-chunk-OUKDTVNU.mjs";
 import "./token-goat-chunk-3BTK54F3.mjs";
-import "./token-goat-chunk-XTQAOTSO.mjs";
-import "./token-goat-chunk-AH6QILZM.mjs";
-import "./token-goat-chunk-PGTH2U4C.mjs";
+import "./token-goat-chunk-4GILLLWY.mjs";
+import "./token-goat-chunk-BFCWY73P.mjs";
 import {
-  checkEmbeddingPreflight,
-  embeddingsDepsAvailable
-} from "./token-goat-chunk-VMFWNHGR.mjs";
-import "./token-goat-chunk-435UQTKD.mjs";
+  forClient,
+  mcpFriendlyText
+} from "./token-goat-chunk-KGEFFSHD.mjs";
+import "./token-goat-chunk-XX6O25RN.mjs";
+import "./token-goat-chunk-HAVAOB3S.mjs";
 import {
-  getDb
-} from "./token-goat-chunk-7CPMDFGB.mjs";
+  isWorkerRunning
+} from "./token-goat-chunk-F6PAUIEK.mjs";
+import "./token-goat-chunk-65N4RHP4.mjs";
+import "./token-goat-chunk-X2SUP3EI.mjs";
+import "./token-goat-chunk-25TRAWET.mjs";
+import "./token-goat-chunk-T5P5ACNQ.mjs";
+import {
+  loadConfig
+} from "./token-goat-chunk-7EZTZOMC.mjs";
+import "./token-goat-chunk-QYHO5CPH.mjs";
 import {
-  loadConfig,
   resolveProjectRoot
-} from "./token-goat-chunk-TGOXNAHW.mjs";
-import "./token-goat-chunk-XB5KKOCG.mjs";
+} from "./token-goat-chunk-4GBVPH3D.mjs";
 import "./token-goat-chunk-YZAAZU2S.mjs";
 import {
   envStrList
 } from "./token-goat-chunk-IVE6U7KV.mjs";
+import "./token-goat-chunk-EDBDRVH5.mjs";
+import "./token-goat-chunk-AH6QILZM.mjs";
+import "./token-goat-chunk-Y4AFKTHK.mjs";
 import {
   extractErrorMessage
-} from "./token-goat-chunk-XYWPOSCN.mjs";
+} from "./token-goat-chunk-HU4TORC5.mjs";
+import {
+  echoedValue,
+  stripUnsafeSuggestions
+} from "./token-goat-chunk-GGGG7RWB.mjs";
 import {
   foldCaseForContainment
-} from "./token-goat-chunk-TCQANXYC.mjs";
+} from "./token-goat-chunk-AM5V6GSX.mjs";
 import {
   displaySafeJson,
   normalizePath
-} from "./token-goat-chunk-NMTKNYGF.mjs";
+} from "./token-goat-chunk-FNFBKLRD.mjs";
 import {
   ENV_KEYS,
   VERSION,
   dataDir,
   globalDbPath
-} from "./token-goat-chunk-MELOKFDJ.mjs";
-import "./token-goat-chunk-Y4AFKTHK.mjs";
-import "./token-goat-chunk-JTKCQMQA.mjs";
+} from "./token-goat-chunk-CO3UYX6G.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -107,32 +153,15 @@ init_define_import_meta_env();
 import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
-var TOKEN_GOAT_RETRY_RE = /token-goat (\w[\w-]*) "([^"]+)"/g;
 var MCP_MAX_LIMIT = 1e3;
 var MCP_MAX_CONTEXT_LINES = 50;
 var MCP_MAX_OUTPUT_LINES = 1e4;
 var MCP_MAX_MIN_LINES = 1e5;
-var RETRY_PARAM_BY_COMMAND = {
-  read: "spec",
-  section: "spec",
-  symbol: "name",
-  skeleton: "file",
-  outline: "file"
-};
-function mcpFriendlyText(text) {
-  let out = text.replace(TOKEN_GOAT_RETRY_RE, (_match, cmd, arg) => {
-    const param = RETRY_PARAM_BY_COMMAND[cmd] ?? "parameter";
-    return `the "${cmd}" tool again with a more specific ${param} (e.g. "${arg}")`;
-  });
-  out = out.replace(/--json\b/g, "the json parameter");
-  out = out.replace(/--limit\b/g, "the limit parameter");
-  out = out.replace(/--top\b/g, "the top parameter");
-  out = out.replace(/--grep PATTERN, --section HEADING, or --tail N/g, "a narrower query");
-  return out;
-}
+var DEFAULT_MCP_TOOLS = ["symbol", "read", "section", "outline", "semantic", "refs", "retrieve_text"];
 function toCallToolResult(result) {
+  const text = result.code === 0 ? result.text : mcpFriendlyText(stripUnsafeSuggestions(displaySafeFailureText(result.text)));
   return {
-    content: [{ type: "text", text: mcpFriendlyText(result.text) }],
+    content: [{ type: "text", text }],
     isError: result.code !== 0
   };
 }
@@ -149,16 +178,16 @@ function toRawCallToolResult(result) {
 }
 function captureOutput(fn) {
   const chunks = [];
-  const record = (chunk, encodingOrCb, maybeCb) => {
-    chunks.push(typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf-8"));
+  const recorder = (word) => (chunk, encodingOrCb, maybeCb) => {
+    chunks.push(word(typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf-8")));
     const callback = typeof encodingOrCb === "function" ? encodingOrCb : typeof maybeCb === "function" ? maybeCb : void 0;
     if (typeof callback === "function") callback();
     return true;
   };
   const origStdoutWrite = process.stdout.write.bind(process.stdout);
   const origStderrWrite = process.stderr.write.bind(process.stderr);
-  process.stdout.write = record;
-  process.stderr.write = record;
+  process.stdout.write = recorder((text) => text);
+  process.stderr.write = recorder(forClient);
   try {
     const code = fn();
     return { code, text: chunks.join("") };
@@ -182,8 +211,86 @@ function realPathForContainment(p) {
 function forCompare(p) {
   return process.platform === "win32" ? foldCaseForContainment(p) : p;
 }
-function resolveToolRoot(projectRoot) {
-  const resolved = resolveProjectRoot(projectRoot !== void 0 ? { project: projectRoot } : {});
+function inferProjectRootFromTarget(target) {
+  const file = specFilePart(target);
+  if (!file) return null;
+  if (path.isAbsolute(file)) {
+    if (fs.existsSync(file)) {
+      try {
+        return resolveProjectRoot({ project: path.dirname(file) });
+      } catch {
+        return null;
+      }
+    }
+    return null;
+  }
+  try {
+    if (fs.existsSync(path.resolve(process.cwd(), file))) {
+      return null;
+    }
+  } catch {
+  }
+  const dbPath = globalDbPath();
+  if (fs.existsSync(dbPath)) {
+    try {
+      const db = getDb(dbPath);
+      const suffix = pathSuffixClause("path");
+      const rows = db.prepare(`SELECT path FROM files WHERE ${suffix.clause} ORDER BY length(path), path LIMIT 5`).all(...suffix.params(normalizePath(file)));
+      for (const row of rows) {
+        if (fs.existsSync(row.path)) {
+          return resolveProjectRoot({ project: path.dirname(row.path) });
+        }
+      }
+    } catch {
+    }
+  }
+  if (!file.includes("/") && !file.includes("\\") && !file.includes(".")) {
+    if (fs.existsSync(dbPath)) {
+      try {
+        const db = getDb(dbPath);
+        const rows = db.prepare(`SELECT file_path FROM symbols WHERE name = ? LIMIT 5`).all(file);
+        for (const row of rows) {
+          if (fs.existsSync(row.file_path)) {
+            return resolveProjectRoot({ project: path.dirname(row.file_path) });
+          }
+        }
+      } catch {
+      }
+    }
+  }
+  return null;
+}
+function rootHasIndexedFiles(root) {
+  const dbPath = globalDbPath();
+  if (!fs.existsSync(dbPath)) return false;
+  try {
+    const prefix = normalizePath(root).toLowerCase().replace(/\/+$/, "") + "/";
+    const row = getDb(dbPath).prepare(`SELECT 1 FROM files WHERE TG_LOWER(substr(path, 1, ?)) = ? LIMIT 1`).get(prefix.length, prefix);
+    return row !== void 0;
+  } catch {
+    return false;
+  }
+}
+function resolveToolRoot(projectRoot, candidateTargets) {
+  if (projectRoot !== void 0) {
+    const resolved2 = resolveProjectRoot({ project: projectRoot });
+    assertRootAllowed(resolved2);
+    return resolved2;
+  }
+  if (candidateTargets && candidateTargets.length > 0) {
+    for (const target of candidateTargets) {
+      if (!target) continue;
+      const inferred = inferProjectRootFromTarget(target);
+      if (inferred && rootHasIndexedFiles(inferred)) {
+        try {
+          assertRootAllowed(inferred);
+          return inferred;
+        } catch {
+        }
+      }
+    }
+  }
+  const resolved = resolveProjectRoot({});
   assertRootAllowed(resolved);
   return resolved;
 }
@@ -225,7 +332,7 @@ function assertRootAllowed(resolvedRoot) {
   if (allowedRoots.some((allowed) => checkWithinProjectRoot(resolvedRoot, allowed).inside)) return;
   if (getStandardAuxiliaryRoots(resolvedRoot).some((aux) => checkWithinProjectRoot(resolvedRoot, aux).inside)) return;
   throw new RootNotAllowedError(
-    `refused: "${resolvedRoot}" is not inside any root listed in mcp.allowed_roots. A caller-supplied projectRoot is untrusted input, so this deployment pins which roots may be named; add the root to mcp.allowed_roots (or TOKEN_GOAT_MCP_ALLOWED_ROOTS) to permit it.`
+    `refused: ${echoedValue(resolvedRoot)} is not inside any root listed in mcp.allowed_roots. A caller-supplied projectRoot is untrusted input, so this deployment pins which roots may be named; add the root to mcp.allowed_roots (or TOKEN_GOAT_MCP_ALLOWED_ROOTS) to permit it.`
   );
 }
 var NO_CHECK_PINS = [];
@@ -251,8 +358,9 @@ function pinsFor(abs, real, identity) {
 }
 function checkWithinProjectRoot(target, resolvedRoot) {
   const rootReal = realPathForContainment(resolvedRoot);
-  const abs = path.resolve(resolvedRoot, normalizePath(target));
-  const absRaw = path.resolve(resolvedRoot, target);
+  const spelled = expandSpecPath(target);
+  const abs = path.resolve(resolvedRoot, normalizePath(spelled));
+  const absRaw = path.resolve(resolvedRoot, spelled);
   const identity = identityOf(absRaw);
   const realNative = realPathForContainment(abs);
   if (rootReal === null) return { inside: false, reason: "unresolvable-root", pins: NO_CHECK_PINS };
@@ -269,27 +377,26 @@ function checkWithinProjectRoot(target, resolvedRoot) {
   if (!under(realRaw)) return { inside: false, reason: "outside", pins: NO_CHECK_PINS };
   return { inside: true, reason: "inside", pins: [...pinsFor(abs, realNative, identity), ...pinsFor(absRaw, realRaw, identity)] };
 }
-function specFilePart(spec) {
-  const range = parseLineRange(spec);
-  if (range !== null) return range.file;
-  const region = parseColonLineSpec(spec);
-  if (region !== null) return region.file;
-  const colonIdx = findSpecSeparator(spec);
-  return colonIdx === -1 ? spec : spec.slice(0, colonIdx);
+function specFileCandidates(spec) {
+  const file = specFilePart(spec);
+  const out = [file];
+  for (let idx = file.indexOf("::"); idx !== -1; idx = file.indexOf("::", idx + 1)) if (idx > 0) out.push(file.slice(0, idx));
+  return out;
 }
 var NO_PINS = /* @__PURE__ */ new Map();
-function refusalText(file, resolvedRoot, reason) {
+function refusalText(file, resolvedRoot, reason, projectRootWasOmitted = false) {
   const escapeHatch = "Set mcp.confine_reads_to_project_root = false (or TOKEN_GOAT_MCP_CONFINE_READS=0) to allow cross-root reads.";
+  const omittedNote = projectRootWasOmitted ? ` Note: projectRoot was omitted and defaulted to server process cwd ${echoedValue(resolvedRoot)}. Pass projectRoot: "<workspace-path>" if your target is in another directory.` : "";
   if (reason === "unresolvable-root") {
-    return `refused: the project root "${resolvedRoot}" could not be resolved, so no path can be confirmed to sit inside it. This is a broken workspace root -- an unmounted share, a deleted directory, or a permission change on a parent -- not a request to read outside the project.`;
+    return `refused: the project root ${echoedValue(resolvedRoot)} could not be resolved, so no path can be confirmed to sit inside it. This is a broken workspace root -- an unmounted share, a deleted directory, or a permission change on a parent -- not a request to read outside the project.` + omittedNote;
   }
   if (reason === "unresolvable-target") {
-    return `refused: "${file}" could not be resolved to a real location, so it cannot be confirmed to sit inside the project root. A symlink loop, a permission error on a parent directory, or a path past the operating system's length limit all produce this. The check fails closed rather than falling back to comparing the text of the path.`;
+    return `refused: ${echoedValue(file)} could not be resolved to a real location, so it cannot be confirmed to sit inside the project root. A symlink loop, a permission error on a parent directory, or a path past the operating system's length limit all produce this. The check fails closed rather than falling back to comparing the text of the path.` + omittedNote;
   }
   const rootScope = loadConfig().mcp.allowed_roots.length === 0 ? "Each call is confined to the projectRoot it names, and that root comes from the caller: set mcp.allowed_roots (or TOKEN_GOAT_MCP_ALLOWED_ROOTS) to pin which roots may be named at all." : "Each call is confined to the projectRoot it names, which must itself sit inside mcp.allowed_roots.";
-  return `refused: "${file}" is outside the project root "${resolvedRoot}". ${rootScope} ${escapeHatch}`;
+  return `refused: ${echoedValue(file)} is outside the project root ${echoedValue(resolvedRoot)}. ${rootScope} ${escapeHatch}${omittedNote}`;
 }
-function confineTargets(targets, resolvedRoot, splitCommas = true) {
+function confineTargets(targets, resolvedRoot, splitCommas = true, projectRootWasOmitted = false) {
   if (!loadConfig(resolvedRoot).mcp.confine_reads_to_project_root) return { ok: true, targets, pins: NO_PINS };
   const allowedRoots = loadConfig().mcp.allowed_roots;
   const checked = [];
@@ -297,31 +404,32 @@ function confineTargets(targets, resolvedRoot, splitCommas = true) {
   for (const raw of targets) {
     const parts = splitCommas ? raw.split(",") : [raw];
     for (const part of parts) {
-      const file = specFilePart(part);
-      if (file === "") continue;
-      let check = checkWithinProjectRoot(file, resolvedRoot);
-      if (!check.inside) {
-        for (const allowed of allowedRoots) {
-          const altCheck = checkWithinProjectRoot(file, allowed);
-          if (altCheck.inside) {
-            check = altCheck;
-            break;
+      for (const file of specFileCandidates(part)) {
+        if (file === "") continue;
+        let check = checkWithinProjectRoot(file, resolvedRoot);
+        if (!check.inside) {
+          for (const allowed of allowedRoots) {
+            const altCheck = checkWithinProjectRoot(file, allowed);
+            if (altCheck.inside) {
+              check = altCheck;
+              break;
+            }
           }
         }
-      }
-      if (!check.inside) {
-        for (const aux of getStandardAuxiliaryRoots(file)) {
-          const auxCheck = checkWithinProjectRoot(file, aux);
-          if (auxCheck.inside) {
-            check = auxCheck;
-            break;
+        if (!check.inside) {
+          for (const aux of getStandardAuxiliaryRoots(file)) {
+            const auxCheck = checkWithinProjectRoot(file, aux);
+            if (auxCheck.inside) {
+              check = auxCheck;
+              break;
+            }
           }
         }
+        if (!check.inside) {
+          return { ok: false, refusal: toCallToolResult({ text: refusalText(file, resolvedRoot, check.reason, projectRootWasOmitted), code: 1 }) };
+        }
+        for (const [key, identity] of check.pins) pins.set(key, identity);
       }
-      if (!check.inside) {
-        return { ok: false, refusal: toCallToolResult({ text: refusalText(file, resolvedRoot, check.reason), code: 1 }) };
-      }
-      for (const [key, identity] of check.pins) pins.set(key, identity);
     }
     checked.push(splitCommas ? parts.join(",") : parts[0]);
   }
@@ -340,31 +448,45 @@ function withConfinedRead(pins, fn) {
     throw err;
   }
 }
+function noteOmittedProjectRoot(result, root, projectRootWasOmitted) {
+  if (!projectRootWasOmitted) return result;
+  if (!isIndexEmptyForProject(globalDbPath(), root)) return result;
+  const note = `
+(Note: projectRoot was omitted and defaulted to server cwd ${echoedValue(root)}, which has no files indexed. Pass projectRoot: "<workspace-path>" to target your workspace.)`;
+  const contents = result.content;
+  if (!Array.isArray(contents)) return result;
+  for (const item of contents) {
+    if (item && typeof item === "object" && "text" in item && typeof item.text === "string") {
+      if (!item.text.includes("projectRoot was omitted")) {
+        item.text += note;
+      }
+    }
+  }
+  return result;
+}
 function mcpToolAllowlist() {
   const names = envStrList(ENV_KEYS.MCP_TOOLS, [], ",");
-  return names.length === 0 ? null : new Set(names);
+  return new Set(names.length === 0 ? DEFAULT_MCP_TOOLS : names);
 }
 async function createMcpServer() {
-  const [{ McpServer }, { z }] = await Promise.all([import("./token-goat-chunk-6AK46ZT7.mjs"), import("./token-goat-chunk-CHLHM42P.mjs")]);
+  const [{ McpServer }, { z }] = await Promise.all([import("./token-goat-chunk-6DG6HWP3.mjs"), import("./token-goat-chunk-CHLHM42P.mjs")]);
   const server = new McpServer({ name: "token-goat", version: VERSION });
   const allowlist = mcpToolAllowlist();
-  if (allowlist !== null) {
-    const matched = /* @__PURE__ */ new Set();
-    const registerAll = server.registerTool.bind(server);
-    server.registerTool = ((name, definition, handler) => {
-      if (!allowlist.has(name)) return;
-      matched.add(name);
-      registerAll(name, definition, handler);
-    });
-    setTimeout(() => {
-      const unmatched = [...allowlist].filter((n) => !matched.has(n));
-      if (unmatched.length > 0) {
-        process.stderr.write(`token-goat: ${ENV_KEYS.MCP_TOOLS} names no such tool: ${unmatched.join(", ")}
+  const matched = /* @__PURE__ */ new Set();
+  const registerAll = server.registerTool.bind(server);
+  server.registerTool = ((name, definition, handler) => {
+    if (!allowlist.has(name)) return;
+    matched.add(name);
+    registerAll(name, definition, handler);
+  });
+  setTimeout(() => {
+    const unmatched = [...allowlist].filter((n) => !matched.has(n));
+    if (unmatched.length > 0) {
+      process.stderr.write(`token-goat: ${ENV_KEYS.MCP_TOOLS} names no such tool: ${unmatched.join(", ")}
 `);
-      }
-    }, 0).unref();
-  }
-  const projectRootField = z.string().optional().describe("absolute workspace root; defaults to the server's cwd, which may not be the workspace, so pass it when unsure");
+    }
+  }, 0).unref();
+  const projectRootField = z.string().optional().describe("absolute workspace root; defaults to the server's cwd, which may not be your workspace");
   server.registerTool(
     "symbol",
     {
@@ -381,27 +503,32 @@ async function createMcpServer() {
     },
     (args) => {
       const { name, limit, file, kind, json, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, file ? [file] : name ? [name] : void 0);
       let confinedFile = file;
       let pins = NO_PINS;
       if (file !== void 0) {
-        const gate = confineTargets([file], root);
+        const gate = confineTargets([file], root, true, projectRootWasOmitted);
         if (!gate.ok) return gate.refusal;
         confinedFile = gate.targets[0];
         pins = gate.pins;
       }
-      return withConfinedRead(
-        pins,
-        () => toCallToolResult(
-          runSymbol({
-            name,
-            limit: limit ?? 20,
-            ...confinedFile !== void 0 ? { file: confinedFile } : {},
-            ...kind !== void 0 ? { kind } : {},
-            ...json === true ? { json: true } : {},
-            projectRoot: root
-          })
-        )
+      return noteOmittedProjectRoot(
+        withConfinedRead(
+          pins,
+          () => toCallToolResult(
+            runSymbol({
+              name,
+              limit: limit ?? 20,
+              ...confinedFile !== void 0 ? { file: confinedFile } : {},
+              ...kind !== void 0 ? { kind } : {},
+              ...json === true ? { json: true } : {},
+              projectRoot: root
+            })
+          )
+        ),
+        root,
+        projectRootWasOmitted
       );
     }
   );
@@ -421,20 +548,25 @@ async function createMcpServer() {
     },
     (args) => {
       const { spec, json, forceRefresh, stats, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([spec], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [spec]);
+      const gate = confineTargets([spec], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
-      return withConfinedRead(
-        gate.pins,
-        () => toCallToolResult(
-          runRead({
-            spec: gate.targets[0],
-            ...json === true ? { json: true } : {},
-            ...forceRefresh === true ? { forceRefresh: true } : {},
-            ...stats === true ? { stats: true } : {},
-            projectRoot: root
-          })
-        )
+      return noteOmittedProjectRoot(
+        withConfinedRead(
+          gate.pins,
+          () => toCallToolResult(
+            runRead({
+              spec: gate.targets[0],
+              ...json === true ? { json: true } : {},
+              ...forceRefresh === true ? { forceRefresh: true } : {},
+              ...stats === true ? { stats: true } : {},
+              projectRoot: root
+            })
+          )
+        ),
+        root,
+        projectRootWasOmitted
       );
     }
   );
@@ -451,18 +583,23 @@ async function createMcpServer() {
     },
     (args) => {
       const { spec, json, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([spec], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [spec]);
+      const gate = confineTargets([spec], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
-      return withConfinedRead(
-        gate.pins,
-        () => toCallToolResult(
-          runSection({
-            spec: gate.targets[0],
-            ...json === true ? { json: true } : {},
-            projectRoot: root
-          })
-        )
+      return noteOmittedProjectRoot(
+        withConfinedRead(
+          gate.pins,
+          () => toCallToolResult(
+            runSection({
+              spec: gate.targets[0],
+              ...json === true ? { json: true } : {},
+              projectRoot: root
+            })
+          )
+        ),
+        root,
+        projectRootWasOmitted
       );
     }
   );
@@ -482,21 +619,26 @@ async function createMcpServer() {
     },
     (args) => {
       const { file, json, minLines, forceRefresh, stats, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([file], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [file]);
+      const gate = confineTargets([file], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
-      return withConfinedRead(
-        gate.pins,
-        () => toCallToolResult(
-          runSkeleton({
-            file: gate.targets[0],
-            ...json === true ? { json: true } : {},
-            ...minLines !== void 0 ? { minLines } : {},
-            ...forceRefresh === true ? { forceRefresh: true } : {},
-            ...stats === true ? { stats: true } : {},
-            projectRoot: root
-          })
-        )
+      return noteOmittedProjectRoot(
+        withConfinedRead(
+          gate.pins,
+          () => toCallToolResult(
+            runSkeleton({
+              file: gate.targets[0],
+              ...json === true ? { json: true } : {},
+              ...minLines !== void 0 ? { minLines } : {},
+              ...forceRefresh === true ? { forceRefresh: true } : {},
+              ...stats === true ? { stats: true } : {},
+              projectRoot: root
+            })
+          )
+        ),
+        root,
+        projectRootWasOmitted
       );
     }
   );
@@ -516,21 +658,26 @@ async function createMcpServer() {
     },
     (args) => {
       const { file, json, minLines, forceRefresh, stats, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([file], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [file]);
+      const gate = confineTargets([file], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
-      return withConfinedRead(
-        gate.pins,
-        () => toCallToolResult(
-          runOutline({
-            file: gate.targets[0],
-            ...json === true ? { json: true } : {},
-            ...minLines !== void 0 ? { minLines } : {},
-            ...forceRefresh === true ? { forceRefresh: true } : {},
-            ...stats === true ? { stats: true } : {},
-            projectRoot: root
-          })
-        )
+      return noteOmittedProjectRoot(
+        withConfinedRead(
+          gate.pins,
+          () => toCallToolResult(
+            runOutline({
+              file: gate.targets[0],
+              ...json === true ? { json: true } : {},
+              ...minLines !== void 0 ? { minLines } : {},
+              ...forceRefresh === true ? { forceRefresh: true } : {},
+              ...stats === true ? { stats: true } : {},
+              projectRoot: root
+            })
+          )
+        ),
+        root,
+        projectRootWasOmitted
       );
     }
   );
@@ -607,7 +754,7 @@ async function createMcpServer() {
         }
       }
       const embeddingsEnabled = loadConfig(rootDir).indexing?.embeddings_enabled ?? true;
-      const preflight = await checkEmbeddingPreflight({
+      const preflight = await checkSemanticReadiness({
         projectRoot: rootDir,
         ...coverage !== void 0 ? { coverage } : {}
       });
@@ -647,9 +794,16 @@ async function createMcpServer() {
     },
     (args) => {
       const { spec, callers, limit, top, json, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([spec], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [spec]);
+      const gate = confineTargets([spec], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
+      if (projectRootWasOmitted && isIndexEmptyForProject(globalDbPath(), root)) {
+        return toCallToolResult({
+          text: `Error: projectRoot was omitted and defaulted to server cwd ${echoedValue(root)}, which has no files indexed. Pass projectRoot: "<workspace-path>" to target your workspace.`,
+          code: 1
+        });
+      }
       return withConfinedRead(
         gate.pins,
         () => toCallToolResultFromExitCode(
@@ -682,22 +836,27 @@ async function createMcpServer() {
     },
     (args) => {
       const { spec, limit, json, context, excludeTests, grep, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([spec], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [spec]);
+      const gate = confineTargets([spec], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
-      return withConfinedRead(
-        gate.pins,
-        () => toCallToolResultFromExitCode(
-          () => runBrief({
-            spec: gate.targets[0],
-            ...json === true ? { json: true } : {},
-            ...limit !== void 0 ? { limit } : {},
-            ...context !== void 0 ? { context } : {},
-            ...excludeTests === true ? { excludeTests: true } : {},
-            ...grep !== void 0 ? { grep } : {},
-            projectRoot: root
-          })
-        )
+      return noteOmittedProjectRoot(
+        withConfinedRead(
+          gate.pins,
+          () => toCallToolResultFromExitCode(
+            () => runBrief({
+              spec: gate.targets[0],
+              ...json === true ? { json: true } : {},
+              ...limit !== void 0 ? { limit } : {},
+              ...context !== void 0 ? { context } : {},
+              ...excludeTests === true ? { excludeTests: true } : {},
+              ...grep !== void 0 ? { grep } : {},
+              projectRoot: root
+            })
+          )
+        ),
+        root,
+        projectRootWasOmitted
       );
     }
   );
@@ -713,7 +872,10 @@ async function createMcpServer() {
     },
     (args) => {
       const { compact, projectRoot } = args;
-      const map = buildProjectMap(resolveToolRoot(projectRoot), { compact: compact === true });
+      const root = resolveToolRoot(projectRoot);
+      const projectDenial = resolveProjectConfinement(root).denial;
+      if (projectDenial !== null) return toCallToolResult({ text: projectDenial, code: 1 });
+      const map = buildProjectMap(root, { compact: compact === true });
       const text = formatProjectMap(map, map.compact);
       const bytesSaved = mapLookupBytesSaved(map, text);
       recordStat("map_lookup", bytesSaved, savedTokensFromBytes(bytesSaved));
@@ -739,7 +901,8 @@ async function createMcpServer() {
           ...ref !== void 0 ? { ref } : {},
           ...symbolMode === true ? { symbolMode: true } : {},
           ...json === true ? { json: true } : {},
-          projectRoot: resolveToolRoot(projectRoot)
+          projectRoot: resolveToolRoot(projectRoot),
+          projectRootResolved: true
         })
       );
     }
@@ -762,8 +925,9 @@ async function createMcpServer() {
     },
     (args) => {
       const { pattern, path: searchPath, maxLines, json, recursive, context, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets(searchPath === void 0 ? [root] : searchPath, root, false);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, searchPath);
+      const gate = confineTargets(searchPath === void 0 ? [root] : searchPath, root, false, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
       const confinedPath = searchPath === void 0 ? void 0 : [...gate.targets];
       return withConfinedRead(
@@ -795,8 +959,9 @@ async function createMcpServer() {
     },
     (args) => {
       const { file, json, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([file], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [file]);
+      const gate = confineTargets([file], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
       return withConfinedRead(
         gate.pins,
@@ -819,8 +984,9 @@ async function createMcpServer() {
     },
     (args) => {
       const { file, json, projectRoot } = args;
-      const root = resolveToolRoot(projectRoot);
-      const gate = confineTargets([file], root);
+      const projectRootWasOmitted = projectRoot === void 0;
+      const root = resolveToolRoot(projectRoot, [file]);
+      const gate = confineTargets([file], root, true, projectRootWasOmitted);
       if (!gate.ok) return gate.refusal;
       return withConfinedRead(
         gate.pins,
@@ -889,13 +1055,15 @@ async function createMcpServer() {
         projectRoot: resolveToolRoot(args.projectRoot),
         ...args.full === true ? { full: true } : {}
       });
-      return result === null ? toCallToolResult({ text: `no local handoff named "${args.name}" in this project`, code: 1 }) : typeof result === "string" ? toRawCallToolResult({ text: result, code: 0 }) : toCallToolResult({ text: displaySafeJson(compressionPayload(result)), code: 0 });
+      return result === null ? toCallToolResult({ text: `no local handoff named ${echoedValue(args.name)} in this project`, code: 1 }) : typeof result === "string" ? toRawCallToolResult({ text: result, code: 0 }) : toCallToolResult({ text: displaySafeJson(compressionPayload(result)), code: 0 });
     }
   );
   return server;
 }
 export {
+  DEFAULT_MCP_TOOLS,
   checkWithinProjectRoot,
   createMcpServer,
+  inferProjectRootFromTarget,
   mcpToolAllowlist
 };