token-goat 2.9.18 → 2.9.20

package/dist/{token-goat-chunk-LTYWLKAG.mjs → token-goat-chunk-2Q3N5KUQ.mjs}

@@ -1,5 +1,17 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
+import {
+  compareSemver
+} from "./token-goat-chunk-ONMU7BON.mjs";
+import {
+  buildCopilotWasteReport,
+  findLatestCopilotSession,
+  findProjectSession,
+  isCopilotTranscript
+} from "./token-goat-chunk-EUZKG7ZO.mjs";
+import {
+  buildResumePacket
+} from "./token-goat-chunk-W6QYCWAT.mjs";
 import {
   ALL_SYMBOLS_IN_FILE_LIMIT,
   AMBIGUOUS_HEADING_LIMIT,
@@ -10,6 +22,8 @@ import {
   computeFileFingerprint,
   createHandoff,
   didYouMean,
+  emit,
+  emitErr,
   enclosingSymbol,
   extraFileArgsNote,
   extractTranscriptText,
@@ -20,8 +34,10 @@ import {
   isAvailable as isAvailable2,
   load,
   loadError,
+  namedSpecsMergeable,
   queryJson,
   rankSimilarNames,
+  readSpecsMergeable,
   resolveBody,
   resolveHandoff,
   resolveSymbolMatch,
@@ -91,10 +107,11 @@ import {
   symbolNamesInFile,
   upsertNote,
   warnIfFilesStale
-} from "./token-goat-chunk-QML7ITHJ.mjs";
+} from "./token-goat-chunk-3VTJC7KU.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
+  MCP_TOOL_PATTERN,
   WEB_OUTPUT_SUBDIR,
   buildCommandManifest,
   checkSymbolBodySize,
@@ -106,197 +123,219 @@ import {
   getWebOutputByUrlFromDisk,
   getWebOutputRaw,
   readStdinJson,
+  runRecallCommand,
   runReconcile,
   storeWebOutput
-} from "./token-goat-chunk-V3ZWBEHM.mjs";
+} from "./token-goat-chunk-I5PQRHFE.mjs";
+import {
+  buildWasteReport,
+  extractResultText,
+  findLatestTranscript,
+  projectTranscriptsDir,
+  safeStringify
+} from "./token-goat-chunk-BQIC3AVL.mjs";
+import {
+  buildManifest
+} from "./token-goat-chunk-VSJGPEBB.mjs";
 import {
-  AGENT_SALT_MARKER,
-  CONTEXT_AUTOCOMPACT_TOKENS,
   GEMINI_TOOL_NAME_MAP,
-  HOOKS_SCRIPT_FILE,
-  MATERIALIZE_SHRUNK_IMAGE_JS,
   MAX_FILES_SCANNED,
-  SESSIONS_SUBDIR,
-  SKILLS_OUTPUT_SUBDIR,
   SKIP_DIRS,
   WORKER_HEARTBEAT_STALE_MS,
   WorkerAlreadyRunningError,
-  accumulateResidentLine,
   applyIndexingPriority,
   auditClaudeMd,
   buildExtractiveCompact,
-  buildGuidanceBlock,
-  buildGuidanceBody,
   buildLineDiff,
-  buildManifestWithCount,
   buildProjectMap,
   buildStats,
-  bundledCliPath,
-  capJsonRows,
   cmdReclaimIndex,
   compactDoc,
   compactPathFor,
   confirmAndApply,
-  contentHash,
-  copilotCliConfigPath,
-  copilotCliMcpToolsDir,
-  copilotCliScriptPath,
-  copilotCliUserRoot,
-  copilotHooksFilePaths,
-  createResidentContextStats,
   detectWalkMode,
   dirtyQueuePathFor,
   drainHeartbeatPathFor,
-  dropEmptyServers,
   emptyIndexMessage,
   enqueueDirtyPathSafe,
-  estimateTokens,
-  estimateTokensFromLength,
-  extractChecklistSection,
-  extractCompactFromMarker,
-  extractNamedSection,
   fenceUntrusted,
   findClaudeMdFiles,
   findContentDuplicates,
-  findLatestSessionId,
   findMemSuggestionCandidates,
   findMemoryMd,
   findOrphanedChunkPaths,
   findSystemTempFiles,
-  formatAge,
-  formatBytes,
+  findTopIndexedProjects,
   formatMemSuggestions,
   formatProjectMap,
   formatSymbolLocation,
-  formatTokenEstimate,
-  getContextPressure,
   getDirtyPathsFor,
   getEmbeddingCoverage,
   getHintStatsSummary,
   getHintStatsTotals,
   getParserFreshness,
   getProjectIndexCounts,
-  getSessionFiles,
-  getSessionId,
-  getSkillFilePath,
   getTrackedFiles,
-  hasManagedServer,
-  incrementSkillHit,
+  indexSizeBytes,
   injectionFencingEnabled,
-  installCopilotCli,
-  installCopilotHooksFile,
-  installVisualStudio,
   isCompactFresh,
-  isCopilotCliInstalled,
   isHintCategory,
-  isManagedServer,
+  isIgnoredIndexPath,
   isPrivateIpv4Octets,
   isPrivateIpv6Groups,
   isSuppressionCategory,
-  isVisualStudioInstalled,
   isWorkerRunning,
-  jsonc,
-  listOutputs,
-  listSkills,
-  loadSessionCache,
-  managedServer,
   mapLookupBytesSaved,
   markCategoryEffective,
   markCategoryIneffective,
   pruneBlockedRoot,
   pruneDeletedFiles,
   pruneOrphanedChunks,
-  pruneSkillOutputs,
+  pruneOrphanedVectors,
   pruneSystemTempFiles,
+  pruneUnembeddableChunks,
   readCompactBody,
-  readCopilotHooksOwners,
-  readCopilotMcpTools,
-  readServersJson,
-  releaseCopilotHooksFile,
+  reclaimIndex,
+  recordKnownRootThrottled,
   removeFileFromIndex,
   resetHintStats,
   runContextStats,
   runDetachedWorkerDaemon,
   scanAndRecord,
-  serversOf,
-  setTokenGoatServer,
   shrinkImage,
-  skillDescriptionLine,
-  skillOutputsDir,
   startDetachedWorker,
   stopWorker,
-  storeCompact,
-  storeOutput,
-  summarizeResidentContext,
-  syncVisualStudioProjectGuidance,
   toolMatcherFor,
-  trimToBudget,
-  uninstallCopilotCli,
-  uninstallVisualStudio,
   urlPolicyDenialReason,
   visionTokensSavedByText,
+  walkProject,
+  writeCompact
+} from "./token-goat-chunk-DPHJU3P7.mjs";
+import {
+  CompressedOutput,
+  TOOL_FILTERS,
+  ToolFilter,
+  deliverCompressed,
+  detectFromCommand
+} from "./token-goat-chunk-PAVWB4L4.mjs";
+import {
+  HOOKS_SCRIPT_FILE,
+  MATERIALIZE_SHRUNK_IMAGE_JS,
+  buildGuidanceBlock,
+  buildGuidanceBody,
+  bundledCliPath,
+  copilotCliConfigPath,
+  copilotCliMcpToolsDir,
+  copilotCliScriptPath,
+  copilotHooksFilePaths,
+  dropEmptyServers,
+  hasManagedServer,
+  installCopilotCli,
+  installCopilotHooksFile,
+  installVisualStudio,
+  isCopilotCliInstalled,
+  isManagedServer,
+  isResidueServersJson,
+  isVisualStudioInstalled,
+  jsonc,
+  managedServer,
+  readCopilotHooksOwners,
+  readServersJson,
+  releaseCopilotHooksFile,
+  serversOf,
+  setTokenGoatServer,
+  skillDescriptionLine,
+  syncVisualStudioProjectGuidance,
+  uninstallCopilotCli,
+  uninstallVisualStudio,
   visualStudioDuplicateNote,
   visualStudioManagedEntry,
   visualStudioMcpStatus,
   visualStudioOtherScopeHasManagedServer,
   visualStudioProjectMcpPath,
   visualStudioSolutionVscodeMcpPath,
-  visualStudioUserMcpPath,
-  walkProject,
-  writeCompact
-} from "./token-goat-chunk-BFEWOMA3.mjs";
+  visualStudioUserMcpPath
+} from "./token-goat-chunk-SP5QR2HN.mjs";
+import {
+  AGENT_SALT_MARKER,
+  CONTEXT_AUTOCOMPACT_TOKENS,
+  SESSIONS_SUBDIR,
+  SKILLS_OUTPUT_SUBDIR,
+  contentHash,
+  eventCount,
+  extractCompactFromMarker,
+  extractNamedSection,
+  findLatestSessionId,
+  formatAge,
+  getContextPressure,
+  getSessionFiles,
+  getSessionId,
+  getSkillFilePath,
+  incrementSkillHit,
+  listOutputs,
+  listSkills,
+  loadSessionCache,
+  loadSessionState,
+  pruneSkillOutputs,
+  sessionsDir,
+  skillOutputsDir,
+  storeCompact,
+  storeOutput
+} from "./token-goat-chunk-KT75DZK4.mjs";
+import {
+  capJsonRows,
+  claudeConfigDir,
+  estimateTokens,
+  estimateTokensFromLength,
+  formatBytes,
+  formatTokenEstimate,
+  trimToBudget
+} from "./token-goat-chunk-ZHFM4DHJ.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
-  CompressedOutput,
-  FILTERS,
-  RECALL_DEFAULT_LIMIT,
-  TOOL_FILTERS,
-  ToolFilter,
   clipLongMatchLine,
   combineStreams,
-  commandHash,
-  deliverCompressed,
-  detectFromCommand,
   getBashOutput,
