token-goat 2.9.17 → 2.9.19

package/dist/{token-goat-chunk-PKNOHVWP.mjs → token-goat-chunk-FQYMZASI.mjs}

@@ -10,25 +10,25 @@ import {
   resolveMinNetSavingsBytes,
   storeBashOutputSync,
   stripAnsiCodes
-} from "./token-goat-chunk-C26ZBGBC.mjs";
+} from "./token-goat-chunk-7DGTVBWP.mjs";
 import {
   DEFAULT_MAX_AGE_MS,
   DEFAULT_MAX_COUNT,
   SOURCE_HINT,
   countRedactionPlaceholders,
+  hasPreciseSecret,
   recordStat,
   recordUnmappedTool,
   redactSecrets,
   savedTokensFromBytes,
   summarize,
   sweepCacheRoots
-} from "./token-goat-chunk-26YUO7MP.mjs";
+} from "./token-goat-chunk-S7RFIX4Y.mjs";
 import {
   parse
 } from "./token-goat-chunk-3BTK54F3.mjs";
 import {
   MARKDOWN_SIZE_THRESHOLD,
-  PARSER_FINGERPRINT,
   deleteFileEmbeddings,
   deleteFileRows,
   eachUnfencedLine,
@@ -48,17 +48,20 @@ import {
   isAvailable,
   isEmbedFresh,
   isEmbeddableDocument,
+  isImagePath,
+  isNonTextAsset,
   isParseSkipEligible,
   isTreeSitterAvailable,
   loadRegexExtractors,
-  parseSourceSymbolsTreeSitterOnly
-} from "./token-goat-chunk-73GXYYZR.mjs";
+  parseSourceSymbolsTreeSitterOnly,
+  parserFingerprintForLanguage
+} from "./token-goat-chunk-EP7TCWHM.mjs";
 import {
   getFileEntry,
   pathEqClause,
   projectScopeClause,
   querySymbols
-} from "./token-goat-chunk-BK3RPPTK.mjs";
+} from "./token-goat-chunk-IBTFGZBX.mjs";
 import {
   detectLanguage,
   detectLanguageOfFile,
@@ -66,7 +69,7 @@ import {
   getDb,
   languageHasFlag,
   redactIfDotenv
-} from "./token-goat-chunk-MWSVUKVV.mjs";
+} from "./token-goat-chunk-JNIFSVWM.mjs";
 import {
   detectHarness,
   fileIsAbsent,
@@ -80,7 +83,7 @@ import {
   makeProjectAt,
   resolveProjectRoot,
   shortFingerprint
-} from "./token-goat-chunk-2VASS5VR.mjs";
+} from "./token-goat-chunk-SOKAPOOC.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-EEIDFMEM.mjs";
@@ -88,6 +91,7 @@ import {
   IDENTICAL_READ_MIN_BODY_BYTES,
   LOCK_WAIT_MS_HARDENED,
   PER_FILE_COUNTERFACTUAL_CEILING,
+  VERSION,
   atomicWriteBytes,
   atomicWriteText,
   backupFile,
@@ -105,6 +109,7 @@ import {
   hookPowershellCommand,
   isCodeFenceDelimiter,
   isInsideRoot,
+  isNodeModulesPath,
   isTestFile,
   isUnderBlockedRoot,
   isWithinQuietHours,
@@ -126,8 +131,9 @@ import {
   withFileLock,
   withInstallScope,
   writeIfDifferent
-} from "./token-goat-chunk-UBZCON6N.mjs";
+} from "./token-goat-chunk-ZGQXRYKE.mjs";
 import {
+  TOOL_RESULTS_ID_CHARS,
   displaySafeJson,
   displaySafePath,
   displaySafeText,
@@ -139,7 +145,7 @@ import {
   resolveIndexPath,
   scanForInjectionPatterns,
   toDisplayPath
-} from "./token-goat-chunk-ERTXEKB6.mjs";
+} from "./token-goat-chunk-NMTKNYGF.mjs";
 import {
   applyExifOrientation,
   calculateFitInside,
@@ -156,6 +162,16 @@ import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
 
+// src/claude_config_dir.ts
+init_define_import_meta_env();
+import * as os from "node:os";
+import * as path from "node:path";
+function claudeConfigDir(homeDir = os.homedir()) {
+  const override = process.env["CLAUDE_CONFIG_DIR"];
+  if (override !== void 0 && override !== "") return override;
+  return path.join(homeDir, ".claude");
+}
+
 // src/index_health.ts
 init_define_import_meta_env();
 import * as fs2 from "fs";
@@ -163,14 +179,14 @@ import * as fs2 from "fs";
 // src/walk_mode.ts
 init_define_import_meta_env();
 import * as fs from "fs";
-import * as path from "path";
+import * as path2 from "path";
 function detectWalkMode(cwd) {
   const project = findProject(cwd);
   if (project?.marker === ".git") return "git";
   let cur = cwd;
   while (true) {
-    if (fs.existsSync(path.join(cur, ".git"))) return "git";
-    const parent = path.dirname(cur);
+    if (fs.existsSync(path2.join(cur, ".git"))) return "git";
+    const parent = path2.dirname(cur);
     if (parent === cur) break;
     cur = parent;
   }
@@ -206,17 +222,17 @@ function getEmbeddingCoverage(dbPath, rootDir) {
     embeddedFiles: countScoped("SELECT COUNT(DISTINCT file_path) as c FROM chunks", "file_path")
   };
 }
-function getParserFreshness(dbPath, parserSha, rootDir) {
+function getParserFreshness(dbPath, expectedFor, rootDir) {
   const db = getDb(dbPath);
-  const count = (extra, params) => {
-    if (rootDir === void 0) {
-      return db.prepare(`SELECT COUNT(*) as c FROM files${extra === "" ? "" : ` WHERE ${extra}`}`).get(...params).c;
-    }
-    const scope = projectScopeClause("path");
-    const where = extra === "" ? scope.clause : `${scope.clause} AND ${extra}`;
-    return db.prepare(`SELECT COUNT(*) as c FROM files WHERE ${where}`).get(...scope.params(rootDir), ...params).c;
-  };
-  return { indexedFiles: count("", []), currentFiles: count("parser_sha = ?", [parserSha]) };
+  const scope = rootDir === void 0 ? void 0 : projectScopeClause("path");
+  const rows = db.prepare(`SELECT language, parser_sha, COUNT(*) as c FROM files${scope === void 0 ? "" : ` WHERE ${scope.clause}`} GROUP BY language, parser_sha`).all(...scope === void 0 || rootDir === void 0 ? [] : scope.params(rootDir));
+  let indexedFiles = 0;
+  let currentFiles = 0;
+  for (const row of rows) {
+    indexedFiles += row.c;
+    if (row.parser_sha !== null && row.parser_sha === expectedFor(row.language ?? "unknown")) currentFiles += row.c;
+  }
+  return { indexedFiles, currentFiles };
 }
 function isIndexEmptyForProject(dbPath, rootDir) {
   if (!fs2.existsSync(dbPath)) return true;
@@ -237,8 +253,8 @@ function emptyIndexMessage(rootDir) {
 // src/bridges/visualstudio_install.ts
 init_define_import_meta_env();
 import * as fs4 from "node:fs";
-import * as os from "node:os";
-import * as path3 from "node:path";
+import * as os2 from "node:os";
+import * as path4 from "node:path";
 
 // src/bridges/guidance_block.ts
 init_define_import_meta_env();
@@ -256,6 +272,7 @@ function buildGuidanceBody(fallbackToolClause, opts = {}) {
     "Exemptions (gate passes, read directly): the file is under ~200 lines and you need all of it; it was never indexed (new, untracked, or generated this turn); it is a genuinely opaque binary (not an image); the target has no symbol handle (e.g. a literal mid-function).",
     "",
     "Failure shapes to catch yourself in, and the command that replaces each:",
+    '- not knowing which command answers a question you can already state in words \u2192 `answer "<question>"`, which resolves the subject in the index, runs the right command, prints `via: <command>`, and refuses rather than guess',
     '- a shell text search with context flags to find a function body \u2192 `read "file::symbol"`',
     '- paging one function with view/view_range \u2192 `read "file::symbol"`',
     '- reading a symbol plus chasing its callers and containing doc section as separate reads \u2192 `brief "file::symbol"`',
@@ -269,7 +286,7 @@ function buildGuidanceBody(fallbackToolClause, opts = {}) {
     "- opening a screenshot, diagram, or scan to read the text in it \u2192 `image-text file`",
     "- opening a PDF or Office document \u2192 inspect its format first, then read a narrow slice: PDF `pdf-meta`/`pdf-outline` then `pdf-locate` to find the pages and `pdf-extract` only those; Word `docx-outline` then `docx-tables`/`docx-text`; PowerPoint `pptx-outline` then `pptx-slide`/`pptx-notes`; Excel `xlsx-sheets` then `xlsx-columns`/`xlsx-head`/`xlsx-range`/`xlsx-query`",
     "",
-    'Commands: `symbol NAME`, `read "file::symbol"`, `brief "file::symbol"`, `section "file::Heading"`, `semantic "description"`, `outline file`/`skeleton file`, `map --compact`, `refs file::symbol --callers`, `changed --symbol`, `config-get file KEY`, `json-query file \'a.b.c\'`/`yaml-query`/`xml-query`, `json-outline file`/`yaml-outline`/`xml-outline`, `bash-output`/`web-output`/`mcp-output`, ' + (gdrive ? "`gdrive-sections <file-id>`, " : "") + "`image-meta file`/`image-text file`, `pdf-meta`/`pdf-outline`/`pdf-locate`/`pdf-extract`, `docx-outline`/`docx-tables`/`docx-text`, `pptx-outline`/`pptx-slide`/`pptx-notes`/`pptx-text`, `xlsx-sheets`/`xlsx-columns`/`xlsx-head`/`xlsx-range`/`xlsx-query`.",
+    'Commands: `answer "<question>"`, `symbol NAME`, `read "file::symbol"`, `brief "file::symbol"`, `section "file::Heading"`, `semantic "description"`, `outline file`/`skeleton file`, `map --compact`, `refs file::symbol --callers`, `changed --symbol`, `config-get file KEY`, `json-query file \'a.b.c\'`/`yaml-query`/`xml-query`, `json-outline file`/`yaml-outline`/`xml-outline`, `bash-output`/`web-output`/`mcp-output`, ' + (gdrive ? "`gdrive-sections <file-id>`, " : "") + "`image-meta file`/`image-text file`, `pdf-meta`/`pdf-outline`/`pdf-locate`/`pdf-extract`, `docx-outline`/`docx-tables`/`docx-text`, `pptx-outline`/`pptx-slide`/`pptx-notes`/`pptx-text`, `xlsx-sheets`/`xlsx-columns`/`xlsx-head`/`xlsx-range`/`xlsx-query`.",
     "",
     "Sub-agent briefs must carry this gate verbatim: a sub-agent inherits none of this context and its reads spend the same token budget.",
     "",
@@ -286,7 +303,7 @@ function buildGuidanceBlock(h) {
 // src/bridges/mcp_servers_json.ts
 init_define_import_meta_env();
 import * as fs3 from "node:fs";
-import * as path2 from "node:path";
+import * as path3 from "node:path";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 var jsoncParser;
@@ -295,10 +312,10 @@ function jsonc() {
   return jsoncParser;
 }
 function bundledCliPath() {
-  const here = path2.dirname(fileURLToPath(import.meta.url));
-  const bundled = path2.join(here, "token-goat.mjs");
+  const here = path3.dirname(fileURLToPath(import.meta.url));
+  const bundled = path3.join(here, "token-goat.mjs");
   if (fs3.existsSync(bundled)) return bundled;
-  return path2.resolve(here, "..", "..", "dist", "token-goat.mjs");
+  return path3.resolve(here, "..", "..", "dist", "token-goat.mjs");
 }
 function managedServer() {
   return {
@@ -311,7 +328,7 @@ function isManagedServer(value) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
   const entry = value;
   const args = entry["args"];
-  return entry["type"] === "stdio" && Array.isArray(args) && args.length === 2 && typeof args[0] === "string" && path2.basename(args[0]).toLowerCase() === "token-goat.mjs" && args[1] === "mcp-serve";
+  return entry["type"] === "stdio" && Array.isArray(args) && args.length === 2 && typeof args[0] === "string" && path3.basename(args[0]).toLowerCase() === "token-goat.mjs" && args[1] === "mcp-serve";
 }
 function readServersJson(filePath, label) {
   const text = fs3.existsSync(filePath) ? fs3.readFileSync(filePath, "utf8") : "{}\n";
@@ -357,6 +374,16 @@ function holdsOnlyManagedServer(value) {
   const names = Object.keys(servers);
   return names.length === 1 && names[0] === "token-goat" && isManagedServer(servers["token-goat"]);
 }
+function isResidueServersJson(text, rootKey = "servers") {
+  const trimmed = text.trim();
+  if (trimmed === "") return true;
+  const parsed = parseObject(trimmed);
+  if (parsed === null) return false;
+  const keys = Object.keys(parsed);
+  if (keys.length !== 1 || keys[0] !== rootKey) return false;
+  const servers = parsed[rootKey];
+  return servers !== null && typeof servers === "object" && !Array.isArray(servers) && Object.keys(servers).length === 0;
+}
 function dropEmptyServers(text, rootKey = "servers") {
   const parsed = parseObject(text);
   if (parsed === null) return text;
@@ -399,10 +426,10 @@ var SIBLING_GATE_MARKERS = [
   ["<!-- token-goat-begin -->", "<!-- token-goat-end -->"]
 ];
 function visualStudioUserMcpPath() {
-  return path3.join(os.homedir(), ".mcp.json");
+  return path4.join(os2.homedir(), ".mcp.json");
 }
 function visualStudioProjectMcpPath(projectRoot = process.cwd()) {
-  return path3.join(path3.resolve(projectRoot), ".mcp.json");
+  return path4.join(path4.resolve(projectRoot), ".mcp.json");
 }
 function visualStudioMcpPath(opts = {}) {
   return opts.project === true ? visualStudioProjectMcpPath(opts.projectRoot) : visualStudioUserMcpPath();
@@ -411,7 +438,7 @@ function otherScopeMcpPath(opts) {
   return opts.project === true ? visualStudioUserMcpPath() : visualStudioProjectMcpPath(opts.projectRoot);
 }
 function visualStudioInstructionsPath(opts = {}) {
-  return opts.project === true ? path3.join(path3.resolve(opts.projectRoot ?? process.cwd()), ".github", "copilot-instructions.md") : path3.join(os.homedir(), "copilot-instructions.md");
+  return opts.project === true ? path4.join(path4.resolve(opts.projectRoot ?? process.cwd()), ".github", "copilot-instructions.md") : path4.join(os2.homedir(), "copilot-instructions.md");
 }
 function visualStudioOtherScopeHasManagedServer(opts = {}) {
   return hasManagedServer(otherScopeMcpPath(opts), LABEL);
@@ -420,7 +447,7 @@ function isVisualStudioInstalled(opts = {}) {
   return hasManagedServer(visualStudioMcpPath(opts), LABEL);
 }
 function visualStudioSolutionVscodeMcpPath(projectRoot = process.cwd()) {
-  return path3.join(path3.resolve(projectRoot), ".vscode", "mcp.json");
+  return path4.join(path4.resolve(projectRoot), ".vscode", "mcp.json");
 }
 function visualStudioManagedRegistrations(projectRoot = process.cwd()) {
   return [visualStudioUserMcpPath(), visualStudioProjectMcpPath(projectRoot), visualStudioSolutionVscodeMcpPath(projectRoot)].filter((p) => hasManagedServer(p, LABEL));
@@ -498,7 +525,7 @@ function installVisualStudioScoped(opts) {
   }
   const next = ensureMcpServersKey(setTokenGoatServer(config.text, managedServer()));
   if (config.text !== next) {
-    ensureDirSync(path3.dirname(mcpPath));
+    ensureDirSync(path4.dirname(mcpPath));
     backupFile(mcpPath);
     atomicWriteText(mcpPath, next);
     if (!mcpExisted || ownedAlready) recordCreatedConfig(mcpPath);
@@ -536,8 +563,8 @@ function uninstallVisualStudioScoped(opts) {
 // src/bridges/copilot_cli_install.ts
 init_define_import_meta_env();
 import * as fs5 from "node:fs";
-import * as os2 from "node:os";
-import * as path4 from "node:path";
+import * as os3 from "node:os";
+import * as path5 from "node:path";
 
 // src/bridges/copilot_cli.ts
 init_define_import_meta_env();
@@ -1255,43 +1282,43 @@ var COPILOT_CLI_HOOK_EVENTS = [
 ];
 function copilotCliUserRoot() {
   const override = process.env["COPILOT_HOME"];
-  if (override !== void 0 && override.trim() !== "") return path4.resolve(override);
-  return path4.join(os2.homedir(), ".copilot");
+  if (override !== void 0 && override.trim() !== "") return path5.resolve(override);
+  return path5.join(os3.homedir(), ".copilot");
 }
 function copilotCliUserHooksDir() {
-  return path4.join(copilotCliUserRoot(), "hooks");
+  return path5.join(copilotCliUserRoot(), "hooks");
 }
 function copilotCliProjectHooksDir() {
-  return path4.join(process.cwd(), ".github", "hooks");
+  return path5.join(process.cwd(), ".github", "hooks");
 }
 function copilotCliCacheRoot() {
   const override = process.env["COPILOT_CACHE_HOME"];
-  if (override !== void 0 && override.trim() !== "") return path4.resolve(override);
-  const home = os2.homedir();
-  if (process.platform === "darwin") return path4.join(home, "Library", "Caches", "copilot");
+  if (override !== void 0 && override.trim() !== "") return path5.resolve(override);
+  const home = os3.homedir();
+  if (process.platform === "darwin") return path5.join(home, "Library", "Caches", "copilot");
   if (process.platform === "win32") {
     const local = process.env["LOCALAPPDATA"];
-    const base2 = local !== void 0 && local.trim() !== "" ? local : path4.join(home, ".cache");
-    return path4.join(base2, "copilot");
+    const base2 = local !== void 0 && local.trim() !== "" ? local : path5.join(home, ".cache");
+    return path5.join(base2, "copilot");
   }
   const xdg = process.env["XDG_CACHE_HOME"];
-  const base = xdg !== void 0 && xdg.trim() !== "" ? xdg : path4.join(home, ".cache");
-  return path4.join(base, "copilot");
+  const base = xdg !== void 0 && xdg.trim() !== "" ? xdg : path5.join(home, ".cache");
+  return path5.join(base, "copilot");
 }
 function copilotCliMcpToolsDir() {
-  return path4.join(copilotCliCacheRoot(), "mcp-tools");
+  return path5.join(copilotCliCacheRoot(), "mcp-tools");
 }
 function copilotCliHooksDir(opts = {}) {
   return opts.local === true ? copilotCliProjectHooksDir() : copilotCliUserHooksDir();
 }
 function copilotCliConfigPath(opts = {}) {
-  return path4.join(copilotCliHooksDir(opts), HOOKS_CONFIG_FILE);
+  return path5.join(copilotCliHooksDir(opts), HOOKS_CONFIG_FILE);
 }
 function copilotCliScriptPath(opts = {}) {
-  return path4.join(copilotCliHooksDir(opts), HOOKS_SCRIPT_FILE);
+  return path5.join(copilotCliHooksDir(opts), HOOKS_SCRIPT_FILE);
 }
 function copilotCliInstructionsPath(opts = {}) {
-  return path4.join(path4.dirname(copilotCliHooksDir(opts)), "copilot-instructions.md");
+  return path5.join(path5.dirname(copilotCliHooksDir(opts)), "copilot-instructions.md");
 }
 var COPILOT_INSTRUCTIONS_BEGIN = "<!-- token-goat-begin -->";
 var COPILOT_INSTRUCTIONS_END = "<!-- token-goat-end -->";
@@ -1349,10 +1376,10 @@ var HOOKS_CONFIG_FILE = "token-goat.json";
 var HOOKS_SCRIPT_FILE = "token-goat-shim.js";
 var HOOKS_OWNERS_FILE = "token-goat.owners";
 function copilotHooksOwnersPath(hooksDir) {
-  return path4.join(hooksDir, HOOKS_OWNERS_FILE);
+  return path5.join(hooksDir, HOOKS_OWNERS_FILE);
 }
 function copilotHooksFilePaths(hooksDir) {
-  return [path4.join(hooksDir, HOOKS_CONFIG_FILE), path4.join(hooksDir, HOOKS_SCRIPT_FILE), copilotHooksOwnersPath(hooksDir)];
+  return [path5.join(hooksDir, HOOKS_CONFIG_FILE), path5.join(hooksDir, HOOKS_SCRIPT_FILE), copilotHooksOwnersPath(hooksDir)];
 }
 function readCopilotHooksOwners(hooksDir) {
   const owners = /* @__PURE__ */ new Set();
@@ -1360,7 +1387,7 @@ function readCopilotHooksOwners(hooksDir) {
   try {
     text = fs5.readFileSync(copilotHooksOwnersPath(hooksDir), "utf8");
   } catch {
-    if (fs5.existsSync(path4.join(hooksDir, HOOKS_CONFIG_FILE))) owners.add("copilot");
+    if (fs5.existsSync(path5.join(hooksDir, HOOKS_CONFIG_FILE))) owners.add("copilot");
     return owners;
   }
   for (const line of text.split(/\r?\n/)) {
@@ -1370,8 +1397,8 @@ function readCopilotHooksOwners(hooksDir) {
   return owners;
 }
 function installCopilotHooksFile(hooksDir, owner) {
-  const configPath = path4.join(hooksDir, HOOKS_CONFIG_FILE);
-  const scriptPath = path4.join(hooksDir, HOOKS_SCRIPT_FILE);
+  const configPath = path5.join(hooksDir, HOOKS_CONFIG_FILE);
+  const scriptPath = path5.join(hooksDir, HOOKS_SCRIPT_FILE);
   const owners = readCopilotHooksOwners(hooksDir);
   const scriptChanged = writeIfDifferent(scriptPath, COPILOT_CLI_HOOK_SCRIPT);
   const desiredText = JSON.stringify(buildConfig(scriptPath), null, 2) + "\n";
@@ -1391,10 +1418,10 @@ function releaseCopilotHooksFile(hooksDir, owner, keepBackups = false) {
     writeIfDifferent(ownersPath, [...owners].sort().join("\n") + "\n");
     return true;
   }
-  const configRemoved = removeFileInScope(path4.join(hooksDir, HOOKS_CONFIG_FILE));
-  if (!keepBackups) removeCreatedBackups(path4.join(hooksDir, HOOKS_CONFIG_FILE));
-  takeCreatedConfig(path4.join(hooksDir, HOOKS_CONFIG_FILE));
-  const scriptRemoved = removeFileInScope(path4.join(hooksDir, HOOKS_SCRIPT_FILE));
+  const configRemoved = removeFileInScope(path5.join(hooksDir, HOOKS_CONFIG_FILE));
+  if (!keepBackups) removeCreatedBackups(path5.join(hooksDir, HOOKS_CONFIG_FILE));
+  takeCreatedConfig(path5.join(hooksDir, HOOKS_CONFIG_FILE));
+  const scriptRemoved = removeFileInScope(path5.join(hooksDir, HOOKS_SCRIPT_FILE));
   const ownersRemoved = removeFileInScope(ownersPath);
   return configRemoved || scriptRemoved || ownersRemoved;
 }
@@ -1453,7 +1480,7 @@ init_define_import_meta_env();
 // src/copilot_mcp_tools.ts
 init_define_import_meta_env();
 import fs6 from "node:fs";
-import path5 from "node:path";
+import path6 from "node:path";
 
 // src/overflow_guard.ts
 init_define_import_meta_env();
@@ -1552,7 +1579,7 @@ function readCopilotMcpTools(dir = copilotCliMcpToolsDir()) {
     if (!entry.toLowerCase().endsWith(".json")) continue;
     let parsed;
     try {
-      parsed = JSON.parse(fs6.readFileSync(path5.join(dir, entry), "utf8"));
+      parsed = JSON.parse(fs6.readFileSync(path6.join(dir, entry), "utf8"));
     } catch {
       unreadable += 1;
       continue;
@@ -1970,15 +1997,15 @@ function extractToolResponseField(raw, keys) {
   if (typeof resp === "string") return resp;
   if (resp !== null && typeof resp === "object") {
     const r = resp;
-    const path24 = resolveToolResponseFieldPath(r, keys);
-    if (path24 !== null) return readAtPath(r, path24);
+    const path26 = resolveToolResponseFieldPath(r, keys);
+    if (path26 !== null) return readAtPath(r, path26);
   }
   return "";
 }
 var NESTED_TOOL_RESPONSE_PATHS = [["file", "content"]];
-function readAtPath(resp, path24) {
+function readAtPath(resp, path26) {
   let cur = resp;
-  for (const seg of path24) {
+  for (const seg of path26) {
     if (cur === null || typeof cur !== "object") return "";
     cur = cur[seg];
   }
@@ -1988,25 +2015,25 @@ function resolveToolResponseFieldPath(resp, keys) {
   for (const key of keys) {
     if (typeof resp[key] === "string" && resp[key] !== "") return [key];
   }
-  for (const path24 of NESTED_TOOL_RESPONSE_PATHS) {
-    if (readAtPath(resp, path24) !== "") return path24;
+  for (const path26 of NESTED_TOOL_RESPONSE_PATHS) {
+    if (readAtPath(resp, path26) !== "") return path26;
   }
   return null;
 }
 function replaceToolResponseField(resp, keys, newText) {
-  const path24 = resolveToolResponseFieldPath(resp, keys);
-  if (path24 === null) return null;
+  const path26 = resolveToolResponseFieldPath(resp, keys);
+  if (path26 === null) return null;
   const root = { ...resp };
   let cur = root;
-  for (let i = 0; i < path24.length - 1; i++) {
-    const seg = path24[i];
+  for (let i = 0; i < path26.length - 1; i++) {
+    const seg = path26[i];
     const child = cur[seg];
     if (child === null || typeof child !== "object") return null;
     const cloned = { ...child };
     cur[seg] = cloned;
     cur = cloned;
   }
-  cur[path24[path24.length - 1]] = newText;
+  cur[path26[path26.length - 1]] = newText;
   return root;
 }
 var OUTPUT_FIRST_TOOL_RESPONSE_KEYS = ["output", "content", "text", "body", "stdout", "stderr"];
@@ -2093,8 +2120,8 @@ function passOutput() {
 function denyOutput(message) {
   return { hookType: "deny", message: `[tg] ${neutralizeOutsideFences(message)}` };
 }
-function contextOutput(context) {
-  return { hookType: "context", context };
+function contextOutput(context, correlators) {
+  return correlators === void 0 ? { hookType: "context", context } : { hookType: "context", context, correlators };
 }
 function emitRewrite(updatedOutput, detail, savings, redaction = "count-here") {
   if (detectHarness() === "vscode") return passOutput();
@@ -2104,7 +2131,8 @@ function emitRewrite(updatedOutput, detail, savings, redaction = "count-here") {
   }
   if (savings !== void 0) {
     const bytesSaved = savings.originalBytes - Buffer.byteLength(updatedOutput, "utf-8");
-    if (bytesSaved > 0) recordStat(savings.kind, bytesSaved, savedTokensFromBytes(bytesSaved), void 0, savings.detail);
+    const credited = Math.max(0, bytesSaved);
+    recordStat(savings.kind, credited, savedTokensFromBytes(credited), void 0, savings.detail);
   }
   return { hookType: "rewriteOutput", updatedOutput };
 }
@@ -2163,8 +2191,8 @@ function makeDedupHintHandlers(opts) {
 init_define_import_meta_env();
 import * as crypto from "node:crypto";
 import * as fs7 from "node:fs";
-import * as os3 from "node:os";
-import * as path6 from "node:path";
+import * as os4 from "node:os";
+import * as path7 from "node:path";
 function vscodeToolName(event) {
   const name = event?.raw[VSCODE_TOOL_NAME_KEY];
   return typeof name === "string" ? name : void 0;
@@ -2174,10 +2202,10 @@ var MATERIALIZED_MAX_AGE_MS = 60 * 60 * 1e3;
 function pruneMaterialized() {
   const now = Date.now();
   try {
-    const dir = os3.tmpdir();
+    const dir = os4.tmpdir();
     for (const file of fs7.readdirSync(dir)) {
       if (!file.startsWith(SHRINK_PREFIX)) continue;
-      const full = path6.join(dir, file);
+      const full = path7.join(dir, file);
       try {
         const st = fs7.statSync(full);
         if (st.isFile() && now - st.mtimeMs > MATERIALIZED_MAX_AGE_MS) fs7.unlinkSync(full);
@@ -2194,7 +2222,7 @@ function materializeShrunkImageFile(context) {
   if (!match) return void 0;
   try {
     pruneMaterialized();
-    const file = path6.join(os3.tmpdir(), `${SHRINK_PREFIX}${process.pid}-${Date.now()}-${crypto.randomUUID()}.${match[1]}`);
+    const file = path7.join(os4.tmpdir(), `${SHRINK_PREFIX}${process.pid}-${Date.now()}-${crypto.randomUUID()}.${match[1]}`);
     fs7.writeFileSync(file, Buffer.from(match[2], "base64"), { mode: 384 });
     return file;
   } catch {
@@ -2272,7 +2300,15 @@ function noteUnrecognizedTool(event, list) {
   const toolName = event.toolName;
   if (typeof toolName !== "string" || toolName === "") return;
   const named = [];
-  for (const { toolName: want } of list) {
+  for (const { toolName: want, toolPattern } of list) {
+    if (toolPattern !== void 0) {
+      let matches = false;
+      try {
+        matches = new RegExp(toolPattern).test(toolName);
+      } catch {
+      }
+      if (matches) return;
+    }
     if (want === void 0) continue;
     if (want === toolName) return;
     named.push(want);
@@ -2319,11 +2355,7 @@ var CLAUDE_CODE_EVENT_NAMES = {
   user_prompt_submit: "UserPromptSubmit",
   subagent_stop: "SubagentStop",
   session_start: "SessionStart",
-  // Claude Code has no separate failure event -- a failed tool arrives on PostToolUse there,
-  // and only Copilot splits it out. This entry exists because the map is exhaustive over
-  // HookEventName, and it is a spelling for the response envelope rather than a claim that
-  // Claude Code will ever send this event. Nothing iterates this map to build install config,
-  // so naming an event Claude Code does not have cannot register one.
+  // Claude Code has no separate failure event -- a failed tool arrives on PostToolUse there, and only Copilot splits it out. This entry exists because the map is exhaustive over HookEventName, and it is a spelling for the response envelope rather than a claim that Claude Code will ever send this event. Nothing iterates this map to build install config, so naming an event Claude Code does not have cannot register one.
   post_tool_use_failure: "PostToolUseFailure"
 };
 var EVENTS_WITHOUT_ADDITIONAL_CONTEXT = /* @__PURE__ */ new Set([
@@ -2400,6 +2432,8 @@ var _curlDownloads = /* @__PURE__ */ new Map();
 var _curlDownloadsAtLoad = /* @__PURE__ */ new Map();
 var _fileLineRanges = /* @__PURE__ */ new Map();
 var _fileServedOutputs = /* @__PURE__ */ new Map();
+var _fileLineRangesAtLoad = /* @__PURE__ */ new Map();
+var _fileServedOutputsAtLoad = /* @__PURE__ */ new Map();
 var _compactedAt = 0;
 var _cliReads = /* @__PURE__ */ new Set();
 var _pendingLargeFileHints = /* @__PURE__ */ new Map();
@@ -2478,7 +2512,6 @@ function recordFileEdit(filePath) {
   const normalized = normalizePath(filePath);
   const key = resolveFilesKey(normalized);
   _fileLineRanges.delete(foldPath(normalized));
-  _fileServedOutputs.delete(foldPath(normalized));
   const prev = _files.get(key);
   if (prev === void 0) {
     _files.set(key, {
@@ -2668,6 +2701,20 @@ function consumedCurlDownloadKeys() {
   }
   return consumed;
 }
+function consumedFileLineRangeKeys() {
+  const consumed = [];
+  for (const key of _fileLineRangesAtLoad.keys()) {
+    if (!_fileLineRanges.has(key)) consumed.push(key);
+  }
+  return consumed;
+}
+function consumedFileServedOutputKeys() {
+  const consumed = [];
+  for (const key of _fileServedOutputsAtLoad.keys()) {
+    if (!_fileServedOutputs.has(key)) consumed.push(key);
+  }
+  return consumed;
+}
 var MAX_RANGES_PER_FILE = 64;
 function statIdentity(absPath) {
   try {
@@ -2748,9 +2795,9 @@ function getSessionId() {
   _sessionId = fromEnv !== void 0 && fromEnv !== "" ? fromEnv : generateSessionId();
   return _sessionId;
 }
-function setTranscriptPath(path24, sessionId) {
-  if (path24 === "") return;
-  _transcriptPath = { path: path24, sessionId };
+function setTranscriptPath(path26, sessionId) {
+  if (path26 === "") return;
+  _transcriptPath = { path: path26, sessionId };
 }
 function getTranscriptPath2() {
   if (_transcriptPath === null) return void 0;
@@ -2792,7 +2839,9 @@ function importSessionState(s) {
   _curlDownloads = new Map(s.curlDownloads);
   _curlDownloadsAtLoad = new Map(_curlDownloads);
   _fileLineRanges = new Map(s.fileLineRanges ?? []);
+  _fileLineRangesAtLoad = new Map(_fileLineRanges);
   _fileServedOutputs = new Map(s.fileServedOutputs ?? []);
+  _fileServedOutputsAtLoad = new Map(_fileServedOutputs);
   _cliReads = new Set(s.cliReads ?? []);
   _pendingLargeFileHints = new Map(s.pendingLargeFileHints ?? []);
   _pendingLargeFileHintsAtLoad = new Map(_pendingLargeFileHints);
@@ -2816,7 +2865,9 @@ registerReset(() => {
   _curlDownloads = /* @__PURE__ */ new Map();
   _curlDownloadsAtLoad = /* @__PURE__ */ new Map();
   _fileLineRanges = /* @__PURE__ */ new Map();
+  _fileLineRangesAtLoad = /* @__PURE__ */ new Map();
   _fileServedOutputs = /* @__PURE__ */ new Map();
+  _fileServedOutputsAtLoad = /* @__PURE__ */ new Map();
   _cliReads = /* @__PURE__ */ new Set();
   _pendingLargeFileHints = /* @__PURE__ */ new Map();
   _pendingLargeFileHintsAtLoad = /* @__PURE__ */ new Map();
@@ -2835,9 +2886,18 @@ registerReset(() => {
 init_define_import_meta_env();
 import { createHash } from "node:crypto";
 import * as fs9 from "node:fs";
-import * as path7 from "node:path";
-var MAX_FILES = 500;
+import * as path9 from "node:path";
+
+// src/sessions_dir.ts
+init_define_import_meta_env();
+import * as path8 from "node:path";
 var SESSIONS_SUBDIR = "sessions";
+function sessionsDir() {
+  return path8.join(tokenGoatHome(), SESSIONS_SUBDIR);
+}
+
+// src/session_store.ts
+var MAX_FILES = 500;
 var AGENT_SALT_MARKER = sanitizeIdForFilename(":agent:");
 var AGENT_SALT_SEPARATOR = ":agent:";
 var AGENT_DIGEST_CHARS = 12;
@@ -2860,10 +2920,10 @@ function sessionSidecarPath(sessionId, suffix) {
   const safe = sessionFileStem(sessionId);
   if (!safe) return null;
   if (suffix.includes("/") || suffix.includes("\\") || suffix.includes("..")) return null;
-  const dir = path7.join(tokenGoatHome(), SESSIONS_SUBDIR);
-  const candidate = path7.join(dir, `${safe}${suffix}`);
+  const dir = sessionsDir();
+  const candidate = path9.join(dir, `${safe}${suffix}`);
   try {
-    const rel = path7.relative(dir, candidate);
+    const rel = path9.relative(dir, candidate);
     if (rel.startsWith("..")) return null;
   } catch {
     return null;
@@ -3108,10 +3168,14 @@ function mergeSessionState(disk, mem) {
     byPath.set(key, prev ? mergeFileEntry(prev, e) : e);
   }
   const compactedAt = Math.max(disk.compactedAt ?? 0, mem.compactedAt ?? 0);
-  const diskRanges = (disk.compactedAt ?? 0) === compactedAt ? disk.fileLineRanges ?? [] : [];
+  const rawDiskRanges = (disk.compactedAt ?? 0) === compactedAt ? disk.fileLineRanges ?? [] : [];
   const memRanges = (mem.compactedAt ?? 0) === compactedAt ? mem.fileLineRanges ?? [] : [];
-  const diskServed = (disk.compactedAt ?? 0) === compactedAt ? disk.fileServedOutputs ?? [] : [];
+  const rawDiskServed = (disk.compactedAt ?? 0) === compactedAt ? disk.fileServedOutputs ?? [] : [];
   const memServed = (mem.compactedAt ?? 0) === compactedAt ? mem.fileServedOutputs ?? [] : [];
+  const clearedRangeFiles = new Set(consumedFileLineRangeKeys());
+  const clearedServedFiles = new Set(consumedFileServedOutputKeys());
+  const diskRanges = rawDiskRanges.filter(([path26]) => !clearedRangeFiles.has(path26));
+  const diskServed = rawDiskServed.filter(([path26]) => !clearedServedFiles.has(path26));
   return {
     files: Array.from(byPath.values()),
     hintsShown: Array.from(/* @__PURE__ */ new Set([...disk.hintsShown, ...mem.hintsShown])),
@@ -3128,10 +3192,7 @@ function mergeSessionState(disk, mem) {
     grepQueries: mergePairs(disk.grepQueries ?? [], mem.grepQueries ?? []),
     globQueries: mergePairs(disk.globQueries ?? [], mem.globQueries ?? []),
     outstandingAgentSpawns: mergeOutstandingAgentSpawns(disk.outstandingAgentSpawns ?? [], mem.outstandingAgentSpawns ?? []),
-    // An accumulating collection, so union rather than pick a winner: two hook processes can
-    // each see a screenshot the other never did. Disk first, then mem, so the order stays
-    // oldest-to-newest and the cap evicts the oldest -- the same policy recordSeenImage applies
-    // in memory, applied again here because a union of two capped lists can exceed the cap.
+    // An accumulating collection, so union rather than pick a winner: two hook processes can each see a screenshot the other never did. Disk first, then mem, so the order stays oldest-to-newest and the cap evicts the oldest -- the same policy recordSeenImage applies in memory, applied again here because a union of two capped lists can exceed the cap.
     seenImageHashes: mergeSeenImageHashes(disk.seenImageHashes ?? [], mem.seenImageHashes ?? []),
     // Last-seen scalar, not an accumulating collection: prefer mem's value (this process's freshest observation) over disk's, since a newer write always supersedes an older one.
     ...mem.lastTabContextDigest !== void 0 ? { lastTabContextDigest: mem.lastTabContextDigest } : disk.lastTabContextDigest !== void 0 ? { lastTabContextDigest: disk.lastTabContextDigest } : {},
@@ -3165,13 +3226,13 @@ function listSiblingSessionStates(sessionId) {
   if (!sessionId) return [];
   const prefix = saltedStemPrefix(sessionId);
   if (prefix === AGENT_SALT_MARKER) return [];
-  const dir = path7.join(tokenGoatHome(), SESSIONS_SUBDIR);
+  const dir = sessionsDir();
   const out = [];
   try {
     if (!fs9.existsSync(dir)) return out;
     for (const file of fs9.readdirSync(dir)) {
       if (!file.endsWith(".json") || !file.startsWith(prefix)) continue;
-      const state = readDiskState(path7.join(dir, file));
+      const state = readDiskState(path9.join(dir, file));
       if (state !== null) out.push(state);
     }
   } catch {
@@ -3190,7 +3251,7 @@ function saveSessionState(sessionId) {
   const p = sessionPath(sessionId);
   if (!p) return;
   try {
-    const dir = path7.dirname(p);
+    const dir = path9.dirname(p);
     if (!fs9.existsSync(dir)) ensureDirSync(dir);
     const mem = exportSessionState();
     const writeMerged = () => {
@@ -3215,7 +3276,6 @@ function saveSessionState(sessionId) {
 init_define_import_meta_env();
 import * as fs10 from "fs/promises";
 import { resolve as resolve4 } from "path";
-import { homedir as homedir3 } from "os";
 import { readdirSync as readdirSync3, readFileSync as readFileSync5, existsSync as existsSync7, statSync as statSync3, unlinkSync as unlinkSync2 } from "node:fs";
 var COMPACT_END_MARKER = "<!-- COMPACT_END -->";
 var SKILLS_OUTPUT_SUBDIR = "skills";
@@ -3234,7 +3294,7 @@ function skillOutputsDir() {
 }
 function skillsSourceDir() {
   if (_skillsSourceDirOverride) return _skillsSourceDirOverride;
-  return resolve4(homedir3(), ".claude", "skills");
+  return resolve4(claudeConfigDir(), "skills");
 }
 async function ensureSkillsDir() {
   try {
@@ -3718,7 +3778,7 @@ async function getSkillFilePath(skillName2) {
   }
 }
 async function resolvePluginSkillPath(pluginName, skillSlug) {
-  const manifestPath = _pluginsManifestPathOverride ?? resolve4(homedir3(), ".claude", "plugins", "installed_plugins.json");
+  const manifestPath = _pluginsManifestPathOverride ?? resolve4(claudeConfigDir(), "plugins", "installed_plugins.json");
   let raw;
   try {
     raw = await fs10.readFile(manifestPath, "utf8");
@@ -3824,14 +3884,14 @@ function pruneSkillOutputs(maxCount = DEFAULT_MAX_COUNT, maxAgeMs = DEFAULT_MAX_
 init_define_import_meta_env();
 import { createHash as createHash2 } from "node:crypto";
 import * as fs11 from "node:fs";
-import * as path9 from "node:path";
+import * as path11 from "node:path";
 
 // src/vscode_path_gate.ts
 init_define_import_meta_env();
-import * as path8 from "node:path";
+import * as path10 from "node:path";
 function resolvesToUncPath(target, cwd) {
   try {
-    return isUncOrDevicePath(path8.resolve(cwd ?? process.cwd(), target));
+    return isUncOrDevicePath(path10.resolve(cwd ?? process.cwd(), target));
   } catch {
     return false;
   }
@@ -3839,8 +3899,8 @@ function resolvesToUncPath(target, cwd) {
 function vscodePathAllowed(filePath, workspace) {
   if (isUncOrDevicePath(filePath)) return false;
   if (workspace === void 0 || isUncOrDevicePath(workspace)) return false;
-  const resolvedRoot = path8.resolve(workspace);
-  const resolvedTarget = path8.resolve(workspace, filePath);
+  const resolvedRoot = path10.resolve(workspace);
+  const resolvedTarget = path10.resolve(workspace, filePath);
   const root = foldPathForContainment(resolvedRoot.replace(/\\/g, "/"));
   const target = foldPathForContainment(resolvedTarget.replace(/\\/g, "/"));
   if (target !== root && !target.startsWith(root.endsWith("/") ? root : root + "/")) return false;
@@ -3858,19 +3918,6 @@ function preToolPathDeclined(event, target) {
 }
 
 // src/image_shrink.ts
-var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".png",
-  ".jpg",
-  ".jpeg",
-  ".gif",
-  ".webp",
-  ".bmp",
-  ".tif",
-  ".tiff",
-  ".avif",
-  ".heic",
-  ".heif"
-]);
 var DEFAULT_MAX_DIMENSION = 1568;
 var VISION_PATCH_PX = 28;
 var VISION_TIER_LIMITS = {
@@ -3942,9 +3989,6 @@ function formatShrinkSummary(result, subject) {
   const dataUrl = `data:image/${result.format};base64,${result.data.toString("base64")}`;
   return { summary, dataUrl };
 }
-function isImagePath(p) {
-  return IMAGE_EXTENSIONS.has(path9.extname(p).toLowerCase());
-}
 var ImageDecodeError = class extends Error {
 };
 async function probeImageMeta(input) {
@@ -4054,7 +4098,7 @@ function statInfo(absPath) {
   }
 }
 function imageShrinkCacheDir() {
-  return path9.join(tokenGoatHome(), "image_shrink_cache");
+  return path11.join(tokenGoatHome(), "image_shrink_cache");
 }
 var SHRINK_ENGINE_REVISION = 3;
 function shrinkCacheKeyForRevision(revision, originalPath, size, mtimeMs, quality) {
@@ -4090,7 +4134,7 @@ function findCachedShrink(originalPath, size, mtimeMs, quality) {
     const format = SHRINK_CACHE_FORMAT.get(m[3] ?? "");
     if (format === void 0) continue;
     return {
-      filePath: path9.join(dir, file),
+      filePath: path11.join(dir, file),
       format,
       originalWidth: Number(m[1]),
       originalHeight: Number(m[2])
@@ -4105,7 +4149,7 @@ function writeCachedShrink(originalPath, result, mtimeMs, quality) {
     const key = shrinkCacheKey(originalPath, result.originalBytes, mtimeMs, quality);
     const ext = SHRINK_CACHE_EXTENSION.get(result.format);
     if (ext === void 0) return;
-    atomicWriteBytes(path9.join(dir, `token-goat-shrink-${key}-${result.originalWidth}x${result.originalHeight}${ext}`), result.data);
+    atomicWriteBytes(path11.join(dir, `token-goat-shrink-${key}-${result.originalWidth}x${result.originalHeight}${ext}`), result.data);
   } catch {
   }
 }
@@ -4121,7 +4165,7 @@ function pruneShrinkCache() {
     const cutoff = now - DEFAULT_MAX_AGE_MS;
     for (const file of fs11.readdirSync(dir)) {
       if (!file.startsWith("token-goat-shrink-")) continue;
-      const full = path9.join(dir, file);
+      const full = path11.join(dir, file);
       try {
         const st = fs11.statSync(full);
         if (st.mtimeMs < cutoff) fs11.unlinkSync(full);
@@ -4133,7 +4177,7 @@ function pruneShrinkCache() {
 }
 var HOST_MATERIALIZED_HARNESSES = /* @__PURE__ */ new Set(["copilot_cli", "pi", "opencode", "openclaw"]);
 async function finalizeShrinkResult(result, filePath, event) {
-  const basename11 = displaySafePath(path9.basename(filePath));
+  const basename11 = displaySafePath(path11.basename(filePath));
   const shrinkSaved = result.originalBytes - result.shrunkBytes;
   const tier = loadConfig().image_shrink.vision_tier;
   const shrinkTokens = visionTokensSaved(result.originalWidth, result.originalHeight, result.width, result.height, tier);
@@ -4151,7 +4195,7 @@ ${dataUrl2}`);
   }
   recordStat("image_shrink", shrinkSaved, shrinkTokens, void 0, basename11);
   if (loadConfig().image_shrink.ocr_enabled) {
-    const { ocrImage, isTextHeavy, formatOcrSummary } = await import("./token-goat-chunk-5WB7GDH4.mjs");
+    const { ocrImage, isTextHeavy, formatOcrSummary } = await import("./token-goat-chunk-62VJ47WN.mjs");
     const ocr = await ocrImage(result.data);
     if (ocr !== null && isTextHeavy(ocr, loadConfig().image_shrink.ocr_min_confidence)) {
       const emitted = formatOcrSummary(ocr, basename11, result.originalBytes);
@@ -4232,10 +4276,34 @@ async function preReadImageHandler(event) {
 }
 registerHook("pre_tool_use", preReadImageHandler, { toolName: "Read" });
 
+// src/embed_backfill.ts
+init_define_import_meta_env();
+var BACKFILL_META_KEY = "unembeddable_chunks_pruned_version";
+function ensureLedger(db) {
+  db.exec("CREATE TABLE IF NOT EXISTS index_migrations (key TEXT PRIMARY KEY, value TEXT NOT NULL)");
+}
+function selectUnembeddableChunkFiles(db, maxChunksPerFile) {
+  const rows = db.prepare("SELECT file_path AS filePath, COUNT(*) AS chunks FROM chunks GROUP BY file_path").all();
+  return rows.filter((r) => isNonTextAsset(r.filePath) || maxChunksPerFile > 0 && r.chunks > maxChunksPerFile);
+}
+function pruneUnembeddableChunks(db, maxChunksPerFile, deleteForFile) {
+  ensureLedger(db);
+  const row = db.prepare("SELECT value FROM index_migrations WHERE key = ?").get(BACKFILL_META_KEY);
+  if (row?.value === VERSION) return { files: 0, chunks: 0, ran: false };
+  const targets = selectUnembeddableChunkFiles(db, maxChunksPerFile);
+  let chunks = 0;
+  for (const target of targets) {
+    deleteForFile(db, target.filePath);
+    chunks += target.chunks;
+  }
+  db.prepare("INSERT INTO index_migrations (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value").run(BACKFILL_META_KEY, VERSION);
+  return { files: targets.length, chunks, ran: true };
+}
+
 // src/index_prune.ts
 init_define_import_meta_env();
 import * as fs12 from "node:fs";
-import * as path10 from "node:path";
+import * as path12 from "node:path";
 function removeFileFromIndex(db, filePath) {
   const tx = db.transaction(() => {
     deleteFileRows(db, filePath);
@@ -4367,7 +4435,7 @@ function pruneOrphanedChunks(dbPath = globalDbPath()) {
   return removed;
 }
 function recordKnownRoot(filePath, dbPath = globalDbPath()) {
-  const project = findProject(path10.dirname(filePath));
+  const project = findProject(path12.dirname(filePath));
   if (project === null || isTooShallowToPrune(project.root)) return;
   const db = getDb(dbPath);
   db.prepare(
@@ -4425,7 +4493,7 @@ function sweepKnownRoots(dbPath = globalDbPath(), opts) {
 }
 var KNOWN_ROOT_RECORD_MIN_INTERVAL_MS = 60 * 60 * 1e3;
 function knownRootRecordMarkerPath(dir, filePath) {
-  return path10.join(dir, `known-root-record-${shortFingerprint(path10.dirname(filePath))}.marker`);
+  return path12.join(dir, `known-root-record-${shortFingerprint(path12.dirname(filePath))}.marker`);
 }
 var KNOWN_ROOT_MARKER_PREFIX = "known-root-record-";
 function sweepExpiredKnownRootMarkers(dir = dataDir()) {
@@ -4434,7 +4502,7 @@ function sweepExpiredKnownRootMarkers(dir = dataDir()) {
     const cutoff = Date.now() - KNOWN_ROOT_RECORD_MIN_INTERVAL_MS;
     for (const file of fs12.readdirSync(dir)) {
       if (!file.startsWith(KNOWN_ROOT_MARKER_PREFIX) || !file.endsWith(".marker")) continue;
-      const full = path10.join(dir, file);
+      const full = path12.join(dir, file);
       try {
         if (fs12.statSync(full).mtimeMs < cutoff) {
           fs12.unlinkSync(full);
@@ -4461,14 +4529,47 @@ function recordKnownRootThrottled(filePath, dir = dataDir(), dbPath = globalDbPa
   }
   recordKnownRoot(filePath, dbPath);
 }
+function findTopIndexedProjects(dbPath = globalDbPath(), limit = 3) {
+  try {
+    const db = getDb(dbPath);
+    const hasRoots = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='known_roots'").get();
+    if (!hasRoots) return [];
+    const rawRoots = db.prepare("SELECT root FROM known_roots").all().map((r) => r.root);
+    const seen = /* @__PURE__ */ new Map();
+    for (const r of rawRoots) {
+      const norm = normalizePath(r).replace(/\/+$/, "");
+      const lower = foldPath(norm);
+      if (!seen.has(lower)) seen.set(lower, norm);
+    }
+    const results = [];
+    for (const root of seen.values()) {
+      const count = db.prepare("SELECT count(*) as c FROM files WHERE path LIKE ? || '/%' OR path = ?").get(root, root).c;
+      if (count > 0) results.push({ root, fileCount: count });
+    }
+    results.sort((a, b) => b.fileCount - a.fileCount);
+    const unique = [];
+    for (const res of results) {
+      const isDuplicate = unique.some((u) => {
+        const r1 = foldPath(u.root);
+        const r2 = foldPath(res.root);
+        return r1.startsWith(r2 + "/") || r2.startsWith(r1 + "/");
+      });
+      if (!isDuplicate) unique.push(res);
+      if (unique.length >= limit) break;
+    }
+    return unique.slice(0, limit);
+  } catch {
+    return [];
+  }
+}
 
 // src/process_priority.ts
 init_define_import_meta_env();
-import * as os4 from "node:os";
+import * as os5 from "node:os";
 var PRIORITY_BY_NAME = {
-  normal: os4.constants.priority.PRIORITY_NORMAL,
-  below_normal: os4.constants.priority.PRIORITY_BELOW_NORMAL,
-  low: os4.constants.priority.PRIORITY_LOW
+  normal: os5.constants.priority.PRIORITY_NORMAL,
+  below_normal: os5.constants.priority.PRIORITY_BELOW_NORMAL,
+  low: os5.constants.priority.PRIORITY_LOW
 };
 var DEFAULT_PRIORITY_NAME = "below_normal";
 function resolveWorkerPriority(name) {
@@ -4477,7 +4578,7 @@ function resolveWorkerPriority(name) {
 }
 function applyIndexingPriority() {
   try {
-    os4.setPriority(0, resolveWorkerPriority(loadConfig().worker.priority));
+    os5.setPriority(0, resolveWorkerPriority(loadConfig().worker.priority));
     return true;
   } catch {
     return false;
@@ -4488,13 +4589,13 @@ function applyIndexingPriority() {
 init_define_import_meta_env();
 import { spawn } from "node:child_process";
 import * as fs15 from "node:fs";
-import * as path13 from "node:path";
+import * as path15 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/index_reclaim.ts
 init_define_import_meta_env();
 import * as fs13 from "node:fs";
-import * as path11 from "node:path";
+import * as path13 from "node:path";
 var DERIVED_TABLES = ["chunk_vectors", "chunks", "refs", "symbols", "files"];
 function indexSizeBytes(dbPath) {
   let total = 0;
@@ -4578,7 +4679,7 @@ function mb(bytes) {
 }
 function cmdReclaimIndex(opts) {
   const dbPath = opts.dbPath ?? globalDbPath();
-  if (opts.force !== true && isWorkerRunning(path11.dirname(dbPath))) {
+  if (opts.force !== true && isWorkerRunning(path13.dirname(dbPath))) {
     throw new Error(
       "reclaim-index: the worker daemon is running and writing to this index. Stop it first with 'token-goat worker stop', then re-run. Pass --force to proceed anyway (results may be inaccurate if the worker is really live)."
     );
@@ -4612,7 +4713,7 @@ function cmdReclaimIndex(opts) {
   }
   if (result.checkpointBusy) {
     process.stdout.write(
-      `  note: a concurrent reader blocked WAL truncation, so some space is still held in ${path11.basename(dbPath)}-wal and the figures above count the main file only. The next checkpoint releases it
+      `  note: a concurrent reader blocked WAL truncation, so some space is still held in ${path13.basename(dbPath)}-wal and the figures above count the main file only. The next checkpoint releases it
 `
     );
   }
@@ -4621,7 +4722,7 @@ function cmdReclaimIndex(opts) {
 // src/snapshots.ts
 init_define_import_meta_env();
 import * as fs14 from "node:fs";
-import * as path12 from "node:path";
+import * as path14 from "node:path";
 var MAX_SNAPSHOTS_PER_SESSION = 150;
 var MAX_SNAPSHOT_BYTES = 256 * 1024;
 var SNAPSHOT_TRUNCATE_BYTES = 50 * 1024;
@@ -4631,10 +4732,10 @@ var VALID_KINDS = /* @__PURE__ */ new Set([KIND_READ, KIND_PREDICTIVE]);
 function sessionDir(sessionId) {
   if (!sessionId) return null;
   const safe = sanitizeIdForFilename(sessionId, 64, "anon");
-  const base = path12.join(tokenGoatHome(), "session_snapshots");
-  const candidate = path12.join(base, safe);
+  const base = path14.join(tokenGoatHome(), "session_snapshots");
+  const candidate = path14.join(base, safe);
   try {
-    const rel = path12.relative(base, candidate);
+    const rel = path14.relative(base, candidate);
     if (rel.startsWith("..")) return null;
   } catch {
     return null;
@@ -4647,7 +4748,7 @@ function pathKey(filePath) {
 function snapshot_path(sessionId, filePath) {
   const d = sessionDir(sessionId);
   if (!d) return null;
-  return path12.join(d, `${pathKey(filePath)}.bin`);
+  return path14.join(d, `${pathKey(filePath)}.bin`);
 }
 function kindSidecarPath(snapshotPath) {
   return snapshotPath + ".kind";
@@ -4655,7 +4756,7 @@ function kindSidecarPath(snapshotPath) {
 function writeSnapshotKind(sidecarPath, kind) {
   try {
     const safeKind = VALID_KINDS.has(kind) ? kind : KIND_READ;
-    const dir = path12.dirname(sidecarPath);
+    const dir = path14.dirname(sidecarPath);
     if (!fs14.existsSync(dir)) {
       ensureDirSync(dir);
     }
@@ -4670,7 +4771,7 @@ function evictOldest(d, maxCount) {
     const entries = [];
     const files = fs14.readdirSync(d);
     for (const file of files) {
-      const fullPath = path12.join(d, file);
+      const fullPath = path14.join(d, file);
       if (!file.endsWith(".bin")) continue;
       try {
         const stat2 = fs14.statSync(fullPath);
@@ -4731,7 +4832,7 @@ function store(sessionId, filePath, content, opts = {}) {
       } catch {
       }
     }
-    const dir = path12.dirname(p);
+    const dir = path14.dirname(p);
     if (!fs14.existsSync(dir)) {
       ensureDirSync(dir);
     }
@@ -4782,14 +4883,14 @@ function removeEligibleSnapshotFile(fullPath, file, cutoff) {
   return file.endsWith(".bin");
 }
 function cleanup_stale(maxAgeHours = 24) {
-  const base = path12.join(tokenGoatHome(), "session_snapshots");
+  const base = path14.join(tokenGoatHome(), "session_snapshots");
   if (!fs14.existsSync(base)) return 0;
   const cutoff = Date.now() - maxAgeHours * 3600 * 1e3;
   let removed = 0;
   try {
     const sessionDirs = fs14.readdirSync(base);
     for (const sessionDir2 of sessionDirs) {
-      const sessionPath2 = path12.join(base, sessionDir2);
+      const sessionPath2 = path14.join(base, sessionDir2);
       try {
         const stat2 = fs14.statSync(sessionPath2);
         if (!stat2.isDirectory()) continue;
@@ -4799,7 +4900,7 @@ function cleanup_stale(maxAgeHours = 24) {
       try {
         const files = fs14.readdirSync(sessionPath2);
         for (const file of files) {
-          const fullPath = path12.join(sessionPath2, file);
+          const fullPath = path14.join(sessionPath2, file);
           try {
             if (removeEligibleSnapshotFile(fullPath, file, cutoff)) removed++;
           } catch {
@@ -4848,15 +4949,15 @@ function drainingSnapshotStamp(file, content) {
 var DRAINING_READ_ATTEMPTS = 5;
 var DRAINING_READ_RETRY_DELAY_MS = 50;
 function listDrainingFiles(queuePath) {
-  const dir = path13.dirname(queuePath);
-  const base = `${path13.basename(queuePath)}.draining`;
+  const dir = path15.dirname(queuePath);
+  const base = `${path15.basename(queuePath)}.draining`;
   let entries;
   try {
     entries = fs15.readdirSync(dir);
   } catch {
     return [];
   }
-  return entries.filter((name) => name === base || name.startsWith(`${base}.alt-`) && !name.includes(".corrupt-")).sort().map((name) => path13.join(dir, name));
+  return entries.filter((name) => name === base || name.startsWith(`${base}.alt-`) && !name.includes(".corrupt-")).sort().map((name) => path15.join(dir, name));
 }
 var MAX_TRANSIENT_RETRIES = 5;
 function bumpRetryCount(dbPath, absPath) {
@@ -4884,16 +4985,16 @@ function clearRetryCount(dbPath, absPath) {
   }
 }
 function dirtyQueuePathFor(dir) {
-  return path13.join(dir, "queue", "dirty.txt");
+  return path15.join(dir, "queue", "dirty.txt");
 }
 function drainHeartbeatPathFor(dir) {
-  return path13.join(dir, "queue", "drain-heartbeat");
+  return path15.join(dir, "queue", "drain-heartbeat");
 }
 function writeDrainHeartbeat(dir, force = false) {
   const now = Date.now();
   if (!force && now - (heartbeatWriteTimes.get(dir) ?? 0) < WORKER_HEARTBEAT_REFRESH_MS) return;
   try {
-    ensureDirSync(path13.dirname(drainHeartbeatPathFor(dir)));
+    ensureDirSync(path15.dirname(drainHeartbeatPathFor(dir)));
     fs15.writeFileSync(drainHeartbeatPathFor(dir), `${process.pid}
 `);
     heartbeatWriteTimes.set(dir, now);
@@ -4945,10 +5046,10 @@ function parseDirtyQueueLines(raw) {
   return out;
 }
 function workerPidPath(dir = dataDir()) {
-  return path13.join(dir, "worker.pid");
+  return path15.join(dir, "worker.pid");
 }
 function workerStampPath(dir = dataDir()) {
-  return path13.join(dir, "worker.stamp");
+  return path15.join(dir, "worker.stamp");
 }
 function getDirtyPathsFor(dir) {
   let raw;
@@ -4960,7 +5061,7 @@ function getDirtyPathsFor(dir) {
   return parseDirtyQueueLines(raw);
 }
 function workerErrorLogPath(dir) {
-  return path13.join(dir, "worker-errors.log");
+  return path15.join(dir, "worker-errors.log");
 }
 var WORKER_ERROR_LOG_MAX_BYTES = 5 * 1024 * 1024;
 var CORRUPT_QUARANTINE_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1e3;
@@ -4978,11 +5079,11 @@ function cleanupWorkerStateFiles(dir) {
   } catch {
   }
   try {
-    const queueDir = path13.dirname(dirtyQueuePathFor(dir));
+    const queueDir = path15.dirname(dirtyQueuePathFor(dir));
     const cutoff = Date.now() - CORRUPT_QUARANTINE_MAX_AGE_MS;
     for (const file of fs15.readdirSync(queueDir)) {
       if (!file.includes(".corrupt-")) continue;
-      const full = path13.join(queueDir, file);
+      const full = path15.join(queueDir, file);
       try {
         if (fs15.statSync(full).mtimeMs < cutoff) fs15.unlinkSync(full);
       } catch {
@@ -5018,7 +5119,7 @@ registerReset(() => {
 function embedFileSerialized(absPath, dbPath, sha) {
   const key = foldPath(absPath);
   const prior = inFlightEmbeddings.get(key);
-  const dir = path13.dirname(dbPath);
+  const dir = path15.dirname(dbPath);
   const onEmbedError = (err) => {
     const message = extractErrorMessage(err);
     appendWorkerErrorLog(dir, `${(/* @__PURE__ */ new Date()).toISOString()} indexFileEmbeddings failed for ${absPath}: ${message}
@@ -5072,7 +5173,7 @@ function logTransientReadFailure(dir, absPath) {
   );
 }
 function bumpAndCheckRetry(dir, absPath) {
-  const dbPath = path13.join(dir, "global.db");
+  const dbPath = path15.join(dir, "global.db");
   const attempts = bumpRetryCount(dbPath, absPath);
   if (attempts > MAX_TRANSIENT_RETRIES) {
     if (attempts === MAX_TRANSIENT_RETRIES + 1) {
@@ -5089,7 +5190,7 @@ function bumpAndCheckRetry(dir, absPath) {
 function appendToDirtyQueue(dir, absPath) {
   const queuePath = dirtyQueuePathFor(dir);
   try {
-    ensureDirSync(path13.dirname(queuePath));
+    ensureDirSync(path15.dirname(queuePath));
     let leadingNewline = "";
     try {
       const existing = fs15.readFileSync(queuePath, "utf8");
@@ -5105,7 +5206,7 @@ function requeueDirtyPath(dir, absPath) {
   if (bumpAndCheckRetry(dir, absPath)) appendToDirtyQueue(dir, absPath);
 }
 function makeIndexer(dbPath) {
-  const dir = path13.dirname(dbPath);
+  const dir = path15.dirname(dbPath);
   return (absPath, sha) => {
     try {
       const ixCfgForSkip = loadConfig().indexing;
@@ -5115,22 +5216,29 @@ function makeIndexer(dbPath) {
       }
       const embeddingsEnabled = loadConfig().indexing?.embeddings_enabled ?? true;
       const depsAvailable = embeddingsEnabled && embeddingsDepsAvailable(getDb(dbPath));
-      if (depsAvailable) ensureEmbeddingProvenance(getDb(dbPath));
+      if (depsAvailable) {
+        ensureEmbeddingProvenance(getDb(dbPath));
+        pruneUnembeddableChunks(getDb(dbPath), loadConfig().indexing?.max_chunks_per_file ?? 0, deleteFileEmbeddings);
+      }
       const entry = getFileEntry(absPath, dbPath);
-      const parseUnchanged = entry?.sha === sha && entry.parserSha === PARSER_FINGERPRINT && !indexedPathSpellingIsStale(entry.filePath, absPath);
+      const spellingStale = entry !== null && indexedPathSpellingIsStale(entry.filePath, absPath);
+      const parseUnchanged = entry?.sha === sha && entry.parserSha === parserFingerprintForLanguage(entry.language) && !spellingStale;
       if (!parseUnchanged) {
         indexFileSync(absPath, dbPath);
       }
-      const embedUnchanged = parseUnchanged && isEmbedFresh(
-        entry?.embedSha,
+      const embedEntry = parseUnchanged ? entry : getFileEntry(absPath, dbPath);
+      const embedUnchanged = !spellingStale && isEmbedFresh(
+        embedEntry?.embedSha,
         sha,
         embeddingsEnabled,
         depsAvailable,
         // Same partial-config defensiveness as embeddingsEnabled above: 0 matches no stamped oversize marker (config floors this key at 1), so a mocked config re-examines the file rather than assuming it current. See isEmbedFresh.
-        loadConfig().indexing?.large_file_symbol_only_kb ?? 0
+        loadConfig().indexing?.large_file_symbol_only_kb ?? 0,
+        // Same reasoning and same 0 fallback for the chunk-count marker.
+        loadConfig().indexing?.max_chunks_per_file ?? 0
       );
       if (embedUnchanged) {
-        return false;
+        return parseUnchanged ? false : void 0;
       }
       return embedFileSerialized(absPath, dbPath, sha);
     } catch (err) {
@@ -5155,7 +5263,7 @@ function processDirtyBatch(paths, index = makeIndexer(globalDbPath()), remove =
     if (fileIsAbsent(p)) {
       try {
         remove(p);
-        clearRetryCount(path13.join(dir, "global.db"), p);
+        clearRetryCount(path15.join(dir, "global.db"), p);
       } catch (err) {
         appendWorkerErrorLog(dir, `${(/* @__PURE__ */ new Date()).toISOString()} removeFileFromIndex failed for ${p}: ${extractErrorMessage(err)}
 `);
@@ -5170,7 +5278,7 @@ function processDirtyBatch(paths, index = makeIndexer(globalDbPath()), remove =
       continue;
     }
     try {
-      const dirname16 = path13.dirname(p);
+      const dirname16 = path15.dirname(p);
       let root;
       if (projectRootCache.has(dirname16)) {
         root = projectRootCache.get(dirname16) ?? null;
@@ -5187,7 +5295,7 @@ function processDirtyBatch(paths, index = makeIndexer(globalDbPath()), remove =
       requeue(dir, p);
       continue;
     }
-    clearRetryCount(path13.join(dir, "global.db"), p);
+    clearRetryCount(path15.join(dir, "global.db"), p);
     if (result !== false) indexed += 1;
   }
   return indexed;
@@ -5201,7 +5309,7 @@ function sleepSyncMs(ms) {
 function drainOnce(dir, index, remove) {
   const queuePath = dirtyQueuePathFor(dir);
   const draining = `${queuePath}.draining`;
-  const dbPath = path13.join(dir, "global.db");
+  const dbPath = path15.join(dir, "global.db");
   const indexFn = index ?? makeIndexer(dbPath);
   const removeFn = remove ?? makeRemover(dbPath);
   let processed = 0;
@@ -5327,7 +5435,7 @@ function isWorkerRunning(dir = dataDir()) {
   return pidAlive(pid) && hasFreshWorkerHeartbeat(dir, pid);
 }
 function workerHealthCheckMarkerPath(dir) {
-  return path13.join(dir, "worker-healthcheck.marker");
+  return path15.join(dir, "worker-healthcheck.marker");
 }
 var WORKER_HEALTHCHECK_MIN_INTERVAL_MS = 5 * 60 * 1e3;
 function ensureWorkerAlive(dir = dataDir()) {
@@ -5423,7 +5531,7 @@ function claimWorkerPidFile(dir, pid) {
 }
 function daemonEntryScript() {
   const self = fileURLToPath2(import.meta.url);
-  const launcher = path13.join(path13.dirname(self), "token-goat.mjs");
+  const launcher = path15.join(path15.dirname(self), "token-goat.mjs");
   try {
     if (fs15.existsSync(launcher)) return launcher;
   } catch {
@@ -5541,7 +5649,7 @@ async function runWorkerLoop(dir, pollIntervalMs, shouldStop = () => false) {
     }
     if (Date.now() - lastKnownRootsSweepMs >= KNOWN_ROOTS_SWEEP_INTERVAL_MS) {
       try {
-        const result = sweepKnownRoots(path13.join(dir, "global.db"));
+        const result = sweepKnownRoots(path15.join(dir, "global.db"));
         if (result.flaggedRoots.length > 0) {
           appendWorkerErrorLog(
             dir,
@@ -5556,7 +5664,7 @@ async function runWorkerLoop(dir, pollIntervalMs, shouldStop = () => false) {
     const now = Date.now();
     if (now - lastIdleVacuumMs >= IDLE_VACUUM_INTERVAL_MS && now - lastActiveMs >= IDLE_VACUUM_COOLDOWN_MS) {
       try {
-        const dbPath = path13.join(dir, "global.db");
+        const dbPath = path15.join(dir, "global.db");
         if (fs15.existsSync(dbPath)) {
           const res = reclaimIndex(dbPath, { rebuild: false });
           if (!res.vacuumDeferred) {
@@ -5602,30 +5710,59 @@ function runDetachedWorkerDaemon() {
 // src/hooks_index.ts
 init_define_import_meta_env();
 import * as fs16 from "node:fs";
-import * as path14 from "node:path";
+import * as path16 from "node:path";
 function dirtyQueuePath() {
-  return path14.join(dataDir(), "queue", "dirty.txt");
+  return path16.join(dataDir(), "queue", "dirty.txt");
 }
-function appendDirtyPath(normalizedPath) {
+function dirtyQueueLeadingNewline(queuePath) {
+  let fd;
+  try {
+    const size = fs16.statSync(queuePath).size;
+    if (size === 0) return "";
+    fd = fs16.openSync(queuePath, "r");
+    const tail = Buffer.allocUnsafe(1);
+    fs16.readSync(fd, tail, 0, 1, size - 1);
+    return tail[0] === 10 ? "" : "\n";
+  } catch {
+    return "";
+  } finally {
+    if (fd !== void 0) {
+      try {
+        fs16.closeSync(fd);
+      } catch {
+      }
+    }
+  }
+}
+function appendDirtyPaths(normalizedPaths) {
+  if (normalizedPaths.length === 0) return;
   const queuePath = dirtyQueuePath();
-  const dir = path14.dirname(queuePath);
+  const dir = path16.dirname(queuePath);
   try {
     ensureDirSync(dir);
   } catch (e) {
     if (e.code !== "EEXIST" || !fs16.existsSync(dir)) throw e;
   }
-  let leadingNewline = "";
-  try {
-    const existing = fs16.readFileSync(queuePath, "utf8");
-    if (existing.length > 0 && !existing.endsWith("\n")) leadingNewline = "\n";
-  } catch {
-  }
-  fs16.appendFileSync(queuePath, `${leadingNewline}${encodeDirtyQueueLine(normalizedPath)}
-`);
+  const body = normalizedPaths.map((p) => `${encodeDirtyQueueLine(p)}
+`).join("");
+  fs16.appendFileSync(queuePath, `${dirtyQueueLeadingNewline(queuePath)}${body}`);
+}
+function appendDirtyPath(normalizedPath) {
+  appendDirtyPaths([normalizedPath]);
 }
 function enqueueDirtyPathSafe(filePath, opts) {
+  enqueueDirtyPathsSafe([filePath], opts);
+}
+function enqueueDirtyPathsSafe(filePaths, opts) {
   try {
-    appendDirtyPath(opts?.alreadyResolved === true ? filePath : resolveIndexPath(filePath));
+    const resolved = [];
+    for (const filePath of filePaths) {
+      const r = opts?.alreadyResolved === true ? filePath : resolveIndexPath(filePath);
+      if (isUnderSystemTemp(r)) continue;
+      resolved.push(r);
+    }
+    if (resolved.length === 0) return;
+    appendDirtyPaths(resolved);
   } catch {
     return;
   }
@@ -5647,9 +5784,9 @@ function getDirtyPaths() {
 function preCompactIndexHandler(_event) {
   const paths = getDirtyPaths();
   if (paths.length > 0) {
-    const sidecar = path14.join(dataDir(), "queue", "pending.txt");
+    const sidecar = path16.join(dataDir(), "queue", "pending.txt");
     try {
-      ensureDirSync(path14.dirname(sidecar));
+      ensureDirSync(path16.dirname(sidecar));
       atomicWriteBytes(sidecar, Buffer.from(`${paths.join("\n")}
 `, "utf8"));
     } catch {
@@ -5662,7 +5799,7 @@ registerHook("pre_compact", preCompactIndexHandler, { advisory: true });
 // src/hooks_read.ts
 init_define_import_meta_env();
 import * as fs23 from "node:fs";
-import * as path19 from "node:path";
+import * as path21 from "node:path";
 
 // src/hint_stats.ts
 init_define_import_meta_env();
@@ -5688,6 +5825,13 @@ var KNOWN_CORRELATOR_PLACEHOLDERS = /* @__PURE__ */ new Set([
   "table_name",
   "name"
 ]);
+function joinCorrelators(correlators) {
+  const kept = correlators.filter((c) => c !== "" && !c.includes("\n"));
+  return kept.length === 0 ? null : [...new Set(kept)].join("\n");
+}
+function splitCorrelators(correlator) {
+  return correlator.split("\n").filter((c) => c !== "");
+}
 function extractPathCorrelator(text) {
   const m = /(?:[A-Za-z]:[\\/]|\.{1,2}\/|\/)[^\s"'`]+/.exec(text);
   if (m === null) return null;
@@ -5748,12 +5892,15 @@ function resetSuppressionStreak(category) {
 }
 function applyHintTracking(event, output, classify) {
   if (output.hookType !== "context") return output;
-  const { category, correlator } = classify(output.context);
+  const classified = classify(output.context);
+  const { category } = classified;
+  const correlator = output.correlators === void 0 ? classified.correlator : joinCorrelators(output.correlators);
   const compensateSelfResolve = event.eventName === "pre_tool_use";
   if (shouldSuppress(category, event.sessionId)) {
     const occasion = bumpSuppressionStreak(category);
     const thresholds = loadConfig().hints.backoff_thresholds;
     if (!isProbeOccasion(occasion, thresholds)) {
+      logSuppressedDetection(category, event.sessionId, correlator);
       return passOutput();
     }
     logHintEmission(category, event.sessionId, correlator, compensateSelfResolve, output.context.length);
@@ -5763,15 +5910,23 @@ function applyHintTracking(event, output, classify) {
   logHintEmission(category, event.sessionId, correlator, compensateSelfResolve, output.context.length);
   return output;
 }
+function logSuppressedDetection(category, sessionId, correlator) {
+  try {
+    getDb(globalDbPath()).prepare(
+      `INSERT INTO hint_emissions (category, session_id, harness, correlator, emitted_at, resolved, acted_on, calls_remaining, bytes_emitted, observable, displayed)
+         VALUES (@category, @sessionId, @harness, @correlator, @emittedAt, 1, 0, 0, 0, 0, 0)`
+    ).run({ category, sessionId, harness: getHarnessName(), correlator, emittedAt: Date.now() });
+  } catch {
+  }
+}
 function logHintEmission(category, sessionId, correlator, compensateSelfResolve = false, bytesEmitted = null) {
   try {
     const db = getDb(globalDbPath());
     const resolved = correlator === null ? 1 : 0;
-    const actedOn = resolved === 1 && isSuppressionCategory(category) ? 1 : 0;
     const window = ACTED_ON_WINDOW + (compensateSelfResolve ? 1 : 0);
     db.prepare(
-      `INSERT INTO hint_emissions (category, session_id, harness, correlator, emitted_at, resolved, acted_on, calls_remaining, bytes_emitted)
-       VALUES (@category, @sessionId, @harness, @correlator, @emittedAt, @resolved, @actedOn, @callsRemaining, @bytesEmitted)`
+      `INSERT INTO hint_emissions (category, session_id, harness, correlator, emitted_at, resolved, acted_on, calls_remaining, bytes_emitted, observable)
+       VALUES (@category, @sessionId, @harness, @correlator, @emittedAt, @resolved, 0, @callsRemaining, @bytesEmitted, @observable)`
     ).run({
       category,
       sessionId,
@@ -5779,9 +5934,9 @@ function logHintEmission(category, sessionId, correlator, compensateSelfResolve
       correlator,
       emittedAt: Date.now(),
       resolved,
-      actedOn,
       callsRemaining: correlator === null ? 0 : window,
-      bytesEmitted
+      bytesEmitted,
+      observable: correlator === null ? 0 : 1
     });
   } catch {
   }
@@ -5801,7 +5956,8 @@ function commandMentionsCorrelator(command, correlator) {
 }
 var SUPPRESSION_HINT_CATEGORIES = /* @__PURE__ */ new Set([
   "read_reread_dedup",
-  "edit_reread_suggest"
+  "edit_reread_suggest",
+  "read_structural_nav"
 ]);
 function isSuppressionCategory(category) {
   return SUPPRESSION_HINT_CATEGORIES.has(category);
@@ -5821,14 +5977,13 @@ function eventTargetText(event) {
 function isDefiance(correlator, target) {
   if (target === "") return false;
   if (TOKEN_GOAT_INVOCATION_RE.test(target)) return false;
-  return commandMentionsCorrelator(target, correlator);
+  return splitCorrelators(correlator).some((c) => commandMentionsCorrelator(target, c));
 }
 function isActedOn(category, correlator, command) {
   if (!TOKEN_GOAT_INVOCATION_RE.test(command)) return false;
-  if (category === "bash_recall") {
-    return command.includes("bash-output") && commandMentionsCorrelator(command, correlator);
-  }
-  return commandMentionsCorrelator(command, correlator);
+  const anyMatch = splitCorrelators(correlator).some((c) => commandMentionsCorrelator(command, c));
+  if (category === "bash_recall") return command.includes("bash-output") && anyMatch;
+  return anyMatch;
 }
 function resolvePendingHintsForEvent(event) {
   try {
@@ -5838,8 +5993,7 @@ function resolvePendingHintsForEvent(event) {
     const pending = db.prepare(`SELECT id, category, correlator, calls_remaining FROM hint_emissions WHERE session_id = ? AND resolved = 0`).all(event.sessionId);
     for (const row of pending) {
       if (!isHintCategory(row.category) || row.correlator === null) {
-        const unobservable = isHintCategory(row.category) && isSuppressionCategory(row.category) ? 1 : 0;
-        db.prepare(`UPDATE hint_emissions SET acted_on = ?, resolved = 1 WHERE id = ?`).run(unobservable, row.id);
+        db.prepare(`UPDATE hint_emissions SET acted_on = 0, resolved = 1, observable = 0 WHERE id = ?`).run(row.id);
         continue;
       }
       if (isSuppressionCategory(row.category)) {
@@ -5884,11 +6038,26 @@ registerHook(
 function categoryStats(category) {
   const db = getDb(globalDbPath());
   const row = db.prepare(
-    `SELECT COUNT(*) AS emitted, SUM(acted_on) AS actedOn, SUM(bytes_emitted) AS bytesEmitted,
+    // Three populations, deliberately not pooled. `emitted` is what was shown AND could be
+    // scored, so it is the only honest denominator for efficacy: including a row nothing could
+    // ever have satisfied would divide a real numerator by partly-imaginary rows. `unobservable`
+    // was shown but carried no pointer -- it spent bytes and earned no verdict. `detected` was
+    // never shown at all (suppressed, or declined by a net-benefit gate) and spent nothing.
+    // bytesEmitted and legacyEmissions span every row, which is correct in each case: the
+    // unobservable rows really did cost the agent, and the never-displayed ones are zero-byte,
+    // so neither distorts the spend figure.
+    // COALESCE on the counts that stay `number`: SUM over no rows is NULL where the COUNT(*)
+    // this replaced was 0, and an aggregate query always returns its row, so the `?? default`
+    // below would not have caught it.
+    `SELECT COALESCE(SUM(CASE WHEN displayed = 1 AND observable = 1 THEN 1 ELSE 0 END), 0) AS emitted,
+              SUM(CASE WHEN displayed = 1 AND observable = 1 THEN acted_on ELSE 0 END) AS actedOn,
+              COALESCE(SUM(CASE WHEN displayed = 1 AND observable = 0 THEN 1 ELSE 0 END), 0) AS unobservable,
+              COALESCE(SUM(CASE WHEN displayed = 0 THEN 1 ELSE 0 END), 0) AS detected,
+              SUM(bytes_emitted) AS bytesEmitted,
               SUM(CASE WHEN bytes_emitted IS NULL THEN 1 ELSE 0 END) AS legacyEmissions
        FROM hint_emissions WHERE category = ? AND harness = ?`
   ).get(category, getHarnessName());
-  return row ?? { emitted: 0, actedOn: 0, bytesEmitted: null, legacyEmissions: 0 };
+  return row ?? { emitted: 0, actedOn: 0, unobservable: 0, detected: 0, bytesEmitted: null, legacyEmissions: 0 };
 }
 function shouldSuppress(category, _sessionId2) {
   try {
@@ -5896,6 +6065,7 @@ function shouldSuppress(category, _sessionId2) {
     const { emitted, actedOn } = categoryStats(category);
     if (emitted < cfg.min_sample_size) return false;
     const pct = 100 * (actedOn ?? 0) / emitted;
+    if (isSuppressionCategory(category)) return 100 - pct > cfg.defiance_threshold_pct;
     return pct < cfg.suppress_threshold_pct;
   } catch {
     return false;
@@ -5916,7 +6086,7 @@ function manualMarks(category) {
 function getHintStatsSummary() {
   const probeThresholds = loadConfig().hints.backoff_thresholds.filter((t) => t > 0);
   return HINT_CATEGORIES.map((category) => {
-    const { emitted, actedOn, bytesEmitted, legacyEmissions } = categoryStats(category);
+    const { emitted, actedOn, unobservable, detected, bytesEmitted, legacyEmissions } = categoryStats(category);
     const marks = manualMarks(category);
     const suppressed = shouldSuppress(category, "");
     return {
@@ -5924,6 +6094,8 @@ function getHintStatsSummary() {
       emitted,
       actedOn: actedOn ?? 0,
       efficacyPct: emitted === 0 ? null : Math.round(1e3 * (actedOn ?? 0) / emitted) / 10,
+      unobservable,
+      detected,
       suppressed,
       suppressionPermanent: suppressed && probeThresholds.length === 0,
       manualEffective: marks.effective,
@@ -6062,7 +6234,7 @@ function planServedElisions(rows, bodies) {
 // src/compact.ts
 init_define_import_meta_env();
 import * as fs18 from "node:fs";
-import * as path15 from "node:path";
+import * as path17 from "node:path";
 
 // src/resident_context.ts
 init_define_import_meta_env();
@@ -6155,9 +6327,9 @@ function collectInvokedSkills(acc, record) {
 function skillName(skill) {
   const name = skill["name"];
   if (typeof name === "string" && name.trim() !== "") return name.trim();
-  const path24 = skill["path"];
-  if (typeof path24 !== "string") return null;
-  const segments = path24.split(/[\\/]/).filter((part) => part !== "");
+  const path26 = skill["path"];
+  if (typeof path26 !== "string") return null;
+  const segments = path26.split(/[\\/]/).filter((part) => part !== "");
   const last = segments[segments.length - 1];
   return last === void 0 || last === "" ? null : last;
 }
@@ -6499,7 +6671,7 @@ function inferSessionGoal(cache, maxTokens = 80) {
     const dirCounts = new Counter();
     for (const fpath of editedPaths) {
       try {
-        let parent = path15.dirname(fpath);
+        let parent = path17.dirname(fpath);
         if (parent === ".") {
           parent = "root";
         } else if (parent.startsWith("./")) {
@@ -6577,11 +6749,11 @@ function isNoisePath(inputPath) {
 }
 function findLatestSessionId() {
   try {
-    const sessionsDir = path15.join(tokenGoatHome(), "sessions");
-    if (!fs18.existsSync(sessionsDir)) {
+    const sessionsDir2 = path17.join(tokenGoatHome(), "sessions");
+    if (!fs18.existsSync(sessionsDir2)) {
       return null;
     }
-    const files = fs18.readdirSync(sessionsDir);
+    const files = fs18.readdirSync(sessionsDir2);
     const jsonFiles = files.filter((f) => f.endsWith(".json") && !f.includes(AGENT_SALT_MARKER));
     if (jsonFiles.length === 0) {
       return null;
@@ -6591,9 +6763,9 @@ function findLatestSessionId() {
       return null;
     }
     let latestFile = firstFile;
-    let latestMtime = fs18.statSync(path15.join(sessionsDir, firstFile)).mtimeMs;
+    let latestMtime = fs18.statSync(path17.join(sessionsDir2, firstFile)).mtimeMs;
     for (const file of jsonFiles) {
-      const mtime = fs18.statSync(path15.join(sessionsDir, file)).mtimeMs;
+      const mtime = fs18.statSync(path17.join(sessionsDir2, file)).mtimeMs;
       if (mtime > latestMtime) {
         latestFile = file;
         latestMtime = mtime;
@@ -6615,28 +6787,28 @@ function eventCount(cache) {
 function writeSessionManifest(projectHash, sessionId, manifestJson) {
   const safeSessionId = sessionFileStem(sessionId);
   if (!safeSessionId) return;
-  const sessionsDir = path15.join(dataDir(), "projects", projectHash, "sessions");
-  if (!fs18.existsSync(sessionsDir)) {
-    ensureDirSync(sessionsDir);
+  const sessionsDir2 = path17.join(dataDir(), "projects", projectHash, "sessions");
+  if (!fs18.existsSync(sessionsDir2)) {
+    ensureDirSync(sessionsDir2);
   }
-  const dest = path15.join(sessionsDir, `${safeSessionId}.json`);
+  const dest = path17.join(sessionsDir2, `${safeSessionId}.json`);
   atomicWriteText(dest, JSON.stringify(manifestJson));
 }
 function readAllSessionManifests(projectHash, maxAgeSecs = 3600) {
-  const sessionsDir = path15.join(dataDir(), "projects", projectHash, "sessions");
-  if (!fs18.existsSync(sessionsDir)) {
+  const sessionsDir2 = path17.join(dataDir(), "projects", projectHash, "sessions");
+  if (!fs18.existsSync(sessionsDir2)) {
     return [];
   }
   const now = Date.now() / 1e3;
   const results = [];
   try {
-    const files = fs18.readdirSync(sessionsDir);
+    const files = fs18.readdirSync(sessionsDir2);
     for (const file of files) {
       if (!file.endsWith(".json")) {
         continue;
       }
       try {
-        const fullPath = path15.join(sessionsDir, file);
+        const fullPath = path17.join(sessionsDir2, file);
         const stat2 = fs18.statSync(fullPath);
         if (now - stat2.mtimeMs / 1e3 > maxAgeSecs) {
           try {
@@ -6829,6 +7001,7 @@ import * as fs19 from "node:fs";
 
 // src/hints/file_type_handler.ts
 init_define_import_meta_env();
+var LARGE_SYMBOL_LINE_THRESHOLD = 200;
 var FILE_TYPE_THRESHOLDS = {
   pdf: 0,
   // always intercept (any size)
@@ -7521,17 +7694,17 @@ function buildPackageManifestHint(options) {
     return null;
   }
 }
-function _sanitizeHintPath(path24) {
-  if (typeof path24 !== "string") {
+function _sanitizeHintPath(path26) {
+  if (typeof path26 !== "string") {
     return "???";
   }
-  return path24.replace(/[\x00]/g, "").slice(0, 200);
+  return path26.replace(/[\x00]/g, "").slice(0, 200);
 }
 
 // src/doc_compact.ts
 init_define_import_meta_env();
 import * as fs20 from "fs";
-import * as path16 from "path";
+import * as path18 from "path";
 var defaultSentencesPerSection = 2;
 var headerPrefix = "<!-- token-goat doc-compact source-hash:";
 var headerRegex = /^<!-- token-goat doc-compact source-hash:(\S+) source:(.+?) -->\r?$/;
@@ -7545,14 +7718,14 @@ function sourceHash(filePath) {
 }
 function _compactSlug(absPathStr) {
   const h = fingerprintContent(foldPath(absPathStr)).slice(0, 12);
-  const ext = path16.extname(absPathStr);
-  const stem = path16.basename(absPathStr, ext);
+  const ext = path18.extname(absPathStr);
+  const stem = path18.basename(absPathStr, ext);
   const safeStem = sanitizeIdForFilename(stem, 32);
   return `${h}_${safeStem}`;
 }
 function compactPathFor(sourcePath) {
   const abs = resolveIndexPath(sourcePath);
-  return path16.join(dataDir(), compactSubdir, `${_compactSlug(abs)}.md`);
+  return path18.join(dataDir(), compactSubdir, `${_compactSlug(abs)}.md`);
 }
 function readCompactHeader(compactPath) {
   try {
@@ -7601,13 +7774,13 @@ function readCompactBody(compactPath) {
   }
 }
 function writeCompact(compactPath, sourcePath, compactBody, sourceRel) {
-  const srcPath = path16.resolve(sourcePath);
+  const srcPath = path18.resolve(sourcePath);
   const sha = sourceHash(srcPath);
-  const displayRel = sourceRel || path16.basename(srcPath);
+  const displayRel = sourceRel || path18.basename(srcPath);
   const header = `${headerPrefix}${sha} source:${displayRel} -->
 `;
   const fullText = header + compactBody.trimStart();
-  const dir = path16.dirname(compactPath);
+  const dir = path18.dirname(compactPath);
   if (!fs20.existsSync(dir)) {
     ensureDirSync(dir);
   }
@@ -7744,12 +7917,12 @@ function compactDoc(filePath, heading) {
 init_define_import_meta_env();
 import crypto2 from "node:crypto";
 import fs21 from "node:fs";
-import path17 from "node:path";
+import path19 from "node:path";
 var MAX_ENTRIES = 500;
 var MAX_TEXT_BYTES = 128 * 1024;
 var CACHE_FILE = "workspace-evidence.json";
 function cachePath() {
-  return path17.join(dataDir(), CACHE_FILE);
+  return path19.join(dataDir(), CACHE_FILE);
 }
 function hash(text) {
   return crypto2.createHash("sha256").update(text).digest("hex");
@@ -7872,7 +8045,7 @@ ${changed.map((entry) => `- ${displaySafePath(entry.source)} (use a fresh surgic
 // src/notebook_compact.ts
 init_define_import_meta_env();
 import * as fs22 from "node:fs";
-import * as path18 from "node:path";
+import * as path20 from "node:path";
 var NB_STRIP_MIN_SAVINGS = 4096;
 function stripNotebook(nbDict) {
   const cells = [];
@@ -7892,14 +8065,14 @@ function stripNotebook(nbDict) {
 var SIDECAR_DEFAULT_MAX_COUNT = 200;
 var SIDECAR_DEFAULT_MAX_AGE_MS = 24 * 3600 * 1e3;
 function pruneSidecars(cacheRoot, maxCount = SIDECAR_DEFAULT_MAX_COUNT, maxAgeMs = SIDECAR_DEFAULT_MAX_AGE_MS) {
-  const nbStripDir = path18.join(cacheRoot, "nb_strip");
+  const nbStripDir = path20.join(cacheRoot, "nb_strip");
   let removed = 0;
   try {
     if (!fs22.existsSync(nbStripDir)) return 0;
     const cutoff = Date.now() - maxAgeMs;
     const kept = [];
     for (const entry of fs22.readdirSync(nbStripDir)) {
-      const dir = path18.join(nbStripDir, entry);
+      const dir = path20.join(nbStripDir, entry);
       let mtime;
       try {
         mtime = fs22.statSync(dir).mtimeMs;
@@ -7935,8 +8108,8 @@ function pruneSidecars(cacheRoot, maxCount = SIDECAR_DEFAULT_MAX_COUNT, maxAgeMs
 }
 function getOrCreateSidecar(rawBytes, cacheRoot, opts = {}) {
   const sha = fingerprintContent(rawBytes);
-  const sidecarDir = path18.join(cacheRoot, "nb_strip", sha);
-  const sidecarPath = path18.join(sidecarDir, "stripped.ipynb");
+  const sidecarDir = path20.join(cacheRoot, "nb_strip", sha);
+  const sidecarPath = path20.join(sidecarDir, "stripped.ipynb");
   if (fs22.existsSync(sidecarPath)) {
     return [sidecarPath, false];
   }
@@ -8042,10 +8215,10 @@ var COMMENT_SYNTAX = new Map([
   ...["py", "rb", "sh", "bash", "zsh", "pl", "r"].map((ext) => [ext, HASH]),
   ...["sql", "lua", "hs"].map((ext) => [ext, DOUBLE_DASH])
 ]);
-function commentSyntaxFor(path24) {
-  const dot = path24.lastIndexOf(".");
+function commentSyntaxFor(path26) {
+  const dot = path26.lastIndexOf(".");
   if (dot < 0) return null;
-  return COMMENT_SYNTAX.get(path24.slice(dot + 1).toLowerCase()) ?? null;
+  return COMMENT_SYNTAX.get(path26.slice(dot + 1).toLowerCase()) ?? null;
 }
 function planCommentFolds(rows, syntax, commentKeep, commentMinBlock, occupied) {
   if (syntax === null || rows.length === 0 || commentKeep < 1 || commentMinBlock < 1) return [];
@@ -8154,8 +8327,8 @@ function planProseFolds(rows, claimed) {
   }
   return folds;
 }
-function foldDetail(path24, folds, maxLen = MAX_FOLD_DETAIL) {
-  const head = `${path24}::`;
+function foldDetail(path26, folds, maxLen = MAX_FOLD_DETAIL) {
+  const head = `${path26}::`;
   const ids = folds.map((f) => f.kind === "body" ? f.name : `#${f.firstLine}-${f.lastLine}`);
   const budget = maxLen - head.length - FOLD_DETAIL_SUFFIX_BUDGET;
   const kept = [];
@@ -8173,7 +8346,7 @@ function foldDetail(path24, folds, maxLen = MAX_FOLD_DETAIL) {
 
 // src/fold_delivery.ts
 init_define_import_meta_env();
-import { readFileSync as readFileSync13, statSync as statSync12 } from "node:fs";
+import { readFileSync as readFileSync13, statSync as statSync13 } from "node:fs";
 
 // src/indexed_source.ts
 init_define_import_meta_env();
@@ -8228,7 +8401,7 @@ function commentFoldNotice(firstLine, lastLine, shownPath) {
 var FOLD_SPAN_PARSE_MAX_BYTES = 4e5;
 function parseFoldSpansFromDisk(normalizedPath, rows) {
   try {
-    if (statSync12(normalizedPath).size > FOLD_SPAN_PARSE_MAX_BYTES) return [];
+    if (statSync13(normalizedPath).size > FOLD_SPAN_PARSE_MAX_BYTES) return [];
     const language = detectLanguage(normalizedPath);
     if (!isTreeSitterAvailable(language)) return [];
     const fileText = readFileSync13(normalizedPath, "utf-8");
@@ -8247,7 +8420,7 @@ function parseFoldSpansFromDisk(normalizedPath, rows) {
 function resolveFoldSpans(normalizedPath, hasCommentSyntax, rows) {
   try {
     const entry = getFileEntry(normalizedPath);
-    if (entry !== null && entry.sha !== "" && !isVirtualIndexedPath(normalizedPath) && entry.sha === fingerprintFile(normalizedPath) && entry.parserSha === PARSER_FINGERPRINT) {
+    if (entry !== null && entry.sha !== "" && !isVirtualIndexedPath(normalizedPath) && entry.sha === fingerprintFile(normalizedPath) && entry.parserSha === parserFingerprintForLanguage(entry.language)) {
       return querySymbols({ filePath: normalizedPath, limit: BODY_FOLD_SYMBOL_LIMIT });
     }
     if (hasCommentSyntax) enqueueDirtyPathSafe(normalizedPath);
@@ -8457,13 +8630,14 @@ function largeFileDenyBytes() {
 function counterfactualCredit(counterfactualBytes, emittedBytes = 0) {
   return Math.max(0, Math.min(counterfactualBytes, PER_FILE_COUNTERFACTUAL_CEILING) - emittedBytes);
 }
-function isNodeModulesPath(p) {
-  const check = foldPath(p);
-  return check.includes("/node_modules/") || check.includes("\\node_modules\\");
+function diffHintCredit(counterfactualBytes, body) {
+  const credit = counterfactualCredit(counterfactualBytes, body.length);
+  if (savedTokensFromBytes(credit) < loadConfig().hints.diff_hint_min_tokens_saved) return null;
+  return credit;
 }
 function relPathWithinRoot(root, target) {
-  const rel = path19.relative(root, target).replace(/\\/g, "/");
-  if (rel.startsWith("..") || path19.isAbsolute(rel)) return null;
+  const rel = path21.relative(root, target).replace(/\\/g, "/");
+  if (rel.startsWith("..") || path21.isAbsolute(rel)) return null;
   return rel;
 }
 function _isDocFile(filePath) {
@@ -8472,7 +8646,7 @@ function _isDocFile(filePath) {
 }
 function isSessionArtifactFile(filePath) {
   if (/[/\\]tasks[/\\][a-z0-9]+\.output$/i.test(filePath)) return true;
-  if (/[/\\]tool-results[/\\][a-z0-9]+\.txt$/i.test(filePath)) return true;
+  if (new RegExp("[/\\\\]tool-results[/\\\\]" + TOOL_RESULTS_ID_CHARS + "\\.txt$", "i").test(filePath)) return true;
   return false;
 }
 function sessionArtifactRecall(rawPath) {
@@ -8489,7 +8663,7 @@ var BINARY_FILE_TYPE_EXTS = /* @__PURE__ */ new Set(["pdf", "docx", "xlsx", "ppt
 var TEXT_FILE_TYPE_EXTS = /* @__PURE__ */ new Set(["html", "htm", "xhtml", "txt", "log", "out", "err", "trace", "csv", "tsv", "vtt", "srt", "svg", "xml", "dtsx", "ampkg", "xaml", "json", "yaml", "yml", "jsonl"]);
 var DISPATCHED_FILE_TYPE_EXTS = /* @__PURE__ */ new Set([...BINARY_FILE_TYPE_EXTS, ...TEXT_FILE_TYPE_EXTS]);
 function isDispatchedFileType(basename11) {
-  return DISPATCHED_FILE_TYPE_EXTS.has(path19.extname(basename11).slice(1).toLowerCase());
+  return DISPATCHED_FILE_TYPE_EXTS.has(path21.extname(basename11).slice(1).toLowerCase());
 }
 function extractQuickSymbolSamples(content, _filePath) {
   const symbols = [];
@@ -8539,11 +8713,6 @@ function surgicalHint(filePath, basename11, lineCount, fileContent) {
   const isHtmlFile = /\.(html|htm)$/i.test(basename11);
   const isSectionFile = /\.(css|scss|sass|less|toml)$/i.test(basename11);
   const isXmlFile = /\.(xml|dtsx|ampkg|xaml)$/i.test(basename11) && !basename11.toLowerCase().endsWith("-meta.xml");
-  const escapeHintName = (name) => {
-    const quoted = name.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    const safe = displaySafeText(quoted);
-    return safe !== quoted ? "" : safe.trim();
-  };
   if (isXmlFile) {
     return `Use \`token-goat xml-outline "${filePath}"\` for structure or \`token-goat xml-query "${filePath}" "<selector>"\` for nodes.`;
   } else if (isDocFile) {
@@ -8589,9 +8758,62 @@ function surgicalHint(filePath, basename11, lineCount, fileContent) {
     if (isShellScript && samples.length > 0) {
       return `Use \`token-goat section "${filePath}::${sym}"\`${avail} for a section, or \`token-goat skeleton "${filePath}"\` / \`token-goat outline "${filePath}"\` for structure.`;
     }
+    if (samples.length > 0) {
+      try {
+        const indexed = querySymbols({ filePath, name: sym, limit: 1 })[0];
+        if (indexed !== void 0 && isLargeSymbolSpan(indexed.lineStart, indexed.lineEnd, filePath)) {
+          return `\`${sym}\` spans ${indexed.lineEnd - indexed.lineStart + 1} lines -- use \`token-goat grep "<pattern>" ${filePath} -C 15 --symbol\` for a slice inside it, or \`token-goat scope ${filePath}:${indexed.lineStart}\` to confirm the enclosing symbol.`;
+        }
+      } catch {
+      }
+    }
     return `Use \`token-goat read "${filePath}::${sym}"\`${avail} for one function, or \`token-goat skeleton "${filePath}"\` / \`token-goat outline "${filePath}"\` for structure.`;
   }
 }
+function escapeHintName(name) {
+  const quoted = name.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+  const safe = displaySafeText(quoted);
+  return safe !== quoted ? "" : safe.trim();
+}
+function isLargeSymbolSpan(lineStart, lineEnd, filePath) {
+  const span = lineEnd - lineStart + 1;
+  if (span > LARGE_SYMBOL_LINE_THRESHOLD) return true;
+  const totalLines = lineCountForSurgicalHint(filePath);
+  return totalLines > 0 && span > totalLines / 2;
+}
+function isWindowInsideMuchLargerSymbol(filePath, start, end) {
+  try {
+    const windowLines = end - start + 1;
+    return querySymbols({ filePath, limit: 500 }).some((s) => {
+      const span = s.lineEnd - s.lineStart + 1;
+      return s.lineStart <= start && s.lineEnd >= end && windowLines * 3 <= span;
+    });
+  } catch {
+    return false;
+  }
+}
+function realSymbolReadHint(filePath, shown, range) {
+  let candidates;
+  try {
+    const all = querySymbols({ filePath, limit: 500 }).map((s) => ({ name: escapeHintName(s.name), lineStart: s.lineStart, lineEnd: s.lineEnd }));
+    const overlapping = range !== void 0 ? all.filter((s) => s.lineStart <= range.end && s.lineEnd >= range.start) : [];
+    candidates = (overlapping.length > 0 ? overlapping : all).filter((s) => s.name !== "");
+  } catch {
+    candidates = [];
+  }
+  const top = candidates[0];
+  if (top === void 0) {
+    return range !== void 0 ? '`token-goat read "' + shown + "@" + range.start + "-" + range.end + '"`' : '`token-goat outline "' + shown + '"`';
+  }
+  if (isLargeSymbolSpan(top.lineStart, top.lineEnd, filePath)) {
+    const line = range !== void 0 ? range.start : top.lineStart;
+    const span = top.lineEnd - top.lineStart + 1;
+    return '`token-goat grep "<pattern>" ' + shown + " -C 15 --symbol` for a slice inside `" + top.name + "` (" + span + " lines), or `token-goat scope " + shown + ":" + line + "` to confirm the enclosing symbol";
+  }
+  const names = candidates.map((s) => s.name).slice(0, 3);
+  const rest = names.length > 1 ? " (or: " + names.slice(1).join(", ") + ")" : "";
+  return '`token-goat read "' + shown + "::" + names[0] + '"`' + rest;
+}
 function lineCountForSurgicalHint(filePath, fileStatSize) {
   try {
     if (fileStatSize !== void 0 && fileStatSize > SLICE_ESTIMATE_SCAN_CAP_BYTES) {
@@ -8702,7 +8924,7 @@ function preReadHandlerInner(event) {
     } catch {
     }
   }
-  const basename11 = displaySafePath(path19.basename(normalized));
+  const basename11 = displaySafePath(path21.basename(normalized));
   if (isLockFile(basename11)) {
     return denyOutput(
       'Lock files are rarely useful to read in full. Use `token-goat section "' + shown + '::<section>"` to extract a specific dependency, or read the relevant manifest instead.'
@@ -8823,12 +9045,13 @@ function preReadHandlerInner(event) {
                 (basename11 + " is unchanged since last read. " + surgicalHint(normalized, basename11, countTextLines(snapDiff.currentContent), snapDiff.currentContent)).trimEnd()
               );
             }
-            if (snapDiff.kind === "diff" && savedTokensFromBytes(snapDiff.savedBytes) >= loadConfig().hints.diff_hint_min_tokens_saved) {
-              recordActualRead(event, normalized);
-              recordStat("session_hint", 0, 0);
-              return denyOutput(
-                ("Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + snapDiff.diff + "\n```") + "\n\n" + surgicalHint(normalized, basename11, countTextLines(snapDiff.currentContent), snapDiff.currentContent)).trimEnd()
-              );
+            if (snapDiff.kind === "diff") {
+              const diffBody = ("Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + snapDiff.diff + "\n```") + "\n\n" + surgicalHint(normalized, basename11, countTextLines(snapDiff.currentContent), snapDiff.currentContent)).trimEnd();
+              if (diffHintCredit(snapDiff.currentContent.length, diffBody) !== null) {
+                recordActualRead(event, normalized);
+                recordStat("session_hint", 0, 0);
+                return denyOutput(diffBody);
+              }
             }
             recordActualRead(event, normalized);
             recordStat("session_hint", 0, 0);
@@ -8859,12 +9082,13 @@ function preReadHandlerInner(event) {
         (basename11 + " is unchanged since last read. " + surgicalHint(normalized, basename11, countTextLines(memSnapDiff.currentContent), memSnapDiff.currentContent)).trimEnd()
       );
     }
-    if (memSnapDiff.kind === "diff" && savedTokensFromBytes(memSnapDiff.savedBytes) >= loadConfig().hints.diff_hint_min_tokens_saved) {
-      recordActualRead(event, normalized);
-      recordStat("session_hint", 0, 0);
-      return denyOutput(
-        ("Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + memSnapDiff.diff + "\n```") + "\n\n" + surgicalHint(normalized, basename11, countTextLines(memSnapDiff.currentContent), memSnapDiff.currentContent)).trimEnd()
-      );
+    if (memSnapDiff.kind === "diff") {
+      const diffBody = ("Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + memSnapDiff.diff + "\n```") + "\n\n" + surgicalHint(normalized, basename11, countTextLines(memSnapDiff.currentContent), memSnapDiff.currentContent)).trimEnd();
+      if (diffHintCredit(memSnapDiff.currentContent.length, diffBody) !== null) {
+        recordActualRead(event, normalized);
+        recordStat("session_hint", 0, 0);
+        return denyOutput(diffBody);
+      }
     }
     recordActualRead(event, normalized);
     recordStat("session_hint", 0, 0);
@@ -8913,12 +9137,13 @@ function preReadHandlerInner(event) {
         );
       }
       if (snapDiff.kind === "diff") {
-        recordActualRead(event, normalized);
-        const artifactDiffCredit = counterfactualCredit(snapDiff.currentContent.length, snapDiff.diff.length);
-        recordStat("session_hint", artifactDiffCredit, savedTokensFromBytes(artifactDiffCredit), void 0, "artifact-snapshot-diff");
-        return denyOutput(
-          "Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + snapDiff.diff + "\n```") + "\n\n" + sessionArtifactRecall(normalized)
-        );
+        const diffBody = "Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + snapDiff.diff + "\n```") + "\n\n" + sessionArtifactRecall(normalized);
+        const artifactDiffCredit = diffHintCredit(snapDiff.currentContent.length, diffBody);
+        if (artifactDiffCredit !== null) {
+          recordActualRead(event, normalized);
+          recordStat("session_hint", artifactDiffCredit, savedTokensFromBytes(artifactDiffCredit), void 0, "artifact-snapshot-diff");
+          return denyOutput(diffBody);
+        }
       }
       recordActualRead(event, normalized);
       recordStat("session_hint", 0, 0);
@@ -8961,13 +9186,12 @@ function preReadHandlerInner(event) {
       );
     }
     if (snapDiff.kind === "diff") {
-      if (savedTokensFromBytes(snapDiff.savedBytes) >= loadConfig().hints.diff_hint_min_tokens_saved) {
+      const diffBody = ("Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + snapDiff.diff + "\n```") + "\n\n" + surgicalHint(normalized, basename11, countTextLines(snapDiff.currentContent), snapDiff.currentContent)).trimEnd();
+      const diffCredit = diffHintCredit(snapDiff.currentContent.length, diffBody);
+      if (diffCredit !== null) {
         recordActualRead(event, normalized);
-        const diffCredit = counterfactualCredit(snapDiff.currentContent.length, snapDiff.diff.length);
         recordStat("diff_hint", diffCredit, savedTokensFromBytes(diffCredit));
-        return denyOutput(
-          ("Content changed since last read of " + basename11 + ". Here is what changed:\n\n" + fenceUntrustedFileContent("```diff\n" + snapDiff.diff + "\n```") + "\n\n" + surgicalHint(normalized, basename11, countTextLines(snapDiff.currentContent), snapDiff.currentContent)).trimEnd()
-        );
+        return denyOutput(diffBody);
       }
     }
   }
@@ -9017,7 +9241,7 @@ function preReadHandlerInner(event) {
         recordStat("read_served_deny", blocked, savedTokensFromBytes(blocked));
         recordStat("session_hint", 0, 0);
         return denyOutput(
-          "Every line of " + shown + " this read would return was already served in this session, byte for byte. Recall it with `token-goat bash-output " + alreadyServed.id + '`, or pull just the part you need with `token-goat read "' + shown + '::Symbol"`.'
+          "Every line of " + shown + " this read would return was already served in this session, byte for byte. Recall it with `token-goat bash-output " + alreadyServed.id + "`, or pull just the part you need with " + realSymbolReadHint(normalized, shown) + "."
         );
       }
       const window = readRequestedSliceWindow(event);
@@ -9032,7 +9256,7 @@ function preReadHandlerInner(event) {
             recordStat("read_served_deny", blocked, savedTokensFromBytes(blocked));
             recordStat("session_hint", 0, 0);
             return denyOutput(
-              "Lines " + start + ".." + end + " of " + shown + ' was already read this session. Pull just the part you need with `token-goat read "' + shown + '::Symbol"`.'
+              "Lines " + start + ".." + end + " of " + shown + " was already read this session. Pull just the part you need with " + realSymbolReadHint(normalized, shown, { start, end }) + "."
             );
           };
           if (snapDiff.kind === "unchanged") {
@@ -9058,11 +9282,14 @@ function preReadHandlerInner(event) {
       }
       const isPagingTracked = isSourceExt || /\.(md|mdx|markdown|rst|xml|dtsx|ampkg|xaml)$/i.test(basename11);
       if (isPagingTracked && window.isExplicitSlice && prevRanges.length >= 3) {
-        recordStat("read_count_deny", rereadCredit, savedTokensFromBytes(rereadCredit));
-        recordStat("session_hint", 0, 0);
-        return denyOutput(
-          "Sequential line-range paging detected on " + shown + " (" + (prevRanges.length + 1) + " slices read). " + surgicalHint(normalized, basename11, lineCountForSurgicalHint(normalized)) + " Inspect structure directly without manual chunk paging."
-        );
+        const pagingWindowSpan = window.offset !== void 0 && window.limit !== void 0 ? { start: window.offset, end: window.offset + window.limit - 1 } : void 0;
+        if (pagingWindowSpan === void 0 || !isWindowInsideMuchLargerSymbol(normalized, pagingWindowSpan.start, pagingWindowSpan.end)) {
+          recordStat("read_count_deny", rereadCredit, savedTokensFromBytes(rereadCredit));
+          recordStat("session_hint", 0, 0);
+          return denyOutput(
+            "Sequential line-range paging detected on " + shown + " (" + (prevRanges.length + 1) + " slices read). " + surgicalHint(normalized, basename11, lineCountForSurgicalHint(normalized)) + " Inspect structure directly without manual chunk paging."
+          );
+        }
       }
     }
     if (config2.hints.reread_deny && !protectedRead) {
@@ -9104,7 +9331,7 @@ function preReadHandlerInner(event) {
     }
     const pagingWindow = readRequestedSliceWindow(event);
     const activeRanges = getFileLineRanges(normalized);
-    const pagingNote = pagingWindow.isExplicitSlice && activeRanges.length >= 2 ? " Sequential line-range paging detected (" + (activeRanges.length + 1) + " slices read). Prefer `token-goat skeleton " + shown + '` or `token-goat read "' + shown + '::Symbol"`.' : "";
+    const pagingNote = pagingWindow.isExplicitSlice && activeRanges.length >= 2 ? " Sequential line-range paging detected (" + (activeRanges.length + 1) + " slices read). Prefer `token-goat skeleton " + shown + "` or " + realSymbolReadHint(normalized, shown, pagingWindow.offset !== void 0 && pagingWindow.limit !== void 0 ? { start: pagingWindow.offset, end: pagingWindow.offset + pagingWindow.limit - 1 } : void 0) + "." : "";
     if (!isWithinQuietHours(config2.hints.quiet_hours)) {
       recordStat("session_hint", 0, 0);
     }
@@ -9147,7 +9374,7 @@ function preReadHandlerInner(event) {
       "Note: " + shown + " is large (" + kb + "KB). " + hint + contextPressureAdvisorySuffix()
     );
   }
-  const fileTypeExt = path19.extname(normalized).slice(1).toLowerCase();
+  const fileTypeExt = path21.extname(normalized).slice(1).toLowerCase();
   const fileStatSize = size ?? statSize(normalized) ?? 0;
   const isKnownFileType = DISPATCHED_FILE_TYPE_EXTS.has(fileTypeExt);
   if (event.toolName !== "Grep" && !isImagePath(normalized) && (isKnownFileType || fileStatSize >= FILE_TYPE_THRESHOLDS.generic)) {
@@ -9228,7 +9455,7 @@ function postReadHandlerInner(event, suppressStructuralHint) {
   if (isTruncatedReadDelivery(event, respText)) {
     markFileTruncated(normalized, !readRequestedSliceWindow(event).isExplicitSlice);
   }
-  const postBasename = path19.basename(normalized);
+  const postBasename = path21.basename(normalized);
   const diffSourcesEnabled = loadConfig().hints.serve_diff_on_reread;
   if (/\.(md|mdx|markdown|rst|txt)$/i.test(postBasename) || isSessionArtifactFile(normalized) || diffSourcesEnabled && isDiffableSource(postBasename)) {
     try {
@@ -9344,7 +9571,7 @@ function elideAlreadyServedLines(event, respText) {
   if (ids.length === 0) return null;
   const parsed = parseNumberedReadResult(respText, readStartLine(event));
   if (parsed === null) return null;
-  if (redactSecrets(respText).count > 0) return null;
+  if (hasPreciseSecret(respText)) return null;
   const bodies = [];
   for (let i = ids.length - 1; i >= 0; i--) {
     const id = ids[i];
@@ -9384,7 +9611,7 @@ function structuralFoldInputs(event, respText) {
   if (filePath === void 0) return null;
   if (readRequestedSliceWindow(event).isExplicitSlice) return null;
   if (isTruncatedReadDelivery(event, respText)) return null;
-  if (redactSecrets(respText).count > 0) return null;
+  if (hasPreciseSecret(respText)) return null;
   const parsed = parseNumberedReadResult(respText, readStartLine(event));
   if (parsed === null) return null;
   const normalized = normalizePath(filePath);
@@ -9421,7 +9648,7 @@ function foldCodeBodies(event, respText) {
   const requestedOffset = sliceWin.offset;
   if (requestedOffset !== void 0 && readStartLine(event) !== requestedOffset) return null;
   if (isTruncatedReadDelivery(event, respText)) return null;
-  if (redactSecrets(respText).count > 0) return null;
+  if (hasPreciseSecret(respText)) return null;
   const parsed = parseNumberedReadResult(respText, readStartLine(event));
   if (parsed === null) return null;
   const shown = displaySafePath(toDisplayPath(findProject(getCwd(event) ?? process.cwd())?.root, normalized));
@@ -9458,13 +9685,13 @@ registerHook("post_tool_use", postReadHandler, { toolName: "Read" });
 // src/baseline.ts
 init_define_import_meta_env();
 import * as fs26 from "node:fs";
-import * as path22 from "node:path";
+import * as path24 from "node:path";
 
 // src/cli_context_stats.ts
 init_define_import_meta_env();
 import * as fs25 from "node:fs";
-import * as os5 from "node:os";
-import * as path21 from "node:path";
+import * as os6 from "node:os";
+import * as path23 from "node:path";
 
 // src/confirm_apply.ts
 init_define_import_meta_env();
@@ -9521,7 +9748,7 @@ ${diff}
 // src/memory_prune.ts
 init_define_import_meta_env();
 import * as fs24 from "node:fs";
-import * as path20 from "node:path";
+import * as path22 from "node:path";
 var ENTRY_RE = /^\s*-\s*\[(?<title>[^\]]+)\]\((?<target>[^)]+?\.md)\)/;
 var URL_SCHEME_RE = /^[a-z][a-z0-9+.-]*:\/\//i;
 function parseIndex(text) {
@@ -9566,7 +9793,7 @@ function pruneIndex(memoryDir, opts) {
     changed: false,
     tokensSaved: 0
   };
-  const memoryMd = path20.join(memoryDir, "MEMORY.md");
+  const memoryMd = path22.join(memoryDir, "MEMORY.md");
   let text;
   try {
     text = fs24.readFileSync(memoryMd, "utf-8");
@@ -9580,7 +9807,7 @@ function pruneIndex(memoryDir, opts) {
   const dups = [];
   for (const entry of entries) {
     const isUrl = URL_SCHEME_RE.test(entry.target);
-    const targetExists = isUrl ? true : path20.isAbsolute(entry.target) ? fs24.existsSync(entry.target) : fs24.existsSync(path20.join(memoryDir, entry.target));
+    const targetExists = isUrl ? true : path22.isAbsolute(entry.target) ? fs24.existsSync(entry.target) : fs24.existsSync(path22.join(memoryDir, entry.target));
     const foldedTarget = foldPath(entry.target);
     if (!targetExists) {
       dead.push(entry);
@@ -9724,7 +9951,7 @@ async function tryEmbeddingClusters(siblings, snippets, threshold) {
 }
 async function findContentDuplicates(memoryDir, _opts) {
   const threshold = _opts?.threshold ?? 0.92;
-  const siblings = fs24.readdirSync(memoryDir).filter((name) => name.toLowerCase().endsWith(".md") && name.toLowerCase() !== "memory.md").map((name) => path20.join(memoryDir, name)).sort();
+  const siblings = fs24.readdirSync(memoryDir).filter((name) => name.toLowerCase().endsWith(".md") && name.toLowerCase() !== "memory.md").map((name) => path22.join(memoryDir, name)).sort();
   if (siblings.length < 2) {
     return [];
   }
@@ -9808,7 +10035,7 @@ function auditClaudeMd(files) {
     const overlaps = [];
     for (const [stripped, filesSet] of lineToFiles) {
       if (filesSet.has(report.path) && filesSet.size > 1) {
-        const others = Array.from(filesSet).filter((p) => p !== report.path).map((p) => path20.basename(p));
+        const others = Array.from(filesSet).filter((p) => p !== report.path).map((p) => path22.basename(p));
         if (others.length > 0) {
           if (stripped.length > 60) {
             overlaps.push(
@@ -9834,31 +10061,31 @@ function tok(filePath) {
     return 0;
   }
 }
-function findClaudeMdFiles(projectRoot, homeDir = os5.homedir()) {
+function findClaudeMdFiles(projectRoot, homeDir = os6.homedir()) {
   const found = [];
   const seen = /* @__PURE__ */ new Set();
-  let current = path21.resolve(projectRoot);
+  let current = path23.resolve(projectRoot);
   while (true) {
-    const candidate = path21.join(current, "CLAUDE.md");
+    const candidate = path23.join(current, "CLAUDE.md");
     if (!seen.has(candidate) && fs25.existsSync(candidate)) {
       found.push(candidate);
       seen.add(candidate);
     }
-    const parent = path21.dirname(current);
+    const parent = path23.dirname(current);
     if (parent === current) break;
     current = parent;
   }
-  const globalMd = path21.join(homeDir, ".claude", "CLAUDE.md");
+  const globalMd = path23.join(claudeConfigDir(homeDir), "CLAUDE.md");
   if (!seen.has(globalMd) && fs25.existsSync(globalMd)) {
     found.push(globalMd);
   }
   return found;
 }
-function findMemoryMd(projectRoot, homeDir = os5.homedir(), alternateRoots = []) {
+function findMemoryMd(projectRoot, homeDir = os6.homedir(), alternateRoots = []) {
   try {
-    const projectsDir = path21.join(homeDir, ".claude", "projects");
+    const projectsDir = path23.join(claudeConfigDir(homeDir), "projects");
     if (!fs25.existsSync(projectsDir)) return null;
-    const rootStr = path21.resolve(projectRoot);
+    const rootStr = path23.resolve(projectRoot);
     const candidateRoots = [rootStr];
     try {
       const realRoot = fs25.realpathSync.native(rootStr);
@@ -9866,12 +10093,12 @@ function findMemoryMd(projectRoot, homeDir = os5.homedir(), alternateRoots = [])
     } catch {
     }
     for (const alternate of alternateRoots) {
-      const resolved = path21.resolve(alternate);
+      const resolved = path23.resolve(alternate);
       if (!candidateRoots.includes(resolved)) candidateRoots.push(resolved);
     }
     for (const root of candidateRoots) {
       const expectedSlug = root.replace(/[^A-Za-z0-9]/g, "-");
-      const candidate = path21.join(projectsDir, expectedSlug, "memory", "MEMORY.md");
+      const candidate = path23.join(projectsDir, expectedSlug, "memory", "MEMORY.md");
       if (fs25.existsSync(candidate)) return candidate;
     }
     return null;
@@ -9879,17 +10106,17 @@ function findMemoryMd(projectRoot, homeDir = os5.homedir(), alternateRoots = [])
     return null;
   }
 }
-function buildStats(projectRoot, homeDir = os5.homedir(), alternateRoots = []) {
+function buildStats(projectRoot, homeDir = os6.homedir(), alternateRoots = []) {
   const claudeMds = findClaudeMdFiles(projectRoot, homeDir);
   const claudeMdRows = [];
   let claudeMdTotal = 0;
   for (const p of claudeMds) {
     const t = tok(p);
     claudeMdTotal += t;
-    const parentDir = path21.basename(path21.dirname(p));
+    const parentDir = path23.basename(path23.dirname(p));
     const label = parentDir === ".claude" ? "~/.claude/CLAUDE.md" : (() => {
       try {
-        return path21.relative(projectRoot, p);
+        return path23.relative(projectRoot, p);
       } catch {
         return p;
       }
@@ -9953,7 +10180,7 @@ async function runContextStats(opts = {}) {
       process.stdout.write("[--fix] No MEMORY.md found; nothing to prune.\n");
     } else {
       const memPath = result.memory_md_path;
-      const pruneResult = pruneIndex(path21.dirname(memPath), { dryRun: true });
+      const pruneResult = pruneIndex(path23.dirname(memPath), { dryRun: true });
       if (!pruneResult.changed || pruneResult.after === void 0) {
         process.stdout.write("[--fix] MEMORY.md already clean; nothing to prune.\n");
       } else {
@@ -10007,6 +10234,10 @@ var SKIP_DIRS = /* @__PURE__ */ new Set([
   ".idea",
   ".vscode"
 ]);
+function isIgnoredIndexPath(p) {
+  const segments = foldPath(p).split(/[/\\]/);
+  return segments.slice(0, -1).some((s) => SKIP_DIRS.has(s));
+}
 var MAX_FILES_SCANNED = 2e4;
 function walkProject(rootDir, opts = {}) {
   const files = [];
@@ -10026,7 +10257,7 @@ function walkProject(rootDir, opts = {}) {
       continue;
     }
     for (const entry of entries) {
-      const full = path22.join(dir, entry.name);
+      const full = path24.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (SKIP_DIRS.has(entry.name) || extraSkipDirs.includes(entry.name)) continue;
         if (entry.name.startsWith(".") && entry.name !== ".") {
@@ -10108,7 +10339,7 @@ function fetchTopSymbols(limit, dbPath, rootDir) {
   }
 }
 function buildProjectMap(rootDir = process.cwd(), opts = {}) {
-  const root = path22.resolve(rootDir);
+  const root = path24.resolve(rootDir);
   const config = loadConfig();
   const { files, languages, truncated } = walkProject(root, { excludeTests: config.repomap.exclude_tests });
   const compact = opts.compact === true || files.length > config.repomap.compact_file_threshold;
@@ -10122,7 +10353,7 @@ function buildProjectMap(rootDir = process.cwd(), opts = {}) {
       mtime = 0;
     }
     return { f, mtime };
-  }).sort((a, b) => b.mtime - a.mtime).slice(0, compact ? 5 : 15).map((x) => path22.relative(root, x.f));
+  }).sort((a, b) => b.mtime - a.mtime).slice(0, compact ? 5 : 15).map((x) => path24.relative(root, x.f));
   return {
     rootDir: root,
     fileCount: files.length,
@@ -10135,7 +10366,7 @@ function buildProjectMap(rootDir = process.cwd(), opts = {}) {
 }
 function formatProjectMap(map, compact = false) {
   const lines = [];
-  const rel = path22.basename(map.rootDir);
+  const rel = path24.basename(map.rootDir);
   lines.push(`# Project map: ${rel}`);
   lines.push(map.fileCountTruncated === true ? `Files: at least ${map.fileCount} (walk stopped at the ${MAX_FILES_SCANNED}-file cap)` : `Files: ${map.fileCount}`);
   const langPairs = Object.entries(map.languages).sort((a, b) => b[1] - a[1]);
@@ -10164,7 +10395,7 @@ function formatProjectMap(map, compact = false) {
 }
 function mapLookupBytesSaved(map, emittedText) {
   const referencedFiles = /* @__PURE__ */ new Set([
-    ...map.recentFiles.map((f) => normalizePath(path22.resolve(map.rootDir, f))),
+    ...map.recentFiles.map((f) => normalizePath(path24.resolve(map.rootDir, f))),
     ...map.topSymbols.map((s) => normalizePath(s.filePath))
   ]);
   const listingText = Array.from(referencedFiles).sort().join("\n");
@@ -10179,7 +10410,7 @@ function findMemSuggestionCandidates(projectRoot) {
   const claudeMdFiles = findClaudeMdFiles(projectRoot);
   const candidateFiles = new Set(claudeMdFiles);
   for (const claudeMd of claudeMdFiles) {
-    const agentsMd = path22.join(path22.dirname(claudeMd), "AGENTS.md");
+    const agentsMd = path24.join(path24.dirname(claudeMd), "AGENTS.md");
     if (fs26.existsSync(agentsMd)) candidateFiles.add(agentsMd);
   }
   const suggestions = [];
@@ -10215,7 +10446,7 @@ function formatMemSuggestions(projectRoot) {
   if (suggestions.length === 0) return "";
   const lines = ["", "## mem suggestions"];
   for (const s of suggestions) {
-    const basename11 = path22.basename(s.path);
+    const basename11 = path24.basename(s.path);
     lines.push(
       "Consider: mem import --from-md " + s.path + "  # migrates " + s.count + " preference-shaped lines from " + basename11 + " as pending facts for review"
     );
@@ -10260,15 +10491,15 @@ function scanAndRecord(text) {
 // src/repomap.ts
 init_define_import_meta_env();
 import * as fs27 from "fs";
-import * as path23 from "path";
+import * as path25 from "path";
 function getTrackedFiles(cwd = process.cwd()) {
   try {
     let dir = cwd;
     let onlyFile = "";
     try {
       if (fs27.statSync(cwd).isFile()) {
-        dir = path23.dirname(cwd);
-        onlyFile = path23.basename(cwd);
+        dir = path25.dirname(cwd);
+        onlyFile = path25.basename(cwd);
       }
     } catch {
     }
@@ -10277,7 +10508,7 @@ function getTrackedFiles(cwd = process.cwd()) {
     if (result.exitCode !== 0 || !result.stdout) {
       return [];
     }
-    return result.stdout.split("\n").filter((line) => line.trim().length > 0).map((rel) => path23.join(dir, rel));
+    return result.stdout.split("\n").filter((line) => line.trim().length > 0).map((rel) => path25.join(dir, rel));
   } catch {
     return [];
   }
@@ -10503,7 +10734,49 @@ function embeddedIpv4Candidates(host) {
   return out;
 }
 
+// src/line_regions.ts
+init_define_import_meta_env();
+function resolveLineRegions(symbols, totalLines, start, end) {
+  if (symbols.length === 0) return [];
+  const firstStart = symbols.reduce((m, s) => Math.min(m, s.lineStart), Number.POSITIVE_INFINITY);
+  const regionFor = (line) => {
+    let best = null;
+    for (const s of symbols) {
+      if (s.lineStart > line || s.lineEnd < line) continue;
+      if (best === null || s.lineEnd - s.lineStart < best.lineEnd - best.lineStart) best = s;
+    }
+    if (best !== null) {
+      return { kind: "symbol", label: `${best.kind} ${best.name}`, start: best.lineStart, end: best.lineEnd };
+    }
+    if (line < firstStart) return { kind: "preamble", label: "file preamble", start: 1, end: firstStart - 1 };
+    let prev = null;
+    let next = null;
+    for (const s of symbols) {
+      if (s.lineEnd < line && (prev === null || s.lineEnd > prev.lineEnd)) prev = s;
+      if (s.lineStart > line && (next === null || s.lineStart < next.lineStart)) next = s;
+    }
+    const prevName = prev === null ? "start of file" : prev.name;
+    return {
+      kind: "gap",
+      label: next === null ? `gap after ${prevName}` : `gap between ${prevName} and ${next.name}`,
+      start: prev === null ? 1 : prev.lineEnd + 1,
+      end: next === null ? totalLines : next.lineStart - 1
+    };
+  };
+  const bySpan = /* @__PURE__ */ new Map();
+  for (let line = start; line <= Math.min(end, totalLines); line++) {
+    const r = regionFor(line);
+    const key = `${r.start}-${r.end}`;
+    const seen = bySpan.get(key);
+    if (seen === void 0) bySpan.set(key, r);
+    else if (!seen.label.split(" / ").includes(r.label)) seen.label = `${seen.label} / ${r.label}`;
+  }
+  const picked = [...bySpan.values()];
+  return picked.filter((r) => !picked.some((o) => o !== r && o.start <= r.start && o.end >= r.end)).sort((a, b) => a.start - b.start || a.end - b.end);
+}
+
 export {
+  claudeConfigDir,
   indexedSourceText,
   isVirtualIndexedPath,
   virtualIndexedScopeNote,
@@ -10545,6 +10818,7 @@ export {
   readServersJson,
   serversOf,
   setTokenGoatServer,
+  isResidueServersJson,
   dropEmptyServers,
   hasManagedServer,
   visualStudioUserMcpPath,
@@ -10586,6 +10860,7 @@ export {
   classifyBashHint,
   classifyEditHint,
   applyHintTracking,
+  logSuppressedDetection,
   isSuppressionCategory,
   meetsSavingsFloor,
   getHintStatsSummary,
@@ -10641,6 +10916,7 @@ export {
   getSessionId,
   setTranscriptPath,
   SESSIONS_SUBDIR,
+  sessionsDir,
   AGENT_SALT_MARKER,
   sessionSidecarPath,
   listSiblingSessionStates,
@@ -10662,6 +10938,7 @@ export {
   loadSessionCache,
   computeAdaptiveBudget,
   buildManifestWithCount,
+  LARGE_SYMBOL_LINE_THRESHOLD,
   buildLineDiff,
   SKILLS_OUTPUT_SUBDIR,
   skillOutputsDir,
@@ -10685,7 +10962,6 @@ export {
   visionTokensSavedByText,
   canShrinkFormat,
   formatShrinkSummary,
-  isImagePath,
   ImageDecodeError,
   probeImageMeta,
   imageQualifiesForShrink,
@@ -10700,6 +10976,7 @@ export {
   searchEvidenceSemantically,
   buildDeltaCapsule,
   foldDetail,
+  pruneUnembeddableChunks,
   removeFileFromIndex,
   pruneDeletedFiles,
   pruneBlockedRoot,
@@ -10708,6 +10985,7 @@ export {
   findOrphanedChunkPaths,
   pruneOrphanedChunks,
   recordKnownRootThrottled,
+  findTopIndexedProjects,
   cmdReclaimIndex,
   applyIndexingPriority,
   WORKER_HEARTBEAT_STALE_MS,
@@ -10722,6 +11000,7 @@ export {
   runDetachedWorkerDaemon,
   appendDirtyPath,
   enqueueDirtyPathSafe,
+  enqueueDirtyPathsSafe,
   foldingEnabled,
   foldDelivery,
   OUTLINE_MIN_HEADINGS,
@@ -10729,6 +11008,7 @@ export {
   planMarkdownOutline,
   planSourceSkeleton,
   isStructuralRewriteAccepted,
+  escapeHintName,
   confirmAndApply,
   findContentDuplicates,
   auditClaudeMd,
@@ -10737,6 +11017,7 @@ export {
   buildStats,
   runContextStats,
   SKIP_DIRS,
+  isIgnoredIndexPath,
   MAX_FILES_SCANNED,
   walkProject,
   buildProjectMap,
@@ -10756,5 +11037,6 @@ export {
   parseIpv6Groups,
   isPrivateIpv4Octets,
   isPrivateIpv6Groups,
-  metadataEndpointRefusal
+  metadataEndpointRefusal,
+  resolveLineRegions
 };