token-goat 2.9.26 → 2.9.29

package/dist/{token-goat-chunk-TG5ZPD6B.mjs → token-goat-chunk-HUYUHODZ.mjs}

@@ -1,17 +1,5 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
-import {
-  compareSemver
-} from "./token-goat-chunk-BH4ZVRB2.mjs";
-import {
-  buildCopilotWasteReport,
-  findLatestCopilotSession,
-  findProjectSession,
-  isCopilotTranscript
-} from "./token-goat-chunk-PAV6NNY7.mjs";
-import {
-  buildResumePacket
-} from "./token-goat-chunk-L45IWWMC.mjs";
 import {
   ALL_SYMBOLS_IN_FILE_LIMIT,
   AMBIGUOUS_HEADING_LIMIT,
@@ -21,7 +9,7 @@ import {
   compressText,
   computeFileFingerprint,
   createHandoff,
-  didYouMean,
+  didYouMeanLines,
   emit,
   emitErr,
   enclosingSymbol,
@@ -90,6 +78,7 @@ import {
   runScreenshot,
   runSection,
   runSemantic,
+  runSemanticMulti,
   runSimilar,
   runSkeleton,
   runSqliteQuery,
@@ -104,10 +93,27 @@ import {
   runYamlQuery,
   runZipList,
   runZipRead,
+  statThroughHandle,
   symbolNamesInFile,
   upsertNote,
   warnIfFilesStale
-} from "./token-goat-chunk-RH27ZSPF.mjs";
+} from "./token-goat-chunk-NMBWLRHW.mjs";
+import "./token-goat-chunk-VZQEWRVH.mjs";
+import {
+  compareSemver
+} from "./token-goat-chunk-2NNUA2LR.mjs";
+import "./token-goat-chunk-PQ53BSCF.mjs";
+import {
+  MCP_DISABLE_NOTE,
+  buildCopilotWasteReport,
+  findLatestCopilotSession,
+  findProjectSession,
+  isCopilotTranscript,
+  unusedMcpServers
+} from "./token-goat-chunk-C5YPNZKQ.mjs";
+import {
+  buildResumePacket
+} from "./token-goat-chunk-RLP6J7WR.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
@@ -126,19 +132,9 @@ import {
   runRecallCommand,
   runReconcile,
   storeWebOutput
-} from "./token-goat-chunk-7Y6GWTII.mjs";
+} from "./token-goat-chunk-DNRPXHYH.mjs";
 import {
-  buildWasteReport,
-  extractResultText,
-  findLatestTranscript,
-  projectTranscriptsDir,
-  safeStringify
-} from "./token-goat-chunk-62IHOU6L.mjs";
-import {
-  buildManifest
-} from "./token-goat-chunk-MDV5VWF4.mjs";
-import {
-  GEMINI_TOOL_NAME_MAP,
+  HINT_CATEGORIES,
   MAX_FILES_SCANNED,
   SKIP_DIRS,
   WORKER_HEARTBEAT_STALE_MS,
@@ -153,6 +149,7 @@ import {
   compactDoc,
   compactPathFor,
   confirmAndApply,
+  dataDirWriteRefusal,
   detectWalkMode,
   dirtyQueuePathFor,
   drainHeartbeatPathFor,
@@ -170,6 +167,7 @@ import {
   formatSymbolLocation,
   getDirtyPathsFor,
   getEmbeddingCoverage,
+  getHintSpendTotals,
   getHintStatsSummary,
   getHintStatsTotals,
   getParserFreshness,
@@ -208,17 +206,32 @@ import {
   visionTokensSavedByText,
   walkProject,
   writeCompact
-} from "./token-goat-chunk-MBDJR6HU.mjs";
+} from "./token-goat-chunk-RTMVLHWX.mjs";
+import "./token-goat-chunk-L7H3U27L.mjs";
+import "./token-goat-chunk-RRNZMM3A.mjs";
+import {
+  GEMINI_TOOL_NAME_MAP
+} from "./token-goat-chunk-E5TK5DNO.mjs";
 import {
   CompressedOutput,
   TOOL_FILTERS,
   ToolFilter,
   deliverCompressed,
   detectFromCommand
-} from "./token-goat-chunk-4GEDH2WU.mjs";
+} from "./token-goat-chunk-ZER6EAXZ.mjs";
 import {
+  buildWasteReport,
+  extractResultText,
+  findLatestTranscript,
+  projectTranscriptsDir,
+  safeStringify
+} from "./token-goat-chunk-44BM7DDQ.mjs";
+import {
+  COPILOT_CLI_HOOK_SCRIPT,
   HOOKS_SCRIPT_FILE,
+  LEGACY_HOOKS_SCRIPT_FILE,
   MATERIALIZE_SHRUNK_IMAGE_JS,
+  SHIM_TRY_SERVER,
   buildGuidanceBlock,
   buildGuidanceBody,
   bundledCliPath,
@@ -253,7 +266,14 @@ import {
   visualStudioProjectMcpPath,
   visualStudioSolutionVscodeMcpPath,
   visualStudioUserMcpPath
-} from "./token-goat-chunk-VVROQBQJ.mjs";
+} from "./token-goat-chunk-EUSDXRXU.mjs";
+import {
+  buildManifest,
+  clearAll,
+  loadEntries,
+  setEntry,
+  unsetEntry
+} from "./token-goat-chunk-G7IWXCFF.mjs";
 import {
   AGENT_SALT_MARKER,
   CONTEXT_AUTOCOMPACT_TOKENS,
@@ -266,8 +286,6 @@ import {
   findLatestSessionId,
   formatAge,
   getContextPressure,
-  getSessionFiles,
-  getSessionId,
   getSkillFilePath,
   incrementSkillHit,
   listOutputs,
@@ -279,27 +297,39 @@ import {
   skillOutputsDir,
   storeCompact,
   storeOutput
-} from "./token-goat-chunk-M6CVNHTW.mjs";
+} from "./token-goat-chunk-H5J3C56Q.mjs";
+import {
+  getSessionFiles,
+  getSessionId
+} from "./token-goat-chunk-TDUT2CL6.mjs";
 import {
-  capJsonRows,
   claudeConfigDir,
-  estimateTokens,
-  estimateTokensFromLength,
   formatBytes,
-  formatTokenEstimate,
-  trimToBudget
-} from "./token-goat-chunk-G6EYO5CD.mjs";
+  formatTokenEstimate
+} from "./token-goat-chunk-ONXH6NZ5.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
-  clipLongMatchLine,
-  combineStreams,
   getBashOutput,
   isRecallCacheType
-} from "./token-goat-chunk-43JFN26X.mjs";
+} from "./token-goat-chunk-O6I2XU4P.mjs";
 import {
-  C,
   DEFAULT_MAX_AGE_MS,
   DEFAULT_MAX_COUNT,
+  listBlobs,
+  pruneBlobs
+} from "./token-goat-chunk-D4ETHJD6.mjs";
+import {
+  capJsonRows,
+  estimateTokens,
+  estimateTokensFromLength,
+  trimToBudget
+} from "./token-goat-chunk-52NSDWYY.mjs";
+import {
+  clipLongMatchLine,
+  combineStreams
+} from "./token-goat-chunk-2WOUYWLM.mjs";
+import {
+  C,
   HOOK_STATS_RETENTION_DAYS,
   RESET,
   _useRichStats,
@@ -308,8 +338,6 @@ import {
   fg,
   formatLocalTimestamp,
   getGlobalDb,
-  listBlobs,
-  pruneBlobs,
   pruneStalePatternCoveredUnmappedTools,
   readUnmappedTools,
   recordStat,
@@ -321,19 +349,28 @@ import {
   statsHasHarnessColumn,
   stripAnsiEscapes,
   summarize
-} from "./token-goat-chunk-D2X7XN5M.mjs";
+} from "./token-goat-chunk-CIQ2FTY3.mjs";
+import {
+  queryServers,
+  serverStatuses
+} from "./token-goat-chunk-RQGGMPCR.mjs";
+import {
+  readMarker,
+  touchMarker
+} from "./token-goat-chunk-DPNLUJWB.mjs";
+import "./token-goat-chunk-SE6E4BKJ.mjs";
 import {
   docxOutline,
   docxTables,
   docxText,
   formatDocxTables
-} from "./token-goat-chunk-WNBSCSAI.mjs";
+} from "./token-goat-chunk-UA5BKWWQ.mjs";
 import {
   pptxNotesText,
   pptxOutline,
   pptxSlideText,
   pptxTextGrep
-} from "./token-goat-chunk-BAWKGODL.mjs";
+} from "./token-goat-chunk-HNFZZHFW.mjs";
 import {
   formatXlsxColumns,
   formatXlsxRange,
@@ -342,11 +379,16 @@ import {
   querySheet,
   rangeSheet,
   xlsxColumns
-} from "./token-goat-chunk-STYRLQIW.mjs";
+} from "./token-goat-chunk-PYSUADX4.mjs";
 import {
   formatCsvTable,
   parseWhereSpecs
-} from "./token-goat-chunk-L43RKNHA.mjs";
+} from "./token-goat-chunk-DNSPXQXQ.mjs";
+import "./token-goat-chunk-3BTK54F3.mjs";
+import "./token-goat-chunk-UXSXQQIY.mjs";
+import "./token-goat-chunk-XTQAOTSO.mjs";
+import "./token-goat-chunk-AH6QILZM.mjs";
+import "./token-goat-chunk-PGTH2U4C.mjs";
 import {
   assetEmbedSha,
   deleteFileEmbeddings,
@@ -368,18 +410,21 @@ import {
   maxChunksEmbedSha,
   missingTreeSitterGrammarPackages,
   modelFilesPresent,
+  oversizeEmbedSha,
   parserFingerprintForLanguage,
   readSection,
   treeSitterCoreAvailable,
   treeSitterCoreLoadError
-} from "./token-goat-chunk-7EPYB34H.mjs";
+} from "./token-goat-chunk-VMFWNHGR.mjs";
 import {
   getFileEntry,
   getProjectFileEntries,
+  projectScopeClause,
   querySymbols
-} from "./token-goat-chunk-IKZLSRII.mjs";
+} from "./token-goat-chunk-435UQTKD.mjs";
 import {
   TREE_SITTER_LANGUAGES,
+  allowReadOnlyIndex,
   detectLanguage,
   detectLanguageOfFile,
   fenceFor,
@@ -388,14 +433,13 @@ import {
   matchGroovySlashy,
   nonTreeSitterLanguageCount,
   redactIfDotenv
-} from "./token-goat-chunk-7SXPJOSZ.mjs";
+} from "./token-goat-chunk-7CPMDFGB.mjs";
 import {
   CONFIG_KEY_ENV_OVERRIDES,
   PROJECT_LOCKED_KEYS,
   PROJECT_LOCKED_SECTIONS,
   SUPPORTED_OCR_LANG_CODES,
   defaultConfig,
-  envBool,
   fileIsAbsent,
   findProject,
   fingerprintContent,
@@ -404,8 +448,10 @@ import {
   getLastConfigParseError,
   getLastProjectConfigParseError,
   getProjectConfigInfo,
+  hookServerEnabled,
   invalidateConfigCache,
   isSupportedOcrLang,
+  isUnderSystemTemp,
   lastProjectConfigLockedKeys,
   loadConfig,
   loadPersistedConfig,
@@ -417,22 +463,21 @@ import {
   stringify,
   validateEnumField,
   validateNumericField
-} from "./token-goat-chunk-LRIZ7K3F.mjs";
+} from "./token-goat-chunk-TGOXNAHW.mjs";
+import "./token-goat-chunk-XB5KKOCG.mjs";
+import "./token-goat-chunk-YZAAZU2S.mjs";
+import {
+  envBool
+} from "./token-goat-chunk-IVE6U7KV.mjs";
 import {
-  ENV_KEYS,
   LOCK_WAIT_MS_HARDENED,
-  PACKAGE_NAME,
-  VERSION,
   assertProjectScopeTarget,
   assertWriteInScope,
   atomicWriteBytes,
   atomicWriteText,
   backupFile,
-  canonicalize,
   cappedSourceBytesSaved,
-  configPath,
   countNoun,
-  dataDir,
   decodeSource,
   detectSourceEncoding,
   encodeSource,
@@ -440,19 +485,16 @@ import {
   ensureNewline,
   escapeRegExp,
   extractErrorMessage,
-  foldPath,
-  globalDbPath,
+  hasCreatedConfig,
   hookCommandFor,
   hookExecPartsFor,
   installSingleFilePlugin,
   isTestFile,
   isUnderBlockedRoot,
-  isWindows,
   pad,
   projectPathIsConsultable,
   projectScopeRoot,
   pushAll,
-  quoteShellPath,
   recordCreatedConfig,
   redactUrlQuery,
   removeCreatedBackups,
@@ -460,16 +502,13 @@ import {
   removeFileInScope,
   requireNonNegativeStrictInt,
   requirePositiveStrictInt,
-  resolveOnPath,
   runGit,
-  sleepSync,
   stripDelimitedBlock,
   stripLower,
   stripOwnHooksFromMap,
   stripStaleGroupHooks,
   takeCreatedConfig,
   toKB,
-  tokenGoatHome,
   uninstallSingleFilePlugin,
   upsertDelimitedBlock,
   withExtension,
@@ -478,7 +517,15 @@ import {
   withRetryOnLock,
   writeIfDifferent,
   writeJsonSettings
-} from "./token-goat-chunk-6E2IDLHF.mjs";
+} from "./token-goat-chunk-XYWPOSCN.mjs";
+import {
+  canonicalize,
+  foldPath,
+  isWindows,
+  quoteShellPath,
+  resolveOnPath,
+  sleepSync
+} from "./token-goat-chunk-TCQANXYC.mjs";
 import {
   UNTRUSTED_FILE_TAG,
   UNTRUSTED_TOOL_TAG,
@@ -493,9 +540,19 @@ import {
   resolveIndexPath,
   toDisplayPath
 } from "./token-goat-chunk-NMTKNYGF.mjs";
+import {
+  ENV_KEYS,
+  PACKAGE_NAME,
+  VERSION,
+  configPath,
+  dataDir,
+  globalDbPath,
+  tokenGoatHome
+} from "./token-goat-chunk-MELOKFDJ.mjs";
+import "./token-goat-chunk-Y4AFKTHK.mjs";
 import {
   compileGuardedRegex
-} from "./token-goat-chunk-GMOUBOX4.mjs";
+} from "./token-goat-chunk-JTKCQMQA.mjs";
 import {
   __export,
   init_define_import_meta_env
@@ -3626,9 +3683,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * @param {string} [path]
    * @return {(string|null|Command)}
    */
-  executableDir(path42) {
-    if (path42 === void 0) return this._executableDir;
-    this._executableDir = path42;
+  executableDir(path41) {
+    if (path41 === void 0) return this._executableDir;
+    this._executableDir = path41;
     return this;
   }
   /**
@@ -3928,8 +3985,8 @@ function attemptedCommandName(argv) {
 }
 
 // src/cli.ts
-import * as fs45 from "fs";
-import * as path41 from "path";
+import * as fs44 from "fs";
+import * as path40 from "path";
 
 // src/walk_index.ts
 init_define_import_meta_env();
@@ -3991,6 +4048,18 @@ init_define_import_meta_env();
 
 // src/bridges/shim_common.ts
 init_define_import_meta_env();
+var SHIM_FILE = "token-goat-shim.cjs";
+var LEGACY_SHIM_FILE = "token-goat-shim.js";
+function legacyShimForwarder(noOp) {
+  const answer = noOp === "" ? "" : `
+  try { process.stdout.write('${noOp}') } catch {}`;
+  return `#!/usr/bin/env node
+// Forwards to token-goat-shim.cjs for hook commands wired before the shim was renamed.
+import('./token-goat-shim.cjs').catch(() => {${answer}
+  process.exitCode = 0
+});
+`;
+}
 var SHIM_REQUIRES = `const { spawnSync } = require('node:child_process')
 const path = require('node:path')
 const { pathToFileURL } = require('node:url')`;
@@ -4022,10 +4091,12 @@ var SHIM_TRY_IN_PROCESS = `// Attempts the in-process hook call: import()s dist/
 async function tryInProcess(entryPath, eventName, input, harnessWaitMs) {
   if (!entryPath) return undefined
   try {
+    const payload = JSON.parse(input)
+    const served = await tryServer(entryPath, eventName, input, harnessWaitMs)
+    if (served !== undefined) return served
     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, harnessWaitMs)
   } catch {
     return undefined
@@ -4111,6 +4182,8 @@ ${SHIM_REQUIRES}
 
 ${SHIM_VALID_HOOK_EVENTS}
 
+${SHIM_TRY_SERVER}
+
 ${SHIM_TRY_IN_PROCESS}
 
 ${SHIM_MAX_BUFFER_CONST}
@@ -4210,6 +4283,8 @@ var CANONICAL_SKILL_MD = gunzipSync(Buffer.from(CANONICAL_SKILL_GZIP_BASE64, "ba
 var HOOK_EVENT_MAP = [
   ["PreToolUse", "pre_tool_use"],
   ["PostToolUse", "post_tool_use"],
+  // A failed call never reaches PostToolUse: Claude Code 2.1.281 sends a missing-file Read and a non-zero Bash exit here instead, carrying `error`, `is_interrupt` and `duration_ms` (captured, 2026-09-24).
+  ["PostToolUseFailure", "post_tool_use_failure"],
   ["PreCompact", "pre_compact"],
   ["PostCompact", "post_compact"],
   ["UserPromptSubmit", "user_prompt_submit"],
@@ -4259,21 +4334,46 @@ function execFormSupportedForVersionOutput(stdout) {
 function expectedHookEntryFor(scriptPath, event) {
   return claudeExecFormHooksSupported() ? hookExecPartsFor(scriptPath, event) : { command: hookCommandFor(scriptPath, event) };
 }
+function realPathOrNull(p) {
+  if (!path3.isAbsolute(p)) return null;
+  try {
+    return fs3.realpathSync.native(p);
+  } catch {
+    return null;
+  }
+}
+function sameHookWord(a, b) {
+  if (a === b) return true;
+  const realA = realPathOrNull(a);
+  return realA !== null && realA === realPathOrNull(b);
+}
+function stringFormHookWords(command) {
+  const words = [];
+  for (const m of command.matchAll(/"((?:\\.|[^"\\])*)"|(\S+)/g)) {
+    const quoted = m[1];
+    words.push(quoted === void 0 ? m[2] : process.platform === "win32" ? quoted : quoted.replace(/\\(.)/g, "$1"));
+  }
+  return words;
+}
 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]);
+  const execForm = expected.args !== void 0;
+  if (!execForm && args !== void 0 && args.length > 0) return false;
+  const a = execForm ? [command, ...args ?? []] : stringFormHookWords(command);
+  const b = execForm ? [expected.command, ...expected.args] : stringFormHookWords(expected.command);
+  return a.length === b.length && a.every((v, i) => sameHookWord(v, b[i]));
 }
 function claudeHookScriptPath() {
-  return path3.join(claudeConfigDir(), "hooks", "token-goat-shim.js");
+  return path3.join(claudeConfigDir(), "hooks", SHIM_FILE);
 }
-function anyScopeReferencesShim(scriptPath, currentScope, alreadyStripped) {
+function claudeLegacyHookScriptPath() {
+  return path3.join(claudeConfigDir(), "hooks", LEGACY_SHIM_FILE);
+}
+function anyScopeReferencesShim(scriptPaths, 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) || (h.args ?? []).some((a) => a.includes(scriptPath))) return true;
+          if (scriptPaths.some((p) => h.command.includes(p) || (h.args ?? []).some((a) => a.includes(p)))) return true;
         }
       }
     }
@@ -4342,7 +4442,9 @@ function installHooksScoped(scope) {
   const scriptPath = claudeHookScriptPath();
   const scriptChanged = withInstallScope(void 0, () => {
     ensureDirSync(path3.dirname(scriptPath));
-    return writeIfDifferent(scriptPath, CLAUDECODE_HOOK_SCRIPT);
+    const forwarderChanged = writeIfDifferent(claudeLegacyHookScriptPath(), legacyShimForwarder("{}"));
+    const scriptChanged2 = writeIfDifferent(scriptPath, CLAUDECODE_HOOK_SCRIPT);
+    return scriptChanged2 || forwarderChanged;
   });
   let settingsChanged = false;
   for (const [eventKey, eventArg] of HOOK_EVENT_MAP) {
@@ -4409,8 +4511,8 @@ function uninstallHooksScoped(scope) {
   const removed = stripOwnHooksFromMap(hooks, isTokenGoatHookCommand);
   const scriptPath = claudeHookScriptPath();
   let removedScript = false;
-  if (!anyScopeReferencesShim(scriptPath, scope, hooks)) {
-    removedScript = withInstallScope(void 0, () => removeFileInScope(scriptPath));
+  if (!anyScopeReferencesShim([scriptPath, claudeLegacyHookScriptPath()], scope, hooks)) {
+    removedScript = withInstallScope(void 0, () => [scriptPath, claudeLegacyHookScriptPath()].map((p2) => removeFileInScope(p2)).some(Boolean));
   }
   if (!removed) return removedScript;
   if (Object.keys(hooks).length === 0) {
@@ -4423,16 +4525,19 @@ function uninstallHooksScoped(scope) {
   return true;
 }
 function isInstalled(scope = "user") {
-  const settings = readSettings(settingsPath(scope));
-  const hooks = settings.hooks;
-  if (hooks === void 0) return false;
+  if (!fs3.existsSync(claudeHookScriptPath())) return false;
+  const missing = missingHookEvents(scope);
+  return missing !== null && missing.length === 0;
+}
+function missingHookEvents(scope = "user") {
+  const hooks = readSettings(settingsPath(scope)).hooks;
+  if (hooks === void 0) return null;
+  if (!HOOK_EVENT_MAP.some(([eventKey]) => groupHasTokenGoat(hooks[eventKey], isTokenGoatHookCommand))) return null;
   const scriptPath = claudeHookScriptPath();
-  if (!fs3.existsSync(scriptPath)) return false;
-  for (const [eventKey, eventArg] of HOOK_EVENT_MAP) {
+  return HOOK_EVENT_MAP.filter(([eventKey, eventArg]) => {
     const expected = expectedHookEntryFor(scriptPath, eventArg);
-    if (!groupHasTokenGoat(hooks[eventKey], (c, a) => hookEntryMatches(c, a, expected))) return false;
-  }
-  return true;
+    return !groupHasTokenGoat(hooks[eventKey], (c, a) => hookEntryMatches(c, a, expected));
+  }).map(([eventKey]) => eventKey);
 }
 var CLAUDE_MD_BEGIN = "<!-- token-goat-begin -->";
 var CLAUDE_MD_END = "<!-- token-goat-end -->";
@@ -4586,6 +4691,8 @@ function stripTg(value) {
   return value
 }
 
+${SHIM_TRY_SERVER}
+
 ${SHIM_TRY_IN_PROCESS}
 
 ${SHIM_MAX_BUFFER_CONST}
@@ -4705,7 +4812,10 @@ function codexAgentsPath() {
   return path4.join(os2.homedir(), ".codex", "AGENTS.md");
 }
 function codexHookScriptPath() {
-  return path4.join(os2.homedir(), ".codex", "hooks", "token-goat-shim.js");
+  return path4.join(os2.homedir(), ".codex", "hooks", SHIM_FILE);
+}
+function codexLegacyHookScriptPath() {
+  return path4.join(os2.homedir(), ".codex", "hooks", LEGACY_SHIM_FILE);
 }
 function readCodexConfig(p, opts = {}) {
   let raw;
@@ -4762,6 +4872,7 @@ function installCodex() {
   const scriptPath = codexHookScriptPath();
   ensureDirSync(path4.dirname(scriptPath));
   atomicWriteText(scriptPath, CODEX_HOOK_SCRIPT);
+  atomicWriteText(codexLegacyHookScriptPath(), legacyShimForwarder("{}"));
   const config = readCodexConfig(configPath2, { strict: true });
   const hooks = config.hooks ?? {};
   let hooksChanged = false;
@@ -4915,10 +5026,12 @@ function uninstallCodex() {
   if (stripAgentsBlock(agentsPath)) {
     removedAny = true;
   }
-  try {
-    fs4.unlinkSync(scriptPath);
-    removedAny = true;
-  } catch {
+  for (const p of [scriptPath, codexLegacyHookScriptPath()]) {
+    try {
+      fs4.unlinkSync(p);
+      removedAny = true;
+    } catch {
+    }
   }
   removeCreatedBackups(configPath2);
   return removedAny;
@@ -5296,6 +5409,8 @@ function toKimi(parsed) {
   return ''
 }
 
+${SHIM_TRY_SERVER}
+
 ${SHIM_TRY_IN_PROCESS}
 
 ${SHIM_MAX_BUFFER_CONST}
@@ -5369,7 +5484,10 @@ function kimiAgentsPath() {
   return path7.join(kimiHome(), "AGENTS.md");
 }
 function kimiHookScriptPath() {
-  return path7.join(kimiHome(), "hooks", "token-goat-shim.js");
+  return path7.join(kimiHome(), "hooks", SHIM_FILE);
+}
+function kimiLegacyHookScriptPath() {
+  return path7.join(kimiHome(), "hooks", LEGACY_SHIM_FILE);
 }
 function kimiSkillDir() {
   return path7.join(kimiHome(), "skills", "token-goat");
@@ -5439,6 +5557,7 @@ function installKimi() {
   const scriptPath = kimiHookScriptPath();
   ensureDirSync(path7.dirname(scriptPath));
   atomicWriteText(scriptPath, KIMI_HOOK_SCRIPT);
+  atomicWriteText(kimiLegacyHookScriptPath(), legacyShimForwarder(""));
   const config = readKimiConfig(configPath2, { strict: true });
   const existing = Array.isArray(config.hooks) ? config.hooks : [];
   const desired = KIMI_HOOK_EVENTS.map((event) => ({
@@ -5490,12 +5609,14 @@ function uninstallKimi() {
     }
   } catch {
   }
-  try {
-    if (fs7.existsSync(kimiHookScriptPath())) {
-      fs7.rmSync(kimiHookScriptPath(), { force: true });
-      removed = true;
+  for (const p of [kimiHookScriptPath(), kimiLegacyHookScriptPath()]) {
+    try {
+      if (fs7.existsSync(p)) {
+        fs7.rmSync(p, { force: true });
+        removed = true;
+      }
+    } catch {
     }
-  } catch {
   }
   removeCreatedBackups(configPath2);
   return removed;
@@ -5589,7 +5710,7 @@ function resolveEntryPath(): string | undefined {
 // undefined (triggering the spawnSync fallback below) when entryPath is absent, the
 // sibling file doesn't exist (an install predating this file), or anything else goes
 // wrong -- this must never throw.
-type RelayInProcessFn = (event: string, payload: unknown) => Promise<string>;
+type RelayInProcessFn = (event: string, payload: unknown, harnessWaitMs?: number, opts?: { elapsedMs?: () => number }) => Promise<string>;
 let cachedRelayInProcess: RelayInProcessFn | undefined;
 async function resolveRelayInProcess(): Promise<RelayInProcessFn | undefined> {
   if (cachedRelayInProcess) return cachedRelayInProcess;
@@ -5657,11 +5778,13 @@ function callHookViaSpawn(event: string, payload: Record<string, unknown>): Reco
 // its own fail-open null rather than being force-killed by pi's own hook timeout
 // budget, ~5000ms) when the in-process path is unavailable or throws.
 async function callHook(event: string, payload: Record<string, unknown>): Promise<Record<string, unknown> | null> {
+  // Timed from here, not from process start: this host lives far longer than one call, so the hook library's default clock (process age) would record the host's uptime as this call's duration.
+  const start = performance.now();
   const relay = await resolveRelayInProcess();
   if (relay) {
     try {
       process.env.TOKEN_GOAT_HARNESS_OVERRIDE = "pi";
-      const out = await relay(event, payload);
+      const out = await relay(event, payload, undefined, { elapsedMs: () => performance.now() - start });
       const trimmed = out?.trim();
       if (!trimmed) return null;
       return JSON.parse(trimmed) as Record<string, unknown>;
@@ -6023,10 +6146,12 @@ function callHookViaSpawn(event, payload) {
 // its own fail-open null rather than being force-killed by the host's own hook timeout
 // budget, ~5000ms) when the in-process path is unavailable or throws.
 async function callHook(event, payload) {
+  // Timed from here, not from process start: this host lives far longer than one call, so the hook library's default clock (process age) would record the host's uptime as this call's duration.
+  const start = performance.now();
   const relay = await resolveRelayInProcess();
   if (relay) {
     try {
-      const out = await relay(event, payload);
+      const out = await relay(event, payload, undefined, { elapsedMs: () => performance.now() - start });
       const trimmed = out ? out.trim() : "";
       if (!trimmed) return null;
       return JSON.parse(trimmed);
@@ -6556,6 +6681,8 @@ function allowResponse(eventName) {
   return eventName === 'pre_tool_use' ? '{"decision":"allow"}' : '{}'
 }
 
+${SHIM_TRY_SERVER}
+
 ${SHIM_TRY_IN_PROCESS}
 
 ${SHIM_MAX_BUFFER_CONST}
@@ -6649,7 +6776,10 @@ function grokConfigPath() {
   return path11.join(grokHooksDir(), "token-goat.json");
 }
 function grokHookScriptPath() {
-  return path11.join(grokHooksDir(), "token-goat-shim.js");
+  return path11.join(grokHooksDir(), SHIM_FILE);
+}
+function grokLegacyHookScriptPath() {
+  return path11.join(grokHooksDir(), LEGACY_SHIM_FILE);
 }
 function buildConfig(scriptPath) {
   const hooks = {};
@@ -6663,11 +6793,12 @@ function buildConfig(scriptPath) {
 function installGrok() {
   const configPath2 = grokConfigPath();
   const scriptPath = grokHookScriptPath();
+  const forwarderChanged = writeIfDifferent(grokLegacyHookScriptPath(), legacyShimForwarder("{}"));
   const scriptChanged = writeIfDifferent(scriptPath, GROK_HOOK_SCRIPT);
   const desiredText = `${JSON.stringify(buildConfig(scriptPath), null, 2)}
 `;
   const configChanged = writeIfDifferent(configPath2, desiredText, true);
-  return { configPath: configPath2, hookScriptPath: scriptPath, alreadyInstalled: !scriptChanged && !configChanged };
+  return { configPath: configPath2, hookScriptPath: scriptPath, alreadyInstalled: !scriptChanged && !forwarderChanged && !configChanged };
 }
 function uninstallGrok() {
   const configPath2 = grokConfigPath();
@@ -6678,10 +6809,12 @@ function uninstallGrok() {
     removedAny = true;
   } catch {
   }
-  try {
-    fs11.unlinkSync(scriptPath);
-    removedAny = true;
-  } catch {
+  for (const p of [scriptPath, grokLegacyHookScriptPath()]) {
+    try {
+      fs11.unlinkSync(p);
+      removedAny = true;
+    } catch {
+    }
   }
   removeCreatedBackups(configPath2);
   return removedAny;
@@ -7169,6 +7302,9 @@ init_define_import_meta_env();
 import { spawnSync as spawnSync2 } from "node:child_process";
 import * as fs15 from "node:fs";
 import * as path15 from "node:path";
+var ProcessListTimeout = class extends Error {
+};
+var PROCESS_LIST_TIMEOUT_MS = 2e4;
 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)) {
@@ -7179,11 +7315,14 @@ function describeProcess(commandLine) {
   return trimmed.length > 0 ? trimmed.length > 60 ? trimmed.slice(0, 60) + "\u2026" : trimmed : "(no command line)";
 }
 function checkMcpProcessHealth(processes) {
-  if (processes === null) {
+  if (!Array.isArray(processes)) {
+    const failure = processes;
+    const query = `Get-CimInstance Win32_Process -Filter "Name='node.exe'" | Select-Object ProcessId,ParentProcessId,CommandLine`;
+    const advice = failure.transient === true ? `Run doctor again once the machine is less busy, or list them yourself with: ${query}` : `List them yourself with: ${query}`;
     return {
       name: "MCP process health",
       status: "warn",
-      message: "could not read the process list (PowerShell did not answer), so duplicate MCP launchers and orphaned Node processes were not checked"
+      message: `could not read the process list (${displaySafeText(failure.reason)}), so duplicate MCP launchers and orphaned Node processes were not checked. ${advice}`
     };
   }
   const byPid = new Set(processes.map((process3) => process3.processId));
@@ -7216,19 +7355,37 @@ function runProcessListCommand() {
   const shell = path15.join(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
   const result = spawnSync2(fs15.existsSync(shell) ? shell : "powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
     encoding: "utf8",
-    timeout: 2e4,
+    timeout: PROCESS_LIST_TIMEOUT_MS,
     maxBuffer: 10 * 1024 * 1024,
     windowsHide: true
   });
-  if (result.error !== void 0) throw result.error;
-  return result.stdout ?? "";
+  return processListOutput(result);
+}
+function processListOutput(result) {
+  if (result.error !== void 0) {
+    const code = result.error.code;
+    if (code === "ETIMEDOUT") throw new ProcessListTimeout(`PowerShell did not finish within ${PROCESS_LIST_TIMEOUT_MS / 1e3}s`);
+    if (code === "ENOENT") throw new Error("powershell.exe was not found");
+    throw result.error;
+  }
+  const stdout = result.stdout ?? "";
+  if (result.status !== 0 && stdout.trim() === "") {
+    const firstLine2 = (result.stderr ?? "").split(/\r?\n/).map((line) => line.trim()).find((line) => line !== "");
+    throw new Error(`PowerShell exited with code ${String(result.status)}${firstLine2 !== void 0 ? `: ${firstLine2}` : ""}`);
+  }
+  return stdout;
 }
 function readWindowsProcesses(runCommand = runProcessListCommand) {
   if (process.platform !== "win32") return [];
   try {
     const output = runCommand().trim();
     if (output === "") return [];
-    const parsed = JSON.parse(output);
+    let parsed;
+    try {
+      parsed = JSON.parse(output);
+    } catch {
+      return { reason: "PowerShell printed something other than the JSON process list" };
+    }
     const rows = Array.isArray(parsed) ? parsed : [parsed];
     return rows.flatMap((row) => {
       if (typeof row !== "object" || row === null) return [];
@@ -7241,8 +7398,9 @@ function readWindowsProcesses(runCommand = runProcessListCommand) {
         commandLine: typeof value["CommandLine"] === "string" ? value["CommandLine"] : ""
       }];
     });
-  } catch {
-    return null;
+  } catch (e) {
+    const reason = e instanceof Error ? e.message : String(e);
+    return e instanceof ProcessListTimeout ? { reason, transient: true } : { reason };
   }
 }
 function checkWorkerRunning(dataDir2) {
@@ -7329,6 +7487,15 @@ function checkVscodeClaudeHooks(useClaudeHooks, claudeHooksInstalled, vscodeHook
     message: vscodeHooksInstalled2 ? "VS Code has chat.useClaudeHooks on and token-goat hooks are in both ~/.claude/settings.json and the Copilot hooks file, so each hook fires twice in VS Code. Turn chat.useClaudeHooks off in VS Code settings." : 'VS Code has chat.useClaudeHooks on, so it runs the token-goat hooks from ~/.claude/settings.json in Claude Code wire format, which VS Code reads only in part. Run "token-goat install --vscode" and turn chat.useClaudeHooks off in VS Code settings.'
   };
 }
+function checkClaudeHookEvents(missing) {
+  const name = "Claude Code hook events";
+  if (missing.user === null && missing.project === null) return null;
+  const gaps = [];
+  if (missing.user !== null && missing.user.length > 0) gaps.push(`user scope lacks ${missing.user.join(", ")}; run: token-goat install`);
+  if (missing.project !== null && missing.project.length > 0) gaps.push(`project scope lacks ${missing.project.join(", ")}; run: token-goat install --project`);
+  if (gaps.length === 0) return { name, status: "ok", message: "every event this build handles is wired" };
+  return { name, status: "warn", message: `${gaps.join(". ")}. Those events never reach token-goat until then; restart any running session afterwards.` };
+}
 function dedupeByResolvedPath(paths) {
   const seen = /* @__PURE__ */ new Set();
   return paths.filter((p) => {
@@ -7565,35 +7732,31 @@ function freelistBytes(header) {
   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 STORAGE_GROUPS = [
+  { name: "refs", owns: /^refs$/, command: "grows with the files indexed, so it shrinks only when files leave the index" },
+  { name: "symbols and their search index", owns: /^symbols(_fts\w*)?$/, command: "grows with the files indexed, so it shrinks only when files leave the index" },
+  {
+    name: "embeddings",
+    owns: /^(chunks|chunk_vectors\w*)$/,
+    command: "these back 'semantic'; to drop them, set indexing.embeddings_enabled = false and indexing.auto_reclaim_embeddings = true, then run 'token-goat doctor --repair'"
+  },
+  { name: "usage stats", owns: /^(stats\w*|hint_\w+|unmapped_tools)$/, command: "ages out on its own (180-day retention)" },
+  { name: "recall cache", owns: /^cache_recall\w*$/, command: "ages out on its own" }
 ];
-var VECTOR_BYTES_PER_ROW = 384 * 4;
+var OWNER_BYTES_SQL = `SELECT COALESCE(m.tbl_name, s.name) AS owner, SUM(s.pgsize) AS bytes FROM dbstat AS s LEFT JOIN sqlite_master AS m ON m.name = s.name WHERE s.aggregate = 1 GROUP BY owner`;
 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 {
-    }
-  }
+  let rows;
   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)"
-      });
-    }
+    rows = getDb(dbPath).prepare(OWNER_BYTES_SQL).all();
   } catch {
+    return [];
   }
-  return shares.sort((a, b) => b.bytes - a.bytes);
+  const shares = STORAGE_GROUPS.map((group) => ({
+    name: group.name,
+    bytes: rows.filter((r) => group.owns.test(r.owner)).reduce((sum, r) => sum + r.bytes, 0),
+    command: group.command
+  }));
+  return shares.filter((share) => share.bytes > 0).sort((a, b) => b.bytes - a.bytes);
 }
 function oversizeDbMessage(dbPath, sizeBytes, freeBytes, tempRows, categories = [], topConsumers = [], thresholdMb = 1500, autoReclaimEmbeddings = false) {
   const mb = (bytes) => Math.round(bytes / (1024 * 1024));
@@ -7604,15 +7767,18 @@ function oversizeDbMessage(dbPath, sizeBytes, freeBytes, tempRows, categories =
     advice.push(`'token-goat doctor --repair' will automatically reclaim embedding vectors and compact global.db`);
   }
   const head = `global.db is ${mb(sizeBytes)} MB at ${displaySafeText(dbPath)} (larger than threshold of ${thresholdMb} MB). `;
-  const totalCategoryBytes = categories.reduce((sum, c) => sum + c.bytes, 0);
+  const listed = categories.slice(0, 3);
+  const totalCategoryBytes = listed.reduce((sum, c) => sum + c.bytes, 0);
   const unmeasuredBytes = sizeBytes - totalCategoryBytes;
-  const breakdown = totalCategoryBytes > 0 && sizeBytes > 0 ? ` Where it went: ${categories.slice(0, 3).map((c) => `${c.name} ${mb(c.bytes)} MB (${Math.round(c.bytes / sizeBytes * 100)}%) -- ${c.command}`).join("; ")}.${unmeasuredBytes >= sizeBytes / 20 ? ` The other ${mb(unmeasuredBytes)} MB is row overhead and indexes, which these commands do not measure.` : ""}` : "";
+  const breakdown = totalCategoryBytes > 0 && sizeBytes > 0 ? ` Where it went: ${listed.map((c) => `${c.name} ${mb(c.bytes)} MB (${Math.round(c.bytes / sizeBytes * 100)}%) -- ${c.command}`).join("; ")}.${unmeasuredBytes >= sizeBytes / 20 ? ` The other ${mb(unmeasuredBytes)} MB is smaller tables and free pages.` : ""}` : "";
   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 [top] = topConsumers;
+  if (top !== void 0) {
     const list = topConsumers.map((c) => `${path17.basename(c.root) || c.root} (${countNoun(c.fileCount, "file")})`).join(", ");
     base += ` Top index consumers: ${list}.`;
+    base += ` To shrink it, take out a project you do not need surgical reads in: 'token-goat project exclude "${displaySafeText(top.root)}"' removes its rows, then 'token-goat reclaim-index' returns the space.`;
   }
-  return base;
+  return `${base} If this size is expected, raise indexing.max_db_size_mb above ${Math.ceil(sizeBytes / (1024 * 1024))}.`;
 }
 function checkDbExists(dataDir2, maxDbSizeMb) {
   const dbPath = path17.join(dataDir2, "global.db");
@@ -7716,6 +7882,29 @@ function checkSymbolCount(dbPath, rootDir) {
   }
 }
 var EMBED_COVERAGE_WARN_FRACTION = 0.25;
+function unembeddedReasons(dbPath, rootDir, symbolOnlyKb, maxChunks) {
+  const db = getDb(dbPath);
+  const scope = rootDir === void 0 ? null : projectScopeClause("path");
+  const rows = db.prepare(`SELECT path, sha, embed_sha FROM files${scope === null ? "" : ` WHERE ${scope.clause}`}`).all(...scope === null || rootDir === void 0 ? [] : scope.params(rootDir));
+  let owed = 0;
+  let overSizeCap = 0;
+  for (const row of rows) {
+    if (isUnderSystemTemp(row.path)) continue;
+    if (row.embed_sha === oversizeEmbedSha(row.sha, symbolOnlyKb)) overSizeCap += 1;
+    else if (!isEmbedFresh(row.embed_sha ?? void 0, row.sha, true, true, symbolOnlyKb, maxChunks)) owed += 1;
+  }
+  return { owed, overSizeCap };
+}
+function unembeddedReasonText(reasons, sizeKb) {
+  let text = "";
+  if (reasons.owed > 0) {
+    text += ` ${countNoun(reasons.owed, "file")} ${reasons.owed === 1 ? "is" : "are"} still owed an embed: the worker embeds them while it is idle, or run 'token-goat index' in the project to embed them now.`;
+  }
+  if (reasons.overSizeCap > 0) {
+    text += ` ${countNoun(reasons.overSizeCap, "file")} ${reasons.overSizeCap === 1 ? "is" : "are"} over indexing.large_file_symbol_only_kb (currently ${sizeKb} KB) and indexed for symbols only; raise it with 'token-goat config set indexing.large_file_symbol_only_kb <KB>' and the next 'token-goat index' embeds them.`;
+  }
+  return text;
+}
 function checkEmbeddingCoverage(dbPath, rootDir) {
   if (!fs18.existsSync(dbPath)) {
     return { name: "Embedding coverage", status: "ok", message: "no database yet" };
@@ -7735,7 +7924,7 @@ function checkEmbeddingCoverage(dbPath, rootDir) {
       return {
         name: "Embedding coverage",
         status: "warn",
-        message: `only ${embeddedFiles} of ${indexedFiles} indexed file(s) (${pct3}%) have embeddings \u2014 'semantic' searches those files only, and reports finding nothing in the same words it uses after searching everything. Files over indexing.large_file_symbol_only_kb (currently ${sizeKb} KB) are indexed for symbols only and are the usual reason; raise it with 'token-goat config set indexing.large_file_symbol_only_kb <KB>' and re-embed with 'token-goat index --force' to widen coverage. Exact symbol lookups are unaffected`
+        message: `only ${embeddedFiles} of ${indexedFiles} indexed file(s) (${pct3}%) have embeddings, so 'semantic' searches those files only, and reports finding nothing in the same words it uses after searching everything.` + unembeddedReasonText(unembeddedReasons(dbPath, rootDir, sizeKb, cfg.indexing.max_chunks_per_file), sizeKb) + ` Exact symbol lookups are unaffected`
       };
     }
     return {
@@ -7989,16 +8178,33 @@ function checkDiskSpace(dataDir2) {
   }
   return { name: "Disk Space", status: "warn", message: "disk space check unavailable on this platform" };
 }
-function checkCopilotCli(configPath2, scriptPath) {
-  if (!fs18.existsSync(configPath2) || !fs18.existsSync(scriptPath)) {
+function checkCopilotCli(configPath2, scriptPath, scope = "user") {
+  if (!fs18.existsSync(configPath2)) {
     return null;
   }
+  const name = scope === "project" ? "Copilot CLI (project)" : "Copilot CLI";
+  const { install, harness } = copilotHooksRecovery(path17.dirname(configPath2), scope);
+  if (scope === "project" && !hasCreatedConfig(configPath2)) {
+    return {
+      name,
+      status: "warn",
+      message: `hook config at ${configPath2} was not written by token-goat on this machine, so doctor does not run the command it names. If these hooks are yours, run "${install}" to rewrite them here.`
+    };
+  }
+  if (!fs18.existsSync(scriptPath)) {
+    if (!fs18.existsSync(path17.join(path17.dirname(scriptPath), LEGACY_HOOKS_SCRIPT_FILE))) return null;
+    return {
+      name,
+      status: "warn",
+      message: `hooks at ${path17.dirname(scriptPath)} still run ${LEGACY_HOOKS_SCRIPT_FILE} from an older token-goat build, which Node loads as an ES module under any package.json that says "type": "module" and then fails every tool call. Recovery: run "${install}", then fully restart ${harness}.`
+    };
+  }
   let config;
   try {
     config = JSON.parse(fs18.readFileSync(configPath2, "utf-8"));
   } catch (err2) {
     return {
-      name: "Copilot CLI",
+      name,
       status: "fail",
       message: `hook config at ${configPath2} is not valid JSON: ${extractErrorMessage(err2, "unknown error")}`
     };
@@ -8006,17 +8212,17 @@ function checkCopilotCli(configPath2, scriptPath) {
   const preToolUseCommand = config.hooks?.["preToolUse"]?.[0]?.command;
   if (typeof preToolUseCommand !== "string" || preToolUseCommand === "") {
     return {
-      name: "Copilot CLI",
+      name,
       status: "fail",
-      message: `hook config at ${configPath2} has no preToolUse entry; run: token-goat install --copilot`
+      message: `hook config at ${configPath2} has no preToolUse entry; run: ${install}`
     };
   }
   const bakedExecPath = /^"([^"]+)"/.exec(preToolUseCommand)?.[1];
   if (bakedExecPath !== void 0 && !fs18.existsSync(bakedExecPath)) {
     return {
-      name: "Copilot CLI",
+      name,
       status: "fail",
-      message: `hook points at a node binary that no longer exists (${bakedExecPath}) -- likely stale after an nvm/fnm/volta node upgrade. Recovery: run "token-goat install --copilot", then fully restart Copilot CLI (renaming/reinstalling the hook has no effect on an already-running session -- Copilot caches hook configs at startup).`
+      message: `hook points at a node binary that no longer exists (${bakedExecPath}) -- likely stale after an nvm/fnm/volta node upgrade. Recovery: run "${install}", then fully restart ${harness} (renaming/reinstalling the hook has no effect on an already-running session -- hook configs are cached at startup).`
     };
   }
   const synthetic = JSON.stringify({
@@ -8034,28 +8240,56 @@ function checkCopilotCli(configPath2, scriptPath) {
   });
   if (res.error) {
     return {
-      name: "Copilot CLI",
+      name,
       status: "fail",
-      message: `hook failed to launch: ${extractErrorMessage(res.error, "unknown error")}. Recovery: run "token-goat install --copilot", then fully restart Copilot CLI.`
+      message: `hook failed to launch: ${extractErrorMessage(res.error, "unknown error")}. Recovery: run "${install}", then fully restart ${harness}.`
     };
   }
   if (res.status !== 0) {
     return {
-      name: "Copilot CLI",
+      name,
       status: "fail",
-      message: `hook exited with status ${res.status} -- Copilot's preToolUse fails closed on a non-zero exit and denies every tool call for the rest of the session. Recovery: run "token-goat install --copilot", then fully restart Copilot CLI (a live session won't pick up the fix).`
+      message: `hook exited with status ${res.status} -- Copilot's preToolUse fails closed on a non-zero exit and denies every tool call for the rest of the session. Recovery: run "${install}", then fully restart ${harness} (a live session won't pick up the fix).`
     };
   }
   try {
     JSON.parse(res.stdout ?? "");
   } catch {
     return {
-      name: "Copilot CLI",
+      name,
       status: "fail",
-      message: 'hook did not return valid JSON -- Copilot treats this as a hook error and denies every tool call. Recovery: run "token-goat install --copilot", then fully restart Copilot CLI.'
+      message: `hook did not return valid JSON -- Copilot treats this as a hook error and denies every tool call. Recovery: run "${install}", then fully restart ${harness}.`
+    };
+  }
+  if (!shimIsCurrent(scriptPath, COPILOT_CLI_HOOK_SCRIPT)) {
+    return { name, status: "warn", message: staleShimMessage(scriptPath, "Copilot", install) + `, then fully restart ${harness}.` };
+  }
+  return { name, status: "ok", message: "preToolUse hook invokes cleanly and returns valid JSON" };
+}
+function copilotHooksRecovery(hooksDir, scope) {
+  const owners = readCopilotHooksOwners(hooksDir);
+  if (!owners.has("copilot") && owners.has("vscode")) {
+    return { install: scope === "project" ? "token-goat install --vscode" : "token-goat install --vscode --user", harness: "VS Code" };
+  }
+  return { install: scope === "project" ? "token-goat install --copilot --local" : "token-goat install --copilot", harness: "Copilot CLI" };
+}
+function shimIsCurrent(scriptPath, expected) {
+  return fs18.readFileSync(scriptPath, "utf-8").replace(/\r\n/g, "\n") === expected.replace(/\r\n/g, "\n");
+}
+function staleShimMessage(scriptPath, harness, reinstall) {
+  return `hook shim at ${scriptPath} was written by an older token-goat build, so fixes to it since then are not reaching ${harness}. Recovery: run "${reinstall}"`;
+}
+function checkHookShim(name, scriptPath, expected, reinstall) {
+  if (!fs18.existsSync(scriptPath)) {
+    if (!fs18.existsSync(path17.join(path17.dirname(scriptPath), LEGACY_SHIM_FILE))) return null;
+    return {
+      name,
+      status: "warn",
+      message: `hooks at ${path17.dirname(scriptPath)} still run ${LEGACY_SHIM_FILE} from an older token-goat build, which Node loads as an ES module under any package.json that says "type": "module" and then fails every tool call. Recovery: run "${reinstall}", then restart any running session.`
     };
   }
-  return { name: "Copilot CLI", status: "ok", message: "preToolUse hook invokes cleanly and returns valid JSON" };
+  if (shimIsCurrent(scriptPath, expected)) return { name, status: "ok", message: `hook shim at ${scriptPath} matches this build` };
+  return { name, status: "warn", message: staleShimMessage(scriptPath, name, reinstall) + ", then restart any running session." };
 }
 var COMPACTION_CHANNEL_WINDOW = 5;
 var COMPACTION_STATS_BATCH_SIZE = 50;
@@ -8192,6 +8426,28 @@ function checkUnmappedTools(dbPath, options) {
     return { name, status: "warn", message: `could not read the tool-name histogram: ${extractErrorMessage(e)}` };
   }
 }
+function checkWorker(dir) {
+  if (checkWorkerRunning(dir)) return { name: "Worker", status: "ok", message: "running" };
+  const refusal2 = fs18.existsSync(dir) ? dataDirWriteRefusal(dir) : void 0;
+  if (refusal2 !== void 0) {
+    return { name: "Worker", status: "fail", message: `not running, and cannot start: ${displaySafeText(dir)} cannot be written (${displaySafeText(extractErrorMessage(refusal2))}); make it writable, then run 'token-goat worker start'` };
+  }
+  return { name: "Worker", status: "warn", message: "not running" };
+}
+function checkHookServer(state) {
+  const name = "Hook server";
+  if (!state.enabled) return { name, status: "ok", message: "off (hooks.server or TOKEN_GOAT_HOOK_SERVER); every hook call starts its own process" };
+  if (state.statuses.length > 0) return { name, status: "ok", message: `${state.statuses.length} running (${state.statuses.map((s) => `slot ${s.slot}, pid ${s.pid}, ${s.served} served`).join("; ")})` };
+  if (state.failure !== void 0) return { name, status: "warn", message: `not running, and the last start failed: ${state.failure}. Run 'token-goat hook-server run' to see it in the foreground` };
+  return { name, status: "ok", message: "not running; the next hook call starts one" };
+}
+async function runDoctorChecks(dataDir2, configPath2, rootDir, processes) {
+  const results = runDoctor(dataDir2, configPath2, rootDir, processes);
+  const enabled = hookServerEnabled();
+  const dir = dataDir2 || dataDir();
+  results.push(checkHookServer({ enabled, statuses: enabled ? await serverStatuses(dir) : [], failure: readMarker("failed", dir) }));
+  return results;
+}
 function runDoctor(dataDir2, configPath2, rootDir, processes) {
   const results = [];
   const actualDataDir = dataDir2 || dataDir();
@@ -8199,7 +8455,7 @@ function runDoctor(dataDir2, configPath2, rootDir, processes) {
   results.push(checkTsCompiler());
   results.push(checkTreeSitter());
   results.push(checkStrayClaudeMdBlocks());
-  results.push(checkWorkerRunning(actualDataDir) ? { name: "Worker", status: "ok", message: "running" } : { name: "Worker", status: "warn", message: "not running" });
+  results.push(checkWorker(actualDataDir));
   const cfg = loadConfig(rootDir);
   results.push(checkDbExists(actualDataDir, cfg.indexing.max_db_size_mb));
   results.push(checkSymbolBodySize(path17.join(actualDataDir, "global.db")));
@@ -8218,6 +8474,14 @@ function runDoctor(dataDir2, configPath2, rootDir, processes) {
   results.push(checkDiskSpace(actualDataDir));
   const copilotResult = checkCopilotCli(copilotCliConfigPath(), copilotCliScriptPath());
   if (copilotResult) results.push(copilotResult);
+  const copilotProjectResult = checkCopilotCli(copilotCliConfigPath({ local: true }), copilotCliScriptPath({ local: true }), "project");
+  if (copilotProjectResult) results.push(copilotProjectResult);
+  const claudeShimResult = checkHookShim("Claude Code", claudeHookScriptPath(), CLAUDECODE_HOOK_SCRIPT, isInstalled("user") || !isInstalled("project") ? "token-goat install" : "token-goat install --project");
+  if (claudeShimResult) results.push(claudeShimResult);
+  const claudeEventsResult = checkClaudeHookEvents({ user: missingHookEvents("user"), project: missingHookEvents("project") });
+  if (claudeEventsResult) results.push(claudeEventsResult);
+  const codexShimResult = checkHookShim("Codex", codexHookScriptPath(), CODEX_HOOK_SCRIPT, "token-goat install --codex");
+  if (codexShimResult) results.push(codexShimResult);
   const vscodeHooksResult = checkVscodeClaudeHooks(
     vscodeUsesClaudeHooks(),
     isInstalled("user") || isInstalled("project"),
@@ -8432,7 +8696,7 @@ async function runDoctorAndExit(opts) {
       console.log();
     }
   }
-  const results = runDoctor(options.dataDir, options.configPath, options.rootDir, options.processes);
+  const results = await runDoctorChecks(options.dataDir, options.configPath, options.rootDir, options.processes);
   printDoctorResults(results);
   if (options.context === true) {
     console.log("\n## Context footprint\n");
@@ -8470,7 +8734,7 @@ async function runDoctorAndExit(opts) {
     }
   }
   try {
-    const { checkUpdateStatus } = await import("./token-goat-chunk-CQHY4SL7.mjs");
+    const { checkUpdateStatus } = await import("./token-goat-chunk-YAGLESS3.mjs");
     const update = await checkUpdateStatus(1500);
     if (update.updateAvailable && update.latest) {
       console.log(`
@@ -8566,7 +8830,7 @@ function generateCompactHelp() {
     "  -h, --help                      display help for command",
     "",
     "Reads: symbol, read, brief, section, semantic, skeleton, outline, refs, scope,",
-    "  similar, context-for, call-chain, impact, callers, dead, test-for",
+    "  similar, context-for, call-chain, impact, callers, dead, test-for, locate",
     "",
     "Analysis: arch, affected, blame, deps, types, coverage-gaps, changed, diff, log,",
     "  exports, imports, find, grep",
@@ -8579,30 +8843,29 @@ function generateCompactHelp() {
     "",
     "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,",
+    "  baseline, cost, coverage-report-gaps, clean-cache,",
     "  cache-audit, reclaim-index, project",
     "",
     "Session: stats, waste, session-outline, session-audit, session-slice,",
     "  session-summary, context-stats, bootstrap-audit, memory, hint-stats,",
-    "  session-schema, mcp-audit",
+    "  session-schema, mcp-audit, audit",
     "",
     "Skills: skill-body, skill-compact, skill-list, skill-size, skill-history,",
     "  skill-diff, skill-section",
     "",
     "Compression: compress-text, retrieve, handoff-create, handoff-resolve,",
-    "  compress, recall, bash-output, web-output, mcp-output, compress-text,",
-    "  compress, bench",
+    "  compress, recall, bash-output, web-output, mcp-output, bench",
     "",
     "Config & Integration: install, uninstall, upgrade, mcp-serve, mcp-status, hook,",
-    "  bridges-status, worker, statusline, version, config, config-get,",
+    "  bridges-status, worker, hook-server, statusline, version, config, config-get,",
     "  capabilities, help",
     "",
     "Data: note, note-add, note-get, note-list, describe, sqlite-query,",
     "  sqlite-tables, sqlite-schema, csv-profile, csv-query",
     "",
-    "Utils: ignores, bash-history, web-history, openapi-op, openapi-outline,",
-    "  gdrive-sections, screenshot, opencode-*, fetch-image, image-meta,",
-    "  image-text, start, stop, resume, replace, insert-section, pr-slice,",
+    "Utils: ignores, bash-history, web-history, history, openapi-op, openapi-outline,",
+    "  gdrive-sections, screenshot, fetch-image, image-meta,",
+    "  image-text, resume, replace, insert-section, pr-slice,",
     "  sharepoint-resolve, transcript, transcript-outline, video-chapters,",
     "  write-file, zip-list, zip-read, mcp-history, compact-doc, compact-hint,",
     "  conflicts, prune-cache",
@@ -8904,12 +9167,9 @@ function performHttpFetch(targetUrl, opts) {
   });
 }
 
-// src/config_commands.ts
-function saveConfigSafe(cfg) {
-  ensureDirSync(path18.dirname(configPath()));
-  saveConfig(cfg);
-}
-function levenshtein(a, b, cap = 3) {
+// src/util_suggest.ts
+init_define_import_meta_env();
+function levenshteinDistance(a, b, cap = 3) {
   if (Math.abs(a.length - b.length) > cap) return cap + 1;
   const prev = Array.from({ length: b.length + 1 }, (_, i) => i);
   for (let i = 1; i <= a.length; i++) {
@@ -8922,8 +9182,17 @@ function levenshtein(a, b, cap = 3) {
   }
   return prev[b.length] ?? cap + 1;
 }
+function suggestPackageNames(query, names) {
+  return [...new Set(names)].map((n) => ({ n, d: levenshteinDistance(query.toLowerCase(), n.toLowerCase()) })).filter((x) => x.d <= 3).sort((a, b) => a.d - b.d).slice(0, 5).map((x) => x.n);
+}
+
+// src/config_commands.ts
+function saveConfigSafe(cfg) {
+  ensureDirSync(path18.dirname(configPath()));
+  saveConfig(cfg);
+}
 function closestKeys(unknown, known) {
-  return known.map((k) => ({ k, d: levenshtein(unknown, k) })).filter((x) => x.d <= 3).sort((a, b) => a.d - b.d).slice(0, 3).map((x) => x.k);
+  return known.map((k) => ({ k, d: levenshteinDistance(unknown, k) })).filter((x) => x.d <= 3).sort((a, b) => a.d - b.d).slice(0, 3).map((x) => x.k);
 }
 function didYouMeanKeySuffix(unknownKey) {
   const knownKeys = flattenConfig(defaultConfig()).map(([k]) => k);
@@ -11511,11 +11780,12 @@ function openWithinRoot(rootReal, p) {
     if (!isPathWithinRoot(rootReal, realPath)) return "outside-root";
     let realStat;
     try {
-      realStat = fs21.statSync(realPath);
+      realStat = statThroughHandle(realPath);
     } catch {
       return "outside-root";
     }
-    if (realStat.dev !== stat.dev || realStat.ino !== stat.ino) return "outside-root";
+    const fdStat = fs21.fstatSync(fd, { bigint: true });
+    if (realStat.dev !== fdStat.dev || realStat.ino !== fdStat.ino) return "outside-root";
     ownershipTransferred = true;
     return { fd, stat };
   } finally {
@@ -13522,9 +13792,9 @@ function cmdNoteAdd(file, opts) {
       const messages = [`No symbol named '${opts.symbol}' is indexed in '${file}'`];
       const allNames = symbolNamesInFile(resolvedPath);
       const available = rankSimilarNames(allNames, opts.symbol);
-      if (available.length > 0) messages.push(didYouMean(available));
+      if (available.length > 0) messages.push(...didYouMeanLines(available));
       else if (allNames.length > 0) messages.push(`Try: token-goat outline ${file}`);
-      throw new CliError(messages.join("\n"));
+      throw new CliError(messages);
     }
     symbol = opts.symbol;
     fingerprint = fingerprintContent(match2.body);
@@ -13853,9 +14123,9 @@ function cmdInsertSection(file, opts) {
     const allHeadings = listSections(file);
     const messages = [`Section '${opts.after}' not found in '${file}'`];
     const available = filterSimilarHeadings(allHeadings, opts.after);
-    if (available.length > 0) messages.push(didYouMean(available));
+    if (available.length > 0) messages.push(...didYouMeanLines(available));
     else if (allHeadings.length > 0) messages.push(`Try: token-goat outline ${file}`);
-    throw new CliError(messages.join("\n"));
+    throw new CliError(messages);
   }
   if (result.occurrences !== void 0) {
     const lines = [
@@ -13867,7 +14137,7 @@ function cmdInsertSection(file, opts) {
     if (result.occurrences.length > AMBIGUOUS_HEADING_LIMIT) {
       lines.push(`  (${result.occurrences.length - AMBIGUOUS_HEADING_LIMIT} more not shown)`);
     }
-    throw new CliError(lines.join("\n"));
+    throw new CliError(lines);
   }
   let rawBytes;
   try {
@@ -14012,13 +14282,13 @@ function registerFormatCommands(program2, guard) {
     []
   ).option("--head <n>", "limit to the first N matching rows").option("--json", "emit rows as a JSON array of objects instead of CSV").option("--delimiter <char>", "field delimiter (default: ,)").option("--no-header", "treat the first row as data, not a header (columns become col1, col2, ...)").action(guard(cmdCsvQuery));
   program2.command("csv-profile <file>").description("per-column type/null/distinct/range summary of a CSV instead of a raw Read").option("--delimiter <char>", "field delimiter (default: ,)").option("--no-header", "treat the first row as data, not a header (columns become col1, col2, ...)").action(guard(cmdCsvProfile));
-  program2.command("json-outline <file>").description("structural summary of a JSON document (array shape / object key types) instead of a raw Read").option("--json", "emit the outline as JSON instead of text").action(guard(cmdJsonOutline));
+  program2.command("json-outline <file>").description("structural summary of a JSON document (array shape / object key types) instead of a raw Read").option("--json", "emit the outline as JSON instead of text").option("--filter <text>", "list only the top-level keys containing TEXT (case-insensitive), with a count of how many matched").action(guard(cmdJsonOutline));
   program2.command("json-query <file> <path>").description(
-    "extract one value or a projected/filtered subset from a JSON document by dot-path instead of a raw Read\n\npath grammar: dot-separated keys with optional bracket segments -- [n] index, [*] wildcard (projects every element/value), [field=value] filter (keeps array elements whose field stringifies to value). Examples: data.items[3].name, items[*].id, items[status=active]"
+    'extract one value or a projected/filtered subset from a JSON document by dot-path instead of a raw Read\n\npath grammar: dot-separated keys with optional bracket segments -- [n] index, [*] wildcard (projects every element/value), [field=value] filter (keeps array elements whose field stringifies to value), ["key"] for a key holding a dot or space. Examples: data.items[3].name, items[*].id, items[status=active], ["a.b"].c'
   ).option("--head <n>", "limit a projected/filtered result to the first N items").option("--json", "emit the result as JSON instead of text").action(guard(cmdJsonQuery));
-  program2.command("yaml-outline <file>").description("structural summary of a YAML document (array shape / object key types) instead of a raw Read -- multi-document streams (---separated) outline as an array of documents").option("--json", "emit the outline as JSON instead of text").action(guard(cmdYamlOutline));
+  program2.command("yaml-outline <file>").description("structural summary of a YAML document (array shape / object key types) instead of a raw Read -- multi-document streams (---separated) outline as an array of documents").option("--json", "emit the outline as JSON instead of text").option("--filter <text>", "list only the top-level keys containing TEXT (case-insensitive), with a count of how many matched").action(guard(cmdYamlOutline));
   program2.command("yaml-query <file> <path>").description(
-    "extract one value or a projected/filtered subset from a YAML document by dot-path instead of a raw Read (same grammar as json-query)\n\npath grammar: dot-separated keys with optional bracket segments -- [n] index, [*] wildcard (projects every element/value), [field=value] filter (keeps array elements whose field stringifies to value). Examples: spec.containers[0].image, items[*].name, items[kind=Service]"
+    'extract one value or a projected/filtered subset from a YAML document by dot-path instead of a raw Read (same grammar as json-query)\n\npath grammar: dot-separated keys with optional bracket segments -- [n] index, [*] wildcard (projects every element/value), [field=value] filter (keeps array elements whose field stringifies to value), ["key"] for a key holding a dot or space. Examples: spec.containers[0].image, items[*].name, items[kind=Service]'
   ).option("--head <n>", "limit a projected/filtered result to the first N items").option("--json", "emit the result as JSON instead of text").action(guard(cmdYamlQuery));
   program2.command("xml-outline <file>").description("structural summary of an XML document (element hierarchy / attribute names / child counts) instead of a raw Read").option("--json", "emit the outline as JSON instead of text").option("--max-depth <n>", "max depth of element hierarchy to show").option("--depth <n>", "alias for --max-depth").action(guard(cmdXmlOutline));
   program2.command("xml-query <file> [path]").description(
@@ -14383,184 +14653,44 @@ function runAffected(opts) {
 
 // src/text_commands.ts
 init_define_import_meta_env();
-import * as fs32 from "fs";
-import * as path29 from "path";
+import * as fs31 from "fs";
+import * as path28 from "path";
 
-// src/project_memory.ts
+// src/text_todo.ts
 init_define_import_meta_env();
-import * as fs28 from "node:fs";
-import * as path26 from "node:path";
-var MAX_ENTRIES = 30;
-var KEY_RE2 = /^[A-Za-z0-9_-]{1,80}$/;
-function ordinal(a, b) {
-  return a < b ? -1 : a > b ? 1 : 0;
-}
-function memoryPath(projectHash) {
-  return path26.join(dataDir(), "projects", `${projectHash}_memory.toml`);
-}
-function validateKey2(key) {
-  if (!KEY_RE2.test(key)) {
-    throw new Error(
-      `Invalid memory key ${JSON.stringify(key)}: use only letters, digits, hyphens, underscores (max 80 chars)`
-    );
-  }
+import * as fs28 from "fs";
+import * as path26 from "path";
+var DEFAULT_KINDS = ["TODO", "FIXME", "HACK", "XXX", "NOTE"];
+function splitLines(text) {
+  return text.split(/\r?\n/);
 }
-function parseTOML(content) {
-  const result = {};
-  for (const line of content.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) {
+function countUnescapedQuotes(text, quoteChar) {
+  let count = 0;
+  let backslashes = 0;
+  for (const ch of text) {
+    if (ch === "\\") {
+      backslashes++;
       continue;
     }
-    const match2 = trimmed.match(/^([A-Za-z0-9_-]+)\s*=\s*"(.*)"\s*$/);
-    if (match2) {
-      const [, key, value] = match2;
-      if (key && value !== void 0) {
-        const unescaped = value.replace(/\\([\\nrt"])/g, (_, c) => {
-          switch (c) {
-            case "\\":
-              return "\\";
-            case "n":
-              return "\n";
-            case "r":
-              return "\r";
-            case '"':
-              return '"';
-            default:
-              return _;
-          }
-        });
-        result[key] = unescaped;
-      }
-    }
+    if (ch === quoteChar && backslashes % 2 === 0) count++;
+    backslashes = 0;
   }
-  return result;
+  return count;
+}
+function isInsideStringLiteral2(line, markerIndex) {
+  const before = line.slice(0, markerIndex);
+  const dqCount = countUnescapedQuotes(before, '"');
+  return dqCount % 2 !== 0;
 }
-function loadRaw(filePath) {
+function isMarkerOccurrence(matched, hasColon) {
+  return hasColon || matched === matched.toUpperCase();
+}
+function scanFileForTodos(filePath, kindSet) {
+  let text;
   try {
-    if (!fs28.existsSync(filePath)) {
-      return {};
-    }
-    const content = fs28.readFileSync(filePath, "utf-8");
-    return parseTOML(content);
+    text = decodeSource(fs28.readFileSync(filePath));
   } catch {
-    return {};
-  }
-}
-function save(filePath, entries) {
-  const lines = [];
-  const sorted = Object.entries(entries).sort(([a], [b]) => ordinal(a, b));
-  for (const [k, v] of sorted) {
-    const escaped = v.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\r/g, "\\r").replace(/\n/g, "\\n");
-    lines.push(`${k} = "${escaped}"`);
-  }
-  const content = lines.length > 0 ? lines.join("\n") + "\n" : "";
-  const dir = path26.dirname(filePath);
-  ensureDirSync(dir);
-  atomicWriteText(filePath, content);
-}
-function loadEntries(projectHash) {
-  return loadRaw(memoryPath(projectHash));
-}
-function setEntry(projectHash, key, value) {
-  validateKey2(key);
-  const p = memoryPath(projectHash);
-  const dir = path26.dirname(p);
-  ensureDirSync(dir);
-  const doSet = () => {
-    const entries = loadRaw(p);
-    const isNewKey = !(key in entries);
-    if (isNewKey && Object.keys(entries).length >= MAX_ENTRIES) {
-      const keysToKeep = MAX_ENTRIES - 1;
-      const allKeys = Object.keys(entries).sort((a, b) => ordinal(a, b));
-      for (const k of allKeys.slice(keysToKeep)) {
-        delete entries[k];
-      }
-    }
-    entries[key] = value;
-    save(p, entries);
-    return true;
-  };
-  if (withFileLock(`${p}.lock`, doSet) === void 0) doSet();
-}
-function unsetEntry(projectHash, key) {
-  validateKey2(key);
-  const p = memoryPath(projectHash);
-  const doUnset = () => {
-    const entries = loadRaw(p);
-    if (key in entries) {
-      delete entries[key];
-      save(p, entries);
-    }
-    return true;
-  };
-  if (withFileLock(`${p}.lock`, doUnset) === void 0) doUnset();
-}
-function clearAll(projectHash) {
-  const p = memoryPath(projectHash);
-  const doClear = () => {
-    if (fs28.existsSync(p)) {
-      save(p, {});
-    }
-    return true;
-  };
-  if (withFileLock(`${p}.lock`, doClear) === void 0) doClear();
-}
-
-// src/util_suggest.ts
-init_define_import_meta_env();
-function packageNameDistance(a, b, cap = 3) {
-  if (Math.abs(a.length - b.length) > cap) return cap + 1;
-  const prev = Array.from({ length: b.length + 1 }, (_, i) => i);
-  for (let i = 1; i <= a.length; i++) {
-    const curr = [i];
-    for (let j = 1; j <= b.length; j++) {
-      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
-      curr.push(Math.min((curr[j - 1] ?? 0) + 1, (prev[j] ?? 0) + 1, (prev[j - 1] ?? 0) + cost));
-    }
-    prev.splice(0, prev.length, ...curr);
-  }
-  return prev[b.length] ?? cap + 1;
-}
-function suggestPackageNames(query, names) {
-  return [...new Set(names)].map((n) => ({ n, d: packageNameDistance(query.toLowerCase(), n.toLowerCase()) })).filter((x) => x.d <= 3).sort((a, b) => a.d - b.d).slice(0, 5).map((x) => x.n);
-}
-
-// src/text_todo.ts
-init_define_import_meta_env();
-import * as fs29 from "fs";
-import * as path27 from "path";
-var DEFAULT_KINDS = ["TODO", "FIXME", "HACK", "XXX", "NOTE"];
-function splitLines(text) {
-  return text.split(/\r?\n/);
-}
-function countUnescapedQuotes(text, quoteChar) {
-  let count = 0;
-  let backslashes = 0;
-  for (const ch of text) {
-    if (ch === "\\") {
-      backslashes++;
-      continue;
-    }
-    if (ch === quoteChar && backslashes % 2 === 0) count++;
-    backslashes = 0;
-  }
-  return count;
-}
-function isInsideStringLiteral2(line, markerIndex) {
-  const before = line.slice(0, markerIndex);
-  const dqCount = countUnescapedQuotes(before, '"');
-  return dqCount % 2 !== 0;
-}
-function isMarkerOccurrence(matched, hasColon) {
-  return hasColon || matched === matched.toUpperCase();
-}
-function scanFileForTodos(filePath, kindSet) {
-  let text;
-  try {
-    text = decodeSource(fs29.readFileSync(filePath));
-  } catch {
-    return [];
+    return [];
   }
   const kindPattern = [...kindSet].map(escapeRegExp).join("|");
   const re = new RegExp(`\\b(${kindPattern})\\b(\\s*:)?\\s*(.*)`, "gi");
@@ -14586,9 +14716,9 @@ function collectTodoFiles(patterns) {
   if (patterns.length > 0) {
     const results = [];
     for (const p of patterns) {
-      const abs = path27.resolve(p);
+      const abs = path26.resolve(p);
       try {
-        const stat = fs29.statSync(abs);
+        const stat = fs28.statSync(abs);
         if (stat.isDirectory()) {
           pushAll(results, walkProject(abs).files);
         } else {
@@ -14653,11 +14783,11 @@ function cmdTodo(patterns, opts) {
 
 // src/text_trace.ts
 init_define_import_meta_env();
-import * as fs30 from "fs";
-import * as path28 from "path";
+import * as fs29 from "fs";
+import * as path27 from "path";
 function readInput(src) {
-  if (src !== void 0) return fs30.readFileSync(src, "utf8");
-  return fs30.readFileSync(0, "utf8");
+  if (src !== void 0) return fs29.readFileSync(src, "utf8");
+  return fs29.readFileSync(0, "utf8");
 }
 function splitLines2(text) {
   return text.split(/\r?\n/);
@@ -14869,7 +14999,7 @@ function isProjectFrame(framePath, cwd) {
   if (framePath.includes("/rustc/")) return false;
   if (framePath.includes(".cargo/registry") || framePath.includes(".cargo\\registry")) return false;
   if (/^<.+>$/.test(framePath)) return false;
-  if (!path28.isAbsolute(framePath) && !framePath.startsWith("..")) return true;
+  if (!path27.isAbsolute(framePath) && !framePath.startsWith("..")) return true;
   return false;
 }
 function resolveFrameSymbol(frame, projectRoot) {
@@ -14977,7 +15107,7 @@ function cmdTrace(src, opts) {
 
 // src/text_logfold.ts
 init_define_import_meta_env();
-import * as fs31 from "fs";
+import * as fs30 from "fs";
 
 // src/filters.ts
 init_define_import_meta_env();
@@ -15107,8 +15237,8 @@ function applyFiltersAndFold(lines, noNormalize, foldRepeats) {
   return folded;
 }
 function readInput2(src) {
-  if (src !== void 0) return fs31.readFileSync(src, "utf8");
-  return fs31.readFileSync(0, "utf8");
+  if (src !== void 0) return fs30.readFileSync(src, "utf8");
+  return fs30.readFileSync(0, "utf8");
 }
 function splitLines3(text) {
   return text.split(/\r?\n/);
@@ -15159,21 +15289,21 @@ var LOCK_PRIORITY = [
   "Cargo.lock"
 ];
 function findLockfile(startPath) {
-  const stat = fs32.statSync(startPath, { throwIfNoEntry: false });
+  const stat = fs31.statSync(startPath, { throwIfNoEntry: false });
   if (stat !== void 0 && stat.isFile()) {
     return { file: startPath, others: [] };
   }
-  const dir = stat !== void 0 && stat.isDirectory() ? startPath : path29.dirname(startPath);
+  const dir = stat !== void 0 && stat.isDirectory() ? startPath : path28.dirname(startPath);
   const found = [];
   for (const name of LOCK_PRIORITY) {
-    const candidate = path29.join(dir, name);
-    if (fs32.existsSync(candidate)) found.push(candidate);
+    const candidate = path28.join(dir, name);
+    if (fs31.existsSync(candidate)) found.push(candidate);
   }
   try {
-    const entries = fs32.readdirSync(dir);
+    const entries = fs31.readdirSync(dir);
     for (const e of entries) {
       if (/^requirements.*\.txt$/.test(e)) {
-        const p = path29.join(dir, e);
+        const p = path28.join(dir, e);
         if (!found.includes(p)) found.push(p);
       }
     }
@@ -15370,8 +15500,8 @@ function parsePnpmLock(content) {
   return deps;
 }
 function parseLockFile(filePath) {
-  const base = path29.basename(filePath);
-  const content = fs32.readFileSync(filePath, "utf8");
+  const base = path28.basename(filePath);
+  const content = fs31.readFileSync(filePath, "utf8");
   if (base === "package-lock.json") return { format: "npm", deps: parsePackageLockJson(content) };
   if (base === "yarn.lock") return { format: "yarn", deps: parseYarnLock(content) };
   if (base === "pnpm-lock.yaml") return { format: "pnpm", deps: parsePnpmLock(content) };
@@ -15444,7 +15574,7 @@ function cmdLockdepsPackage(lockfile, format, deps, query, json) {
   }
   const primary = matches2.find((d) => d.kind === "direct") ?? matches2[0];
   const otherVersions = [...new Set(matches2.filter((d) => d.version !== primary.version).map((d) => d.version))];
-  const graph = format === "npm" ? buildNpmEdges(fs32.readFileSync(lockfile, "utf8")) : null;
+  const graph = format === "npm" ? buildNpmEdges(fs31.readFileSync(lockfile, "utf8")) : null;
   const graphAvailable = graph !== null;
   const dependsOn = graph !== null ? [...graph.edges.get(query) ?? []].sort() : [];
   const dependedOnBy = graph !== null ? findReverseDirectDeps(query, graph.edges, graph.directNames) : [];
@@ -15484,7 +15614,7 @@ Depended on by direct/top-level deps (${dependedOnBy.length}):
 `);
 }
 function cmdLockdeps(filePath, opts) {
-  const target = filePath !== void 0 ? path29.resolve(filePath) : process.cwd();
+  const target = filePath !== void 0 ? path28.resolve(filePath) : process.cwd();
   const found = findLockfile(target);
   if (found === null) {
     throw new Error("No lockfile found. Expected one of: " + LOCK_PRIORITY.join(", ") + ", requirements*.txt");
@@ -15572,20 +15702,20 @@ function cmdNote(action, key, value, opts) {
   throw new Error(`Unknown note action: ${action}. Use: set, get, unset, list, clear`);
 }
 function loadAllSessionReadCounts() {
-  const sessionsDir2 = path29.join(tokenGoatHome(), "sessions");
+  const sessionsDir2 = path28.join(tokenGoatHome(), "sessions");
   const totals = /* @__PURE__ */ new Map();
   let entries;
   try {
-    entries = fs32.readdirSync(sessionsDir2, { withFileTypes: true });
+    entries = fs31.readdirSync(sessionsDir2, { withFileTypes: true });
   } catch {
     return totals;
   }
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const filePath = path29.join(sessionsDir2, entry.name);
+    const filePath = path28.join(sessionsDir2, entry.name);
     let raw;
     try {
-      raw = JSON.parse(fs32.readFileSync(filePath, "utf8"));
+      raw = JSON.parse(fs31.readFileSync(filePath, "utf8"));
     } catch {
       continue;
     }
@@ -15718,7 +15848,7 @@ function cmdIgnores(opts) {
 }
 function countPackIgnorePatterns(root) {
   try {
-    return fs32.readFileSync(path29.join(root, ".tokengoatignore"), "utf8").split("\n").map((ln) => ln.trim()).filter((ln) => ln.length > 0 && !ln.startsWith("#")).length;
+    return fs31.readFileSync(path28.join(root, ".tokengoatignore"), "utf8").split("\n").map((ln) => ln.trim()).filter((ln) => ln.length > 0 && !ln.startsWith("#")).length;
   } catch {
     return 0;
   }
@@ -15727,8 +15857,8 @@ function countPackIgnorePatterns(root) {
 // src/dep_docs.ts
 init_define_import_meta_env();
 import { createRequire } from "node:module";
-import * as fs33 from "node:fs";
-import * as path30 from "node:path";
+import * as fs32 from "node:fs";
+import * as path29 from "node:path";
 var _require = createRequire(import.meta.url);
 var _ts = null;
 var _tsLoadAttempted = false;
@@ -15747,21 +15877,21 @@ function loadTs() {
 }
 function dirExists(p) {
   try {
-    return fs33.statSync(p).isDirectory();
+    return fs32.statSync(p).isDirectory();
   } catch {
     return false;
   }
 }
 function fileExists(p) {
   try {
-    return fs33.statSync(p).isFile();
+    return fs32.statSync(p).isFile();
   } catch {
     return false;
   }
 }
 function readFileTextOrNull(p) {
   try {
-    return fs33.readFileSync(p, "utf8");
+    return fs32.readFileSync(p, "utf8");
   } catch {
     return null;
   }
@@ -15769,7 +15899,7 @@ function readFileTextOrNull(p) {
 function listInstalledPackageNames(nodeModulesDir) {
   let entries;
   try {
-    entries = fs33.readdirSync(nodeModulesDir, { withFileTypes: true });
+    entries = fs32.readdirSync(nodeModulesDir, { withFileTypes: true });
   } catch {
     return [];
   }
@@ -15779,7 +15909,7 @@ function listInstalledPackageNames(nodeModulesDir) {
     if (entry.name.startsWith("@")) {
       let scoped;
       try {
-        scoped = fs33.readdirSync(path30.join(nodeModulesDir, entry.name), { withFileTypes: true });
+        scoped = fs32.readdirSync(path29.join(nodeModulesDir, entry.name), { withFileTypes: true });
       } catch {
         continue;
       }
@@ -15796,12 +15926,12 @@ var README_NAME_RE = /^readme(\.(md|markdown|txt))?$/i;
 function findReadmeFile(pkgDir) {
   const direct = findReadmeIn(pkgDir);
   if (direct !== null) return direct;
-  return findReadmeIn(path30.join(pkgDir, "docs"));
+  return findReadmeIn(path29.join(pkgDir, "docs"));
 }
 function findReadmeIn(dir) {
   let entries;
   try {
-    entries = fs33.readdirSync(dir, { withFileTypes: true });
+    entries = fs32.readdirSync(dir, { withFileTypes: true });
   } catch {
     return null;
   }
@@ -15813,7 +15943,7 @@ function findReadmeIn(dir) {
     return 1;
   };
   matches2.sort((a, b) => rank(a.name) - rank(b.name));
-  return path30.join(dir, matches2[0].name);
+  return path29.join(dir, matches2[0].name);
 }
 function typesPackageDirName(pkgName) {
   if (pkgName.startsWith("@")) {
@@ -15840,30 +15970,30 @@ function resolveTypesLocation(pkgDir, pkgJson, nodeModulesDir, pkgName) {
   if (declared !== void 0) {
     const candidates = [declared, declared.endsWith(".d.ts") ? declared : `${declared}.d.ts`, declared.replace(/\.[cm]?[jt]s$/, ".d.ts")];
     for (const c of candidates) {
-      const p = path30.join(pkgDir, c);
+      const p = path29.join(pkgDir, c);
       if (fileExists(p)) return { path: p, source: "bundled" };
     }
   }
   const main = typeof pkgJson["main"] === "string" ? pkgJson["main"] : "index.js";
-  const mainDts = path30.join(pkgDir, main.replace(/\.[cm]?js$/, ".d.ts"));
+  const mainDts = path29.join(pkgDir, main.replace(/\.[cm]?js$/, ".d.ts"));
   if (fileExists(mainDts)) return { path: mainDts, source: "bundled" };
-  const indexDts = path30.join(pkgDir, "index.d.ts");
+  const indexDts = path29.join(pkgDir, "index.d.ts");
   if (fileExists(indexDts)) return { path: indexDts, source: "bundled" };
   const typesDirName = typesPackageDirName(pkgName);
-  const typesPkgDir = path30.join(nodeModulesDir, "@types", typesDirName);
-  const typesPkgJsonRaw = readFileTextOrNull(path30.join(typesPkgDir, "package.json"));
+  const typesPkgDir = path29.join(nodeModulesDir, "@types", typesDirName);
+  const typesPkgJsonRaw = readFileTextOrNull(path29.join(typesPkgDir, "package.json"));
   if (typesPkgJsonRaw !== null) {
     try {
       const typesPkgJson = JSON.parse(typesPkgJsonRaw);
       const entry = (typeof typesPkgJson["types"] === "string" ? typesPkgJson["types"] : void 0) ?? (typeof typesPkgJson["main"] === "string" ? typesPkgJson["main"] : void 0) ?? "index.d.ts";
       const entryCandidates = [entry, entry.endsWith(".d.ts") ? entry : `${entry}.d.ts`, entry.replace(/\.[cm]?[jt]s$/, ".d.ts")];
       for (const c of entryCandidates) {
-        const entryPath = path30.join(typesPkgDir, c);
+        const entryPath = path29.join(typesPkgDir, c);
         if (fileExists(entryPath)) return { path: entryPath, source: "@types" };
       }
     } catch {
     }
-    const fallback = path30.join(typesPkgDir, "index.d.ts");
+    const fallback = path29.join(typesPkgDir, "index.d.ts");
     if (fileExists(fallback)) return { path: fallback, source: "@types" };
   }
   return null;
@@ -15930,16 +16060,16 @@ function recordDepDocsStat(fullSourceBytes, emittedText, packageName) {
 }
 function runDepDocs(opts) {
   const root = resolveProjectRoot({ project: opts.projectRoot ?? process.cwd() });
-  const nodeModulesDir = path30.join(root, "node_modules");
-  const pkgDir = path30.join(nodeModulesDir, opts.packageName);
-  const pkgJsonPath = path30.join(pkgDir, "package.json");
+  const nodeModulesDir = path29.join(root, "node_modules");
+  const pkgDir = path29.join(nodeModulesDir, opts.packageName);
+  const pkgJsonPath = path29.join(pkgDir, "package.json");
   if (!dirExists(pkgDir) || !fileExists(pkgJsonPath)) {
     const known = listInstalledPackageNames(nodeModulesDir);
     const suggestions = suggestPackageNames(opts.packageName, known);
     const hint = suggestions.length > 0 ? ` (did you mean: ${suggestions.map(displaySafeText).join(", ")}?)` : "";
     return { text: `Package '${displaySafeText(opts.packageName)}' not found under ${displaySafeText(nodeModulesDir)}${hint}`, code: 1 };
   }
-  const pkgJsonRaw = fs33.readFileSync(pkgJsonPath, "utf8");
+  const pkgJsonRaw = fs32.readFileSync(pkgJsonPath, "utf8");
   let pkgJson;
   try {
     pkgJson = JSON.parse(pkgJsonRaw);
@@ -16315,8 +16445,7 @@ function collectCapabilities(config = loadConfig()) {
       id: "at_rest.symbol_index",
       kind: "at-rest",
       what: "Stores the text of indexed source files in a local database, so a symbol can be returned without re-reading the file.",
-      // Always on: it is the product. Reported anyway, because a reviewer deciding about data at
-      // rest needs the always-on items more than the optional ones.
+      // Always on: it is the product. Reported anyway, because a reviewer deciding about data at rest needs the always-on items more than the optional ones.
       enabled: true,
       controlledBy: "always on (this is what the tool does)",
       enforcedAt: "src/db.ts"
@@ -16328,15 +16457,24 @@ function collectCapabilities(config = loadConfig()) {
       enabled: true,
       controlledBy: "always on, 24-hour expiry",
       enforcedAt: "src/disk_cache.ts"
+    },
+    {
+      id: "ipc.hook_server",
+      kind: "local-ipc",
+      what: "Keeps up to three hook servers running between hook calls, each on a named pipe (Windows) or Unix socket (elsewhere) that answers only a caller holding the key file in the data directory.",
+      // Read the way the server reads it, which a project's config cannot change.
+      enabled: hookServerEnabled(),
+      controlledBy: "hooks.server (global config only), TOKEN_GOAT_HOOK_SERVER",
+      enforcedAt: "src/hook_server.ts::runHookServer"
     }
   ];
 }
 function renderCapabilities(caps) {
   const lines = [];
-  for (const kind of ["egress", "at-rest"]) {
+  for (const [kind, heading] of [["egress", "Can send data off this machine:"], ["at-rest", "Leaves data on this machine:"], ["local-ipc", "Listens for other processes on this machine:"]]) {
     const group = caps.filter((c) => c.kind === kind);
     if (group.length === 0) continue;
-    lines.push(kind === "egress" ? "Can send data off this machine:" : "Leaves data on this machine:");
+    lines.push(heading);
     for (const c of group) {
       lines.push(`  [${c.enabled ? "ON " : "OFF"}] ${displaySafeText(c.id)}`);
       lines.push(`         ${c.what}`);
@@ -16352,13 +16490,13 @@ function renderCapabilities(caps) {
 
 // src/cli_session.ts
 init_define_import_meta_env();
-import * as fs40 from "node:fs";
+import * as fs39 from "node:fs";
 
 // src/session_audit.ts
 init_define_import_meta_env();
-import * as fs34 from "node:fs";
+import * as fs33 from "node:fs";
 import * as os16 from "node:os";
-import * as path31 from "node:path";
+import * as path30 from "node:path";
 import * as readline from "node:readline";
 var MODEL_VISIBLE_CATEGORIES = ["toolResults", "assistantText", "assistantThinking", "toolUseInputs", "attachments", "userTurns", "harnessMeta", "system"];
 function computeCalibration(estimated, measured) {
@@ -16419,10 +16557,13 @@ var ATTACHMENT_VISIBLE_FIELDS = {
 };
 var CACHE_WRITE_MULTIPLIER = 1.25;
 var CACHE_READ_MULTIPLIER = 0.1;
-var READ_DIVERT_MARKER_RE = /(?:was already read this session|Already read |You've already read|Use `token-goat (?:section|read|bash-output|config-get|skeleton)|token-goat bash-output --file)/;
+var READ_DIVERT_MARKER_RE = /(?:was already read this session|Already read |You've already read|(?:Use|Run) `token-goat (?:section|read|bash-output|config-get|skeleton|json-query|yaml-query)|token-goat bash-output --file)/;
 var READ_DIVERT_MAX_BYTES = 2500;
 var READ_FULL_SERVE_MIN_BYTES = 10240;
 var DENY_TEMPLATES = [
+  // hint_target.ts's sharpenRepeatedDeny replaces a verbatim repeat of any deny with this one line, so the kind the first copy had is not recoverable from the second.
+  { kind: "repeat_refusal_deny", re: /Repeat refusal of this exact call/, tool: "Read" },
+  { kind: "skill_repeat_refusal_deny", re: /Repeat refusal of this exact call/, tool: "Skill" },
   { kind: "node_modules_deny", re: /node_modules is typically noise/, tool: "Read" },
   { kind: "lock_file_deny", re: /Lock files are rarely useful to read in full/, tool: "Read" },
   { kind: "tsbuildinfo_deny", re: /TypeScript incremental build cache file/, tool: "Read" },
@@ -16432,13 +16573,7 @@ var DENY_TEMPLATES = [
   // Must stay ABOVE markdown_heading_tree_deny: this deny's message embeds the same "Large markdown file (N headings)" guidance block, so the generic alternative would swallow it and the new intervention would be uncountable. DENY_TEMPLATES is scanned with `.find`, so the more specific wording has to come first.
   { kind: "subagent_markdown_first_read_deny", re: /Subagent first read of a large markdown file/, tool: "Read" },
   { kind: "markdown_heading_tree_deny", re: /Large markdown file \(\d+ headings\)/, tool: "Read" },
-  // The first alternative is a wording hooks_read.ts no longer emits (it claimed a compact-manifest
-  // section that never existed, reworded in 3d044feb). It stays because this table classifies a
-  // historical corpus, not just today's output: transcripts written before the rewording still
-  // carry the old text, and dropping the alternative silently shrank this kind from 51 events to
-  // 30 -- 41% of its history -- with a green suite. A superseded alternative is only removable
-  // once no transcript contains it, which source code cannot tell you. See the superseded-wording
-  // test in tests/deny_outcomes.test.ts.
+  // The first alternative is a wording hooks_read.ts no longer emits (it claimed a compact-manifest section that never existed, reworded in 3d044feb). It stays because this table classifies a historical corpus, not just today's output: transcripts written before the rewording still carry the old text, and dropping the alternative silently shrank this kind from 51 events to 30 -- 41% of its history -- with a green suite. A superseded alternative is only removable once no transcript contains it, which source code cannot tell you. See the superseded-wording test in tests/deny_outcomes.test.ts.
   { kind: "memory_md_reread_deny", re: /MEMORY\.md was read this session\. Its content is in the compact manifest|already read this session\. Memory files rarely change mid-session/, tool: "Read" },
   { kind: "improve_state_reread_deny", re: /Orchestrator state already read this session/, tool: "Read" },
   { kind: "env_reread_deny", re: /Environment files rarely change mid-session/, tool: "Read" },
@@ -16448,12 +16583,12 @@ var DENY_TEMPLATES = [
   { kind: "session_artifact_large_deny", re: /(?:Session transcript|Tool-result file) is large \(/, tool: "Read" },
   { kind: "session_artifact_generic_reread_deny", re: /already read this session\. Use `token-goat bash-output --file/, tool: "Read" },
   { kind: "truncated_read_deny", re: /File was truncated on last read \(>33K tokens\)/, tool: "Read" },
-  { kind: "doc_unchanged_deny", re: /is unchanged since last read\. Use `token-goat (?:section|read)/, tool: "Read" },
-  { kind: "doc_diff_deny", re: /Content changed since last read of [\s\S]*?Use `token-goat (?:section|read)/, tool: "Read" },
+  { kind: "doc_unchanged_deny", re: /is unchanged since last read\. (?:Use|Run) `token-goat (?:section|read|skeleton|json-query|yaml-query)/, tool: "Read" },
+  { kind: "doc_diff_deny", re: /Content changed since last read of [\s\S]*?(?:Use|Run) `token-goat (?:section|read|skeleton|json-query|yaml-query)/, tool: "Read" },
   { kind: "read_served_deny", re: /was already served in this session, byte for byte/, tool: "Read" },
   // Its own kind rather than folded into read_served_deny above, whose stat name this branch shares: the wording is disjoint (a span, not a byte-for-byte whole serve) and so is the follow-up it invites, since the model still needs part of that span and has to choose a narrower call rather than recall the whole result.
   { kind: "range_reread_deny", re: /Lines \d+\.\.\d+ of [\s\S]*?was already read this session/, tool: "Read" },
-  { kind: "markdown_already_read_deny", re: /Markdown file already read this session\. Use `token-goat section/, tool: "Read" },
+  { kind: "markdown_already_read_deny", re: /Markdown file already read this session\./, tool: "Read" },
   { kind: "read_count_deny", re: /(?:Read|Tried to read) this file \d+ times already/, tool: "Read" },
   // Shares read_count_deny's stat name and matches none of its wording: this branch fires on the SHAPE of the reads (consecutive line windows walking one file) rather than on their count, and says so.
   { kind: "sequential_paging_deny", re: /Sequential line-range paging detected on /, tool: "Read" },
@@ -16543,9 +16678,9 @@ function toolResultText(content) {
   return "";
 }
 function listCorpusTranscripts(corpusDir) {
-  if (!fs34.existsSync(corpusDir)) return [];
+  if (!fs33.existsSync(corpusDir)) return [];
   try {
-    const stat = fs34.statSync(corpusDir);
+    const stat = fs33.statSync(corpusDir);
     if (stat.isFile()) {
       return corpusDir.endsWith(".jsonl") ? [corpusDir] : [];
     }
@@ -16555,13 +16690,13 @@ function listCorpusTranscripts(corpusDir) {
   const found = [];
   const walk = (dir, entries) => {
     for (const entry of entries) {
-      const full = path31.join(dir, entry.name);
+      const full = path30.join(dir, entry.name);
       if (entry.name.endsWith(".jsonl")) {
         found.push(full);
       } else if (entry.isDirectory()) {
         let inner;
         try {
-          inner = fs34.readdirSync(full, { withFileTypes: true });
+          inner = fs33.readdirSync(full, { withFileTypes: true });
         } catch {
           continue;
         }
@@ -16570,31 +16705,41 @@ function listCorpusTranscripts(corpusDir) {
     }
   };
   try {
-    walk(corpusDir, fs34.readdirSync(corpusDir, { withFileTypes: true }));
+    walk(corpusDir, fs33.readdirSync(corpusDir, { withFileTypes: true }));
   } catch {
   }
   return found.sort();
 }
+var MS_PER_DAY = 24 * 60 * 60 * 1e3;
+function modifiedSince(files, sinceMs) {
+  return files.filter((file) => {
+    try {
+      return fs33.statSync(file).mtimeMs >= sinceMs;
+    } catch {
+      return false;
+    }
+  });
+}
 function defaultCorpusDir() {
-  const claudeDir = path31.join(claudeConfigDir(), "projects");
-  if (fs34.existsSync(claudeDir) && listCorpusTranscripts(claudeDir).length > 0) {
+  const claudeDir = path30.join(claudeConfigDir(), "projects");
+  if (fs33.existsSync(claudeDir) && listCorpusTranscripts(claudeDir).length > 0) {
     return claudeDir;
   }
   const home = os16.homedir();
-  const appData = process.env["APPDATA"] || path31.join(home, "AppData", "Roaming");
+  const appData = process.env["APPDATA"] || path30.join(home, "AppData", "Roaming");
   const candidates = [
     claudeDir,
-    path31.join(appData, "Code", "User", "workspaceStorage"),
-    path31.join(appData, "Code - Insiders", "User", "workspaceStorage"),
-    path31.join(home, "Library", "Application Support", "Code", "User", "workspaceStorage"),
-    path31.join(home, "Library", "Application Support", "Code - Insiders", "User", "workspaceStorage"),
-    path31.join(home, ".config", "Code", "User", "workspaceStorage"),
-    path31.join(home, ".config", "Code - Insiders", "User", "workspaceStorage"),
-    path31.join(home, ".copilot", "session-state")
+    path30.join(appData, "Code", "User", "workspaceStorage"),
+    path30.join(appData, "Code - Insiders", "User", "workspaceStorage"),
+    path30.join(home, "Library", "Application Support", "Code", "User", "workspaceStorage"),
+    path30.join(home, "Library", "Application Support", "Code - Insiders", "User", "workspaceStorage"),
+    path30.join(home, ".config", "Code", "User", "workspaceStorage"),
+    path30.join(home, ".config", "Code - Insiders", "User", "workspaceStorage"),
+    path30.join(home, ".copilot", "session-state")
   ];
   for (const cand of candidates) {
     try {
-      if (fs34.existsSync(cand) && listCorpusTranscripts(cand).length > 0) {
+      if (fs33.existsSync(cand) && listCorpusTranscripts(cand).length > 0) {
         return cand;
       }
     } catch {
@@ -16602,11 +16747,13 @@ function defaultCorpusDir() {
   }
   return claudeDir;
 }
-async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneObservations, bashHeadMap, denyRows) {
+async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneObservations, bashHeadMap, denyRows, toolErrorAcc) {
   const isLane = filePath.split(/[\\/]/).includes("subagents");
   let laneFirstPrefix = null;
   let laneBriefBytes = -1;
   const toolNameById = /* @__PURE__ */ new Map();
+  const modelById = /* @__PURE__ */ new Map();
+  const bashCommandById = /* @__PURE__ */ new Map();
   const bashHeadById = /* @__PURE__ */ new Map();
   let pendingBashReread = [];
   const readCallById = /* @__PURE__ */ new Map();
@@ -16645,7 +16792,7 @@ async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneOb
     }
     pendingBashReread = keptBash;
   };
-  const stream = fs34.createReadStream(filePath);
+  const stream = fs33.createReadStream(filePath);
   const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
   const streamFailure = new Promise((_, reject) => stream.on("error", reject));
   const consume = (async () => {
@@ -16709,11 +16856,15 @@ async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneOb
             if (!toolNameById.has(block["id"])) {
               toolNameById.set(block["id"], name);
               toolRollup(toolMap, name).calls += 1;
+              const model = typeof message.model === "string" && message.model !== "" ? message.model : void 0;
+              if (model !== void 0) modelById.set(block["id"], model);
+              toolErrorAcc.countCall(name, model);
               const input = block["input"] !== null && typeof block["input"] === "object" ? block["input"] : {};
               let readNorm;
               let editNorm;
               if (name === "Bash" && typeof input["command"] === "string") {
                 bashHeadById.set(block["id"], commandHead(input["command"]));
+                bashCommandById.set(block["id"], input["command"]);
               } else if (name === "Read" && typeof input["file_path"] === "string") {
                 readNorm = normalizeReadPath(input["file_path"]);
                 const priorEpoch = readPathEpoch.get(readNorm);
@@ -16767,9 +16918,17 @@ async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneOb
           const name = toolNameById.get(id) ?? "(unknown)";
           addCategory(s.estimated.toolResults, bytes);
           const roll = toolRollup(toolMap, name);
-          if (!toolNameById.has(id)) roll.calls += 1;
+          if (!toolNameById.has(id)) {
+            roll.calls += 1;
+            toolErrorAcc.countCall(name, void 0);
+          }
           roll.resultBytes += bytes;
           roll.resultEstTokens += estimateTokensFromLength(bytes);
+          if (block["is_error"] === true) {
+            const denialKind = obj["toolDenialKind"];
+            const command = bashCommandById.get(id);
+            toolErrorAcc.countError(name, modelById.get(id), text, { ...typeof denialKind === "string" ? { denialKind } : {}, ...command !== void 0 ? { command } : {} });
+          }
           if (name === "Edit" && block["is_error"] === true) {
             s.editErrorBaseline.totalErrors += 1;
             editErrorById.set(id, true);
@@ -16777,13 +16936,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 path42 = readPathById.get(id) ?? "";
-              const lastSlash = path42.lastIndexOf("/");
+              const path41 = readPathById.get(id) ?? "";
+              const lastSlash = path41.lastIndexOf("/");
               openDenies.push({
                 kind: denyTemplate.kind,
                 withheldBytes: parseWithheldBytes(denyTemplate.kind, text),
-                path: path42,
-                basename: lastSlash === -1 ? path42 : path42.slice(lastSlash + 1),
+                path: path41,
+                basename: lastSlash === -1 ? path41 : path41.slice(lastSlash + 1),
                 callIndexAtDeny: perCall.length,
                 compactEpochAtOpen: compactEpoch,
                 compactEpochAtWindow: null,
@@ -16973,7 +17132,7 @@ async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneOb
   if (isLane) {
     let agentType = "(none)";
     try {
-      const meta = JSON.parse(fs34.readFileSync(filePath.replace(/\.jsonl$/i, ".meta.json"), "utf8"));
+      const meta = JSON.parse(fs33.readFileSync(filePath.replace(/\.jsonl$/i, ".meta.json"), "utf8"));
       if (typeof meta["agentType"] === "string" && meta["agentType"] !== "") agentType = meta["agentType"];
     } catch {
     }
@@ -17054,14 +17213,19 @@ function aggregateDenyOutcomes(rows) {
   return result.sort((a, b) => b.count - a.count || a.kind.localeCompare(b.kind));
 }
 async function auditSessionCorpus(opts = {}) {
-  const corpusDir = path31.resolve(opts.dir ?? defaultCorpusDir());
-  if (!fs34.existsSync(corpusDir)) {
+  const corpusDir = path30.resolve(opts.dir ?? defaultCorpusDir());
+  if (!fs33.existsSync(corpusDir)) {
     throw new Error(`session corpus directory not found: ${corpusDir}`);
   }
-  const files = listCorpusTranscripts(corpusDir);
-  if (files.length === 0) {
+  const windowDays = opts.windowDays ?? 0;
+  const allFiles = listCorpusTranscripts(corpusDir);
+  if (allFiles.length === 0) {
     throw new Error(`no .jsonl session transcripts found under ${corpusDir}`);
   }
+  const files = windowDays === 0 ? allFiles : modifiedSince(allFiles, Date.now() - windowDays * MS_PER_DAY);
+  if (files.length === 0) {
+    throw new Error(`no .jsonl session transcripts under ${corpusDir} were modified in the last ${windowDays} days`);
+  }
   const started = Date.now();
   const summary = {
     corpusDir,
@@ -17096,8 +17260,11 @@ async function auditSessionCorpus(opts = {}) {
     denyOutcomes: [],
     editErrorBaseline: { totalEdits: 0, totalErrors: 0, rate: 0 },
     lineTypes: {},
-    omissionMarkers: { fires: 0, linesOmitted: 0 }
+    omissionMarkers: { fires: 0, linesOmitted: 0 },
+    windowDays,
+    toolErrors: { byTool: [], byModel: [], unknownPrefixes: [] }
   };
+  const toolErrorAcc = (await import("./token-goat-chunk-G23DWHV4.mjs")).newToolErrorAccumulator();
   const toolMap = /* @__PURE__ */ new Map();
   const attachmentMap = /* @__PURE__ */ new Map();
   const hookMap = /* @__PURE__ */ new Map();
@@ -17106,7 +17273,7 @@ async function auditSessionCorpus(opts = {}) {
   const denyRows = [];
   for (const file of files) {
     try {
-      await auditOneFile(file, summary, toolMap, attachmentMap, hookMap, laneObservations, bashHeadMap, denyRows);
+      await auditOneFile(file, summary, toolMap, attachmentMap, hookMap, laneObservations, bashHeadMap, denyRows, toolErrorAcc);
       summary.filesScanned += 1;
     } catch {
       summary.filesFailed += 1;
@@ -17146,6 +17313,7 @@ async function auditSessionCorpus(opts = {}) {
   summary.denyOutcomes = aggregateDenyOutcomes(denyRows);
   summary.editErrorBaseline.rate = summary.editErrorBaseline.totalEdits === 0 ? 0 : summary.editErrorBaseline.totalErrors / summary.editErrorBaseline.totalEdits;
   summary.calibration = computeCalibration(summary.estimated, summary.measured);
+  summary.toolErrors = toolErrorAcc.finish();
   summary.runtimeMs = Date.now() - started;
   return summary;
 }
@@ -17266,17 +17434,17 @@ function formatSessionAudit(s) {
 
 // src/session_read.ts
 init_define_import_meta_env();
-import * as fs35 from "node:fs";
-import * as path32 from "node:path";
+import * as fs34 from "node:fs";
+import * as path31 from "node:path";
 import * as readline2 from "node:readline";
 function resolveSessionTranscript(arg, opts = {}) {
   if (arg !== void 0 && arg !== "") {
-    if (fs35.existsSync(arg) && fs35.statSync(arg).isFile()) return arg;
+    if (fs34.existsSync(arg) && fs34.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 = path32.join(dir, byId);
-    if (fs35.existsSync(candidate) && fs35.statSync(candidate).isFile()) return candidate;
+    const candidate = path31.join(dir, byId);
+    if (fs34.existsSync(candidate) && fs34.statSync(candidate).isFile()) return candidate;
     return null;
   }
   const projectRoot = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
@@ -17334,7 +17502,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 = fs35.createReadStream(transcriptPath, { encoding: "utf8" });
+  const input = fs34.createReadStream(transcriptPath, { encoding: "utf8" });
   const rl = readline2.createInterface({ input, crlfDelay: Infinity });
   try {
     let lineNumber = 0;
@@ -17433,9 +17601,9 @@ function formatSessionSlice(turns) {
 
 // src/cli_bootstrap_audit.ts
 init_define_import_meta_env();
-import * as fs36 from "node:fs";
+import * as fs35 from "node:fs";
 import * as os17 from "node:os";
-import * as path33 from "node:path";
+import * as path32 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) {
@@ -17444,7 +17612,7 @@ function parseBudget(name, value) {
   return value;
 }
 async function readFrontmatter(filePath) {
-  const stream = fs36.createReadStream(filePath, { encoding: "utf8" });
+  const stream = fs35.createReadStream(filePath, { encoding: "utf8" });
   const lines = readline3.createInterface({ input: stream, crlfDelay: Infinity });
   let first = true;
   let inFrontmatter = false;
@@ -17490,44 +17658,44 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
   let logicalRoot;
   let rootIsLink;
   try {
-    rootIsLink = (await fs36.promises.lstat(root)).isSymbolicLink();
-    logicalRoot = await fs36.promises.realpath(root);
+    rootIsLink = (await fs35.promises.lstat(root)).isSymbolicLink();
+    logicalRoot = await fs35.promises.realpath(root);
   } catch (error) {
     if (error.code === "ENOENT") return entries;
-    diagnostics.push({ path: path33.resolve(root), reason: "unreadable root" });
+    diagnostics.push({ path: path32.resolve(root), reason: "unreadable root" });
     return entries;
   }
   if (rootIsLink && !followLinks) {
-    diagnostics.push({ path: path33.resolve(root), reason: "external root link skipped (use --follow-links)" });
+    diagnostics.push({ path: path32.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 = path33.relative(canonicalKey(allowedRoot), canonicalKey(candidate));
-    return relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path33.sep}`) && !path33.isAbsolute(relative3);
+    const relative3 = path32.relative(canonicalKey(allowedRoot), canonicalKey(candidate));
+    return relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path32.sep}`) && !path32.isAbsolute(relative3);
   };
   async function visit(candidate, allowedRoot, topLevel = false) {
     let real;
     let candidateIsLink;
     try {
-      candidateIsLink = (await fs36.promises.lstat(candidate)).isSymbolicLink();
-      real = await fs36.promises.realpath(candidate);
+      candidateIsLink = (await fs35.promises.lstat(candidate)).isSymbolicLink();
+      real = await fs35.promises.realpath(candidate);
     } catch {
-      diagnostics.push({ path: path33.resolve(candidate), reason: "broken or unreadable link" });
+      diagnostics.push({ path: path32.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: path33.resolve(candidate), reason: candidateIsLink ? "external link skipped (use --follow-links)" : "canonical target outside scan root" });
+      diagnostics.push({ path: path32.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 fs36.promises.stat(real);
+      stat = await fs35.promises.stat(real);
     } catch {
-      diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable" });
+      diagnostics.push({ path: path32.resolve(candidate), reason: "unreadable" });
       return;
     }
     const canonical = process.platform === "win32" ? real.toLocaleLowerCase() : real;
@@ -17536,16 +17704,16 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
       visitedDirs.add(canonical);
       let children;
       try {
-        children = await fs36.promises.readdir(real, { withFileTypes: true });
+        children = await fs35.promises.readdir(real, { withFileTypes: true });
       } catch {
-        diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable directory" });
+        diagnostics.push({ path: path32.resolve(candidate), reason: "unreadable directory" });
         return;
       }
       children.sort((a, b) => a.name.localeCompare(b.name));
-      for (const child of children) await visit(path33.join(real, child.name), trustedRoot);
+      for (const child of children) await visit(path32.join(real, child.name), trustedRoot);
       return;
     }
-    if (!stat.isFile() || path33.extname(real).toLowerCase() !== ".md") return;
+    if (!stat.isFile() || path32.extname(real).toLowerCase() !== ".md") return;
     if (seenFiles.has(canonical)) return;
     seenFiles.add(canonical);
     try {
@@ -17555,35 +17723,35 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
       const toolsBytes = Buffer.byteLength(metadata.tools, "utf8");
       entries.push({
         kind,
-        path: path33.resolve(real),
+        path: path32.resolve(real),
         description_bytes: descriptionBytes,
         tools_bytes: toolsBytes,
         metadata_bytes: descriptionBytes + toolsBytes,
         estimated_tokens: Math.floor((descriptionBytes + toolsBytes) / 4)
       });
     } catch {
-      diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable file" });
+      diagnostics.push({ path: path32.resolve(candidate), reason: "unreadable file" });
     }
   }
   try {
-    const children = await fs36.promises.readdir(logicalRoot, { withFileTypes: true });
+    const children = await fs35.promises.readdir(logicalRoot, { withFileTypes: true });
     children.sort((a, b) => a.name.localeCompare(b.name));
-    for (const child of children) await visit(path33.join(logicalRoot, child.name), void 0, true);
+    for (const child of children) await visit(path32.join(logicalRoot, child.name), void 0, true);
   } catch {
-    diagnostics.push({ path: path33.resolve(root), reason: "unreadable root" });
+    diagnostics.push({ path: path32.resolve(root), reason: "unreadable root" });
   }
   return entries;
 }
 async function buildBootstrapAudit(opts = {}) {
   const project = resolveProjectRoot(opts.project === void 0 ? {} : { project: opts.project });
-  const home = path33.resolve(opts.home ?? os17.homedir());
+  const home = path32.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(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 agents = await scanMetadataRoot(path32.join(claudeConfigDir(home), "agents"), "agent", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
+  const skills = await scanMetadataRoot(path32.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);
@@ -17650,8 +17818,8 @@ async function runBootstrapAudit(opts = {}) {
 
 // src/cli_memory.ts
 init_define_import_meta_env();
-import * as fs37 from "node:fs";
-import * as path34 from "node:path";
+import * as fs36 from "node:fs";
+import * as path33 from "node:path";
 function removeExactDupLines(text, report) {
   if (report.exactDupLines.length === 0) return text;
   const toRemove = new Set(report.exactDupLines.map(([, dupIdx]) => dupIdx));
@@ -17709,7 +17877,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(path34.basename(m))).join(", ")}
+        `  [${cluster.method}, similarity ${cluster.similarity}, ~${cluster.tokens} tok] ${cluster.members.map((m) => displaySafeText(path33.basename(m))).join(", ")}
 `
       );
     }
@@ -17724,7 +17892,7 @@ async function runMemoryCommand(opts = {}) {
   const claudeMds = findClaudeMdFiles(projectRoot);
   const reports = auditClaudeMd(claudeMds);
   const memoryMdPath = findMemoryMd(projectRoot);
-  const clusters = memoryMdPath !== null ? await findContentDuplicates(path34.dirname(memoryMdPath)) : [];
+  const clusters = memoryMdPath !== null ? await findContentDuplicates(path33.dirname(memoryMdPath)) : [];
   printReport(reports, clusters);
   if (opts.fix !== true) return;
   const changes = [];
@@ -17732,7 +17900,7 @@ async function runMemoryCommand(opts = {}) {
     if (report.exactDupLines.length === 0) continue;
     let before;
     try {
-      before = fs37.readFileSync(report.path, "utf-8");
+      before = fs36.readFileSync(report.path, "utf-8");
     } catch {
       continue;
     }
@@ -17770,8 +17938,8 @@ async function runMemoryCommand(opts = {}) {
 
 // src/cli_waste.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 printCopilotReport(report) {
   const w = (text) => {
     process.stdout.write(text);
@@ -17825,8 +17993,9 @@ function printCopilotReport(report) {
   } else {
     for (const server of mcp.servers) {
       const tokens = server.estimatedTokens.toLocaleString();
+      const calls = report.mcpCalls === null ? "" : `, ${countNoun(report.mcpCalls[server.serverName] ?? 0, "call")} this session`;
       w(`  ${server.serverName}: ${countNoun(server.toolCount, "tool")}, `);
-      w(`${formatBytes(server.definitionBytes)}, ~${tokens} tok
+      w(`${formatBytes(server.definitionBytes)}, ~${tokens} tok${calls}
 `);
     }
     const mcpTokens = mcp.servers.reduce((sum, server) => sum + server.estimatedTokens, 0);
@@ -17846,6 +18015,15 @@ function printCopilotReport(report) {
       w("  tool-filter flags above still can.\n");
     }
     w("  Dropping a server saves its line above on every request for the rest of the session.\n");
+    const unused = unusedMcpServers(report);
+    if (unused === null) {
+      w("  This log records no tool calls, so it cannot say which servers went unused.\n");
+    } else {
+      for (const server of unused) w(`  Never called this session: \`copilot mcp disable ${server.serverName}\` drops it from future sessions.
+`);
+      if (unused.length > 0) w(`  ${MCP_DISABLE_NOTE}
+`);
+    }
   }
   if (mcp.unreadable > 0) {
     const verb = mcp.unreadable === 1 ? "is" : "are";
@@ -17972,8 +18150,8 @@ function printResidentContext(resident, w) {
 async function runWasteCommand(opts = {}) {
   const projectRoot = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
   if (opts.transcript !== void 0) {
-    const resolvedPath = path35.resolve(opts.transcript);
-    if (!fs38.existsSync(resolvedPath)) {
+    const resolvedPath = path34.resolve(opts.transcript);
+    if (!fs37.existsSync(resolvedPath)) {
       if (opts.copilot === true) {
         const detail = `Copilot session event log not found: ${resolvedPath}`;
         if (opts.json === true) {
@@ -18013,7 +18191,7 @@ async function runWasteCommand(opts = {}) {
   }
   if (opts.copilot === true) {
     const eventsPath = opts.project !== void 0 ? findLatestCopilotSession({ projectRoot }) : findLatestCopilotSession({ projectRoot }) ?? findLatestCopilotSession();
-    if (eventsPath === null || !fs38.existsSync(eventsPath)) {
+    if (eventsPath === null || !fs37.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)}
@@ -18070,13 +18248,13 @@ async function runWasteCommand(opts = {}) {
 
 // src/cli_mcp_audit.ts
 init_define_import_meta_env();
-import * as fs39 from "node:fs";
+import * as fs38 from "node:fs";
 import * as os18 from "node:os";
-import * as path36 from "node:path";
+import * as path35 from "node:path";
 function readMcpJsonFile(configPath2) {
   try {
-    if (!fs39.existsSync(configPath2)) return null;
-    const content = fs39.readFileSync(configPath2, "utf-8");
+    if (!fs38.existsSync(configPath2)) return null;
+    const content = fs38.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;
@@ -18092,8 +18270,8 @@ function driveLetterCaseVariants(p) {
 }
 function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   try {
-    if (!fs39.existsSync(claudeJsonPath)) return null;
-    const parsed = JSON.parse(fs39.readFileSync(claudeJsonPath, "utf-8"));
+    if (!fs38.existsSync(claudeJsonPath)) return null;
+    const parsed = JSON.parse(fs38.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, "\\")];
@@ -18111,9 +18289,9 @@ function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   }
 }
 function discoverMcpConfig(projectRoot, home) {
-  const mcpJsonPath = path36.join(projectRoot, ".mcp.json");
-  const claudeJsonPath = path36.join(home, ".claude.json");
-  const copilotJsonPath = path36.join(home, ".copilot", "mcp-config.json");
+  const mcpJsonPath = path35.join(projectRoot, ".mcp.json");
+  const claudeJsonPath = path35.join(home, ".claude.json");
+  const copilotJsonPath = path35.join(home, ".copilot", "mcp-config.json");
   const sourcesChecked = [mcpJsonPath, claudeJsonPath, copilotJsonPath];
   const fromMcpJson = readMcpJsonFile(mcpJsonPath);
   if (fromMcpJson !== null) return { servers: fromMcpJson, sourcePath: mcpJsonPath, sourcesChecked };
@@ -18312,6 +18490,11 @@ async function runStatuslineCommand(opts = {}) {
 
 // src/cli_hint_stats.ts
 init_define_import_meta_env();
+var SESSION_JSON_SCOPE = {
+  session: ["emitted", "actedOn", "efficacyPct", "unobservable", "detected", "bytesEmitted", "legacyEmissions", "totals.spentBytes", "totals.legacyEmissions"],
+  allTime: ["suppressed", "suppressionPermanent", "manualEffective", "manualIneffective"],
+  unavailable: ["totals.savedBytes"]
+};
 function formatSpentCell(row) {
   if (row.emitted === 0) return "n/a";
   if (row.bytesEmitted === null) return "n/a (legacy)";
@@ -18351,6 +18534,16 @@ TOTAL   saved-bytes=${totals.savedBytes} (all-time, every hint kind)   spent-byt
 `
   );
 }
+function printSessionTotals(totals) {
+  const spent = totals.spentBytes === null ? "n/a" : String(totals.spentBytes);
+  const legacyNote = totals.legacyEmissions > 0 ? ` (excludes ${totals.legacyEmissions} legacy emission(s) recorded before spend tracking)` : "";
+  process.stdout.write(
+    `
+TOTAL (this session)   spent-bytes=${spent} (hint_emissions ledger only)${legacyNote}
+saved-bytes: not available per session, because the stats ledger it comes from records no session id. Run \`token-goat hint-stats\` without --session-id for the all-time figure.
+`
+  );
+}
 function runHintStatsCommand(opts = {}) {
   if (opts.reset === true) {
     resetHintStats();
@@ -18369,13 +18562,24 @@ function runHintStatsCommand(opts = {}) {
 `);
     return;
   }
-  const rows = getHintStatsSummary();
+  const session = opts.sessionId;
+  const rows = getHintStatsSummary(session);
   if (opts.json === true) {
-    process.stdout.write(`${displaySafeJson(rows, 0)}
+    const payload = session === void 0 ? rows : { session, scope: SESSION_JSON_SCOPE, rows, totals: { savedBytes: null, ...getHintSpendTotals(session) } };
+    process.stdout.write(`${displaySafeJson(payload, 0)}
 `);
     return;
   }
-  if (rows.every((r) => r.emitted === 0 && r.actedOn === 0 && r.unobservable === 0 && r.detected === 0)) {
+  const noEmissions = rows.every((r) => r.emitted === 0 && r.actedOn === 0 && r.unobservable === 0 && r.detected === 0);
+  if (session !== void 0) {
+    process.stdout.write(
+      `Session: ${displaySafeText(session)}
+emitted, undisplayed, acted-on, efficacy and spent-bytes count this session only. suppressed, manual+ and manual- are all-time, across every session: suppression is decided on the whole history, and manual marks carry no session.
+`
+    );
+    if (noEmissions) process.stdout.write("No hint emissions were recorded for this session, so every per-session figure below is 0.\n");
+  }
+  if (session === void 0 && noEmissions) {
     process.stdout.write("No hint emissions recorded yet \u2014 the zeros below are absence of data, not measured ineffectiveness.\n");
   }
   printSummary(rows);
@@ -18401,7 +18605,8 @@ function runHintStatsCommand(opts = {}) {
 hints.backoff_thresholds is empty, so suppression here is permanent rather than a self-healing throttle: ${names} will not emit again on any occasion. Set backoff_thresholds to re-enable probe emissions, or run \`token-goat hint-stats --reset\` to clear the ledger.
 `);
   }
-  printTotals(getHintStatsTotals());
+  if (session === void 0) printTotals(getHintStatsTotals());
+  else printSessionTotals(getHintSpendTotals(session));
 }
 
 // src/cli_session.ts
@@ -18434,7 +18639,7 @@ function cmdWaste(opts = {}) {
   });
 }
 async function cmdAudit(opts = {}) {
-  const { runAuditCommand } = await import("./token-goat-chunk-CXBOFPF4.mjs");
+  const { runAuditCommand } = await import("./token-goat-chunk-67BNIKKO.mjs");
   return runAuditCommand({
     ...opts.project !== void 0 ? { project: opts.project } : {},
     ...opts.transcript !== void 0 ? { transcript: opts.transcript } : {},
@@ -18444,10 +18649,15 @@ async function cmdAudit(opts = {}) {
 async function cmdSessionAudit(opts = {}) {
   let summary;
   try {
-    summary = await auditSessionCorpus({ ...opts.dir !== void 0 ? { dir: opts.dir } : {} });
+    summary = await auditSessionCorpus({ ...opts.dir !== void 0 ? { dir: opts.dir } : {}, ...opts.windowDays !== void 0 ? { windowDays: opts.windowDays } : {} });
   } catch (err2) {
     throw new CliError(err2 instanceof Error ? err2.message : String(err2));
   }
+  if (opts.toolErrors === true) {
+    const { formatToolErrorCensus } = await import("./token-goat-chunk-G23DWHV4.mjs");
+    out(opts.json === true ? displaySafeJson({ filesScanned: summary.filesScanned, windowDays: summary.windowDays, ...summary.toolErrors }, 0) : formatToolErrorCensus(summary.toolErrors, summary));
+    return;
+  }
   out(opts.json === true ? displaySafeJson(summary, 0) : formatSessionAudit(summary));
 }
 async function cmdSessionOutline(sessionIdOrPath, opts = {}) {
@@ -18467,7 +18677,7 @@ ${formatSessionOutline(turns)}`;
 }
 function sessionTranscriptSize(transcriptPath) {
   try {
-    return fs40.statSync(transcriptPath).size;
+    return fs39.statSync(transcriptPath).size;
   } catch {
     return 0;
   }
@@ -18511,30 +18721,46 @@ function cmdStatusline(opts = {}) {
   return runStatuslineCommand({ ...opts.json === true ? { json: true } : {} });
 }
 function cmdHintStats(opts = {}) {
+  if (opts.sessionId !== void 0) {
+    const mutating = [opts.reset === true ? "--reset" : null, opts.markEffective !== void 0 ? "--mark-effective" : null, opts.markIneffective !== void 0 ? "--mark-ineffective" : null].filter((f) => f !== null);
+    if (mutating.length > 0) {
+      throw new CliError(`--session-id cannot be combined with ${mutating.join(", ")}: those change cross-session state (every session's emissions and marks), not one session's view`);
+    }
+  }
+  const session = opts.sessionId === void 0 ? void 0 : resolveHintStatsSession(opts.sessionId);
   if (opts.markEffective !== void 0 && !isHintCategory(opts.markEffective)) {
-    throw new CliError(`--mark-effective must be one of: bash_redirect, bash_recall, read_reread_dedup, read_structural_nav, edit_reread_suggest (got: ${opts.markEffective})`);
+    throw new CliError(`--mark-effective must be one of: ${HINT_CATEGORIES.join(", ")} (got: ${opts.markEffective})`);
   }
   if (opts.markIneffective !== void 0 && !isHintCategory(opts.markIneffective)) {
-    throw new CliError(`--mark-ineffective must be one of: bash_redirect, bash_recall, read_reread_dedup, read_structural_nav, edit_reread_suggest (got: ${opts.markIneffective})`);
+    throw new CliError(`--mark-ineffective must be one of: ${HINT_CATEGORIES.join(", ")} (got: ${opts.markIneffective})`);
   }
   runHintStatsCommand({
     ...opts.json === true ? { json: true } : {},
     ...opts.reset === true ? { reset: true } : {},
     ...opts.markEffective !== void 0 && isHintCategory(opts.markEffective) ? { markEffective: opts.markEffective } : {},
-    ...opts.markIneffective !== void 0 && isHintCategory(opts.markIneffective) ? { markIneffective: opts.markIneffective } : {}
+    ...opts.markIneffective !== void 0 && isHintCategory(opts.markIneffective) ? { markIneffective: opts.markIneffective } : {},
+    ...session !== void 0 ? { sessionId: session } : {}
   });
 }
+function resolveHintStatsSession(arg) {
+  const trimmed = arg.trim();
+  if (trimmed === "") throw new CliError("--session-id needs a session id, or `latest` for the most recent session");
+  if (trimmed !== "latest") return trimmed;
+  const latest = findLatestSessionId();
+  if (latest === null) throw new CliError("--session-id latest: no session state found on disk; pass a session id explicitly");
+  return latest;
+}
 
 // src/cli_skills.ts
 init_define_import_meta_env();
-import * as fs41 from "node:fs";
-import * as path37 from "node:path";
+import * as fs40 from "node:fs";
+import * as path36 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(fs41.readFileSync(filePath));
+  const body = decodeSource(fs40.readFileSync(filePath));
   if (opts.compact === true) {
     const emitted = extractCompactFromMarker(body) ?? body;
     out(emitted);
@@ -18561,7 +18787,7 @@ async function cmdSkillCompact(name, opts) {
       }
       let body2;
       try {
-        body2 = decodeSource(fs41.readFileSync(filePath));
+        body2 = decodeSource(fs40.readFileSync(filePath));
       } catch {
         unresolvable++;
         continue;
@@ -18595,19 +18821,19 @@ async function cmdSkillCompact(name, opts) {
     if (!opts.path.trim()) {
       throw new CliError("--path cannot be empty");
     }
-    if (!fs41.existsSync(opts.path)) {
+    if (!fs40.existsSync(opts.path)) {
       throw new CliError(`skill file not found: ${opts.path}`);
     }
     try {
-      body = fs41.readFileSync(opts.path, "utf-8");
+      body = fs40.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 ?? path37.basename(path37.dirname(path37.resolve(opts.path)));
-    sourcePath = path37.resolve(opts.path);
+    cacheName = name ?? path36.basename(path36.dirname(path36.resolve(opts.path)));
+    sourcePath = path36.resolve(opts.path);
   } else {
     if (name === void 0 || !name.trim()) {
       throw new CliError("skill-compact requires a <name> or --path <file>");
@@ -18616,7 +18842,7 @@ async function cmdSkillCompact(name, opts) {
     if (filePath === null) {
       throw new CliError(`skill '${name}' not found`);
     }
-    body = fs41.readFileSync(filePath, "utf-8");
+    body = fs40.readFileSync(filePath, "utf-8");
     cacheName = name;
     sourcePath = filePath;
   }
@@ -18748,8 +18974,8 @@ async function cmdSkillDiff(name) {
   }
   const newer = versions[0];
   const older = versions[1];
-  const newerBody = await fs41.promises.readFile(path37.resolve(dir, `${newer.outputId}.txt`), "utf-8").catch(() => null);
-  const olderBody = await fs41.promises.readFile(path37.resolve(dir, `${older.outputId}.txt`), "utf-8").catch(() => null);
+  const newerBody = await fs40.promises.readFile(path36.resolve(dir, `${newer.outputId}.txt`), "utf-8").catch(() => null);
+  const olderBody = await fs40.promises.readFile(path36.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;
@@ -18778,7 +19004,7 @@ async function cmdSkillSection(nameHeading, headingArg) {
   if (!filePath) {
     throw new CliError(`skill '${skillName}' not found`);
   }
-  const body = decodeSource(fs41.readFileSync(filePath));
+  const body = decodeSource(fs40.readFileSync(filePath));
   const extracted = extractNamedSection(body, heading);
   if (!extracted) {
     const allHeadings = listSections(filePath);
@@ -18788,10 +19014,10 @@ async function cmdSkillSection(nameHeading, headingArg) {
     }
     const messages = [`Section '${heading}' not found in skill '${skillName}'`];
     const available = filterSimilarHeadings(allHeadings, heading);
-    if (available.length > 0) messages.push(didYouMean(available));
+    if (available.length > 0) messages.push(...didYouMeanLines(available));
     else if (allHeadings.length === 0) messages.push(`skill '${skillName}' has no headings`);
     else messages.push(`Try: token-goat outline ${filePath}`);
-    throw new CliError(messages.join("\n"));
+    throw new CliError(messages);
   }
   out(extracted);
 }
@@ -18801,8 +19027,8 @@ init_define_import_meta_env();
 
 // src/cli_stats.ts
 init_define_import_meta_env();
-import * as fs42 from "node:fs";
-import * as path38 from "node:path";
+import * as fs41 from "node:fs";
+import * as path37 from "node:path";
 function writeRaw(text) {
   const payload = colorStdout() ? text : stripAnsiEscapes(text);
   process.stdout.write(ensureNewline(payload));
@@ -18814,7 +19040,7 @@ function formatTopFiles(ranked) {
   if (ranked.length === 0) return "";
   const lines = ["Top files this session:"];
   for (const { path: filePath, count } of ranked) {
-    const basename10 = path38.basename(filePath);
+    const basename10 = path37.basename(filePath);
     lines.push(`  ${count.toString().padStart(3)}x  ${basename10}  (${filePath})`);
   }
   return lines.join("\n");
@@ -18832,11 +19058,11 @@ function renderTopSessionFiles(topN = 5) {
 function renderTopSessionFilesFromDisk(topN = 5, overrideSessionsDir) {
   try {
     const dir = overrideSessionsDir ?? sessionsDir();
-    if (!fs42.existsSync(dir)) return "";
-    const files = fs42.readdirSync(dir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, mtime: fs42.statSync(path38.join(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).slice(0, 3);
+    if (!fs41.existsSync(dir)) return "";
+    const files = fs41.readdirSync(dir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, mtime: fs41.statSync(path37.join(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).slice(0, 3);
     for (const { name } of files) {
       try {
-        const raw = fs42.readFileSync(path38.join(dir, name), "utf-8");
+        const raw = fs41.readFileSync(path37.join(dir, name), "utf-8");
         const data = JSON.parse(raw);
         const filesList = data["files"];
         if (!Array.isArray(filesList)) continue;
@@ -18858,6 +19084,7 @@ var METHODOLOGY = {
   billing: "They are not GitHub Copilot usage, provider-reported token consumption, or billing data.",
   byte_derived_formula: "Most read, hook, and command entries go through savedTokensFromBytes in src/stats.ts, which is Math.round(bytes_saved / 4). Image entries are the exception: they are priced in visual tokens, not bytes.",
   filter_estimates: "Output compressors record their filter-calculated delta, measured against what the harness would actually have delivered rather than the full command output. Image entries are priced in visual tokens (28x28-pixel patches, capped at the configured vision tier), because an image is not billed by its byte size; where the pixel dimensions are unavailable the tier ceiling is used.",
+  read_command_baselines: "A read command is credited the bytes of what it replaced, less what it printed. Naming a file (read, section, outline and the rest) replaces reading that file whole, capped at 100,000 bytes per file, about what one Read returns before it truncates. A search over files the caller did not name (symbol NAME, semantic) replaces a search plus a read of the one file wanted, so it is credited the largest matched file under the same cap, not every match. refs is credited the one line per reference a plain text search prints, and changed the diff it stands in for; both are shell output, so both are first cut to what the harness would have delivered of it.",
   advisory_events: "Zero-byte, zero-token advisory events show that guidance fired, not that an agent followed it.",
   audit: "Use stats --full or stats --json for source and command breakdowns; reconcile billing with provider-exported usage data."
 };
@@ -18873,6 +19100,7 @@ function renderMethodology(json = false) {
     `\`tokens saved\` is a ${METHODOLOGY.estimate_scope.toLowerCase()} ${METHODOLOGY.billing}`,
     "",
     `- ${METHODOLOGY.byte_derived_formula}`,
+    `- ${METHODOLOGY.read_command_baselines}`,
     `- ${METHODOLOGY.filter_estimates}`,
     `- ${METHODOLOGY.advisory_events}`,
     `- ${METHODOLOGY.audit}`,
@@ -18971,6 +19199,19 @@ function getNewestSessionFiles() {
   const filesArr = Array.isArray(raw["files"]) ? raw["files"] : [];
   return { id: newest.id, sessionCount: blobs.length, filesArr };
 }
+function emitHistoryOutput(allItems, limit, json, emptyMessage, printTable) {
+  const sorted = allItems.sort((a, b) => b.storedAt - a.storedAt);
+  const items = capAndNote(sorted, limit);
+  if (json === true) {
+    process.stdout.write(displaySafeJson(items) + "\n");
+    return;
+  }
+  if (items.length === 0) {
+    process.stdout.write(emptyMessage);
+    return;
+  }
+  printTable(items);
+}
 function cmdBashHistory(opts) {
   const limit = parseLimitOpt("bash-history", opts.limit);
   const blobs = listBlobs(BASH_OUTPUT_SUBDIR);
@@ -18985,24 +19226,17 @@ function cmdBashHistory(opts) {
       exitCode: typeof v["exitCode"] === "number" ? v["exitCode"] : -1,
       sizeBytes: typeof v["sizeBytes"] === "number" ? v["sizeBytes"] : 0
     };
-  }).filter((x) => x !== null).sort((a, b) => b.storedAt - a.storedAt);
-  const items = capAndNote(allItems, limit);
-  if (opts.json === true) {
-    process.stdout.write(displaySafeJson(items) + "\n");
-    return;
-  }
-  if (items.length === 0) {
-    process.stdout.write("No bash output entries cached.\n");
-    return;
-  }
-  process.stdout.write(`${pad("id", 18)}  ${pad("bytes", 8)}  ${pad("exit", 4)}  command
+  }).filter((x) => x !== null);
+  emitHistoryOutput(allItems, limit, opts.json, "No bash output entries cached.\n", (items) => {
+    process.stdout.write(`${pad("id", 18)}  ${pad("bytes", 8)}  ${pad("exit", 4)}  command
 `);
-  for (const item of items) {
-    const flatCommand = displaySafeText(item.command);
-    const preview = flatCommand.length > 80 ? flatCommand.slice(0, 77) + "..." : flatCommand;
-    process.stdout.write(`${pad(displaySafeText(item.id), 18)}  ${pad(String(item.sizeBytes), 8)}  ${pad(String(item.exitCode), 4)}  ${preview}
+    for (const item of items) {
+      const flatCommand = displaySafeText(item.command);
+      const preview = flatCommand.length > 80 ? flatCommand.slice(0, 77) + "..." : flatCommand;
+      process.stdout.write(`${pad(displaySafeText(item.id), 18)}  ${pad(String(item.sizeBytes), 8)}  ${pad(String(item.exitCode), 4)}  ${preview}
 `);
-  }
+    }
+  });
 }
 function cmdWebHistory(opts) {
   const limit = parseLimitOpt("web-history", opts.limit);
@@ -19016,22 +19250,15 @@ function cmdWebHistory(opts) {
       bytes: typeof v["content"] === "string" ? Buffer.byteLength(v["content"], "utf8") : 0,
       storedAt: mtime
     };
-  }).filter((x) => x !== null).sort((a, b) => b.storedAt - a.storedAt);
-  const items = capAndNote(allItems, limit);
-  if (opts.json === true) {
-    process.stdout.write(displaySafeJson(items) + "\n");
-    return;
-  }
-  if (items.length === 0) {
-    process.stdout.write("No web output entries cached.\n");
-    return;
-  }
-  process.stdout.write(`${pad("id", 18)}  ${pad("bytes", 8)}  url
+  }).filter((x) => x !== null);
+  emitHistoryOutput(allItems, limit, opts.json, "No web output entries cached.\n", (items) => {
+    process.stdout.write(`${pad("id", 18)}  ${pad("bytes", 8)}  url
 `);
-  for (const item of items) {
-    process.stdout.write(`${pad(displaySafeText(item.id), 18)}  ${pad(String(item.bytes), 8)}  ${displaySafeText(item.url)}
+    for (const item of items) {
+      process.stdout.write(`${pad(displaySafeText(item.id), 18)}  ${pad(String(item.bytes), 8)}  ${displaySafeText(item.url)}
 `);
-  }
+    }
+  });
 }
 function cmdMcpHistory(opts) {
   const limit = parseLimitOpt("mcp-history", opts.limit);
@@ -19047,22 +19274,15 @@ function cmdMcpHistory(opts) {
       storedAt: typeof v["storedAt"] === "number" ? v["storedAt"] : mtime,
       sizeBytes: typeof v["sizeBytes"] === "number" ? v["sizeBytes"] : 0
     };
-  }).filter((x) => x !== null).sort((a, b) => b.storedAt - a.storedAt);
-  const items = capAndNote(allItems, limit);
-  if (opts.json === true) {
-    process.stdout.write(displaySafeJson(items) + "\n");
-    return;
-  }
-  if (items.length === 0) {
-    process.stdout.write("No mcp output entries cached.\n");
-    return;
-  }
-  process.stdout.write(`${pad("id", 18)}  ${pad("bytes", 8)}  tool
+  }).filter((x) => x !== null);
+  emitHistoryOutput(allItems, limit, opts.json, "No mcp output entries cached.\n", (items) => {
+    process.stdout.write(`${pad("id", 18)}  ${pad("bytes", 8)}  tool
 `);
-  for (const item of items) {
-    process.stdout.write(`${pad(displaySafeText(item.id), 18)}  ${pad(String(item.sizeBytes), 8)}  ${displaySafeText(item.toolName)}
+    for (const item of items) {
+      process.stdout.write(`${pad(displaySafeText(item.id), 18)}  ${pad(String(item.sizeBytes), 8)}  ${displaySafeText(item.toolName)}
 `);
-  }
+    }
+  });
 }
 function cmdCleanCache(opts) {
   const removed = {};
@@ -19296,7 +19516,7 @@ function registerSessionCommands(program2, guard) {
       })
     )
   );
-  program2.command("capabilities").description("report every capability that can send data off this machine, and its current state").option("-j, --json", "emit as JSON, for asserting on in a pipeline").action(
+  program2.command("capabilities").description("report every capability that can send data off this machine, leave data on it, or listen for other processes on it, and its current state").option("-j, --json", "emit as JSON, for asserting on in a pipeline").action(
     guard((opts) => {
       const caps = collectCapabilities();
       console.log(opts.json ? displaySafeJson({ version: VERSION, capabilities: caps }) : renderCapabilities(caps));
@@ -19309,10 +19529,17 @@ function registerSessionCommands(program2, guard) {
   program2.command("audit").description("session retrospective: analyze the current session transcript (Copilot CLI or Claude Code) and emit a Maintainer Feedback Card").option("--project <path>", "project root to analyze").option("--transcript <path>", "explicit transcript path (default: active or newest session for this project)").option("-j, --json", "output as JSON").action(guard(cmdAudit));
   program2.command("session-outline [session-id-or-path]").description("turn-by-turn structure (role, preview, tool calls, approx size) of a Claude Code session JSONL transcript, instead of a raw Read; defaults to the current project's most recent session").option("--project <path>", "project root to resolve the session transcript against").option("--json", "output JSON").action(guard(cmdSessionOutline));
   program2.command("session-slice [session-id-or-path]").description("full content of one turn range from a Claude Code session JSONL transcript (see session-outline for turn numbers), instead of a raw Read").requiredOption("--range <spec>", "turn range, e.g. 5-9 or 12 (see session-outline for turn numbers)").option("--project <path>", "project root to resolve the session transcript against").option("--json", "output JSON").action(guard(cmdSessionSlice));
-  program2.command("session-audit").alias("audit-session").description("corpus-wide token attribution across every local Claude Code session transcript: measured billed usage, estimated content size by source and by tool, and billed cost by session position (aggregate counts only, never transcript content)").option("--dir <path>", "transcript corpus root to scan (default: ~/.claude/projects)").option("--json", "output JSON").action(guard(cmdSessionAudit));
+  program2.command("session-audit").alias("audit-session").description("corpus-wide token attribution across every local Claude Code session transcript: measured billed usage, estimated content size by source and by tool, and billed cost by session position (aggregate counts only, never transcript content)").option("--dir <path>", "transcript corpus root to scan (default: ~/.claude/projects)").option("--window-days <days>", "only transcripts whose file was modified in the last N days (0 = all time)", "0").option("--tool-errors", "print only the failed-tool-call report: calls, errors, expected failures by reason and unknown ones, per tool and per model, with the top unknown error prefixes").option("--json", "output JSON").action(guard(
+    (opts) => cmdSessionAudit({
+      ...opts.dir !== void 0 ? { dir: opts.dir } : {},
+      ...opts.json === true ? { json: true } : {},
+      ...opts.toolErrors === true ? { toolErrors: true } : {},
+      windowDays: requireNonNegativeInt("--window-days", opts.windowDays)
+    })
+  ));
   program2.command("mcp-audit").description("MCP server schema cost-vs-usage report: estimate per-server token cost from cached tool calls").option("--project <path>", "project root to analyze").option("--json", "output JSON").action(guard(cmdMcpAudit));
   program2.command("recall [query]").description("search across every cached bash-output, web-output, and mcp-output entry (full-text); with no query, list them newest-first").option("--type <type>", "filter to one cache type: bash, web, or mcp").option("--limit <n>", "max results to return (default: 10)").option("--json", "output JSON").action(guard(cmdRecall));
-  program2.command("hint-stats").description("per-category efficacy report for token-goat's discretionary hint hooks (emitted/acted-on/suppression)").option("--json", "output JSON").option("--reset", "clear all tracked emissions and manual marks").option("--mark-effective <category>", 'record a manual "effective" vote for a hint category').option("--mark-ineffective <category>", 'record a manual "ineffective" vote for a hint category').action(guard(cmdHintStats));
+  program2.command("hint-stats").description("per-category efficacy report for token-goat's discretionary hint hooks (emitted/acted-on/suppression); all-time unless --session-id narrows it").option("--json", "output JSON").option("--session-id <id>", "scope emission counts, efficacy and spend to one session id (or `latest`); suppression and manual marks stay all-time, and saved-bytes has no per-session figure").option("--reset", "clear all tracked emissions and manual marks").option("--mark-effective <category>", 'record a manual "effective" vote for a hint category').option("--mark-ineffective <category>", 'record a manual "ineffective" vote for a hint category').action(guard(cmdHintStats));
   program2.command("statusline").description("render one line of terminal status text from a harness statusline payload on stdin (Claude Code statusLine.command)").option("--json", "emit the underlying data as JSON instead of a rendered line (debug)").action(guard(cmdStatusline));
   program2.command("skill-body <name>").description("retrieve a skill's cached body").option("-c, --compact", "print compact slice instead of full body").action(guard(cmdSkillBody));
   program2.command("skill-compact [name]").description("regenerate and cache compact slice for a skill").option("--path <file>", "read the skill body from this file instead of resolving by name").option("--all", "regenerate compacts for all skills, skipping fresh ones").action(guard(cmdSkillCompact));
@@ -19388,11 +19615,44 @@ function registerSessionCommands(program2, guard) {
   program2.command("describe [target] [table]").description("describe columns and structure of a session store table or SQLite database file instead of querying SELECT *").option("-j, --json", "output as JSON").action(guard(cmdDescribe));
 }
 
+// src/cli_hook_server.ts
+init_define_import_meta_env();
+async function cmdHookServerRun(opts) {
+  const slot = Number(opts.slot ?? "0");
+  const { runHookServer } = await import("./token-goat-chunk-ORNFMIER.mjs");
+  try {
+    await runHookServer(slot, (argv) => run(argv));
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    touchMarker("failed", `slot ${slot}: ${message}`);
+    throw new CliError(message);
+  }
+}
+function formatHookServerStatus(s, now = Date.now()) {
+  return `slot ${s.slot}: pid ${s.pid}, v${s.version}, up ${formatAge(now - s.startedAt)}, served ${s.served}, errors ${s.errors}, idle ${formatAge(now - s.lastUsedAt)}`;
+}
+async function cmdHookServerStatus(opts) {
+  const statuses = await serverStatuses();
+  if (opts.json === true) {
+    out(displaySafeJson(statuses));
+    return;
+  }
+  if (statuses.length === 0) {
+    out("No hook server is running. The next hook call starts one.");
+    return;
+  }
+  for (const s of statuses) out(formatHookServerStatus(s));
+}
+async function cmdHookServerStop() {
+  const stopped = await queryServers("stop");
+  out(stopped.length === 0 ? "No hook server is running." : `Stopped ${stopped.length} hook server${stopped.length === 1 ? "" : "s"}.`);
+}
+
 // src/bridges_status.ts
 init_define_import_meta_env();
 var NO_SERVER_HANDLER_REASON = "token-goat has no registered server-side handler for this event (zero registerHook('notification'|'stop', ...) call sites in src/) -- wiring it client-side would currently be a no-op";
 var NO_POST_COMPACT_EVENT_REASON = "post_compact is a Claude Code event (hook_event_name PostCompact, carrying compact_summary); no equivalent has been confirmed for this harness, so it is left unwired rather than guessed at";
-var NO_SEPARATE_FAILURE_EVENT_REASON = "post_tool_use_failure exists because Copilot CLI routes a failed tool result to a separate postToolUseFailure event instead of postToolUse. No separate failure event is wired for this harness, so a failed tool call either arrives on post_tool_use like any other result or is not seen; which of the two has not been checked here";
+var NO_SEPARATE_FAILURE_EVENT_REASON = "post_tool_use_failure exists because Copilot CLI (postToolUseFailure) and Claude Code (PostToolUseFailure) route a failed tool result to a separate event instead of their post-tool one. No separate failure event is wired for this harness, so a failed tool call either arrives on post_tool_use like any other result or is not seen; which of the two has not been checked here";
 var COPILOT_NO_POST_COMPACT_REASON = "Copilot CLI has no post-compaction hook: its HookType enum (schemas/api.schema.json, 1.0.79 and 1.0.80) declares preCompact and no postCompact, and both preCompact call sites in app.js await the hook and never assign its result. Whether the summary is reachable another way is open. app.js does emit session.compaction_complete carrying summaryContent, and the session event writer subscribes to '*' -- but emit() vs emitEphemeral() does NOT gate that writer: dispatchEventHandlers runs outside the ephemeral branch in emitInternal, on('*') early-returns past every filter, and the writer's callback applies no filter of its own before handing the JSON to native recordEventJson. The durable-vs-ephemeral decision is in Rust (api_session_event_writer.rs) and was not readable. Nor is the event uniformly summary-bearing: two of the four emit sites are the branches taken when no summary exists, summaryContent is optional in the schema, and the relay session class emits the same event via emitEphemeral. No compaction has ever been observed on the machines checked, so nothing empirical anchors any of it. Context can be written back on the next turn through userPromptSubmitted additionalContext";
 var VERIFICATION_RANK = {
   dogfooded: 0,
@@ -19411,9 +19671,8 @@ var BRIDGE_CAPABILITY_MATRIX = [
     sourceFile: "src/install.ts (HOOK_EVENT_MAP)",
     verification: "dogfooded",
     verificationNote: "The harness this repo is developed and released under; CLAUDE.md requires every CLI/hook change be run against the built binary here before it ships.",
-    implemented: /* @__PURE__ */ new Set(["pre_tool_use", "post_tool_use", "pre_compact", "post_compact", "user_prompt_submit", "subagent_stop", "session_start"]),
+    implemented: /* @__PURE__ */ new Set(["pre_tool_use", "post_tool_use", "post_tool_use_failure", "pre_compact", "post_compact", "user_prompt_submit", "subagent_stop", "session_start"]),
     reasons: [
-      { events: ["post_tool_use_failure"], reason: NO_SEPARATE_FAILURE_EVENT_REASON },
       { events: ["notification", "stop"], reason: NO_SERVER_HANDLER_REASON }
     ]
   },
@@ -19450,55 +19709,7 @@ var BRIDGE_CAPABILITY_MATRIX = [
       }
     ]
   },
-  /**
-   * What Copilot CLI's wired events can actually carry, read from the shipping 1.0.80 bundle
-   * rather than from its hooks reference page. A row's `implemented` set says an event is wired;
-   * it deliberately says nothing about how much of that event's response the harness honors, and
-   * for Copilot the difference matters:
-   *
-   * - `pre_tool_use` deny is real, and the reason text reaches the model. The native string table
-   *   (runtime.node offset 98057208) carries `permissionDecision`, `permissionDecisionReason`, the
-   *   default "No reason provided." and the formatter "Denied by preToolUse hook: " as distinct
-   *   literals, and app.js sets `{textResultForLlm: reason, resultType: "denied"}` per denial and
-   *   filters that call out of execution. This was previously only an inference drawn from an
-   *   incident comment; it is now confirmed. The fail-closed "(hook errored)" deny-all strings sit
-   *   beside these, so that incident was behavior layered on top of a working deny handler, not a
-   *   substitute for one.
-   * - `post_tool_use` honors `modifiedResult`, so compression, injection fencing and image shrink
-   *   do reach the model: `postToolExecution` (app.js offset 2043150) assigns the returned
-   *   `toolResultJson` onto the tool result in place.
-   * - `post_tool_use` drops `additionalContext` on the JS path -- no supplier for the
-   *   `onAdditionalContext` callback anywhere in the bundle, and no `additional_contexts` key in
-   *   that event's native return payload, unlike its pre-tool sibling. Whether native folds it
-   *   into the returned result instead was not verified.
-   * - Failed tool calls never reach `post_tool_use` at all. Copilot routes them to a separate
-   *   `postToolUseFailure` event, which is handed only a stringified error and honors only
-   *   `additionalContext`; `modifiedResult` is documented as not honored there. So on Copilot the
-   *   output of a failed tool call reaches the model unfenced, uncompressed and unshrunk, and no
-   *   response shape token-goat's shim can emit changes that. Known gap, deliberately recorded.
-   *   What `additionalContext` does on that event is no longer doc-derived: app.js offset 2043380
-   *   reads the native processor's return and, when it carries `additionalContext`, either folds
-   *   it into `textResultForLlm` (if `appendFailureContextToToolResult` is set) or formats it and
-   *   pushes `{content, source: "system"}` onto `toolResult.newMessages`. So the channel is real
-   *   and model-visible -- it just carries advice alongside the failure, never a replacement for
-   *   it. It is wired now, as its own `post_tool_use_failure` event rather than a reuse of
-   *   `post_tool_use`: routing failures through the success event would let success-path handlers
-   *   mark a file as successfully read when the read failed. Because the channel spends tokens
-   *   instead of saving them, its handler (`src/hooks_tool_failure.ts`) stays silent on a first
-   *   failure and speaks only on an exact repeat.
-   * - `pre_compact` is wired and fires, but nothing it returns can reach the model. Both dispatch
-   *   sites call it in statement position and drop the result: app.js offset 2467452 (the manual
-   *   `/compact` path) and offset 2571216 (`case "execute_pre_compact_hook"`). The contrast is
-   *   what makes this conclusive rather than an absence of evidence -- the same `event()` runner's
-   *   return IS read for other events, e.g. `notification` at offset 2296123 assigns it and
-   *   forwards `additionalContext` as a prepended system prompt. The compaction prompt is then
-   *   built from session history and the user's own focus text, with no hook channel into it.
-   *   So token-goat's `pre_compact` registration here is observe-only by construction, not merely
-   *   unused: a future attempt to inject a session manifest through it would silently do nothing.
-   *   Not verified: whether the native declarative runner applies `additionalContext` itself. The
-   *   trail ends in stripped Rust. That it would make the explicit JS handling for `notification`
-   *   and `userPromptSubmitted` redundant is an argument, not a proof.
-   */
+  /** What Copilot CLI's wired events can actually carry, read from the shipping 1.0.80 bundle rather than from its hooks reference page. A row's `implemented` set says an event is wired; it deliberately says nothing about how much of that event's response the harness honors, and for Copilot the difference matters: - `pre_tool_use` deny is real, and the reason text reaches the model. The native string table (runtime.node offset 98057208) carries `permissionDecision`, `permissionDecisionReason`, the default "No reason provided." and the formatter "Denied by preToolUse hook: " as distinct literals, and app.js sets `{textResultForLlm: reason, resultType: "denied"}` per denial and filters that call out of execution. This was previously only an inference drawn from an incident comment; it is now confirmed. The fail-closed "(hook errored)" deny-all strings sit beside these, so that incident was behavior layered on top of a working deny handler, not a substitute for one. - `post_tool_use` honors `modifiedResult`, so compression, injection fencing and image shrink do reach the model: `postToolExecution` (app.js offset 2043150) assigns the returned `toolResultJson` onto the tool result in place. - `post_tool_use` drops `additionalContext` on the JS path -- no supplier for the `onAdditionalContext` callback anywhere in the bundle, and no `additional_contexts` key in that event's native return payload, unlike its pre-tool sibling. Whether native folds it into the returned result instead was not verified. - Failed tool calls never reach `post_tool_use` at all. Copilot routes them to a separate `postToolUseFailure` event, which is handed only a stringified error and honors only `additionalContext`; `modifiedResult` is documented as not honored there. So on Copilot the output of a failed tool call reaches the model unfenced, uncompressed and unshrunk, and no response shape token-goat's shim can emit changes that. Known gap, deliberately recorded. What `additionalContext` does on that event is no longer doc-derived: app.js offset 2043380 reads the native processor's return and, when it carries `additionalContext`, either folds it into `textResultForLlm` (if `appendFailureContextToToolResult` is set) or formats it and pushes `{content, source: "system"}` onto `toolResult.newMessages`. So the channel is real and model-visible -- it just carries advice alongside the failure, never a replacement for it. It is wired now, as its own `post_tool_use_failure` event rather than a reuse of `post_tool_use`: routing failures through the success event would let success-path handlers mark a file as successfully read when the read failed. Because the channel spends tokens instead of saving them, its handler (`src/hooks_tool_failure.ts`) stays silent on a first failure and speaks only on an exact repeat. - `pre_compact` is wired and fires, but nothing it returns can reach the model. Both dispatch sites call it in statement position and drop the result: app.js offset 2467452 (the manual `/compact` path) and offset 2571216 (`case "execute_pre_compact_hook"`). The contrast is what makes this conclusive rather than an absence of evidence -- the same `event()` runner's return IS read for other events, e.g. `notification` at offset 2296123 assigns it and forwards `additionalContext` as a prepended system prompt. The compaction prompt is then built from session history and the user's own focus text, with no hook channel into it. So token-goat's `pre_compact` registration here is observe-only by construction, not merely unused: a future attempt to inject a session manifest through it would silently do nothing. Not verified: whether the native declarative runner applies `additionalContext` itself. The trail ends in stripped Rust. That it would make the explicit JS handling for `notification` and `userPromptSubmitted` redundant is an argument, not a proof. */
   {
     harness: "copilot_cli",
     label: "Copilot CLI",
@@ -19723,25 +19934,25 @@ function installVerificationNotice(harness) {
 
 // src/purge.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";
 function directorySize(root) {
   let total = 0;
   let entries;
   try {
-    entries = fs43.readdirSync(root, { withFileTypes: true });
+    entries = fs42.readdirSync(root, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const full = path39.join(root, entry.name);
+    const full = path38.join(root, entry.name);
     if (entry.isDirectory()) {
       total += directorySize(full);
       continue;
     }
     if (!entry.isFile()) continue;
     try {
-      total += fs43.statSync(full).size;
+      total += fs42.statSync(full).size;
     } catch {
     }
   }
@@ -19760,7 +19971,7 @@ function purgeDataDirectories() {
     }
     const bytes = directorySize(root);
     try {
-      fs43.rmSync(root, { recursive: true, force: true });
+      fs42.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) });
@@ -19907,8 +20118,8 @@ async function getSectionContent(fileId, heading, opts = {}) {
 
 // src/cli_bench.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";
 var ControlFilter = class extends ToolFilter {
   constructor(name, transform) {
     super();
@@ -19929,13 +20140,13 @@ var CONTROL_FILTERS = {
 };
 var MAX_BENCH_FILE_BYTES = 5 * 1024 * 1024;
 function readCaseFile(id, filePath, what) {
-  const bytes = fs44.statSync(filePath).size;
+  const bytes = fs43.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 fs44.readFileSync(filePath, "utf8");
+  return fs43.readFileSync(filePath, "utf8");
 }
 function parseCase(id, metaPath, outputPath) {
   const metaText = readCaseFile(id, metaPath, "metadata");
@@ -19970,7 +20181,7 @@ function parseCase(id, metaPath, outputPath) {
 function loadCorpus(dir) {
   let entries;
   try {
-    entries = fs44.readdirSync(dir);
+    entries = fs43.readdirSync(dir);
   } catch {
     throw new Error(`bench corpus not found: ${dir}`);
   }
@@ -19978,9 +20189,9 @@ function loadCorpus(dir) {
   for (const entry of entries.sort()) {
     if (!entry.endsWith(".json")) continue;
     const id = entry.slice(0, -".json".length);
-    const outputPath = path40.join(dir, `${id}.txt`);
-    if (!fs44.existsSync(outputPath)) throw new Error(`bench case ${id}: missing output file ${outputPath}`);
-    cases.push(parseCase(id, path40.join(dir, entry), outputPath));
+    const outputPath = path39.join(dir, `${id}.txt`);
+    if (!fs43.existsSync(outputPath)) throw new Error(`bench case ${id}: missing output file ${outputPath}`);
+    cases.push(parseCase(id, path39.join(dir, entry), outputPath));
   }
   if (cases.length === 0) throw new Error(`bench corpus is empty: ${dir}`);
   return cases;
@@ -20100,10 +20311,10 @@ function appendTsv(file, report, commit) {
     report.mustKeepTotal,
     report.coveredFilters
   ].join("	");
-  const dir = path40.dirname(path40.resolve(file));
-  fs44.mkdirSync(dir, { recursive: true });
-  const header = fs44.existsSync(file) ? "" : TSV_HEADER;
-  fs44.appendFileSync(file, header + row + "\n", "utf8");
+  const dir = path39.dirname(path39.resolve(file));
+  fs43.mkdirSync(dir, { recursive: true });
+  const header = fs43.existsSync(file) ? "" : TSV_HEADER;
+  fs43.appendFileSync(file, header + row + "\n", "utf8");
 }
 function currentCommit(cwd) {
   const opts = cwd === void 0 ? {} : { cwd };
@@ -20130,7 +20341,16 @@ function runBenchCommand(opts) {
 
 // src/cli.ts
 var CliError = class extends Error {
+  lines;
+  constructor(message) {
+    super(typeof message === "string" ? message : message.join("\n"));
+    this.lines = typeof message === "string" ? void 0 : message;
+  }
 };
+function formatCommandError(e) {
+  if (e instanceof CliError && e.lines !== void 0) return "token-goat: " + e.lines.map(displaySafeText).join("\n");
+  return "token-goat: " + displaySafeText(extractErrorMessage(e));
+}
 function out(text) {
   const payload = colorStdout() ? text : stripAnsiEscapes(text);
   process.stdout.write(ensureNewline(payload));
@@ -20143,10 +20363,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 (fs45.statSync(file).size > CONTENT_MAX_INPUT_CHARS) {
+    if (fs44.statSync(file).size > CONTENT_MAX_INPUT_CHARS) {
       throw new CliError(`file exceeds the ${CONTENT_MAX_INPUT_CHARS}-byte safety limit`);
     }
-    value = fs45.readFileSync(file, "utf8");
+    value = fs44.readFileSync(file, "utf8");
   } else {
     if (text === void 0) throw new CliError("provide text or --file");
     value = text;
@@ -20191,19 +20411,23 @@ function cmdHandoffResolve(name, opts) {
   if (result === null) throw new CliError(`no local handoff named "${name}" in this project`);
   out(typeof result === "string" ? result : formatCompression(result, false, "payload withheld: inlining it would cost more tokens than the original text; pass --full to get the original text back outright"));
 }
-async function cmdSemantic(query, opts) {
+async function cmdSemantic(query, more, opts) {
   if (!query && !opts.preflight && !opts.warm) {
     throw new CliError("missing required argument: query");
   }
+  if (opts.preflight === true && more.length > 0) {
+    throw new CliError("--preflight checks the embedding setup and runs no query; drop the queries, or drop --preflight to search");
+  }
   const limit = opts.limit !== void 0 ? requireNonNegativeInt("--limit", opts.limit) : 20;
-  const { text, code } = await runSemantic(query ?? "", {
+  const semanticOpts = {
     limit,
     ...opts.json === true ? { json: true } : {},
     ...opts.grep !== void 0 ? { grep: opts.grep } : {},
     ...opts.excludeTests === true ? { excludeTests: true } : {},
     ...opts.preflight === true ? { preflight: true } : {},
     ...opts.warm === true ? { warm: true } : {}
-  });
+  };
+  const { text, code } = more.length > 0 ? await runSemanticMulti([query ?? "", ...more], semanticOpts) : await runSemantic(query ?? "", semanticOpts);
   (opts.json === true || code === 0 ? out : err)(text);
   process.exitCode = code;
 }
@@ -20269,7 +20493,7 @@ async function cmdIndex(pathArg, opts = {}) {
       continue;
     }
     const sha = fingerprintFile(key);
-    if (sha === null && !fs45.existsSync(key)) continue;
+    if (sha === null && !fs44.existsSync(key)) continue;
     recordKnownRootThrottled(key, dataDir(), dbPath);
     const entry = sha !== null ? getFileEntry(key, dbPath) : null;
     const spellingStale = entry !== null && indexedPathSpellingIsStale(entry.filePath, key);
@@ -20306,7 +20530,7 @@ async function cmdIndex(pathArg, opts = {}) {
         }
         continue;
       }
-      if (!fs45.existsSync(key)) continue;
+      if (!fs44.existsSync(key)) continue;
     }
     const embedFresh = parseUnchanged ? embedUnchanged : embedFreshFor(getFileEntry(key, dbPath)?.embedSha);
     if (!embedFresh) {
@@ -20367,7 +20591,7 @@ async function cmdMcpServe() {
   let StdioServerTransport;
   try {
     ;
-    ({ createMcpServer } = await import("./token-goat-chunk-5BQ7W7D7.mjs"));
+    ({ createMcpServer } = await import("./token-goat-chunk-PKRWMHVP.mjs"));
     ({ StdioServerTransport } = await import("./token-goat-chunk-EVC4TOLE.mjs"));
   } catch (err2) {
     process.stderr.write(
@@ -20392,11 +20616,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-ADMR3QVF.mjs");
+  const { relay } = await import("./token-goat-chunk-Z6KBMOBI.mjs");
   await relay(event);
 }
 function projectHooksCommitNote(pathFiles, hooksConfigPath) {
-  const shim = hooksConfigPath === void 0 ? "" : ` (${displaySafePath(path41.join(path41.dirname(hooksConfigPath), HOOKS_SCRIPT_FILE))} is generated with them)`;
+  const shim = hooksConfigPath === void 0 ? "" : ` (${displaySafePath(path40.join(path40.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) {
@@ -20429,7 +20653,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-ADMR3QVF.mjs");
+  await import("./token-goat-chunk-Z6KBMOBI.mjs");
   const scope = opts.project === true ? "project" : "user";
   if (wantsClaudeCodeBase(opts)) {
     const result = installHooks(scope);
@@ -20575,16 +20799,16 @@ async function cmdInstall(opts) {
     );
   }
   try {
-    const skillDir2 = path41.join(claudeConfigDir(), "skills");
-    if (fs45.existsSync(skillDir2)) {
-      const entries = fs45.readdirSync(skillDir2, { withFileTypes: true });
+    const skillDir2 = path40.join(claudeConfigDir(), "skills");
+    if (fs44.existsSync(skillDir2)) {
+      const entries = fs44.readdirSync(skillDir2, { withFileTypes: true });
       const skillNames = [];
       const sessionId = getSessionId();
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
-        const skillFile = path41.join(skillDir2, entry.name, "SKILL.md");
-        if (fs45.existsSync(skillFile)) {
-          const body = fs45.readFileSync(skillFile, "utf-8");
+        const skillFile = path40.join(skillDir2, entry.name, "SKILL.md");
+        if (fs44.existsSync(skillFile)) {
+          const body = fs44.readFileSync(skillFile, "utf-8");
           const compact = extractCompactFromMarker(body);
           if (compact === null) continue;
           const sourceSha = contentHash(body);
@@ -20595,9 +20819,9 @@ async function cmdInstall(opts) {
       if (skillNames.length > 0) {
         const dir = skillOutputsDir();
         ensureDirSync(dir);
-        const pregenPath = path41.join(dir, "pregen.json");
+        const pregenPath = path40.join(dir, "pregen.json");
         const pregenData = { ts: Date.now(), names: skillNames };
-        await fs45.promises.writeFile(pregenPath, JSON.stringify(pregenData, null, 2));
+        await fs44.promises.writeFile(pregenPath, JSON.stringify(pregenData, null, 2));
         out(`Pre-generated ${skillNames.length} skill compacts.`);
       }
     }
@@ -20611,7 +20835,7 @@ function cmdMcpStatus(opts) {
   const scope = opts.project === true ? { projectRoot: process.cwd() } : {};
   out(displaySafeJson(opts.vscode === true ? vscodeDecoderConfigured(scope) : visualStudioMcpStatus(scope), 0));
 }
-function cmdUninstall(opts) {
+async function cmdUninstall(opts) {
   if (opts.project === true && opts.user === true) {
     throw new Error("uninstall takes either -p/--project or --user, not both.");
   }
@@ -20661,7 +20885,7 @@ function cmdUninstall(opts) {
   if (opts.hermes === true) {
     out("No separate Hermes integration to remove (it shares the Claude Code hook entries).");
   }
-  if (opts.purge === true) runPurge();
+  if (opts.purge === true) await runPurge();
 }
 function leftoverIntegrations(opts) {
   const candidates = [
@@ -20703,7 +20927,8 @@ function leftoverIntegrations(opts) {
   }
   return found;
 }
-function runPurge() {
+async function runPurge() {
+  await queryServers("stop");
   if (isWorkerRunning()) {
     err('token-goat: the background worker is running, so --purge would delete files it is about to rewrite. Run "token-goat worker stop" first.');
     return;
@@ -20764,7 +20989,7 @@ async function cmdDoctor(opts) {
     doctorOpts.rootDir = project.root;
   }
   if (opts.json === true) {
-    const results = runDoctor(doctorOpts.dataDir, doctorOpts.configPath, doctorOpts.rootDir);
+    const results = await runDoctorChecks(doctorOpts.dataDir, doctorOpts.configPath, doctorOpts.rootDir);
     out(displaySafeJson(results, 0));
     if (results.some((r) => r.status === "fail")) {
       throw new CliError("doctor checks failed");
@@ -20860,7 +21085,7 @@ function cmdBashOutput(id, opts) {
     }
     let content;
     try {
-      const st = fs45.statSync(opts.file);
+      const st = fs44.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`);
       }
@@ -20875,7 +21100,7 @@ function cmdBashOutput(id, opts) {
 `);
         }
       }
-      content = redactIfDotenv(opts.file, decodeSource(fs45.readFileSync(opts.file)));
+      content = redactIfDotenv(opts.file, decodeSource(fs44.readFileSync(opts.file)));
     } catch (e) {
       if (e instanceof CliError) throw e;
       throw new CliError(`cannot read file: ${opts.file}`);
@@ -20939,15 +21164,15 @@ function cmdMcpOutput(id, opts) {
     if (opts.file.includes("\0")) {
       throw new CliError("--file path contains a null byte");
     }
-    if (!fs45.existsSync(opts.file)) {
+    if (!fs44.existsSync(opts.file)) {
       throw new CliError(`file not found: ${opts.file}`);
     }
     try {
-      const st = fs45.statSync(opts.file);
+      const st = fs44.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(fs45.readFileSync(opts.file));
+      content = decodeSource(fs44.readFileSync(opts.file));
     } catch (e) {
       if (e instanceof CliError) throw e;
       throw new CliError(`cannot read file: ${opts.file}`);
@@ -21020,9 +21245,14 @@ async function cmdCompress(commandArgs, opts = {}) {
       process.exitCode = 1;
       return;
     }
-    const bashRunner = await import("./token-goat-chunk-E6B2UFDF.mjs");
+    const bashRunner = await import("./token-goat-chunk-VQ6F6T7X.mjs");
     if (opts.compress === false) {
-      process.exitCode = bashRunner.runRaw(command, parseTimeout(opts.timeout, bashRunner.DEFAULT_TIMEOUT_SECONDS));
+      process.exitCode = bashRunner.runRaw(
+        command,
+        parseTimeout(opts.timeout, bashRunner.DEFAULT_TIMEOUT_SECONDS),
+        opts.native,
+        opts.shell
+      );
       return;
     }
     const maxTokens = opts.maxTokens !== void 0 ? requireNonNegativeInt("--max-tokens", opts.maxTokens) : 0;
@@ -21030,12 +21260,14 @@ async function cmdCompress(commandArgs, opts = {}) {
       filterName: opts.filter,
       timeout: parseTimeout(opts.timeout, bashRunner.DEFAULT_TIMEOUT_SECONDS),
       maxTokens,
+      ...opts.capHintB64 !== void 0 ? { capHint: Buffer.from(opts.capHintB64, "base64").toString("utf8") } : {},
       ...opts.profile !== void 0 ? { compressionProfile: opts.profile } : {},
       ...opts.quietSuccess === true ? { quietSuccess: true } : {},
-      ...opts.native === true ? { nativeShell: true } : {}
+      ...opts.native === true ? { nativeShell: true } : {},
+      ...opts.shell !== void 0 ? { shellType: opts.shell } : {}
     });
   } catch (e) {
-    err(`token-goat: ${displaySafeText(extractErrorMessage(e))}`);
+    err(formatCommandError(e));
     process.exitCode = 1;
   }
 }
@@ -21067,11 +21299,41 @@ ${content}`;
   const bytesSaved = cappedSourceBytesSaved(fullSourceBytes, Buffer.byteLength(toEmit, "utf8"));
   recordStat("gdrive_sections", bytesSaved, savedTokensFromBytes(bytesSaved));
 }
+var READ_ONLY_INDEX_COMMANDS = /* @__PURE__ */ new Set([
+  "symbol",
+  "read",
+  "brief",
+  "section",
+  "semantic",
+  "skeleton",
+  "outline",
+  "refs",
+  "answer",
+  "ask",
+  "map",
+  "exports",
+  "imports",
+  "find",
+  "locate",
+  "callers",
+  "call-chain",
+  "impact",
+  "dead",
+  "deps",
+  "types",
+  "scope",
+  "similar",
+  "context-for",
+  "test-for"
+]);
 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)").option("--notice <text>", "print this line to stdout before the command's own output");
-  program2.hook("preAction", (thisCommand) => {
+  program2.hook("preAction", (thisCommand, actionCommand) => {
+    if (actionCommand.parent === program2 && READ_ONLY_INDEX_COMMANDS.has(actionCommand.name())) {
+      allowReadOnlyIndex(() => err("token-goat: the index database cannot be written here, so this run reads it without writing: no stats are recorded and changed files are not reindexed."));
+    }
     const opts = thisCommand.opts();
     const cwdOverride = opts.cwd;
     if (cwdOverride !== void 0) {
@@ -21106,8 +21368,7 @@ function buildProgram() {
         process.exitCode = 0;
       }
     } catch (e) {
-      const msg = extractErrorMessage(e);
-      err(`token-goat: ${displaySafeText(msg)}`);
+      err(formatCommandError(e));
       process.exitCode = 1;
     }
   };
@@ -21196,7 +21457,7 @@ function buildProgram() {
       )
     );
   });
-  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));
+  program2.command("semantic [query] [more...]").description("semantic search (falls back to full-text search); several queries run in one call, one headed block per query").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));
   const registerSymbolListing = (name, description, run2) => {
     program2.command(`${name} <file> [more...]`).description(description).option("-j, --json", "output as JSON").option("--min-lines <n>", "only show symbols at least N lines long").option("--grep <pattern>", "only show symbols whose name matches this regex (literal substring if it is not valid regex)").option("--force-refresh", "reparse file from disk before querying (ignore stale index)").option("--stats", "add per-symbol reference count and doc-coverage flag").action(
       (file, more, opts) => runExitText(
@@ -21252,7 +21513,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 ?? path41.join("tests", "fixtures", "bench"),
+        corpus: opts.corpus ?? path40.join("tests", "fixtures", "bench"),
         ...opts.tsv !== void 0 ? { tsv: opts.tsv } : {},
         ...opts.validate === true ? { validate: true } : {},
         ...opts.json === true ? { json: true } : {}
@@ -21264,13 +21525,17 @@ function buildProgram() {
   program2.command("handoff-create <name> [text]").description("create a project-local named compressed handoff").option("--file <path>", "read handoff text from a local file instead of the argument").action(guard(cmdHandoffCreate));
   program2.command("handoff-resolve <name>").description("resolve a project-local handoff compactly, or return it in full").option("--full", "return the full handoff text").action(guard(cmdHandoffResolve));
   program2.command("hook <event>").description("hook relay entrypoint (reads JSON on stdin)").option("--harness <name>", "override harness detection for this invocation (sets TOKEN_GOAT_HARNESS_OVERRIDE)").action(guard(cmdHook));
-  program2.command("install").description("install hooks into Claude Code settings").option("-p, --project", "install into project scope instead of user scope").option("--user", "with --vscode, install into user scope instead of this project (every project at once, but nothing past the first folder of a multi-root workspace)").option("--codex", "also patch Codex CLI (~/.codex/config.toml, ~/.codex/AGENTS.md)").option("--gemini", "also patch Gemini CLI (~/.gemini/settings.json)").option("--qwen", "also patch Qwen Code (~/.qwen/settings.json)").option("--kimi", "also register a Kimi Code hook config, shim, instructions block and skill ($KIMI_CODE_HOME or ~/.kimi-code: config.toml, hooks/token-goat-shim.js, AGENTS.md, skills/token-goat/SKILL.md)").option("--pi", "also drop a pi (pi-coding-agent) extension (~/.pi/agent/extensions/token-goat.ts)").option("--opencode", "also drop an opencode plugin (~/.config/opencode/plugins/token-goat.ts, %APPDATA%\\opencode\\plugins\\token-goat.ts on Windows)").option("--hermes", "verify token-goat hooks are present for Hermes Agent (writes nothing new)").option("--openclaw", "also register an OpenClaw plugin (~/.openclaw/openclaw.json, ~/.openclaw/plugins/token-goat.ts)").option("--copilot", "also register a Copilot CLI hook config and routing block (~/.copilot/hooks/token-goat.json, ~/.copilot/hooks/token-goat-shim.js, ~/.copilot/copilot-instructions.md; with --local, <project>/.github/hooks/token-goat.json, <project>/.github/hooks/token-goat-shim.js, <project>/.github/copilot-instructions.md)").option("--grok", "also register a Grok CLI (xAI Grok Build) hook config (~/.grok/hooks/token-goat.json, ~/.grok/hooks/token-goat-shim.js)").option("--vscode", "also configure a VS Code MCP server (the workspace .vscode/mcp.json by default; --user for the user-profile mcp.json) and Copilot routing guidance").option("--visualstudio", "also configure a Visual Studio (2022 17.14+ / 2026) Copilot MCP server and routing guidance, no hooks (%USERPROFILE%\\.mcp.json and %USERPROFILE%\\copilot-instructions.md; -p/--project for <project>/.mcp.json and <project>/.github/copilot-instructions.md)").option("--zed", "also register token-goat as a Zed MCP context server (%APPDATA%\\Zed\\settings.json on Windows, ~/.config/zed/settings.json elsewhere, plus a generated shim script); Zed has no hooks API, so this is user scope only, no -p/--project support").option("--cursor", 'also register a Cursor MCP server (~/.cursor/mcp.json by default; -p/--project for <project>/.cursor/mcp.json); writes no Cursor hooks config -- Cursor already imports the Claude Code hooks "token-goat install" writes to ~/.claude/settings.json').option("--local", "with --pi, install the project-local extension (<project>/.pi/extensions/token-goat.ts) instead of the global one").action(guard(cmdInstall));
-  program2.command("uninstall").description("remove token-goat hooks from Claude Code settings").option("-p, --project", "uninstall from project scope instead of user scope").option("--user", "with --vscode, remove the user-scope install instead of this project one").option("--codex", "also strip the Codex CLI integration (~/.codex/config.toml, ~/.codex/AGENTS.md)").option("--gemini", "also strip the Gemini CLI integration (~/.gemini/settings.json)").option("--qwen", "also strip the Qwen Code integration (~/.qwen/settings.json)").option("--kimi", "also strip the Kimi Code integration (config.toml hooks, hooks/token-goat-shim.js, the AGENTS.md block and skills/token-goat under $KIMI_CODE_HOME or ~/.kimi-code)").option("--pi", "also remove the pi (pi-coding-agent) extension").option("--opencode", "also remove the opencode plugin").option("--hermes", "no-op verification flag for symmetry with install (removes no files)").option("--openclaw", "also remove the OpenClaw plugin and config entry").option("--copilot", "also remove the Copilot CLI hook config and shim script, and strip the token-goat block from ~/.copilot/copilot-instructions.md (or <project>/.github/copilot-instructions.md with --local)").option("--grok", "also remove the Grok CLI hook config and shim script").option("--vscode", "also remove the VS Code MCP server (project scope by default; --user for the user-profile one) and routing guidance").option("--visualstudio", "also remove the Visual Studio MCP server entry and routing guidance (user scope by default; -p/--project for the project one)").option("--zed", "also remove the Zed MCP context server entry and its generated shim script").option("--cursor", "also remove the Cursor MCP server entry (user scope by default; -p/--project for the project one)").option("--local", "with --pi, remove the project-local extension instead of the global one").option("--purge", "also delete the data directories (index, caches, session state, logs); refuses while the worker is running").action(guard(cmdUninstall));
+  program2.command("install").description("install hooks into Claude Code settings, or with harness flags into those harnesses instead").option("-p, --project", "install into project scope instead of user scope").option("--user", "with --vscode, install into user scope instead of this project (every project at once, but nothing past the first folder of a multi-root workspace)").option("--codex", "patch Codex CLI (~/.codex/config.toml, ~/.codex/AGENTS.md)").option("--gemini", "patch Gemini CLI (~/.gemini/settings.json)").option("--qwen", "patch Qwen Code (~/.qwen/settings.json)").option("--kimi", "register a Kimi Code hook config, shim, instructions block and skill ($KIMI_CODE_HOME or ~/.kimi-code: config.toml, hooks/token-goat-shim.cjs, AGENTS.md, skills/token-goat/SKILL.md)").option("--pi", "drop a pi (pi-coding-agent) extension (~/.pi/agent/extensions/token-goat.ts)").option("--opencode", "drop an opencode plugin (~/.config/opencode/plugins/token-goat.ts, %APPDATA%\\opencode\\plugins\\token-goat.ts on Windows)").option("--hermes", "verify token-goat hooks are present for Hermes Agent (writes nothing new)").option("--openclaw", "register an OpenClaw plugin (~/.openclaw/openclaw.json, ~/.openclaw/plugins/token-goat.ts)").option("--copilot", "register a Copilot CLI hook config and routing block (~/.copilot/hooks/token-goat.json, ~/.copilot/hooks/token-goat-shim.cjs, ~/.copilot/copilot-instructions.md; with --local, <project>/.github/hooks/token-goat.json, <project>/.github/hooks/token-goat-shim.cjs, <project>/.github/copilot-instructions.md)").option("--grok", "register a Grok CLI (xAI Grok Build) hook config (~/.grok/hooks/token-goat.json, ~/.grok/hooks/token-goat-shim.cjs)").option("--vscode", "configure a VS Code MCP server (the workspace .vscode/mcp.json by default; --user for the user-profile mcp.json) and Copilot routing guidance").option("--visualstudio", "configure a Visual Studio (2022 17.14+ / 2026) Copilot MCP server and routing guidance, no hooks (%USERPROFILE%\\.mcp.json and %USERPROFILE%\\copilot-instructions.md; -p/--project for <project>/.mcp.json and <project>/.github/copilot-instructions.md)").option("--zed", "register token-goat as a Zed MCP context server (%APPDATA%\\Zed\\settings.json on Windows, ~/.config/zed/settings.json elsewhere, plus a generated shim script); Zed has no hooks API, so this is user scope only, no -p/--project support").option("--cursor", 'register a Cursor MCP server (~/.cursor/mcp.json by default; -p/--project for <project>/.cursor/mcp.json); writes no Cursor hooks config -- Cursor already imports the Claude Code hooks "token-goat install" writes to ~/.claude/settings.json').option("--local", "with --pi, install the project-local extension (<project>/.pi/extensions/token-goat.ts) instead of the global one").action(guard(cmdInstall));
+  program2.command("uninstall").description("remove token-goat hooks from Claude Code settings, or with harness flags from those harnesses instead").option("-p, --project", "uninstall from project scope instead of user scope").option("--user", "with --vscode, remove the user-scope install instead of this project one").option("--codex", "strip the Codex CLI integration (~/.codex/config.toml, ~/.codex/AGENTS.md)").option("--gemini", "strip the Gemini CLI integration (~/.gemini/settings.json)").option("--qwen", "strip the Qwen Code integration (~/.qwen/settings.json)").option("--kimi", "strip the Kimi Code integration (config.toml hooks, hooks/token-goat-shim.cjs, the AGENTS.md block and skills/token-goat under $KIMI_CODE_HOME or ~/.kimi-code)").option("--pi", "remove the pi (pi-coding-agent) extension").option("--opencode", "remove the opencode plugin").option("--hermes", "no-op verification flag for symmetry with install (removes no files)").option("--openclaw", "remove the OpenClaw plugin and config entry").option("--copilot", "remove the Copilot CLI hook config and shim script, and strip the token-goat block from ~/.copilot/copilot-instructions.md (or <project>/.github/copilot-instructions.md with --local)").option("--grok", "remove the Grok CLI hook config and shim script").option("--vscode", "remove the VS Code MCP server (project scope by default; --user for the user-profile one) and routing guidance").option("--visualstudio", "remove the Visual Studio MCP server entry and routing guidance (user scope by default; -p/--project for the project one)").option("--zed", "remove the Zed MCP context server entry and its generated shim script").option("--cursor", "remove the Cursor MCP server entry (user scope by default; -p/--project for the project one)").option("--local", "with --pi, remove the project-local extension instead of the global one").option("--purge", "also delete the data directories (index, caches, session state, logs); refuses while the worker is running").action(guard(cmdUninstall));
   program2.command("mcp-status").description("check whether an MCP integration is already configured (used by the VS Code extension)").option("--vscode", "check VS Code mcp.json (user scope, plus workspace scope with --project)").option("--visualstudio", "check the Visual Studio %USERPROFILE%\\.mcp.json (plus the project .mcp.json with --project)").option("-p, --project", "also check the project file: .vscode/mcp.json for --vscode, .mcp.json for --visualstudio (relative to --cwd or the real cwd)").action(guard(cmdMcpStatus));
   const worker = program2.command("worker").description("background indexer lifecycle");
   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));
+  const hookServer = program2.command("hook-server").description("resident processes that answer hook calls and read-only commands without starting Node for each one");
+  hookServer.command("run", { hidden: true }).description("serve one slot (started automatically by the first hook call)").option("--slot <n>", "which slot to serve", "0").action(guard(cmdHookServerRun));
+  hookServer.command("status").description("list the running hook servers").option("-j, --json", "output as JSON").action(guard(cmdHookServerStatus));
+  hookServer.command("stop").description("stop every running hook server (the next hook call starts a fresh one)").action(guard(cmdHookServerStop));
   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));
@@ -21283,10 +21548,10 @@ function buildProgram() {
   registerAnalysisCommands(program2, guard);
   registerSessionCommands(program2, guard);
   program2.command("gdrive-sections <file-id>").description("fetch and list sections from a public Google Doc").option("--heading <name>", "get content of one named section").option("--fresh", "skip the on-disk cache and force a live fetch").action(guard(cmdGdriveSections));
-  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("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("--shell <type>", "shell interpreter to run under: bash | pwsh | powershell | native").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("--cap-hint-b64 <payload>", "base64 text printed after the output when --max-tokens cut it (the Bash hook sets it to the narrower read command)").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-CQHY4SL7.mjs");
+      const { cmdUpgrade } = await import("./token-goat-chunk-YAGLESS3.mjs");
       await cmdUpgrade(opts, () => cmdInstall({}));
     })()
   );
@@ -21303,8 +21568,19 @@ function buildProgram() {
         return;
       }
       if (cmd) {
+        const known = program2.commands.some((sub) => sub.name() === cmd || sub.aliases().includes(cmd));
+        if (!known) {
+          err(`token-goat: unknown command '${displaySafeText(cmd)}'. Run 'token-goat commands --grep <pattern>' to search the list.`);
+          process.exitCode = 1;
+          return;
+        }
         const argv = [process.argv[0] ?? "node", process.argv[1] ?? "token-goat", cmd, "--help"];
-        program2.parse(argv);
+        try {
+          program2.parse(argv);
+        } catch (e) {
+          const code = e.code;
+          if (code !== "commander.help" && code !== "commander.helpDisplayed") throw e;
+        }
       } else {
         out(generateCompactHelp());
       }
@@ -21325,7 +21601,7 @@ async function run(argv = process.argv) {
     return;
   }
   if (argv[2] === "--batch-serve" && typeof argv[3] === "string") {
-    const { serveBatch } = await import("./token-goat-chunk-E3K3BTEQ.mjs");
+    const { serveBatch } = await import("./token-goat-chunk-ASLWOQ3I.mjs");
     serveBatch(argv[3], (a) => run(a));
     return;
   }
@@ -21349,80 +21625,81 @@ async function run(argv = process.argv) {
       process.exitCode = 1;
       return;
     }
-    const msg = extractErrorMessage(e);
-    err(`token-goat: ${displaySafeText(msg)}`);
+    err(formatCommandError(e));
     process.exitCode = 1;
   }
 }
-
 export {
-  requireInt,
-  requireNonNegativeInt,
-  requirePositiveInt,
-  expandGlobs,
-  fenceFileText,
-  fenceFileFieldIfMatched,
-  fileSizeOrZero,
-  cmdPdfExtract,
-  cmdPdfLocate,
-  cmdPdfOutline,
-  cmdPdfMeta,
-  cmdVideoChapters,
-  cmdSharepointResolve,
-  cmdXlsxSheets,
-  cmdXlsxHead,
-  cmdXlsxColumns,
-  cmdXlsxRange,
-  cmdXlsxQuery,
-  cmdPptxOutline,
-  cmdPptxSlide,
-  cmdPptxNotes,
-  cmdPptxText,
+  CliError,
+  _applyFiltersAndPrint,
+  applyExitOverride,
+  buildProgram,
+  cmdCsvProfile,
+  cmdCsvQuery,
+  cmdDescribe,
   cmdDocxOutline,
   cmdDocxTables,
   cmdDocxText,
-  cmdTranscriptOutline,
-  cmdTranscript,
-  cmdCsvQuery,
-  cmdCsvProfile,
-  cmdJsonOutline,
-  cmdJsonQuery,
-  cmdYamlOutline,
-  cmdYamlQuery,
-  cmdXmlOutline,
-  cmdXmlQuery,
+  cmdHtmlLint,
   cmdHtmlOutline,
   cmdHtmlQuery,
-  cmdHtmlLint,
-  cmdOpenApiOutline,
-  cmdOpenApiOp,
-  cmdZipList,
-  cmdZipRead,
-  cmdNoteAdd,
-  cmdWriteFile,
-  cmdReplace,
-  cmdInsertSection,
-  fenceOcrText,
   cmdImageMeta,
   cmdImageText,
-  cmdSqliteTables,
-  cmdSqliteSchema,
-  cmdSqliteQuery,
+  cmdIndex,
+  cmdInsertSection,
+  cmdJsonOutline,
+  cmdJsonQuery,
+  cmdNoteAdd,
+  cmdOpenApiOp,
+  cmdOpenApiOutline,
+  cmdPdfExtract,
+  cmdPdfLocate,
+  cmdPdfMeta,
+  cmdPdfOutline,
+  cmdPptxNotes,
+  cmdPptxOutline,
+  cmdPptxSlide,
+  cmdPptxText,
+  cmdReplace,
+  cmdSessionSchema,
+  cmdSharepointResolve,
   cmdSkillBody,
   cmdSkillCompact,
-  cmdSkillList,
-  cmdSkillSize,
-  cmdSkillHistory,
   cmdSkillDiff,
+  cmdSkillHistory,
+  cmdSkillList,
   cmdSkillSection,
-  CliError,
-  out,
+  cmdSkillSize,
+  cmdSqliteQuery,
+  cmdSqliteSchema,
+  cmdSqliteTables,
+  cmdTranscript,
+  cmdTranscriptOutline,
+  cmdVideoChapters,
+  cmdWriteFile,
+  cmdXlsxColumns,
+  cmdXlsxHead,
+  cmdXlsxQuery,
+  cmdXlsxRange,
+  cmdXlsxSheets,
+  cmdXmlOutline,
+  cmdXmlQuery,
+  cmdYamlOutline,
+  cmdYamlQuery,
+  cmdZipList,
+  cmdZipRead,
   err,
-  cmdIndex,
-  visualStudioManualSteps,
+  expandGlobs,
+  fenceFileFieldIfMatched,
+  fenceFileText,
+  fenceOcrText,
+  fileSizeOrZero,
+  formatCommandError,
   leftoverIntegrations,
-  _applyFiltersAndPrint,
-  buildProgram,
-  applyExitOverride,
-  run
+  out,
+  requireInt,
+  requireNonNegativeInt,
+  requirePositiveInt,
+  run,
+  visualStudioManualSteps
 };