-  isRecallCacheType,
-  listRecentRecall,
-  normalizeCommandForCacheKey,
-  searchRecall
-} from "./token-goat-chunk-CTOYJ232.mjs";
+  isRecallCacheType
+} from "./token-goat-chunk-SL454EN5.mjs";
 import {
   C,
   DEFAULT_MAX_AGE_MS,
   DEFAULT_MAX_COUNT,
+  HOOK_STATS_RETENTION_DAYS,
   RESET,
   _useRichStats,
   colorStdout,
   compileCustomPatterns,
   fg,
   formatLocalTimestamp,
+  getGlobalDb,
   listBlobs,
-  loadBlob,
   pruneBlobs,
+  pruneStalePatternCoveredUnmappedTools,
   readUnmappedTools,
   recordStat,
   redactSecrets,
   renderShortStats,
   renderStats,
   savedTokensFromBytes,
-  stripAnsi,
+  statsHasDurationColumn,
+  statsHasHarnessColumn,
+  stripAnsiEscapes,
   summarize
-} from "./token-goat-chunk-HPOFR6QX.mjs";
+} from "./token-goat-chunk-K5XPIUVB.mjs";
 import {
   docxOutline,
   docxTables,
   docxText,
   formatDocxTables
-} from "./token-goat-chunk-UENEL6KX.mjs";
+} from "./token-goat-chunk-PTW22MRC.mjs";
 import {
   pptxNotesText,
   pptxOutline,
   pptxSlideText,
   pptxTextGrep
-} from "./token-goat-chunk-ARNRFR6M.mjs";
+} from "./token-goat-chunk-DNAF26L4.mjs";
 import {
   formatXlsxColumns,
   formatXlsxRange,
@@ -305,13 +344,14 @@ import {
   querySheet,
   rangeSheet,
   xlsxColumns
-} from "./token-goat-chunk-LA3O4JGD.mjs";
+} from "./token-goat-chunk-ODF7H7WS.mjs";
 import {
   formatCsvTable,
   parseWhereSpecs
-} from "./token-goat-chunk-EPXNOKIV.mjs";
+} from "./token-goat-chunk-P4XBHZXU.mjs";
 import {
-  PARSER_FINGERPRINT,
+  assetEmbedSha,
+  deleteFileEmbeddings,
   embeddingBackendLoadError,
   embeddingsDepsAvailable,
   ensureEmbeddingProvenance,
@@ -327,16 +367,19 @@ import {
   isTreeSitterAvailable,
   listSections,
   loadRegexExtractors,
+  maxChunksEmbedSha,
   missingTreeSitterGrammarPackages,
   modelFilesPresent,
+  parserFingerprintForLanguage,
   readSection,
   treeSitterCoreAvailable,
   treeSitterCoreLoadError
-} from "./token-goat-chunk-W3E65QOW.mjs";
+} from "./token-goat-chunk-ERGHDBC6.mjs";
 import {
   getFileEntry,
+  getProjectFileEntries,
   querySymbols
-} from "./token-goat-chunk-I67CPTDD.mjs";
+} from "./token-goat-chunk-K3ZNBN4U.mjs";
 import {
   TREE_SITTER_LANGUAGES,
   detectLanguage,
@@ -347,7 +390,7 @@ import {
   matchGroovySlashy,
   nonTreeSitterLanguageCount,
   redactIfDotenv
-} from "./token-goat-chunk-L7VCX33I.mjs";
+} from "./token-goat-chunk-T63VHOL3.mjs";
 import {
   CONFIG_KEY_ENV_OVERRIDES,
   PROJECT_LOCKED_KEYS,
@@ -376,7 +419,7 @@ import {
   stringify,
   validateEnumField,
   validateNumericField
-} from "./token-goat-chunk-CA6V36KW.mjs";
+} from "./token-goat-chunk-74ADIZZX.mjs";
 import {
   ENV_KEYS,
   LOCK_WAIT_MS_HARDENED,
@@ -402,6 +445,7 @@ import {
   foldPath,
   globalDbPath,
   hookCommandFor,
+  hookExecPartsFor,
   installSingleFilePlugin,
   isTestFile,
   isUnderBlockedRoot,
@@ -414,12 +458,12 @@ import {
   recordCreatedConfig,
   redactUrlQuery,
   removeCreatedBackups,
+  removeEmptyDirInScope,
   removeFileInScope,
   requireNonNegativeStrictInt,
   requirePositiveStrictInt,
   resolveOnPath,
   runGit,
-  safeSlice,
   sleepSync,
   stripDelimitedBlock,
   stripLower,
@@ -436,7 +480,7 @@ import {
   withRetryOnLock,
   writeIfDifferent,
   writeJsonSettings
-} from "./token-goat-chunk-QIDLJGXZ.mjs";
+} from "./token-goat-chunk-6LJNM4ZZ.mjs";
 import {
   UNTRUSTED_FILE_TAG,
   UNTRUSTED_TOOL_TAG,
@@ -450,7 +494,7 @@ import {
   normalizePath,
   resolveIndexPath,
   toDisplayPath
-} from "./token-goat-chunk-ERTXEKB6.mjs";
+} from "./token-goat-chunk-NMTKNYGF.mjs";
 import {
   compileGuardedRegex
 } from "./token-goat-chunk-GMOUBOX4.mjs";
@@ -3584,9 +3628,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * @param {string} [path]
    * @return {(string|null|Command)}
    */
-  executableDir(path44) {
-    if (path44 === void 0) return this._executableDir;
-    this._executableDir = path44;
+  executableDir(path42) {
+    if (path42 === void 0) return this._executableDir;
+    this._executableDir = path42;
     return this;
   }
   /**
@@ -3886,9 +3930,8 @@ function attemptedCommandName(argv) {
 }
 
 // src/cli.ts
-import * as fs47 from "fs";
-import * as path43 from "path";
-import { homedir as homedir20 } from "os";
+import * as fs45 from "fs";
+import * as path41 from "path";
 
 // src/walk_index.ts
 init_define_import_meta_env();
@@ -3941,8 +3984,8 @@ function collectWalkIndexFiles(root, opts = {}) {
 
 // src/install.ts
 init_define_import_meta_env();
+import { spawnSync } from "node:child_process";
 import * as fs3 from "node:fs";
-import * as os2 from "node:os";
 import * as path3 from "node:path";
 
 // src/bridges/claudecode.ts
@@ -3974,15 +4017,18 @@ var SHIM_TRY_IN_PROCESS = `// Attempts the in-process hook call: import()s dist/
 // loaded) and calls its exported relayInProcess() directly, avoiding a second node
 // process spawn entirely. Returns undefined (triggering the spawnSync fallback below)
 // when entryPath is absent, the sibling file doesn't exist (an older install predating
-// this file), or anything else goes wrong -- this must never throw.
-async function tryInProcess(entryPath, eventName, input) {
+// this file), or anything else goes wrong -- this must never throw. harnessWaitMs, when
+// the caller has one (Claude Code's async-detach marker time -- see SHIM_ASYNC_DETACH),
+// is forwarded straight through: this runs in the same process as the caller, so its
+// performance.now() reading shares the same origin and needs no conversion.
+async function tryInProcess(entryPath, eventName, input, harnessWaitMs) {
   if (!entryPath) return undefined
   try {
     const hookLibPath = path.join(path.dirname(entryPath), 'token-goat-hook.mjs')
     if (!require('node:fs').existsSync(hookLibPath)) return undefined
     const mod = await import(pathToFileURL(hookLibPath).href)
     const payload = JSON.parse(input)
-    return await mod.relayInProcess(eventName, payload)
+    return await mod.relayInProcess(eventName, payload, harnessWaitMs)
   } catch {
     return undefined
   }
@@ -3996,6 +4042,52 @@ var SHIM_SPAWN_LADDER = `    const res = entryPath
           maxBuffer: SHIM_MAX_BUFFER_BYTES,
         })`;
 var SHIM_MAX_BUFFER_CONST = `const SHIM_MAX_BUFFER_BYTES = 32 * 1024 * 1024`;
+var SHIM_ASYNC_DETACH = `const ASYNC_DETACH_TOOLS = new Set(['Edit', 'Write', 'MultiEdit', 'NotebookEdit'])
+const ASYNC_DETACH_SKIP_EXT_RE = /\\.(md|mdx|markdown|rst)$/i
+const ASYNC_DETACH_BASH_MAX_BYTES = 200
+// Same key order as OUTPUT_FIRST_TOOL_RESPONSE_KEYS in hooks_common.ts.
+const ASYNC_DETACH_BASH_TEXT_KEYS = ['output', 'content', 'text', 'body', 'stdout', 'stderr']
+function bashResultByteLength(resp) {
+  if (typeof resp === 'string') return Buffer.byteLength(resp, 'utf8')
+  if (resp && typeof resp === 'object') {
+    if (typeof resp['persistedOutputSize'] === 'number') return resp['persistedOutputSize']
+    for (const key of ASYNC_DETACH_BASH_TEXT_KEYS) {
+      if (typeof resp[key] === 'string' && resp[key] !== '') return Buffer.byteLength(resp[key], 'utf8')
+    }
+    return Buffer.byteLength(JSON.stringify(resp), 'utf8')
+  }
+  return 0
+}
+function isAsyncDetachEligible(eventName, input) {
+  if (eventName === 'subagent_stop') return true
+  if (eventName !== 'post_tool_use') return false
+  try {
+    const payload = JSON.parse(input)
+    const toolName = payload['tool_name']
+    if (ASYNC_DETACH_TOOLS.has(toolName)) {
+      const toolInput = payload['tool_input'] || {}
+      const filePath =
+        typeof toolInput['file_path'] === 'string'
+          ? toolInput['file_path']
+          : typeof toolInput['notebook_path'] === 'string'
+            ? toolInput['notebook_path']
+            : ''
+      return !ASYNC_DETACH_SKIP_EXT_RE.test(filePath)
+    }
+    if (toolName === 'Bash') return bashResultByteLength(payload['tool_response']) < ASYNC_DETACH_BASH_MAX_BYTES
+    return false
+  } catch {
+    return false
+  }
+}`;
+var SHIM_OWN_COMMAND_BYPASS = `const TG_CD_PREFIX_RE = /^(?:cd\\s+(?:"[^"]*"|'[^']*'|\\S+)[ \\t]*(?:&&|;|\\r?\\n)\\s*)+/
+const TG_OWN_COMMAND_RE = /^(?:[A-Za-z_][A-Za-z0-9_]*=\\S+\\s+)*(?:token-goat\\b|node(?:\\.exe)?\\s+["']?(?:\\S*[\\\\/])?token-goat(?:\\.mjs)?["']?\\b)/i
+function isOwnTokenGoatCommand(cmd) {
+  if (typeof cmd !== 'string' || cmd.trim() === '') return false
+  const body = (cmd.replace(TG_CD_PREFIX_RE, '') || cmd).trim()
+  if (/[;&|\`]|\\$\\(/.test(body)) return false
+  return TG_OWN_COMMAND_RE.test(body)
+}`;
 
 // src/bridges/claudecode.ts
 var CLAUDECODE_HOOK_SCRIPT = `#!/usr/bin/env node
@@ -4025,6 +4117,10 @@ ${SHIM_TRY_IN_PROCESS}
 
 ${SHIM_MAX_BUFFER_CONST}
 
+${SHIM_ASYNC_DETACH}
+
+${SHIM_OWN_COMMAND_BYPASS}
+
 async function main() {
   const eventName = process.argv[2] || ''
   if (!VALID_HOOK_EVENTS.has(eventName)) {
@@ -4038,6 +4134,32 @@ async function main() {
     process.stdout.write('{}')
     return
   }
+  // A pre_tool_use Bash call that is token-goat's own CLI has nothing for the pipeline below to
+  // say, so this skips the round trip entirely rather than backgrounding it -- see
+  // isOwnTokenGoatCommand's docstring in shim_common.ts for the measured emission rate this
+  // forfeits.
+  if (eventName === 'pre_tool_use') {
+    try {
+      const payload = JSON.parse(input)
+      if (payload['tool_name'] === 'Bash' && isOwnTokenGoatCommand(payload['tool_input'] && payload['tool_input']['command'])) {
+        process.stdout.write('{}')
+        return
+      }
+    } catch {
+      // Fall through to normal handling on unparseable stdin.
+    }
+  }
+  // Print this before the in-process/spawn round trip below, not after: the harness detaches on
+  // the first stdout line it sees, and the whole point is not waiting out that round trip for a
+  // call that was always going to answer '{}'. asyncDetachAtMs, taken at this exact print, is the
+  // last instant this process's elapsed time and the harness's own wait are the same number --
+  // record it now so the finally block in relayInProcess (relay.ts) can report what Claude Code
+  // actually waited on instead of this call's full lifetime.
+  let asyncDetachAtMs
+  if (isAsyncDetachEligible(eventName, input)) {
+    asyncDetachAtMs = performance.now()
+    process.stdout.write('{"async":true}\\n')
+  }
   // process.argv[3], when present, is the absolute path to the running token-goat CLI
   // entry (mirrors the same argv[3]-baked-entry convention used by the Codex/Copilot
   // CLI shims). Try the in-process hook lib first (tryInProcess above), which avoids
@@ -4048,8 +4170,15 @@ async function main() {
   // timeout/killSignal on both spawnSync fallbacks means token-goat degrades to its own
   // fail-open '{}' rather than being force-killed by Claude Code's own hook timeout.
   const entryPath = process.argv[3]
-  let stdout = await tryInProcess(entryPath, eventName, input)
+  let stdout = await tryInProcess(entryPath, eventName, input, asyncDetachAtMs)
   if (stdout === undefined) {
+    // Reaching here with asyncDetachAtMs set means tryInProcess failed after
+    // isAsyncDetachEligible had already parsed this same input successfully, so the cause is an
+    // install missing its dist/token-goat-hook.mjs sibling or a broken import -- never a bad
+    // payload. asyncDetachAtMs is this process's own elapsed time and has no meaning in the
+    // spawned child's clock, so it is deliberately not threaded across that boundary; the child
+    // falls back to timing its own lifetime, the same already-approximate number every hook got
+    // on this fallback path before async-detach existed.
 ${SHIM_SPAWN_LADDER}
       : spawnSync('token-goat hook ' + eventName, {
           input,
@@ -4073,6 +4202,12 @@ main().catch(() => {
 })
 `;
 
+// src/canonical_skill.ts
+init_define_import_meta_env();
+import { gunzipSync } from "node:zlib";
+var CANONICAL_SKILL_GZIP_BASE64 = "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";
+var CANONICAL_SKILL_MD = gunzipSync(Buffer.from(CANONICAL_SKILL_GZIP_BASE64, "base64")).toString("utf8");
+
 // src/install.ts
 var HOOK_EVENT_MAP = [
   ["PreToolUse", "pre_tool_use"],
@@ -4091,18 +4226,56 @@ function anchoredMarkerPattern(marker) {
   return new RegExp(`(?<![a-zA-Z0-9_-])${escaped}(?![a-zA-Z0-9_-])`);
 }
 var HOOK_MARKER_PATTERNS = [SHIM_COMMAND_MARKER, COMMAND_MARKER, ...LEGACY_COMMAND_MARKERS].map(anchoredMarkerPattern);
-function isTokenGoatHookCommand(command) {
-  return HOOK_MARKER_PATTERNS.some((pattern) => pattern.test(command));
+function isTokenGoatHookCommand(command, args) {
+  const haystack = args !== void 0 && args.length > 0 ? `${command} ${args.join(" ")}` : command;
+  return HOOK_MARKER_PATTERNS.some((pattern) => pattern.test(haystack));
+}
+var CLAUDE_EXEC_FORM_MIN_VERSION = "2.1.139";
+var _claudeExecFormHooksSupported;
+function claudeExecFormHooksSupported() {
+  const override = process.env["TOKEN_GOAT_CLAUDE_EXEC_FORM_HOOKS"];
+  if (override === "1") return true;
+  if (override === "0") return false;
+  if (_claudeExecFormHooksSupported !== void 0) return _claudeExecFormHooksSupported;
+  _claudeExecFormHooksSupported = probeClaudeExecFormHooksSupported();
+  return _claudeExecFormHooksSupported;
+}
+function probeClaudeExecFormHooksSupported() {
+  const resolved = resolveOnPath("claude");
+  if (resolved === null) return false;
+  try {
+    const isBatch = /\.(?:cmd|bat)$/i.test(resolved);
+    const comspec = path3.join(process.env["SystemRoot"] ?? process.env["windir"] ?? "C:\\Windows", "System32", "cmd.exe");
+    const result = isBatch ? spawnSync(fs3.existsSync(comspec) ? comspec : "cmd.exe", ["/d", "/s", "/c", resolved, "--version"], { encoding: "utf-8", timeout: 5e3, windowsHide: true }) : spawnSync(resolved, ["--version"], { encoding: "utf-8", timeout: 5e3, windowsHide: true });
+    if (result.status !== 0) return false;
+    return execFormSupportedForVersionOutput(result.stdout ?? "");
+  } catch {
+    return false;
+  }
+}
+function execFormSupportedForVersionOutput(stdout) {
+  const m = /(\d+\.\d+\.\d+)/.exec(stdout);
+  if (!m) return false;
+  return compareSemver(m[1], CLAUDE_EXEC_FORM_MIN_VERSION) >= 0;
+}
+function expectedHookEntryFor(scriptPath, event) {
+  return claudeExecFormHooksSupported() ? hookExecPartsFor(scriptPath, event) : { command: hookCommandFor(scriptPath, event) };
+}
+function hookEntryMatches(command, args, expected) {
+  if (command !== expected.command) return false;
+  const a = args ?? [];
+  const b = expected.args ?? [];
+  return a.length === b.length && a.every((v, i) => v === b[i]);
 }
 function claudeHookScriptPath() {
-  return path3.join(os2.homedir(), ".claude", "hooks", "token-goat-shim.js");
+  return path3.join(claudeConfigDir(), "hooks", "token-goat-shim.js");
 }
 function anyScopeReferencesShim(scriptPath, currentScope, alreadyStripped) {
   const referencesIn = (map) => {
     for (const groups of Object.values(map ?? {})) {
       for (const group of groups) {
         for (const h of group.hooks ?? []) {
-          if (h.command.includes(scriptPath)) return true;
+          if (h.command.includes(scriptPath) || (h.args ?? []).some((a) => a.includes(scriptPath))) return true;
         }
       }
     }
@@ -4116,8 +4289,7 @@ function anyScopeReferencesShim(scriptPath, currentScope, alreadyStripped) {
   return false;
 }
 function settingsPath(scope) {
-  const root = scope === "user" ? os2.homedir() : normalizeDarwinSystemAlias(process.cwd());
-  const base = path3.join(root, ".claude");
+  const base = scope === "user" ? claudeConfigDir() : path3.join(normalizeDarwinSystemAlias(process.cwd()), ".claude");
   return path3.join(base, "settings.json");
 }
 var SettingsParseError = class extends Error {
@@ -4154,7 +4326,7 @@ function groupHasTokenGoat(groups, predicate) {
   if (groups === void 0) return false;
   for (const group of groups) {
     for (const h of group.hooks ?? []) {
-      if (predicate(h.command)) return true;
+      if (predicate(h.command, h.args)) return true;
     }
   }
   return false;
@@ -4176,13 +4348,13 @@ function installHooksScoped(scope) {
   });
   let settingsChanged = false;
   for (const [eventKey, eventArg] of HOOK_EVENT_MAP) {
-    const expectedCommand = hookCommandFor(scriptPath, eventArg);
+    const expected = expectedHookEntryFor(scriptPath, eventArg);
     const existingGroups = hooks[eventKey] ?? [];
     const groups = [];
     let strippedStale = false;
     for (const group of existingGroups) {
       const keptHooks = (group.hooks ?? []).filter((h) => {
-        const isStale = isTokenGoatHookCommand(h.command) && h.command !== expectedCommand;
+        const isStale = isTokenGoatHookCommand(h.command, h.args) && !hookEntryMatches(h.command, h.args, expected);
         if (isStale) strippedStale = true;
         return !isStale;
       });
@@ -4192,7 +4364,7 @@ function installHooksScoped(scope) {
         groups.push(group);
       }
     }
-    const isOurs = (command) => command === expectedCommand;
+    const isOurs = (command, args) => hookEntryMatches(command, args, expected);
     if (groupHasTokenGoat(groups, isOurs)) {
       const narrowed = toolMatcherFor(eventArg);
       let renarrowed = false;
@@ -4201,7 +4373,7 @@ function installHooksScoped(scope) {
           const group = groups[i];
           if (group === void 0) continue;
           const ownHooks = group.hooks ?? [];
-          const isOwnGroup = ownHooks.length > 0 && ownHooks.every((h) => isOurs(h.command));
+          const isOwnGroup = ownHooks.length > 0 && ownHooks.every((h) => isOurs(h.command, h.args));
           if (isOwnGroup && group.matcher !== narrowed) {
             groups[i] = { ...group, matcher: narrowed };
             renarrowed = true;
@@ -4215,7 +4387,7 @@ function installHooksScoped(scope) {
       continue;
     }
     const matcher = toolMatcherFor(eventArg) ?? "";
-    groups.push({ matcher, hooks: [{ type: "command", command: expectedCommand }] });
+    groups.push({ matcher, hooks: [{ type: "command", command: expected.command, ...expected.args !== void 0 ? { args: expected.args } : {} }] });
     hooks[eventKey] = groups;
     settingsChanged = true;
   }
@@ -4259,15 +4431,15 @@ function isInstalled(scope = "user") {
   const scriptPath = claudeHookScriptPath();
   if (!fs3.existsSync(scriptPath)) return false;
   for (const [eventKey, eventArg] of HOOK_EVENT_MAP) {
-    const expectedCommand = hookCommandFor(scriptPath, eventArg);
-    if (!groupHasTokenGoat(hooks[eventKey], (c) => c === expectedCommand)) return false;
+    const expected = expectedHookEntryFor(scriptPath, eventArg);
+    if (!groupHasTokenGoat(hooks[eventKey], (c, a) => hookEntryMatches(c, a, expected))) return false;
   }
   return true;
 }
 var CLAUDE_MD_BEGIN = "<!-- token-goat-begin -->";
 var CLAUDE_MD_END = "<!-- token-goat-end -->";
 function claudeMdPath() {
-  return path3.join(os2.homedir(), ".claude", "CLAUDE.md");
+  return path3.join(claudeConfigDir(), "CLAUDE.md");
 }
 function buildClaudeMdBlock() {
   return buildGuidanceBlock({
@@ -4292,7 +4464,7 @@ function uninstallClaudeMd() {
   return stripClaudeMdBlock(claudeMdPath());
 }
 function findStrayClaudeMdBlocks(searchRoot) {
-  const root = searchRoot ?? path3.join(os2.homedir(), ".claude");
+  const root = searchRoot ?? claudeConfigDir();
   const canonical = path3.resolve(claudeMdPath());
   const found = [];
   if (!fs3.existsSync(root)) return found;
@@ -4335,26 +4507,11 @@ function findStrayClaudeMdBlocks(searchRoot) {
   walk(root, 0);
   return found.sort();
 }
-function skillMdFrontmatter(gdrive) {
-  return `---
-name: token-goat
-${skillDescriptionLine(gdrive)}
-allowed-tools:
-  - Bash
-  - Read
-  - Grep
-  - Glob
----`;
-}
 function skillMdContent() {
-  const gdrive = loadConfig().gdrive.enabled;
-  return `${skillMdFrontmatter(gdrive)}
-
-${buildGuidanceBody("Claude Code's own Read, Grep, and Glob preference rules", { gdrive })}
-`;
+  return CANONICAL_SKILL_MD;
 }
 function skillDir() {
-  return path3.join(os2.homedir(), ".claude", "skills", "token-goat");
+  return path3.join(claudeConfigDir(), "skills", "token-goat");
 }
 function skillPath() {
   return path3.join(skillDir(), "SKILL.md");
@@ -4386,7 +4543,7 @@ function uninstallSkill() {
 init_define_import_meta_env();
 import * as crypto from "node:crypto";
 import * as fs4 from "node:fs";
-import * as os3 from "node:os";
+import * as os2 from "node:os";
 import * as path4 from "node:path";
 
 // src/bridges/codex.ts
@@ -4398,6 +4555,9 @@ ${SHIM_REQUIRES}
 
 ${SHIM_VALID_HOOK_EVENTS}
 
+// Codex sets no env var of its own identifying a hook subprocess; see this module's docblock.
+process.env.TOKEN_GOAT_HARNESS_OVERRIDE = 'codex'
+
 // Keep in sync with CLAUDE_CODE_EVENT_NAMES in src/hook_registry.ts -- the
 // live/wired 'token-goat hook <event>' path (src/relay.ts) always emits this
 // PascalCase spelling for hookSpecificOutput.hookEventName, never the raw
@@ -4526,7 +4686,7 @@ function groupHasTokenGoat2(groups, matcher, predicate) {
 
 // src/bridges/codex_install.ts
 var CODEX_COMMAND_MARKER = "token-goat-shim";
-var CODEX_MATCHERS = ["view_image|shell|bash", "apply_patch", "web_search"];
+var CODEX_MATCHERS = ["view_image|Bash|exec|shell|bash", "apply_patch", "web_search"];
 var CODEX_HOOK_EVENTS = ["PreToolUse", "PostToolUse"];
 var CODEX_EVENT_ARG = {
   PreToolUse: "pre_tool_use",
@@ -4541,13 +4701,13 @@ var CODEX_GLOBAL_EVENT_ARG = {
 var CodexConfigParseError = class extends Error {
 };
 function codexConfigPath() {
-  return path4.join(os3.homedir(), ".codex", "config.toml");
+  return path4.join(os2.homedir(), ".codex", "config.toml");
 }
 function codexAgentsPath() {
-  return path4.join(os3.homedir(), ".codex", "AGENTS.md");
+  return path4.join(os2.homedir(), ".codex", "AGENTS.md");
 }
 function codexHookScriptPath() {
-  return path4.join(os3.homedir(), ".codex", "hooks", "token-goat-shim.js");
+  return path4.join(os2.homedir(), ".codex", "hooks", "token-goat-shim.js");
 }
 function readCodexConfig(p, opts = {}) {
   let raw;
@@ -4809,7 +4969,7 @@ function buildAgentsBlock() {
   return buildGuidanceBlock({
     beginMarker: AGENTS_BEGIN,
     endMarker: AGENTS_END,
-    fallbackToolClause: "Codex's native `shell`, `apply_patch`, and `view_image` tools (shell commands like `cat`/`type` run inside `shell`)",
+    fallbackToolClause: "Codex's native `exec`, `apply_patch`, and `view_image` tools (shell commands like `cat`/`type` run inside `exec`)",
     gdrive: loadConfig().gdrive.enabled
   });
 }
@@ -4823,7 +4983,7 @@ function stripAgentsBlock(p) {
 // src/bridges/gemini_install.ts
 init_define_import_meta_env();
 import * as fs5 from "node:fs";
-import * as os4 from "node:os";
+import * as os3 from "node:os";
 import * as path5 from "node:path";
 var GEMINI_LEGACY_COMMAND_MARKER = "token-goat hook";
 var GEMINI_HOOK_EVENTS = ["BeforeTool", "AfterTool", "PreCompress"];
@@ -4845,7 +5005,7 @@ function registeredInternalTools(eventName) {
 var GeminiSettingsParseError = class extends Error {
 };
 function geminiSettingsPath() {
-  return path5.join(os4.homedir(), ".gemini", "settings.json");
+  return path5.join(os3.homedir(), ".gemini", "settings.json");
 }
 function readGeminiSettings(p, opts = {}) {
   let raw;
@@ -4976,7 +5136,7 @@ function isGeminiInstalled() {
 // src/bridges/qwen_install.ts
 init_define_import_meta_env();
 import * as fs6 from "node:fs";
-import * as os5 from "node:os";
+import * as os4 from "node:os";
 import * as path6 from "node:path";
 var QWEN_HOOK_EVENTS = ["PreToolUse", "PostToolUse", "PreCompact", "UserPromptSubmit", "SubagentStop"];
 var QWEN_EVENT_ARG = {
@@ -4989,7 +5149,7 @@ var QWEN_EVENT_ARG = {
 var QwenSettingsParseError = class extends Error {
 };
 function qwenSettingsPath() {
-  return path6.join(os5.homedir(), ".qwen", "settings.json");
+  return path6.join(os4.homedir(), ".qwen", "settings.json");
 }
 function readQwenSettings(p, opts = {}) {
   let raw;
@@ -5001,10 +5161,10 @@ function readQwenSettings(p, opts = {}) {
   let parsed;
   try {
     parsed = JSON.parse(raw);
-  } catch {
+  } catch (e) {
     if (opts.strict === true) {
       throw new QwenSettingsParseError(
-        `Qwen Code settings file '${p}' exists but contains invalid JSON. Fix or back up the file before running install.`
+        `Qwen Code settings file '${p}' exists but contains invalid JSON. Fix or back up the file before running install. (${extractErrorMessage(e)})`
       );
     }
     return {};
@@ -5093,7 +5253,7 @@ function isQwenInstalled() {
 // src/bridges/kimi_install.ts
 init_define_import_meta_env();
 import * as fs7 from "node:fs";
-import * as os6 from "node:os";
+import * as os5 from "node:os";
 import * as path7 from "node:path";
 
 // src/bridges/kimi.ts
@@ -5202,7 +5362,7 @@ var KimiConfigParseError = class extends Error {
 function kimiHome() {
   const override = process.env["KIMI_CODE_HOME"];
   if (override !== void 0 && override.trim() !== "") return path7.resolve(override);
-  return path7.join(os6.homedir(), ".kimi-code");
+  return path7.join(os5.homedir(), ".kimi-code");
 }
 function kimiConfigPath() {
   return path7.join(kimiHome(), "config.toml");
@@ -5356,7 +5516,7 @@ function isKimiInstalled() {
 // src/bridges/pi_install.ts
 init_define_import_meta_env();
 import * as fs8 from "node:fs";
-import * as os7 from "node:os";
+import * as os6 from "node:os";
 import * as path8 from "node:path";
 
 // src/bridges/pi.ts
@@ -5722,7 +5882,7 @@ export default function (pi: ExtensionAPI) {
 
 // src/bridges/pi_install.ts
 function piGlobalExtensionPath() {
-  return path8.join(os7.homedir(), ".pi", "agent", "extensions", "token-goat.ts");
+  return path8.join(os6.homedir(), ".pi", "agent", "extensions", "token-goat.ts");
 }
 function piLocalExtensionPath() {
   return path8.join(process.cwd(), ".pi", "extensions", "token-goat.ts");
@@ -5758,7 +5918,7 @@ function isPiInstalled(opts = {}) {
 // src/bridges/opencode_install.ts
 init_define_import_meta_env();
 import * as fs9 from "node:fs";
-import * as os8 from "node:os";
+import * as os7 from "node:os";
 import * as path9 from "node:path";
 
 // src/bridges/opencode.ts
@@ -6032,11 +6192,11 @@ function opencodeGlobalConfigDir() {
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
     if (appData !== void 0 && appData.trim() !== "") return appData;
-    return path9.join(os8.homedir(), "AppData", "Roaming");
+    return path9.join(os7.homedir(), "AppData", "Roaming");
   }
   const xdgConfigHome = process.env["XDG_CONFIG_HOME"];
   if (xdgConfigHome !== void 0 && xdgConfigHome.trim() !== "") return xdgConfigHome;
-  return path9.join(os8.homedir(), ".config");
+  return path9.join(os7.homedir(), ".config");
 }
 function opencodePluginPath() {
   return path9.join(opencodeGlobalConfigDir(), "opencode", "plugins", "token-goat.ts");
@@ -6059,7 +6219,7 @@ function isOpencodeInstalled() {
 // src/bridges/openclaw_install.ts
 init_define_import_meta_env();
 import * as fs10 from "node:fs";
-import * as os9 from "node:os";
+import * as os8 from "node:os";
 import * as path10 from "node:path";
 
 // src/bridges/openclaw.ts
@@ -6221,7 +6381,7 @@ var OpenclawConfigParseError = class extends Error {
 };
 var OPENCLAW_PLUGIN_ID = "token-goat";
 function openclawHomeDir() {
-  return path10.join(os9.homedir(), ".openclaw");
+  return path10.join(os8.homedir(), ".openclaw");
 }
 function openclawConfigPath() {
   return path10.join(openclawHomeDir(), "openclaw.json");
@@ -6373,7 +6533,7 @@ function isOpenclawInstalled() {
 // src/bridges/grok_install.ts
 init_define_import_meta_env();
 import * as fs11 from "node:fs";
-import * as os10 from "node:os";
+import * as os9 from "node:os";
 import * as path11 from "node:path";
 
 // src/bridges/grok.ts
@@ -6485,7 +6645,7 @@ var GROK_EVENT_ARG = {
   SubagentStop: "subagent_stop"
 };
 function grokHooksDir() {
-  return path11.join(os10.homedir(), ".grok", "hooks");
+  return path11.join(os9.homedir(), ".grok", "hooks");
 }
 function grokConfigPath() {
   return path11.join(grokHooksDir(), "token-goat.json");
@@ -6535,7 +6695,7 @@ function isGrokInstalled() {
 // src/bridges/vscode_install.ts
 init_define_import_meta_env();
 import * as fs12 from "node:fs";
-import * as os11 from "node:os";
+import * as os10 from "node:os";
 import * as path12 from "node:path";
 var VSCODE_GUIDANCE_BEGIN = "<!-- token-goat-vscode-begin -->";
 var VSCODE_GUIDANCE_END = "<!-- token-goat-vscode-end -->";
@@ -6544,13 +6704,13 @@ var END = VSCODE_GUIDANCE_END;
 function vscodeUserConfigDir() {
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
-    const base = appData !== void 0 && appData.trim() !== "" ? appData : path12.join(os11.homedir(), "AppData", "Roaming");
+    const base = appData !== void 0 && appData.trim() !== "" ? appData : path12.join(os10.homedir(), "AppData", "Roaming");
     return path12.join(base, "Code", "User");
   }
   if (process.platform === "darwin") {
-    return path12.join(os11.homedir(), "Library", "Application Support", "Code", "User");
+    return path12.join(os10.homedir(), "Library", "Application Support", "Code", "User");
   }
-  return path12.join(os11.homedir(), ".config", "Code", "User");
+  return path12.join(os10.homedir(), ".config", "Code", "User");
 }
 function vscodeUserMcpPath() {
   return path12.join(vscodeUserConfigDir(), "mcp.json");
@@ -6565,11 +6725,11 @@ function otherScopeMcpPath(opts) {
   return opts.project === true ? vscodeUserMcpPath() : vscodeProjectMcpPath(opts.projectRoot);
 }
 function vscodeInstructionsPath(opts = {}) {
-  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "copilot-instructions.md") : path12.join(os11.homedir(), ".copilot", "instructions", "token-goat.instructions.md");
+  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "copilot-instructions.md") : path12.join(os10.homedir(), ".copilot", "instructions", "token-goat.instructions.md");
 }
 var USER_INSTRUCTIONS_FRONTMATTER = "---\ndescription: 'token-goat: when to use its MCP tools and CLI instead of reading whole files'\napplyTo: '**'\n---\n";
 function vscodeHooksDir(opts = {}) {
-  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "hooks") : path12.join(os11.homedir(), ".copilot", "hooks");
+  return opts.project === true ? path12.join(path12.resolve(opts.projectRoot ?? process.cwd()), ".github", "hooks") : path12.join(os10.homedir(), ".copilot", "hooks");
 }
 function vscodeScopeFromFlags(flags) {
   return { project: flags.user !== true };
@@ -6715,8 +6875,12 @@ function uninstallVscodeScoped(opts) {
     }
     if (servers && isManagedServer(servers["token-goat"])) {
       const next = dropEmptyServers(updateConfig(config.text, void 0));
-      if (/^\s*\{\s*\}\s*$/.test(next) && takeCreatedConfig(mcpPath)) removeFileInScope(mcpPath);
-      else {
+      if (/^\s*\{\s*\}\s*$/.test(next) && takeCreatedConfig(mcpPath)) {
+        removeFileInScope(mcpPath);
+        if (opts.project === true) {
+          removeEmptyDirInScope(path12.dirname(mcpPath));
+        }
+      } else {
         backupFile(mcpPath);
         atomicWriteText(mcpPath, next);
       }
@@ -6733,16 +6897,31 @@ function uninstallVscodeScoped(opts) {
   if (releaseCopilotHooksFile(vscodeHooksDir(opts), "vscode", opts.keepBackups === true)) removed = true;
   return removed;
 }
+function cleanupDeprecatedVscodeProjectMcp(projectRoot) {
+  const root = path12.resolve(projectRoot ?? process.cwd());
+  return withInstallScope(root, () => {
+    const projectMcp = path12.join(root, ".vscode", "mcp.json");
+    if (!fs12.existsSync(projectMcp)) return false;
+    const text = fs12.readFileSync(projectMcp, "utf8");
+    if (isResidueServersJson(text) && takeCreatedConfig(projectMcp)) {
+      removeFileInScope(projectMcp);
+      removeEmptyDirInScope(path12.dirname(projectMcp));
+      removeCreatedBackups(projectMcp);
+      return true;
+    }
+    return false;
+  });
+}
 
 // src/bridges/cursor_install.ts
 init_define_import_meta_env();
 import * as fs13 from "node:fs";
-import * as os12 from "node:os";
+import * as os11 from "node:os";
 import * as path13 from "node:path";
 var MCP_SERVERS_KEY = "mcpServers";
 var TOKEN_GOAT_ENTRY_KEY = "token-goat";
 function cursorUserConfigDir() {
-  return path13.join(os12.homedir(), ".cursor");
+  return path13.join(os11.homedir(), ".cursor");
 }
 function cursorMcpPath(opts = {}) {
   if (opts.project === true) {
@@ -6817,7 +6996,7 @@ function cursorManagedEntry(mcpPath) {
 // src/bridges/zed_install.ts
 init_define_import_meta_env();
 import * as fs14 from "node:fs";
-import * as os13 from "node:os";
+import * as os12 from "node:os";
 import * as path14 from "node:path";
 var CONTEXT_SERVERS_KEY = "context_servers";
 var TOKEN_GOAT_ENTRY_KEY2 = "token-goat";
@@ -6825,11 +7004,11 @@ var ZED_TIMEOUT_MS = 3e4;
 function zedConfigDir() {
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
-    const base2 = appData !== void 0 && appData.trim() !== "" ? appData : path14.join(os13.homedir(), "AppData", "Roaming");
+    const base2 = appData !== void 0 && appData.trim() !== "" ? appData : path14.join(os12.homedir(), "AppData", "Roaming");
     return path14.join(base2, "Zed");
   }
   const xdgConfig = process.env["XDG_CONFIG_HOME"];
-  const base = xdgConfig !== void 0 && xdgConfig.trim() !== "" ? xdgConfig : path14.join(os13.homedir(), ".config");
+  const base = xdgConfig !== void 0 && xdgConfig.trim() !== "" ? xdgConfig : path14.join(os12.homedir(), ".config");
   return path14.join(base, "zed");
 }
 function zedSettingsPath() {
@@ -6919,13 +7098,88 @@ function zedManagedEntry(settingsPath2) {
 init_define_import_meta_env();
 import * as fs18 from "fs";
 import * as path17 from "path";
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
+
+// src/hook_latency.ts
+init_define_import_meta_env();
+function percentile(sorted, p) {
+  if (sorted.length === 0) return 0;
+  const idx = Math.min(sorted.length - 1, Math.max(0, Math.ceil(p / 100 * sorted.length) - 1));
+  return sorted[idx];
+}
+function formatAgeSeconds(seconds) {
+  if (seconds < 60) return `${seconds}s ago`;
+  if (seconds < 3600) return `${Math.floor(seconds / 60)}m ago`;
+  if (seconds < 86400) return `${Math.floor(seconds / 3600)}h ago`;
+  return `${Math.floor(seconds / 86400)}d ago`;
+}
+function hookLatencyBreakdown(testDb, homeDir) {
+  try {
+    const db = testDb ?? getGlobalDb(homeDir);
+    if (!statsHasDurationColumn(db)) return [];
+    const harnessExpr = statsHasHarnessColumn(db) ? "COALESCE(harness, '')" : "''";
+    const rows = db.prepare(
+      `SELECT kind, ${harnessExpr} AS harness, duration_ms, ts FROM stats
+         WHERE kind LIKE 'hook:%' AND duration_ms IS NOT NULL ORDER BY ts DESC`
+    ).all();
+    const grouped = /* @__PURE__ */ new Map();
+    for (const row of rows) {
+      const event = row.kind.slice("hook:".length);
+      const key = `${event}::${row.harness}`;
+      let g = grouped.get(key);
+      if (g === void 0) {
+        g = { event, harness: row.harness, durations: [], newest_ts: row.ts };
+        grouped.set(key, g);
+      }
+      g.durations.push(row.duration_ms);
+      if (row.ts > g.newest_ts) g.newest_ts = row.ts;
+    }
+    return [...grouped.values()].map((g) => {
+      const sorted = [...g.durations].sort((a, b) => a - b);
+      return {
+        event: g.event,
+        harness: g.harness,
+        count: sorted.length,
+        median_ms: percentile(sorted, 50),
+        p95_ms: percentile(sorted, 95),
+        max_ms: sorted[sorted.length - 1],
+        newest_ts: g.newest_ts
+      };
+    }).sort((a, b) => b.p95_ms - a.p95_ms);
+  } catch {
+    return [];
+  }
+}
+function renderHookLatencyStats(testDb, homeDir) {
+  const rows = hookLatencyBreakdown(testDb, homeDir);
+  if (rows.length === 0) {
+    console.log(`No hook latency recorded in the last ${HOOK_STATS_RETENTION_DAYS} day(s) (or this database predates the duration_ms column).`);
+    return;
+  }
+  const nowTs = Math.floor(Date.now() / 1e3);
+  console.log(`Hook latency, last ${HOOK_STATS_RETENTION_DAYS} day(s) (worst p95 first):`);
+  for (const r of rows) {
+    const age = formatAgeSeconds(Math.max(0, nowTs - r.newest_ts));
+    console.log(
+      `  ${r.event.padEnd(22)} ${(r.harness || "unrecorded").padEnd(12)} n=${String(r.count).padEnd(5)} median ${String(r.median_ms).padStart(5)}ms  p95 ${String(r.p95_ms).padStart(5)}ms  max ${String(r.max_ms).padStart(6)}ms  last seen ${age}`
+    );
+  }
+}
 
 // src/cli_doctor_process.ts
 init_define_import_meta_env();
-import { spawnSync } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 import * as fs15 from "node:fs";
 import * as path15 from "node:path";
+var INTERPRETER_BASENAMES = /* @__PURE__ */ new Set(["node.exe", "python.exe", "python3.exe", "pwsh.exe", "powershell.exe", "cmd.exe"]);
+function describeProcess(commandLine) {
+  for (const m of commandLine.matchAll(/[^\s"]+\.(?:js|mjs|cjs|ts|py|exe)\b/gi)) {
+    const basename10 = m[0].replace(/\\/g, "/").split("/").pop() ?? m[0];
+    if (!INTERPRETER_BASENAMES.has(basename10.toLowerCase())) return basename10;
+  }
+  const trimmed = commandLine.trim();
+  return trimmed.length > 0 ? trimmed.length > 60 ? trimmed.slice(0, 60) + "\u2026" : trimmed : "(no command line)";
+}
 function checkMcpProcessHealth(processes) {
   if (processes === null) {
     return {
@@ -6947,13 +7201,13 @@ function checkMcpProcessHealth(processes) {
     if (chromeLaunchers.length > 1) details.push(`${chromeLaunchers.length} Chrome DevTools MCP launchers (PIDs: ${chromeLaunchers.map((p) => p.processId).join(", ")})`);
     if (playwrightLaunchers.length > 1) details.push(`${playwrightLaunchers.length} Playwright MCP launchers (PIDs: ${playwrightLaunchers.map((p) => p.processId).join(", ")})`);
     if (orphanedNodeProcesses.length > 0) {
-      const pids = orphanedNodeProcesses.map((p) => p.processId).join(", ");
-      details.push(`${orphanedNodeProcesses.length} orphaned Node process${orphanedNodeProcesses.length === 1 ? "" : "es"} (PIDs: ${pids})`);
+      const described = orphanedNodeProcesses.map((p) => `${p.processId} (${describeProcess(p.commandLine)})`).join(", ");
+      details.push(`${orphanedNodeProcesses.length} orphaned Node process${orphanedNodeProcesses.length === 1 ? "" : "es"}: ${described}`);
     }
     return {
       name: "MCP process health",
       status: "warn",
-      message: `${details.join("; ")} detected. These are host-managed processes left by closed terminal/CLI sessions; close stale sessions or terminate specific confirmed orphan PIDs with Stop-Process -Id <PID>.`
+      message: `${details.join("; ")} detected. None of these are token-goat's own processes -- they are host-managed Node/MCP processes left by closed terminal or CLI sessions; confirm what each one is (the name shown above is a starting point) before stopping it with Stop-Process -Id <PID>.`
     };
   }
   return { name: "MCP process health", status: "ok", message: "no duplicate MCP launchers or orphaned Node processes detected" };
@@ -6962,7 +7216,7 @@ function runProcessListCommand() {
   const command = "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress";
   const systemRoot = process.env["SystemRoot"] ?? process.env["windir"] ?? "C:\\Windows";
   const shell = path15.join(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
-  const result = spawnSync(fs15.existsSync(shell) ? shell : "powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
+  const result = spawnSync2(fs15.existsSync(shell) ? shell : "powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
     encoding: "utf8",
     timeout: 2e4,
     maxBuffer: 10 * 1024 * 1024,
@@ -7000,11 +7254,11 @@ function checkWorkerRunning(dataDir2) {
 // src/cli_doctor_platforms.ts
 init_define_import_meta_env();
 import * as fs16 from "node:fs";
-import * as os14 from "node:os";
+import * as os13 from "node:os";
 import * as path16 from "node:path";
 function globalMcpConfigPath() {
   const copilotHome = process.env["COPILOT_HOME"];
-  const root = copilotHome !== void 0 && copilotHome.trim() !== "" ? path16.resolve(copilotHome) : path16.join(os14.homedir(), ".copilot");
+  const root = copilotHome !== void 0 && copilotHome.trim() !== "" ? path16.resolve(copilotHome) : path16.join(os13.homedir(), ".copilot");
   return path16.join(root, "mcp-config.json");
 }
 function checkGlobalMcpConfig(configPath2 = globalMcpConfigPath()) {
@@ -7161,6 +7415,28 @@ function checkStrayClaudeMdBlocks(searchRoot) {
     message: `${strays.length} stray cop${strays.length === 1 ? "y" : "ies"} outside CLAUDE.md (never refreshed by install, never removed by uninstall, will go stale): ${strays.join(", ")}`
   };
 }
+function checkVscodeProjectMcp(projectRoot = process.cwd()) {
+  const mcpPath = path16.join(path16.resolve(projectRoot), ".vscode", "mcp.json");
+  if (!fs16.existsSync(mcpPath)) return null;
+  if (hasManagedServer(mcpPath, "VS Code")) return null;
+  try {
+    const content = fs16.readFileSync(mcpPath, "utf8");
+    if (isResidueServersJson(content)) {
+      return {
+        name: "VS Code project MCP",
+        status: "warn",
+        message: `empty residue file at ${displaySafeText(mcpPath)} triggers Copilot CLI deprecation warnings; delete it or run 'token-goat uninstall --vscode'`
+      };
+    }
+    return {
+      name: "VS Code project MCP",
+      status: "warn",
+      message: `${displaySafeText(mcpPath)} is deprecated by Copilot CLI v1.0.84+; migrate configured servers to .mcp.json or .github/mcp.json (https://gh.io/copilotcli-mcpmigrate)`
+    };
+  } catch {
+    return null;
+  }
+}
 
 // src/cli_doctor_security.ts
 init_define_import_meta_env();
@@ -7285,22 +7561,61 @@ function checkSecurityPosture(cfg, dataDirPath) {
 }
 
 // src/cli_doctor.ts
-var DB_SIZE_WARN_BYTES = 1024 * 1024 * 1024;
+var DB_SIZE_WARN_BYTES = 1500 * 1024 * 1024;
 function freelistBytes(header) {
   if (header.length < 40) return 0;
   const rawPageSize = header.readUInt16BE(16);
   return (rawPageSize === 1 ? 65536 : rawPageSize) * header.readUInt32BE(36);
 }
-function oversizeDbMessage(dbPath, sizeBytes, freeBytes, tempRows) {
+var CATEGORY_COLUMNS = [
+  { name: "symbol bodies", table: "symbols", column: "body", command: "'token-goat reclaim-index --rebuild' drops and re-derives them under the current parser's size cap" },
+  { name: "refs", table: "refs", column: "context", command: "'token-goat reclaim-index --rebuild' drops and re-derives them" },
+  { name: "chunk text", table: "chunks", column: "text", command: "'token-goat reclaim-index --rebuild' drops and re-derives them" },
+  { name: "stats detail", table: "stats", column: "detail", command: "ages out on its own (180-day retention) -- no manual command needed" }
+];
+var VECTOR_BYTES_PER_ROW = 384 * 4;
+function dbCategoryBreakdown(dbPath) {
+  const db = getDb(dbPath);
+  const shares = [];
+  for (const cat of CATEGORY_COLUMNS) {
+    try {
+      const row = db.prepare(`SELECT COALESCE(SUM(LENGTH(${cat.column})), 0) as bytes FROM ${cat.table}`).get();
+      if (row.bytes > 0) shares.push({ name: cat.name, bytes: row.bytes, command: cat.command });
+    } catch {
+    }
+  }
+  try {
+    const row = db.prepare("SELECT COUNT(*) as n FROM chunk_vectors").get();
+    if (row.n > 0) {
+      shares.push({
+        name: "embedding vectors",
+        bytes: row.n * VECTOR_BYTES_PER_ROW,
+        command: "'token-goat reclaim-index --rebuild' drops them (set indexing.embeddings_enabled = false first so they don't regrow)"
+      });
+    }
+  } catch {
+  }
+  return shares.sort((a, b) => b.bytes - a.bytes);
+}
+function oversizeDbMessage(dbPath, sizeBytes, freeBytes, tempRows, categories = [], topConsumers = [], thresholdMb = 1500, autoReclaimEmbeddings = false) {
   const mb = (bytes) => Math.round(bytes / (1024 * 1024));
   const advice = [];
   if (freeBytes >= sizeBytes / 10) advice.push(`'token-goat reclaim-index' returns the ${mb(freeBytes)} MB of it that is free pages`);
   if (tempRows > 0) advice.push(`'token-goat project prune' removes ${countNoun(tempRows, "scratch file")} indexed under the OS temp dir`);
-  const head = `global.db is ${mb(sizeBytes)} MB at ${displaySafeText(dbPath)} (larger than recommended). `;
-  if (advice.length > 0) return `${head}${advice.join("; ")}.`;
-  return `${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.`;
+  if (autoReclaimEmbeddings) {
+    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 breakdown = totalCategoryBytes > 0 ? ` Where it went: ${categories.slice(0, 3).map((c) => `${c.name} ${mb(c.bytes)} MB (${Math.round(c.bytes / totalCategoryBytes * 100)}%) -- ${c.command}`).join("; ")}.` : "";
+  let base = advice.length > 0 ? `${head}${advice.join("; ")}.${breakdown}` : `${head}Only ${mb(freeBytes)} MB of it is free pages and none of it is temp-dir scratch, so it is live index data that neither 'reclaim-index' nor 'project prune' will shrink.${breakdown}`;
+  if (topConsumers.length > 0) {
+    const list = topConsumers.map((c) => `${path17.basename(c.root) || c.root} (${countNoun(c.fileCount, "file")})`).join(", ");
+    base += ` Top index consumers: ${list}.`;
+  }
+  return base;
 }
-function checkDbExists(dataDir2) {
+function checkDbExists(dataDir2, maxDbSizeMb) {
   const dbPath = path17.join(dataDir2, "global.db");
   if (!fs18.existsSync(dbPath)) {
     return {
@@ -7309,7 +7624,7 @@ function checkDbExists(dataDir2) {
       message: `global.db not found at ${dbPath}`
     };
   }
-  const sizeBytes = fs18.statSync(dbPath).size;
+  const sizeBytes = indexSizeBytes(dbPath);
   const SQLITE_HEADER = "SQLite format 3\0";
   let header = "";
   let headerBytes = Buffer.alloc(0);
@@ -7332,13 +7647,35 @@ function checkDbExists(dataDir2) {
       message: `global.db at ${dbPath} is not a valid SQLite file (${sizeBytes} bytes) \u2014 likely truncated or corrupt`
     };
   }
-  if (sizeBytes > DB_SIZE_WARN_BYTES) {
+  const cfg = loadConfig();
+  const thresholdMb = maxDbSizeMb ?? cfg.indexing.max_db_size_mb ?? 1500;
+  const warnBytes = thresholdMb * 1024 * 1024;
+  if (sizeBytes > warnBytes) {
     let tempRows = 0;
     try {
       tempRows = findSystemTempFiles(dbPath).length;
     } catch {
     }
-    return { name: "Database", status: "warn", message: oversizeDbMessage(dbPath, sizeBytes, freelistBytes(headerBytes), tempRows) };
+    let categories = [];
+    try {
+      categories = dbCategoryBreakdown(dbPath);
+    } catch {
+    }
+    const topConsumers = findTopIndexedProjects(dbPath, 3);
+    return {
+      name: "Database",
+      status: "warn",
+      message: oversizeDbMessage(
+        dbPath,
+        sizeBytes,
+        freelistBytes(headerBytes),
+        tempRows,
+        categories,
+        topConsumers,
+        thresholdMb,
+        cfg.indexing.auto_reclaim_embeddings
+      )
+    };
   }
   return {
     name: "Database",
@@ -7421,7 +7758,7 @@ function checkParserFreshness(dbPath, rootDir) {
     return { name: "Parser freshness", status: "ok", message: "no database yet" };
   }
   try {
-    const { indexedFiles, currentFiles } = getParserFreshness(dbPath, PARSER_FINGERPRINT, rootDir);
+    const { indexedFiles, currentFiles } = getParserFreshness(dbPath, parserFingerprintForLanguage, rootDir);
     if (indexedFiles === 0) {
       return { name: "Parser freshness", status: "ok", message: "no indexed files yet" };
     }
@@ -7484,7 +7821,7 @@ function checkInstall() {
   if (resolved !== null) {
     const isBatch = /\.(?:cmd|bat)$/i.test(resolved);
     const comspec = path17.join(process.env["SystemRoot"] ?? process.env["windir"] ?? "C:\\Windows", "System32", "cmd.exe");
-    const result = isBatch ? spawnSync2(fs18.existsSync(comspec) ? comspec : "cmd.exe", ["/d", "/s", "/c", resolved, "--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true }) : spawnSync2(resolved, ["--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true });
+    const result = isBatch ? spawnSync3(fs18.existsSync(comspec) ? comspec : "cmd.exe", ["/d", "/s", "/c", resolved, "--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true }) : spawnSync3(resolved, ["--version"], { encoding: "utf-8", timeout: 15e3, windowsHide: true });
     if (result.status === 0) return { name: "Installation", status: "ok", message: (result.stdout ?? "").trim() };
   }
   return { name: "Installation", status: "fail", message: `token-goat command not found; run: npm install -g ${PACKAGE_NAME}` };
@@ -7633,7 +7970,7 @@ function checkDiskSpace(dataDir2) {
   }
   if (process.platform !== "win32") {
     try {
-      const result = spawnSync2("df", ["-Pk", dataDir2], { encoding: "utf-8" });
+      const result = spawnSync3("df", ["-Pk", dataDir2], { encoding: "utf-8" });
       const stdout = typeof result.stdout === "string" ? result.stdout : "";
       if (result.error === void 0 && result.status === 0 && stdout) {
         const lines = stdout.trim().split("\n");
@@ -7689,7 +8026,7 @@ function checkCopilotCli(configPath2, scriptPath) {
     toolName: "view",
     toolArgs: { path: "doctor-check.txt" }
   });
-  const res = spawnSync2(preToolUseCommand, {
+  const res = spawnSync3(preToolUseCommand, {
     input: synthetic,
     encoding: "utf-8",
     shell: true,
@@ -7724,6 +8061,7 @@ function checkCopilotCli(configPath2, scriptPath) {
 var COMPACTION_CHANNEL_WINDOW = 5;
 var COMPACTION_STATS_BATCH_SIZE = 50;
 var COMPACTION_STATS_SCAN_CEILING = 2e3;
+var COMPACTION_MANIFEST_FIX_VERSION = "2.9.18";
 function checkCompactionChannel(dbPath) {
   const name = "Compaction channel";
   if (!fs18.existsSync(dbPath)) {
@@ -7738,8 +8076,9 @@ function checkCompactionChannel(dbPath) {
     const conclusive = [];
     let offset = 0;
     let scanned = 0;
+    let preFixConclusive = 0;
     for (; ; ) {
-      const batch = db.prepare("SELECT detail FROM stats WHERE kind = 'compact_summary' ORDER BY rowid DESC LIMIT ? OFFSET ?").all(COMPACTION_STATS_BATCH_SIZE, offset);
+      const batch = db.prepare("SELECT detail, tg_version FROM stats WHERE kind = 'compact_summary' ORDER BY rowid DESC LIMIT ? OFFSET ?").all(COMPACTION_STATS_BATCH_SIZE, offset);
       if (batch.length === 0) break;
       offset += batch.length;
       scanned += batch.length;
@@ -7748,6 +8087,10 @@ function checkCompactionChannel(dbPath) {
         if (m === null) continue;
         const sampled = Number(m[2]);
         if (sampled === 0) continue;
+        if (row.tg_version === null || compareSemver(row.tg_version, COMPACTION_MANIFEST_FIX_VERSION) < 0) {
+          preFixConclusive++;
+          continue;
+        }
         conclusive.push({ survived: Number(m[1]), sampled });
         if (conclusive.length >= COMPACTION_CHANNEL_WINDOW) break;
       }
@@ -7755,6 +8098,9 @@ function checkCompactionChannel(dbPath) {
       if (scanned >= COMPACTION_STATS_SCAN_CEILING) break;
     }
     if (conclusive.length === 0) {
+      if (preFixConclusive > 0) {
+        return { name, status: "ok", message: `no post-fix compaction evidence yet -- ${preFixConclusive} compaction(s) found predate ${COMPACTION_MANIFEST_FIX_VERSION}'s manifest-survival fix and are not counted` };
+      }
       return { name, status: "ok", message: "no compaction has been measured yet" };
     }
     const dead = conclusive.filter((c) => c.survived === 0).length;
@@ -7772,20 +8118,58 @@ function checkCompactionChannel(dbPath) {
     return { name, status: "warn", message: `could not read compaction stats: ${extractErrorMessage(e)}` };
   }
 }
-var UNMAPPED_TOOL_SAMPLE = 5;
-function checkUnmappedTools(dbPath) {
-  const name = "Tool names";
+function checkHookLatency(dbPath) {
+  const name = "Hook latency";
   if (!fs18.existsSync(dbPath)) {
     return { name, status: "ok", message: "no database yet" };
   }
   try {
-    const rows = readUnmappedTools(dbPath);
+    const db = getDb(dbPath);
+    const present = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'stats'").get();
+    if (present === void 0) {
+      return { name, status: "ok", message: "no hooks measured yet" };
+    }
+    const rows = hookLatencyBreakdown(db);
     if (rows.length === 0) {
-      return { name, status: "ok", message: "every tool name seen so far reached a handler that wanted it" };
+      return { name, status: "ok", message: "no hook latency recorded yet (or this database predates the duration_ms column)" };
     }
-    const nearMisses = rows.filter(
-      (r) => r.near_miss !== null && r.near_miss !== void 0 && r.near_miss !== r.tool_name
-    );
+    const worst = rows[0];
+    const totalCount = rows.reduce((n, r) => n + r.count, 0);
+    const worstLabel = `${worst.event} (${worst.harness || "unrecorded harness"})`;
+    const budgetMs = loadConfig().hooks.latency_budget_ms;
+    if (worst.p95_ms > budgetMs) {
+      return {
+        name,
+        status: "warn",
+        message: `${worstLabel} is running a p95 of ${worst.p95_ms}ms across ${totalCount} recent hook(s); see 'token-goat stats --hooks' for the full breakdown`
+      };
+    }
+    return { name, status: "ok", message: `worst p95 ${worst.p95_ms}ms (${worstLabel}) across ${totalCount} recent hook(s)` };
+  } catch (e) {
+    return { name, status: "warn", message: `could not read hook latency stats: ${extractErrorMessage(e)}` };
+  }
+}
+var UNMAPPED_TOOL_SAMPLE = 5;
+var UNMAPPED_TOOL_MAX_AGE_DAYS = 7;
+function checkUnmappedTools(dbPath, options) {
+  const name = "Tool names";
+  if (!fs18.existsSync(dbPath)) {
+    return { name, status: "ok", message: "no database yet" };
+  }
+  try {
+    pruneStalePatternCoveredUnmappedTools(getDb(dbPath), [MCP_TOOL_PATTERN]);
+    const rows = readUnmappedTools(dbPath);
+    if (rows.length === 0) {
+      return { name, status: "ok", message: "every tool name seen so far reached a handler that wanted it" };
+    }
+    const maxAgeDays = options?.maxAgeDays ?? UNMAPPED_TOOL_MAX_AGE_DAYS;
+    const nowSecs = options?.nowSecs ?? Math.floor(Date.now() / 1e3);
+    const maxAgeSecs = maxAgeDays * 86400;
+    const nearMisses = rows.filter((r) => {
+      if (r.near_miss === null || r.near_miss === void 0 || r.near_miss === r.tool_name) return false;
+      if (r.last_seen > 0 && nowSecs - r.last_seen > maxAgeSecs) return false;
+      return true;
+    });
     if (nearMisses.length > 0) {
       const shown2 = nearMisses.slice(0, UNMAPPED_TOOL_SAMPLE).map((r) => `${r.harness} sent "${r.tool_name}" where "${r.near_miss}" is handled (${r.event_name}, ${r.hits}x)`);
       const more2 = nearMisses.length > UNMAPPED_TOOL_SAMPLE ? ` (+${nearMisses.length - UNMAPPED_TOOL_SAMPLE} more)` : "";
@@ -7817,11 +8201,13 @@ function runDoctor(dataDir2, configPath2, rootDir, processes) {
   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(checkDbExists(actualDataDir));
+  const cfg = loadConfig(rootDir);
+  results.push(checkDbExists(actualDataDir, cfg.indexing.max_db_size_mb));
   results.push(checkSymbolBodySize(path17.join(actualDataDir, "global.db")));
   results.push(checkSymbolCount(path17.join(actualDataDir, "global.db"), rootDir));
   results.push(checkDirtyQueueHealth(actualDataDir));
   results.push(checkCompactionChannel(path17.join(actualDataDir, "global.db")));
+  results.push(checkHookLatency(path17.join(actualDataDir, "global.db")));
   results.push(checkUnmappedTools(path17.join(actualDataDir, "global.db")));
   const actualConfigPath = configPath2 || configPath();
   results.push(checkConfigValid(actualConfigPath));
@@ -7841,6 +8227,8 @@ function runDoctor(dataDir2, configPath2, rootDir, processes) {
   if (vscodeHooksResult) results.push(vscodeHooksResult);
   const vscodeScopeResult = checkVscodeUserScopeHooks(vscodeHooksInstalled(), vscodeHooksInstalled({ project: true }));
   if (vscodeScopeResult) results.push(vscodeScopeResult);
+  const vscodeProjectMcpResult = checkVscodeProjectMcp(rootDir);
+  if (vscodeProjectMcpResult) results.push(vscodeProjectMcpResult);
   const visualStudioResult = checkVisualStudio([visualStudioUserMcpPath(), visualStudioProjectMcpPath()], [visualStudioSolutionVscodeMcpPath()]);
   if (visualStudioResult) results.push(visualStudioResult);
   const zedResult = checkZed(zedSettingsPath());
@@ -7897,6 +8285,31 @@ async function runDoctorRepair(opts) {
       errors.push(`Failed to download embedding model: ${extractErrorMessage(e)}`);
     }
   }
+  const rootDir = path17.resolve(opts?.rootDir ?? process.cwd());
+  const projectMcp = path17.join(rootDir, ".vscode", "mcp.json");
+  try {
+    if (cleanupDeprecatedVscodeProjectMcp(rootDir)) {
+      repairs.push(`Removed empty deprecated VS Code MCP residue file at ${displaySafeText(projectMcp)}`);
+    }
+  } catch (e) {
+    errors.push(`Failed to clean up ${displaySafeText(projectMcp)}: ${extractErrorMessage(e)}`);
+  }
+  const actualDataDir = opts?.dataDir ?? dataDir();
+  const dbPath = path17.join(actualDataDir, "global.db");
+  if (cfg.indexing.auto_reclaim_embeddings && fs18.existsSync(dbPath)) {
+    try {
+      const sizeBytes = indexSizeBytes(dbPath);
+      const thresholdMb = cfg.indexing.max_db_size_mb ?? 1500;
+      const maxBytes = thresholdMb * 1024 * 1024;
+      if (sizeBytes > maxBytes) {
+        const res = reclaimIndex(dbPath, { embeddingsOnly: true });
+        const savedMb = Math.round((res.beforeBytes - res.afterBytes) / (1024 * 1024));
+        repairs.push(`Auto-reclaimed embeddings and compacted global.db (${savedMb > 0 ? `reclaimed ${savedMb} MB` : "compacted"})`);
+      }
+    } catch (e) {
+      errors.push(`Failed to auto-reclaim embeddings from global.db: ${extractErrorMessage(e)}`);
+    }
+  }
   return { repairs, errors };
 }
 function printDoctorResults(results) {
@@ -8058,7 +8471,7 @@ async function runDoctorAndExit(opts) {
     }
   }
   try {
-    const { checkUpdateStatus } = await import("./token-goat-chunk-K4DG6EEF.mjs");
+    const { checkUpdateStatus } = await import("./token-goat-chunk-AU2K2QHR.mjs");
     const update = await checkUpdateStatus(1500);
     if (update.updateAvailable && update.latest) {
       console.log(`
@@ -8150,6 +8563,7 @@ function generateCompactHelp() {
     "Options:",
     "  -v, --version                   print the token-goat version",
     "  --cwd <path>                    run as if invoked from this directory",
+    "  --notice <text>                 print this line before the command's own output",
     "  -h, --help                      display help for command",
     "",
     "Reads: symbol, read, brief, section, semantic, skeleton, outline, refs, scope,",
@@ -8164,7 +8578,7 @@ function generateCompactHelp() {
     "  html-lint, docx-outline, docx-tables, docx-text, pptx-outline, pptx-slide, pptx-text,",
     "  pptx-notes",
     "",
-    "Index & Search: index, map, reconcile, doctor, commands, ask, pack, tokens,",
+    "Index & Search: index, map, reconcile, doctor, commands, ask, answer, pack, tokens,",
     "  budget, failures, todo, trace, logfold, lockdeps, dep-docs, recent, hot,",
     "  snapshot-snapshot, baseline, cost, coverage-report-gaps, clean-cache,",
     "  cache-audit, reclaim-index, project",
@@ -8206,7 +8620,7 @@ init_define_import_meta_env();
 // src/config_commands.ts
 init_define_import_meta_env();
 import * as fs20 from "node:fs";
-import * as os15 from "node:os";
+import * as os14 from "node:os";
 import * as path18 from "node:path";
 
 // src/webfetch.ts
@@ -8215,7 +8629,7 @@ import { existsSync as existsSync14, readdirSync as readdirSync3, statSync as st
 import * as http from "http";
 import * as https from "https";
 import { isIPv4, isIPv6 } from "net";
-import { resolve as resolve6, join as join16 } from "path";
+import { resolve as resolve7, join as join16 } from "path";
 import { URL as URL2 } from "url";
 import { promisify } from "util";
 import { lookup as dnsLookup } from "dns";
@@ -8356,7 +8770,7 @@ function cleanupStaleDownloads() {
     const files = readdirSync3(cacheDir);
     for (const file of files) {
       if (file.endsWith(".tmp")) {
-        const filePath = resolve6(cacheDir, file);
+        const filePath = resolve7(cacheDir, file);
         try {
           const stat = statSync3(filePath);
           if (Date.now() - stat.mtimeMs < STALE_DOWNLOAD_AGE_MS) continue;
@@ -8492,13 +8906,6 @@ function performHttpFetch(targetUrl, opts) {
 }
 
 // src/config_commands.ts
-function emit(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(payload));
-}
-function emitErr(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function saveConfigSafe(cfg) {
   ensureDirSync(path18.dirname(configPath()));
   saveConfig(cfg);
@@ -8948,13 +9355,15 @@ function cmdProject(opts) {
     invalidateConfigCache();
     const prunedTempFiles = pruneSystemTempFiles();
     const prunedOrphanChunks = pruneOrphanedChunks();
+    const prunedOrphanVectors = pruneOrphanedVectors();
     if (opts.json === true) {
-      emit(displaySafeJson({ pruned: removed, blocked_roots: after, prunedTempFiles: prunedTempFiles.length, prunedOrphanChunkFiles: prunedOrphanChunks.length }));
+      emit(displaySafeJson({ pruned: removed, blocked_roots: after, prunedTempFiles: prunedTempFiles.length, prunedOrphanChunkFiles: prunedOrphanChunks.length, prunedOrphanVectors }));
       return;
     }
     emit(`Pruned ${removed} stale root(s). Remaining: ${after.length}`);
     emit(`Pruned ${prunedTempFiles.length} stale indexed temp-dir file(s).`);
     emit(`Pruned orphaned embedding chunks for ${prunedOrphanChunks.length} file(s).`);
+    emit(`Pruned ${prunedOrphanVectors} orphaned embedding vector(s).`);
     return;
   }
   emitErr(`project: unknown action '${action}'. Use list, exclude, or prune.`);
@@ -9072,7 +9481,7 @@ async function cmdFetchImage(opts) {
     throw new Error(`fetch failed: ${opts.url}`, { cause: e });
   }
   const buf = fetched.body;
-  const outPath = opts.out ?? path18.join(os15.tmpdir(), `tg-fetch-${Date.now()}${extensionForContentType(fetched.contentType)}`);
+  const outPath = opts.out ?? path18.join(os14.tmpdir(), `tg-fetch-${Date.now()}${extensionForContentType(fetched.contentType)}`);
   const originalBytes = buf.length;
   let shrunkBytes;
   let outData;
@@ -11852,7 +12261,7 @@ function extractGeneric(lines) {
   return result;
 }
 function extractFailures(text, options) {
-  const cleaned = stripAnsi(text);
+  const cleaned = stripAnsiEscapes(text);
   const lines = cleaned.split("\n");
   const detected = options?.runner ?? detectRunner(cleaned);
   if (detected === "pytest") {
@@ -12027,7 +12436,8 @@ function cmdConflicts(targetPath, opts) {
   process.exitCode = runConflicts({
     ...targetPath !== void 0 ? { path: targetPath } : {},
     ...opts.json === true ? { json: true } : {},
-    ...opts.summary === true ? { summary: true } : {}
+    ...opts.summary === true ? { summary: true } : {},
+    ...opts.context !== void 0 ? { context: parseInt(opts.context, 10) } : {}
   });
 }
 async function cmdScreenshot(url, destPath, opts) {
@@ -12075,7 +12485,7 @@ function cmdPack(patterns, opts) {
   }
   const result = expandedList.length > 0 ? collectFiles(root, expandedList, collectOpts) : collectFromStdin(root, collectOpts);
   if (opts.budget !== void 0) {
-    const budgetN = requireInt2("--budget", opts.budget);
+    const budgetN = requireInt("--budget", opts.budget);
     if (result.total_tokens > budgetN) {
       err(`token-goat: pack: token count ${result.total_tokens} exceeds budget ${budgetN}`);
       process.exitCode = 3;
@@ -12112,7 +12522,7 @@ function cmdTokens(patterns, opts) {
   let entries = [...result.entries];
   if (opts.asc === true) entries.reverse();
   const eligibleCount = entries.length;
-  if (opts.top !== void 0) entries = entries.slice(0, requireNonNegativeInt2("--top", opts.top));
+  if (opts.top !== void 0) entries = entries.slice(0, requireNonNegativeInt("--top", opts.top));
   const truncated = entries.length < eligibleCount;
   if (opts.json === true) {
     out(displaySafeJson({ entries, truncated, totalCount: eligibleCount, total_tokens: result.total_tokens, total_lines: result.total_lines }));
@@ -12160,7 +12570,7 @@ function cmdBudget(patterns, opts) {
   if (opts.json === true) {
     out(displaySafeJson(result));
   } else {
-    const contextK = opts.context !== void 0 ? requirePositiveInt2("--context", opts.context) : Math.round(loadConfig().context.model_window_tokens / 1e3);
+    const contextK = opts.context !== void 0 ? requirePositiveInt("--context", opts.context) : Math.round(loadConfig().context.model_window_tokens / 1e3);
     out(formatBudgetText(result, contextK));
   }
 }
@@ -12190,7 +12600,7 @@ import * as fs26 from "node:fs";
 // src/sharepoint_resolve.ts
 init_define_import_meta_env();
 import * as fs24 from "node:fs";
-import * as os16 from "node:os";
+import * as os15 from "node:os";
 import * as path23 from "node:path";
 var TENANT_HOST_RE = /^([a-z0-9-]+?)(-my)?\.sharepoint\.com$/i;
 function parseShareUrl(url) {
@@ -12263,7 +12673,7 @@ function tryLibraryPaths(root, libSegments, triedPaths) {
   }
   return null;
 }
-function resolveLocalPath(parsed, env = process.env, home = os16.homedir()) {
+function resolveLocalPath(parsed, env = process.env, home = os15.homedir()) {
   const roots = candidateRoots(env, home);
   const libSegments = parsed.libraryPath.split(/[/\\]+/).filter((s) => s.length > 0 && s !== "." && s !== "..");
   const triedPaths = [];
@@ -12423,12 +12833,12 @@ function formatCues(cues) {
 
 // src/video_chapters.ts
 init_define_import_meta_env();
-import { spawnSync as spawnSync3 } from "node:child_process";
+import { spawnSync as spawnSync4 } from "node:child_process";
 var _ffprobeAvailable;
 function isFfprobeAvailable() {
   if (_ffprobeAvailable !== void 0) return _ffprobeAvailable;
   try {
-    const res = spawnSync3("ffprobe", ["-version"], { stdio: "ignore" });
+    const res = spawnSync4("ffprobe", ["-version"], { stdio: "ignore" });
     _ffprobeAvailable = res.status === 0;
   } catch {
     _ffprobeAvailable = false;
@@ -12439,7 +12849,7 @@ function extractVideoChapters(file) {
   if (!isFfprobeAvailable()) {
     throw new Error("ffprobe not found on PATH; video-chapters requires ffmpeg (install ffmpeg and ensure ffprobe is on PATH)");
   }
-  const res = spawnSync3(
+  const res = spawnSync4(
     "ffprobe",
     ["-v", "error", "-print_format", "json", "-show_chapters", "-show_streams", file],
     { encoding: "utf8", maxBuffer: 64 * 1024 * 1024 }
@@ -12507,8 +12917,8 @@ async function cmdPdfLocate(file, pattern, opts) {
   const locateOpts = {
     ignoreCase: opts.ignoreCase === true
   };
-  if (opts.maxMatches !== void 0) locateOpts.maxMatches = requirePositiveInt2("--max-matches", opts.maxMatches);
-  if (opts.context !== void 0) locateOpts.context = requirePositiveInt2("--context", opts.context);
+  if (opts.maxMatches !== void 0) locateOpts.maxMatches = requirePositiveInt("--max-matches", opts.maxMatches);
+  if (opts.context !== void 0) locateOpts.context = requirePositiveInt("--context", opts.context);
   if (opts.pages !== void 0) locateOpts.pages = opts.pages;
   const { matches: matches2, truncated } = await runPdfLocate(file, pattern, locateOpts);
   const pages = matches2.map((m) => m.page);
@@ -12618,14 +13028,14 @@ async function cmdXlsxSheets(file, opts = {}) {
   recordXlsxStat("xlsx_sheets", file, text);
 }
 async function cmdXlsxHead(file, opts) {
-  const rows = opts.rows !== void 0 ? requireNonNegativeInt2("--rows", opts.rows) : 20;
+  const rows = opts.rows !== void 0 ? requireNonNegativeInt("--rows", opts.rows) : 20;
   const columns = opts.columns ? opts.columns.split(",").map((c) => c.trim()).filter(Boolean) : void 0;
   const text = fenceFileText(await headSheet(file, opts.sheet, rows, columns));
   out(text);
   recordXlsxStat("xlsx_head", file, text);
 }
 async function cmdXlsxColumns(file, opts = {}) {
-  const maxRows = opts.head !== void 0 ? requireNonNegativeInt2("--head", opts.head) : 100;
+  const maxRows = opts.head !== void 0 ? requireNonNegativeInt("--head", opts.head) : 100;
   const result = await xlsxColumns(file, opts.sheet, maxRows);
   if (opts.json === true) {
     const text = displaySafeJson({
@@ -12653,7 +13063,7 @@ async function cmdXlsxQuery(file, opts) {
   const result = await querySheet(file, opts.sheet, {
     ...columns !== void 0 ? { columns } : {},
     ...wheres !== void 0 ? { wheres } : {},
-    ...opts.head !== void 0 ? { head: requireNonNegativeInt2("--head", opts.head) } : {}
+    ...opts.head !== void 0 ? { head: requireNonNegativeInt("--head", opts.head) } : {}
   });
   if (opts.json === true) {
     const rowsJson = result.rows.map((r) => Object.fromEntries(result.header.map((h, i) => [h, fenceFileFieldIfMatched(r[i] ?? "")])));
@@ -12685,13 +13095,13 @@ async function cmdPptxOutline(file, opts) {
   recordDocStat("pptx_outline", file, text);
 }
 async function cmdPptxSlide(file, opts) {
-  const n = requireNonNegativeInt2("--slide", opts.slide);
+  const n = requireNonNegativeInt("--slide", opts.slide);
   const text = fenceFileText(await pptxSlideText(file, n, opts.notes === true));
   out(text);
   recordDocStat("pptx_slide", file, text);
 }
 async function cmdPptxNotes(file, opts) {
-  const n = opts.slide !== void 0 ? requireNonNegativeInt2("--slide", opts.slide) : void 0;
+  const n = opts.slide !== void 0 ? requireNonNegativeInt("--slide", opts.slide) : void 0;
   const text = await pptxNotesText(file, n);
   const printed = text.length > 0 ? fenceFileText(text) : "no speaker notes found";
   out(printed);
@@ -12820,7 +13230,7 @@ function cmdXmlOutline(file, opts) {
   process.exitCode = runXmlOutline({
     file,
     ...opts.json === true ? { json: true } : {},
-    ...depthStr !== void 0 ? { maxDepth: requireNonNegativeInt2("--max-depth", depthStr) } : {}
+    ...depthStr !== void 0 ? { maxDepth: requireNonNegativeInt("--max-depth", depthStr) } : {}
   });
 }
 function cmdXmlQuery(file, pathOrOpts, optsMaybe) {
@@ -13629,17 +14039,236 @@ function registerFormatCommands(program2, guard) {
 // src/cli_cmd_analysis.ts
 init_define_import_meta_env();
 
+// src/answer_router.ts
+init_define_import_meta_env();
+function refusal(why, suggestion) {
+  return `cannot answer deterministically: ${why}; try: ${suggestion}`;
+}
+var JUDGEMENT_PATTERNS = [
+  /\bwhy\b/i,
+  /\bshould (?:i|we|it|this|that)\b/i,
+  /^(?:is|are|does|do|did|can|could|would|will|has|have)\b/i,
+  /^(?:explain|describe|summari[sz]e|review|assess|evaluate|compare|analy[sz]e)\b/i,
+  /^how\b/i,
+  /\bwhat(?:'s| is)? (?:the )?(?:bug|issue|problem|point|difference)\b/i,
+  /\bwhat(?:'s| is) wrong\b/i,
+  /\bat runtime\b/i,
+  /\bwhat value\b/i,
+  /\breturns? when\b/i,
+  /\b(?:correct|incorrect|buggy|broken|safe|unsafe|better|worse|best)\b/i
+];
+var INTENT_RULES = [
+  { intent: "callers", re: /^who calls (.+)$/i },
+  { intent: "callers", re: /^what calls (.+)$/i },
+  { intent: "callers", re: /^callers of (.+)$/i },
+  { intent: "callers", re: /^call ?-?sites of (.+)$/i },
+  { intent: "callers", re: /^(?:all )?(.+) call ?-?sites$/i },
+  { intent: "tests", re: /^wh(?:at|ich) tests? (?:covers?|exercises?|tests?|touch(?:es)?) (.+)$/i },
+  { intent: "tests", re: /^tests? for (.+)$/i },
+  { intent: "tests", re: /^test coverage (?:for|of) (.+)$/i },
+  { intent: "exports", re: /^what does (.+) export$/i },
+  { intent: "exports", re: /^exports of (.+)$/i },
+  { intent: "exports", re: /^(.+) exports$/i },
+  { intent: "imports", re: /^what does (.+) import$/i },
+  { intent: "imports", re: /^imports of (.+)$/i },
+  // The bare form is the commoner of the pair in the captured corpus (34 hits vs 15 for `X exports`). It is only safe alongside file-only subject resolution for this intent: with a symbol fallback, the corpus lines `Add imports` and `Update imports` resolve `Add`/`Update` to whatever same-named symbol sorts first.
+  { intent: "imports", re: /^(.+) imports$/i },
+  { intent: "impact", re: /^what breaks if (.+) changes?$/i },
+  { intent: "impact", re: /^what breaks if (?:i|we|you) chang(?:e|ed) (.+)$/i },
+  { intent: "impact", re: /^what breaks when (?:i|we|you) chang(?:e|ed) (.+)$/i },
+  { intent: "impact", re: /^what breaks when (.+) chang(?:es|ed)$/i },
+  { intent: "impact", re: /^what depends on (.+)$/i },
+  { intent: "impact", re: /^what(?:'s| is) impacted by (?:changing )?(.+)$/i },
+  { intent: "impact", re: /^blast radius of (.+)$/i },
+  { intent: "impact", re: /^impact of (?:changing )?(.+)$/i },
+  { intent: "where", re: /^where is (.+) (?:defined|declared)$/i },
+  { intent: "where", re: /^where is (.+)$/i },
+  { intent: "where", re: /^where does (.+) live$/i }
+];
+function normalizeQuestion(question) {
+  const collapsed = question.replace(/\s+/g, " ").trim().replace(/[?\s]+$/, "");
+  return collapsed.replace(/^(?:check|show|list|find|get|print|inspect|read|locate|verify|measure|view|trace|identify) (?:the |a |an )?/i, "");
+}
+function isJudgementQuestion(rawQuestion) {
+  const question = normalizeQuestion(rawQuestion);
+  return JUDGEMENT_PATTERNS.some((p) => p.test(question));
+}
+function classify(rawQuestion) {
+  const question = normalizeQuestion(rawQuestion);
+  if (isJudgementQuestion(question)) return null;
+  for (const rule of INTENT_RULES) {
+    const m = rule.re.exec(question);
+    if (m && m[1] !== void 0) {
+      const subject = normalizeSubject(m[1]);
+      if (subject.length > 0) return { intent: rule.intent, subject };
+    }
+  }
+  return null;
+}
+function normalizeSubject(raw) {
+  let s = raw.trim();
+  for (; ; ) {
+    const next = s.replace(/^[`'"]+/, "").replace(/[`'".,;:!]+$/, "").trim();
+    if (next === s) break;
+    s = next;
+  }
+  s = s.replace(/^(?:the|a|an) /i, "");
+  return s.trim();
+}
+var SYMBOL_SCAN_PAGE = 200;
+function resolveSymbolHit(subject, rootDir) {
+  for (let offset = 0; ; offset += SYMBOL_SCAN_PAGE) {
+    const rows = querySymbols({ name: subject, rootDir, limit: SYMBOL_SCAN_PAGE, offset });
+    if (rows.length === 0) return null;
+    const hit = rows.find((r) => !isIgnoredIndexPath(r.filePath));
+    if (hit) return { name: hit.name, file: hit.filePath };
+    if (rows.length < SYMBOL_SCAN_PAGE) return null;
+  }
+}
+function resolveFileHit(subject, rootDir) {
+  const entry = getFileEntry(resolveIndexPath(subject));
+  if (entry && !isIgnoredIndexPath(entry.filePath)) return { kind: "file", path: entry.filePath };
+  if (subject.includes("/") || subject.includes("\\")) return null;
+  const want = foldPath(subject);
+  const matches2 = [];
+  for (const [folded, indexed] of getProjectFileEntries(rootDir)) {
+    if (isIgnoredIndexPath(folded)) continue;
+    const base = folded.slice(Math.max(folded.lastIndexOf("/"), folded.lastIndexOf("\\")) + 1);
+    const dot = base.lastIndexOf(".");
+    if (base === want || dot > 0 && base.slice(0, dot) === want) matches2.push(indexed.filePath);
+  }
+  const paths = [...new Set(matches2)].sort();
+  if (paths.length === 0) return null;
+  if (paths.length === 1 && paths[0] !== void 0) return { kind: "file", path: paths[0] };
+  return { kind: "ambiguous", candidates: paths };
+}
+function resolveSubject(subject, mode = "symbol-first") {
+  const rootDir = resolveProjectRoot({ project: process.cwd() });
+  const sep5 = subject.lastIndexOf("::");
+  if (sep5 > 0 && sep5 + 2 < subject.length) {
+    const file2 = resolveIndexPath(subject.slice(0, sep5));
+    const hit2 = querySymbols({ filePath: file2, name: subject.slice(sep5 + 2), rootDir, limit: 1 })[0];
+    if (hit2 && !isIgnoredIndexPath(hit2.filePath)) return { kind: "symbol", name: hit2.name, file: hit2.filePath };
+    return null;
+  }
+  if (/\s/.test(subject)) return null;
+  if (mode === "symbol-first") {
+    const hit2 = resolveSymbolHit(subject, rootDir);
+    if (hit2) return { kind: "symbol", name: hit2.name, file: hit2.file };
+    return resolveFileHit(subject, rootDir);
+  }
+  const file = resolveFileHit(subject, rootDir);
+  if (file) return file;
+  const hit = resolveSymbolHit(subject, rootDir);
+  if (!hit) return null;
+  return mode === "file-first" ? { kind: "symbol", name: hit.name, file: hit.file } : { kind: "symbol-only", name: hit.name, file: hit.file };
+}
+var FILE_INTENTS = /* @__PURE__ */ new Set(["tests", "exports", "imports"]);
+var ANSWER_DELEGATE_LIMIT = 20;
+function subjectModeFor(intent) {
+  if (intent === "exports" || intent === "imports") return "file-only";
+  return intent === "tests" ? "file-first" : "symbol-first";
+}
+function runAnswer(opts) {
+  const question = opts.question.trim();
+  if (question.length === 0) {
+    emitErr(refusal("the question is empty", 'token-goat answer "who calls <symbol>"'));
+    return 1;
+  }
+  if (isJudgementQuestion(question)) {
+    emitErr(
+      refusal(
+        "that asks for judgement, intent, or runtime behaviour, which the index cannot answer -- it would need the code read and reasoned over",
+        `token-goat semantic "${question}"`
+      )
+    );
+    return 1;
+  }
+  const cls = classify(question);
+  if (cls === null) {
+    emitErr(
+      refusal(
+        "no intent matched -- this router only answers where/who-calls/what-tests-cover/what-exports/what-imports/what-breaks questions about a named symbol or file",
+        `token-goat semantic "${question}"`
+      )
+    );
+    return 1;
+  }
+  const resolved = resolveSubject(cls.subject, subjectModeFor(cls.intent));
+  if (resolved === null) {
+    emitErr(
+      refusal(
+        `'${cls.subject}' is not an indexed symbol or file`,
+        `token-goat semantic "${question}"`
+      )
+    );
+    return 1;
+  }
+  const rootDir = resolveProjectRoot({ project: process.cwd() });
+  if (resolved.kind === "ambiguous") {
+    const shown = resolved.candidates.slice(0, 5).map((c) => toDisplayPath(rootDir, c));
+    const more = resolved.candidates.length - shown.length;
+    const first = shown[0] ?? "";
+    const next = FILE_INTENTS.has(cls.intent) ? `token-goat answer "${cls.intent === "tests" ? "tests for" : cls.intent === "imports" ? "imports of" : "exports of"} ${first}"` : `token-goat outline ${first}`;
+    emitErr(
+      refusal(
+        `'${cls.subject}' names ${resolved.candidates.length} files in this project (${shown.join(", ")}${more > 0 ? `, +${more} more` : ""})`,
+        next
+      )
+    );
+    return 1;
+  }
+  if (resolved.kind === "symbol-only") {
+    emitErr(
+      refusal(
+        `'${cls.subject}' is a symbol; exports/imports are file-level`,
+        `token-goat ${cls.intent} ${toDisplayPath(rootDir, resolved.file)}`
+      )
+    );
+    return 1;
+  }
+  if (FILE_INTENTS.has(cls.intent)) {
+    const file = resolved.kind === "symbol" ? resolved.file : resolved.path;
+    const display = toDisplayPath(rootDir, file);
+    if (cls.intent === "tests") {
+      emit(`via: token-goat test-for ${display}`);
+      return runTestFor({ file });
+    }
+    if (cls.intent === "exports") {
+      emit(`via: token-goat exports ${display}`);
+      return runExports({ file });
+    }
+    emit(`via: token-goat imports ${display}`);
+    return runImports({ file });
+  }
+  if (resolved.kind === "file") {
+    const display = toDisplayPath(rootDir, resolved.path);
+    emitErr(
+      refusal(
+        `'${cls.subject}' is a file, and ${cls.intent === "where" ? "where" : cls.intent} needs a symbol`,
+        `token-goat outline ${display}`
+      )
+    );
+    return 1;
+  }
+  if (cls.intent === "callers") {
+    emit(`via: token-goat callers ${displaySafeText(resolved.name)} --limit ${ANSWER_DELEGATE_LIMIT}`);
+    return runCallers({ symbol: resolved.name, limit: ANSWER_DELEGATE_LIMIT });
+  }
+  if (cls.intent === "impact") {
+    emit(`via: token-goat impact ${displaySafeText(resolved.name)} --top ${ANSWER_DELEGATE_LIMIT}`);
+    return runImpact({ symbol: resolved.name, top: ANSWER_DELEGATE_LIMIT });
+  }
+  emit(`via: token-goat symbol ${displaySafeText(resolved.name)} -p --exclude-vendored`);
+  const r = runSymbol({ name: resolved.name, projectRoot: rootDir, limit: ANSWER_DELEGATE_LIMIT, excludeVendored: true });
+  if (r.text.length > 0) emit(r.text);
+  return r.code;
+}
+
 // src/affected.ts
 init_define_import_meta_env();
 import * as path25 from "node:path";
 var DEFAULT_AFFECTED_DEPTH = 5;
-function emit2(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(payload));
-}
-function emitErr2(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function guardedFilter(filter2) {
   const guarded = compileGuardedRegex(filter2);
   if (!guarded.ok) throw new Error(`--filter is not usable as a regular expression: ${guarded.reason}`);
@@ -13694,43 +14323,43 @@ function computeAffected(opts) {
 }
 function runAffected(opts) {
   if (opts.depth !== void 0 && opts.depth <= 0) {
-    emitErr2(`--depth must be a positive number, got: ${opts.depth}`);
+    emitErr(`--depth must be a positive number, got: ${opts.depth}`);
     return 1;
   }
   if (opts.files.length === 0) {
-    emitErr2("No changed files given. Pass paths as arguments, or pipe them in with --stdin.");
+    emitErr("No changed files given. Pass paths as arguments, or pipe them in with --stdin.");
     return 1;
   }
   if (opts.filter !== void 0) {
     const guarded = compileGuardedRegex(opts.filter);
     if (!guarded.ok) {
-      emitErr2(`--filter is not usable as a regular expression: ${guarded.reason}`);
+      emitErr(`--filter is not usable as a regular expression: ${guarded.reason}`);
       return 1;
     }
   }
   const result = computeAffected(opts);
   if (opts.json === true) {
-    emit2(displaySafeJson(result));
+    emit(displaySafeJson(result));
     return 0;
   }
   if (opts.quiet === true) {
-    for (const f of result.testFiles) emit2(f);
+    for (const f of result.testFiles) emit(f);
   } else if (result.testFiles.length === 0) {
     const traced = opts.files.length - result.unknownSeeds.length;
     if (traced === 0) {
-      emit2(`Nothing could be traced: ${result.unknownSeeds.length === 1 ? "the file given is not tracked" : "none of the files given are tracked"} in this project.`);
+      emit(`Nothing could be traced: ${result.unknownSeeds.length === 1 ? "the file given is not tracked" : "none of the files given are tracked"} in this project.`);
     } else {
-      emit2(`No test files import ${countNoun(traced, "changed file")} (within ${countNoun(result.depth, "hop")}).`);
+      emit(`No test files import ${countNoun(traced, "changed file")} (within ${countNoun(result.depth, "hop")}).`);
     }
   } else {
-    emit2(`${countNoun(result.testFiles.length, "affected test file")} (${countNoun(result.reachedCount, "file")} reached within ${countNoun(result.depth, "hop")}):`);
-    for (const f of result.testFiles) emit2(`  ${f}`);
+    emit(`${countNoun(result.testFiles.length, "affected test file")} (${countNoun(result.reachedCount, "file")} reached within ${countNoun(result.depth, "hop")}):`);
+    for (const f of result.testFiles) emit(`  ${f}`);
   }
   if (result.unknownSeeds.length > 0) {
-    emitErr2(`Not tracked in this project, so nothing was traced from ${result.unknownSeeds.length === 1 ? "it" : "them"}: ${result.unknownSeeds.join(", ")}`);
+    emitErr(`Not tracked in this project, so nothing was traced from ${result.unknownSeeds.length === 1 ? "it" : "them"}: ${result.unknownSeeds.join(", ")}`);
   }
   if (result.depthLimited) {
-    emitErr2(`Stopped at --depth ${result.depth} with ${countNoun(result.unexploredAtFrontier, "file")} still unexplored; more tests may be affected (raise --depth).`);
+    emitErr(`Stopped at --depth ${result.depth} with ${countNoun(result.unexploredAtFrontier, "file")} still unexplored; more tests may be affected (raise --depth).`);
   }
   return 0;
 }
@@ -14332,6 +14961,69 @@ function cmdTrace(src, opts) {
 // src/text_logfold.ts
 init_define_import_meta_env();
 import * as fs31 from "fs";
+
+// src/filters.ts
+init_define_import_meta_env();
+var DROP = () => null;
+var FILTERS = [
+  {
+    // git fetch/clone progress: "remote: Counting objects: 73% (8/11)", "Receiving objects: 100% (11/11), done.", "Resolving deltas: ...".
+    name: "git-progress",
+    pattern: /^(remote:\s+)?(Counting objects|Compressing objects|Receiving objects|Resolving deltas|Unpacking objects|Enumerating objects|Writing objects):/i,
+    replacer: DROP
+  },
+  {
+    // npm install summary chatter: "added 142 packages in 3s", "changed 5 packages", "audited 200 packages in 1s".
+    name: "npm-summary",
+    pattern: /^\s*(added|removed|changed|audited)\s+\d+\s+packages?\b/i,
+    replacer: DROP
+  },
+  {
+    // npm/yarn deprecation + funding noise that adds nothing actionable.
+    name: "npm-funding",
+    pattern: /^\s*\d+\s+packages? are looking for funding\b/i,
+    replacer: DROP
+  },
+  {
+    // pip download progress: "Downloading foo-1.2.3-py3-none-any.whl (1.2 MB)" and the " |████████| 1.2 MB 5.0 MB/s" meter lines.
+    name: "pip-download",
+    pattern: /^\s*(Downloading|Collecting|Using cached|Requirement already satisfied)\b/i,
+    replacer: DROP
+  },
+  {
+    // A progress meter line built from Unicode box-drawing/block glyphs, e.g. "████████░░░░ 60%". Restricted to those glyphs (not ASCII #/=/-) so an ASCII final state like "Building [####] 100%" is preserved as real output.
+    name: "progress-bar",
+    pattern: /[█▉▊▋▌▍▎▏▓▒░]{3,}/,
+    replacer: DROP
+  },
+  {
+    // Docker layer pull progress: "abc123: Pulling fs layer", "abc123: Download complete", "abc123: Pull complete".
+    name: "docker-pull",
+    pattern: /^[0-9a-f]{6,}:\s+(Pulling|Waiting|Downloading|Verifying|Extracting|Download complete|Pull complete|Already exists)\b/i,
+    replacer: DROP
+  },
+  {
+    // cargo build chatter: "   Compiling foo v0.1.0", "  Downloading crates ...".
+    name: "cargo-progress",
+    pattern: /^\s*(Compiling|Downloading|Downloaded|Updating|Fetching)\s+\S/,
+    replacer: DROP
+  },
+  {
+    // Webpack/bundler asset rows are voluminous; keep the build result lines (errors, warnings, "compiled") by only dropping plain asset size rows.
+    name: "webpack-asset",
+    pattern: /^\s*(asset|chunk)\s+\S+\s+[\d.]+\s*(KiB|MiB|bytes)\b/i,
+    replacer: DROP
+  },
+  {
+    // A binary-content marker line: any line carrying a NUL byte is treated as non-text and collapsed to a single readable marker.
+    name: "binary-content",
+    // eslint-disable-next-line no-control-regex -- intentionally matches the NUL control byte that signals binary content
+    pattern: /\x00/,
+    replacer: () => "[binary content elided by token-goat]"
+  }
+];
+
+// src/text_logfold.ts
 var VOLATILE_SUBS = [
   { re: /\b\d{1,2}:\d{2}:\d{2}(?:\.\d+)?\b/g, placeholder: "[HH:MM:SS]" },
   { re: /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, placeholder: "[UUID]" },
@@ -14863,17 +15555,17 @@ function cmdNote(action, key, value, opts) {
   throw new Error(`Unknown note action: ${action}. Use: set, get, unset, list, clear`);
 }
 function loadAllSessionReadCounts() {
-  const sessionsDir = path29.join(tokenGoatHome(), "sessions");
+  const sessionsDir2 = path29.join(tokenGoatHome(), "sessions");
   const totals = /* @__PURE__ */ new Map();
   let entries;
   try {
-    entries = fs32.readdirSync(sessionsDir, { withFileTypes: true });
+    entries = fs32.readdirSync(sessionsDir2, { withFileTypes: true });
   } catch {
     return totals;
   }
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const filePath = path29.join(sessionsDir, entry.name);
+    const filePath = path29.join(sessionsDir2, entry.name);
     let raw;
     try {
       raw = JSON.parse(fs32.readFileSync(filePath, "utf8"));
@@ -15476,6 +16168,7 @@ function registerAnalysisCommands(program2, guard) {
       })
     )
   );
+  program2.command("answer <question>").description("answer a plain-English question from the index alone, or refuse with a reason (no model call, no inference)").action((question) => runExit(() => runAnswer({ question })));
   program2.command("pack [patterns...]").description("bundle matched files into a single LLM-ready output (Markdown, XML, or plain text)").option("--format <style>", "output style: md (default), xml, or text", "md").option("--line-numbers", "prefix each line with its line number").option("--instruction-file <path>", "append a task prompt from a file").option("--output <path>", "write output to a file instead of stdout").option("--no-ignore", "bypass .tokengoatignore patterns").option("--strip-comments", "remove language-appropriate comments before packing").option("--scan-secrets", "scan for credentials; exit 2 if any are found").option("--budget <n>", "exit 3 if the estimated token count exceeds n").action(guard(cmdPack));
   program2.command("tokens [patterns...]").description("per-file token footprint table, sorted largest-first").option("--tree", "group by directory with subtotals and percentage of total").option("--top <n>", "limit to the N biggest files").option("--asc", "reverse order (ascending)").option("-j, --json", "output as JSON").action(guard(cmdTokens));
   program2.command("budget <patterns...>").description("estimate the total token cost of a file set").option("--context <n>", "context window in thousands of tokens (shows % fill)").option("-j, --json", "output as JSON").action(guard(cmdBudget));
@@ -15510,7 +16203,7 @@ function registerAnalysisCommands(program2, guard) {
   ).option("--file <path>", "narrow to one source file's gaps (matched exact or as a path suffix against the report's own file keys)").option("--json", "emit the gap report as JSON instead of text").action(guard(cmdCoverageReportGaps));
   program2.command("conflicts [path]").description(
     "unresolved git merge-conflict markers (<<<<<<< / ||||||| / ======= / >>>>>>>, two-way or diff3 three-way) instead of a raw Read or grep\n\npath may be a single file, a directory (scanned recursively), or omitted entirely (scans the whole project from the current directory); only files with at least one conflict region or malformed-marker warning are reported"
-  ).option("--summary", "line ranges and ours/base/theirs labels only, omitting the conflict content").option("--json", "emit the results as JSON instead of text").action(guard(cmdConflicts));
+  ).option("-C, --context <n>", "lines of surrounding context to include before and after each conflict region (default: 3)").option("--summary", "line ranges and ours/base/theirs labels only, omitting the conflict content").option("--json", "emit the results as JSON instead of text").action(guard(cmdConflicts));
   program2.command("history").description("show recent session history: bash commands and web fetches (current-session or recent cache)").option("--limit <n>", "max entries to show (default: 30)").option("-j, --json", "output as JSON").action((opts) => guard(() => cmdHistory(opts))());
   program2.command("changed [ref]").description("list files or symbols changed since a git ref").option("--since <ref>", "git ref to compare against (default: HEAD~5)").option("--symbol", "list symbols instead of files").option("-j, --json", "output as JSON").option("--grep <pattern>", "filter to changed files whose path matches this regex (falls back to a literal substring match when the pattern does not compile); applies to file paths even in --symbol mode").option("--exclude-tests", "hide changed files that live in a test file (opt-in; default output is unchanged); applies to file paths even in --symbol mode").action(
     (ref, opts) => runExit(
@@ -15642,14 +16335,31 @@ function renderCapabilities(caps) {
 
 // src/cli_session.ts
 init_define_import_meta_env();
-import * as fs42 from "node:fs";
+import * as fs40 from "node:fs";
 
 // src/session_audit.ts
 init_define_import_meta_env();
 import * as fs34 from "node:fs";
-import * as os17 from "node:os";
+import * as os16 from "node:os";
 import * as path31 from "node:path";
 import * as readline from "node:readline";
+var MODEL_VISIBLE_CATEGORIES = ["toolResults", "assistantText", "assistantThinking", "toolUseInputs", "attachments", "userTurns", "harnessMeta", "system"];
+function computeCalibration(estimated, measured) {
+  let modelVisibleBytes = 0;
+  let estimatedTokens = 0;
+  for (const key of MODEL_VISIBLE_CATEGORIES) {
+    modelVisibleBytes += estimated[key].bytes;
+    estimatedTokens += estimated[key].estTokens;
+  }
+  const measuredFirstWriteTokens = measured.inputTokens + measured.cacheCreationTokens;
+  return {
+    modelVisibleBytes,
+    estimatedTokens,
+    measuredFirstWriteTokens,
+    relativeError: measuredFirstWriteTokens === 0 ? 0 : (estimatedTokens - measuredFirstWriteTokens) / measuredFirstWriteTokens,
+    bytesPerMeasuredToken: measuredFirstWriteTokens === 0 ? 0 : modelVisibleBytes / measuredFirstWriteTokens
+  };
+}
 function emptyMeasured() {
   return { apiCalls: 0, inputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0, outputTokens: 0 };
 }
@@ -15724,8 +16434,12 @@ var DENY_TEMPLATES = [
   { 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: "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: "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" },
   { kind: "generic_reread_deny", re: /was already read this session \(\d+ read/, tool: "Read" },
   { kind: "large_file_deny", re: /is very large \(\d+(?:\.\d+)?KB\)\./, tool: "Read" },
   { kind: "file_type_handler_deny", re: /too large to preview \(exceeds the in-hook scan cap\)|cannot be read as text\.|Read cannot return spreadsheet content|Read cannot return slide content|Read cannot return document content|Use Read with offset and limit parameters to read specific line ranges/, tool: "Read" },
@@ -15797,7 +16511,7 @@ function deepStringBytes(value) {
   }
   return 0;
 }
-var OMISSION_MARKER_RE = /(?:--- (\d+) lines omitted ---|\[token-goat: \+?(\d+) more [a-z ]*lines omitted\]|--- patch: (\d+) lines omitted by token-goat ---|\.\.\. (\d+) lines omitted by token-goat \.\.\.)/g;
+var OMISSION_MARKER_RE = /(?:--- (\d+) lines omitted ---|\[token-goat: \+?(\d+) (?:more )?[a-z ]*lines omitted\]|--- patch: (\d+) lines omitted by token-goat ---|\.\.\. (\d+) lines omitted by token-goat \.\.\.)/g;
 function toolResultText(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) {
@@ -15845,11 +16559,11 @@ function listCorpusTranscripts(corpusDir) {
   return found.sort();
 }
 function defaultCorpusDir() {
-  const claudeDir = path31.join(os17.homedir(), ".claude", "projects");
+  const claudeDir = path31.join(claudeConfigDir(), "projects");
   if (fs34.existsSync(claudeDir) && listCorpusTranscripts(claudeDir).length > 0) {
     return claudeDir;
   }
-  const home = os17.homedir();
+  const home = os16.homedir();
   const appData = process.env["APPDATA"] || path31.join(home, "AppData", "Roaming");
   const candidates = [
     claudeDir,
@@ -15995,7 +16709,7 @@ async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneOb
                 s.editErrorBaseline.totalEdits += 1;
               }
               if (openDenies.length > 0) {
-                const bashCommand = name === "Bash" && typeof input["command"] === "string" ? input["command"] : void 0;
+                const bashCommand = name === "Bash" && typeof input["command"] === "string" ? input["command"].toLowerCase() : void 0;
                 for (const o of openDenies) {
                   if (o.toolCalls.length >= 10) continue;
                   const isReadSamePath = readNorm !== void 0 && o.path !== "" && readNorm === o.path;
@@ -16046,13 +16760,13 @@ async function auditOneFile(filePath, s, toolMap, attachmentMap, hookMap, laneOb
           if (name === "Read" || name === "Skill") {
             const denyTemplate = DENY_TEMPLATES.find((t) => t.tool === name && t.re.test(text));
             if (denyTemplate !== void 0) {
-              const path44 = readPathById.get(id) ?? "";
-              const lastSlash = path44.lastIndexOf("/");
+              const path42 = readPathById.get(id) ?? "";
+              const lastSlash = path42.lastIndexOf("/");
               openDenies.push({
                 kind: denyTemplate.kind,
                 withheldBytes: parseWithheldBytes(denyTemplate.kind, text),
-                path: path44,
-                basename: lastSlash === -1 ? path44 : path44.slice(lastSlash + 1),
+                path: path42,
+                basename: lastSlash === -1 ? path42 : path42.slice(lastSlash + 1),
                 callIndexAtDeny: perCall.length,
                 compactEpochAtOpen: compactEpoch,
                 compactEpochAtWindow: null,
@@ -16353,6 +17067,7 @@ async function auditSessionCorpus(opts = {}) {
       system: emptyCategory(),
       otherLocal: emptyCategory()
     },
+    calibration: { modelVisibleBytes: 0, estimatedTokens: 0, measuredFirstWriteTokens: 0, relativeError: 0, bytesPerMeasuredToken: 0 },
     tools: [],
     attachmentKinds: [],
     hookOutputs: [],
@@ -16413,6 +17128,7 @@ async function auditSessionCorpus(opts = {}) {
   summary.hookOutputs = [...hookMap.values()].sort((a, b) => b.contextBytes - a.contextBytes || b.fires - a.fires || a.origin.localeCompare(b.origin) || a.event.localeCompare(b.event));
   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.runtimeMs = Date.now() - started;
   return summary;
 }
@@ -16453,11 +17169,20 @@ function formatSessionAudit(s) {
     ["system lines", e.system],
     ["local bookkeeping (never sent)", e.otherLocal]
   ];
-  const modelVisibleBytes = rows.slice(0, 8).reduce((acc, [, c]) => acc + c.bytes, 0);
+  const cal = s.calibration;
+  const modelVisibleBytes = cal.modelVisibleBytes;
   for (const [label, cat] of rows.sort((a, b) => b[1].bytes - a[1].bytes)) {
     lines.push(`${label.padEnd(31)} count ${fmt(cat.count).padStart(11)}  bytes ${fmt(cat.bytes).padStart(15)}  est-tokens ${fmt(cat.estTokens).padStart(13)}  ${label === "local bookkeeping (never sent)" ? "(excluded from share)" : pct(cat.bytes, modelVisibleBytes)}`);
   }
   lines.push("");
+  lines.push("## Estimator calibration (the estimate above against the billed ledger above it)");
+  lines.push(`Model-visible bytes:          ${fmt(cal.modelVisibleBytes).padStart(18)}`);
+  lines.push(`Estimated tokens (chars/3):   ${fmt(cal.estimatedTokens).padStart(18)}`);
+  lines.push(`Measured first-write tokens:  ${fmt(cal.measuredFirstWriteTokens).padStart(18)}  (input + cache-write; NEVER input alone -- a cached session bills nearly every first write as a cache write)`);
+  lines.push(`Estimator error:              ${(cal.relativeError >= 0 ? "+" : "") + (cal.relativeError * 100).toFixed(1) + "%"} ${cal.relativeError >= 0 ? "over" : "under"} measured`);
+  lines.push(`Implied bytes per token:      ${cal.bytesPerMeasuredToken.toFixed(2)}  (against the 3.0 the estimate divides by)`);
+  lines.push("Read the error as a bound, not a correction factor. Two effects inflate the measured side and neither is separable here: a prefix whose cache entry expires is written again and billed twice while the estimate counts it once, and the system prompt and tool schemas are sent on every call but appear in the transcript only in part. Both push the measured figure up, so an estimate below it is expected and only the magnitude carries information.");
+  lines.push("");
   lines.push("## Tool results by tool (estimated content size; calls = tool_use invocations)");
   for (const t of s.tools.slice(0, 25)) {
     lines.push(`${displaySafeText(t.name).padEnd(42)} calls ${fmt(t.calls).padStart(9)}  bytes ${fmt(t.resultBytes).padStart(15)}  est-tokens ${fmt(t.resultEstTokens).padStart(12)}`);
@@ -16524,267 +17249,17 @@ function formatSessionAudit(s) {
 
 // src/session_read.ts
 init_define_import_meta_env();
-import * as fs36 from "node:fs";
-import * as path33 from "node:path";
-import * as readline2 from "node:readline";
-
-// src/waste.ts
-init_define_import_meta_env();
 import * as fs35 from "node:fs";
-import * as os18 from "node:os";
 import * as path32 from "node:path";
-function projectTranscriptsDir(projectRoot) {
-  const rootStr = path32.resolve(projectRoot);
-  const slug = rootStr.replace(/[^A-Za-z0-9]/g, "-");
-  return path32.join(os18.homedir(), ".claude", "projects", slug);
-}
-function findLatestTranscript(projectRoot) {
-  const dir = projectTranscriptsDir(projectRoot);
-  let entries;
-  try {
-    entries = fs35.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
-  } catch {
-    return null;
-  }
-  let best = null;
-  for (const name of entries) {
-    const full = path32.join(dir, name);
-    let stat;
-    try {
-      stat = fs35.statSync(full);
-    } catch {
-      continue;
-    }
-    if (best === null || stat.mtimeMs > best.mtimeMs) best = { file: full, mtimeMs: stat.mtimeMs };
-  }
-  return best?.file ?? null;
-}
-function safeStringify(value) {
-  try {
-    return JSON.stringify(value) ?? "";
-  } catch {
-    return "";
-  }
-}
-var FILE_PATH_TOOLS = /* @__PURE__ */ new Set(["Read", "Edit", "Write", "NotebookEdit", "MultiEdit"]);
-function extractFilePath(name, input) {
-  if (!FILE_PATH_TOOLS.has(name)) return null;
-  if (input === null || typeof input !== "object") return null;
-  const o = input;
-  const fp = o["file_path"];
-  if (typeof fp === "string") return fp;
-  const notebookPath = o["notebook_path"];
-  return typeof notebookPath === "string" ? notebookPath : null;
-}
-function extractCommand(name, input) {
-  if (name !== "Bash") return null;
-  if (input === null || typeof input !== "object") return null;
-  const cmd = input["command"];
-  return typeof cmd === "string" ? cmd : null;
-}
-function summarizeInput(name, input, filePath, command) {
-  if (filePath !== null) return filePath;
-  if (command !== null) return command.length > 100 ? `${command.slice(0, 100)}\u2026` : command;
-  if (input === null || typeof input !== "object") return "";
-  const o = input;
-  for (const key of ["pattern", "query", "path", "description", "prompt"]) {
-    const v = o[key];
-    if (typeof v === "string") return v.length > 100 ? `${v.slice(0, 100)}\u2026` : v;
-  }
-  const s = safeStringify(input);
-  return s.length > 100 ? `${s.slice(0, 100)}\u2026` : s;
-}
-function extractResultText(content) {
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content.map((b) => {
-      if (b !== null && typeof b === "object" && b["type"] === "text") {
-        const t = b["text"];
-        return typeof t === "string" ? t : "";
-      }
-      return "";
-    }).join("\n");
-  }
-  return "";
-}
-function parseTranscript2(transcriptPath) {
-  const raw = fs35.readFileSync(transcriptPath, "utf-8");
-  const calls = [];
-  const resultTextById = /* @__PURE__ */ new Map();
-  const assistantTurns = [];
-  const resident = createResidentContextStats();
-  let seq = 0;
-  for (const line of raw.split("\n")) {
-    const trimmed = line.trim();
-    if (trimmed === "") continue;
-    let obj;
-    try {
-      obj = JSON.parse(trimmed);
-    } catch {
-      continue;
-    }
-    if (obj === null || typeof obj !== "object") continue;
-    const o = obj;
-    accumulateResidentLine(resident, o, trimmed.length);
-    const message = o["message"];
-    if (message === null || typeof message !== "object") continue;
-    const messageObj = message;
-    const content = messageObj["content"];
-    if (!Array.isArray(content)) continue;
-    const role = typeof messageObj["role"] === "string" ? messageObj["role"] : null;
-    const cwd = typeof o["cwd"] === "string" ? o["cwd"] : null;
-    let turnTextTokens = 0;
-    let sawTextBlock = false;
-    for (const block of content) {
-      if (block === null || typeof block !== "object") continue;
-      const b = block;
-      if (b["type"] === "tool_use" && typeof b["id"] === "string" && typeof b["name"] === "string") {
-        const name = b["name"];
-        const input = b["input"];
-        const filePath = extractFilePath(name, input);
-        const command = extractCommand(name, input);
-        calls.push({
-          seq: seq++,
-          id: b["id"],
-          name,
-          input,
-          filePath,
-          command,
-          summary: summarizeInput(name, input, filePath, command),
-          cwd
-        });
-      } else if (b["type"] === "tool_result" && typeof b["tool_use_id"] === "string") {
-        const id = b["tool_use_id"];
-        if (!resultTextById.has(id)) {
-          resultTextById.set(id, extractResultText(b["content"]));
-        }
-      } else if (role === "assistant" && b["type"] === "text" && typeof b["text"] === "string") {
-        sawTextBlock = true;
-        turnTextTokens += estimateTokens(b["text"]);
-      }
-    }
-    if (role === "assistant" && sawTextBlock) assistantTurns.push(turnTextTokens);
-  }
-  return { calls, resultTextById, assistantTurns, resident };
-}
-function costPerCall(parsed) {
-  return parsed.calls.map((c) => ({
-    ...c,
-    tokens: estimateTokens(parsed.resultTextById.get(c.id) ?? "")
-  }));
-}
-function aggregateSortedDesc(pairs) {
-  return [...pairs].map(([key, tokens]) => ({ key, tokens })).sort((a, b) => b.tokens - a.tokens);
-}
-function tokensByTool(costs) {
-  const m = /* @__PURE__ */ new Map();
-  for (const c of costs) m.set(c.name, (m.get(c.name) ?? 0) + c.tokens);
-  return aggregateSortedDesc(m);
-}
-function tokensByFile(costs) {
-  const m = /* @__PURE__ */ new Map();
-  for (const c of costs) {
-    if (c.filePath === null) continue;
-    m.set(c.filePath, (m.get(c.filePath) ?? 0) + c.tokens);
-  }
-  return aggregateSortedDesc(m);
-}
-function topExpensiveCalls(costs, n) {
-  return [...costs].sort((a, b) => b.tokens - a.tokens).slice(0, n);
-}
-function neverTouchedAgain(costs) {
-  const readsByFile = /* @__PURE__ */ new Map();
-  for (const c of costs) {
-    if (c.name !== "Read" || c.filePath === null) continue;
-    const arr = readsByFile.get(c.filePath) ?? [];
-    arr.push(c);
-    readsByFile.set(c.filePath, arr);
-  }
-  const out2 = [];
-  for (const [filePath, reads] of readsByFile) {
-    const firstSeq = Math.min(...reads.map((r) => r.seq));
-    const touchedLater = costs.some((c) => {
-      if (c.seq <= firstSeq) return false;
-      if (c.filePath === filePath) return true;
-      return safeStringify(c.input).includes(filePath);
-    });
-    if (!touchedLater) {
-      out2.push({ filePath, tokens: reads.reduce((n, r) => n + r.tokens, 0) });
-    }
-  }
-  return out2.sort((a, b) => b.tokens - a.tokens);
-}
-async function repeatedUncompressedBashCommands(costs) {
-  const groups = /* @__PURE__ */ new Map();
-  for (const c of costs) {
-    if (c.name !== "Bash" || c.command === null) continue;
-    const norm = normalizeCommandForCacheKey(c.command);
-    const arr = groups.get(norm) ?? [];
-    arr.push(c);
-    groups.set(norm, arr);
-  }
-  const out2 = [];
-  for (const [norm, calls] of groups) {
-    if (calls.length < 2) continue;
-    let cached = false;
-    for (const c of calls) {
-      try {
-        const hash = await commandHash(c.command, c.cwd);
-        if (getBashOutput(hash) !== null) {
-          cached = true;
-          break;
-        }
-      } catch {
-      }
-    }
-    if (cached) continue;
-    const totalTokens = calls.reduce((n, c) => n + c.tokens, 0);
-    out2.push({
-      normalized: norm,
-      count: calls.length,
-      totalTokens,
-      avgTokens: Math.round(totalTokens / calls.length)
-    });
-  }
-  return out2.sort((a, b) => b.totalTokens - a.totalTokens);
-}
-function assistantOutputCost(assistantTurns) {
-  const turnCount = assistantTurns.length;
-  let generatedTokens = 0;
-  let resendCeilingTokens = 0;
-  for (let i = 0; i < turnCount; i++) {
-    const tokens = assistantTurns[i] ?? 0;
-    generatedTokens += tokens;
-    resendCeilingTokens += tokens * (turnCount - 1 - i);
-  }
-  return { turnCount, generatedTokens, resendCeilingTokens };
-}
-async function buildWasteReport(transcriptPath, opts = {}) {
-  const parsed = parseTranscript2(transcriptPath);
-  const costs = costPerCall(parsed);
-  const topN = opts.topN ?? 10;
-  return {
-    transcriptPath,
-    totalTokens: costs.reduce((n, c) => n + c.tokens, 0),
-    tokensByTool: tokensByTool(costs),
-    tokensByFile: tokensByFile(costs),
-    topCalls: topExpensiveCalls(costs, topN).map((c) => ({ seq: c.seq, name: c.name, summary: c.summary, tokens: c.tokens })),
-    neverTouchedAgain: neverTouchedAgain(costs),
-    repeatedUncompressedBash: await repeatedUncompressedBashCommands(costs),
-    assistantOutput: assistantOutputCost(parsed.assistantTurns),
-    residentContext: summarizeResidentContext(parsed.resident)
-  };
-}
-
-// src/session_read.ts
+import * as readline2 from "node:readline";
 function resolveSessionTranscript(arg, opts = {}) {
   if (arg !== void 0 && arg !== "") {
-    if (fs36.existsSync(arg) && fs36.statSync(arg).isFile()) return arg;
+    if (fs35.existsSync(arg) && fs35.statSync(arg).isFile()) return arg;
     const projectRoot2 = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
     const dir = projectTranscriptsDir(projectRoot2);
     const byId = arg.endsWith(".jsonl") ? arg : `${arg}.jsonl`;
-    const candidate = path33.join(dir, byId);
-    if (fs36.existsSync(candidate) && fs36.statSync(candidate).isFile()) return candidate;
+    const candidate = path32.join(dir, byId);
+    if (fs35.existsSync(candidate) && fs35.statSync(candidate).isFile()) return candidate;
     return null;
   }
   const projectRoot = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
@@ -16842,7 +17317,7 @@ function toolCallsForBlocks(blocks) {
   return blocks.filter((b) => b.type === "tool_use" && b.name !== void 0).map((b) => b.name);
 }
 async function* streamTurns(transcriptPath) {
-  const input = fs36.createReadStream(transcriptPath, { encoding: "utf8" });
+  const input = fs35.createReadStream(transcriptPath, { encoding: "utf8" });
   const rl = readline2.createInterface({ input, crlfDelay: Infinity });
   try {
     let lineNumber = 0;
@@ -16941,9 +17416,9 @@ function formatSessionSlice(turns) {
 
 // src/cli_bootstrap_audit.ts
 init_define_import_meta_env();
-import * as fs37 from "node:fs";
-import * as os19 from "node:os";
-import * as path34 from "node:path";
+import * as fs36 from "node:fs";
+import * as os17 from "node:os";
+import * as path33 from "node:path";
 import * as readline3 from "node:readline";
 var FRONTMATTER_KEYS = /* @__PURE__ */ new Set(["description", "tools", "allowed-tools", "allowed_tools"]);
 function parseBudget(name, value) {
@@ -16952,7 +17427,7 @@ function parseBudget(name, value) {
   return value;
 }
 async function readFrontmatter(filePath) {
-  const stream = fs37.createReadStream(filePath, { encoding: "utf8" });
+  const stream = fs36.createReadStream(filePath, { encoding: "utf8" });
   const lines = readline3.createInterface({ input: stream, crlfDelay: Infinity });
   let first = true;
   let inFrontmatter = false;
@@ -16998,44 +17473,44 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
   let logicalRoot;
   let rootIsLink;
   try {
-    rootIsLink = (await fs37.promises.lstat(root)).isSymbolicLink();
-    logicalRoot = await fs37.promises.realpath(root);
+    rootIsLink = (await fs36.promises.lstat(root)).isSymbolicLink();
+    logicalRoot = await fs36.promises.realpath(root);
   } catch (error) {
     if (error.code === "ENOENT") return entries;
-    diagnostics.push({ path: path34.resolve(root), reason: "unreadable root" });
+    diagnostics.push({ path: path33.resolve(root), reason: "unreadable root" });
     return entries;
   }
   if (rootIsLink && !followLinks) {
-    diagnostics.push({ path: path34.resolve(root), reason: "external root link skipped (use --follow-links)" });
+    diagnostics.push({ path: path33.resolve(root), reason: "external root link skipped (use --follow-links)" });
     return entries;
   }
   const canonicalKey = (candidate) => process.platform === "win32" ? candidate.toLocaleLowerCase() : candidate;
   const isContained = (candidate, allowedRoot) => {
-    const relative3 = path34.relative(canonicalKey(allowedRoot), canonicalKey(candidate));
-    return relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path34.sep}`) && !path34.isAbsolute(relative3);
+    const relative3 = path33.relative(canonicalKey(allowedRoot), canonicalKey(candidate));
+    return relative3 === "" || relative3 !== ".." && !relative3.startsWith(`..${path33.sep}`) && !path33.isAbsolute(relative3);
   };
   async function visit(candidate, allowedRoot, topLevel = false) {
     let real;
     let candidateIsLink;
     try {
-      candidateIsLink = (await fs37.promises.lstat(candidate)).isSymbolicLink();
-      real = await fs37.promises.realpath(candidate);
+      candidateIsLink = (await fs36.promises.lstat(candidate)).isSymbolicLink();
+      real = await fs36.promises.realpath(candidate);
     } catch {
-      diagnostics.push({ path: path34.resolve(candidate), reason: "broken or unreadable link" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: "broken or unreadable link" });
       return;
     }
     const withinAllowedRoot = allowedRoot === void 0 ? isContained(real, logicalRoot) : isContained(real, allowedRoot);
     const canFollowExternal = followLinks && topLevel;
     if (!withinAllowedRoot && !canFollowExternal) {
-      diagnostics.push({ path: path34.resolve(candidate), reason: candidateIsLink ? "external link skipped (use --follow-links)" : "canonical target outside scan root" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: candidateIsLink ? "external link skipped (use --follow-links)" : "canonical target outside scan root" });
       return;
     }
     const trustedRoot = !withinAllowedRoot && canFollowExternal ? real : allowedRoot ?? real;
     let stat;
     try {
-      stat = await fs37.promises.stat(real);
+      stat = await fs36.promises.stat(real);
     } catch {
-      diagnostics.push({ path: path34.resolve(candidate), reason: "unreadable" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable" });
       return;
     }
     const canonical = process.platform === "win32" ? real.toLocaleLowerCase() : real;
@@ -17044,16 +17519,16 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
       visitedDirs.add(canonical);
       let children;
       try {
-        children = await fs37.promises.readdir(real, { withFileTypes: true });
+        children = await fs36.promises.readdir(real, { withFileTypes: true });
       } catch {
-        diagnostics.push({ path: path34.resolve(candidate), reason: "unreadable directory" });
+        diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable directory" });
         return;
       }
       children.sort((a, b) => a.name.localeCompare(b.name));
-      for (const child of children) await visit(path34.join(real, child.name), trustedRoot);
+      for (const child of children) await visit(path33.join(real, child.name), trustedRoot);
       return;
     }
-    if (!stat.isFile() || path34.extname(real).toLowerCase() !== ".md") return;
+    if (!stat.isFile() || path33.extname(real).toLowerCase() !== ".md") return;
     if (seenFiles.has(canonical)) return;
     seenFiles.add(canonical);
     try {
@@ -17063,35 +17538,35 @@ async function scanMetadataRoot(root, kind, diagnostics, visitedDirs = /* @__PUR
       const toolsBytes = Buffer.byteLength(metadata.tools, "utf8");
       entries.push({
         kind,
-        path: path34.resolve(real),
+        path: path33.resolve(real),
         description_bytes: descriptionBytes,
         tools_bytes: toolsBytes,
         metadata_bytes: descriptionBytes + toolsBytes,
         estimated_tokens: Math.floor((descriptionBytes + toolsBytes) / 4)
       });
     } catch {
-      diagnostics.push({ path: path34.resolve(candidate), reason: "unreadable file" });
+      diagnostics.push({ path: path33.resolve(candidate), reason: "unreadable file" });
     }
   }
   try {
-    const children = await fs37.promises.readdir(logicalRoot, { withFileTypes: true });
+    const children = await fs36.promises.readdir(logicalRoot, { withFileTypes: true });
     children.sort((a, b) => a.name.localeCompare(b.name));
-    for (const child of children) await visit(path34.join(logicalRoot, child.name), void 0, true);
+    for (const child of children) await visit(path33.join(logicalRoot, child.name), void 0, true);
   } catch {
-    diagnostics.push({ path: path34.resolve(root), reason: "unreadable root" });
+    diagnostics.push({ path: path33.resolve(root), reason: "unreadable root" });
   }
   return entries;
 }
 async function buildBootstrapAudit(opts = {}) {
   const project = resolveProjectRoot(opts.project === void 0 ? {} : { project: opts.project });
-  const home = path34.resolve(opts.home ?? os19.homedir());
+  const home = path33.resolve(opts.home ?? os17.homedir());
   const context = buildStats(project, home, opts.project === void 0 ? [] : [opts.project]);
   const diagnostics = [];
   const top = opts.top === void 0 ? 10 : parseBudget("--top", opts.top) ?? 10;
   const visitedDirs = /* @__PURE__ */ new Set();
   const seenFiles = /* @__PURE__ */ new Set();
-  const agents = await scanMetadataRoot(path34.join(home, ".claude", "agents"), "agent", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
-  const skills = await scanMetadataRoot(path34.join(home, ".claude", "skills"), "skill", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
+  const agents = await scanMetadataRoot(path33.join(claudeConfigDir(home), "agents"), "agent", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
+  const skills = await scanMetadataRoot(path33.join(claudeConfigDir(home), "skills"), "skill", diagnostics, visitedDirs, seenFiles, opts.followLinks === true);
   const rankedEntries = [...agents, ...skills].sort((a, b) => b.metadata_bytes - a.metadata_bytes || a.path.localeCompare(b.path));
   const largestTotal = rankedEntries.length;
   const largest = rankedEntries.slice(0, top);
@@ -17158,8 +17633,8 @@ async function runBootstrapAudit(opts = {}) {
 
 // src/cli_memory.ts
 init_define_import_meta_env();
-import * as fs38 from "node:fs";
-import * as path35 from "node:path";
+import * as fs37 from "node:fs";
+import * as path34 from "node:path";
 function removeExactDupLines(text, report) {
   if (report.exactDupLines.length === 0) return text;
   const toRemove = new Set(report.exactDupLines.map(([, dupIdx]) => dupIdx));
@@ -17217,7 +17692,7 @@ function printReport(reports, clusters) {
   } else {
     for (const cluster of clusters) {
       w(
-        `  [${cluster.method}, similarity ${cluster.similarity}, ~${cluster.tokens} tok] ${cluster.members.map((m) => displaySafeText(path35.basename(m))).join(", ")}
+        `  [${cluster.method}, similarity ${cluster.similarity}, ~${cluster.tokens} tok] ${cluster.members.map((m) => displaySafeText(path34.basename(m))).join(", ")}
 `
       );
     }
@@ -17232,7 +17707,7 @@ async function runMemoryCommand(opts = {}) {
   const claudeMds = findClaudeMdFiles(projectRoot);
   const reports = auditClaudeMd(claudeMds);
   const memoryMdPath = findMemoryMd(projectRoot);
-  const clusters = memoryMdPath !== null ? await findContentDuplicates(path35.dirname(memoryMdPath)) : [];
+  const clusters = memoryMdPath !== null ? await findContentDuplicates(path34.dirname(memoryMdPath)) : [];
   printReport(reports, clusters);
   if (opts.fix !== true) return;
   const changes = [];
@@ -17240,7 +17715,7 @@ async function runMemoryCommand(opts = {}) {
     if (report.exactDupLines.length === 0) continue;
     let before;
     try {
-      before = fs38.readFileSync(report.path, "utf-8");
+      before = fs37.readFileSync(report.path, "utf-8");
     } catch {
       continue;
     }
@@ -17278,142 +17753,8 @@ async function runMemoryCommand(opts = {}) {
 
 // src/cli_waste.ts
 init_define_import_meta_env();
-import * as fs40 from "node:fs";
-import * as path37 from "node:path";
-
-// src/copilot_waste.ts
-init_define_import_meta_env();
-import * as fs39 from "node:fs";
-import * as path36 from "node:path";
-var HOOK_RECORD_TYPES = /* @__PURE__ */ new Set(["hook.start", "hook.end"]);
-function splitInjectedBlocks(transformed) {
-  const out2 = [];
-  const blockRe = /<([a-z_][a-z0-9_]*)>([\s\S]*?)<\/\1>/gi;
-  let m;
-  while ((m = blockRe.exec(transformed)) !== null) {
-    const tag = (m[1] ?? "").toLowerCase();
-    const body = m[2] ?? "";
-    let kind = tag;
-    if (tag === "system_reminder") {
-      const inner = /^\s*<([a-z_][a-z0-9_]*)>/i.exec(body);
-      kind = inner !== null ? `reminder:${(inner[1] ?? "").toLowerCase()}` : "reminder:text";
-    }
-    out2.push({ kind, body: m[0] });
-  }
-  return out2;
-}
-function findLatestCopilotSession() {
-  const root = path36.join(copilotCliUserRoot(), "session-state");
-  let entries;
-  try {
-    entries = fs39.readdirSync(root);
-  } catch {
-    return null;
-  }
-  let best = null;
-  let bestMtime = -Infinity;
-  for (const entry of entries) {
-    const candidate = path36.join(root, entry, "events.jsonl");
-    try {
-      const st = fs39.statSync(candidate);
-      if (!st.isFile()) continue;
-      if (st.mtimeMs > bestMtime) {
-        bestMtime = st.mtimeMs;
-        best = candidate;
-      }
-    } catch {
-    }
-  }
-  return best;
-}
-function readNumber(source, key) {
-  const value = source[key];
-  return typeof value === "number" && Number.isFinite(value) ? value : 0;
-}
-function buildCopilotWasteReport(eventsPath) {
-  const raw = fs39.readFileSync(eventsPath, "utf-8");
-  const report = {
-    sessionPath: eventsPath,
-    sessionId: path36.basename(path36.dirname(eventsPath)),
-    turns: 0,
-    tokens: null,
-    blocks: [],
-    compactions: [],
-    hookRecordBytes: 0,
-    totalEventBytes: Buffer.byteLength(raw, "utf-8"),
-    // Read through the real resolution chain rather than passed in. Copilot's
-    // own COPILOT_CACHE_HOME override is what tests point at a fixture, so the
-    // shipping path is the tested path and there is no seam here that only a
-    // test ever supplies.
-    mcpTools: readCopilotMcpTools()
-  };
-  const classes = /* @__PURE__ */ new Map();
-  const seen = /* @__PURE__ */ new Map();
-  for (const line of raw.split("\n")) {
-    const trimmed = line.trim();
-    if (trimmed === "") continue;
-    let event;
-    try {
-      event = JSON.parse(trimmed);
-    } catch {
-      continue;
-    }
-    const type = typeof event["type"] === "string" ? event["type"] : "";
-    const data = event["data"] ?? {};
-    if (HOOK_RECORD_TYPES.has(type)) {
-      report.hookRecordBytes += Buffer.byteLength(trimmed, "utf-8");
-      continue;
-    }
-    if (type === "session.shutdown") {
-      report.tokens = {
-        systemTokens: readNumber(data, "systemTokens"),
-        toolDefinitionsTokens: readNumber(data, "toolDefinitionsTokens"),
-        conversationTokens: readNumber(data, "conversationTokens"),
-        currentTokens: readNumber(data, "currentTokens")
-      };
-      continue;
-    }
-    if (type === "session.compaction_complete") {
-      const summary = typeof data["summaryContent"] === "string" ? data["summaryContent"] : "";
-      report.compactions.push({
-        trigger: typeof data["trigger"] === "string" ? data["trigger"] : "unknown",
-        summaryBytes: Buffer.byteLength(summary, "utf-8"),
-        preTokens: readNumber(data, "preCompactionTokens"),
-        postTokens: readNumber(data, "postCompactionTokens")
-      });
-      continue;
-    }
-    if (type !== "user.message") continue;
-    const transformed = typeof data["transformedContent"] === "string" ? data["transformedContent"] : "";
-    if (transformed === "") continue;
-    report.turns += 1;
-    for (const block of splitInjectedBlocks(transformed)) {
-      const bytes = Buffer.byteLength(block.body, "utf-8");
-      let cls = classes.get(block.kind);
-      if (cls === void 0) {
-        cls = { kind: block.kind, count: 0, bytes: 0, repeatBytes: 0, repeatCount: 0 };
-        classes.set(block.kind, cls);
-      }
-      cls.count += 1;
-      cls.bytes += bytes;
-      let bucket = seen.get(block.kind);
-      if (bucket === void 0) {
-        bucket = /* @__PURE__ */ new Set();
-        seen.set(block.kind, bucket);
-      }
-      if (bucket.has(block.body)) {
-        cls.repeatBytes += bytes;
-        cls.repeatCount += 1;
-      } else {
-        bucket.add(block.body);
-      }
-    }
-  }
-  report.blocks = [...classes.values()].sort((a, b) => b.bytes - a.bytes);
-  return report;
-}
-
-// src/cli_waste.ts
+import * as fs38 from "node:fs";
+import * as path35 from "node:path";
 function printCopilotReport(report) {
   const w = (text) => {
     process.stdout.write(text);
@@ -17612,9 +17953,50 @@ function printResidentContext(resident, w) {
   w(resident.compactionCount === 0 ? "\n" : ", each re-injecting the fixed preamble (CLAUDE.md, memory, skill and agent listings)\n");
 }
 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)) {
+      if (opts.copilot === true) {
+        const detail = `Copilot session event log not found: ${resolvedPath}`;
+        if (opts.json === true) {
+          process.stdout.write(`${displaySafeJson({ error: detail }, 0)}
+`);
+        } else {
+          process.stdout.write("\n# token-goat waste (Copilot CLI)\n");
+          process.stdout.write(`${detail}
+`);
+        }
+        process.exitCode = 1;
+        return;
+      }
+      process.stderr.write(`token-goat: transcript not found: ${resolvedPath}
+`);
+      process.exitCode = 1;
+      return;
+    }
+    if (opts.copilot === true || isCopilotTranscript(resolvedPath)) {
+      const copilotReport = buildCopilotWasteReport(resolvedPath);
+      if (opts.json === true) {
+        process.stdout.write(`${displaySafeJson(copilotReport, 0)}
+`);
+        return;
+      }
+      printCopilotReport(copilotReport);
+      return;
+    }
+    const report2 = await buildWasteReport(resolvedPath, opts.top !== void 0 ? { topN: opts.top } : {});
+    if (opts.json === true) {
+      process.stdout.write(`${displaySafeJson(report2, 0)}
+`);
+      return;
+    }
+    printReport2(report2);
+    return;
+  }
   if (opts.copilot === true) {
-    const eventsPath = opts.transcript !== void 0 ? path37.resolve(opts.transcript) : findLatestCopilotSession();
-    if (eventsPath === null || !fs40.existsSync(eventsPath)) {
+    const eventsPath = opts.project !== void 0 ? findLatestCopilotSession({ projectRoot }) : findLatestCopilotSession({ projectRoot }) ?? findLatestCopilotSession();
+    if (eventsPath === null || !fs38.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)}
@@ -17636,9 +18018,8 @@ async function runWasteCommand(opts = {}) {
     printCopilotReport(copilotReport);
     return;
   }
-  const projectRoot = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
-  const transcriptPath = opts.transcript !== void 0 ? path37.resolve(opts.transcript) : findLatestTranscript(projectRoot);
-  if (transcriptPath === null) {
+  const detected = findProjectSession(projectRoot);
+  if (detected === null) {
     if (opts.json === true) {
       process.stdout.write(`${displaySafeJson({ error: "no session transcript found", project: projectRoot }, 0)}
 `);
@@ -17651,13 +18032,17 @@ async function runWasteCommand(opts = {}) {
     process.exitCode = 1;
     return;
   }
-  if (!fs40.existsSync(transcriptPath)) {
-    process.stderr.write(`token-goat: transcript not found: ${transcriptPath}
+  if (detected.kind === "copilot") {
+    const copilotReport = buildCopilotWasteReport(detected.path);
+    if (opts.json === true) {
+      process.stdout.write(`${displaySafeJson(copilotReport, 0)}
 `);
-    process.exitCode = 1;
+      return;
+    }
+    printCopilotReport(copilotReport);
     return;
   }
-  const report = await buildWasteReport(transcriptPath, opts.top !== void 0 ? { topN: opts.top } : {});
+  const report = await buildWasteReport(detected.path, opts.top !== void 0 ? { topN: opts.top } : {});
   if (opts.json === true) {
     process.stdout.write(`${displaySafeJson(report, 0)}
 `);
@@ -17668,13 +18053,13 @@ async function runWasteCommand(opts = {}) {
 
 // src/cli_mcp_audit.ts
 init_define_import_meta_env();
-import * as fs41 from "node:fs";
-import * as os20 from "node:os";
-import * as path38 from "node:path";
+import * as fs39 from "node:fs";
+import * as os18 from "node:os";
+import * as path36 from "node:path";
 function readMcpJsonFile(configPath2) {
   try {
-    if (!fs41.existsSync(configPath2)) return null;
-    const content = fs41.readFileSync(configPath2, "utf-8");
+    if (!fs39.existsSync(configPath2)) return null;
+    const content = fs39.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;
@@ -17690,8 +18075,8 @@ function driveLetterCaseVariants(p) {
 }
 function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   try {
-    if (!fs41.existsSync(claudeJsonPath)) return null;
-    const parsed = JSON.parse(fs41.readFileSync(claudeJsonPath, "utf-8"));
+    if (!fs39.existsSync(claudeJsonPath)) return null;
+    const parsed = JSON.parse(fs39.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, "\\")];
@@ -17709,9 +18094,9 @@ function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   }
 }
 function discoverMcpConfig(projectRoot, home) {
-  const mcpJsonPath = path38.join(projectRoot, ".mcp.json");
-  const claudeJsonPath = path38.join(home, ".claude.json");
-  const copilotJsonPath = path38.join(home, ".copilot", "mcp-config.json");
+  const mcpJsonPath = path36.join(projectRoot, ".mcp.json");
+  const claudeJsonPath = path36.join(home, ".claude.json");
+  const copilotJsonPath = path36.join(home, ".copilot", "mcp-config.json");
   const sourcesChecked = [mcpJsonPath, claudeJsonPath, copilotJsonPath];
   const fromMcpJson = readMcpJsonFile(mcpJsonPath);
   if (fromMcpJson !== null) return { servers: fromMcpJson, sourcePath: mcpJsonPath, sourcesChecked };
@@ -17742,7 +18127,7 @@ function analyzeMcpCache() {
   }
   return serverMetrics;
 }
-function buildMcpAuditReport(projectRoot, home = os20.homedir()) {
+function buildMcpAuditReport(projectRoot, home = os18.homedir()) {
   const discovery = discoverMcpConfig(projectRoot, home);
   const config = discovery.servers;
   const cacheMetrics = analyzeMcpCache();
@@ -17828,69 +18213,6 @@ async function runMcpAuditCommand(opts = {}) {
   printReport3(report);
 }
 
-// src/cli_recall.ts
-init_define_import_meta_env();
-var RECALL_COMMAND = {
-  bash: "bash-output",
-  web: "web-output",
-  mcp: "mcp-output"
-};
-function fenceTagForCacheType(cacheType) {
-  return cacheType === "web" ? UNTRUSTED_WEB_TAG : UNTRUSTED_TOOL_TAG;
-}
-function fenceRecallListing(text, hits) {
-  const tags = new Set(hits.map((hit) => fenceTagForCacheType(hit.cacheType)));
-  const tag = tags.size === 1 ? [...tags][0] ?? UNTRUSTED_TOOL_TAG : UNTRUSTED_TOOL_TAG;
-  return fenceUntrusted(text, tag);
-}
-function fenceSnippetIfMatched(hit) {
-  const matches2 = scanAndRecord(hit.snippet);
-  if (matches2.length === 0) return hit.snippet;
-  return fenceUntrustedContent(hit.snippet, matches2, fenceTagForCacheType(hit.cacheType));
-}
-function printHits(query, hits) {
-  const w = (text) => {
-    process.stdout.write(text);
-  };
-  if (hits.length === 0) {
-    w(query === void 0 ? "No cache entries yet.\n" : `No cache entries match: ${query}
-`);
-    return;
-  }
-  const body = hits.map((hit) => {
-    const label = hit.label.length > 80 ? hit.label.slice(0, 77) + "..." : hit.label;
-    const pointer = hit.blobPresent ? `  (token-goat ${RECALL_COMMAND[hit.cacheType]} ${hit.id})` : "  (blob expired -- content below is all that remains)";
-    return `[${pad(hit.cacheType, 4)}] ${hit.id}
-${pointer}
-  ${label}
-  ${hit.snippet}
-`;
-  }).join("\n");
-  w(`${fenceRecallListing(body, hits)}
-`);
-}
-function runRecallCommand(query, opts = {}) {
-  const browse = query === void 0 || query.trim() === "";
-  const scope = {
-    ...opts.type !== void 0 ? { type: opts.type } : {},
-    ...opts.limit !== void 0 ? { limit: opts.limit } : {}
-  };
-  const effectiveLimit = opts.limit ?? RECALL_DEFAULT_LIMIT;
-  const fetched = browse ? listRecentRecall({ ...scope, limit: effectiveLimit + 1 }) : searchRecall(query, { ...scope, limit: effectiveLimit + 1 });
-  const hits = fetched.slice(0, effectiveLimit);
-  if (fetched.length > hits.length) {
-    process.stderr.write(`Showing ${hits.length} entries; more are available (raise --limit to see them).
-`);
-  }
-  if (opts.json === true) {
-    const fenced = hits.map((hit) => ({ ...hit, snippet: fenceSnippetIfMatched(hit) }));
-    process.stdout.write(`${displaySafeJson(fenced, 0)}
-`);
-    return;
-  }
-  printHits(browse ? void 0 : query, hits);
-}
-
 // src/cli_statusline.ts
 init_define_import_meta_env();
 var STDIN_TIMEOUT_MS = 1500;
@@ -17967,7 +18289,7 @@ async function runStatuslineCommand(opts = {}) {
     return;
   }
   const line = renderStatusline(data);
-  process.stdout.write(`${colorStdout() ? line : stripAnsi(line)}
+  process.stdout.write(`${colorStdout() ? line : stripAnsiEscapes(line)}
 `);
 }
 
@@ -17986,14 +18308,20 @@ function efficacyCell(row) {
   const pct3 = row.efficacyPct === null ? "n/a" : `${row.efficacyPct}%`;
   return isSuppressionCategory(row.category) ? `${pct3} *` : pct3;
 }
+function emittedCell(row) {
+  return row.unobservable > 0 ? `${row.emitted} ~${row.unobservable}` : String(row.emitted);
+}
+function detectedCell(row) {
+  return row.detected === 0 ? "-" : String(row.detected);
+}
 function printSummary(rows) {
   const w = (text) => {
     process.stdout.write(text);
   };
-  w(pad("category", 22) + pad("emitted", 9) + pad("acted-on", 10) + pad("efficacy", 12) + pad("suppressed", 17) + pad("manual+", 9) + pad("manual-", 9) + "spent\n");
+  w(pad("category", 22) + pad("emitted", 9) + pad("undisplayed", 13) + pad("acted-on", 10) + pad("efficacy", 12) + pad("suppressed", 17) + pad("manual+", 9) + pad("manual-", 9) + "spent-bytes\n");
   for (const row of rows) {
     w(
-      pad(row.category, 22) + pad(String(row.emitted), 9) + pad(String(row.actedOn), 10) + pad(efficacyCell(row), 12) + pad(suppressedCell(row), 17) + pad(String(row.manualEffective), 9) + pad(String(row.manualIneffective), 9) + formatSpentCell(row) + "\n"
+      pad(row.category, 22) + pad(emittedCell(row), 9) + pad(detectedCell(row), 13) + pad(String(row.actedOn), 10) + pad(efficacyCell(row), 12) + pad(suppressedCell(row), 17) + pad(String(row.manualEffective), 9) + pad(String(row.manualIneffective), 9) + formatSpentCell(row) + "\n"
     );
   }
 }
@@ -18002,7 +18330,7 @@ function printTotals(totals) {
   const legacyNote = totals.legacyEmissions > 0 ? ` (excludes ${totals.legacyEmissions} legacy emission(s) recorded before spend tracking)` : "";
   process.stdout.write(
     `
-TOTAL   saved=${totals.savedBytes} (all-time, every hint kind)   spent=${spent} (hint_emissions ledger only)${legacyNote}
+TOTAL   saved-bytes=${totals.savedBytes} (all-time, every hint kind)   spent-bytes=${spent} (hint_emissions ledger only)${legacyNote}
 `
   );
 }
@@ -18030,7 +18358,7 @@ function runHintStatsCommand(opts = {}) {
 `);
     return;
   }
-  if (rows.every((r) => r.emitted === 0 && r.actedOn === 0)) {
+  if (rows.every((r) => r.emitted === 0 && r.actedOn === 0 && r.unobservable === 0 && r.detected === 0)) {
     process.stdout.write("No hint emissions recorded yet \u2014 the zeros below are absence of data, not measured ineffectiveness.\n");
   }
   printSummary(rows);
@@ -18039,6 +18367,16 @@ function runHintStatsCommand(opts = {}) {
       '\n* Scored on an absence: these hints ask the agent NOT to do something, so a window that expires with no re-read counts as compliance. Their percentage is not comparable with the unmarked rows, which only count when the agent runs the command the hint named. A high starred figure means "the warned-against read was not seen", not "this hint persuaded anyone".\n'
     );
   }
+  if (rows.some((r) => r.detected > 0)) {
+    process.stdout.write(
+      "\nundisplayed: detections that never reached the agent -- auto-suppressed, or declined by the hint's own net-benefit gate because the substitute it would have proposed was not smaller than the read it was redirecting. They cost nothing and are scored nowhere. A large figure against a small emitted count means the trigger is alive and the mute is doing the work; a `-` means it has gone quiet on its own.\n"
+    );
+  }
+  if (rows.some((r) => r.unobservable > 0)) {
+    process.stdout.write(
+      "\n~N: N further emissions in that category carried no correlator -- no pointer a later command could have matched -- so no verdict about them was ever observed. They are not in the emitted or acted-on counts and not in the efficacy figure, which is scored only on the rows that could have gone either way. They ARE in the spend column: an unobservable hint costs the agent its bytes all the same.\n"
+    );
+  }
   const permanent = rows.filter((r) => r.suppressionPermanent);
   if (permanent.length > 0) {
     const names = permanent.map((r) => r.category).join(", ");
@@ -18074,10 +18412,18 @@ function cmdWaste(opts = {}) {
     ...opts.project !== void 0 ? { project: opts.project } : {},
     ...opts.transcript !== void 0 ? { transcript: opts.transcript } : {},
     ...opts.json === true ? { json: true } : {},
-    ...opts.top !== void 0 ? { top: requireNonNegativeInt2("--top", opts.top) } : {},
+    ...opts.top !== void 0 ? { top: requireNonNegativeInt("--top", opts.top) } : {},
     ...opts.copilot === true ? { copilot: true } : {}
   });
 }
+async function cmdAudit(opts = {}) {
+  const { runAuditCommand } = await import("./token-goat-chunk-DYUBZZNP.mjs");
+  return runAuditCommand({
+    ...opts.project !== void 0 ? { project: opts.project } : {},
+    ...opts.transcript !== void 0 ? { transcript: opts.transcript } : {},
+    ...opts.json === true ? { json: true } : {}
+  });
+}
 async function cmdSessionAudit(opts = {}) {
   let summary;
   try {
@@ -18104,7 +18450,7 @@ ${formatSessionOutline(turns)}`;
 }
 function sessionTranscriptSize(transcriptPath) {
   try {
-    return fs42.statSync(transcriptPath).size;
+    return fs40.statSync(transcriptPath).size;
   } catch {
     return 0;
   }
@@ -18140,7 +18486,7 @@ function cmdRecall(query, opts = {}) {
   }
   runRecallCommand(query, {
     ...type !== void 0 ? { type } : {},
-    ...opts.limit !== void 0 ? { limit: requireNonNegativeInt2("--limit", opts.limit) } : {},
+    ...opts.limit !== void 0 ? { limit: requireNonNegativeInt("--limit", opts.limit) } : {},
     ...opts.json === true ? { json: true } : {}
   });
 }
@@ -18164,14 +18510,14 @@ function cmdHintStats(opts = {}) {
 
 // src/cli_skills.ts
 init_define_import_meta_env();
-import * as fs43 from "node:fs";
-import * as path39 from "node:path";
+import * as fs41 from "node:fs";
+import * as path37 from "node:path";
 async function cmdSkillBody(name, opts) {
   const filePath = await getSkillFilePath(name);
   if (filePath === null) {
     throw new CliError(`skill '${name}' not found`);
   }
-  const body = decodeSource(fs43.readFileSync(filePath));
+  const body = decodeSource(fs41.readFileSync(filePath));
   if (opts.compact === true) {
     const emitted = extractCompactFromMarker(body) ?? body;
     out(emitted);
@@ -18198,7 +18544,7 @@ async function cmdSkillCompact(name, opts) {
       }
       let body2;
       try {
-        body2 = decodeSource(fs43.readFileSync(filePath));
+        body2 = decodeSource(fs41.readFileSync(filePath));
       } catch {
         unresolvable++;
         continue;
@@ -18232,19 +18578,19 @@ async function cmdSkillCompact(name, opts) {
     if (!opts.path.trim()) {
       throw new CliError("--path cannot be empty");
     }
-    if (!fs43.existsSync(opts.path)) {
+    if (!fs41.existsSync(opts.path)) {
       throw new CliError(`skill file not found: ${opts.path}`);
     }
     try {
-      body = fs43.readFileSync(opts.path, "utf-8");
+      body = fs41.readFileSync(opts.path, "utf-8");
     } catch (e) {
       if (e.code === "ENOENT") {
         throw new CliError(`skill file not found: ${opts.path}`);
       }
       throw new CliError(`failed to read skill file '${opts.path}': ${extractErrorMessage(e)}`);
     }
-    cacheName = name ?? path39.basename(path39.dirname(path39.resolve(opts.path)));
-    sourcePath = path39.resolve(opts.path);
+    cacheName = name ?? path37.basename(path37.dirname(path37.resolve(opts.path)));
+    sourcePath = path37.resolve(opts.path);
   } else {
     if (name === void 0 || !name.trim()) {
       throw new CliError("skill-compact requires a <name> or --path <file>");
@@ -18253,7 +18599,7 @@ async function cmdSkillCompact(name, opts) {
     if (filePath === null) {
       throw new CliError(`skill '${name}' not found`);
     }
-    body = fs43.readFileSync(filePath, "utf-8");
+    body = fs41.readFileSync(filePath, "utf-8");
     cacheName = name;
     sourcePath = filePath;
   }
@@ -18385,8 +18731,8 @@ async function cmdSkillDiff(name) {
   }
   const newer = versions[0];
   const older = versions[1];
-  const newerBody = await fs43.promises.readFile(path39.resolve(dir, `${newer.outputId}.txt`), "utf-8").catch(() => null);
-  const olderBody = await fs43.promises.readFile(path39.resolve(dir, `${older.outputId}.txt`), "utf-8").catch(() => null);
+  const newerBody = await 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);
   if (newerBody === null || olderBody === null) {
     out(`a cached version of '${name}' was evicted while diffing -- try again`);
     return;
@@ -18415,7 +18761,7 @@ async function cmdSkillSection(nameHeading, headingArg) {
   if (!filePath) {
     throw new CliError(`skill '${skillName}' not found`);
   }
-  const body = decodeSource(fs43.readFileSync(filePath));
+  const body = decodeSource(fs41.readFileSync(filePath));
   const extracted = extractNamedSection(body, heading);
   if (!extracted) {
     const allHeadings = listSections(filePath);
@@ -18436,94 +18782,12 @@ async function cmdSkillSection(nameHeading, headingArg) {
 // src/cache_session_commands.ts
 init_define_import_meta_env();
 
-// src/resume.ts
-init_define_import_meta_env();
-import { readFile } from "node:fs/promises";
-var MAX_RESUME_TOKENS = 2e3;
-var MAX_RESUME_CHARS = MAX_RESUME_TOKENS * 4;
-var SKILL_MAX_COUNT = 3;
-var SKILL_MAX_CHARS_EACH = 400;
-async function buildSkillsSection(sessionId) {
-  const skills = await listSkills(sessionId);
-  if (skills.length === 0) return [];
-  const skillLines = ["## Skills"];
-  for (const skill of skills.slice(0, SKILL_MAX_COUNT)) {
-    let checklist = null;
-    try {
-      const filePath = await getSkillFilePath(skill.name);
-      if (filePath !== null) {
-        const body = await readFile(filePath, "utf-8");
-        checklist = extractChecklistSection(body);
-      }
-    } catch {
-      checklist = null;
-    }
-    if (checklist !== null) {
-      const trimmed = checklist.length > SKILL_MAX_CHARS_EACH ? checklist.slice(0, SKILL_MAX_CHARS_EACH).trimEnd() + "\u2026" : checklist;
-      skillLines.push(`**${skill.name}**:`);
-      skillLines.push(trimmed);
-    } else {
-      skillLines.push(`**${skill.name}** \u2014 \`token-goat skill-body ${skill.name} --section DoD\``);
-    }
-  }
-  skillLines.push("");
-  return skillLines;
-}
-async function buildResumePacket(sessionId) {
-  const blob = loadBlob(SESSIONS_SUBDIR, sessionId);
-  if (blob === null || typeof blob !== "object") return null;
-  const raw = blob;
-  const filesArr = Array.isArray(raw["files"]) ? raw["files"] : [];
-  const lines = [`# Resume packet \u2014 session ${sessionId}`, ""];
-  try {
-    lines.push(...await buildSkillsSection(sessionId));
-  } catch {
-  }
-  const editedPaths = filesArr.filter((f) => f["wasEdited"] === true).map((f) => typeof f["path"] === "string" ? f["path"] : "").filter(Boolean).slice(0, 10);
-  if (editedPaths.length > 0) {
-    lines.push("## Edited files");
-    for (const p of editedPaths) lines.push(`- ${p}`);
-    lines.push("");
-  }
-  const topRead = [...filesArr].filter((f) => f["wasEdited"] !== true).sort((a, b) => (typeof b["readCount"] === "number" ? b["readCount"] : 0) - (typeof a["readCount"] === "number" ? a["readCount"] : 0)).slice(0, 8).map((f) => typeof f["path"] === "string" ? f["path"] : "").filter(Boolean);
-  if (topRead.length > 0) {
-    lines.push("## Top files read");
-    for (const p of topRead) lines.push(`- ${p}`);
-    lines.push("");
-  }
-  const bashOutputs = Array.isArray(raw["bashOutputs"]) ? raw["bashOutputs"] : [];
-  const recentBash = bashOutputs.slice(-2);
-  if (recentBash.length > 0) {
-    lines.push("## Recent bash commands");
-    for (const entry of recentBash) {
-      if (Array.isArray(entry) && typeof entry[1] === "string") {
-        const bashEntry = getBashOutput(entry[1]);
-        if (bashEntry !== null) lines.push(`- ${displaySafeText(bashEntry.command)}`);
-      }
-    }
-    lines.push("");
-  }
-  try {
-    const projectRoot = resolveProjectRoot();
-    const result = runGit(["diff", "--stat"], { cwd: projectRoot });
-    if (result.exitCode === 0 && result.stdout.trim().length > 0) {
-      lines.push("## Uncommitted changes (git diff --stat)");
-      lines.push(result.stdout.trim());
-      lines.push("");
-    }
-  } catch {
-  }
-  const text = lines.join("\n");
-  if (text.length <= MAX_RESUME_CHARS) return text;
-  return safeSlice(text, MAX_RESUME_CHARS) + "\n... (truncated to cap)\n";
-}
-
 // src/cli_stats.ts
 init_define_import_meta_env();
-import * as fs44 from "node:fs";
-import * as path40 from "node:path";
+import * as fs42 from "node:fs";
+import * as path38 from "node:path";
 function writeRaw(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
+  const payload = colorStdout() ? text : stripAnsiEscapes(text);
   process.stdout.write(ensureNewline(payload));
 }
 function rankByReadCount(entries, topN) {
@@ -18533,7 +18797,7 @@ function formatTopFiles(ranked) {
   if (ranked.length === 0) return "";
   const lines = ["Top files this session:"];
   for (const { path: filePath, count } of ranked) {
-    const basename10 = path40.basename(filePath);
+    const basename10 = path38.basename(filePath);
     lines.push(`  ${count.toString().padStart(3)}x  ${basename10}  (${filePath})`);
   }
   return lines.join("\n");
@@ -18550,12 +18814,12 @@ function renderTopSessionFiles(topN = 5) {
 }
 function renderTopSessionFilesFromDisk(topN = 5, overrideSessionsDir) {
   try {
-    const sessionsDir = overrideSessionsDir ?? path40.join(dataDir(), "sessions");
-    if (!fs44.existsSync(sessionsDir)) return "";
-    const files = fs44.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, mtime: fs44.statSync(path40.join(sessionsDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).slice(0, 3);
+    const dir = overrideSessionsDir ?? sessionsDir();
+    if (!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);
     for (const { name } of files) {
       try {
-        const raw = fs44.readFileSync(path40.join(sessionsDir, name), "utf-8");
+        const raw = fs42.readFileSync(path38.join(dir, name), "utf-8");
         const data = JSON.parse(raw);
         const filesList = data["files"];
         if (!Array.isArray(filesList)) continue;
@@ -18619,6 +18883,10 @@ function runStats(opts = {}) {
     renderMethodology(opts.json === true);
     return;
   }
+  if (opts.hooks === true) {
+    renderHookLatencyStats(void 0, opts.homeDir);
+    return;
+  }
   const window = opts.windowDays ?? 30;
   const summary = summarize(window, void 0, opts.homeDir);
   if (opts.json === true) {
@@ -18643,13 +18911,10 @@ function runStats(opts = {}) {
 }
 
 // src/cache_session_commands.ts
-function emitErr3(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function capAndNote(rows, limit) {
   const shown = rows.slice(0, limit);
   if (shown.length < rows.length) {
-    emitErr3(`Showing ${shown.length} of ${rows.length} entries (raise --limit to see the rest).`);
+    emitErr(`Showing ${shown.length} of ${rows.length} entries (raise --limit to see the rest).`);
   }
   return shown;
 }
@@ -18659,11 +18924,11 @@ function parseLimitOpt(cmdName, limitStr, dflt = 30) {
   try {
     n = requireNonNegativeStrictInt("--limit", limitStr);
   } catch (e) {
-    emitErr3(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
+    emitErr(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
     throw new Error(`invalid --limit: ${limitStr}`, { cause: e });
   }
   if (n === 0) {
-    emitErr3(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
+    emitErr(`${cmdName}: --limit must be a positive number, got: "${limitStr}"`);
     throw new Error(`invalid --limit: ${limitStr}`);
   }
   return n;
@@ -18695,9 +18960,10 @@ function cmdBashHistory(opts) {
   const allItems = blobs.map(({ id, mtime, value }) => {
     if (typeof value !== "object" || value === null) return null;
     const v = value;
+    if (typeof v["command"] !== "string") return null;
     return {
       id,
-      command: typeof v["command"] === "string" ? v["command"] : "",
+      command: v["command"],
       storedAt: typeof v["storedAt"] === "number" ? v["storedAt"] : mtime,
       exitCode: typeof v["exitCode"] === "number" ? v["exitCode"] : -1,
       sizeBytes: typeof v["sizeBytes"] === "number" ? v["sizeBytes"] : 0
@@ -18900,11 +19166,17 @@ function cmdCompactHint(opts) {
   const cache = sessionId !== null ? loadSessionCache(sessionId) : null;
   const transcriptPath = sessionId !== null ? resolveSessionTranscript(sessionId) : null;
   const pressure = getContextPressure(cache ?? void 0, transcriptPath ?? void 0);
-  const [manifest, eventCount] = sessionId !== null ? buildManifestWithCount(sessionId) : ["", 0];
+  let manifest = "";
+  let events = 0;
+  if (sessionId !== null && cache !== null) {
+    loadSessionState(sessionId);
+    manifest = buildManifest(sessionId, process.cwd(), transcriptPath ?? void 0);
+    events = eventCount(cache);
+  }
   const manifestTokens = estimateTokens(manifest);
   const pct3 = (pressure.fillFraction * 100).toFixed(1);
   if (opts.json === true) {
-    const out2 = { tier: pressure.tier, fillFraction: pressure.fillFraction, pct: Number(pct3), manifestTokens, eventCount };
+    const out2 = { tier: pressure.tier, fillFraction: pressure.fillFraction, pct: Number(pct3), manifestTokens, eventCount: events };
     if (sessionId !== null) out2["sessionId"] = sessionId;
     if (opts.trigger !== void 0) out2["trigger"] = opts.trigger;
     process.stdout.write(displaySafeJson(out2) + "\n");
@@ -18914,7 +19186,7 @@ function cmdCompactHint(opts) {
 `);
   if (sessionId !== null) process.stdout.write(`Session: ${sessionId}
 `);
-  process.stdout.write(`Manifest: ${manifestTokens} tokens, ${countNoun(eventCount, "event")}
+  process.stdout.write(`Manifest: ${manifestTokens} tokens, ${countNoun(events, "event")}
 `);
   if (opts.trigger === "auto") {
     const remaining = Math.max(0, Math.round((1 - pressure.fillFraction) * CONTEXT_AUTOCOMPACT_TOKENS));
@@ -19017,6 +19289,7 @@ function registerSessionCommands(program2, guard) {
   program2.command("bootstrap-audit").description("audit Claude Code startup-context contributors without reading prompt bodies").option("--project <path>", "project root to analyze").option("--home <path>", "home directory override (for CI/testing)").option("--follow-links", "follow external symlink/junction roots and direct children").option("-j, --json", "output as JSON").option("--top <n>", "largest metadata entries to show (default 10)", "10").option("--warn-tokens <n>", "warn when total estimated startup tokens exceed n").option("--fail-tokens <n>", "fail when total estimated startup tokens exceed n").option("--warn-bytes <n>", "warn when agent/skill metadata bytes exceed n").option("--fail-bytes <n>", "fail when agent/skill metadata bytes exceed n").action(guard(cmdBootstrapAudit));
   program2.command("memory").description("analyze CLAUDE.md files for duplicate/overlapping content (--fix to apply safe mechanical fixes)").option("--project <path>", "project root to analyze").option("--analyze", "report-only analysis (default)").option("--fix", "remove exact-duplicate lines (confirm-gated; shows a diff before writing)").option("--yes", "apply --fix changes without prompting (non-interactive)").action(guard(cmdMemory));
   program2.command("waste").description("session spend-ledger: token cost per tool/file from the current Claude Code session transcript, plus waste signals").option("--project <path>", "project root to analyze").option("--transcript <path>", "explicit transcript JSONL path (default: most-recently-modified transcript for this project)").option("--top <n>", "number of top expensive tool calls to show (default: 10)").option("--copilot", "analyze a Copilot CLI session event log instead, reporting Copilot's own token split").option("--json", "output JSON").action(guard(cmdWaste));
+  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));
@@ -19131,16 +19404,15 @@ var BRIDGE_CAPABILITY_MATRIX = [
     harness: "codex",
     label: "Codex CLI",
     sourceFile: "src/bridges/codex_install.ts (CODEX_HOOK_EVENTS, CODEX_GLOBAL_HOOK_EVENTS)",
-    verification: "sourced",
-    verificationNote: "Wire format pinned to Codex 0.137.0+'s declared hookSpecificOutput schema (src/bridges/codex.ts); no run against a Codex binary is recorded here.",
+    verification: "dogfooded",
+    verificationNote: `codex-cli 0.155.0, 2026-09-22: observed running the installed config.toml hooks and delivering real payloads to the shim -- PreToolUse/PostToolUse with tool_name "Bash" and tool_input.command, and PreCompact with trigger "auto" from a forced auto-compaction. A pre-tool deny was honored (the model dropped Get-Content and ran token-goat outline instead) and post-tool additionalContext reached the model; the pre-compact response did not, which is why codex is in PRE_COMPACT_CONTEXT_DROPPED. Two conditions gate the tool events and both fail silently. config.toml must carry the matching [hooks.state] trusted_hash the installer writes, and the matcher must name the tool as it appears on the hook wire -- "Bash" for shell execution, since Codex normalizes its own exec tool into Claude Code's vocabulary before matching, while apply_patch stays native. A matcher naming the internal spelling produced a run with eight pre_compact rows and no pre_tool_use or post_tool_use row at all, and that also stranded every queued compaction manifest. Verified end to end after the fix: a forced auto-compaction run recorded eight compactions and twelve manifest deliveries in its own rollout transcript.`,
     implemented: /* @__PURE__ */ new Set(["pre_tool_use", "post_tool_use", "pre_compact", "user_prompt_submit", "subagent_stop"]),
     reasons: [
       { events: ["post_tool_use_failure"], reason: NO_SEPARATE_FAILURE_EVENT_REASON },
-      { events: ["post_compact"], reason: NO_POST_COMPACT_EVENT_REASON },
       { events: ["notification", "stop"], reason: NO_SERVER_HANDLER_REASON },
       {
-        events: ["session_start"],
-        reason: "Codex CLI's hook config schema (CODEX_EVENT_ARG) has no session-start-equivalent event to map onto token-goat's session_start -- unlike Claude Code's real SessionStart hook"
+        events: ["post_compact", "session_start"],
+        reason: "Codex CLI 0.155.0 does declare PostCompact and SessionStart -- both appear in the hook-event enum next to PreToolUse and PreCompact, so the earlier claim that it had no session-start equivalent and no post-compact event was wrong. They stay unwired for the reason the rest of this table applies: neither channel has been measured. The post-compact input has no summary field anywhere in the binary's payload key list (session_id, turn_id, agent_id, agent_type, transcript_path, hook_event_name, model, permission_mode, trigger, tool_name, tool_input, tool_use_id), so postCompactHandler would have nothing to count, and whether SessionStart forwards additionalContext has not been run"
       }
     ]
   },
@@ -19281,7 +19553,7 @@ var BRIDGE_CAPABILITY_MATRIX = [
     reasons: [
       {
         events: ["pre_compact", "post_tool_use_failure"],
-        reason: "VS Code reads the shared Copilot hooks file but maps only sessionStart, sessionEnd, userPromptSubmitted, preToolUse, postToolUse, agentStop, subagentStop and errorOccurred out of it, so the file's preCompact and postToolUseFailure entries never fire there"
+        reason: "VS Code reads the shared Copilot hooks file but maps only sessionStart, sessionEnd, userPromptSubmitted, preToolUse, postToolUse, agentStop, subagentStop and errorOccurred out of it, so the file's preCompact and postToolUseFailure entries never fire there. Re-read in the 1.138.0 bundle, where the github-copilot branch of that table still lists exactly those eight: the compaction manifest is unavailable on this harness rather than merely unwired, and unlike Copilot CLI and Codex there is no queueing fallback, because the trigger itself never arrives"
       },
       { events: ["post_compact"], reason: NO_POST_COMPACT_EVENT_REASON },
       { events: ["notification", "stop"], reason: NO_SERVER_HANDLER_REASON }
@@ -19434,25 +19706,25 @@ function installVerificationNotice(harness) {
 
 // src/purge.ts
 init_define_import_meta_env();
-import * as fs45 from "node:fs";
-import * as path41 from "node:path";
+import * as fs43 from "node:fs";
+import * as path39 from "node:path";
 function directorySize(root) {
   let total = 0;
   let entries;
   try {
-    entries = fs45.readdirSync(root, { withFileTypes: true });
+    entries = fs43.readdirSync(root, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const full = path41.join(root, entry.name);
+    const full = path39.join(root, entry.name);
     if (entry.isDirectory()) {
       total += directorySize(full);
       continue;
     }
     if (!entry.isFile()) continue;
     try {
-      total += fs45.statSync(full).size;
+      total += fs43.statSync(full).size;
     } catch {
     }
   }
@@ -19471,7 +19743,7 @@ function purgeDataDirectories() {
     }
     const bytes = directorySize(root);
     try {
-      fs45.rmSync(root, { recursive: true, force: true });
+      fs43.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) });
@@ -19618,8 +19890,8 @@ async function getSectionContent(fileId, heading, opts = {}) {
 
 // src/cli_bench.ts
 init_define_import_meta_env();
-import * as fs46 from "node:fs";
-import * as path42 from "node:path";
+import * as fs44 from "node:fs";
+import * as path40 from "node:path";
 var ControlFilter = class extends ToolFilter {
   constructor(name, transform) {
     super();
@@ -19640,13 +19912,13 @@ var CONTROL_FILTERS = {
 };
 var MAX_BENCH_FILE_BYTES = 5 * 1024 * 1024;
 function readCaseFile(id, filePath, what) {
-  const bytes = fs46.statSync(filePath).size;
+  const bytes = fs44.statSync(filePath).size;
   if (bytes > MAX_BENCH_FILE_BYTES) {
     throw new Error(
       `bench case ${id}: ${what} is ${bytes} bytes, over the ${MAX_BENCH_FILE_BYTES}-byte limit for a corpus file (${filePath})`
     );
   }
-  return fs46.readFileSync(filePath, "utf8");
+  return fs44.readFileSync(filePath, "utf8");
 }
 function parseCase(id, metaPath, outputPath) {
   const metaText = readCaseFile(id, metaPath, "metadata");
@@ -19681,7 +19953,7 @@ function parseCase(id, metaPath, outputPath) {
 function loadCorpus(dir) {
   let entries;
   try {
-    entries = fs46.readdirSync(dir);
+    entries = fs44.readdirSync(dir);
   } catch {
     throw new Error(`bench corpus not found: ${dir}`);
   }
@@ -19689,9 +19961,9 @@ function loadCorpus(dir) {
   for (const entry of entries.sort()) {
     if (!entry.endsWith(".json")) continue;
     const id = entry.slice(0, -".json".length);
-    const outputPath = path42.join(dir, `${id}.txt`);
-    if (!fs46.existsSync(outputPath)) throw new Error(`bench case ${id}: missing output file ${outputPath}`);
-    cases.push(parseCase(id, path42.join(dir, entry), outputPath));
+    const outputPath = 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));
   }
   if (cases.length === 0) throw new Error(`bench corpus is empty: ${dir}`);
   return cases;
@@ -19811,10 +20083,10 @@ function appendTsv(file, report, commit) {
     report.mustKeepTotal,
     report.coveredFilters
   ].join("	");
-  const dir = path42.dirname(path42.resolve(file));
-  fs46.mkdirSync(dir, { recursive: true });
-  const header = fs46.existsSync(file) ? "" : TSV_HEADER;
-  fs46.appendFileSync(file, header + row + "\n", "utf8");
+  const dir = path40.dirname(path40.resolve(file));
+  fs44.mkdirSync(dir, { recursive: true });
+  const header = fs44.existsSync(file) ? "" : TSV_HEADER;
+  fs44.appendFileSync(file, header + row + "\n", "utf8");
 }
 function currentCommit(cwd) {
   const opts = cwd === void 0 ? {} : { cwd };
@@ -19843,7 +20115,7 @@ function runBenchCommand(opts) {
 var CliError = class extends Error {
 };
 function out(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
+  const payload = colorStdout() ? text : stripAnsiEscapes(text);
   process.stdout.write(ensureNewline(payload));
 }
 function err(text) {
@@ -19854,10 +20126,10 @@ function readBoundedText(text, file) {
   if (text === void 0 && file === void 0) throw new CliError("provide text or --file");
   let value;
   if (file !== void 0) {
-    if (fs47.statSync(file).size > CONTENT_MAX_INPUT_CHARS) {
+    if (fs45.statSync(file).size > CONTENT_MAX_INPUT_CHARS) {
       throw new CliError(`file exceeds the ${CONTENT_MAX_INPUT_CHARS}-byte safety limit`);
     }
-    value = fs47.readFileSync(file, "utf8");
+    value = fs45.readFileSync(file, "utf8");
   } else {
     if (text === void 0) throw new CliError("provide text or --file");
     value = text;
@@ -19902,35 +20174,11 @@ 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"));
 }
-function requireInt2(flag, raw) {
-  if (!/^-?\d+$/.test(raw)) {
-    throw new CliError(`${flag} must be a number, got: "${raw}"`);
-  }
-  const n = Number.parseInt(raw, 10);
-  if (!Number.isFinite(n)) {
-    throw new CliError(`${flag} must be a number, got: "${raw}"`);
-  }
-  return n;
-}
-function requireNonNegativeInt2(flag, raw) {
-  const n = requireInt2(flag, raw);
-  if (n < 0) {
-    throw new CliError(`${flag} must be a non-negative number, got: "${raw}"`);
-  }
-  return n;
-}
-function requirePositiveInt2(flag, raw) {
-  const n = requireInt2(flag, raw);
-  if (n <= 0) {
-    throw new CliError(`${flag} must be a positive number, got: "${raw}"`);
-  }
-  return n;
-}
 async function cmdSemantic(query, opts) {
   if (!query && !opts.preflight && !opts.warm) {
     throw new CliError("missing required argument: query");
   }
-  const limit = opts.limit !== void 0 ? requireNonNegativeInt2("--limit", opts.limit) : 20;
+  const limit = opts.limit !== void 0 ? requireNonNegativeInt("--limit", opts.limit) : 20;
   const { text, code } = await runSemantic(query ?? "", {
     limit,
     ...opts.json === true ? { json: true } : {},
@@ -19967,6 +20215,7 @@ async function cmdIndex(pathArg, opts = {}) {
   const ixCfg = loadConfig().indexing;
   if ((loadConfig().indexing?.embeddings_enabled ?? true) && embeddingsDepsAvailable(getDb(dbPath))) {
     ensureEmbeddingProvenance(getDb(dbPath));
+    pruneUnembeddableChunks(getDb(dbPath), ixCfg.max_chunks_per_file, deleteFileEmbeddings, { asset: assetEmbedSha, maxChunks: maxChunksEmbedSha });
   }
   let indexed = 0;
   let failed = 0;
@@ -20003,20 +20252,24 @@ async function cmdIndex(pathArg, opts = {}) {
       continue;
     }
     const sha = fingerprintFile(key);
-    if (sha === null && !fs47.existsSync(key)) continue;
+    if (sha === null && !fs45.existsSync(key)) continue;
+    recordKnownRootThrottled(key, dataDir(), dbPath);
     const entry = sha !== null ? getFileEntry(key, dbPath) : null;
     const spellingStale = entry !== null && indexedPathSpellingIsStale(entry.filePath, key);
-    const parseUnchanged = !force && !spellingStale && sha !== null && entry?.sha === sha && entry.parserSha === PARSER_FINGERPRINT;
+    const parseUnchanged = !force && !spellingStale && sha !== null && entry?.sha === sha && entry.parserSha === parserFingerprintForLanguage(entry.language);
     const embeddingsEnabled = loadConfig().indexing?.embeddings_enabled ?? true;
     const depsAvailable = embeddingsEnabled && embeddingsDepsAvailable(getDb(dbPath));
-    const embedUnchanged = !force && parseUnchanged && sha !== null && isEmbedFresh(
-      entry?.embedSha,
+    const embedFreshFor = (embedSha) => !force && !spellingStale && sha !== null && isEmbedFresh(
+      embedSha,
       sha,
       embeddingsEnabled,
       depsAvailable,
       // See isEmbedFresh: an `oversize:` marker stays fresh only while indexing.large_file_symbol_only_kb is still what it was stamped under, so raising the threshold re-embeds the files it just admitted instead of leaving them permanently skipped. 0 matches no marker (config floors this key at 1), the safe direction for a partially-mocked config.
-      loadConfig().indexing?.large_file_symbol_only_kb ?? 0
+      loadConfig().indexing?.large_file_symbol_only_kb ?? 0,
+      // Same reasoning and same 0 fallback for the chunk-count marker.
+      loadConfig().indexing?.max_chunks_per_file ?? 0
     );
+    const embedUnchanged = embedFreshFor(entry?.embedSha);
     if (parseUnchanged && embedUnchanged) {
       skipped += 1;
       continue;
@@ -20036,9 +20289,10 @@ async function cmdIndex(pathArg, opts = {}) {
         }
         continue;
       }
-      if (!fs47.existsSync(key)) continue;
+      if (!fs45.existsSync(key)) continue;
     }
-    if (!embedUnchanged) {
+    const embedFresh = parseUnchanged ? embedUnchanged : embedFreshFor(getFileEntry(key, dbPath)?.embedSha);
+    if (!embedFresh) {
       paintProgress("embedding");
       await indexFileEmbeddings(key, dbPath, sha ?? void 0);
     }
@@ -20096,7 +20350,7 @@ async function cmdMcpServe() {
   let StdioServerTransport;
   try {
     ;
-    ({ createMcpServer } = await import("./token-goat-chunk-6LGVCCMY.mjs"));
+    ({ createMcpServer } = await import("./token-goat-chunk-3OGZOFLS.mjs"));
     ({ StdioServerTransport } = await import("./token-goat-chunk-EVC4TOLE.mjs"));
   } catch (err2) {
     process.stderr.write(
@@ -20121,11 +20375,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-34OUJ2IE.mjs");
+  const { relay } = await import("./token-goat-chunk-G6SYQQO7.mjs");
   await relay(event);
 }
 function projectHooksCommitNote(pathFiles, hooksConfigPath) {
-  const shim = hooksConfigPath === void 0 ? "" : ` (${displaySafePath(path43.join(path43.dirname(hooksConfigPath), HOOKS_SCRIPT_FILE))} is generated with them)`;
+  const shim = hooksConfigPath === void 0 ? "" : ` (${displaySafePath(path41.join(path41.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) {
@@ -20158,7 +20412,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-34OUJ2IE.mjs");
+  await import("./token-goat-chunk-G6SYQQO7.mjs");
   const scope = opts.project === true ? "project" : "user";
   if (wantsClaudeCodeBase(opts)) {
     const result = installHooks(scope);
@@ -20304,16 +20558,16 @@ async function cmdInstall(opts) {
     );
   }
   try {
-    const skillDir2 = path43.join(homedir20(), ".claude", "skills");
-    if (fs47.existsSync(skillDir2)) {
-      const entries = fs47.readdirSync(skillDir2, { withFileTypes: true });
+    const skillDir2 = path41.join(claudeConfigDir(), "skills");
+    if (fs45.existsSync(skillDir2)) {
+      const entries = fs45.readdirSync(skillDir2, { withFileTypes: true });
       const skillNames = [];
       const sessionId = getSessionId();
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
-        const skillFile = path43.join(skillDir2, entry.name, "SKILL.md");
-        if (fs47.existsSync(skillFile)) {
-          const body = fs47.readFileSync(skillFile, "utf-8");
+        const skillFile = path41.join(skillDir2, entry.name, "SKILL.md");
+        if (fs45.existsSync(skillFile)) {
+          const body = fs45.readFileSync(skillFile, "utf-8");
           const compact = extractCompactFromMarker(body);
           if (compact === null) continue;
           const sourceSha = contentHash(body);
@@ -20324,9 +20578,9 @@ async function cmdInstall(opts) {
       if (skillNames.length > 0) {
         const dir = skillOutputsDir();
         ensureDirSync(dir);
-        const pregenPath = path43.join(dir, "pregen.json");
+        const pregenPath = path41.join(dir, "pregen.json");
         const pregenData = { ts: Date.now(), names: skillNames };
-        await fs47.promises.writeFile(pregenPath, JSON.stringify(pregenData, null, 2));
+        await fs45.promises.writeFile(pregenPath, JSON.stringify(pregenData, null, 2));
         out(`Pre-generated ${skillNames.length} skill compacts.`);
       }
     }
@@ -20466,13 +20720,14 @@ function cmdWorkerStatus() {
   out(isWorkerRunning() ? "Worker is running." : "Worker is not running.");
 }
 function cmdStats(opts = {}) {
-  const windowDays = opts.windowDays !== void 0 ? requireNonNegativeInt2("--window-days", opts.windowDays) : 30;
+  const windowDays = opts.windowDays !== void 0 ? requireNonNegativeInt("--window-days", opts.windowDays) : 30;
   const statsOpts = {
     json: opts.json === true,
     windowDays,
     full: opts.full === true,
     short: opts.short === true,
-    methodology: opts.methodology === true
+    methodology: opts.methodology === true,
+    hooks: opts.hooks === true
   };
   if (opts.homeDir !== void 0) {
     statsOpts.homeDir = opts.homeDir;
@@ -20505,7 +20760,7 @@ async function cmdDoctor(opts) {
   }
 }
 function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTag = UNTRUSTED_WEB_TAG) {
-  const emit3 = (text) => {
+  const emit2 = (text) => {
     if (!fenceByProvenance || text === "") {
       out(text);
       return text;
@@ -20536,7 +20791,7 @@ function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTa
     }
   }
   if (opts.grep !== void 0 && opts.maxMatches !== void 0) {
-    const cap = requireNonNegativeInt2("--max-matches", opts.maxMatches);
+    const cap = requireNonNegativeInt("--max-matches", opts.maxMatches);
     const matched = content === "" ? [] : content.split(/\r?\n/);
     if (matched.length > cap) {
       content = [...matched.slice(0, cap), "[token-goat: showing first " + cap + " of " + matched.length + " matching lines; raise --max-matches for more]"].join("\n");
@@ -20544,11 +20799,11 @@ function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTa
   }
   const rawLines = content.split(/\r?\n/);
   if (opts.full === true) {
-    return emit3(rawLines.join("\n"));
+    return emit2(rawLines.join("\n"));
   }
   const lines = rawLines.length > 1 && rawLines[rawLines.length - 1] === "" ? rawLines.slice(0, -1) : rawLines;
-  const headN = opts.head !== void 0 ? requireNonNegativeInt2("--head", opts.head) : 30;
-  const tailN = opts.tail !== void 0 ? requireNonNegativeInt2("--tail", opts.tail) : 80;
+  const headN = opts.head !== void 0 ? requireNonNegativeInt("--head", opts.head) : 30;
+  const tailN = opts.tail !== void 0 ? requireNonNegativeInt("--tail", opts.tail) : 80;
   const applyElision = (lines2, headN2, tailN2) => lines2.length > headN2 + tailN2 + 1 ? [...lines2.slice(0, headN2), "...(elided)...", ...lines2.slice(lines2.length - tailN2)] : lines2;
   const noteLineCap = (which, flag, shown, total) => {
     if (shown >= total) return;
@@ -20567,7 +20822,7 @@ function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTa
     result = lines.slice(Math.max(0, lines.length - tailN));
     noteLineCap("last", "tail", result.length, lines.length);
   }
-  return emit3(result.join("\n"));
+  return emit2(result.join("\n"));
 }
 function cmdBashOutput(id, opts) {
   const parseVerifyThreshold = (optVal) => {
@@ -20588,7 +20843,7 @@ function cmdBashOutput(id, opts) {
     }
     let content;
     try {
-      const st = fs47.statSync(opts.file);
+      const st = fs45.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`);
       }
@@ -20603,7 +20858,7 @@ function cmdBashOutput(id, opts) {
 `);
         }
       }
-      content = redactIfDotenv(opts.file, decodeSource(fs47.readFileSync(opts.file)));
+      content = redactIfDotenv(opts.file, decodeSource(fs45.readFileSync(opts.file)));
     } catch (e) {
       if (e instanceof CliError) throw e;
       throw new CliError(`cannot read file: ${opts.file}`);
@@ -20667,15 +20922,15 @@ function cmdMcpOutput(id, opts) {
     if (opts.file.includes("\0")) {
       throw new CliError("--file path contains a null byte");
     }
-    if (!fs47.existsSync(opts.file)) {
+    if (!fs45.existsSync(opts.file)) {
       throw new CliError(`file not found: ${opts.file}`);
     }
     try {
-      const st = fs47.statSync(opts.file);
+      const st = fs45.statSync(opts.file);
       if (st.isFIFO() || st.isSocket()) {
         throw new CliError(`--file '${opts.file}' is a special file (FIFO or socket) \u2014 only regular files are supported`);
       }
-      content = decodeSource(fs47.readFileSync(opts.file));
+      content = decodeSource(fs45.readFileSync(opts.file));
     } catch (e) {
       if (e instanceof CliError) throw e;
       throw new CliError(`cannot read file: ${opts.file}`);
@@ -20696,7 +20951,7 @@ function cmdMcpOutput(id, opts) {
     const data = extractJsonFromMcpOutput(content);
     let head;
     if (opts.head !== void 0) {
-      head = requireNonNegativeInt2("--head", opts.head);
+      head = requireNonNegativeInt("--head", opts.head);
     }
     const queryResult = queryJson(data, opts.jsonQuery);
     const { head: _omittedHead, ...restOpts } = opts;
@@ -20748,13 +21003,13 @@ async function cmdCompress(commandArgs, opts = {}) {
       process.exitCode = 1;
       return;
     }
-    const bashRunner = await import("./token-goat-chunk-2KTZ6J7T.mjs");
+    const bashRunner = await import("./token-goat-chunk-CBXLE54Q.mjs");
     if (opts.compress === false) {
       process.exitCode = bashRunner.runRaw(command, parseTimeout(opts.timeout, bashRunner.DEFAULT_TIMEOUT_SECONDS));
       return;
     }
-    const maxTokens = opts.maxTokens !== void 0 ? requireNonNegativeInt2("--max-tokens", opts.maxTokens) : 0;
-    process.exitCode = bashRunner.run(command, {
+    const maxTokens = opts.maxTokens !== void 0 ? requireNonNegativeInt("--max-tokens", opts.maxTokens) : 0;
+    process.exitCode = await bashRunner.run(command, {
       filterName: opts.filter,
       timeout: parseTimeout(opts.timeout, bashRunner.DEFAULT_TIMEOUT_SECONDS),
       maxTokens,
@@ -20798,9 +21053,10 @@ ${content}`;
 var originalHelpInformation = null;
 function buildProgram() {
   const program2 = new Command();
-  program2.name("token-goat").description("Surgical token-reduction companion for AI coding agents").version(VERSION, "-v, --version", "print the token-goat version").option("--cwd <path>", "run as if invoked from this directory (overrides the real working directory)");
+  program2.name("token-goat").description("Surgical token-reduction companion for AI coding agents").version(VERSION, "-v, --version", "print the token-goat version").option("--cwd <path>", "run as if invoked from this directory (overrides the real working directory)").option("--notice <text>", "print this line to stdout before the command's own output");
   program2.hook("preAction", (thisCommand) => {
-    const cwdOverride = thisCommand.opts().cwd;
+    const opts = thisCommand.opts();
+    const cwdOverride = opts.cwd;
     if (cwdOverride !== void 0) {
       try {
         process.chdir(cwdOverride);
@@ -20808,6 +21064,7 @@ function buildProgram() {
         throw new Error(`--cwd ${cwdOverride}: ${extractErrorMessage(e)}`, { cause: e });
       }
     }
+    if (opts.notice !== void 0) out(opts.notice);
   });
   const guard = (fn) => async (...args) => {
     process.exitCode = void 0;
@@ -20837,7 +21094,7 @@ function buildProgram() {
       process.exitCode = 1;
     }
   };
-  program2.command("symbol [name] [more...]").description("search for a symbol by name, or project-wide by --grep name pattern").option("-l, --limit <n>", "max results").option("-f, --file <path>", "restrict to one file").option("-k, --kind <kind>", "restrict to one kind (function, class, ...)").option("-p, --project [path]", "scope search to one project root instead of the global index (defaults to cwd)").option("-j, --json", "output as JSON").option("--grep <pattern>", "only show symbols whose name matches this regex (literal substring if it is not valid regex); cannot be combined with <name>").option("--exclude-tests", "hide symbols defined in a test file (opt-in; default output is unchanged)").option("--stats", "add per-result reference count and doc-coverage flag (project-wide count per NAME, not per definition site -- same-named symbols across files share a count)").action((name, more, opts) => {
+  program2.command("symbol [name] [more...]").description("search for a symbol by name, or project-wide by --grep name pattern").option("-l, --limit <n>", "max results").option("-f, --file <path>", "restrict to one file").option("-k, --kind <kind>", "restrict to one kind (function, class, ...)").option("-p, --project [path]", "scope search to one project root instead of the global index (defaults to cwd)").option("-j, --json", "output as JSON").option("--grep <pattern>", "only show symbols whose name matches this regex (literal substring if it is not valid regex); cannot be combined with <name>").option("--exclude-tests", "hide symbols defined in a test file (opt-in; default output is unchanged)").option("--exclude-vendored", "hide symbols defined under a dependency or build directory the indexer skips (node_modules, dist, site-packages, ...) (opt-in; default output is unchanged)").option("--stats", "add per-result reference count and doc-coverage flag (project-wide count per NAME, not per definition site -- same-named symbols across files share a count)").action((name, more, opts) => {
     let projectRoot;
     if (opts.project === true) {
       projectRoot = resolveProjectRoot({ project: process.cwd() });
@@ -20851,13 +21108,14 @@ function buildProgram() {
         more,
         () => runSymbol({
           ...name !== void 0 ? { name } : {},
-          limit: opts.limit !== void 0 ? requireNonNegativeInt2("--limit", opts.limit) : 20,
+          limit: opts.limit !== void 0 ? requireNonNegativeInt("--limit", opts.limit) : 20,
           ...opts.file !== void 0 ? { file: opts.file } : {},
           ...opts.kind !== void 0 ? { kind: opts.kind } : {},
           ...projectRoot !== void 0 ? { projectRoot } : {},
           ...opts.json === true ? { json: true } : {},
           ...opts.grep !== void 0 ? { grep: opts.grep } : {},
           ...opts.excludeTests === true ? { excludeTests: true } : {},
+          ...opts.excludeVendored === true ? { excludeVendored: true } : {},
           ...opts.stats === true ? { stats: true } : {}
         }),
         // `symbol` searches one name; there is no comma form that would search several.
@@ -20866,7 +21124,7 @@ function buildProgram() {
     );
   });
   program2.command("read <spec> [more...]").description(
-    "read one symbol's full body (spec: file::symbol; disambiguate a name shared by several classes with file::Parent.symbol; a trailing @LINE anchor -- file::symbol@LINE, or combined as file::Parent.symbol@LINE -- picks out a specific candidate by its exact starting line, for the case a Parent qualifier can't reach (e.g. a top-level definition); comma-separated file::a,b for a merged multi-symbol view, or a::x,b::y to merge symbols across several files)"
+    "read one symbol's full body (spec: file::symbol; disambiguate a name shared by several classes with file::Parent.symbol; a trailing @LINE anchor -- file::symbol@LINE, or combined as file::Parent.symbol@LINE -- picks out a specific candidate by its exact starting line, for the case a Parent qualifier can't reach (e.g. a top-level definition); comma-separated file::a,b for a merged multi-symbol view, or a::x,b::y to merge symbols across several files; file:LINE or file:START-END resolves a line number to the region enclosing it -- the symbol, the file preamble, or the gap between two symbols -- while file@START-END serves those raw lines)"
   ).option("-j, --json", "output as JSON").option("--force-refresh", "reparse file from disk before querying (ignore stale index)").option("--stats", "add per-symbol reference count and doc-coverage flag").action(
     (spec, more, opts) => runExitText(
       () => noteExtraFileArgs(
@@ -20879,7 +21137,8 @@ function buildProgram() {
           ...opts.forceRefresh === true ? { forceRefresh: true } : {},
           ...opts.stats === true ? { stats: true } : {}
         }),
-        { noun: "spec" }
+        // Whether the comma form the note names would actually run depends on the specs themselves, not on the command: `read` merges `::` specs and nothing else.
+        { noun: "spec", mergeable: readSpecsMergeable([spec, ...more]) }
       )
     )
   );
@@ -20887,12 +21146,12 @@ function buildProgram() {
     "symbol body + callers + containing doc section in one call (spec: file::symbol; also accepts the file::symbol@LINE anchor form documented under `read`; comma-separated file::a,b for a merged multi-symbol view; cross-file a.ts::x,b.ts::y is also supported)"
   ).option("-j, --json", "output as JSON").option("--limit <n>", "max callers to show (default: 20)").option("-C, --context <n>", "lines of call-site source to show before and after each caller (default 0)").option("--exclude-tests", "hide callers whose call site lives in a test file (opt-in; default output is unchanged)").option("--grep <pattern>", "only show callers whose enclosing symbol name matches this regex (literal substring if it is not valid regex)").action(
     (spec, more, opts) => runExit(() => {
-      emitExtraFileArgsNote("brief", spec, more, { noun: "spec" });
+      emitExtraFileArgsNote("brief", spec, more, { noun: "spec", mergeable: namedSpecsMergeable([spec, ...more]) });
       return runBrief({
         spec,
         ...opts.json === true ? { json: true } : {},
-        ...opts.limit !== void 0 ? { limit: requireNonNegativeInt2("--limit", opts.limit) } : {},
-        ...opts.context !== void 0 ? { context: requireNonNegativeInt2("--context", opts.context) } : {},
+        ...opts.limit !== void 0 ? { limit: requireNonNegativeInt("--limit", opts.limit) } : {},
+        ...opts.context !== void 0 ? { context: requireNonNegativeInt("--context", opts.context) } : {},
         ...opts.excludeTests === true ? { excludeTests: true } : {},
         ...opts.grep !== void 0 ? { grep: opts.grep } : {}
       });
@@ -20900,14 +21159,26 @@ function buildProgram() {
   );
   program2.command("section <spec> [more...]").description(
     'read one section from a file (spec: file::heading, or file::<unambiguous heading prefix> \u2014 e.g. "Lesson 16" resolves a longer unique heading; comma-separated file::A,B for a merged multi-heading view), or list all sections with --list'
-  ).option("-j, --json", "output as JSON").option("--list", "list all section headings in the file instead of reading one").option("--grep <pattern>", "with --list, filter headings to this regex (literal substring if it is not valid regex)").action(
-    (spec, more, opts) => opts.list === true ? runExit(() => {
+  ).option("-j, --json", "output as JSON").option("--list", "list all section headings in the file instead of reading one").option("--grep <pattern>", "with --list, filter headings to this regex (literal substring if it is not valid regex)").option("--max-lines <n>", "limit returned section content to at most N lines from the top").option("--head <n>", "alias for --max-lines").action((spec, more, opts) => {
+    const maxLinesRaw = opts.maxLines ?? opts.head;
+    const maxLines = maxLinesRaw !== void 0 ? requireNonNegativeInt("--max-lines", maxLinesRaw) : void 0;
+    return opts.list === true ? runExit(() => {
       emitExtraFileArgsNote("section --list", spec, more, { mergeable: false });
       return runListSections({ file: spec, ...opts.json === true ? { json: true } : {}, ...opts.grep !== void 0 ? { grep: opts.grep } : {} });
     }) : runExitText(
-      () => noteExtraFileArgs("section", spec, more, () => runSection({ spec, ...opts.json === true ? { json: true } : {} }), { noun: "spec" })
-    )
-  );
+      () => noteExtraFileArgs(
+        "section",
+        spec,
+        more,
+        () => runSection({
+          spec,
+          ...opts.json === true ? { json: true } : {},
+          ...maxLines !== void 0 ? { maxLines } : {}
+        }),
+        { noun: "spec", mergeable: namedSpecsMergeable([spec, ...more]) }
+      )
+    );
+  });
   program2.command("semantic [query]").description("semantic search (falls back to full-text search)").option("-l, --limit <n>", "max results").option("-j, --json", "output as JSON").option("--grep <pattern>", "filter to hits whose file path matches this regex (literal substring if it is not valid regex); matched against the path as rendered").option("--exclude-tests", "hide hits whose file is a test file (opt-in; default output is unchanged)").option("--preflight", "run semantic embedding preflight check and exit").option("--warm", "warm up the embedding model session in memory").action(guard(cmdSemantic));
   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(
@@ -20919,7 +21190,7 @@ function buildProgram() {
           () => run2({
             file,
             ...opts.json === true ? { json: true } : {},
-            ...opts.minLines !== void 0 ? { minLines: requireNonNegativeInt2("--min-lines", opts.minLines) } : {},
+            ...opts.minLines !== void 0 ? { minLines: requireNonNegativeInt("--min-lines", opts.minLines) } : {},
             ...opts.grep !== void 0 ? { grep: opts.grep } : {},
             ...opts.forceRefresh === true ? { forceRefresh: true } : {},
             ...opts.stats === true ? { stats: true } : {}
@@ -20943,14 +21214,14 @@ function buildProgram() {
     "for a high-fanout symbol, group references by file (count only) and show only the top N files by reference count instead of a per-line dump"
   ).option("-C, --context <n>", "lines of call-site source to show before and after each reference (default 0)").option("-j, --json", "output as JSON").option("--exclude-tests", "hide references whose call site lives in a test file (opt-in; default output is unchanged)").option("--grep <pattern>", "filter to references whose call-site file path matches this regex (falls back to a literal substring match when the pattern does not compile); matched against the path as rendered, so ^src/ matches what you see in every form -- drops test/vendored hits from a wide-fanout symbol").action(
     (spec, more, opts) => runExit(() => {
-      emitExtraFileArgsNote("refs", spec, more, { noun: "spec" });
+      emitExtraFileArgsNote("refs", spec, more, { noun: "spec", mergeable: namedSpecsMergeable([spec, ...more]) });
       return runRefs({
         spec,
         ...opts.callers === true ? { callers: true } : {},
         ...opts.json === true ? { json: true } : {},
-        ...opts.limit !== void 0 ? { limit: requireNonNegativeInt2("--limit", opts.limit) } : {},
-        ...opts.top !== void 0 ? { top: requireNonNegativeInt2("--top", opts.top) } : {},
-        ...opts.context !== void 0 ? { context: requireNonNegativeInt2("--context", opts.context) } : {},
+        ...opts.limit !== void 0 ? { limit: requireNonNegativeInt("--limit", opts.limit) } : {},
+        ...opts.top !== void 0 ? { top: requireNonNegativeInt("--top", opts.top) } : {},
+        ...opts.context !== void 0 ? { context: requireNonNegativeInt("--context", opts.context) } : {},
         ...opts.excludeTests === true ? { excludeTests: true } : {},
         ...opts.grep !== void 0 ? { grep: opts.grep } : {}
       });
@@ -20964,7 +21235,7 @@ function buildProgram() {
   program2.command("bench").description("replay a corpus of captured command output through the compressors; prints the byte savings ratio and a fidelity check, and exits 1 when a must-keep line was dropped").option("--corpus <dir>", "corpus directory (default: tests/fixtures/bench, relative to the working directory)").option("--tsv <path>", "append one result row, keyed by the current commit, creating the file and its header if absent").option("--validate", "score the corpus with control filters instead: proves the ratio has a floor and the fidelity guard can actually fail").option("-j, --json", "output as JSON").action(
     (opts) => runExitText(
       () => runBenchCommand({
-        corpus: opts.corpus ?? path43.join("tests", "fixtures", "bench"),
+        corpus: opts.corpus ?? path41.join("tests", "fixtures", "bench"),
         ...opts.tsv !== void 0 ? { tsv: opts.tsv } : {},
         ...opts.validate === true ? { validate: true } : {},
         ...opts.json === true ? { json: true } : {}
@@ -20983,7 +21254,7 @@ function buildProgram() {
   worker.command("start").description("start the background indexer").action(guard(cmdWorkerStart));
   worker.command("stop").description("stop the background indexer").action(guard(cmdWorkerStop));
   worker.command("status").description("check if the indexer is running").action(guard(cmdWorkerStatus));
-  program2.command("stats").description("show session statistics (bare = totals only; --full for the breakdown)").option("-j, --json", "output as JSON").option("--full", "show the full breakdown (by source, by command, by day)").option("--short", "force the rich short KPI view even when stdout is not a TTY (e.g. piped)").option("--methodology", "explain local savings estimates and their billing limits").option("--window-days <days>", "days to include (0 = all time)", "30").option("--home-dir <path>", "home directory (for testing)").action(guard(cmdStats));
+  program2.command("stats").description("show session statistics (bare = totals only; --full for the breakdown)").option("-j, --json", "output as JSON").option("--full", "show the full breakdown (by source, by command, by day)").option("--short", "force the rich short KPI view even when stdout is not a TTY (e.g. piped)").option("--methodology", "explain local savings estimates and their billing limits").option("--hooks", "show the per-event/per-harness hook latency breakdown (median/p95/slowest/last-seen)").option("--window-days <days>", "days to include (0 = all time)", "30").option("--home-dir <path>", "home directory (for testing)").action(guard(cmdStats));
   program2.command("doctor").description("diagnose token-goat health").option("--context", "include context footprint analysis").option("--json", "emit check results as JSON instead of text").option("--repair", "automatically repair fixable issues (permissive settings, missing semantics models)").option("--fix", "alias for --repair").action(guard(cmdDoctor));
   program2.command("bash-output [id]").description("retrieve cached bash output by ID or file").option("--head <n>", "show first N lines").option("--tail <n>", "show last N lines").option("--grep <pattern>", "filter lines matching regex").option("--max-matches <n>", "cap --grep output to the first N matching lines").option("--section <heading>", "extract a specific section from the output").option("--full", "print the entire cached entry with no head/tail elision").option("--file <path>", "read from raw output file instead of cache").option("--transcript", "parse the --file as a JSONL agent transcript: keep assistant text blocks in order before filtering").option("--verify-last-write [seconds]", "verify the file or cache entry was written within [seconds] (default: 60s) to catch stale/no-op terminal output").option("--strict", "exit non-zero when --verify-last-write detects stale output").action(guard(cmdBashOutput));
   program2.command("web-output [id]").description("retrieve a cached WebFetch response body by ID").option("--head <n>", "show first N lines").option("--tail <n>", "show last N lines").option("--grep <pattern>", "filter lines matching regex").option("--max-matches <n>", "cap --grep output to the first N matching lines").option("--section <heading>", "extract a specific section from the response").option("--full", "print the entire cached entry with no head/tail elision").option("--raw", "return the body as actually fetched, before extractCleanText cleaning, instead of the default cleaned text").action(guard(cmdWebOutput));
@@ -20998,7 +21269,7 @@ function buildProgram() {
   program2.command("compress [command...]").alias("bash").alias("run").description("run a shell command (under a POSIX shell / bash) and emit a compressed view of its output").allowUnknownOption(true).option("-c, --cmd <command>", "the shell command to run, as one string (use / for paths across platforms)").option("--cmd-b64 <payload>", "the shell command as a base64-encoded string (preserves quotes, backslashes, and symbols across platforms)").option("-f, --filter <name>", "filter name (auto-detected from the command when omitted)").option("--timeout <seconds>", "wall-clock timeout in seconds (0 = built-in default)").option("--no-compress", "stream output raw without compression (debug the wrapper)").option("--profile <name>", "compression profile: aggressive | balanced | minimal").option("--max-tokens <n>", "post-compress token cap (0 = no cap)").option("-q, --quiet-success", "on exit code 0, emit only [tg: ok] summary and store full output for recall via bash-output").option("--native", "use native platform shell (e.g. cmd.exe on Windows) instead of bash, preserving Windows path backslashes").action(cmdCompress);
   program2.command("upgrade").alias("update").description("check for updates and upgrade token-goat to the latest version").option("--check", "check whether an update is available without installing").option("-j, --json", "emit version check status as JSON").action(
     (opts) => guard(async () => {
-      const { cmdUpgrade } = await import("./token-goat-chunk-K4DG6EEF.mjs");
+      const { cmdUpgrade } = await import("./token-goat-chunk-AU2K2QHR.mjs");
       await cmdUpgrade(opts, () => cmdInstall({}));
     })()
   );
@@ -21068,6 +21339,9 @@ async function run(argv = process.argv) {
 }
 
 export {
+  requireInt,
+  requireNonNegativeInt,
+  requirePositiveInt,
   expandGlobs,
   fenceFileText,
   fenceFileFieldIfMatched,
@@ -21127,9 +21401,6 @@ export {
   CliError,
   out,
   err,
-  requireInt2 as requireInt,
-  requireNonNegativeInt2 as requireNonNegativeInt,
-  requirePositiveInt2 as requirePositiveInt,
   cmdIndex,
   visualStudioManualSteps,
   leftoverIntegrations,