token-goat 2.9.19 → 2.9.21

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

@@ -2,7 +2,16 @@ import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
 import {
   compareSemver
-} from "./token-goat-chunk-GYC34EGE.mjs";
+} from "./token-goat-chunk-KRPJIXCT.mjs";
+import {
+  buildCopilotWasteReport,
+  findLatestCopilotSession,
+  findProjectSession,
+  isCopilotTranscript
+} from "./token-goat-chunk-PPYZS7TI.mjs";
+import {
+  buildResumePacket
+} from "./token-goat-chunk-64OEF3UN.mjs";
 import {
   ALL_SYMBOLS_IN_FILE_LIMIT,
   AMBIGUOUS_HEADING_LIMIT,
@@ -13,6 +22,8 @@ import {
   computeFileFingerprint,
   createHandoff,
   didYouMean,
+  emit,
+  emitErr,
   enclosingSymbol,
   extraFileArgsNote,
   extractTranscriptText,
@@ -96,183 +107,195 @@ import {
   symbolNamesInFile,
   upsertNote,
   warnIfFilesStale
-} from "./token-goat-chunk-PIAESKVU.mjs";
+} from "./token-goat-chunk-BKHJRFDE.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
   MCP_TOOL_PATTERN,
   WEB_OUTPUT_SUBDIR,
   buildCommandManifest,
-  buildWasteReport,
   checkSymbolBodySize,
   cmdDescribe,
   cmdSessionSchema,
-  extractResultText,
   filterCommandManifest,
-  findLatestTranscript,
   formatCommandManifest,
   getWebOutput,
   getWebOutputByUrlFromDisk,
   getWebOutputRaw,
-  projectTranscriptsDir,
   readStdinJson,
   runRecallCommand,
   runReconcile,
-  safeStringify,
   storeWebOutput
-} from "./token-goat-chunk-2GTB5RBZ.mjs";
+} from "./token-goat-chunk-4V4OZHHV.mjs";
+import {
+  buildWasteReport,
+  extractResultText,
+  findLatestTranscript,
+  projectTranscriptsDir,
+  safeStringify
+} from "./token-goat-chunk-KQI24O4B.mjs";
+import {
+  buildManifest
+} from "./token-goat-chunk-PDYQA3AP.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,
   applyIndexingPriority,
   auditClaudeMd,
   buildExtractiveCompact,
-  buildGuidanceBlock,
-  buildGuidanceBody,
   buildLineDiff,
-  buildManifestWithCount,
   buildProjectMap,
   buildStats,
-  bundledCliPath,
-  capJsonRows,
-  claudeConfigDir,
   cmdReclaimIndex,
   compactDoc,
   compactPathFor,
   confirmAndApply,
-  contentHash,
-  copilotCliConfigPath,
-  copilotCliMcpToolsDir,
-  copilotCliScriptPath,
-  copilotCliUserRoot,
-  copilotHooksFilePaths,
   detectWalkMode,
   dirtyQueuePathFor,
   drainHeartbeatPathFor,
-  dropEmptyServers,
   emptyIndexMessage,
   enqueueDirtyPathSafe,
-  estimateTokens,
-  estimateTokensFromLength,
-  extractChecklistSection,
-  extractCompactFromMarker,
-  extractNamedSection,
   fenceUntrusted,
   findClaudeMdFiles,
   findContentDuplicates,
-  findLatestSessionId,
   findMemSuggestionCandidates,
   findMemoryMd,
-  findOrphanedChunkPaths,
   findSystemTempFiles,
   findTopIndexedProjects,
-  formatAge,
-  formatBytes,
   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,
   isIgnoredIndexPath,
-  isManagedServer,
   isPrivateIpv4Octets,
   isPrivateIpv6Groups,
-  isResidueServersJson,
   isSuppressionCategory,
-  isVisualStudioInstalled,
   isWorkerRunning,
-  jsonc,
-  listOutputs,
-  listSkills,
-  loadSessionCache,
-  managedServer,
   mapLookupBytesSaved,
   markCategoryEffective,
   markCategoryIneffective,
   pruneBlockedRoot,
   pruneDeletedFiles,
-  pruneOrphanedChunks,
-  pruneSkillOutputs,
   pruneSystemTempFiles,
   pruneUnembeddableChunks,
   readCompactBody,
-  readCopilotHooksOwners,
-  readCopilotMcpTools,
-  readServersJson,
-  releaseCopilotHooksFile,
+  reclaimIndex,
+  recordKnownRootThrottled,
   removeFileFromIndex,
   resetHintStats,
   runContextStats,
   runDetachedWorkerDaemon,
   scanAndRecord,
-  serversOf,
-  sessionsDir,
-  setTokenGoatServer,
   shrinkImage,
-  skillDescriptionLine,
-  skillOutputsDir,
   startDetachedWorker,
   stopWorker,
-  storeCompact,
-  storeOutput,
-  syncVisualStudioProjectGuidance,
+  sweepKnownRoots,
   toolMatcherFor,
-  trimToBudget,
-  uninstallCopilotCli,
-  uninstallVisualStudio,
   urlPolicyDenialReason,
   visionTokensSavedByText,
+  walkProject,
+  writeCompact
+} from "./token-goat-chunk-SMUYPBF5.mjs";
+import {
+  CompressedOutput,
+  TOOL_FILTERS,
+  ToolFilter,
+  deliverCompressed,
+  detectFromCommand
+} from "./token-goat-chunk-DDP64XR7.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-FQYMZASI.mjs";
+  visualStudioUserMcpPath
+} from "./token-goat-chunk-MQACN7VG.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-MECDAPXB.mjs";
+import {
+  capJsonRows,
+  claudeConfigDir,
+  estimateTokens,
+  estimateTokensFromLength,
+  formatBytes,
+  formatTokenEstimate,
+  trimToBudget
+} from "./token-goat-chunk-MEKVJZUN.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
-  CompressedOutput,
-  FILTERS,
-  TOOL_FILTERS,
-  ToolFilter,
   clipLongMatchLine,
   combineStreams,
