token-goat 2.9.17 → 2.9.19

package/dist/{token-goat-chunk-7VQMOBPQ.mjs → token-goat-chunk-WKO5TVNA.mjs}

@@ -1,5 +1,8 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
+import {
+  compareSemver
+} from "./token-goat-chunk-GYC34EGE.mjs";
 import {
   ALL_SYMBOLS_IN_FILE_LIMIT,
   AMBIGUOUS_HEADING_LIMIT,
@@ -20,8 +23,10 @@ import {
   isAvailable as isAvailable2,
   load,
   loadError,
+  namedSpecsMergeable,
   queryJson,
   rankSimilarNames,
+  readSpecsMergeable,
   resolveBody,
   resolveHandoff,
   resolveSymbolMatch,
@@ -91,24 +96,31 @@ import {
   symbolNamesInFile,
   upsertNote,
   warnIfFilesStale
-} from "./token-goat-chunk-IDHWKNKZ.mjs";
+} from "./token-goat-chunk-PIAESKVU.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
+  MCP_TOOL_PATTERN,
   WEB_OUTPUT_SUBDIR,
   buildCommandManifest,
+  buildWasteReport,
   checkSymbolBodySize,
   cmdDescribe,
   cmdSessionSchema,
+  extractResultText,
   filterCommandManifest,
+  findLatestTranscript,
   formatCommandManifest,
   getWebOutput,
   getWebOutputByUrlFromDisk,
   getWebOutputRaw,
+  projectTranscriptsDir,
   readStdinJson,
+  runRecallCommand,
   runReconcile,
+  safeStringify,
   storeWebOutput
-} from "./token-goat-chunk-HRUGS6CO.mjs";
+} from "./token-goat-chunk-2GTB5RBZ.mjs";
 import {
   AGENT_SALT_MARKER,
   CONTEXT_AUTOCOMPACT_TOKENS,
@@ -121,7 +133,6 @@ import {
   SKIP_DIRS,
   WORKER_HEARTBEAT_STALE_MS,
   WorkerAlreadyRunningError,
-  accumulateResidentLine,
   applyIndexingPriority,
   auditClaudeMd,
   buildExtractiveCompact,
@@ -133,6 +144,7 @@ import {
   buildStats,
   bundledCliPath,
   capJsonRows,
+  claudeConfigDir,
   cmdReclaimIndex,
   compactDoc,
   compactPathFor,
@@ -143,7 +155,6 @@ import {
   copilotCliScriptPath,
   copilotCliUserRoot,
   copilotHooksFilePaths,
-  createResidentContextStats,
   detectWalkMode,
   dirtyQueuePathFor,
   drainHeartbeatPathFor,
@@ -163,6 +174,7 @@ import {
   findMemoryMd,
   findOrphanedChunkPaths,
   findSystemTempFiles,
+  findTopIndexedProjects,
   formatAge,
   formatBytes,
   formatMemSuggestions,
@@ -189,9 +201,11 @@ import {
   isCompactFresh,
   isCopilotCliInstalled,
   isHintCategory,
+  isIgnoredIndexPath,
   isManagedServer,
   isPrivateIpv4Octets,
   isPrivateIpv6Groups,
+  isResidueServersJson,
   isSuppressionCategory,
   isVisualStudioInstalled,
   isWorkerRunning,
@@ -208,6 +222,7 @@ import {
   pruneOrphanedChunks,
   pruneSkillOutputs,
   pruneSystemTempFiles,
+  pruneUnembeddableChunks,
   readCompactBody,
   readCopilotHooksOwners,
   readCopilotMcpTools,
@@ -219,6 +234,7 @@ import {
   runDetachedWorkerDaemon,
   scanAndRecord,
   serversOf,
+  sessionsDir,
   setTokenGoatServer,
   shrinkImage,
   skillDescriptionLine,
@@ -227,7 +243,6 @@ import {
   stopWorker,
   storeCompact,
   storeOutput,
-  summarizeResidentContext,
   syncVisualStudioProjectGuidance,
   toolMatcherFor,
   trimToBudget,
@@ -244,59 +259,59 @@ import {
   visualStudioUserMcpPath,
   walkProject,
   writeCompact
-} from "./token-goat-chunk-PKNOHVWP.mjs";
+} from "./token-goat-chunk-FQYMZASI.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
   CompressedOutput,
   FILTERS,
-  RECALL_DEFAULT_LIMIT,
   TOOL_FILTERS,
   ToolFilter,
   clipLongMatchLine,
   combineStreams,
-  commandHash,
   deliverCompressed,
   detectFromCommand,
   getBashOutput,
-  isRecallCacheType,
-  listRecentRecall,
-  normalizeCommandForCacheKey,
-  searchRecall
-} from "./token-goat-chunk-C26ZBGBC.mjs";
+  isRecallCacheType
+} from "./token-goat-chunk-7DGTVBWP.mjs";
 import {
   C,
   DEFAULT_MAX_AGE_MS,
   DEFAULT_MAX_COUNT,
+  HOOK_STATS_RETENTION_DAYS,
   RESET,
   _useRichStats,
   colorStdout,
   compileCustomPatterns,
   fg,
   formatLocalTimestamp,
+  getGlobalDb,
   listBlobs,
   loadBlob,
   pruneBlobs,
+  pruneStalePatternCoveredUnmappedTools,
   readUnmappedTools,
   recordStat,
   redactSecrets,
   renderShortStats,
   renderStats,
   savedTokensFromBytes,
+  statsHasDurationColumn,
+  statsHasHarnessColumn,
   stripAnsi,
   summarize
-} from "./token-goat-chunk-26YUO7MP.mjs";
+} from "./token-goat-chunk-S7RFIX4Y.mjs";
 import {
   docxOutline,
   docxTables,
   docxText,
   formatDocxTables
-} from "./token-goat-chunk-CPHVXKNU.mjs";
+} from "./token-goat-chunk-DHIXE6GV.mjs";
 import {
   pptxNotesText,
   pptxOutline,
   pptxSlideText,
   pptxTextGrep
-} from "./token-goat-chunk-W2GUUQAQ.mjs";
+} from "./token-goat-chunk-3W5P673V.mjs";
 import {
   formatXlsxColumns,
   formatXlsxRange,
@@ -305,13 +320,13 @@ import {
   querySheet,
   rangeSheet,
   xlsxColumns
-} from "./token-goat-chunk-THBLW56G.mjs";
+} from "./token-goat-chunk-FJZ5MZK7.mjs";
 import {
   formatCsvTable,
   parseWhereSpecs
-} from "./token-goat-chunk-KZPO4DWC.mjs";
+} from "./token-goat-chunk-KWM6KBPA.mjs";
 import {
-  PARSER_FINGERPRINT,
+  deleteFileEmbeddings,
   embeddingBackendLoadError,
   embeddingsDepsAvailable,
   ensureEmbeddingProvenance,
@@ -329,14 +344,16 @@ import {
   loadRegexExtractors,
   missingTreeSitterGrammarPackages,
   modelFilesPresent,
+  parserFingerprintForLanguage,
   readSection,
   treeSitterCoreAvailable,
   treeSitterCoreLoadError
-} from "./token-goat-chunk-73GXYYZR.mjs";
+} from "./token-goat-chunk-EP7TCWHM.mjs";
 import {
   getFileEntry,
+  getProjectFileEntries,
   querySymbols
-} from "./token-goat-chunk-BK3RPPTK.mjs";
+} from "./token-goat-chunk-IBTFGZBX.mjs";
 import {
   TREE_SITTER_LANGUAGES,
   detectLanguage,
@@ -347,7 +364,7 @@ import {
   matchGroovySlashy,
   nonTreeSitterLanguageCount,
   redactIfDotenv
-} from "./token-goat-chunk-MWSVUKVV.mjs";
+} from "./token-goat-chunk-JNIFSVWM.mjs";
 import {
   CONFIG_KEY_ENV_OVERRIDES,
   PROJECT_LOCKED_KEYS,
@@ -376,7 +393,7 @@ import {
   stringify,
   validateEnumField,
   validateNumericField
-} from "./token-goat-chunk-2VASS5VR.mjs";
+} from "./token-goat-chunk-SOKAPOOC.mjs";
 import {
   ENV_KEYS,
   LOCK_WAIT_MS_HARDENED,
@@ -402,6 +419,7 @@ import {
   foldPath,
   globalDbPath,
   hookCommandFor,
+  hookExecPartsFor,
   installSingleFilePlugin,
   isTestFile,
   isUnderBlockedRoot,
@@ -414,6 +432,7 @@ import {
   recordCreatedConfig,
   redactUrlQuery,
   removeCreatedBackups,
+  removeEmptyDirInScope,
   removeFileInScope,
   requireNonNegativeStrictInt,
   requirePositiveStrictInt,
@@ -436,7 +455,7 @@ import {
   withRetryOnLock,
   writeIfDifferent,
   writeJsonSettings
-} from "./token-goat-chunk-UBZCON6N.mjs";
+} from "./token-goat-chunk-ZGQXRYKE.mjs";
 import {
   UNTRUSTED_FILE_TAG,
   UNTRUSTED_TOOL_TAG,
@@ -450,7 +469,7 @@ import {
   normalizePath,
   resolveIndexPath,
   toDisplayPath
-} from "./token-goat-chunk-ERTXEKB6.mjs";
+} from "./token-goat-chunk-NMTKNYGF.mjs";
 import {
   compileGuardedRegex
 } from "./token-goat-chunk-GMOUBOX4.mjs";
@@ -3584,9 +3603,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * @param {string} [path]
    * @return {(string|null|Command)}
    */
-  executableDir(path44) {
-    if (path44 === void 0) return this._executableDir;
-    this._executableDir = path44;
+  executableDir(path43) {
+    if (path43 === void 0) return this._executableDir;
+    this._executableDir = path43;
     return this;
   }
   /**
@@ -3886,9 +3905,8 @@ function attemptedCommandName(argv) {
 }
 
 // src/cli.ts
-import * as fs47 from "fs";
-import * as path43 from "path";
-import { homedir as homedir20 } from "os";
+import * as fs46 from "fs";
+import * as path42 from "path";
 
 // src/walk_index.ts
 init_define_import_meta_env();
@@ -3941,8 +3959,8 @@ function collectWalkIndexFiles(root, opts = {}) {
 
 // src/install.ts
 init_define_import_meta_env();
+import { spawnSync } from "node:child_process";
 import * as fs3 from "node:fs";
-import * as os2 from "node:os";
 import * as path3 from "node:path";
 
 // src/bridges/claudecode.ts
@@ -3974,15 +3992,18 @@ var SHIM_TRY_IN_PROCESS = `// Attempts the in-process hook call: import()s dist/
 // loaded) and calls its exported relayInProcess() directly, avoiding a second node
 // process spawn entirely. Returns undefined (triggering the spawnSync fallback below)
 // when entryPath is absent, the sibling file doesn't exist (an older install predating
-// this file), or anything else goes wrong -- this must never throw.
-async function tryInProcess(entryPath, eventName, input) {
+// this file), or anything else goes wrong -- this must never throw. harnessWaitMs, when
+// the caller has one (Claude Code's async-detach marker time -- see SHIM_ASYNC_DETACH),
+// is forwarded straight through: this runs in the same process as the caller, so its
+// performance.now() reading shares the same origin and needs no conversion.
+async function tryInProcess(entryPath, eventName, input, harnessWaitMs) {
   if (!entryPath) return undefined
   try {
     const hookLibPath = path.join(path.dirname(entryPath), 'token-goat-hook.mjs')
     if (!require('node:fs').existsSync(hookLibPath)) return undefined
     const mod = await import(pathToFileURL(hookLibPath).href)
     const payload = JSON.parse(input)
-    return await mod.relayInProcess(eventName, payload)
+    return await mod.relayInProcess(eventName, payload, harnessWaitMs)
   } catch {
     return undefined
   }
@@ -3996,6 +4017,52 @@ var SHIM_SPAWN_LADDER = `    const res = entryPath
           maxBuffer: SHIM_MAX_BUFFER_BYTES,
         })`;
 var SHIM_MAX_BUFFER_CONST = `const SHIM_MAX_BUFFER_BYTES = 32 * 1024 * 1024`;
+var SHIM_ASYNC_DETACH = `const ASYNC_DETACH_TOOLS = new Set(['Edit', 'Write', 'MultiEdit', 'NotebookEdit'])
+const ASYNC_DETACH_SKIP_EXT_RE = /\\.(md|mdx|markdown|rst)$/i
+const ASYNC_DETACH_BASH_MAX_BYTES = 200
+// Same key order as OUTPUT_FIRST_TOOL_RESPONSE_KEYS in hooks_common.ts.
+const ASYNC_DETACH_BASH_TEXT_KEYS = ['output', 'content', 'text', 'body', 'stdout', 'stderr']
+function bashResultByteLength(resp) {
+  if (typeof resp === 'string') return Buffer.byteLength(resp, 'utf8')
+  if (resp && typeof resp === 'object') {
+    if (typeof resp['persistedOutputSize'] === 'number') return resp['persistedOutputSize']
+    for (const key of ASYNC_DETACH_BASH_TEXT_KEYS) {
+      if (typeof resp[key] === 'string' && resp[key] !== '') return Buffer.byteLength(resp[key], 'utf8')
+    }
+    return Buffer.byteLength(JSON.stringify(resp), 'utf8')
+  }
+  return 0
+}
+function isAsyncDetachEligible(eventName, input) {
+  if (eventName === 'subagent_stop') return true
+  if (eventName !== 'post_tool_use') return false
+  try {
+    const payload = JSON.parse(input)
+    const toolName = payload['tool_name']
+    if (ASYNC_DETACH_TOOLS.has(toolName)) {
+      const toolInput = payload['tool_input'] || {}
+      const filePath =
+        typeof toolInput['file_path'] === 'string'
+          ? toolInput['file_path']
+          : typeof toolInput['notebook_path'] === 'string'
+            ? toolInput['notebook_path']
+            : ''
+      return !ASYNC_DETACH_SKIP_EXT_RE.test(filePath)
+    }
+    if (toolName === 'Bash') return bashResultByteLength(payload['tool_response']) < ASYNC_DETACH_BASH_MAX_BYTES
+    return false
+  } catch {
+    return false
+  }
+}`;
+var SHIM_OWN_COMMAND_BYPASS = `const TG_CD_PREFIX_RE = /^(?:cd\\s+(?:"[^"]*"|'[^']*'|\\S+)[ \\t]*(?:&&|;|\\r?\\n)\\s*)+/
+const TG_OWN_COMMAND_RE = /^(?:[A-Za-z_][A-Za-z0-9_]*=\\S+\\s+)*(?:token-goat\\b|node(?:\\.exe)?\\s+["']?(?:\\S*[\\\\/])?token-goat(?:\\.mjs)?["']?\\b)/i
+function isOwnTokenGoatCommand(cmd) {
+  if (typeof cmd !== 'string' || cmd.trim() === '') return false
+  const body = (cmd.replace(TG_CD_PREFIX_RE, '') || cmd).trim()
+  if (/[;&|\`]|\\$\\(/.test(body)) return false
+  return TG_OWN_COMMAND_RE.test(body)
+}`;
 
 // src/bridges/claudecode.ts
 var CLAUDECODE_HOOK_SCRIPT = `#!/usr/bin/env node
@@ -4025,6 +4092,10 @@ ${SHIM_TRY_IN_PROCESS}
 
 ${SHIM_MAX_BUFFER_CONST}
 
+${SHIM_ASYNC_DETACH}
+
+${SHIM_OWN_COMMAND_BYPASS}
+
 async function main() {
   const eventName = process.argv[2] || ''
   if (!VALID_HOOK_EVENTS.has(eventName)) {
@@ -4038,6 +4109,32 @@ async function main() {
     process.stdout.write('{}')
     return
   }
+  // A pre_tool_use Bash call that is token-goat's own CLI has nothing for the pipeline below to
+  // say, so this skips the round trip entirely rather than backgrounding it -- see
+  // isOwnTokenGoatCommand's docstring in shim_common.ts for the measured emission rate this
+  // forfeits.
+  if (eventName === 'pre_tool_use') {
+    try {
+      const payload = JSON.parse(input)
+      if (payload['tool_name'] === 'Bash' && isOwnTokenGoatCommand(payload['tool_input'] && payload['tool_input']['command'])) {
+        process.stdout.write('{}')
+        return
+      }
+    } catch {
+      // Fall through to normal handling on unparseable stdin.
+    }
+  }
+  // Print this before the in-process/spawn round trip below, not after: the harness detaches on
+  // the first stdout line it sees, and the whole point is not waiting out that round trip for a
+  // call that was always going to answer '{}'. asyncDetachAtMs, taken at this exact print, is the
+  // last instant this process's elapsed time and the harness's own wait are the same number --
+  // record it now so the finally block in relayInProcess (relay.ts) can report what Claude Code
+  // actually waited on instead of this call's full lifetime.
+  let asyncDetachAtMs
+  if (isAsyncDetachEligible(eventName, input)) {
+    asyncDetachAtMs = performance.now()
+    process.stdout.write('{"async":true}\\n')
+  }
   // process.argv[3], when present, is the absolute path to the running token-goat CLI
   // entry (mirrors the same argv[3]-baked-entry convention used by the Codex/Copilot
   // CLI shims). Try the in-process hook lib first (tryInProcess above), which avoids
@@ -4048,8 +4145,15 @@ async function main() {
   // timeout/killSignal on both spawnSync fallbacks means token-goat degrades to its own
   // fail-open '{}' rather than being force-killed by Claude Code's own hook timeout.
   const entryPath = process.argv[3]
-  let stdout = await tryInProcess(entryPath, eventName, input)
+  let stdout = await tryInProcess(entryPath, eventName, input, asyncDetachAtMs)
   if (stdout === undefined) {
+    // Reaching here with asyncDetachAtMs set means tryInProcess failed after
+    // isAsyncDetachEligible had already parsed this same input successfully, so the cause is an
+    // install missing its dist/token-goat-hook.mjs sibling or a broken import -- never a bad
+    // payload. asyncDetachAtMs is this process's own elapsed time and has no meaning in the
+    // spawned child's clock, so it is deliberately not threaded across that boundary; the child
+    // falls back to timing its own lifetime, the same already-approximate number every hook got
+    // on this fallback path before async-detach existed.
 ${SHIM_SPAWN_LADDER}
       : spawnSync('token-goat hook ' + eventName, {
           input,
@@ -4091,18 +4195,56 @@ function anchoredMarkerPattern(marker) {
   return new RegExp(`(?<![a-zA-Z0-9_-])${escaped}(?![a-zA-Z0-9_-])`);
 }
 var HOOK_MARKER_PATTERNS = [SHIM_COMMAND_MARKER, COMMAND_MARKER, ...LEGACY_COMMAND_MARKERS].map(anchoredMarkerPattern);
-function isTokenGoatHookCommand(command) {
-  return HOOK_MARKER_PATTERNS.some((pattern) => pattern.test(command));
+function isTokenGoatHookCommand(command, args) {
+  const haystack = args !== void 0 && args.length > 0 ? `${command} ${args.join(" ")}` : command;
+  return HOOK_MARKER_PATTERNS.some((pattern) => pattern.test(haystack));
+}
+var CLAUDE_EXEC_FORM_MIN_VERSION = "2.1.139";
+var _claudeExecFormHooksSupported;
+function claudeExecFormHooksSupported() {
+  const override = process.env["TOKEN_GOAT_CLAUDE_EXEC_FORM_HOOKS"];
+  if (override === "1") return true;
+  if (override === "0") return false;
+  if (_claudeExecFormHooksSupported !== void 0) return _claudeExecFormHooksSupported;
+  _claudeExecFormHooksSupported = probeClaudeExecFormHooksSupported();
+  return _claudeExecFormHooksSupported;
+}
+function probeClaudeExecFormHooksSupported() {
+  const resolved = resolveOnPath("claude");
+  if (resolved === null) return false;
+  try {
+    const isBatch = /\.(?:cmd|bat)$/i.test(resolved);
+    const comspec = path3.join(process.env["SystemRoot"] ?? process.env["windir"] ?? "C:\\Windows", "System32", "cmd.exe");
+    const result = isBatch ? spawnSync(fs3.existsSync(comspec) ? comspec : "cmd.exe", ["/d", "/s", "/c", resolved, "--version"], { encoding: "utf-8", timeout: 5e3, windowsHide: true }) : spawnSync(resolved, ["--version"], { encoding: "utf-8", timeout: 5e3, windowsHide: true });
+    if (result.status !== 0) return false;
+    return execFormSupportedForVersionOutput(result.stdout ?? "");
+  } catch {
+    return false;
+  }
+}
+function execFormSupportedForVersionOutput(stdout) {
+  const m = /(\d+\.\d+\.\d+)/.exec(stdout);
+  if (!m) return false;
+  return compareSemver(m[1], CLAUDE_EXEC_FORM_MIN_VERSION) >= 0;
+}
+function expectedHookEntryFor(scriptPath, event) {
+  return claudeExecFormHooksSupported() ? hookExecPartsFor(scriptPath, event) : { command: hookCommandFor(scriptPath, event) };
+}
+function hookEntryMatches(command, args, expected) {
+  if (command !== expected.command) return false;
+  const a = args ?? [];
+  const b = expected.args ?? [];
+  return a.length === b.length && a.every((v, i) => v === b[i]);
 }
 function claudeHookScriptPath() {
-  return path3.join(os2.homedir(), ".claude", "hooks", "token-goat-shim.js");
+  return path3.join(claudeConfigDir(), "hooks", "token-goat-shim.js");
 }
 function anyScopeReferencesShim(scriptPath, currentScope, alreadyStripped) {
   const referencesIn = (map) => {
     for (const groups of Object.values(map ?? {})) {
       for (const group of groups) {
         for (const h of group.hooks ?? []) {
-          if (h.command.includes(scriptPath)) return true;
+          if (h.command.includes(scriptPath) || (h.args ?? []).some((a) => a.includes(scriptPath))) return true;
         }
       }
     }
@@ -4116,8 +4258,7 @@ function anyScopeReferencesShim(scriptPath, currentScope, alreadyStripped) {
   return false;
 }
 function settingsPath(scope) {
-  const root = scope === "user" ? os2.homedir() : normalizeDarwinSystemAlias(process.cwd());
-  const base = path3.join(root, ".claude");
+  const base = scope === "user" ? claudeConfigDir() : path3.join(normalizeDarwinSystemAlias(process.cwd()), ".claude");
   return path3.join(base, "settings.json");
 }
 var SettingsParseError = class extends Error {
@@ -4154,7 +4295,7 @@ function groupHasTokenGoat(groups, predicate) {
   if (groups === void 0) return false;
   for (const group of groups) {
     for (const h of group.hooks ?? []) {
-      if (predicate(h.command)) return true;
+      if (predicate(h.command, h.args)) return true;
     }
   }
   return false;
@@ -4176,13 +4317,13 @@ function installHooksScoped(scope) {
   });
   let settingsChanged = false;
   for (const [eventKey, eventArg] of HOOK_EVENT_MAP) {
-    const expectedCommand = hookCommandFor(scriptPath, eventArg);
+    const expected = expectedHookEntryFor(scriptPath, eventArg);
     const existingGroups = hooks[eventKey] ?? [];
     const groups = [];
     let strippedStale = false;
     for (const group of existingGroups) {
       const keptHooks = (group.hooks ?? []).filter((h) => {
-        const isStale = isTokenGoatHookCommand(h.command) && h.command !== expectedCommand;
+        const isStale = isTokenGoatHookCommand(h.command, h.args) && !hookEntryMatches(h.command, h.args, expected);
         if (isStale) strippedStale = true;
         return !isStale;
       });
@@ -4192,7 +4333,7 @@ function installHooksScoped(scope) {
         groups.push(group);
       }
     }
-    const isOurs = (command) => command === expectedCommand;
+    const isOurs = (command, args) => hookEntryMatches(command, args, expected);
     if (groupHasTokenGoat(groups, isOurs)) {
       const narrowed = toolMatcherFor(eventArg);
       let renarrowed = false;
@@ -4201,7 +4342,7 @@ function installHooksScoped(scope) {
           const group = groups[i];
           if (group === void 0) continue;
           const ownHooks = group.hooks ?? [];
-          const isOwnGroup = ownHooks.length > 0 && ownHooks.every((h) => isOurs(h.command));
+          const isOwnGroup = ownHooks.length > 0 && ownHooks.every((h) => isOurs(h.command, h.args));
           if (isOwnGroup && group.matcher !== narrowed) {
             groups[i] = { ...group, matcher: narrowed };
             renarrowed = true;
@@ -4215,7 +4356,7 @@ function installHooksScoped(scope) {
       continue;
     }
     const matcher = toolMatcherFor(eventArg) ?? "";
-    groups.push({ matcher, hooks: [{ type: "command", command: expectedCommand }] });
+    groups.push({ matcher, hooks: [{ type: "command", command: expected.command, ...expected.args !== void 0 ? { args: expected.args } : {} }] });
     hooks[eventKey] = groups;
     settingsChanged = true;
   }
@@ -4259,15 +4400,15 @@ function isInstalled(scope = "user") {
   const scriptPath = claudeHookScriptPath();
   if (!fs3.existsSync(scriptPath)) return false;
   for (const [eventKey, eventArg] of HOOK_EVENT_MAP) {
-    const expectedCommand = hookCommandFor(scriptPath, eventArg);
-    if (!groupHasTokenGoat(hooks[eventKey], (c) => c === expectedCommand)) return false;
+    const expected = expectedHookEntryFor(scriptPath, eventArg);
+    if (!groupHasTokenGoat(hooks[eventKey], (c, a) => hookEntryMatches(c, a, expected))) return false;
   }
   return true;
 }
 var CLAUDE_MD_BEGIN = "<!-- token-goat-begin -->";
 var CLAUDE_MD_END = "<!-- token-goat-end -->";
 function claudeMdPath() {
-  return path3.join(os2.homedir(), ".claude", "CLAUDE.md");
+  return path3.join(claudeConfigDir(), "CLAUDE.md");
 }
 function buildClaudeMdBlock() {
   return buildGuidanceBlock({
@@ -4292,7 +4433,7 @@ function uninstallClaudeMd() {
   return stripClaudeMdBlock(claudeMdPath());
 }
 function findStrayClaudeMdBlocks(searchRoot) {
-  const root = searchRoot ?? path3.join(os2.homedir(), ".claude");
+  const root = searchRoot ?? claudeConfigDir();
   const canonical = path3.resolve(claudeMdPath());
   const found = [];
   if (!fs3.existsSync(root)) return found;
@@ -4354,7 +4495,7 @@ ${buildGuidanceBody("Claude Code's own Read, Grep, and Glob preference rules", {
 `;
 }
 function skillDir() {
-  return path3.join(os2.homedir(), ".claude", "skills", "token-goat");
+  return path3.join(claudeConfigDir(), "skills", "token-goat");
 }
 function skillPath() {
   return path3.join(skillDir(), "SKILL.md");
@@ -4386,7 +4527,7 @@ function uninstallSkill() {
 init_define_import_meta_env();
 import * as crypto from "node:crypto";
 import * as fs4 from "node:fs";
-import * as os3 from "node:os";
+import * as os2 from "node:os";
 import * as path4 from "node:path";
 
 // src/bridges/codex.ts
@@ -4541,13 +4682,13 @@ var CODEX_GLOBAL_EVENT_ARG = {
 var CodexConfigParseError = class extends Error {
 };
 function codexConfigPath() {
-  return path4.join(os3.homedir(), ".codex", "config.toml");
+  return path4.join(os2.homedir(), ".codex", "config.toml");
 }
 function codexAgentsPath() {
-  return path4.join(os3.homedir(), ".codex", "AGENTS.md");
+  return path4.join(os2.homedir(), ".codex", "AGENTS.md");
 }
 function codexHookScriptPath() {
-  return path4.join(os3.homedir(), ".codex", "hooks", "token-goat-shim.js");
+  return path4.join(os2.homedir(), ".codex", "hooks", "token-goat-shim.js");
 }
 function readCodexConfig(p, opts = {}) {
   let raw;
@@ -4823,7 +4964,7 @@ function stripAgentsBlock(p) {
 // src/bridges/gemini_install.ts
 init_define_import_meta_env();
 import * as fs5 from "node:fs";
-import * as os4 from "node:os";
+import * as os3 from "node:os";
 import * as path5 from "node:path";
 var GEMINI_LEGACY_COMMAND_MARKER = "token-goat hook";
 var GEMINI_HOOK_EVENTS = ["BeforeTool", "AfterTool", "PreCompress"];
@@ -4845,7 +4986,7 @@ function registeredInternalTools(eventName) {
 var GeminiSettingsParseError = class extends Error {
 };
 function geminiSettingsPath() {
-  return path5.join(os4.homedir(), ".gemini", "settings.json");
+  return path5.join(os3.homedir(), ".gemini", "settings.json");
 }
 function readGeminiSettings(p, opts = {}) {
   let raw;
@@ -4976,7 +5117,7 @@ function isGeminiInstalled() {
 // src/bridges/qwen_install.ts
 init_define_import_meta_env();
 import * as fs6 from "node:fs";
-import * as os5 from "node:os";
+import * as os4 from "node:os";
 import * as path6 from "node:path";
 var QWEN_HOOK_EVENTS = ["PreToolUse", "PostToolUse", "PreCompact", "UserPromptSubmit", "SubagentStop"];
 var QWEN_EVENT_ARG = {
@@ -4989,7 +5130,7 @@ var QWEN_EVENT_ARG = {
 var QwenSettingsParseError = class extends Error {
 };
 function qwenSettingsPath() {
-  return path6.join(os5.homedir(), ".qwen", "settings.json");
+  return path6.join(os4.homedir(), ".qwen", "settings.json");
 }
 function readQwenSettings(p, opts = {}) {
   let raw;
@@ -5093,7 +5234,7 @@ function isQwenInstalled() {
 // src/bridges/kimi_install.ts
 init_define_import_meta_env();
 import * as fs7 from "node:fs";
-import * as os6 from "node:os";
+import * as os5 from "node:os";
 import * as path7 from "node:path";
 
 // src/bridges/kimi.ts
@@ -5202,7 +5343,7 @@ var KimiConfigParseError = class extends Error {
 function kimiHome() {
   const override = process.env["KIMI_CODE_HOME"];
   if (override !== void 0 && override.trim() !== "") return path7.resolve(override);
-  return path7.join(os6.homedir(), ".kimi-code");
+  return path7.join(os5.homedir(), ".kimi-code");
 }
 function kimiConfigPath() {
   return path7.join(kimiHome(), "config.toml");
@@ -5356,7 +5497,7 @@ function isKimiInstalled() {
 // src/bridges/pi_install.ts
 init_define_import_meta_env();
 import * as fs8 from "node:fs";
-import * as os7 from "node:os";
+import * as os6 from "node:os";
 import * as path8 from "node:path";
 
 // src/bridges/pi.ts
@@ -5722,7 +5863,7 @@ export default function (pi: ExtensionAPI) {
 
 // src/bridges/pi_install.ts
 function piGlobalExtensionPath() {
-  return path8.join(os7.homedir(), ".pi", "agent", "extensions", "token-goat.ts");
+  return path8.join(os6.homedir(), ".pi", "agent", "extensions", "token-goat.ts");
 }
 function piLocalExtensionPath() {
   return path8.join(process.cwd(), ".pi", "extensions", "token-goat.ts");
@@ -5758,7 +5899,7 @@ function isPiInstalled(opts = {}) {
 // src/bridges/opencode_install.ts
 init_define_import_meta_env();
 import * as fs9 from "node:fs";
-import * as os8 from "node:os";
+import * as os7 from "node:os";
 import * as path9 from "node:path";
 
 // src/bridges/opencode.ts
@@ -6032,11 +6173,11 @@ function opencodeGlobalConfigDir() {
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
     if (appData !== void 0 && appData.trim() !== "") return appData;
-    return path9.join(os8.homedir(), "AppData", "Roaming");
+    return path9.join(os7.homedir(), "AppData", "Roaming");
   }
   const xdgConfigHome = process.env["XDG_CONFIG_HOME"];
   if (xdgConfigHome !== void 0 && xdgConfigHome.trim() !== "") return xdgConfigHome;
-  return path9.join(os8.homedir(), ".config");
+  return path9.join(os7.homedir(), ".config");
 }
 function opencodePluginPath() {
   return path9.join(opencodeGlobalConfigDir(), "opencode", "plugins", "token-goat.ts");
@@ -6059,7 +6200,7 @@ function isOpencodeInstalled() {
 // src/bridges/openclaw_install.ts
 init_define_import_meta_env();
 import * as fs10 from "node:fs";
-import * as os9 from "node:os";
+import * as os8 from "node:os";
 import * as path10 from "node:path";
 
 // src/bridges/openclaw.ts
@@ -6221,7 +6362,7 @@ var OpenclawConfigParseError = class extends Error {
 };
 var OPENCLAW_PLUGIN_ID = "token-goat";
 function openclawHomeDir() {
-  return path10.join(os9.homedir(), ".openclaw");
+  return path10.join(os8.homedir(), ".openclaw");
 }
 function openclawConfigPath() {
   return path10.join(openclawHomeDir(), "openclaw.json");
@@ -6373,7 +6514,7 @@ function isOpenclawInstalled() {
 // src/bridges/grok_install.ts
 init_define_import_meta_env();
 import * as fs11 from "node:fs";
-import * as os10 from "node:os";
+import * as os9 from "node:os";
 import * as path11 from "node:path";
 
 // src/bridges/grok.ts
@@ -6485,7 +6626,7 @@ var GROK_EVENT_ARG = {
   SubagentStop: "subagent_stop"
 };
 function grokHooksDir() {
-  return path11.join(os10.homedir(), ".grok", "hooks");
+  return path11.join(os9.homedir(), ".grok", "hooks");
 }
 function grokConfigPath() {
   return path11.join(grokHooksDir(), "token-goat.json");
@@ -6535,7 +6676,7 @@ function isGrokInstalled() {
 // src/bridges/vscode_install.ts
 init_define_import_meta_env();
 import * as fs12 from "node:fs";
-import * as os11 from "node:os";
+import * as os10 from "node:os";
 import * as path12 from "node:path";
 var VSCODE_GUIDANCE_BEGIN = "<!-- token-goat-vscode-begin -->";
 var VSCODE_GUIDANCE_END = "<!-- token-goat-vscode-end -->";
@@ -6544,13 +6685,13 @@ var END = VSCODE_GUIDANCE_END;
 function vscodeUserConfigDir() {
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
-    const base = appData !== void 0 && appData.trim() !== "" ? appData : path12.join(os11.homedir(), "AppData", "Roaming");
+    const base = appData !== void 0 && appData.trim() !== "" ? appData : path12.join(os10.homedir(), "AppData", "Roaming");
     return path12.join(base, "Code", "User");
   }
   if (process.platform === "darwin") {
-    return path12.join(os11.homedir(), "Library", "Application Support", "Code", "User");
+    return path12.join(os10.homedir(), "Library", "Application Support", "Code", "User");
   }
-  return path12.join(os11.homedir(), ".config", "Code", "User");
+  return path12.join(os10.homedir(), ".config", "Code", "User");
 }
 function vscodeUserMcpPath() {
   return path12.join(vscodeUserConfigDir(), "mcp.json");
@@ -6565,11 +6706,11 @@ function otherScopeMcpPath(opts) {
   return opts.project === true ? vscodeUserMcpPath() : vscodeProjectMcpPath(opts.projectRoot);
 }
 function vscodeInstructionsPath(opts = {}) {
-  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "copilot-instructions.md") : path12.join(os11.homedir(), ".copilot", "instructions", "token-goat.instructions.md");
+  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "copilot-instructions.md") : path12.join(os10.homedir(), ".copilot", "instructions", "token-goat.instructions.md");
 }
 var USER_INSTRUCTIONS_FRONTMATTER = "---\ndescription: 'token-goat: when to use its MCP tools and CLI instead of reading whole files'\napplyTo: '**'\n---\n";
 function vscodeHooksDir(opts = {}) {
-  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "hooks") : path12.join(os11.homedir(), ".copilot", "hooks");
+  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "hooks") : path12.join(os10.homedir(), ".copilot", "hooks");
 }
 function vscodeScopeFromFlags(flags) {
   return { project: flags.user !== true };
@@ -6715,8 +6856,12 @@ function uninstallVscodeScoped(opts) {
     }
     if (servers && isManagedServer(servers["token-goat"])) {
       const next = dropEmptyServers(updateConfig(config.text, void 0));
-      if (/^\s*\{\s*\}\s*$/.test(next) && takeCreatedConfig(mcpPath)) removeFileInScope(mcpPath);
-      else {
+      if (/^\s*\{\s*\}\s*$/.test(next) && takeCreatedConfig(mcpPath)) {
+        removeFileInScope(mcpPath);
+        if (opts.project === true) {
+          removeEmptyDirInScope(path12.dirname(mcpPath));
+        }
+      } else {
         backupFile(mcpPath);
         atomicWriteText(mcpPath, next);
       }
@@ -6733,16 +6878,31 @@ function uninstallVscodeScoped(opts) {
   if (releaseCopilotHooksFile(vscodeHooksDir(opts), "vscode", opts.keepBackups === true)) removed = true;
   return removed;
 }
+function cleanupDeprecatedVscodeProjectMcp(projectRoot) {
+  const root = path12.resolve(projectRoot ?? process.cwd());
+  return withInstallScope(root, () => {
+    const projectMcp = path12.join(root, ".vscode", "mcp.json");
+    if (!fs12.existsSync(projectMcp)) return false;
+    const text = fs12.readFileSync(projectMcp, "utf8");
+    if (isResidueServersJson(text) && takeCreatedConfig(projectMcp)) {
+      removeFileInScope(projectMcp);
+      removeEmptyDirInScope(path12.dirname(projectMcp));
+      removeCreatedBackups(projectMcp);
+      return true;
+    }
+    return false;
+  });
+}
 
 // src/bridges/cursor_install.ts
 init_define_import_meta_env();
 import * as fs13 from "node:fs";
-import * as os12 from "node:os";
+import * as os11 from "node:os";
 import * as path13 from "node:path";
 var MCP_SERVERS_KEY = "mcpServers";
 var TOKEN_GOAT_ENTRY_KEY = "token-goat";
 function cursorUserConfigDir() {
-  return path13.join(os12.homedir(), ".cursor");
+  return path13.join(os11.homedir(), ".cursor");
 }
 function cursorMcpPath(opts = {}) {
   if (opts.project === true) {
@@ -6817,7 +6977,7 @@ function cursorManagedEntry(mcpPath) {
 // src/bridges/zed_install.ts
 init_define_import_meta_env();
 import * as fs14 from "node:fs";
-import * as os13 from "node:os";
+import * as os12 from "node:os";
 import * as path14 from "node:path";
 var CONTEXT_SERVERS_KEY = "context_servers";
 var TOKEN_GOAT_ENTRY_KEY2 = "token-goat";
@@ -6825,11 +6985,11 @@ var ZED_TIMEOUT_MS = 3e4;
 function zedConfigDir() {
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
-    const base2 = appData !== void 0 && appData.trim() !== "" ? appData : path14.join(os13.homedir(), "AppData", "Roaming");
+    const base2 = appData !== void 0 && appData.trim() !== "" ? appData : path14.join(os12.homedir(), "AppData", "Roaming");
     return path14.join(base2, "Zed");
   }
   const xdgConfig = process.env["XDG_CONFIG_HOME"];
-  const base = xdgConfig !== void 0 && xdgConfig.trim() !== "" ? xdgConfig : path14.join(os13.homedir(), ".config");
+  const base = xdgConfig !== void 0 && xdgConfig.trim() !== "" ? xdgConfig : path14.join(os12.homedir(), ".config");
   return path14.join(base, "zed");
 }
 function zedSettingsPath() {
@@ -6919,13 +7079,88 @@ function zedManagedEntry(settingsPath2) {
 init_define_import_meta_env();
 import * as fs18 from "fs";
 import * as path17 from "path";
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
+
+// src/hook_latency.ts
+init_define_import_meta_env();
+function percentile(sorted, p) {
+  if (sorted.length === 0) return 0;
+  const idx = Math.min(sorted.length - 1, Math.max(0, Math.ceil(p / 100 * sorted.length) - 1));
+  return sorted[idx];
+}
+function formatAgeSeconds(seconds) {
+  if (seconds < 60) return `${seconds}s ago`;
+  if (seconds < 3600) return `${Math.floor(seconds / 60)}m ago`;
+  if (seconds < 86400) return `${Math.floor(seconds / 3600)}h ago`;
+  return `${Math.floor(seconds / 86400)}d ago`;
+}
+function hookLatencyBreakdown(testDb, homeDir) {
+  try {
+    const db = testDb ?? getGlobalDb(homeDir);
+    if (!statsHasDurationColumn(db)) return [];
+    const harnessExpr = statsHasHarnessColumn(db) ? "COALESCE(harness, '')" : "''";
+    const rows = db.prepare(
+      `SELECT kind, ${harnessExpr} AS harness, duration_ms, ts FROM stats
+         WHERE kind LIKE 'hook:%' AND duration_ms IS NOT NULL ORDER BY ts DESC`
+    ).all();
+    const grouped = /* @__PURE__ */ new Map();
+    for (const row of rows) {
+      const event = row.kind.slice("hook:".length);
+      const key = `${event}::${row.harness}`;
+      let g = grouped.get(key);
+      if (g === void 0) {
+        g = { event, harness: row.harness, durations: [], newest_ts: row.ts };
+        grouped.set(key, g);
+      }
+      g.durations.push(row.duration_ms);
+      if (row.ts > g.newest_ts) g.newest_ts = row.ts;
+    }
+    return [...grouped.values()].map((g) => {
+      const sorted = [...g.durations].sort((a, b) => a - b);
+      return {
+        event: g.event,
+        harness: g.harness,
+        count: sorted.length,
+        median_ms: percentile(sorted, 50),
+        p95_ms: percentile(sorted, 95),
+        max_ms: sorted[sorted.length - 1],
+        newest_ts: g.newest_ts
+      };
+    }).sort((a, b) => b.p95_ms - a.p95_ms);
+  } catch {
+    return [];
+  }
+}
+function renderHookLatencyStats(testDb, homeDir) {
+  const rows = hookLatencyBreakdown(testDb, homeDir);
+  if (rows.length === 0) {
+    console.log(`No hook latency recorded in the last ${HOOK_STATS_RETENTION_DAYS} day(s) (or this database predates the duration_ms column).`);
+    return;
+  }
+  const nowTs = Math.floor(Date.now() / 1e3);
+  console.log(`Hook latency, last ${HOOK_STATS_RETENTION_DAYS} day(s) (worst p95 first):`);
+  for (const r of rows) {
+    const age = formatAgeSeconds(Math.max(0, nowTs - r.newest_ts));
+    console.log(
+      `  ${r.event.padEnd(22)} ${(r.harness || "unrecorded").padEnd(12)} n=${String(r.count).padEnd(5)} median ${String(r.median_ms).padStart(5)}ms  p95 ${String(r.p95_ms).padStart(5)}ms  max ${String(r.max_ms).padStart(6)}ms  last seen ${age}`
+    );
+  }
+}
 
 // src/cli_doctor_process.ts
 init_define_import_meta_env();
-import { spawnSync } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 import * as fs15 from "node:fs";
 import * as path15 from "node:path";
+var INTERPRETER_BASENAMES = /* @__PURE__ */ new Set(["node.exe", "python.exe", "python3.exe", "pwsh.exe", "powershell.exe", "cmd.exe"]);
+function describeProcess(commandLine) {
+  for (const m of commandLine.matchAll(/[^\s"]+\.(?:js|mjs|cjs|ts|py|exe)\b/gi)) {
+    const basename11 = m[0].replace(/\\/g, "/").split("/").pop() ?? m[0];
+    if (!INTERPRETER_BASENAMES.has(basename11.toLowerCase())) return basename11;
+  }
+  const trimmed = commandLine.trim();
+  return trimmed.length > 0 ? trimmed.length > 60 ? trimmed.slice(0, 60) + "\u2026" : trimmed : "(no command line)";
+}
 function checkMcpProcessHealth(processes) {
   if (processes === null) {
     return {
@@ -6947,13 +7182,13 @@ function checkMcpProcessHealth(processes) {
     if (chromeLaunchers.length > 1) details.push(`${chromeLaunchers.length} Chrome DevTools MCP launchers (PIDs: ${chromeLaunchers.map((p) => p.processId).join(", ")})`);
     if (playwrightLaunchers.length > 1) details.push(`${playwrightLaunchers.length} Playwright MCP launchers (PIDs: ${playwrightLaunchers.map((p) => p.processId).join(", ")})`);
     if (orphanedNodeProcesses.length > 0) {
-      const pids = orphanedNodeProcesses.map((p) => p.processId).join(", ");
-      details.push(`${orphanedNodeProcesses.length} orphaned Node process${orphanedNodeProcesses.length === 1 ? "" : "es"} (PIDs: ${pids})`);
+      const described = orphanedNodeProcesses.map((p) => `${p.processId} (${describeProcess(p.commandLine)})`).join(", ");
+      details.push(`${orphanedNodeProcesses.length} orphaned Node process${orphanedNodeProcesses.length === 1 ? "" : "es"}: ${described}`);
     }
     return {
       name: "MCP process health",
       status: "warn",
-      message: `${details.join("; ")} detected. These are host-managed processes left by closed terminal/CLI sessions; close stale sessions or terminate specific confirmed orphan PIDs with Stop-Process -Id <PID>.`
+      message: `${details.join("; ")} detected. None of these are token-goat's own processes -- they are host-managed Node/MCP processes left by closed terminal or CLI sessions; confirm what each one is (the name shown above is a starting point) before stopping it with Stop-Process -Id <PID>.`
     };
   }
   return { name: "MCP process health", status: "ok", message: "no duplicate MCP launchers or orphaned Node processes detected" };
@@ -6962,7 +7197,7 @@ function runProcessListCommand() {
   const command = "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress";
   const systemRoot = process.env["SystemRoot"] ?? process.env["windir"] ?? "C:\\Windows";
   const shell = path15.join(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
-  const result = spawnSync(fs15.existsSync(shell) ? shell : "powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
+  const result = spawnSync2(fs15.existsSync(shell) ? shell : "powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
     encoding: "utf8",
     timeout: 2e4,
     maxBuffer: 10 * 1024 * 1024,
@@ -7000,11 +7235,11 @@ function checkWorkerRunning(dataDir2) {
 // src/cli_doctor_platforms.ts
 init_define_import_meta_env();
 import * as fs16 from "node:fs";
-import * as os14 from "node:os";
+import * as os13 from "node:os";
 import * as path16 from "node:path";
 function globalMcpConfigPath() {
   const copilotHome = process.env["COPILOT_HOME"];
-  const root = copilotHome !== void 0 && copilotHome.trim() !== "" ? path16.resolve(copilotHome) : path16.join(os14.homedir(), ".copilot");
+  const root = copilotHome !== void 0 && copilotHome.trim() !== "" ? path16.resolve(copilotHome) : path16.join(os13.homedir(), ".copilot");
   return path16.join(root, "mcp-config.json");
 }
 function checkGlobalMcpConfig(configPath2 = globalMcpConfigPath()) {
@@ -7161,6 +7396,28 @@ function checkStrayClaudeMdBlocks(searchRoot) {
     message: `${strays.length} stray cop${strays.length === 1 ? "y" : "ies"} outside CLAUDE.md (never refreshed by install, never removed by uninstall, will go stale): ${strays.join(", ")}`
   };
 }
+function checkVscodeProjectMcp(projectRoot = process.cwd()) {
+  const mcpPath = path16.join(path16.resolve(projectRoot), ".vscode", "mcp.json");
+  if (!fs16.existsSync(mcpPath)) return null;
+  if (hasManagedServer(mcpPath, "VS Code")) return null;
+  try {
+    const content = fs16.readFileSync(mcpPath, "utf8");
+    if (isResidueServersJson(content)) {
+      return {
+        name: "VS Code project MCP",
+        status: "warn",
+        message: `empty residue file at ${displaySafeText(mcpPath)} triggers Copilot CLI deprecation warnings; delete it or run 'token-goat uninstall --vscode'`
+      };
+    }
+    return {
+      name: "VS Code project MCP",
+      status: "warn",
+      message: `${displaySafeText(mcpPath)} is deprecated by Copilot CLI v1.0.84+; migrate configured servers to .mcp.json or .github/mcp.json (https://gh.io/copilotcli-mcpmigrate)`
+    };
+  } catch {
+    return null;
+  }
+}
 
 // src/cli_doctor_security.ts
 init_define_import_meta_env();
@@ -7286,6 +7543,56 @@ function checkSecurityPosture(cfg, dataDirPath) {
 
 // src/cli_doctor.ts
 var DB_SIZE_WARN_BYTES = 1024 * 1024 * 1024;
+function freelistBytes(header) {
+  if (header.length < 40) return 0;
+  const rawPageSize = header.readUInt16BE(16);
+  return (rawPageSize === 1 ? 65536 : rawPageSize) * header.readUInt32BE(36);
+}
+var CATEGORY_COLUMNS = [
+  { name: "symbol bodies", table: "symbols", column: "body", command: "'token-goat reclaim-index --rebuild' drops and re-derives them under the current parser's size cap" },
+  { name: "refs", table: "refs", column: "context", command: "'token-goat reclaim-index --rebuild' drops and re-derives them" },
+  { name: "chunk text", table: "chunks", column: "text", command: "'token-goat reclaim-index --rebuild' drops and re-derives them" },
+  { name: "stats detail", table: "stats", column: "detail", command: "ages out on its own (180-day retention) -- no manual command needed" }
+];
+var VECTOR_BYTES_PER_ROW = 384 * 4;
+function dbCategoryBreakdown(dbPath) {
+  const db = getDb(dbPath);
+  const shares = [];
+  for (const cat of CATEGORY_COLUMNS) {
+    try {
+      const row = db.prepare(`SELECT COALESCE(SUM(LENGTH(${cat.column})), 0) as bytes FROM ${cat.table}`).get();
+      if (row.bytes > 0) shares.push({ name: cat.name, bytes: row.bytes, command: cat.command });
+    } catch {
+    }
+  }
+  try {
+    const row = db.prepare("SELECT COUNT(*) as n FROM chunk_vectors").get();
+    if (row.n > 0) {
+      shares.push({
+        name: "embedding vectors",
+        bytes: row.n * VECTOR_BYTES_PER_ROW,
+        command: "'token-goat reclaim-index --rebuild' drops them (set indexing.embeddings_enabled = false first so they don't regrow)"
+      });
+    }
+  } catch {
+  }
+  return shares.sort((a, b) => b.bytes - a.bytes);
+}
+function oversizeDbMessage(dbPath, sizeBytes, freeBytes, tempRows, categories = [], topConsumers = []) {
+  const mb = (bytes) => Math.round(bytes / (1024 * 1024));
+  const advice = [];
+  if (freeBytes >= sizeBytes / 10) advice.push(`'token-goat reclaim-index' returns the ${mb(freeBytes)} MB of it that is free pages`);
+  if (tempRows > 0) advice.push(`'token-goat project prune' removes ${countNoun(tempRows, "scratch file")} indexed under the OS temp dir`);
+  const head = `global.db is ${mb(sizeBytes)} MB at ${displaySafeText(dbPath)} (larger than recommended). `;
+  const totalCategoryBytes = categories.reduce((sum, c) => sum + c.bytes, 0);
+  const breakdown = totalCategoryBytes > 0 ? ` Where it went: ${categories.slice(0, 3).map((c) => `${c.name} ${mb(c.bytes)} MB (${Math.round(c.bytes / totalCategoryBytes * 100)}%) -- ${c.command}`).join("; ")}.` : "";
+  let base = advice.length > 0 ? `${head}${advice.join("; ")}.${breakdown}` : `${head}Only ${mb(freeBytes)} MB of it is free pages and none of it is temp-dir scratch, so it is live index data that neither 'reclaim-index' nor 'project prune' will shrink.${breakdown}`;
+  if (topConsumers.length > 0) {
+    const list = topConsumers.map((c) => `${path17.basename(c.root) || c.root} (${countNoun(c.fileCount, "file")})`).join(", ");
+    base += ` Top index consumers: ${list}.`;
+  }
+  return base;
+}
 function checkDbExists(dataDir2) {
   const dbPath = path17.join(dataDir2, "global.db");
   if (!fs18.existsSync(dbPath)) {
@@ -7298,12 +7605,14 @@ function checkDbExists(dataDir2) {
   const sizeBytes = fs18.statSync(dbPath).size;
   const SQLITE_HEADER = "SQLite format 3\0";
   let header = "";
+  let headerBytes = Buffer.alloc(0);
   try {
     const fd = fs18.openSync(dbPath, "r");
     try {
-      const buf = Buffer.alloc(SQLITE_HEADER.length);
+      const buf = Buffer.alloc(100);
       const bytesRead = fs18.readSync(fd, buf, 0, buf.length, 0);
-      header = buf.toString("latin1", 0, bytesRead);
+      headerBytes = buf.subarray(0, bytesRead);
+      header = buf.toString("latin1", 0, Math.min(bytesRead, SQLITE_HEADER.length));
     } finally {
       fs18.closeSync(fd);
     }
@@ -7317,12 +7626,18 @@ function checkDbExists(dataDir2) {
     };
   }
   if (sizeBytes > DB_SIZE_WARN_BYTES) {
-    const mb = Math.round(sizeBytes / (1024 * 1024));
-    return {
-      name: "Database",
-      status: "warn",
-      message: `global.db is ${mb} MB at ${displaySafeText(dbPath)} (larger than recommended). Run 'token-goat reclaim-index' to recover space (or 'token-goat reclaim-index --rebuild' to re-index).`
-    };
+    let tempRows = 0;
+    try {
+      tempRows = findSystemTempFiles(dbPath).length;
+    } catch {
+    }
+    let categories = [];
+    try {
+      categories = dbCategoryBreakdown(dbPath);
+    } catch {
+    }
+    const topConsumers = findTopIndexedProjects(dbPath, 3);
+    return { name: "Database", status: "warn", message: oversizeDbMessage(dbPath, sizeBytes, freelistBytes(headerBytes), tempRows, categories, topConsumers) };
   }
   return {
     name: "Database",
@@ -7405,7 +7720,7 @@ function checkParserFreshness(dbPath, rootDir) {
     return { name: "Parser freshness", status: "ok", message: "no database yet" };
   }
   try {
-    const { indexedFiles, currentFiles } = getParserFreshness(dbPath, PARSER_FINGERPRINT, rootDir);
+    const { indexedFiles, currentFiles } = getParserFreshness(dbPath, parserFingerprintForLanguage, rootDir);
     if (indexedFiles === 0) {
       return { name: "Parser freshness", status: "ok", message: "no indexed files yet" };
     }
@@ -7468,7 +7783,7 @@ function checkInstall() {
   if (resolved !== null) {
     const isBatch = /\.(?:cmd|bat)$/i.test(resolved);
     const comspec = path17.join(process.env["SystemRoot"] ?? process.env["windir"] ?? "C:\\Windows", "System32", "cmd.exe");
-    const result = isBatch ? spawnSync2(fs18.existsSync(comspec) ? comspec : "cmd.exe", ["/d", "/s", "/c", resolved, "--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true }) : spawnSync2(resolved, ["--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true });
+    const result = isBatch ? spawnSync3(fs18.existsSync(comspec) ? comspec : "cmd.exe", ["/d", "/s", "/c", resolved, "--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true }) : spawnSync3(resolved, ["--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true });
     if (result.status === 0) return { name: "Installation", status: "ok", message: (result.stdout ?? "").trim() };
   }
   return { name: "Installation", status: "fail", message: `token-goat command not found; run: npm install -g ${PACKAGE_NAME}` };
@@ -7617,7 +7932,7 @@ function checkDiskSpace(dataDir2) {
   }
   if (process.platform !== "win32") {
     try {
-      const result = spawnSync2("df", ["-Pk", dataDir2], { encoding: "utf-8" });
+      const result = spawnSync3("df", ["-Pk", dataDir2], { encoding: "utf-8" });
       const stdout = typeof result.stdout === "string" ? result.stdout : "";
       if (result.error === void 0 && result.status === 0 && stdout) {
         const lines = stdout.trim().split("\n");
@@ -7673,7 +7988,7 @@ function checkCopilotCli(configPath2, scriptPath) {
     toolName: "view",
     toolArgs: { path: "doctor-check.txt" }
   });
-  const res = spawnSync2(preToolUseCommand, {
+  const res = spawnSync3(preToolUseCommand, {
     input: synthetic,
     encoding: "utf-8",
     shell: true,
@@ -7708,6 +8023,7 @@ function checkCopilotCli(configPath2, scriptPath) {
 var COMPACTION_CHANNEL_WINDOW = 5;
 var COMPACTION_STATS_BATCH_SIZE = 50;
 var COMPACTION_STATS_SCAN_CEILING = 2e3;
+var COMPACTION_MANIFEST_FIX_VERSION = "2.9.18";
 function checkCompactionChannel(dbPath) {
   const name = "Compaction channel";
   if (!fs18.existsSync(dbPath)) {
@@ -7722,8 +8038,9 @@ function checkCompactionChannel(dbPath) {
     const conclusive = [];
     let offset = 0;
     let scanned = 0;
+    let preFixConclusive = 0;
     for (; ; ) {
-      const batch = db.prepare("SELECT detail FROM stats WHERE kind = 'compact_summary' ORDER BY rowid DESC LIMIT ? OFFSET ?").all(COMPACTION_STATS_BATCH_SIZE, offset);
+      const batch = db.prepare("SELECT detail, tg_version FROM stats WHERE kind = 'compact_summary' ORDER BY rowid DESC LIMIT ? OFFSET ?").all(COMPACTION_STATS_BATCH_SIZE, offset);
       if (batch.length === 0) break;
       offset += batch.length;
       scanned += batch.length;
@@ -7732,6 +8049,10 @@ function checkCompactionChannel(dbPath) {
         if (m === null) continue;
         const sampled = Number(m[2]);
         if (sampled === 0) continue;
+        if (row.tg_version === null || compareSemver(row.tg_version, COMPACTION_MANIFEST_FIX_VERSION) < 0) {
+          preFixConclusive++;
+          continue;
+        }
         conclusive.push({ survived: Number(m[1]), sampled });
         if (conclusive.length >= COMPACTION_CHANNEL_WINDOW) break;
       }
@@ -7739,6 +8060,9 @@ function checkCompactionChannel(dbPath) {
       if (scanned >= COMPACTION_STATS_SCAN_CEILING) break;
     }
     if (conclusive.length === 0) {
+      if (preFixConclusive > 0) {
+        return { name, status: "ok", message: `no post-fix compaction evidence yet -- ${preFixConclusive} compaction(s) found predate ${COMPACTION_MANIFEST_FIX_VERSION}'s manifest-survival fix and are not counted` };
+      }
       return { name, status: "ok", message: "no compaction has been measured yet" };
     }
     const dead = conclusive.filter((c) => c.survived === 0).length;
@@ -7756,20 +8080,58 @@ function checkCompactionChannel(dbPath) {
     return { name, status: "warn", message: `could not read compaction stats: ${extractErrorMessage(e)}` };
   }
 }
+function checkHookLatency(dbPath) {
+  const name = "Hook latency";
+  if (!fs18.existsSync(dbPath)) {
+    return { name, status: "ok", message: "no database yet" };
+  }
+  try {
+    const db = getDb(dbPath);
+    const present = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'stats'").get();
+    if (present === void 0) {
+      return { name, status: "ok", message: "no hooks measured yet" };
+    }
+    const rows = hookLatencyBreakdown(db);
+    if (rows.length === 0) {
+      return { name, status: "ok", message: "no hook latency recorded yet (or this database predates the duration_ms column)" };
+    }
+    const worst = rows[0];
+    const totalCount = rows.reduce((n, r) => n + r.count, 0);
+    const worstLabel = `${worst.event} (${worst.harness || "unrecorded harness"})`;
+    const budgetMs = loadConfig().hooks.latency_budget_ms;
+    if (worst.p95_ms > budgetMs) {
+      return {
+        name,
+        status: "warn",
+        message: `${worstLabel} is running a p95 of ${worst.p95_ms}ms across ${totalCount} recent hook(s); see 'token-goat stats --hooks' for the full breakdown`
+      };
+    }
+    return { name, status: "ok", message: `worst p95 ${worst.p95_ms}ms (${worstLabel}) across ${totalCount} recent hook(s)` };
+  } catch (e) {
+    return { name, status: "warn", message: `could not read hook latency stats: ${extractErrorMessage(e)}` };
+  }
+}
 var UNMAPPED_TOOL_SAMPLE = 5;
-function checkUnmappedTools(dbPath) {
+var UNMAPPED_TOOL_MAX_AGE_DAYS = 7;
+function checkUnmappedTools(dbPath, options) {
   const name = "Tool names";
   if (!fs18.existsSync(dbPath)) {
     return { name, status: "ok", message: "no database yet" };
   }
   try {
+    pruneStalePatternCoveredUnmappedTools(getDb(dbPath), [MCP_TOOL_PATTERN]);
     const rows = readUnmappedTools(dbPath);
     if (rows.length === 0) {
       return { name, status: "ok", message: "every tool name seen so far reached a handler that wanted it" };
     }
-    const nearMisses = rows.filter(
-      (r) => r.near_miss !== null && r.near_miss !== void 0 && r.near_miss !== r.tool_name
-    );
+    const maxAgeDays = options?.maxAgeDays ?? UNMAPPED_TOOL_MAX_AGE_DAYS;
+    const nowSecs = options?.nowSecs ?? Math.floor(Date.now() / 1e3);
+    const maxAgeSecs = maxAgeDays * 86400;
+    const nearMisses = rows.filter((r) => {
+      if (r.near_miss === null || r.near_miss === void 0 || r.near_miss === r.tool_name) return false;
+      if (r.last_seen > 0 && nowSecs - r.last_seen > maxAgeSecs) return false;
+      return true;
+    });
     if (nearMisses.length > 0) {
       const shown2 = nearMisses.slice(0, UNMAPPED_TOOL_SAMPLE).map((r) => `${r.harness} sent "${r.tool_name}" where "${r.near_miss}" is handled (${r.event_name}, ${r.hits}x)`);
       const more2 = nearMisses.length > UNMAPPED_TOOL_SAMPLE ? ` (+${nearMisses.length - UNMAPPED_TOOL_SAMPLE} more)` : "";
@@ -7779,12 +8141,15 @@ function checkUnmappedTools(dbPath) {
         message: `${shown2.join("; ")}${more2} -- these differ only by case or separators, so that bridge's tool-rename step is very likely not being applied and every handler behind those names is inert`
       };
     }
-    const shown = rows.slice(0, UNMAPPED_TOOL_SAMPLE).map((r) => `${r.tool_name} (${r.hits}x)`);
-    const more = rows.length > UNMAPPED_TOOL_SAMPLE ? `, +${rows.length - UNMAPPED_TOOL_SAMPLE} more` : "";
+    const byName = /* @__PURE__ */ new Map();
+    for (const r of rows) byName.set(r.tool_name, Math.max(byName.get(r.tool_name) ?? 0, r.hits));
+    const names = [...byName].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
+    const shown = names.slice(0, UNMAPPED_TOOL_SAMPLE).map(([tool, hits]) => `${tool} (${hits}x)`);
+    const more = names.length > UNMAPPED_TOOL_SAMPLE ? `, +${names.length - UNMAPPED_TOOL_SAMPLE} more` : "";
     return {
       name,
       status: "ok",
-      message: `${rows.length} tool name(s) seen with no handler, none resembling one token-goat handles: ${shown.join(", ")}${more}`
+      message: `${names.length} tool name(s) seen with no handler, none resembling one token-goat handles: ${shown.join(", ")}${more}`
     };
   } catch (e) {
     return { name, status: "warn", message: `could not read the tool-name histogram: ${extractErrorMessage(e)}` };
@@ -7803,6 +8168,7 @@ function runDoctor(dataDir2, configPath2, rootDir, processes) {
   results.push(checkSymbolCount(path17.join(actualDataDir, "global.db"), rootDir));
   results.push(checkDirtyQueueHealth(actualDataDir));
   results.push(checkCompactionChannel(path17.join(actualDataDir, "global.db")));
+  results.push(checkHookLatency(path17.join(actualDataDir, "global.db")));
   results.push(checkUnmappedTools(path17.join(actualDataDir, "global.db")));
   const actualConfigPath = configPath2 || configPath();
   results.push(checkConfigValid(actualConfigPath));
@@ -7822,6 +8188,8 @@ function runDoctor(dataDir2, configPath2, rootDir, processes) {
   if (vscodeHooksResult) results.push(vscodeHooksResult);
   const vscodeScopeResult = checkVscodeUserScopeHooks(vscodeHooksInstalled(), vscodeHooksInstalled({ project: true }));
   if (vscodeScopeResult) results.push(vscodeScopeResult);
+  const vscodeProjectMcpResult = checkVscodeProjectMcp(rootDir);
+  if (vscodeProjectMcpResult) results.push(vscodeProjectMcpResult);
   const visualStudioResult = checkVisualStudio([visualStudioUserMcpPath(), visualStudioProjectMcpPath()], [visualStudioSolutionVscodeMcpPath()]);
   if (visualStudioResult) results.push(visualStudioResult);
   const zedResult = checkZed(zedSettingsPath());
@@ -7878,6 +8246,15 @@ async function runDoctorRepair(opts) {
       errors.push(`Failed to download embedding model: ${extractErrorMessage(e)}`);
     }
   }
+  const rootDir = path17.resolve(opts?.rootDir ?? process.cwd());
+  const projectMcp = path17.join(rootDir, ".vscode", "mcp.json");
+  try {
+    if (cleanupDeprecatedVscodeProjectMcp(rootDir)) {
+      repairs.push(`Removed empty deprecated VS Code MCP residue file at ${displaySafeText(projectMcp)}`);
+    }
+  } catch (e) {
+    errors.push(`Failed to clean up ${displaySafeText(projectMcp)}: ${extractErrorMessage(e)}`);
+  }
   return { repairs, errors };
 }
 function printDoctorResults(results) {
@@ -8039,7 +8416,7 @@ async function runDoctorAndExit(opts) {
     }
   }
   try {
-    const { checkUpdateStatus } = await import("./token-goat-chunk-RB24DBBS.mjs");
+    const { checkUpdateStatus } = await import("./token-goat-chunk-VJQBYSXG.mjs");
     const update = await checkUpdateStatus(1500);
     if (update.updateAvailable && update.latest) {
       console.log(`
@@ -8131,6 +8508,7 @@ function generateCompactHelp() {
     "Options:",
     "  -v, --version                   print the token-goat version",
     "  --cwd <path>                    run as if invoked from this directory",
+    "  --notice <text>                 print this line before the command's own output",
     "  -h, --help                      display help for command",
     "",
     "Reads: symbol, read, brief, section, semantic, skeleton, outline, refs, scope,",
@@ -8145,7 +8523,7 @@ function generateCompactHelp() {
     "  html-lint, docx-outline, docx-tables, docx-text, pptx-outline, pptx-slide, pptx-text,",
     "  pptx-notes",
     "",
-    "Index & Search: index, map, reconcile, doctor, commands, ask, pack, tokens,",
+    "Index & Search: index, map, reconcile, doctor, commands, ask, answer, pack, tokens,",
     "  budget, failures, todo, trace, logfold, lockdeps, dep-docs, recent, hot,",
     "  snapshot-snapshot, baseline, cost, coverage-report-gaps, clean-cache,",
     "  cache-audit, reclaim-index, project",
@@ -8187,7 +8565,7 @@ init_define_import_meta_env();
 // src/config_commands.ts
 init_define_import_meta_env();
 import * as fs20 from "node:fs";
-import * as os15 from "node:os";
+import * as os14 from "node:os";
 import * as path18 from "node:path";
 
 // src/webfetch.ts
@@ -8196,7 +8574,7 @@ import { existsSync as existsSync14, readdirSync as readdirSync3, statSync as st
 import * as http from "http";
 import * as https from "https";
 import { isIPv4, isIPv6 } from "net";
-import { resolve as resolve6, join as join16 } from "path";
+import { resolve as resolve7, join as join16 } from "path";
 import { URL as URL2 } from "url";
 import { promisify } from "util";
 import { lookup as dnsLookup } from "dns";
@@ -8337,7 +8715,7 @@ function cleanupStaleDownloads() {
     const files = readdirSync3(cacheDir);
     for (const file of files) {
       if (file.endsWith(".tmp")) {
-        const filePath = resolve6(cacheDir, file);
+        const filePath = resolve7(cacheDir, file);
         try {
           const stat = statSync3(filePath);
           if (Date.now() - stat.mtimeMs < STALE_DOWNLOAD_AGE_MS) continue;
@@ -9053,7 +9431,7 @@ async function cmdFetchImage(opts) {
     throw new Error(`fetch failed: ${opts.url}`, { cause: e });
   }
   const buf = fetched.body;
-  const outPath = opts.out ?? path18.join(os15.tmpdir(), `tg-fetch-${Date.now()}${extensionForContentType(fetched.contentType)}`);
+  const outPath = opts.out ?? path18.join(os14.tmpdir(), `tg-fetch-${Date.now()}${extensionForContentType(fetched.contentType)}`);
   const originalBytes = buf.length;
   let shrunkBytes;
   let outData;
@@ -12171,7 +12549,7 @@ import * as fs26 from "node:fs";
 // src/sharepoint_resolve.ts
 init_define_import_meta_env();
 import * as fs24 from "node:fs";
-import * as os16 from "node:os";
+import * as os15 from "node:os";
 import * as path23 from "node:path";
 var TENANT_HOST_RE = /^([a-z0-9-]+?)(-my)?\.sharepoint\.com$/i;
 function parseShareUrl(url) {
@@ -12244,7 +12622,7 @@ function tryLibraryPaths(root, libSegments, triedPaths) {
   }
   return null;
 }
-function resolveLocalPath(parsed, env = process.env, home = os16.homedir()) {
+function resolveLocalPath(parsed, env = process.env, home = os15.homedir()) {
   const roots = candidateRoots(env, home);
   const libSegments = parsed.libraryPath.split(/[/\\]+/).filter((s) => s.length > 0 && s !== "." && s !== "..");
   const triedPaths = [];
@@ -12404,12 +12782,12 @@ function formatCues(cues) {
 
 // src/video_chapters.ts
 init_define_import_meta_env();
-import { spawnSync as spawnSync3 } from "node:child_process";
+import { spawnSync as spawnSync4 } from "node:child_process";
 var _ffprobeAvailable;
 function isFfprobeAvailable() {
   if (_ffprobeAvailable !== void 0) return _ffprobeAvailable;
   try {
-    const res = spawnSync3("ffprobe", ["-version"], { stdio: "ignore" });
+    const res = spawnSync4("ffprobe", ["-version"], { stdio: "ignore" });
     _ffprobeAvailable = res.status === 0;
   } catch {
     _ffprobeAvailable = false;
@@ -12420,7 +12798,7 @@ function extractVideoChapters(file) {
   if (!isFfprobeAvailable()) {
     throw new Error("ffprobe not found on PATH; video-chapters requires ffmpeg (install ffmpeg and ensure ffprobe is on PATH)");
   }
-  const res = spawnSync3(
+  const res = spawnSync4(
     "ffprobe",
     ["-v", "error", "-print_format", "json", "-show_chapters", "-show_streams", file],
     { encoding: "utf8", maxBuffer: 64 * 1024 * 1024 }
@@ -13610,15 +13988,248 @@ function registerFormatCommands(program2, guard) {
 // src/cli_cmd_analysis.ts
 init_define_import_meta_env();
 
+// src/answer_router.ts
+init_define_import_meta_env();
+function emit2(text) {
+  const payload = colorStdout() ? text : stripAnsi(text);
+  process.stdout.write(ensureNewline(payload));
+}
+function emitErr2(text) {
+  process.stderr.write(ensureNewline(text));
+}
+function refusal(why, suggestion) {
+  return `cannot answer deterministically: ${why}; try: ${suggestion}`;
+}
+var JUDGEMENT_PATTERNS = [
+  /\bwhy\b/i,
+  /\bshould (?:i|we|it|this|that)\b/i,
+  /^(?:is|are|does|do|did|can|could|would|will|has|have)\b/i,
+  /^(?:explain|describe|summari[sz]e|review|assess|evaluate|compare|analy[sz]e)\b/i,
+  /^how\b/i,
+  /\bwhat(?:'s| is)? (?:the )?(?:bug|issue|problem|point|difference)\b/i,
+  /\bwhat(?:'s| is) wrong\b/i,
+  /\bat runtime\b/i,
+  /\bwhat value\b/i,
+  /\breturns? when\b/i,
+  /\b(?:correct|incorrect|buggy|broken|safe|unsafe|better|worse|best)\b/i
+];
+var INTENT_RULES = [
+  { intent: "callers", re: /^who calls (.+)$/i },
+  { intent: "callers", re: /^what calls (.+)$/i },
+  { intent: "callers", re: /^callers of (.+)$/i },
+  { intent: "callers", re: /^call ?-?sites of (.+)$/i },
+  { intent: "callers", re: /^(?:all )?(.+) call ?-?sites$/i },
+  { intent: "tests", re: /^wh(?:at|ich) tests? (?:covers?|exercises?|tests?|touch(?:es)?) (.+)$/i },
+  { intent: "tests", re: /^tests? for (.+)$/i },
+  { intent: "tests", re: /^test coverage (?:for|of) (.+)$/i },
+  { intent: "exports", re: /^what does (.+) export$/i },
+  { intent: "exports", re: /^exports of (.+)$/i },
+  { intent: "exports", re: /^(.+) exports$/i },
+  { intent: "imports", re: /^what does (.+) import$/i },
+  { intent: "imports", re: /^imports of (.+)$/i },
+  // The bare form is the commoner of the pair in the captured corpus (34 hits vs 15 for `X exports`). It is only safe alongside file-only subject resolution for this intent: with a symbol fallback, the corpus lines `Add imports` and `Update imports` resolve `Add`/`Update` to whatever same-named symbol sorts first.
+  { intent: "imports", re: /^(.+) imports$/i },
+  { intent: "impact", re: /^what breaks if (.+) changes?$/i },
+  { intent: "impact", re: /^what breaks if (?:i|we|you) chang(?:e|ed) (.+)$/i },
+  { intent: "impact", re: /^what breaks when (?:i|we|you) chang(?:e|ed) (.+)$/i },
+  { intent: "impact", re: /^what breaks when (.+) chang(?:es|ed)$/i },
+  { intent: "impact", re: /^what depends on (.+)$/i },
+  { intent: "impact", re: /^what(?:'s| is) impacted by (?:changing )?(.+)$/i },
+  { intent: "impact", re: /^blast radius of (.+)$/i },
+  { intent: "impact", re: /^impact of (?:changing )?(.+)$/i },
+  { intent: "where", re: /^where is (.+) (?:defined|declared)$/i },
+  { intent: "where", re: /^where is (.+)$/i },
+  { intent: "where", re: /^where does (.+) live$/i }
+];
+function normalizeQuestion(question) {
+  const collapsed = question.replace(/\s+/g, " ").trim().replace(/[?\s]+$/, "");
+  return collapsed.replace(/^(?:check|show|list|find|get|print|inspect|read|locate|verify|measure|view|trace|identify) (?:the |a |an )?/i, "");
+}
+function isJudgementQuestion(rawQuestion) {
+  const question = normalizeQuestion(rawQuestion);
+  return JUDGEMENT_PATTERNS.some((p) => p.test(question));
+}
+function classify(rawQuestion) {
+  const question = normalizeQuestion(rawQuestion);
+  if (isJudgementQuestion(question)) return null;
+  for (const rule of INTENT_RULES) {
+    const m = rule.re.exec(question);
+    if (m && m[1] !== void 0) {
+      const subject = normalizeSubject(m[1]);
+      if (subject.length > 0) return { intent: rule.intent, subject };
+    }
+  }
+  return null;
+}
+function normalizeSubject(raw) {
+  let s = raw.trim();
+  for (; ; ) {
+    const next = s.replace(/^[`'"]+/, "").replace(/[`'".,;:!]+$/, "").trim();
+    if (next === s) break;
+    s = next;
+  }
+  s = s.replace(/^(?:the|a|an) /i, "");
+  return s.trim();
+}
+var SYMBOL_SCAN_PAGE = 200;
+function resolveSymbolHit(subject, rootDir) {
+  for (let offset = 0; ; offset += SYMBOL_SCAN_PAGE) {
+    const rows = querySymbols({ name: subject, rootDir, limit: SYMBOL_SCAN_PAGE, offset });
+    if (rows.length === 0) return null;
+    const hit = rows.find((r) => !isIgnoredIndexPath(r.filePath));
+    if (hit) return { name: hit.name, file: hit.filePath };
+    if (rows.length < SYMBOL_SCAN_PAGE) return null;
+  }
+}
+function resolveFileHit(subject, rootDir) {
+  const entry = getFileEntry(resolveIndexPath(subject));
+  if (entry && !isIgnoredIndexPath(entry.filePath)) return { kind: "file", path: entry.filePath };
+  if (subject.includes("/") || subject.includes("\\")) return null;
+  const want = foldPath(subject);
+  const matches2 = [];
+  for (const [folded, indexed] of getProjectFileEntries(rootDir)) {
+    if (isIgnoredIndexPath(folded)) continue;
+    const base = folded.slice(Math.max(folded.lastIndexOf("/"), folded.lastIndexOf("\\")) + 1);
+    const dot = base.lastIndexOf(".");
+    if (base === want || dot > 0 && base.slice(0, dot) === want) matches2.push(indexed.filePath);
+  }
+  const paths = [...new Set(matches2)].sort();
+  if (paths.length === 0) return null;
+  if (paths.length === 1 && paths[0] !== void 0) return { kind: "file", path: paths[0] };
+  return { kind: "ambiguous", candidates: paths };
+}
+function resolveSubject(subject, mode = "symbol-first") {
+  const rootDir = resolveProjectRoot({ project: process.cwd() });
+  const sep5 = subject.lastIndexOf("::");
+  if (sep5 > 0 && sep5 + 2 < subject.length) {
+    const file2 = resolveIndexPath(subject.slice(0, sep5));
+    const hit2 = querySymbols({ filePath: file2, name: subject.slice(sep5 + 2), rootDir, limit: 1 })[0];
+    if (hit2 && !isIgnoredIndexPath(hit2.filePath)) return { kind: "symbol", name: hit2.name, file: hit2.filePath };
+    return null;
+  }
+  if (/\s/.test(subject)) return null;
+  if (mode === "symbol-first") {
+    const hit2 = resolveSymbolHit(subject, rootDir);
+    if (hit2) return { kind: "symbol", name: hit2.name, file: hit2.file };
+    return resolveFileHit(subject, rootDir);
+  }
+  const file = resolveFileHit(subject, rootDir);
+  if (file) return file;
+  const hit = resolveSymbolHit(subject, rootDir);
+  if (!hit) return null;
+  return mode === "file-first" ? { kind: "symbol", name: hit.name, file: hit.file } : { kind: "symbol-only", name: hit.name, file: hit.file };
+}
+var FILE_INTENTS = /* @__PURE__ */ new Set(["tests", "exports", "imports"]);
+var ANSWER_DELEGATE_LIMIT = 20;
+function subjectModeFor(intent) {
+  if (intent === "exports" || intent === "imports") return "file-only";
+  return intent === "tests" ? "file-first" : "symbol-first";
+}
+function runAnswer(opts) {
+  const question = opts.question.trim();
+  if (question.length === 0) {
+    emitErr2(refusal("the question is empty", 'token-goat answer "who calls <symbol>"'));
+    return 1;
+  }
+  if (isJudgementQuestion(question)) {
+    emitErr2(
+      refusal(
+        "that asks for judgement, intent, or runtime behaviour, which the index cannot answer -- it would need the code read and reasoned over",
+        `token-goat semantic "${question}"`
+      )
+    );
+    return 1;
+  }
+  const cls = classify(question);
+  if (cls === null) {
+    emitErr2(
+      refusal(
+        "no intent matched -- this router only answers where/who-calls/what-tests-cover/what-exports/what-imports/what-breaks questions about a named symbol or file",
+        `token-goat semantic "${question}"`
+      )
+    );
+    return 1;
+  }
+  const resolved = resolveSubject(cls.subject, subjectModeFor(cls.intent));
+  if (resolved === null) {
+    emitErr2(
+      refusal(
+        `'${cls.subject}' is not an indexed symbol or file`,
+        `token-goat semantic "${question}"`
+      )
+    );
+    return 1;
+  }
+  const rootDir = resolveProjectRoot({ project: process.cwd() });
+  if (resolved.kind === "ambiguous") {
+    const shown = resolved.candidates.slice(0, 5).map((c) => toDisplayPath(rootDir, c));
+    const more = resolved.candidates.length - shown.length;
+    const first = shown[0] ?? "";
+    const next = FILE_INTENTS.has(cls.intent) ? `token-goat answer "${cls.intent === "tests" ? "tests for" : cls.intent === "imports" ? "imports of" : "exports of"} ${first}"` : `token-goat outline ${first}`;
+    emitErr2(
+      refusal(
+        `'${cls.subject}' names ${resolved.candidates.length} files in this project (${shown.join(", ")}${more > 0 ? `, +${more} more` : ""})`,
+        next
+      )
+    );
+    return 1;
+  }
+  if (resolved.kind === "symbol-only") {
+    emitErr2(
+      refusal(
+        `'${cls.subject}' is a symbol; exports/imports are file-level`,
+        `token-goat ${cls.intent} ${toDisplayPath(rootDir, resolved.file)}`
+      )
+    );
+    return 1;
+  }
+  if (FILE_INTENTS.has(cls.intent)) {
+    const file = resolved.kind === "symbol" ? resolved.file : resolved.path;
+    const display = toDisplayPath(rootDir, file);
+    if (cls.intent === "tests") {
+      emit2(`via: token-goat test-for ${display}`);
+      return runTestFor({ file });
+    }
+    if (cls.intent === "exports") {
+      emit2(`via: token-goat exports ${display}`);
+      return runExports({ file });
+    }
+    emit2(`via: token-goat imports ${display}`);
+    return runImports({ file });
+  }
+  if (resolved.kind === "file") {
+    const display = toDisplayPath(rootDir, resolved.path);
+    emitErr2(
+      refusal(
+        `'${cls.subject}' is a file, and ${cls.intent === "where" ? "where" : cls.intent} needs a symbol`,
+        `token-goat outline ${display}`
+      )
+    );
+    return 1;
+  }
+  if (cls.intent === "callers") {
+    emit2(`via: token-goat callers ${displaySafeText(resolved.name)} --limit ${ANSWER_DELEGATE_LIMIT}`);
+    return runCallers({ symbol: resolved.name, limit: ANSWER_DELEGATE_LIMIT });
+  }
+  if (cls.intent === "impact") {
+    emit2(`via: token-goat impact ${displaySafeText(resolved.name)} --top ${ANSWER_DELEGATE_LIMIT}`);
+    return runImpact({ symbol: resolved.name, top: ANSWER_DELEGATE_LIMIT });
+  }
+  emit2(`via: token-goat symbol ${displaySafeText(resolved.name)} -p --exclude-vendored`);
+  const r = runSymbol({ name: resolved.name, projectRoot: rootDir, limit: ANSWER_DELEGATE_LIMIT, excludeVendored: true });
+  if (r.text.length > 0) emit2(r.text);
+  return r.code;
+}
+
 // src/affected.ts
 init_define_import_meta_env();
 import * as path25 from "node:path";
 var DEFAULT_AFFECTED_DEPTH = 5;
-function emit2(text) {
+function emit3(text) {
   const payload = colorStdout() ? text : stripAnsi(text);
   process.stdout.write(ensureNewline(payload));
 }
-function emitErr2(text) {
+function emitErr3(text) {
   process.stderr.write(ensureNewline(text));
 }
 function guardedFilter(filter2) {
@@ -13675,43 +14286,43 @@ function computeAffected(opts) {
 }
 function runAffected(opts) {
   if (opts.depth !== void 0 && opts.depth <= 0) {
-    emitErr2(`--depth must be a positive number, got: ${opts.depth}`);
+    emitErr3(`--depth must be a positive number, got: ${opts.depth}`);
     return 1;
   }
   if (opts.files.length === 0) {
-    emitErr2("No changed files given. Pass paths as arguments, or pipe them in with --stdin.");
+    emitErr3("No changed files given. Pass paths as arguments, or pipe them in with --stdin.");
     return 1;
   }
   if (opts.filter !== void 0) {
     const guarded = compileGuardedRegex(opts.filter);
     if (!guarded.ok) {
-      emitErr2(`--filter is not usable as a regular expression: ${guarded.reason}`);
+      emitErr3(`--filter is not usable as a regular expression: ${guarded.reason}`);
       return 1;
     }
   }
   const result = computeAffected(opts);
   if (opts.json === true) {
-    emit2(displaySafeJson(result));
+    emit3(displaySafeJson(result));
     return 0;
   }
   if (opts.quiet === true) {
-    for (const f of result.testFiles) emit2(f);
+    for (const f of result.testFiles) emit3(f);
   } else if (result.testFiles.length === 0) {
     const traced = opts.files.length - result.unknownSeeds.length;
     if (traced === 0) {
-      emit2(`Nothing could be traced: ${result.unknownSeeds.length === 1 ? "the file given is not tracked" : "none of the files given are tracked"} in this project.`);
+      emit3(`Nothing could be traced: ${result.unknownSeeds.length === 1 ? "the file given is not tracked" : "none of the files given are tracked"} in this project.`);
     } else {
-      emit2(`No test files import ${countNoun(traced, "changed file")} (within ${countNoun(result.depth, "hop")}).`);
+      emit3(`No test files import ${countNoun(traced, "changed file")} (within ${countNoun(result.depth, "hop")}).`);
     }
   } else {
-    emit2(`${countNoun(result.testFiles.length, "affected test file")} (${countNoun(result.reachedCount, "file")} reached within ${countNoun(result.depth, "hop")}):`);
-    for (const f of result.testFiles) emit2(`  ${f}`);
+    emit3(`${countNoun(result.testFiles.length, "affected test file")} (${countNoun(result.reachedCount, "file")} reached within ${countNoun(result.depth, "hop")}):`);
+    for (const f of result.testFiles) emit3(`  ${f}`);
   }
   if (result.unknownSeeds.length > 0) {
-    emitErr2(`Not tracked in this project, so nothing was traced from ${result.unknownSeeds.length === 1 ? "it" : "them"}: ${result.unknownSeeds.join(", ")}`);
+    emitErr3(`Not tracked in this project, so nothing was traced from ${result.unknownSeeds.length === 1 ? "it" : "them"}: ${result.unknownSeeds.join(", ")}`);
   }
   if (result.depthLimited) {
-    emitErr2(`Stopped at --depth ${result.depth} with ${countNoun(result.unexploredAtFrontier, "file")} still unexplored; more tests may be affected (raise --depth).`);
+    emitErr3(`Stopped at --depth ${result.depth} with ${countNoun(result.unexploredAtFrontier, "file")} still unexplored; more tests may be affected (raise --depth).`);
   }
   return 0;
 }
@@ -14844,17 +15455,17 @@ function cmdNote(action, key, value, opts) {
   throw new Error(`Unknown note action: ${action}. Use: set, get, unset, list, clear`);
 }
 function loadAllSessionReadCounts() {
-  const sessionsDir = path29.join(tokenGoatHome(), "sessions");
+  const sessionsDir2 = path29.join(tokenGoatHome(), "sessions");
   const totals = /* @__PURE__ */ new Map();
   let entries;
   try {
-    entries = fs32.readdirSync(sessionsDir, { withFileTypes: true });
+    entries = fs32.readdirSync(sessionsDir2, { withFileTypes: true });
   } catch {
     return totals;
   }
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const filePath = path29.join(sessionsDir, entry.name);
+    const filePath = path29.join(sessionsDir2, entry.name);
     let raw;
     try {
       raw = JSON.parse(fs32.readFileSync(filePath, "utf8"));
@@ -15457,6 +16068,7 @@ function registerAnalysisCommands(program2, guard) {
       })
     )
   );
+  program2.command("answer <question>").description("answer a plain-English question from the index alone, or refuse with a reason (no model call, no inference)").action((question) => runExit(() => runAnswer({ question })));
   program2.command("pack [patterns...]").description("bundle matched files into a single LLM-ready output (Markdown, XML, or plain text)").option("--format <style>", "output style: md (default), xml, or text", "md").option("--line-numbers", "prefix each line with its line number").option("--instruction-file <path>", "append a task prompt from a file").option("--output <path>", "write output to a file instead of stdout").option("--no-ignore", "bypass .tokengoatignore patterns").option("--strip-comments", "remove language-appropriate comments before packing").option("--scan-secrets", "scan for credentials; exit 2 if any are found").option("--budget <n>", "exit 3 if the estimated token count exceeds n").action(guard(cmdPack));
   program2.command("tokens [patterns...]").description("per-file token footprint table, sorted largest-first").option("--tree", "group by directory with subtotals and percentage of total").option("--top <n>", "limit to the N biggest files").option("--asc", "reverse order (ascending)").option("-j, --json", "output as JSON").action(guard(cmdTokens));
   program2.command("budget <patterns...>").description("estimate the total token cost of a file set").option("--context <n>", "context window in thousands of tokens (shows % fill)").option("-j, --json", "output as JSON").action(guard(cmdBudget));
@@ -15623,12 +16235,12 @@ function renderCapabilities(caps) {
 
 // src/cli_session.ts
 init_define_import_meta_env();
-import * as fs42 from "node:fs";
+import * as fs41 from "node:fs";
 
 // src/session_audit.ts
 init_define_import_meta_env();
 import * as fs34 from "node:fs";
-import * as os17 from "node:os";
+import * as os16 from "node:os";
 import * as path31 from "node:path";
 import * as readline from "node:readline";
 function emptyMeasured() {
@@ -15735,10 +16347,10 @@ var SHELL_READER_TOKEN_RE = /\b(?:sed|grep|cat|head|tail|awk|rg|less|nl|python3?
 function escapeRegExp2(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function shellReadMatch(command, basename10) {
-  if (basename10 === "" || !SHELL_READER_TOKEN_RE.test(command)) return "none";
-  if (!command.includes(basename10)) return "none";
-  const escaped = escapeRegExp2(basename10);
+function shellReadMatch(command, basename11) {
+  if (basename11 === "" || !SHELL_READER_TOKEN_RE.test(command)) return "none";
+  if (!command.includes(basename11)) return "none";
+  const escaped = escapeRegExp2(basename11);
   const strict = new RegExp(`(?:^|["'\`/\\\\\\s])${escaped}(?:$|["'\`/\\\\\\s,;:)])`);
   return strict.test(command) ? "match" : "ambiguous";
 }
@@ -15826,11 +16438,11 @@ function listCorpusTranscripts(corpusDir) {
   return found.sort();
 }
 function defaultCorpusDir() {
-  const claudeDir = path31.join(os17.homedir(), ".claude", "projects");
+  const claudeDir = path31.join(claudeConfigDir(), "projects");
   if (fs34.existsSync(claudeDir) && listCorpusTranscripts(claudeDir).length > 0) {
     return claudeDir;
   }
-  const home = os17.homedir();
+  const home = os16.homedir();
   const appData = process.env["APPDATA"] || path31.join(home, "AppData", "Roaming");
   const candidates = [
     claudeDir,
@@ -16027,13 +16639,13 @@ async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneOb
           if (name === "Read" || name === "Skill") {
             const denyTemplate = DENY_TEMPLATES.find((t) => t.tool === name && t.re.test(text));
             if (denyTemplate !== void 0) {
-              const path44 = readPathById.get(id) ?? "";
-              const lastSlash = path44.lastIndexOf("/");
+              const path43 = readPathById.get(id) ?? "";
+              const lastSlash = path43.lastIndexOf("/");
               openDenies.push({
                 kind: denyTemplate.kind,
                 withheldBytes: parseWithheldBytes(denyTemplate.kind, text),
-                path: path44,
-                basename: lastSlash === -1 ? path44 : path44.slice(lastSlash + 1),
+                path: path43,
+                basename: lastSlash === -1 ? path43 : path43.slice(lastSlash + 1),
                 callIndexAtDeny: perCall.length,
                 compactEpochAtOpen: compactEpoch,
                 compactEpochAtWindow: null,
@@ -16505,267 +17117,17 @@ function formatSessionAudit(s) {
 
 // src/session_read.ts
 init_define_import_meta_env();
-import * as fs36 from "node:fs";
-import * as path33 from "node:path";
-import * as readline2 from "node:readline";
-
-// src/waste.ts
-init_define_import_meta_env();
 import * as fs35 from "node:fs";
-import * as os18 from "node:os";
 import * as path32 from "node:path";
-function projectTranscriptsDir(projectRoot) {
-  const rootStr = path32.resolve(projectRoot);
-  const slug = rootStr.replace(/[^A-Za-z0-9]/g, "-");
-  return path32.join(os18.homedir(), ".claude", "projects", slug);
-}
-function findLatestTranscript(projectRoot) {
-  const dir = projectTranscriptsDir(projectRoot);
-  let entries;
-  try {
-    entries = fs35.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
-  } catch {
-    return null;
-  }
-  let best = null;
-  for (const name of entries) {
-    const full = path32.join(dir, name);
-    let stat;
-    try {
-      stat = fs35.statSync(full);
-    } catch {
-      continue;
-    }
-    if (best === null || stat.mtimeMs > best.mtimeMs) best = { file: full, mtimeMs: stat.mtimeMs };
-  }
-  return best?.file ?? null;
-}
-function safeStringify(value) {
-  try {
-    return JSON.stringify(value) ?? "";
-  } catch {
-    return "";
-  }
-}
-var FILE_PATH_TOOLS = /* @__PURE__ */ new Set(["Read", "Edit", "Write", "NotebookEdit", "MultiEdit"]);
-function extractFilePath(name, input) {
-  if (!FILE_PATH_TOOLS.has(name)) return null;
-  if (input === null || typeof input !== "object") return null;
-  const o = input;
-  const fp = o["file_path"];
-  if (typeof fp === "string") return fp;
-  const notebookPath = o["notebook_path"];
-  return typeof notebookPath === "string" ? notebookPath : null;
-}
-function extractCommand(name, input) {
-  if (name !== "Bash") return null;
-  if (input === null || typeof input !== "object") return null;
-  const cmd = input["command"];
-  return typeof cmd === "string" ? cmd : null;
-}
-function summarizeInput(name, input, filePath, command) {
-  if (filePath !== null) return filePath;
-  if (command !== null) return command.length > 100 ? `${command.slice(0, 100)}\u2026` : command;
-  if (input === null || typeof input !== "object") return "";
-  const o = input;
-  for (const key of ["pattern", "query", "path", "description", "prompt"]) {
-    const v = o[key];
-    if (typeof v === "string") return v.length > 100 ? `${v.slice(0, 100)}\u2026` : v;
-  }
-  const s = safeStringify(input);
-  return s.length > 100 ? `${s.slice(0, 100)}\u2026` : s;
-}
-function extractResultText(content) {
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content.map((b) => {
-      if (b !== null && typeof b === "object" && b["type"] === "text") {
-        const t = b["text"];
-        return typeof t === "string" ? t : "";
-      }
-      return "";
-    }).join("\n");
-  }
-  return "";
-}
-function parseTranscript2(transcriptPath) {
-  const raw = fs35.readFileSync(transcriptPath, "utf-8");
-  const calls = [];
-  const resultTextById = /* @__PURE__ */ new Map();
-  const assistantTurns = [];
-  const resident = createResidentContextStats();
-  let seq = 0;
-  for (const line of raw.split("\n")) {
-    const trimmed = line.trim();
-    if (trimmed === "") continue;
-    let obj;
-    try {
-      obj = JSON.parse(trimmed);
-    } catch {
-      continue;
-    }
-    if (obj === null || typeof obj !== "object") continue;
-    const o = obj;
-    accumulateResidentLine(resident, o, trimmed.length);
-    const message = o["message"];
-    if (message === null || typeof message !== "object") continue;
-    const messageObj = message;
-    const content = messageObj["content"];
-    if (!Array.isArray(content)) continue;
-    const role = typeof messageObj["role"] === "string" ? messageObj["role"] : null;
-    const cwd = typeof o["cwd"] === "string" ? o["cwd"] : null;
-    let turnTextTokens = 0;
-    let sawTextBlock = false;
-    for (const block of content) {
-      if (block === null || typeof block !== "object") continue;
-      const b = block;
-      if (b["type"] === "tool_use" && typeof b["id"] === "string" && typeof b["name"] === "string") {
-        const name = b["name"];
-        const input = b["input"];
-        const filePath = extractFilePath(name, input);
-        const command = extractCommand(name, input);
-        calls.push({
-          seq: seq++,
-          id: b["id"],
-          name,
-          input,
-          filePath,
-          command,
-          summary: summarizeInput(name, input, filePath, command),
-          cwd
-        });
-      } else if (b["type"] === "tool_result" && typeof b["tool_use_id"] === "string") {
-        const id = b["tool_use_id"];
-        if (!resultTextById.has(id)) {
-          resultTextById.set(id, extractResultText(b["content"]));
-        }
-      } else if (role === "assistant" && b["type"] === "text" && typeof b["text"] === "string") {
-        sawTextBlock = true;
-        turnTextTokens += estimateTokens(b["text"]);
-      }
-    }
-    if (role === "assistant" && sawTextBlock) assistantTurns.push(turnTextTokens);
-  }
-  return { calls, resultTextById, assistantTurns, resident };
-}
-function costPerCall(parsed) {
-  return parsed.calls.map((c) => ({
-    ...c,
-    tokens: estimateTokens(parsed.resultTextById.get(c.id) ?? "")
-  }));
-}
-function aggregateSortedDesc(pairs) {
-  return [...pairs].map(([key, tokens]) => ({ key, tokens })).sort((a, b) => b.tokens - a.tokens);
-}
-function tokensByTool(costs) {
-  const m = /* @__PURE__ */ new Map();
-  for (const c of costs) m.set(c.name, (m.get(c.name) ?? 0) + c.tokens);
-  return aggregateSortedDesc(m);
-}
-function tokensByFile(costs) {
-  const m = /* @__PURE__ */ new Map();
-  for (const c of costs) {
-    if (c.filePath === null) continue;
-    m.set(c.filePath, (m.get(c.filePath) ?? 0) + c.tokens);
-  }
-  return aggregateSortedDesc(m);
-}
-function topExpensiveCalls(costs, n) {
-  return [...costs].sort((a, b) => b.tokens - a.tokens).slice(0, n);
-}
-function neverTouchedAgain(costs) {
-  const readsByFile = /* @__PURE__ */ new Map();
-  for (const c of costs) {
-    if (c.name !== "Read" || c.filePath === null) continue;
-    const arr = readsByFile.get(c.filePath) ?? [];
-    arr.push(c);
-    readsByFile.set(c.filePath, arr);
-  }
-  const out2 = [];
-  for (const [filePath, reads] of readsByFile) {
-    const firstSeq = Math.min(...reads.map((r) => r.seq));
-    const touchedLater = costs.some((c) => {
-      if (c.seq <= firstSeq) return false;
-      if (c.filePath === filePath) return true;
-      return safeStringify(c.input).includes(filePath);
-    });
-    if (!touchedLater) {
-      out2.push({ filePath, tokens: reads.reduce((n, r) => n + r.tokens, 0) });
-    }
-  }
-  return out2.sort((a, b) => b.tokens - a.tokens);
-}
-async function repeatedUncompressedBashCommands(costs) {
-  const groups = /* @__PURE__ */ new Map();
-  for (const c of costs) {
-    if (c.name !== "Bash" || c.command === null) continue;
-    const norm = normalizeCommandForCacheKey(c.command);
-    const arr = groups.get(norm) ?? [];
-    arr.push(c);
-    groups.set(norm, arr);
-  }
-  const out2 = [];
-  for (const [norm, calls] of groups) {
-    if (calls.length < 2) continue;
-    let cached = false;
-    for (const c of calls) {
-      try {
-        const hash = await commandHash(c.command, c.cwd);
-        if (getBashOutput(hash) !== null) {
-          cached = true;
-          break;
-        }
-      } catch {
-      }
-    }
-    if (cached) continue;
-    const totalTokens = calls.reduce((n, c) => n + c.tokens, 0);
-    out2.push({
-      normalized: norm,
-      count: calls.length,
-      totalTokens,
-      avgTokens: Math.round(totalTokens / calls.length)
-    });
-  }
-  return out2.sort((a, b) => b.totalTokens - a.totalTokens);
-}
-function assistantOutputCost(assistantTurns) {
-  const turnCount = assistantTurns.length;
-  let generatedTokens = 0;
-  let resendCeilingTokens = 0;
-  for (let i = 0; i < turnCount; i++) {
-    const tokens = assistantTurns[i] ?? 0;
-    generatedTokens += tokens;
-    resendCeilingTokens += tokens * (turnCount - 1 - i);
-  }
-  return { turnCount, generatedTokens, resendCeilingTokens };
-}
-async function buildWasteReport(transcriptPath, opts = {}) {
-  const parsed = parseTranscript2(transcriptPath);
-  const costs = costPerCall(parsed);
-  const topN = opts.topN ?? 10;
-  return {
-    transcriptPath,
-    totalTokens: costs.reduce((n, c) => n + c.tokens, 0),
-    tokensByTool: tokensByTool(costs),
-    tokensByFile: tokensByFile(costs),
-    topCalls: topExpensiveCalls(costs, topN).map((c) => ({ seq: c.seq, name: c.name, summary: c.summary, tokens: c.tokens })),
-    neverTouchedAgain: neverTouchedAgain(costs),
-    repeatedUncompressedBash: await repeatedUncompressedBashCommands(costs),
-    assistantOutput: assistantOutputCost(parsed.assistantTurns),
-    residentContext: summarizeResidentContext(parsed.resident)
-  };
-}
-
-// src/session_read.ts
+import * as readline2 from "node:readline";
 function resolveSessionTranscript(arg, opts = {}) {
   if (arg !== void 0 && arg !== "") {
-    if (fs36.existsSync(arg) && fs36.statSync(arg).isFile()) return arg;
+    if (fs35.existsSync(arg) && fs35.statSync(arg).isFile()) return arg;
     const projectRoot2 = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
     const dir = projectTranscriptsDir(projectRoot2);
     const byId = arg.endsWith(".jsonl") ? arg : `${arg}.jsonl`;
-    const candidate = path33.join(dir, byId);
-    if (fs36.existsSync(candidate) && fs36.statSync(candidate).isFile()) return candidate;
+    const candidate = path32.join(dir, byId);
+    if (fs35.existsSync(candidate) && fs35.statSync(candidate).isFile()) return candidate;
     return null;
   }
   const projectRoot = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
@@ -16823,7 +17185,7 @@ function toolCallsForBlocks(blocks) {
   return blocks.filter((b) => b.type === "tool_use" && b.name !== void 0).map((b) => b.name);
 }
 async function* streamTurns(transcriptPath) {
-  const input = fs36.createReadStream(transcriptPath, { encoding: "utf8" });
+  const input = fs35.createReadStream(transcriptPath, { encoding: "utf8" });
   const rl = readline2.createInterface({ input, crlfDelay: Infinity });
   try {
     let lineNumber = 0;
@@ -16922,9 +17284,9 @@ function formatSessionSlice(turns) {
 
 // src/cli_bootstrap_audit.ts
 init_define_import_meta_env();
-import * as fs37 from "node:fs";
-import * as os19 from "node:os";
-import * as path34 from "node:path";
+import * as fs36 from "node:fs";
+import * as os17 from "node:os";
+import * as path33 from "node:path";
 import * as readline3 from "node:readline";
 var FRONTMATTER_KEYS = /* @__PURE__ */ new Set(["description", "tools", "allowed-tools", "allowed_tools"]);
 function parseBudget(name, value) {
@@ -16933,7 +17295,7 @@ function parseBudget(name, value) {
   return value;
 }
 async function readFrontmatter(filePath) {
-  const stream = fs37.createReadStream(filePath, { encoding: "utf8" });
+  const stream = fs36.createReadStream(filePath, { encoding: "utf8" });
   const lines = readline3.createInterface({ input: stream, crlfDelay: Infinity });
   let first = true;
   let inFrontmatter = false;
@@ -16979,44 +17341,44 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
   let logicalRoot;
   let rootIsLink;
   try {
-    rootIsLink = (await fs37.promises.lstat(root)).isSymbolicLink();
-    logicalRoot = await fs37.promises.realpath(root);
+    rootIsLink = (await fs36.promises.lstat(root)).isSymbolicLink();
+    logicalRoot = await fs36.promises.realpath(root);
   } catch (error) {
     if (error.code === "ENOENT") return entries;
-    diagnostics.push({ path: path34.resolve(root), reason: "unreadable root" });
+    diagnostics.push({ path: path33.resolve(root), reason: "unreadable root" });
     return entries;
   }
   if (rootIsLink && !followLinks) {
-    diagnostics.push({ path: path34.resolve(root), reason: "external root link skipped (use --follow-links)" });
+    diagnostics.push({ path: path33.resolve(root), reason: "external root link skipped (use --follow-links)" });
     return entries;
   }
   const canonicalKey = (candidate) => process.platform === "win32" ? candidate.toLocaleLowerCase() : candidate;
   const isContained = (candidate, allowedRoot) => {
-    const relative3 = path34.relative(canonicalKey(allowedRoot), canonicalKey(candidate));
-    return relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path34.sep}`) && !path34.isAbsolute(relative3);
+    const relative3 = path33.relative(canonicalKey(allowedRoot), canonicalKey(candidate));
+    return relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path33.sep}`) && !path33.isAbsolute(relative3);
   };
   async function visit(candidate, allowedRoot, topLevel = false) {
     let real;
     let candidateIsLink;
     try {
-      candidateIsLink = (await fs37.promises.lstat(candidate)).isSymbolicLink();
-      real = await fs37.promises.realpath(candidate);
+      candidateIsLink = (await fs36.promises.lstat(candidate)).isSymbolicLink();
+      real = await fs36.promises.realpath(candidate);
     } catch {
-      diagnostics.push({ path: path34.resolve(candidate), reason: "broken or unreadable link" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: "broken or unreadable link" });
       return;
     }
     const withinAllowedRoot = allowedRoot === void 0 ? isContained(real, logicalRoot) : isContained(real, allowedRoot);
     const canFollowExternal = followLinks && topLevel;
     if (!withinAllowedRoot && !canFollowExternal) {
-      diagnostics.push({ path: path34.resolve(candidate), reason: candidateIsLink ? "external link skipped (use --follow-links)" : "canonical target outside scan root" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: candidateIsLink ? "external link skipped (use --follow-links)" : "canonical target outside scan root" });
       return;
     }
     const trustedRoot = !withinAllowedRoot && canFollowExternal ? real : allowedRoot ?? real;
     let stat;
     try {
-      stat = await fs37.promises.stat(real);
+      stat = await fs36.promises.stat(real);
     } catch {
-      diagnostics.push({ path: path34.resolve(candidate), reason: "unreadable" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable" });
       return;
     }
     const canonical = process.platform === "win32" ? real.toLocaleLowerCase() : real;
@@ -17025,16 +17387,16 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
       visitedDirs.add(canonical);
       let children;
       try {
-        children = await fs37.promises.readdir(real, { withFileTypes: true });
+        children = await fs36.promises.readdir(real, { withFileTypes: true });
       } catch {
-        diagnostics.push({ path: path34.resolve(candidate), reason: "unreadable directory" });
+        diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable directory" });
         return;
       }
       children.sort((a, b) => a.name.localeCompare(b.name));
-      for (const child of children) await visit(path34.join(real, child.name), trustedRoot);
+      for (const child of children) await visit(path33.join(real, child.name), trustedRoot);
       return;
     }
-    if (!stat.isFile() || path34.extname(real).toLowerCase() !== ".md") return;
+    if (!stat.isFile() || path33.extname(real).toLowerCase() !== ".md") return;
     if (seenFiles.has(canonical)) return;
     seenFiles.add(canonical);
     try {
@@ -17044,35 +17406,35 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
       const toolsBytes = Buffer.byteLength(metadata.tools, "utf8");
       entries.push({
         kind,
-        path: path34.resolve(real),
+        path: path33.resolve(real),
         description_bytes: descriptionBytes,
         tools_bytes: toolsBytes,
         metadata_bytes: descriptionBytes + toolsBytes,
         estimated_tokens: Math.floor((descriptionBytes + toolsBytes) / 4)
       });
     } catch {
-      diagnostics.push({ path: path34.resolve(candidate), reason: "unreadable file" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable file" });
     }
   }
   try {
-    const children = await fs37.promises.readdir(logicalRoot, { withFileTypes: true });
+    const children = await fs36.promises.readdir(logicalRoot, { withFileTypes: true });
     children.sort((a, b) => a.name.localeCompare(b.name));
-    for (const child of children) await visit(path34.join(logicalRoot, child.name), void 0, true);
+    for (const child of children) await visit(path33.join(logicalRoot, child.name), void 0, true);
   } catch {
-    diagnostics.push({ path: path34.resolve(root), reason: "unreadable root" });
+    diagnostics.push({ path: path33.resolve(root), reason: "unreadable root" });
   }
   return entries;
 }
 async function buildBootstrapAudit(opts = {}) {
   const project = resolveProjectRoot(opts.project === void 0 ? {} : { project: opts.project });
-  const home = path34.resolve(opts.home ?? os19.homedir());
+  const home = path33.resolve(opts.home ?? os17.homedir());
   const context = buildStats(project, home, opts.project === void 0 ? [] : [opts.project]);
   const diagnostics = [];
   const top = opts.top === void 0 ? 10 : parseBudget("--top", opts.top) ?? 10;
   const visitedDirs = /* @__PURE__ */ new Set();
   const seenFiles = /* @__PURE__ */ new Set();
-  const agents = await scanMetadataRoot(path34.join(home, ".claude", "agents"), "agent", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
-  const skills = await scanMetadataRoot(path34.join(home, ".claude", "skills"), "skill", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
+  const agents = await scanMetadataRoot(path33.join(claudeConfigDir(home), "agents"), "agent", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
+  const skills = await scanMetadataRoot(path33.join(claudeConfigDir(home), "skills"), "skill", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
   const rankedEntries = [...agents, ...skills].sort((a, b) => b.metadata_bytes - a.metadata_bytes || a.path.localeCompare(b.path));
   const largestTotal = rankedEntries.length;
   const largest = rankedEntries.slice(0, top);
@@ -17139,8 +17501,8 @@ async function runBootstrapAudit(opts = {}) {
 
 // src/cli_memory.ts
 init_define_import_meta_env();
-import * as fs38 from "node:fs";
-import * as path35 from "node:path";
+import * as fs37 from "node:fs";
+import * as path34 from "node:path";
 function removeExactDupLines(text, report) {
   if (report.exactDupLines.length === 0) return text;
   const toRemove = new Set(report.exactDupLines.map(([, dupIdx]) => dupIdx));
@@ -17198,7 +17560,7 @@ function printReport(reports, clusters) {
   } else {
     for (const cluster of clusters) {
       w(
-        `  [${cluster.method}, similarity ${cluster.similarity}, ~${cluster.tokens} tok] ${cluster.members.map((m) => displaySafeText(path35.basename(m))).join(", ")}
+        `  [${cluster.method}, similarity ${cluster.similarity}, ~${cluster.tokens} tok] ${cluster.members.map((m) => displaySafeText(path34.basename(m))).join(", ")}
 `
       );
     }
@@ -17213,7 +17575,7 @@ async function runMemoryCommand(opts = {}) {
   const claudeMds = findClaudeMdFiles(projectRoot);
   const reports = auditClaudeMd(claudeMds);
   const memoryMdPath = findMemoryMd(projectRoot);
-  const clusters = memoryMdPath !== null ? await findContentDuplicates(path35.dirname(memoryMdPath)) : [];
+  const clusters = memoryMdPath !== null ? await findContentDuplicates(path34.dirname(memoryMdPath)) : [];
   printReport(reports, clusters);
   if (opts.fix !== true) return;
   const changes = [];
@@ -17221,7 +17583,7 @@ async function runMemoryCommand(opts = {}) {
     if (report.exactDupLines.length === 0) continue;
     let before;
     try {
-      before = fs38.readFileSync(report.path, "utf-8");
+      before = fs37.readFileSync(report.path, "utf-8");
     } catch {
       continue;
     }
@@ -17259,13 +17621,13 @@ async function runMemoryCommand(opts = {}) {
 
 // src/cli_waste.ts
 init_define_import_meta_env();
-import * as fs40 from "node:fs";
-import * as path37 from "node:path";
+import * as fs39 from "node:fs";
+import * as path36 from "node:path";
 
 // src/copilot_waste.ts
 init_define_import_meta_env();
-import * as fs39 from "node:fs";
-import * as path36 from "node:path";
+import * as fs38 from "node:fs";
+import * as path35 from "node:path";
 var HOOK_RECORD_TYPES = /* @__PURE__ */ new Set(["hook.start", "hook.end"]);
 function splitInjectedBlocks(transformed) {
   const out2 = [];
@@ -17284,19 +17646,19 @@ function splitInjectedBlocks(transformed) {
   return out2;
 }
 function findLatestCopilotSession() {
-  const root = path36.join(copilotCliUserRoot(), "session-state");
+  const root = path35.join(copilotCliUserRoot(), "session-state");
   let entries;
   try {
-    entries = fs39.readdirSync(root);
+    entries = fs38.readdirSync(root);
   } catch {
     return null;
   }
   let best = null;
   let bestMtime = -Infinity;
   for (const entry of entries) {
-    const candidate = path36.join(root, entry, "events.jsonl");
+    const candidate = path35.join(root, entry, "events.jsonl");
     try {
-      const st = fs39.statSync(candidate);
+      const st = fs38.statSync(candidate);
       if (!st.isFile()) continue;
       if (st.mtimeMs > bestMtime) {
         bestMtime = st.mtimeMs;
@@ -17312,10 +17674,10 @@ function readNumber(source, key) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
 function buildCopilotWasteReport(eventsPath) {
-  const raw = fs39.readFileSync(eventsPath, "utf-8");
+  const raw = fs38.readFileSync(eventsPath, "utf-8");
   const report = {
     sessionPath: eventsPath,
-    sessionId: path36.basename(path36.dirname(eventsPath)),
+    sessionId: path35.basename(path35.dirname(eventsPath)),
     turns: 0,
     tokens: null,
     blocks: [],
@@ -17594,8 +17956,8 @@ function printResidentContext(resident, w) {
 }
 async function runWasteCommand(opts = {}) {
   if (opts.copilot === true) {
-    const eventsPath = opts.transcript !== void 0 ? path37.resolve(opts.transcript) : findLatestCopilotSession();
-    if (eventsPath === null || !fs40.existsSync(eventsPath)) {
+    const eventsPath = opts.transcript !== void 0 ? path36.resolve(opts.transcript) : findLatestCopilotSession();
+    if (eventsPath === null || !fs39.existsSync(eventsPath)) {
       const detail = eventsPath === null ? "no Copilot CLI session found under <copilot-home>/session-state" : `Copilot session event log not found: ${eventsPath}`;
       if (opts.json === true) {
         process.stdout.write(`${displaySafeJson({ error: detail }, 0)}
@@ -17618,7 +17980,7 @@ async function runWasteCommand(opts = {}) {
     return;
   }
   const projectRoot = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
-  const transcriptPath = opts.transcript !== void 0 ? path37.resolve(opts.transcript) : findLatestTranscript(projectRoot);
+  const transcriptPath = opts.transcript !== void 0 ? path36.resolve(opts.transcript) : findLatestTranscript(projectRoot);
   if (transcriptPath === null) {
     if (opts.json === true) {
       process.stdout.write(`${displaySafeJson({ error: "no session transcript found", project: projectRoot }, 0)}
@@ -17632,7 +17994,7 @@ async function runWasteCommand(opts = {}) {
     process.exitCode = 1;
     return;
   }
-  if (!fs40.existsSync(transcriptPath)) {
+  if (!fs39.existsSync(transcriptPath)) {
     process.stderr.write(`token-goat: transcript not found: ${transcriptPath}
 `);
     process.exitCode = 1;
@@ -17649,13 +18011,13 @@ async function runWasteCommand(opts = {}) {
 
 // src/cli_mcp_audit.ts
 init_define_import_meta_env();
-import * as fs41 from "node:fs";
-import * as os20 from "node:os";
-import * as path38 from "node:path";
+import * as fs40 from "node:fs";
+import * as os18 from "node:os";
+import * as path37 from "node:path";
 function readMcpJsonFile(configPath2) {
   try {
-    if (!fs41.existsSync(configPath2)) return null;
-    const content = fs41.readFileSync(configPath2, "utf-8");
+    if (!fs40.existsSync(configPath2)) return null;
+    const content = fs40.readFileSync(configPath2, "utf-8");
     const parsed = JSON.parse(content);
     const servers = parsed && typeof parsed === "object" ? parsed.mcpServers ?? ("servers" in parsed ? null : parsed) : null;
     return servers && typeof servers === "object" ? servers : null;
@@ -17671,8 +18033,8 @@ function driveLetterCaseVariants(p) {
 }
 function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   try {
-    if (!fs41.existsSync(claudeJsonPath)) return null;
-    const parsed = JSON.parse(fs41.readFileSync(claudeJsonPath, "utf-8"));
+    if (!fs40.existsSync(claudeJsonPath)) return null;
+    const parsed = JSON.parse(fs40.readFileSync(claudeJsonPath, "utf-8"));
     const projects = parsed && typeof parsed === "object" ? parsed.projects : null;
     if (!projects || typeof projects !== "object") return null;
     const slashForms = [projectRoot, projectRoot.replace(/\\/g, "/"), projectRoot.replace(/\//g, "\\")];
@@ -17690,9 +18052,9 @@ function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   }
 }
 function discoverMcpConfig(projectRoot, home) {
-  const mcpJsonPath = path38.join(projectRoot, ".mcp.json");
-  const claudeJsonPath = path38.join(home, ".claude.json");
-  const copilotJsonPath = path38.join(home, ".copilot", "mcp-config.json");
+  const mcpJsonPath = path37.join(projectRoot, ".mcp.json");
+  const claudeJsonPath = path37.join(home, ".claude.json");
+  const copilotJsonPath = path37.join(home, ".copilot", "mcp-config.json");
   const sourcesChecked = [mcpJsonPath, claudeJsonPath, copilotJsonPath];
   const fromMcpJson = readMcpJsonFile(mcpJsonPath);
   if (fromMcpJson !== null) return { servers: fromMcpJson, sourcePath: mcpJsonPath, sourcesChecked };
@@ -17723,7 +18085,7 @@ function analyzeMcpCache() {
   }
   return serverMetrics;
 }
-function buildMcpAuditReport(projectRoot, home = os20.homedir()) {
+function buildMcpAuditReport(projectRoot, home = os18.homedir()) {
   const discovery = discoverMcpConfig(projectRoot, home);
   const config = discovery.servers;
   const cacheMetrics = analyzeMcpCache();
@@ -17809,69 +18171,6 @@ async function runMcpAuditCommand(opts = {}) {
   printReport3(report);
 }
 
-// src/cli_recall.ts
-init_define_import_meta_env();
-var RECALL_COMMAND = {
-  bash: "bash-output",
-  web: "web-output",
-  mcp: "mcp-output"
-};
-function fenceTagForCacheType(cacheType) {
-  return cacheType === "web" ? UNTRUSTED_WEB_TAG : UNTRUSTED_TOOL_TAG;
-}
-function fenceRecallListing(text, hits) {
-  const tags = new Set(hits.map((hit) => fenceTagForCacheType(hit.cacheType)));
-  const tag = tags.size === 1 ? [...tags][0] ?? UNTRUSTED_TOOL_TAG : UNTRUSTED_TOOL_TAG;
-  return fenceUntrusted(text, tag);
-}
-function fenceSnippetIfMatched(hit) {
-  const matches2 = scanAndRecord(hit.snippet);
-  if (matches2.length === 0) return hit.snippet;
-  return fenceUntrustedContent(hit.snippet, matches2, fenceTagForCacheType(hit.cacheType));
-}
-function printHits(query, hits) {
-  const w = (text) => {
-    process.stdout.write(text);
-  };
-  if (hits.length === 0) {
-    w(query === void 0 ? "No cache entries yet.\n" : `No cache entries match: ${query}
-`);
-    return;
-  }
-  const body = hits.map((hit) => {
-    const label = hit.label.length > 80 ? hit.label.slice(0, 77) + "..." : hit.label;
-    const pointer = hit.blobPresent ? `  (token-goat ${RECALL_COMMAND[hit.cacheType]} ${hit.id})` : "  (blob expired -- content below is all that remains)";
-    return `[${pad(hit.cacheType, 4)}] ${hit.id}
-${pointer}
-  ${label}
-  ${hit.snippet}
-`;
-  }).join("\n");
-  w(`${fenceRecallListing(body, hits)}
-`);
-}
-function runRecallCommand(query, opts = {}) {
-  const browse = query === void 0 || query.trim() === "";
-  const scope = {
-    ...opts.type !== void 0 ? { type: opts.type } : {},
-    ...opts.limit !== void 0 ? { limit: opts.limit } : {}
-  };
-  const effectiveLimit = opts.limit ?? RECALL_DEFAULT_LIMIT;
-  const fetched = browse ? listRecentRecall({ ...scope, limit: effectiveLimit + 1 }) : searchRecall(query, { ...scope, limit: effectiveLimit + 1 });
-  const hits = fetched.slice(0, effectiveLimit);
-  if (fetched.length > hits.length) {
-    process.stderr.write(`Showing ${hits.length} entries; more are available (raise --limit to see them).
-`);
-  }
-  if (opts.json === true) {
-    const fenced = hits.map((hit) => ({ ...hit, snippet: fenceSnippetIfMatched(hit) }));
-    process.stdout.write(`${displaySafeJson(fenced, 0)}
-`);
-    return;
-  }
-  printHits(browse ? void 0 : query, hits);
-}
-
 // src/cli_statusline.ts
 init_define_import_meta_env();
 var STDIN_TIMEOUT_MS = 1500;
@@ -17967,14 +18266,20 @@ function efficacyCell(row) {
   const pct3 = row.efficacyPct === null ? "n/a" : `${row.efficacyPct}%`;
   return isSuppressionCategory(row.category) ? `${pct3} *` : pct3;
 }
+function emittedCell(row) {
+  return row.unobservable > 0 ? `${row.emitted} ~${row.unobservable}` : String(row.emitted);
+}
+function detectedCell(row) {
+  return row.detected === 0 ? "-" : String(row.detected);
+}
 function printSummary(rows) {
   const w = (text) => {
     process.stdout.write(text);
   };
-  w(pad("category", 22) + pad("emitted", 9) + pad("acted-on", 10) + pad("efficacy", 12) + pad("suppressed", 17) + pad("manual+", 9) + pad("manual-", 9) + "spent\n");
+  w(pad("category", 22) + pad("emitted", 9) + pad("undisplayed", 13) + pad("acted-on", 10) + pad("efficacy", 12) + pad("suppressed", 17) + pad("manual+", 9) + pad("manual-", 9) + "spent\n");
   for (const row of rows) {
     w(
-      pad(row.category, 22) + pad(String(row.emitted), 9) + pad(String(row.actedOn), 10) + pad(efficacyCell(row), 12) + pad(suppressedCell(row), 17) + pad(String(row.manualEffective), 9) + pad(String(row.manualIneffective), 9) + formatSpentCell(row) + "\n"
+      pad(row.category, 22) + pad(emittedCell(row), 9) + pad(detectedCell(row), 13) + pad(String(row.actedOn), 10) + pad(efficacyCell(row), 12) + pad(suppressedCell(row), 17) + pad(String(row.manualEffective), 9) + pad(String(row.manualIneffective), 9) + formatSpentCell(row) + "\n"
     );
   }
 }
@@ -18011,7 +18316,7 @@ function runHintStatsCommand(opts = {}) {
 `);
     return;
   }
-  if (rows.every((r) => r.emitted === 0 && r.actedOn === 0)) {
+  if (rows.every((r) => r.emitted === 0 && r.actedOn === 0 && r.unobservable === 0 && r.detected === 0)) {
     process.stdout.write("No hint emissions recorded yet \u2014 the zeros below are absence of data, not measured ineffectiveness.\n");
   }
   printSummary(rows);
@@ -18020,6 +18325,16 @@ function runHintStatsCommand(opts = {}) {
       '\n* Scored on an absence: these hints ask the agent NOT to do something, so a window that expires with no re-read counts as compliance. Their percentage is not comparable with the unmarked rows, which only count when the agent runs the command the hint named. A high starred figure means "the warned-against read was not seen", not "this hint persuaded anyone".\n'
     );
   }
+  if (rows.some((r) => r.detected > 0)) {
+    process.stdout.write(
+      "\nundisplayed: detections that never reached the agent -- auto-suppressed, or declined by the hint's own net-benefit gate because the substitute it would have proposed was not smaller than the read it was redirecting. They cost nothing and are scored nowhere. A large figure against a small emitted count means the trigger is alive and the mute is doing the work; a `-` means it has gone quiet on its own.\n"
+    );
+  }
+  if (rows.some((r) => r.unobservable > 0)) {
+    process.stdout.write(
+      "\n~N: N further emissions in that category carried no correlator -- no pointer a later command could have matched -- so no verdict about them was ever observed. They are not in the emitted or acted-on counts and not in the efficacy figure, which is scored only on the rows that could have gone either way. They ARE in the spend column: an unobservable hint costs the agent its bytes all the same.\n"
+    );
+  }
   const permanent = rows.filter((r) => r.suppressionPermanent);
   if (permanent.length > 0) {
     const names = permanent.map((r) => r.category).join(", ");
@@ -18085,7 +18400,7 @@ ${formatSessionOutline(turns)}`;
 }
 function sessionTranscriptSize(transcriptPath) {
   try {
-    return fs42.statSync(transcriptPath).size;
+    return fs41.statSync(transcriptPath).size;
   } catch {
     return 0;
   }
@@ -18145,14 +18460,14 @@ function cmdHintStats(opts = {}) {
 
 // src/cli_skills.ts
 init_define_import_meta_env();
-import * as fs43 from "node:fs";
-import * as path39 from "node:path";
+import * as fs42 from "node:fs";
+import * as path38 from "node:path";
 async function cmdSkillBody(name, opts) {
   const filePath = await getSkillFilePath(name);
   if (filePath === null) {
     throw new CliError(`skill '${name}' not found`);
   }
-  const body = decodeSource(fs43.readFileSync(filePath));
+  const body = decodeSource(fs42.readFileSync(filePath));
   if (opts.compact === true) {
     const emitted = extractCompactFromMarker(body) ?? body;
     out(emitted);
@@ -18179,7 +18494,7 @@ async function cmdSkillCompact(name, opts) {
       }
       let body2;
       try {
-        body2 = decodeSource(fs43.readFileSync(filePath));
+        body2 = decodeSource(fs42.readFileSync(filePath));
       } catch {
         unresolvable++;
         continue;
@@ -18213,19 +18528,19 @@ async function cmdSkillCompact(name, opts) {
     if (!opts.path.trim()) {
       throw new CliError("--path cannot be empty");
     }
-    if (!fs43.existsSync(opts.path)) {
+    if (!fs42.existsSync(opts.path)) {
       throw new CliError(`skill file not found: ${opts.path}`);
     }
     try {
-      body = fs43.readFileSync(opts.path, "utf-8");
+      body = fs42.readFileSync(opts.path, "utf-8");
     } catch (e) {
       if (e.code === "ENOENT") {
         throw new CliError(`skill file not found: ${opts.path}`);
       }
       throw new CliError(`failed to read skill file '${opts.path}': ${extractErrorMessage(e)}`);
     }
-    cacheName = name ?? path39.basename(path39.dirname(path39.resolve(opts.path)));
-    sourcePath = path39.resolve(opts.path);
+    cacheName = name ?? path38.basename(path38.dirname(path38.resolve(opts.path)));
+    sourcePath = path38.resolve(opts.path);
   } else {
     if (name === void 0 || !name.trim()) {
       throw new CliError("skill-compact requires a <name> or --path <file>");
@@ -18234,7 +18549,7 @@ async function cmdSkillCompact(name, opts) {
     if (filePath === null) {
       throw new CliError(`skill '${name}' not found`);
     }
-    body = fs43.readFileSync(filePath, "utf-8");
+    body = fs42.readFileSync(filePath, "utf-8");
     cacheName = name;
     sourcePath = filePath;
   }
@@ -18366,8 +18681,8 @@ async function cmdSkillDiff(name) {
   }
   const newer = versions[0];
   const older = versions[1];
-  const newerBody = await fs43.promises.readFile(path39.resolve(dir, `${newer.outputId}.txt`), "utf-8").catch(() => null);
-  const olderBody = await fs43.promises.readFile(path39.resolve(dir, `${older.outputId}.txt`), "utf-8").catch(() => null);
+  const newerBody = await fs42.promises.readFile(path38.resolve(dir, `${newer.outputId}.txt`), "utf-8").catch(() => null);
+  const olderBody = await fs42.promises.readFile(path38.resolve(dir, `${older.outputId}.txt`), "utf-8").catch(() => null);
   if (newerBody === null || olderBody === null) {
     out(`a cached version of '${name}' was evicted while diffing -- try again`);
     return;
@@ -18396,7 +18711,7 @@ async function cmdSkillSection(nameHeading, headingArg) {
   if (!filePath) {
     throw new CliError(`skill '${skillName}' not found`);
   }
-  const body = decodeSource(fs43.readFileSync(filePath));
+  const body = decodeSource(fs42.readFileSync(filePath));
   const extracted = extractNamedSection(body, heading);
   if (!extracted) {
     const allHeadings = listSections(filePath);
@@ -18501,8 +18816,8 @@ async function buildResumePacket(sessionId) {
 
 // src/cli_stats.ts
 init_define_import_meta_env();
-import * as fs44 from "node:fs";
-import * as path40 from "node:path";
+import * as fs43 from "node:fs";
+import * as path39 from "node:path";
 function writeRaw(text) {
   const payload = colorStdout() ? text : stripAnsi(text);
   process.stdout.write(ensureNewline(payload));
@@ -18514,8 +18829,8 @@ function formatTopFiles(ranked) {
   if (ranked.length === 0) return "";
   const lines = ["Top files this session:"];
   for (const { path: filePath, count } of ranked) {
-    const basename10 = path40.basename(filePath);
-    lines.push(`  ${count.toString().padStart(3)}x  ${basename10}  (${filePath})`);
+    const basename11 = path39.basename(filePath);
+    lines.push(`  ${count.toString().padStart(3)}x  ${basename11}  (${filePath})`);
   }
   return lines.join("\n");
 }
@@ -18531,12 +18846,12 @@ function renderTopSessionFiles(topN = 5) {
 }
 function renderTopSessionFilesFromDisk(topN = 5, overrideSessionsDir) {
   try {
-    const sessionsDir = overrideSessionsDir ?? path40.join(dataDir(), "sessions");
-    if (!fs44.existsSync(sessionsDir)) return "";
-    const files = fs44.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, mtime: fs44.statSync(path40.join(sessionsDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).slice(0, 3);
+    const dir = overrideSessionsDir ?? sessionsDir();
+    if (!fs43.existsSync(dir)) return "";
+    const files = fs43.readdirSync(dir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, mtime: fs43.statSync(path39.join(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).slice(0, 3);
     for (const { name } of files) {
       try {
-        const raw = fs44.readFileSync(path40.join(sessionsDir, name), "utf-8");
+        const raw = fs43.readFileSync(path39.join(dir, name), "utf-8");
         const data = JSON.parse(raw);
         const filesList = data["files"];
         if (!Array.isArray(filesList)) continue;
@@ -18600,6 +18915,10 @@ function runStats(opts = {}) {
     renderMethodology(opts.json === true);
     return;
   }
+  if (opts.hooks === true) {
+    renderHookLatencyStats(void 0, opts.homeDir);
+    return;
+  }
   const window = opts.windowDays ?? 30;
   const summary = summarize(window, void 0, opts.homeDir);
   if (opts.json === true) {
@@ -18624,13 +18943,13 @@ function runStats(opts = {}) {
 }
 
 // src/cache_session_commands.ts
-function emitErr3(text) {
+function emitErr4(text) {
   process.stderr.write(ensureNewline(text));
 }
 function capAndNote(rows, limit) {
   const shown = rows.slice(0, limit);
   if (shown.length < rows.length) {
-    emitErr3(`Showing ${shown.length} of ${rows.length} entries (raise --limit to see the rest).`);
+    emitErr4(`Showing ${shown.length} of ${rows.length} entries (raise --limit to see the rest).`);
   }
   return shown;
 }
@@ -18640,11 +18959,11 @@ function parseLimitOpt(cmdName, limitStr, dflt = 30) {
   try {
     n = requireNonNegativeStrictInt("--limit", limitStr);
   } catch (e) {
-    emitErr3(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
+    emitErr4(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
     throw new Error(`invalid --limit: ${limitStr}`, { cause: e });
   }
   if (n === 0) {
-    emitErr3(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
+    emitErr4(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
     throw new Error(`invalid --limit: ${limitStr}`);
   }
   return n;
@@ -18676,9 +18995,10 @@ function cmdBashHistory(opts) {
   const allItems = blobs.map(({ id, mtime, value }) => {
     if (typeof value !== "object" || value === null) return null;
     const v = value;
+    if (typeof v["command"] !== "string") return null;
     return {
       id,
-      command: typeof v["command"] === "string" ? v["command"] : "",
+      command: v["command"],
       storedAt: typeof v["storedAt"] === "number" ? v["storedAt"] : mtime,
       exitCode: typeof v["exitCode"] === "number" ? v["exitCode"] : -1,
       sizeBytes: typeof v["sizeBytes"] === "number" ? v["sizeBytes"] : 0
@@ -19415,25 +19735,25 @@ function installVerificationNotice(harness) {
 
 // src/purge.ts
 init_define_import_meta_env();
-import * as fs45 from "node:fs";
-import * as path41 from "node:path";
+import * as fs44 from "node:fs";
+import * as path40 from "node:path";
 function directorySize(root) {
   let total = 0;
   let entries;
   try {
-    entries = fs45.readdirSync(root, { withFileTypes: true });
+    entries = fs44.readdirSync(root, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const full = path41.join(root, entry.name);
+    const full = path40.join(root, entry.name);
     if (entry.isDirectory()) {
       total += directorySize(full);
       continue;
     }
     if (!entry.isFile()) continue;
     try {
-      total += fs45.statSync(full).size;
+      total += fs44.statSync(full).size;
     } catch {
     }
   }
@@ -19452,7 +19772,7 @@ function purgeDataDirectories() {
     }
     const bytes = directorySize(root);
     try {
-      fs45.rmSync(root, { recursive: true, force: true });
+      fs44.rmSync(root, { recursive: true, force: true });
       result.removed.push({ path: root, bytes });
     } catch (e) {
       result.failed.push({ path: root, reason: e instanceof Error ? e.message : String(e) });
@@ -19599,8 +19919,8 @@ async function getSectionContent(fileId, heading, opts = {}) {
 
 // src/cli_bench.ts
 init_define_import_meta_env();
-import * as fs46 from "node:fs";
-import * as path42 from "node:path";
+import * as fs45 from "node:fs";
+import * as path41 from "node:path";
 var ControlFilter = class extends ToolFilter {
   constructor(name, transform) {
     super();
@@ -19621,13 +19941,13 @@ var CONTROL_FILTERS = {
 };
 var MAX_BENCH_FILE_BYTES = 5 * 1024 * 1024;
 function readCaseFile(id, filePath, what) {
-  const bytes = fs46.statSync(filePath).size;
+  const bytes = fs45.statSync(filePath).size;
   if (bytes > MAX_BENCH_FILE_BYTES) {
     throw new Error(
       `bench case ${id}: ${what} is ${bytes} bytes, over the ${MAX_BENCH_FILE_BYTES}-byte limit for a corpus file (${filePath})`
     );
   }
-  return fs46.readFileSync(filePath, "utf8");
+  return fs45.readFileSync(filePath, "utf8");
 }
 function parseCase(id, metaPath, outputPath) {
   const metaText = readCaseFile(id, metaPath, "metadata");
@@ -19662,7 +19982,7 @@ function parseCase(id, metaPath, outputPath) {
 function loadCorpus(dir) {
   let entries;
   try {
-    entries = fs46.readdirSync(dir);
+    entries = fs45.readdirSync(dir);
   } catch {
     throw new Error(`bench corpus not found: ${dir}`);
   }
@@ -19670,9 +19990,9 @@ function loadCorpus(dir) {
   for (const entry of entries.sort()) {
     if (!entry.endsWith(".json")) continue;
     const id = entry.slice(0, -".json".length);
-    const outputPath = path42.join(dir, `${id}.txt`);
-    if (!fs46.existsSync(outputPath)) throw new Error(`bench case ${id}: missing output file ${outputPath}`);
-    cases.push(parseCase(id, path42.join(dir, entry), outputPath));
+    const outputPath = path41.join(dir, `${id}.txt`);
+    if (!fs45.existsSync(outputPath)) throw new Error(`bench case ${id}: missing output file ${outputPath}`);
+    cases.push(parseCase(id, path41.join(dir, entry), outputPath));
   }
   if (cases.length === 0) throw new Error(`bench corpus is empty: ${dir}`);
   return cases;
@@ -19792,10 +20112,10 @@ function appendTsv(file, report, commit) {
     report.mustKeepTotal,
     report.coveredFilters
   ].join("	");
-  const dir = path42.dirname(path42.resolve(file));
-  fs46.mkdirSync(dir, { recursive: true });
-  const header = fs46.existsSync(file) ? "" : TSV_HEADER;
-  fs46.appendFileSync(file, header + row + "\n", "utf8");
+  const dir = path41.dirname(path41.resolve(file));
+  fs45.mkdirSync(dir, { recursive: true });
+  const header = fs45.existsSync(file) ? "" : TSV_HEADER;
+  fs45.appendFileSync(file, header + row + "\n", "utf8");
 }
 function currentCommit(cwd) {
   const opts = cwd === void 0 ? {} : { cwd };
@@ -19835,10 +20155,10 @@ function readBoundedText(text, file) {
   if (text === void 0 && file === void 0) throw new CliError("provide text or --file");
   let value;
   if (file !== void 0) {
-    if (fs47.statSync(file).size > CONTENT_MAX_INPUT_CHARS) {
+    if (fs46.statSync(file).size > CONTENT_MAX_INPUT_CHARS) {
       throw new CliError(`file exceeds the ${CONTENT_MAX_INPUT_CHARS}-byte safety limit`);
     }
-    value = fs47.readFileSync(file, "utf8");
+    value = fs46.readFileSync(file, "utf8");
   } else {
     if (text === void 0) throw new CliError("provide text or --file");
     value = text;
@@ -19948,6 +20268,7 @@ async function cmdIndex(pathArg, opts = {}) {
   const ixCfg = loadConfig().indexing;
   if ((loadConfig().indexing?.embeddings_enabled ?? true) && embeddingsDepsAvailable(getDb(dbPath))) {
     ensureEmbeddingProvenance(getDb(dbPath));
+    pruneUnembeddableChunks(getDb(dbPath), ixCfg.max_chunks_per_file, deleteFileEmbeddings);
   }
   let indexed = 0;
   let failed = 0;
@@ -19984,20 +20305,23 @@ async function cmdIndex(pathArg, opts = {}) {
       continue;
     }
     const sha = fingerprintFile(key);
-    if (sha === null && !fs47.existsSync(key)) continue;
+    if (sha === null && !fs46.existsSync(key)) continue;
     const entry = sha !== null ? getFileEntry(key, dbPath) : null;
     const spellingStale = entry !== null && indexedPathSpellingIsStale(entry.filePath, key);
-    const parseUnchanged = !force && !spellingStale && sha !== null && entry?.sha === sha && entry.parserSha === PARSER_FINGERPRINT;
+    const parseUnchanged = !force && !spellingStale && sha !== null && entry?.sha === sha && entry.parserSha === parserFingerprintForLanguage(entry.language);
     const embeddingsEnabled = loadConfig().indexing?.embeddings_enabled ?? true;
     const depsAvailable = embeddingsEnabled && embeddingsDepsAvailable(getDb(dbPath));
-    const embedUnchanged = !force && parseUnchanged && sha !== null && isEmbedFresh(
-      entry?.embedSha,
+    const embedFreshFor = (embedSha) => !force && !spellingStale && sha !== null && isEmbedFresh(
+      embedSha,
       sha,
       embeddingsEnabled,
       depsAvailable,
       // See isEmbedFresh: an `oversize:` marker stays fresh only while indexing.large_file_symbol_only_kb is still what it was stamped under, so raising the threshold re-embeds the files it just admitted instead of leaving them permanently skipped. 0 matches no marker (config floors this key at 1), the safe direction for a partially-mocked config.
-      loadConfig().indexing?.large_file_symbol_only_kb ?? 0
+      loadConfig().indexing?.large_file_symbol_only_kb ?? 0,
+      // Same reasoning and same 0 fallback for the chunk-count marker.
+      loadConfig().indexing?.max_chunks_per_file ?? 0
     );
+    const embedUnchanged = embedFreshFor(entry?.embedSha);
     if (parseUnchanged && embedUnchanged) {
       skipped += 1;
       continue;
@@ -20017,9 +20341,10 @@ async function cmdIndex(pathArg, opts = {}) {
         }
         continue;
       }
-      if (!fs47.existsSync(key)) continue;
+      if (!fs46.existsSync(key)) continue;
     }
-    if (!embedUnchanged) {
+    const embedFresh = parseUnchanged ? embedUnchanged : embedFreshFor(getFileEntry(key, dbPath)?.embedSha);
+    if (!embedFresh) {
       paintProgress("embedding");
       await indexFileEmbeddings(key, dbPath, sha ?? void 0);
     }
@@ -20077,7 +20402,7 @@ async function cmdMcpServe() {
   let StdioServerTransport;
   try {
     ;
-    ({ createMcpServer } = await import("./token-goat-chunk-YFGEUIEO.mjs"));
+    ({ createMcpServer } = await import("./token-goat-chunk-DA6TIDLI.mjs"));
     ({ StdioServerTransport } = await import("./token-goat-chunk-EVC4TOLE.mjs"));
   } catch (err2) {
     process.stderr.write(
@@ -20102,11 +20427,11 @@ async function cmdHook(event, opts) {
   if (typeof opts.harness === "string" && opts.harness.length > 0) {
     process.env[ENV_KEYS.HARNESS_OVERRIDE] = opts.harness;
   }
-  const { relay } = await import("./token-goat-chunk-CKIJWTRQ.mjs");
+  const { relay } = await import("./token-goat-chunk-NYFYIRG3.mjs");
   await relay(event);
 }
 function projectHooksCommitNote(pathFiles, hooksConfigPath) {
-  const shim = hooksConfigPath === void 0 ? "" : ` (${displaySafePath(path43.join(path43.dirname(hooksConfigPath), HOOKS_SCRIPT_FILE))} is generated with them)`;
+  const shim = hooksConfigPath === void 0 ? "" : ` (${displaySafePath(path42.join(path42.dirname(hooksConfigPath), HOOKS_SCRIPT_FILE))} is generated with them)`;
   return `Note: ${pathFiles.map((p) => displaySafePath(p)).join(", ")} ${pathFiles.length === 1 ? "holds" : "hold"} absolute paths to node and token-goat on this machine${shim}, so do not commit them: list them in .git/info/exclude or .gitignore.`;
 }
 function visualStudioManualSteps(scope) {
@@ -20139,7 +20464,7 @@ async function cmdInstall(opts) {
   if (opts.project === true && opts.user === true) {
     throw new Error("install takes either -p/--project or --user, not both.");
   }
-  await import("./token-goat-chunk-CKIJWTRQ.mjs");
+  await import("./token-goat-chunk-NYFYIRG3.mjs");
   const scope = opts.project === true ? "project" : "user";
   if (wantsClaudeCodeBase(opts)) {
     const result = installHooks(scope);
@@ -20285,16 +20610,16 @@ async function cmdInstall(opts) {
     );
   }
   try {
-    const skillDir2 = path43.join(homedir20(), ".claude", "skills");
-    if (fs47.existsSync(skillDir2)) {
-      const entries = fs47.readdirSync(skillDir2, { withFileTypes: true });
+    const skillDir2 = path42.join(claudeConfigDir(), "skills");
+    if (fs46.existsSync(skillDir2)) {
+      const entries = fs46.readdirSync(skillDir2, { withFileTypes: true });
       const skillNames = [];
       const sessionId = getSessionId();
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
-        const skillFile = path43.join(skillDir2, entry.name, "SKILL.md");
-        if (fs47.existsSync(skillFile)) {
-          const body = fs47.readFileSync(skillFile, "utf-8");
+        const skillFile = path42.join(skillDir2, entry.name, "SKILL.md");
+        if (fs46.existsSync(skillFile)) {
+          const body = fs46.readFileSync(skillFile, "utf-8");
           const compact = extractCompactFromMarker(body);
           if (compact === null) continue;
           const sourceSha = contentHash(body);
@@ -20305,9 +20630,9 @@ async function cmdInstall(opts) {
       if (skillNames.length > 0) {
         const dir = skillOutputsDir();
         ensureDirSync(dir);
-        const pregenPath = path43.join(dir, "pregen.json");
+        const pregenPath = path42.join(dir, "pregen.json");
         const pregenData = { ts: Date.now(), names: skillNames };
-        await fs47.promises.writeFile(pregenPath, JSON.stringify(pregenData, null, 2));
+        await fs46.promises.writeFile(pregenPath, JSON.stringify(pregenData, null, 2));
         out(`Pre-generated ${skillNames.length} skill compacts.`);
       }
     }
@@ -20453,7 +20778,8 @@ function cmdStats(opts = {}) {
     windowDays,
     full: opts.full === true,
     short: opts.short === true,
-    methodology: opts.methodology === true
+    methodology: opts.methodology === true,
+    hooks: opts.hooks === true
   };
   if (opts.homeDir !== void 0) {
     statsOpts.homeDir = opts.homeDir;
@@ -20486,7 +20812,7 @@ async function cmdDoctor(opts) {
   }
 }
 function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTag = UNTRUSTED_WEB_TAG) {
-  const emit3 = (text) => {
+  const emit4 = (text) => {
     if (!fenceByProvenance || text === "") {
       out(text);
       return text;
@@ -20525,7 +20851,7 @@ function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTa
   }
   const rawLines = content.split(/\r?\n/);
   if (opts.full === true) {
-    return emit3(rawLines.join("\n"));
+    return emit4(rawLines.join("\n"));
   }
   const lines = rawLines.length > 1 && rawLines[rawLines.length - 1] === "" ? rawLines.slice(0, -1) : rawLines;
   const headN = opts.head !== void 0 ? requireNonNegativeInt2("--head", opts.head) : 30;
@@ -20548,7 +20874,7 @@ function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTa
     result = lines.slice(Math.max(0, lines.length - tailN));
     noteLineCap("last", "tail", result.length, lines.length);
   }
-  return emit3(result.join("\n"));
+  return emit4(result.join("\n"));
 }
 function cmdBashOutput(id, opts) {
   const parseVerifyThreshold = (optVal) => {
@@ -20569,7 +20895,7 @@ function cmdBashOutput(id, opts) {
     }
     let content;
     try {
-      const st = fs47.statSync(opts.file);
+      const st = fs46.statSync(opts.file);
       if (st.isFIFO() || st.isSocket()) {
         throw new CliError(`--file '${opts.file}' is a special file (FIFO or socket) \u2014 only regular files are supported`);
       }
@@ -20584,7 +20910,7 @@ function cmdBashOutput(id, opts) {
 `);
         }
       }
-      content = redactIfDotenv(opts.file, decodeSource(fs47.readFileSync(opts.file)));
+      content = redactIfDotenv(opts.file, decodeSource(fs46.readFileSync(opts.file)));
     } catch (e) {
       if (e instanceof CliError) throw e;
       throw new CliError(`cannot read file: ${opts.file}`);
@@ -20648,15 +20974,15 @@ function cmdMcpOutput(id, opts) {
     if (opts.file.includes("\0")) {
       throw new CliError("--file path contains a null byte");
     }
-    if (!fs47.existsSync(opts.file)) {
+    if (!fs46.existsSync(opts.file)) {
       throw new CliError(`file not found: ${opts.file}`);
     }
     try {
-      const st = fs47.statSync(opts.file);
+      const st = fs46.statSync(opts.file);
       if (st.isFIFO() || st.isSocket()) {
         throw new CliError(`--file '${opts.file}' is a special file (FIFO or socket) \u2014 only regular files are supported`);
       }
-      content = decodeSource(fs47.readFileSync(opts.file));
+      content = decodeSource(fs46.readFileSync(opts.file));
     } catch (e) {
       if (e instanceof CliError) throw e;
       throw new CliError(`cannot read file: ${opts.file}`);
@@ -20729,13 +21055,13 @@ async function cmdCompress(commandArgs, opts = {}) {
       process.exitCode = 1;
       return;
     }
-    const bashRunner = await import("./token-goat-chunk-7EGKXBWT.mjs");
+    const bashRunner = await import("./token-goat-chunk-P46RTOAQ.mjs");
     if (opts.compress === false) {
       process.exitCode = bashRunner.runRaw(command, parseTimeout(opts.timeout, bashRunner.DEFAULT_TIMEOUT_SECONDS));
       return;
     }
     const maxTokens = opts.maxTokens !== void 0 ? requireNonNegativeInt2("--max-tokens", opts.maxTokens) : 0;
-    process.exitCode = bashRunner.run(command, {
+    process.exitCode = await bashRunner.run(command, {
       filterName: opts.filter,
       timeout: parseTimeout(opts.timeout, bashRunner.DEFAULT_TIMEOUT_SECONDS),
       maxTokens,
@@ -20779,9 +21105,10 @@ ${content}`;
 var originalHelpInformation = null;
 function buildProgram() {
   const program2 = new Command();
-  program2.name("token-goat").description("Surgical token-reduction companion for AI coding agents").version(VERSION, "-v, --version", "print the token-goat version").option("--cwd <path>", "run as if invoked from this directory (overrides the real working directory)");
+  program2.name("token-goat").description("Surgical token-reduction companion for AI coding agents").version(VERSION, "-v, --version", "print the token-goat version").option("--cwd <path>", "run as if invoked from this directory (overrides the real working directory)").option("--notice <text>", "print this line to stdout before the command's own output");
   program2.hook("preAction", (thisCommand) => {
-    const cwdOverride = thisCommand.opts().cwd;
+    const opts = thisCommand.opts();
+    const cwdOverride = opts.cwd;
     if (cwdOverride !== void 0) {
       try {
         process.chdir(cwdOverride);
@@ -20789,6 +21116,7 @@ function buildProgram() {
         throw new Error(`--cwd ${cwdOverride}: ${extractErrorMessage(e)}`, { cause: e });
       }
     }
+    if (opts.notice !== void 0) out(opts.notice);
   });
   const guard = (fn) => async (...args) => {
     process.exitCode = void 0;
@@ -20818,7 +21146,7 @@ function buildProgram() {
       process.exitCode = 1;
     }
   };
-  program2.command("symbol [name] [more...]").description("search for a symbol by name, or project-wide by --grep name pattern").option("-l, --limit <n>", "max results").option("-f, --file <path>", "restrict to one file").option("-k, --kind <kind>", "restrict to one kind (function, class, ...)").option("-p, --project [path]", "scope search to one project root instead of the global index (defaults to cwd)").option("-j, --json", "output as JSON").option("--grep <pattern>", "only show symbols whose name matches this regex (literal substring if it is not valid regex); cannot be combined with <name>").option("--exclude-tests", "hide symbols defined in a test file (opt-in; default output is unchanged)").option("--stats", "add per-result reference count and doc-coverage flag (project-wide count per NAME, not per definition site -- same-named symbols across files share a count)").action((name, more, opts) => {
+  program2.command("symbol [name] [more...]").description("search for a symbol by name, or project-wide by --grep name pattern").option("-l, --limit <n>", "max results").option("-f, --file <path>", "restrict to one file").option("-k, --kind <kind>", "restrict to one kind (function, class, ...)").option("-p, --project [path]", "scope search to one project root instead of the global index (defaults to cwd)").option("-j, --json", "output as JSON").option("--grep <pattern>", "only show symbols whose name matches this regex (literal substring if it is not valid regex); cannot be combined with <name>").option("--exclude-tests", "hide symbols defined in a test file (opt-in; default output is unchanged)").option("--exclude-vendored", "hide symbols defined under a dependency or build directory the indexer skips (node_modules, dist, site-packages, ...) (opt-in; default output is unchanged)").option("--stats", "add per-result reference count and doc-coverage flag (project-wide count per NAME, not per definition site -- same-named symbols across files share a count)").action((name, more, opts) => {
     let projectRoot;
     if (opts.project === true) {
       projectRoot = resolveProjectRoot({ project: process.cwd() });
@@ -20839,6 +21167,7 @@ function buildProgram() {
           ...opts.json === true ? { json: true } : {},
           ...opts.grep !== void 0 ? { grep: opts.grep } : {},
           ...opts.excludeTests === true ? { excludeTests: true } : {},
+          ...opts.excludeVendored === true ? { excludeVendored: true } : {},
           ...opts.stats === true ? { stats: true } : {}
         }),
         // `symbol` searches one name; there is no comma form that would search several.
@@ -20847,7 +21176,7 @@ function buildProgram() {
     );
   });
   program2.command("read <spec> [more...]").description(
-    "read one symbol's full body (spec: file::symbol; disambiguate a name shared by several classes with file::Parent.symbol; a trailing @LINE anchor -- file::symbol@LINE, or combined as file::Parent.symbol@LINE -- picks out a specific candidate by its exact starting line, for the case a Parent qualifier can't reach (e.g. a top-level definition); comma-separated file::a,b for a merged multi-symbol view, or a::x,b::y to merge symbols across several files)"
+    "read one symbol's full body (spec: file::symbol; disambiguate a name shared by several classes with file::Parent.symbol; a trailing @LINE anchor -- file::symbol@LINE, or combined as file::Parent.symbol@LINE -- picks out a specific candidate by its exact starting line, for the case a Parent qualifier can't reach (e.g. a top-level definition); comma-separated file::a,b for a merged multi-symbol view, or a::x,b::y to merge symbols across several files; file:LINE or file:START-END resolves a line number to the region enclosing it -- the symbol, the file preamble, or the gap between two symbols -- while file@START-END serves those raw lines)"
   ).option("-j, --json", "output as JSON").option("--force-refresh", "reparse file from disk before querying (ignore stale index)").option("--stats", "add per-symbol reference count and doc-coverage flag").action(
     (spec, more, opts) => runExitText(
       () => noteExtraFileArgs(
@@ -20860,7 +21189,8 @@ function buildProgram() {
           ...opts.forceRefresh === true ? { forceRefresh: true } : {},
           ...opts.stats === true ? { stats: true } : {}
         }),
-        { noun: "spec" }
+        // Whether the comma form the note names would actually run depends on the specs themselves, not on the command: `read` merges `::` specs and nothing else.
+        { noun: "spec", mergeable: readSpecsMergeable([spec, ...more]) }
       )
     )
   );
@@ -20868,7 +21198,7 @@ function buildProgram() {
     "symbol body + callers + containing doc section in one call (spec: file::symbol; also accepts the file::symbol@LINE anchor form documented under `read`; comma-separated file::a,b for a merged multi-symbol view; cross-file a.ts::x,b.ts::y is also supported)"
   ).option("-j, --json", "output as JSON").option("--limit <n>", "max callers to show (default: 20)").option("-C, --context <n>", "lines of call-site source to show before and after each caller (default 0)").option("--exclude-tests", "hide callers whose call site lives in a test file (opt-in; default output is unchanged)").option("--grep <pattern>", "only show callers whose enclosing symbol name matches this regex (literal substring if it is not valid regex)").action(
     (spec, more, opts) => runExit(() => {
-      emitExtraFileArgsNote("brief", spec, more, { noun: "spec" });
+      emitExtraFileArgsNote("brief", spec, more, { noun: "spec", mergeable: namedSpecsMergeable([spec, ...more]) });
       return runBrief({
         spec,
         ...opts.json === true ? { json: true } : {},
@@ -20886,7 +21216,7 @@ function buildProgram() {
       emitExtraFileArgsNote("section --list", spec, more, { mergeable: false });
       return runListSections({ file: spec, ...opts.json === true ? { json: true } : {}, ...opts.grep !== void 0 ? { grep: opts.grep } : {} });
     }) : runExitText(
-      () => noteExtraFileArgs("section", spec, more, () => runSection({ spec, ...opts.json === true ? { json: true } : {} }), { noun: "spec" })
+      () => noteExtraFileArgs("section", spec, more, () => runSection({ spec, ...opts.json === true ? { json: true } : {} }), { noun: "spec", mergeable: namedSpecsMergeable([spec, ...more]) })
     )
   );
   program2.command("semantic [query]").description("semantic search (falls back to full-text search)").option("-l, --limit <n>", "max results").option("-j, --json", "output as JSON").option("--grep <pattern>", "filter to hits whose file path matches this regex (literal substring if it is not valid regex); matched against the path as rendered").option("--exclude-tests", "hide hits whose file is a test file (opt-in; default output is unchanged)").option("--preflight", "run semantic embedding preflight check and exit").option("--warm", "warm up the embedding model session in memory").action(guard(cmdSemantic));
@@ -20924,7 +21254,7 @@ function buildProgram() {
     "for a high-fanout symbol, group references by file (count only) and show only the top N files by reference count instead of a per-line dump"
   ).option("-C, --context <n>", "lines of call-site source to show before and after each reference (default 0)").option("-j, --json", "output as JSON").option("--exclude-tests", "hide references whose call site lives in a test file (opt-in; default output is unchanged)").option("--grep <pattern>", "filter to references whose call-site file path matches this regex (falls back to a literal substring match when the pattern does not compile); matched against the path as rendered, so ^src/ matches what you see in every form -- drops test/vendored hits from a wide-fanout symbol").action(
     (spec, more, opts) => runExit(() => {
-      emitExtraFileArgsNote("refs", spec, more, { noun: "spec" });
+      emitExtraFileArgsNote("refs", spec, more, { noun: "spec", mergeable: namedSpecsMergeable([spec, ...more]) });
       return runRefs({
         spec,
         ...opts.callers === true ? { callers: true } : {},
@@ -20945,7 +21275,7 @@ function buildProgram() {
   program2.command("bench").description("replay a corpus of captured command output through the compressors; prints the byte savings ratio and a fidelity check, and exits 1 when a must-keep line was dropped").option("--corpus <dir>", "corpus directory (default: tests/fixtures/bench, relative to the working directory)").option("--tsv <path>", "append one result row, keyed by the current commit, creating the file and its header if absent").option("--validate", "score the corpus with control filters instead: proves the ratio has a floor and the fidelity guard can actually fail").option("-j, --json", "output as JSON").action(
     (opts) => runExitText(
       () => runBenchCommand({
-        corpus: opts.corpus ?? path43.join("tests", "fixtures", "bench"),
+        corpus: opts.corpus ?? path42.join("tests", "fixtures", "bench"),
         ...opts.tsv !== void 0 ? { tsv: opts.tsv } : {},
         ...opts.validate === true ? { validate: true } : {},
         ...opts.json === true ? { json: true } : {}
@@ -20964,7 +21294,7 @@ function buildProgram() {
   worker.command("start").description("start the background indexer").action(guard(cmdWorkerStart));
   worker.command("stop").description("stop the background indexer").action(guard(cmdWorkerStop));
   worker.command("status").description("check if the indexer is running").action(guard(cmdWorkerStatus));
-  program2.command("stats").description("show session statistics (bare = totals only; --full for the breakdown)").option("-j, --json", "output as JSON").option("--full", "show the full breakdown (by source, by command, by day)").option("--short", "force the rich short KPI view even when stdout is not a TTY (e.g. piped)").option("--methodology", "explain local savings estimates and their billing limits").option("--window-days <days>", "days to include (0 = all time)", "30").option("--home-dir <path>", "home directory (for testing)").action(guard(cmdStats));
+  program2.command("stats").description("show session statistics (bare = totals only; --full for the breakdown)").option("-j, --json", "output as JSON").option("--full", "show the full breakdown (by source, by command, by day)").option("--short", "force the rich short KPI view even when stdout is not a TTY (e.g. piped)").option("--methodology", "explain local savings estimates and their billing limits").option("--hooks", "show the per-event/per-harness hook latency breakdown (median/p95/slowest/last-seen)").option("--window-days <days>", "days to include (0 = all time)", "30").option("--home-dir <path>", "home directory (for testing)").action(guard(cmdStats));
   program2.command("doctor").description("diagnose token-goat health").option("--context", "include context footprint analysis").option("--json", "emit check results as JSON instead of text").option("--repair", "automatically repair fixable issues (permissive settings, missing semantics models)").option("--fix", "alias for --repair").action(guard(cmdDoctor));
   program2.command("bash-output [id]").description("retrieve cached bash output by ID or file").option("--head <n>", "show first N lines").option("--tail <n>", "show last N lines").option("--grep <pattern>", "filter lines matching regex").option("--max-matches <n>", "cap --grep output to the first N matching lines").option("--section <heading>", "extract a specific section from the output").option("--full", "print the entire cached entry with no head/tail elision").option("--file <path>", "read from raw output file instead of cache").option("--transcript", "parse the --file as a JSONL agent transcript: keep assistant text blocks in order before filtering").option("--verify-last-write [seconds]", "verify the file or cache entry was written within [seconds] (default: 60s) to catch stale/no-op terminal output").option("--strict", "exit non-zero when --verify-last-write detects stale output").action(guard(cmdBashOutput));
   program2.command("web-output [id]").description("retrieve a cached WebFetch response body by ID").option("--head <n>", "show first N lines").option("--tail <n>", "show last N lines").option("--grep <pattern>", "filter lines matching regex").option("--max-matches <n>", "cap --grep output to the first N matching lines").option("--section <heading>", "extract a specific section from the response").option("--full", "print the entire cached entry with no head/tail elision").option("--raw", "return the body as actually fetched, before extractCleanText cleaning, instead of the default cleaned text").action(guard(cmdWebOutput));
@@ -20979,7 +21309,7 @@ function buildProgram() {
   program2.command("compress [command...]").alias("bash").alias("run").description("run a shell command (under a POSIX shell / bash) and emit a compressed view of its output").allowUnknownOption(true).option("-c, --cmd <command>", "the shell command to run, as one string (use / for paths across platforms)").option("--cmd-b64 <payload>", "the shell command as a base64-encoded string (preserves quotes, backslashes, and symbols across platforms)").option("-f, --filter <name>", "filter name (auto-detected from the command when omitted)").option("--timeout <seconds>", "wall-clock timeout in seconds (0 = built-in default)").option("--no-compress", "stream output raw without compression (debug the wrapper)").option("--profile <name>", "compression profile: aggressive | balanced | minimal").option("--max-tokens <n>", "post-compress token cap (0 = no cap)").option("-q, --quiet-success", "on exit code 0, emit only [tg: ok] summary and store full output for recall via bash-output").option("--native", "use native platform shell (e.g. cmd.exe on Windows) instead of bash, preserving Windows path backslashes").action(cmdCompress);
   program2.command("upgrade").alias("update").description("check for updates and upgrade token-goat to the latest version").option("--check", "check whether an update is available without installing").option("-j, --json", "emit version check status as JSON").action(
     (opts) => guard(async () => {
-      const { cmdUpgrade } = await import("./token-goat-chunk-RB24DBBS.mjs");
+      const { cmdUpgrade } = await import("./token-goat-chunk-VJQBYSXG.mjs");
       await cmdUpgrade(opts, () => cmdInstall({}));
     })()
   );