-  deliverCompressed,
-  detectFromCommand,
   getBashOutput,
   isRecallCacheType
-} from "./token-goat-chunk-7DGTVBWP.mjs";
+} from "./token-goat-chunk-M43UJVYQ.mjs";
 import {
   C,
   DEFAULT_MAX_AGE_MS,
@@ -286,7 +309,6 @@ import {
   formatLocalTimestamp,
   getGlobalDb,
   listBlobs,
-  loadBlob,
   pruneBlobs,
   pruneStalePatternCoveredUnmappedTools,
   readUnmappedTools,
@@ -297,21 +319,21 @@ import {
   savedTokensFromBytes,
   statsHasDurationColumn,
   statsHasHarnessColumn,
-  stripAnsi,
+  stripAnsiEscapes,
   summarize
-} from "./token-goat-chunk-S7RFIX4Y.mjs";
+} from "./token-goat-chunk-PHDNWISV.mjs";
 import {
   docxOutline,
   docxTables,
   docxText,
   formatDocxTables
-} from "./token-goat-chunk-DHIXE6GV.mjs";
+} from "./token-goat-chunk-ORRDWKLA.mjs";
 import {
   pptxNotesText,
   pptxOutline,
   pptxSlideText,
   pptxTextGrep
-} from "./token-goat-chunk-3W5P673V.mjs";
+} from "./token-goat-chunk-MZQORUX5.mjs";
 import {
   formatXlsxColumns,
   formatXlsxRange,
@@ -320,12 +342,13 @@ import {
   querySheet,
   rangeSheet,
   xlsxColumns
-} from "./token-goat-chunk-FJZ5MZK7.mjs";
+} from "./token-goat-chunk-LK3YOKDF.mjs";
 import {
   formatCsvTable,
   parseWhereSpecs
-} from "./token-goat-chunk-KWM6KBPA.mjs";
+} from "./token-goat-chunk-SHV6QQAS.mjs";
 import {
+  assetEmbedSha,
   deleteFileEmbeddings,
   embeddingBackendLoadError,
   embeddingsDepsAvailable,
@@ -342,18 +365,19 @@ import {
   isTreeSitterAvailable,
   listSections,
   loadRegexExtractors,
+  maxChunksEmbedSha,
   missingTreeSitterGrammarPackages,
   modelFilesPresent,
   parserFingerprintForLanguage,
   readSection,
   treeSitterCoreAvailable,
   treeSitterCoreLoadError
-} from "./token-goat-chunk-EP7TCWHM.mjs";
+} from "./token-goat-chunk-IAMIQLCV.mjs";
 import {
   getFileEntry,
   getProjectFileEntries,
   querySymbols
-} from "./token-goat-chunk-IBTFGZBX.mjs";
+} from "./token-goat-chunk-XQSSPX3X.mjs";
 import {
   TREE_SITTER_LANGUAGES,
   detectLanguage,
@@ -364,7 +388,7 @@ import {
   matchGroovySlashy,
   nonTreeSitterLanguageCount,
   redactIfDotenv
-} from "./token-goat-chunk-JNIFSVWM.mjs";
+} from "./token-goat-chunk-2ZHD3XCD.mjs";
 import {
   CONFIG_KEY_ENV_OVERRIDES,
   PROJECT_LOCKED_KEYS,
@@ -393,7 +417,7 @@ import {
   stringify,
   validateEnumField,
   validateNumericField
-} from "./token-goat-chunk-SOKAPOOC.mjs";
+} from "./token-goat-chunk-M6CDVASA.mjs";
 import {
   ENV_KEYS,
   LOCK_WAIT_MS_HARDENED,
@@ -438,7 +462,6 @@ import {
   requirePositiveStrictInt,
   resolveOnPath,
   runGit,
-  safeSlice,
   sleepSync,
   stripDelimitedBlock,
   stripLower,
@@ -455,7 +478,7 @@ import {
   withRetryOnLock,
   writeIfDifferent,
   writeJsonSettings
-} from "./token-goat-chunk-ZGQXRYKE.mjs";
+} from "./token-goat-chunk-TGBSMHPM.mjs";
 import {
   UNTRUSTED_FILE_TAG,
   UNTRUSTED_TOOL_TAG,
@@ -3603,9 +3626,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * @param {string} [path]
    * @return {(string|null|Command)}
    */
-  executableDir(path43) {
-    if (path43 === void 0) return this._executableDir;
-    this._executableDir = path43;
+  executableDir(path42) {
+    if (path42 === void 0) return this._executableDir;
+    this._executableDir = path42;
     return this;
   }
   /**
@@ -3905,8 +3928,8 @@ function attemptedCommandName(argv) {
 }
 
 // src/cli.ts
-import * as fs46 from "fs";
-import * as path42 from "path";
+import * as fs45 from "fs";
+import * as path41 from "path";
 
 // src/walk_index.ts
 init_define_import_meta_env();
@@ -4177,6 +4200,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"],
@@ -4476,23 +4505,8 @@ 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(claudeConfigDir(), "skills", "token-goat");
@@ -4539,6 +4553,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
@@ -4667,7 +4684,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",
@@ -4950,7 +4967,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
   });
 }
@@ -5142,10 +5159,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 {};
@@ -7155,8 +7172,8 @@ import * as path15 from "node:path";
 var INTERPRETER_BASENAMES = /* @__PURE__ */ new Set(["node.exe", "python.exe", "python3.exe", "pwsh.exe", "powershell.exe", "cmd.exe"]);
 function describeProcess(commandLine) {
   for (const m of commandLine.matchAll(/[^\s"]+\.(?:js|mjs|cjs|ts|py|exe)\b/gi)) {
-    const basename11 = m[0].replace(/\\/g, "/").split("/").pop() ?? m[0];
-    if (!INTERPRETER_BASENAMES.has(basename11.toLowerCase())) return basename11;
+    const 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)";
@@ -7542,7 +7559,7 @@ 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);
@@ -7578,12 +7595,15 @@ function dbCategoryBreakdown(dbPath) {
   }
   return shares.sort((a, b) => b.bytes - a.bytes);
 }
-function oversizeDbMessage(dbPath, sizeBytes, freeBytes, tempRows, categories = [], topConsumers = []) {
+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 (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}`;
@@ -7593,7 +7613,7 @@ function oversizeDbMessage(dbPath, sizeBytes, freeBytes, tempRows, categories =
   }
   return base;
 }
-function checkDbExists(dataDir2) {
+function checkDbExists(dataDir2, maxDbSizeMb) {
   const dbPath = path17.join(dataDir2, "global.db");
   if (!fs18.existsSync(dbPath)) {
     return {
@@ -7602,7 +7622,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);
@@ -7625,7 +7645,10 @@ 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;
@@ -7637,7 +7660,20 @@ function checkDbExists(dataDir2) {
     } catch {
     }
     const topConsumers = findTopIndexedProjects(dbPath, 3);
-    return { name: "Database", status: "warn", message: oversizeDbMessage(dbPath, sizeBytes, freelistBytes(headerBytes), tempRows, categories, topConsumers) };
+    return {
+      name: "Database",
+      status: "warn",
+      message: oversizeDbMessage(
+        dbPath,
+        sizeBytes,
+        freelistBytes(headerBytes),
+        tempRows,
+        categories,
+        topConsumers,
+        thresholdMb,
+        cfg.indexing.auto_reclaim_embeddings
+      )
+    };
   }
   return {
     name: "Database",
@@ -8163,7 +8199,8 @@ 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));
@@ -8255,6 +8292,22 @@ async function runDoctorRepair(opts) {
   } 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) {
@@ -8416,7 +8469,7 @@ async function runDoctorAndExit(opts) {
     }
   }
   try {
-    const { checkUpdateStatus } = await import("./token-goat-chunk-VJQBYSXG.mjs");
+    const { checkUpdateStatus } = await import("./token-goat-chunk-ZJWPJL7O.mjs");
     const update = await checkUpdateStatus(1500);
     if (update.updateAvailable && update.latest) {
       console.log(`
@@ -8851,13 +8904,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);
@@ -9276,10 +9322,11 @@ function cmdProject(opts) {
     const removed = before.length - after.length;
     const stale = before.filter((r) => !after.includes(r));
     const staleTempFiles = findSystemTempFiles();
-    const orphanChunkPaths = findOrphanedChunkPaths();
+    const sweep = sweepKnownRoots(void 0, { dryRun: opts.dryRun === true });
+    const orphanChunkPaths = sweep.prunedOrphanChunkPaths;
     if (opts.dryRun === true) {
       if (opts.json === true) {
-        emit(displaySafeJson({ dryRun: true, wouldPrune: removed, stale, wouldPruneTempFiles: staleTempFiles.length, staleTempFiles, wouldPruneOrphanChunkFiles: orphanChunkPaths.length, orphanChunkPaths, blocked_roots: before }));
+        emit(displaySafeJson({ dryRun: true, wouldPrune: removed, stale, wouldPruneTempFiles: staleTempFiles.length, staleTempFiles, wouldPruneOrphanChunkFiles: orphanChunkPaths.length, orphanChunkPaths, wouldPruneDeadFileRows: sweep.prunedRows, deadRowRoots: sweep.prunedRoots, flaggedRoots: sweep.flaggedRoots, blocked_roots: before }));
         return;
       }
       if (removed === 0) {
@@ -9300,20 +9347,31 @@ function cmdProject(opts) {
         emit(`Would prune orphaned embedding chunks for ${orphanChunkPaths.length} file(s):`);
         for (const p of orphanChunkPaths) emit(`  ${p}`);
       }
+      if (sweep.prunedRows === 0) {
+        emit("Would prune 0 dead file row(s) under known roots. Nothing to do.");
+      } else {
+        emit(`Would prune ${sweep.prunedRows} dead file row(s) under ${sweep.prunedRoots.length} known root(s):`);
+        for (const r of sweep.prunedRoots) emit(`  ${r}`);
+      }
+      for (const r of sweep.flaggedRoots) emit(`  skipped (too many rows would go at once, root may be partly offline): ${r}`);
       return;
     }
     cfg.worker.blocked_roots = after;
     saveConfigSafe(cfg);
     invalidateConfigCache();
     const prunedTempFiles = pruneSystemTempFiles();
-    const prunedOrphanChunks = pruneOrphanedChunks();
+    const prunedOrphanChunks = sweep.prunedOrphanChunkPaths;
+    const prunedOrphanVectors = sweep.prunedOrphanVectors;
     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, prunedDeadFileRows: sweep.prunedRows, deadRowRoots: sweep.prunedRoots, flaggedRoots: sweep.flaggedRoots }));
       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).`);
+    emit(`Pruned ${sweep.prunedRows} dead file row(s) under ${sweep.prunedRoots.length} known root(s).`);
+    for (const r of sweep.flaggedRoots) emit(`  skipped (too many rows would go at once, root may be partly offline): ${r}`);
     return;
   }
   emitErr(`project: unknown action '${action}'. Use list, exclude, or prune.`);
@@ -12211,7 +12269,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") {
@@ -12386,7 +12444,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) {
@@ -12434,7 +12493,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;
@@ -12471,7 +12530,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 }));
@@ -12519,7 +12578,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));
   }
 }
@@ -12866,8 +12925,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);
@@ -12977,14 +13036,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({
@@ -13012,7 +13071,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] ?? "")])));
@@ -13044,13 +13103,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);
@@ -13179,7 +13238,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) {
@@ -13990,13 +14049,6 @@ init_define_import_meta_env();
 
 // src/answer_router.ts
 init_define_import_meta_env();
-function emit2(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(payload));
-}
-function emitErr2(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function refusal(why, suggestion) {
   return `cannot answer deterministically: ${why}; try: ${suggestion}`;
 }
@@ -14128,11 +14180,11 @@ function subjectModeFor(intent) {
 function runAnswer(opts) {
   const question = opts.question.trim();
   if (question.length === 0) {
-    emitErr2(refusal("the question is empty", 'token-goat answer "who calls <symbol>"'));
+    emitErr(refusal("the question is empty", 'token-goat answer "who calls <symbol>"'));
     return 1;
   }
   if (isJudgementQuestion(question)) {
-    emitErr2(
+    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}"`
@@ -14142,7 +14194,7 @@ function runAnswer(opts) {
   }
   const cls = classify(question);
   if (cls === null) {
-    emitErr2(
+    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}"`
@@ -14152,7 +14204,7 @@ function runAnswer(opts) {
   }
   const resolved = resolveSubject(cls.subject, subjectModeFor(cls.intent));
   if (resolved === null) {
-    emitErr2(
+    emitErr(
       refusal(
         `'${cls.subject}' is not an indexed symbol or file`,
         `token-goat semantic "${question}"`
@@ -14166,7 +14218,7 @@ function runAnswer(opts) {
     const more = resolved.candidates.length - shown.length;
     const first = shown[0] ?? "";
     const next = FILE_INTENTS.has(cls.intent) ? `token-goat answer "${cls.intent === "tests" ? "tests for" : cls.intent === "imports" ? "imports of" : "exports of"} ${first}"` : `token-goat outline ${first}`;
-    emitErr2(
+    emitErr(
       refusal(
         `'${cls.subject}' names ${resolved.candidates.length} files in this project (${shown.join(", ")}${more > 0 ? `, +${more} more` : ""})`,
         next
@@ -14175,7 +14227,7 @@ function runAnswer(opts) {
     return 1;
   }
   if (resolved.kind === "symbol-only") {
-    emitErr2(
+    emitErr(
       refusal(
         `'${cls.subject}' is a symbol; exports/imports are file-level`,
         `token-goat ${cls.intent} ${toDisplayPath(rootDir, resolved.file)}`
@@ -14187,19 +14239,19 @@ function runAnswer(opts) {
     const file = resolved.kind === "symbol" ? resolved.file : resolved.path;
     const display = toDisplayPath(rootDir, file);
     if (cls.intent === "tests") {
-      emit2(`via: token-goat test-for ${display}`);
+      emit(`via: token-goat test-for ${display}`);
       return runTestFor({ file });
     }
     if (cls.intent === "exports") {
-      emit2(`via: token-goat exports ${display}`);
+      emit(`via: token-goat exports ${display}`);
       return runExports({ file });
     }
-    emit2(`via: token-goat imports ${display}`);
+    emit(`via: token-goat imports ${display}`);
     return runImports({ file });
   }
   if (resolved.kind === "file") {
     const display = toDisplayPath(rootDir, resolved.path);
-    emitErr2(
+    emitErr(
       refusal(
         `'${cls.subject}' is a file, and ${cls.intent === "where" ? "where" : cls.intent} needs a symbol`,
         `token-goat outline ${display}`
@@ -14208,16 +14260,16 @@ function runAnswer(opts) {
     return 1;
   }
   if (cls.intent === "callers") {
-    emit2(`via: token-goat callers ${displaySafeText(resolved.name)} --limit ${ANSWER_DELEGATE_LIMIT}`);
+    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") {
-    emit2(`via: token-goat impact ${displaySafeText(resolved.name)} --top ${ANSWER_DELEGATE_LIMIT}`);
+    emit(`via: token-goat impact ${displaySafeText(resolved.name)} --top ${ANSWER_DELEGATE_LIMIT}`);
     return runImpact({ symbol: resolved.name, top: ANSWER_DELEGATE_LIMIT });
   }
-  emit2(`via: token-goat symbol ${displaySafeText(resolved.name)} -p --exclude-vendored`);
+  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) emit2(r.text);
+  if (r.text.length > 0) emit(r.text);
   return r.code;
 }
 
@@ -14225,13 +14277,6 @@ function runAnswer(opts) {
 init_define_import_meta_env();
 import * as path25 from "node:path";
 var DEFAULT_AFFECTED_DEPTH = 5;
-function emit3(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(payload));
-}
-function emitErr3(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}`);
@@ -14286,43 +14331,43 @@ function computeAffected(opts) {
 }
 function runAffected(opts) {
   if (opts.depth !== void 0 && opts.depth <= 0) {
-    emitErr3(`--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) {
-    emitErr3("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) {
-      emitErr3(`--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) {
-    emit3(displaySafeJson(result));
+    emit(displaySafeJson(result));
     return 0;
   }
   if (opts.quiet === true) {
-    for (const f of result.testFiles) emit3(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) {
-      emit3(`Nothing could be traced: ${result.unknownSeeds.length === 1 ? "the file given is not tracked" : "none of the files given are tracked"} in this project.`);
+      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 {
-      emit3(`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 {
-    emit3(`${countNoun(result.testFiles.length, "affected test file")} (${countNoun(result.reachedCount, "file")} reached within ${countNoun(result.depth, "hop")}):`);
-    for (const f of result.testFiles) emit3(`  ${f}`);
+    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) {
-    emitErr3(`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) {
-    emitErr3(`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;
 }
@@ -14924,6 +14969,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]" },
@@ -16103,7 +16211,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(
@@ -16235,7 +16343,7 @@ function renderCapabilities(caps) {
 
 // src/cli_session.ts
 init_define_import_meta_env();
-import * as fs41 from "node:fs";
+import * as fs40 from "node:fs";
 
 // src/session_audit.ts
 init_define_import_meta_env();
@@ -16243,6 +16351,23 @@ import * as fs34 from "node:fs";
 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 };
 }
@@ -16317,8 +16442,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" },
@@ -16347,10 +16476,10 @@ var SHELL_READER_TOKEN_RE = /\b(?:sed|grep|cat|head|tail|awk|rg|less|nl|python3?
 function escapeRegExp2(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function shellReadMatch(command, basename11) {
-  if (basename11 === "" || !SHELL_READER_TOKEN_RE.test(command)) return "none";
-  if (!command.includes(basename11)) return "none";
-  const escaped = escapeRegExp2(basename11);
+function shellReadMatch(command, basename10) {
+  if (basename10 === "" || !SHELL_READER_TOKEN_RE.test(command)) return "none";
+  if (!command.includes(basename10)) return "none";
+  const escaped = escapeRegExp2(basename10);
   const strict = new RegExp(`(?:^|["'\`/\\\\\\s])${escaped}(?:$|["'\`/\\\\\\s,;:)])`);
   return strict.test(command) ? "match" : "ambiguous";
 }
@@ -16390,7 +16519,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)) {
@@ -16588,7 +16717,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;
@@ -16639,13 +16768,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 path43 = readPathById.get(id) ?? "";
-              const lastSlash = path43.lastIndexOf("/");
+              const path42 = readPathById.get(id) ?? "";
+              const lastSlash = path42.lastIndexOf("/");
               openDenies.push({
                 kind: denyTemplate.kind,
                 withheldBytes: parseWithheldBytes(denyTemplate.kind, text),
-                path: path43,
-                basename: lastSlash === -1 ? path43 : path43.slice(lastSlash + 1),
+                path: path42,
+                basename: lastSlash === -1 ? path42 : path42.slice(lastSlash + 1),
                 callIndexAtDeny: perCall.length,
                 compactEpochAtOpen: compactEpoch,
                 compactEpochAtWindow: null,
@@ -16946,6 +17075,7 @@ async function auditSessionCorpus(opts = {}) {
       system: emptyCategory(),
       otherLocal: emptyCategory()
     },
+    calibration: { modelVisibleBytes: 0, estimatedTokens: 0, measuredFirstWriteTokens: 0, relativeError: 0, bytesPerMeasuredToken: 0 },
     tools: [],
     attachmentKinds: [],
     hookOutputs: [],
@@ -17006,6 +17136,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;
 }
@@ -17046,11 +17177,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)}`);
@@ -17621,142 +17761,8 @@ async function runMemoryCommand(opts = {}) {
 
 // src/cli_waste.ts
 init_define_import_meta_env();
-import * as fs39 from "node:fs";
-import * as path36 from "node:path";
-
-// src/copilot_waste.ts
-init_define_import_meta_env();
 import * as fs38 from "node:fs";
 import * as path35 from "node:path";
-var HOOK_RECORD_TYPES = /* @__PURE__ */ new Set(["hook.start", "hook.end"]);
-function splitInjectedBlocks(transformed) {
-  const out2 = [];
-  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 = path35.join(copilotCliUserRoot(), "session-state");
-  let entries;
-  try {
-    entries = fs38.readdirSync(root);
-  } catch {
-    return null;
-  }
-  let best = null;
-  let bestMtime = -Infinity;
-  for (const entry of entries) {
-    const candidate = path35.join(root, entry, "events.jsonl");
-    try {
-      const st = fs38.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 = fs38.readFileSync(eventsPath, "utf-8");
-  const report = {
-    sessionPath: eventsPath,
-    sessionId: path35.basename(path35.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
 function printCopilotReport(report) {
   const w = (text) => {
     process.stdout.write(text);
@@ -17955,9 +17961,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 ? path36.resolve(opts.transcript) : findLatestCopilotSession();
-    if (eventsPath === null || !fs39.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)}
@@ -17979,9 +18026,8 @@ async function runWasteCommand(opts = {}) {
     printCopilotReport(copilotReport);
     return;
   }
-  const projectRoot = resolveProjectRoot(opts.project !== void 0 ? { project: opts.project } : {});
-  const transcriptPath = opts.transcript !== void 0 ? path36.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)}
 `);
@@ -17994,13 +18040,17 @@ async function runWasteCommand(opts = {}) {
     process.exitCode = 1;
     return;
   }
-  if (!fs39.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)}
 `);
@@ -18011,13 +18061,13 @@ async function runWasteCommand(opts = {}) {
 
 // src/cli_mcp_audit.ts
 init_define_import_meta_env();
-import * as fs40 from "node:fs";
+import * as fs39 from "node:fs";
 import * as os18 from "node:os";
-import * as path37 from "node:path";
+import * as path36 from "node:path";
 function readMcpJsonFile(configPath2) {
   try {
-    if (!fs40.existsSync(configPath2)) return null;
-    const content = fs40.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;
@@ -18033,8 +18083,8 @@ function driveLetterCaseVariants(p) {
 }
 function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   try {
-    if (!fs40.existsSync(claudeJsonPath)) return null;
-    const parsed = JSON.parse(fs40.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, "\\")];
@@ -18052,9 +18102,9 @@ function readClaudeJsonConfig(claudeJsonPath, projectRoot) {
   }
 }
 function discoverMcpConfig(projectRoot, home) {
-  const mcpJsonPath = path37.join(projectRoot, ".mcp.json");
-  const claudeJsonPath = path37.join(home, ".claude.json");
-  const copilotJsonPath = path37.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 };
@@ -18247,7 +18297,7 @@ async function runStatuslineCommand(opts = {}) {
     return;
   }
   const line = renderStatusline(data);
-  process.stdout.write(`${colorStdout() ? line : stripAnsi(line)}
+  process.stdout.write(`${colorStdout() ? line : stripAnsiEscapes(line)}
 `);
 }
 
@@ -18276,7 +18326,7 @@ function printSummary(rows) {
   const w = (text) => {
     process.stdout.write(text);
   };
-  w(pad("category", 22) + pad("emitted", 9) + pad("undisplayed", 13) + pad("acted-on", 10) + pad("efficacy", 12) + pad("suppressed", 17) + pad("manual+", 9) + pad("manual-", 9) + "spent\n");
+  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(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"
@@ -18288,7 +18338,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}
 `
   );
 }
@@ -18370,10 +18420,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-KVAXTA2W.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 {
@@ -18400,7 +18458,7 @@ ${formatSessionOutline(turns)}`;
 }
 function sessionTranscriptSize(transcriptPath) {
   try {
-    return fs41.statSync(transcriptPath).size;
+    return fs40.statSync(transcriptPath).size;
   } catch {
     return 0;
   }
@@ -18436,7 +18494,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 } : {}
   });
 }
@@ -18460,14 +18518,14 @@ function cmdHintStats(opts = {}) {
 
 // src/cli_skills.ts
 init_define_import_meta_env();
-import * as fs42 from "node:fs";
-import * as path38 from "node:path";
+import * as fs41 from "node:fs";
+import * as path37 from "node:path";
 async function cmdSkillBody(name, opts) {
   const filePath = await getSkillFilePath(name);
   if (filePath === null) {
     throw new CliError(`skill '${name}' not found`);
   }
-  const body = decodeSource(fs42.readFileSync(filePath));
+  const body = decodeSource(fs41.readFileSync(filePath));
   if (opts.compact === true) {
     const emitted = extractCompactFromMarker(body) ?? body;
     out(emitted);
@@ -18494,7 +18552,7 @@ async function cmdSkillCompact(name, opts) {
       }
       let body2;
       try {
-        body2 = decodeSource(fs42.readFileSync(filePath));
+        body2 = decodeSource(fs41.readFileSync(filePath));
       } catch {
         unresolvable++;
         continue;
@@ -18528,19 +18586,19 @@ async function cmdSkillCompact(name, opts) {
     if (!opts.path.trim()) {
       throw new CliError("--path cannot be empty");
     }
-    if (!fs42.existsSync(opts.path)) {
+    if (!fs41.existsSync(opts.path)) {
       throw new CliError(`skill file not found: ${opts.path}`);
     }
     try {
-      body = fs42.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 ?? path38.basename(path38.dirname(path38.resolve(opts.path)));
-    sourcePath = path38.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>");
@@ -18549,7 +18607,7 @@ async function cmdSkillCompact(name, opts) {
     if (filePath === null) {
       throw new CliError(`skill '${name}' not found`);
     }
-    body = fs42.readFileSync(filePath, "utf-8");
+    body = fs41.readFileSync(filePath, "utf-8");
     cacheName = name;
     sourcePath = filePath;
   }
@@ -18681,8 +18739,8 @@ async function cmdSkillDiff(name) {
   }
   const newer = versions[0];
   const older = versions[1];
-  const newerBody = await fs42.promises.readFile(path38.resolve(dir, `${newer.outputId}.txt`), "utf-8").catch(() => null);
-  const olderBody = await fs42.promises.readFile(path38.resolve(dir, `${older.outputId}.txt`), "utf-8").catch(() => null);
+  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;
@@ -18711,7 +18769,7 @@ async function cmdSkillSection(nameHeading, headingArg) {
   if (!filePath) {
     throw new CliError(`skill '${skillName}' not found`);
   }
-  const body = decodeSource(fs42.readFileSync(filePath));
+  const body = decodeSource(fs41.readFileSync(filePath));
   const extracted = extractNamedSection(body, heading);
   if (!extracted) {
     const allHeadings = listSections(filePath);
@@ -18732,94 +18790,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 fs43 from "node:fs";
-import * as path39 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) {
@@ -18829,8 +18805,8 @@ function formatTopFiles(ranked) {
   if (ranked.length === 0) return "";
   const lines = ["Top files this session:"];
   for (const { path: filePath, count } of ranked) {
-    const basename11 = path39.basename(filePath);
-    lines.push(`  ${count.toString().padStart(3)}x  ${basename11}  (${filePath})`);
+    const basename10 = path38.basename(filePath);
+    lines.push(`  ${count.toString().padStart(3)}x  ${basename10}  (${filePath})`);
   }
   return lines.join("\n");
 }
@@ -18847,11 +18823,11 @@ function renderTopSessionFiles(topN = 5) {
 function renderTopSessionFilesFromDisk(topN = 5, overrideSessionsDir) {
   try {
     const dir = overrideSessionsDir ?? sessionsDir();
-    if (!fs43.existsSync(dir)) return "";
-    const files = fs43.readdirSync(dir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, mtime: fs43.statSync(path39.join(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).slice(0, 3);
+    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 = fs43.readFileSync(path39.join(dir, 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;
@@ -18943,13 +18919,10 @@ function runStats(opts = {}) {
 }
 
 // src/cache_session_commands.ts
-function emitErr4(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function capAndNote(rows, limit) {
   const shown = rows.slice(0, limit);
   if (shown.length < rows.length) {
-    emitErr4(`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;
 }
@@ -18959,11 +18932,11 @@ function parseLimitOpt(cmdName, limitStr, dflt = 30) {
   try {
     n = requireNonNegativeStrictInt("--limit", limitStr);
   } catch (e) {
-    emitErr4(`${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) {
-    emitErr4(`${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;
@@ -19201,11 +19174,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");
@@ -19215,7 +19194,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));
@@ -19318,6 +19297,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));
@@ -19432,16 +19412,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"
       }
     ]
   },
@@ -19582,7 +19561,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 }
@@ -19735,25 +19714,25 @@ function installVerificationNotice(harness) {
 
 // src/purge.ts
 init_define_import_meta_env();
-import * as fs44 from "node:fs";
-import * as path40 from "node:path";
+import * as fs43 from "node:fs";
+import * as path39 from "node:path";
 function directorySize(root) {
   let total = 0;
   let entries;
   try {
-    entries = fs44.readdirSync(root, { withFileTypes: true });
+    entries = fs43.readdirSync(root, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const full = path40.join(root, entry.name);
+    const full = path39.join(root, entry.name);
     if (entry.isDirectory()) {
       total += directorySize(full);
       continue;
     }
     if (!entry.isFile()) continue;
     try {
-      total += fs44.statSync(full).size;
+      total += fs43.statSync(full).size;
     } catch {
     }
   }
@@ -19772,7 +19751,7 @@ function purgeDataDirectories() {
     }
     const bytes = directorySize(root);
     try {
-      fs44.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) });
@@ -19919,8 +19898,8 @@ async function getSectionContent(fileId, heading, opts = {}) {
 
 // src/cli_bench.ts
 init_define_import_meta_env();
-import * as fs45 from "node:fs";
-import * as path41 from "node:path";
+import * as fs44 from "node:fs";
+import * as path40 from "node:path";
 var ControlFilter = class extends ToolFilter {
   constructor(name, transform) {
     super();
@@ -19941,13 +19920,13 @@ var CONTROL_FILTERS = {
 };
 var MAX_BENCH_FILE_BYTES = 5 * 1024 * 1024;
 function readCaseFile(id, filePath, what) {
-  const bytes = fs45.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 fs45.readFileSync(filePath, "utf8");
+  return fs44.readFileSync(filePath, "utf8");
 }
 function parseCase(id, metaPath, outputPath) {
   const metaText = readCaseFile(id, metaPath, "metadata");
@@ -19982,7 +19961,7 @@ function parseCase(id, metaPath, outputPath) {
 function loadCorpus(dir) {
   let entries;
   try {
-    entries = fs45.readdirSync(dir);
+    entries = fs44.readdirSync(dir);
   } catch {
     throw new Error(`bench corpus not found: ${dir}`);
   }
@@ -19990,9 +19969,9 @@ function loadCorpus(dir) {
   for (const entry of entries.sort()) {
     if (!entry.endsWith(".json")) continue;
     const id = entry.slice(0, -".json".length);
-    const outputPath = path41.join(dir, `${id}.txt`);
-    if (!fs45.existsSync(outputPath)) throw new Error(`bench case ${id}: missing output file ${outputPath}`);
-    cases.push(parseCase(id, path41.join(dir, entry), outputPath));
+    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;
@@ -20112,10 +20091,10 @@ function appendTsv(file, report, commit) {
     report.mustKeepTotal,
     report.coveredFilters
   ].join("	");
-  const dir = path41.dirname(path41.resolve(file));
-  fs45.mkdirSync(dir, { recursive: true });
-  const header = fs45.existsSync(file) ? "" : TSV_HEADER;
-  fs45.appendFileSync(file, header + row + "\n", "utf8");
+  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 };
@@ -20144,7 +20123,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) {
@@ -20155,10 +20134,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 (fs46.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 = fs46.readFileSync(file, "utf8");
+    value = fs45.readFileSync(file, "utf8");
   } else {
     if (text === void 0) throw new CliError("provide text or --file");
     value = text;
@@ -20203,35 +20182,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 } : {},
@@ -20268,7 +20223,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);
+    pruneUnembeddableChunks(getDb(dbPath), ixCfg.max_chunks_per_file, deleteFileEmbeddings, { asset: assetEmbedSha, maxChunks: maxChunksEmbedSha });
   }
   let indexed = 0;
   let failed = 0;
@@ -20305,7 +20260,8 @@ async function cmdIndex(pathArg, opts = {}) {
       continue;
     }
     const sha = fingerprintFile(key);
-    if (sha === null && !fs46.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 === parserFingerprintForLanguage(entry.language);
@@ -20341,7 +20297,7 @@ async function cmdIndex(pathArg, opts = {}) {
         }
         continue;
       }
-      if (!fs46.existsSync(key)) continue;
+      if (!fs45.existsSync(key)) continue;
     }
     const embedFresh = parseUnchanged ? embedUnchanged : embedFreshFor(getFileEntry(key, dbPath)?.embedSha);
     if (!embedFresh) {
@@ -20402,7 +20358,7 @@ async function cmdMcpServe() {
   let StdioServerTransport;
   try {
     ;
-    ({ createMcpServer } = await import("./token-goat-chunk-DA6TIDLI.mjs"));
+    ({ createMcpServer } = await import("./token-goat-chunk-GO7OWONJ.mjs"));
     ({ StdioServerTransport } = await import("./token-goat-chunk-EVC4TOLE.mjs"));
   } catch (err2) {
     process.stderr.write(
@@ -20427,11 +20383,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-NYFYIRG3.mjs");
+  const { relay } = await import("./token-goat-chunk-CMHBTXMY.mjs");
   await relay(event);
 }
 function projectHooksCommitNote(pathFiles, hooksConfigPath) {
-  const shim = hooksConfigPath === void 0 ? "" : ` (${displaySafePath(path42.join(path42.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) {
@@ -20464,7 +20420,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-NYFYIRG3.mjs");
+  await import("./token-goat-chunk-CMHBTXMY.mjs");
   const scope = opts.project === true ? "project" : "user";
   if (wantsClaudeCodeBase(opts)) {
     const result = installHooks(scope);
@@ -20610,16 +20566,16 @@ async function cmdInstall(opts) {
     );
   }
   try {
-    const skillDir2 = path42.join(claudeConfigDir(), "skills");
-    if (fs46.existsSync(skillDir2)) {
-      const entries = fs46.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 = path42.join(skillDir2, entry.name, "SKILL.md");
-        if (fs46.existsSync(skillFile)) {
-          const body = fs46.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);
@@ -20630,9 +20586,9 @@ async function cmdInstall(opts) {
       if (skillNames.length > 0) {
         const dir = skillOutputsDir();
         ensureDirSync(dir);
-        const pregenPath = path42.join(dir, "pregen.json");
+        const pregenPath = path41.join(dir, "pregen.json");
         const pregenData = { ts: Date.now(), names: skillNames };
-        await fs46.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.`);
       }
     }
@@ -20772,7 +20728,7 @@ 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,
@@ -20812,7 +20768,7 @@ async function cmdDoctor(opts) {
   }
 }
 function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTag = UNTRUSTED_WEB_TAG) {
-  const emit4 = (text) => {
+  const emit2 = (text) => {
     if (!fenceByProvenance || text === "") {
       out(text);
       return text;
@@ -20843,7 +20799,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");
@@ -20851,11 +20807,11 @@ function _applyFiltersAndPrint(content, opts, fenceByProvenance = false, fenceTa
   }
   const rawLines = content.split(/\r?\n/);
   if (opts.full === true) {
-    return emit4(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;
@@ -20874,7 +20830,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 emit4(result.join("\n"));
+  return emit2(result.join("\n"));
 }
 function cmdBashOutput(id, opts) {
   const parseVerifyThreshold = (optVal) => {
@@ -20895,7 +20851,7 @@ function cmdBashOutput(id, opts) {
     }
     let content;
     try {
-      const st = fs46.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`);
       }
@@ -20910,7 +20866,7 @@ function cmdBashOutput(id, opts) {
 `);
         }
       }
-      content = redactIfDotenv(opts.file, decodeSource(fs46.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}`);
@@ -20974,15 +20930,15 @@ function cmdMcpOutput(id, opts) {
     if (opts.file.includes("\0")) {
       throw new CliError("--file path contains a null byte");
     }
-    if (!fs46.existsSync(opts.file)) {
+    if (!fs45.existsSync(opts.file)) {
       throw new CliError(`file not found: ${opts.file}`);
     }
     try {
-      const st = fs46.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(fs46.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}`);
@@ -21003,7 +20959,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;
@@ -21055,12 +21011,12 @@ async function cmdCompress(commandArgs, opts = {}) {
       process.exitCode = 1;
       return;
     }
-    const bashRunner = await import("./token-goat-chunk-P46RTOAQ.mjs");
+    const bashRunner = await import("./token-goat-chunk-4IIU3GNS.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;
+    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),
@@ -21160,7 +21116,7 @@ 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 } : {},
@@ -21202,8 +21158,8 @@ function buildProgram() {
       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 } : {}
       });
@@ -21211,14 +21167,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", mergeable: namedSpecsMergeable([spec, ...more]) })
-    )
-  );
+      () => 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(
@@ -21230,7 +21198,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 } : {}
@@ -21259,9 +21227,9 @@ function buildProgram() {
         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 } : {}
       });
@@ -21275,7 +21243,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 ?? path42.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 } : {}
@@ -21309,7 +21277,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-VJQBYSXG.mjs");
+      const { cmdUpgrade } = await import("./token-goat-chunk-ZJWPJL7O.mjs");
       await cmdUpgrade(opts, () => cmdInstall({}));
     })()
   );
@@ -21379,6 +21347,9 @@ async function run(argv = process.argv) {
 }
 
 export {
+  requireInt,
+  requireNonNegativeInt,
+  requirePositiveInt,
   expandGlobs,
   fenceFileText,
   fenceFileFieldIfMatched,
@@ -21438,9 +21409,6 @@ export {
   CliError,
   out,
   err,
-  requireInt2 as requireInt,
-  requireNonNegativeInt2 as requireNonNegativeInt,
-  requirePositiveInt2 as requirePositiveInt,
   cmdIndex,
   visualStudioManualSteps,
   leftoverIntegrations,