token-goat 2.9.18 → 2.9.19

package/dist/{token-goat-chunk-WFX2V3OF.mjs → token-goat-chunk-HPMMLV37.mjs}

@@ -1,23 +1,27 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
 import {
+  MAX_CAPTURE_BYTES,
   canRunWrappedShell,
   clipToDeliveryCap,
   deliveredOutputBytes
-} from "./token-goat-chunk-RHHFEXKF.mjs";
+} from "./token-goat-chunk-MU6I4IDI.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
+  MCP_TOOL_PATTERN,
+  RECALL_COMMAND,
   buildCommandManifest,
   checkSymbolBodySize,
   diagnoseSqlFailure,
   flattenCommandNames,
   getWebOutput,
   isReconcileClean,
+  projectTranscriptsDir,
   readStdinJson,
   reconcileProject,
   storeWebOutput
-} from "./token-goat-chunk-V3ZWBEHM.mjs";
+} from "./token-goat-chunk-2GTB5RBZ.mjs";
 import {
   BODY_FIRST_TOOL_RESPONSE_KEYS,
   GENERIC_SERVED_OUTPUT_KEY,
@@ -32,6 +36,7 @@ import {
   buildProjectMap,
   classifyBashHint,
   classifyEditHint,
+  claudeConfigDir,
   clearCurlDownload,
   compactPathFor,
   computeAdaptiveBudget,
@@ -41,6 +46,7 @@ import {
   emitRewriteIfChanged,
   enqueueDirtyPathSafe,
   ensureWorkerAlive,
+  escapeHintName,
   estimateTokens,
   extractCompactFromMarker,
   extractToolResponseField,
@@ -84,6 +90,7 @@ import {
   listSiblingSessionStates,
   loadSessionCache,
   loadSessionState,
+  logSuppressedDetection,
   makeDedupHintHandlers,
   markCompactStale,
   markCompacted,
@@ -122,6 +129,7 @@ import {
   registerHook,
   removeOutstandingAgentSpawn,
   repeatedSkillBodyHint,
+  resolveLineRegions,
   runHook,
   saveSessionState,
   scanAndRecord,
@@ -144,9 +152,10 @@ import {
   wasFileReadThisSession,
   wasHintShown,
   withPreservedBlocks
-} from "./token-goat-chunk-BFEWOMA3.mjs";
+} from "./token-goat-chunk-FQYMZASI.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
+  bashOutputIdSync,
   commandHash,
   compressOutput,
   dedupeConsecutive,
@@ -162,41 +171,47 @@ import {
   isRewriteWorthwhile,
   isScopedGitStatusOrDiffStatCommand,
   isTestRunnerCommand,
+  looksLikePytestOutput,
+  pathStem,
+  pytestFilter,
   resolveMinNetSavingsBytes,
   shlexSplit,
   splitOwnTrailingNotices,
   storeBashOutput,
   summarizeOutputDelta
-} from "./token-goat-chunk-CTOYJ232.mjs";
+} from "./token-goat-chunk-7DGTVBWP.mjs";
 import {
   recordStat,
   redactSecrets,
   savedTokensFromBytes,
   storeBlob,
   stripAnsiEscapes
-} from "./token-goat-chunk-HPOFR6QX.mjs";
+} from "./token-goat-chunk-S7RFIX4Y.mjs";
 import {
   extractMarkdownHeadings,
   formatHeadingTreeParts
-} from "./token-goat-chunk-W3E65QOW.mjs";
+} from "./token-goat-chunk-EP7TCWHM.mjs";
 import {
-  countSymbols
-} from "./token-goat-chunk-I67CPTDD.mjs";
+  countSymbols,
+  getFileEntry,
+  querySymbols
+} from "./token-goat-chunk-IBTFGZBX.mjs";
 import {
   detectLanguage,
   getDb,
   languageHasFlag
-} from "./token-goat-chunk-L7VCX33I.mjs";
+} from "./token-goat-chunk-JNIFSVWM.mjs";
 import {
   detectHarness,
   envBool,
   envInt,
   findProject,
+  fingerprintFile,
   getHarnessName,
   isUnderSystemTemp,
   loadConfig,
   shortFingerprint
-} from "./token-goat-chunk-CA6V36KW.mjs";
+} from "./token-goat-chunk-SOKAPOOC.mjs";
 import {
   ENV_KEYS,
   IDENTICAL_READ_MIN_BODY_BYTES,
@@ -216,8 +231,9 @@ import {
   isInsideRoot,
   runGit,
   toKB
-} from "./token-goat-chunk-QIDLJGXZ.mjs";
+} from "./token-goat-chunk-ZGQXRYKE.mjs";
 import {
+  TOOL_RESULTS_ID_CHARS,
   UNTRUSTED_TOOL_TAG,
   displaySafePath,
   displaySafeText,
@@ -226,7 +242,7 @@ import {
   normalizePath,
   resolveIndexPath,
   toDisplayPath
-} from "./token-goat-chunk-ERTXEKB6.mjs";
+} from "./token-goat-chunk-NMTKNYGF.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -404,7 +420,7 @@ function grepIntInput(toolInput, key) {
 function grepSignature(toolInput) {
   const pattern = toolInput["pattern"];
   if (typeof pattern !== "string" || pattern === "") return null;
-  const path5 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
+  const path6 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
   const outputMode = typeof toolInput["output_mode"] === "string" ? toolInput["output_mode"] : "files_with_matches";
   const glob = typeof toolInput["glob"] === "string" ? toolInput["glob"] : "";
   const type = typeof toolInput["type"] === "string" ? toolInput["type"] : "";
@@ -419,7 +435,7 @@ function grepSignature(toolInput) {
   const offset = grepIntInput(toolInput, "offset");
   return JSON.stringify([
     pattern,
-    path5,
+    path6,
     outputMode,
     glob,
     type,
@@ -563,8 +579,8 @@ function isBroadCatchAllGlob(pattern, pathArg) {
 function globSignature(toolInput) {
   const pattern = toolInput["pattern"];
   if (typeof pattern !== "string" || pattern === "") return null;
-  const path5 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
-  return JSON.stringify([pattern, path5]);
+  const path6 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
+  return JSON.stringify([pattern, path6]);
 }
 var { post: postGlobHandler, pre: preGlobDedupHandler } = makeDedupHintHandlers({
   toolName: "Glob",
@@ -953,7 +969,7 @@ init_define_import_meta_env();
 var TRACKED_SKILL = "token-goat";
 var MAX_COMMANDS_SHOWN = 8;
 async function currentCommandNames() {
-  const { buildProgram } = await import("./token-goat-chunk-BWCRC23L.mjs");
+  const { buildProgram } = await import("./token-goat-chunk-L2UOJBV4.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -1259,7 +1275,8 @@ function reconcileNote(cwd, indexed) {
     if (drifted > 0) clauses.push(`${countNoun(drifted, "file")} that changed outside this session${breakdown}`);
     if (upgraded > 0) clauses.push(`${countNoun(upgraded, "file")} unchanged on disk but indexed by an older version of token-goat`);
     return `token-goat: reindexing ${clauses.join(" and ")}${truncated}. Symbol lookups may be briefly stale.`;
-  } catch {
+  } catch (e) {
+    recordStat("reconcile_note_failed", 0, 0, void 0, extractErrorMessage(e));
     return null;
   }
 }
@@ -1870,11 +1887,11 @@ function mapInner(r, f) {
 function mapOuter(r, f) {
   return r.matched ? f(r) : r;
 }
-function ab(pa, pb, join3) {
-  return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join3(ma.value, vb, data, i, j)));
+function ab(pa, pb, join4) {
+  return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join4(ma.value, vb, data, i, j)));
 }
-function abc(pa, pb, pc, join3) {
-  return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join3(ma.value, mb.value, vc, data, i, j))));
+function abc(pa, pb, pc, join4) {
+  return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join4(ma.value, mb.value, vc, data, i, j))));
 }
 function ahead(p) {
   return (data, i) => mapOuter(p(data, i), (m1) => ({
@@ -5851,8 +5868,8 @@ function trimCharacterEnd(str, char) {
 function unicodeEscape(str) {
   return str.replace(/[\s\S]/g, (c) => "\\u" + c.charCodeAt().toString(16).padStart(4, "0"));
 }
-function get(obj, path5) {
-  for (const key of path5) {
+function get(obj, path6) {
+  for (const key of path6) {
     if (!obj) {
       return void 0;
     }
@@ -7053,8 +7070,8 @@ function withBrackets(str, brackets) {
   const rbr = typeof brackets[1] === "string" ? brackets[1] : "]";
   return lbr + str + rbr;
 }
-function pathRewrite(path5, rewriter, baseUrl, metadata, elem) {
-  const modifiedPath = typeof rewriter === "function" ? rewriter(path5, metadata, elem) : path5;
+function pathRewrite(path6, rewriter, baseUrl, metadata, elem) {
+  const modifiedPath = typeof rewriter === "function" ? rewriter(path6, metadata, elem) : path6;
   return modifiedPath[0] === "/" && baseUrl ? trimCharacterEnd(baseUrl, "/") + modifiedPath : modifiedPath;
 }
 function formatImage(elem, walk, builder, formatOptions) {
@@ -7378,9 +7395,9 @@ function handleDeprecatedOptions(options) {
     options.selectors.push(...tagDefinitions);
     options.selectors = mergeDuplicatesPreferLast(options.selectors, ((s) => s.selector));
   }
-  function set(obj, path5, value) {
-    const valueKey = path5.pop();
-    for (const key of path5) {
+  function set(obj, path6, value) {
+    const valueKey = path6.pop();
+    for (const key of path6) {
       let nested = obj[key];
       if (!nested) {
         nested = {};
@@ -7670,20 +7687,147 @@ registerHook("post_tool_use", postSkillHandler, { toolName: "Skill" });
 
 // src/hooks_bash.ts
 init_define_import_meta_env();
-import { statSync as statSync6, existsSync } from "node:fs";
 
-// src/hooks_bash_commands.ts
+// src/bash_structural_index.ts
+init_define_import_meta_env();
+import { statSync as statSync4 } from "node:fs";
+var ALLOWED_BINARIES = /* @__PURE__ */ new Set(["rg", "grep", "egrep", "fgrep"]);
+var PY_DEF_RE = /^\^?(?:async\s+)?def\b(?:\s+([A-Za-z_]\w*))?$/;
+var PY_CLASS_RE = /^\^?class\b(?:\s+([A-Za-z_]\w*))?$/;
+var IMPORT_RE = /^\^import\b/;
+var SHELL_SAFE_UNQUOTED_RE = /^[A-Za-z0-9_.:/+,=@^-]+$/;
+var SHELL_UNSAFE_IN_EITHER_QUOTING_RE = /[$`"\\\r\n]/;
+function dualShellArg(s) {
+  if (SHELL_SAFE_UNQUOTED_RE.test(s)) return s;
+  if (SHELL_UNSAFE_IN_EITHER_QUOTING_RE.test(s)) return null;
+  return `"${s}"`;
+}
+function detectStructuralIndexRewrite(rawCmd, cwd) {
+  try {
+    const detected = detectFromCommand(rawCmd, cwd);
+    if (detected === null || detected.filter.name !== "grep") return null;
+    const argv = detected.argv;
+    if (argv.length !== 3) return null;
+    const [bin, pattern, rawPath] = argv;
+    if (bin === void 0 || pattern === void 0 || rawPath === void 0) return null;
+    if (!ALLOWED_BINARIES.has(pathStem(bin).toLowerCase())) return null;
+    if (/[*?[\]{}]/.test(rawPath)) return null;
+    const resolved = resolveIndexPath(rawPath, cwd);
+    let stat;
+    try {
+      stat = statSync4(resolved);
+    } catch {
+      return null;
+    }
+    if (!stat.isFile()) return null;
+    const entry = getFileEntry(resolved);
+    if (entry === null) return null;
+    if (entry.sha !== "") {
+      const diskSha = fingerprintFile(resolved);
+      if (diskSha === null || diskSha !== entry.sha) return null;
+    }
+    const pathArg = dualShellArg(rawPath);
+    if (pathArg === null) return null;
+    let target = null;
+    if (DOC_EXT_RE.test(rawPath) && STRUCTURAL_DOC_PATTERN_RE.test(pattern)) {
+      target = { command: `outline ${pathArg}`, kind: "headings" };
+    } else {
+      const lang = detectLanguage(resolved);
+      const trimmedPattern = pattern.trim();
+      if (lang === "python" && languageHasFlag(lang, "grepSource")) {
+        const defMatch = PY_DEF_RE.exec(trimmedPattern);
+        const classMatch = defMatch === null ? PY_CLASS_RE.exec(trimmedPattern) : null;
+        const nameMatch = defMatch ?? classMatch;
+        if (nameMatch !== null) {
+          const name2 = nameMatch[1];
+          if (name2) {
+            const grepArg = dualShellArg("^" + name2);
+            target = grepArg === null ? null : { command: `outline ${pathArg} --grep ${grepArg}`, kind: `symbols named starting with ${name2} (functions, classes or any other kind sharing that name)` };
+          } else {
+            target = { command: `outline ${pathArg}`, kind: "all symbols in the file (not just functions/classes)" };
+          }
+        } else if (IMPORT_RE.test(trimmedPattern)) {
+          target = { command: `imports ${pathArg}`, kind: "imports" };
+        }
+      } else if (lang !== "unknown" && languageHasFlag(lang, "grepSource") && IMPORT_RE.test(trimmedPattern)) {
+        target = { command: `imports ${pathArg}`, kind: "imports" };
+      }
+    }
+    if (target === null) return null;
+    const notice = `[token-goat: rewrote this rg/grep search to an indexed answer (${target.kind}) instead of running it -- re-run your original command yourself for a literal text search]`;
+    const noticeArg = dualShellArg(notice);
+    if (noticeArg === null) return null;
+    return { command: `token-goat --notice ${noticeArg} ${target.command}`, kind: target.kind };
+  } catch {
+    return null;
+  }
+}
+
+// src/bash_range_savings.ts
 init_define_import_meta_env();
-import { statSync as statSync5 } from "node:fs";
+import { statSync as statSync5, readFileSync as readFileSync3 } from "node:fs";
+var ALL_SYMBOLS_IN_FILE = -1;
+var REGION_HEADER_BYTES = 56;
+function rangeSubstituteFor(hintPath, cwd, ranges) {
+  if (ranges.length === 0) return null;
+  try {
+    const resolved = resolveIndexPath(hintPath, cwd);
+    if (!statSync5(resolved).isFile()) return null;
+    const entry = getFileEntry(resolved);
+    if (entry === null) return null;
+    if (entry.sha !== "") {
+      const diskSha = fingerprintFile(resolved);
+      if (diskSha === null || diskSha !== entry.sha) return null;
+    }
+    const lines = readFileSync3(resolved, "utf8").split("\n");
+    const symbols = querySymbols({ filePath: resolved, limit: ALL_SYMBOLS_IN_FILE });
+    if (symbols.length === 0) return null;
+    const bytesOf = (start, end) => Buffer.byteLength(lines.slice(start - 1, Math.min(end, lines.length)).join("\n"), "utf8");
+    const requestedLines = /* @__PURE__ */ new Set();
+    const regionBySpan = /* @__PURE__ */ new Map();
+    for (const [start, end] of ranges) {
+      for (let l = start; l <= Math.min(end, lines.length); l++) requestedLines.add(l);
+      for (const r of resolveLineRegions(symbols, lines.length, start, end)) {
+        const named = symbols.find((s) => s.lineStart === r.start && s.lineEnd === r.end);
+        regionBySpan.set(`${r.start}-${r.end}`, {
+          kind: r.kind,
+          name: r.kind === "symbol" && r.end > r.start && named !== void 0 ? named.name : null,
+          start: r.start,
+          end: r.end
+        });
+      }
+    }
+    if (regionBySpan.size === 0) return null;
+    let requestedBytes = 0;
+    for (const l of requestedLines) requestedBytes += Buffer.byteLength(lines[l - 1] ?? "", "utf8") + 1;
+    const regions = [...regionBySpan.values()].sort((a, b) => a.start - b.start || a.end - b.end);
+    const replacementBytes = regions.reduce((t, r) => t + bytesOf(r.start, r.end) + REGION_HEADER_BYTES, 0);
+    const commands = regions.map(
+      (r) => r.name === null ? `token-goat read "${hintPath}:${r.start}-${r.end}"` : `token-goat read "${hintPath}::${r.name}"`
+    );
+    return { requestedBytes, replacementBytes, commands };
+  } catch {
+    return null;
+  }
+}
+
+// src/bash_surgical_target.ts
+init_define_import_meta_env();
+import { statSync as statSync7 } from "node:fs";
 
 // src/bash_extractors.ts
 init_define_import_meta_env();
-import { statSync as statSync4, openSync as openSync2, readSync, closeSync as closeSync2 } from "node:fs";
-function surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml = false) {
-  return isXml ? 'Use `token-goat xml-outline "' + hintPath + '"` to inspect structure, or `token-goat xml-query "' + hintPath + '" "<selector>"` to query specific nodes.' : isEnv ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` to read a specific variable.' : isConfig ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` or `token-goat section "' + hintPath + '::sectionName"` to read a specific value.' : isDoc ? 'Use `token-goat section "' + hintPath + '::SectionHeading"` to read one section.' : 'Use `token-goat read "' + hintPath + '::SymbolName"` to read one function or class.';
+import { statSync as statSync6, openSync as openSync2, readSync, closeSync as closeSync2 } from "node:fs";
+function genericSurgicalFallback(shown) {
+  return '`token-goat outline "' + shown + '"`';
+}
+function surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml = false, target = null) {
+  const key = target ?? "KEY_NAME";
+  const section = target ?? "SectionHeading";
+  return isXml ? 'Use `token-goat xml-outline "' + hintPath + '"` to inspect structure, or `token-goat xml-query "' + hintPath + '" "<selector>"` to query specific nodes.' : isEnv ? 'Use `token-goat config-get "' + hintPath + '" ' + key + "` to read a specific variable." : isConfig ? target === null ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` or `token-goat section "' + hintPath + '::sectionName"` to read a specific value.' : 'Use `token-goat config-get "' + hintPath + '" ' + key + "` to read a specific value, or " + genericSurgicalFallback(hintPath) + " for every key with line ranges." : isDoc ? 'Use `token-goat section "' + hintPath + "::" + section + '"` to read one section' + (target === null ? "." : ", or " + genericSurgicalFallback(hintPath) + " for every heading with line ranges.") : "Use " + genericSurgicalFallback(hintPath) + " to read one function or class.";
 }
 function surgicalHintForConfigDoc(filePath, isConfig, isDoc, isSql, isXml = false) {
-  return isXml ? 'Use `token-goat xml-outline "' + filePath + '"` to inspect structure, or `token-goat xml-query "' + filePath + '" "<selector>"` to query specific nodes.' : isConfig ? 'Use `token-goat config-get "' + filePath + '" KEY_NAME` or `token-goat section "' + filePath + '::sectionName"` to read a specific value.' : isSql ? 'Use `token-goat section "' + filePath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.' : isDoc ? 'Use `token-goat section "' + filePath + '::SectionHeading"` to read one section.' : 'Use `token-goat read "' + filePath + '::SymbolName"` or `token-goat skeleton "' + filePath + '"` to see the file structure.';
+  return isXml ? 'Use `token-goat xml-outline "' + filePath + '"` to inspect structure, or `token-goat xml-query "' + filePath + '" "<selector>"` to query specific nodes.' : isConfig ? 'Use `token-goat config-get "' + filePath + '" KEY_NAME` or `token-goat section "' + filePath + '::sectionName"` to read a specific value.' : isSql ? 'Use `token-goat section "' + filePath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.' : isDoc ? 'Use `token-goat section "' + filePath + '::SectionHeading"` to read one section.' : "Use " + genericSurgicalFallback(filePath) + ' or `token-goat skeleton "' + filePath + '"` to see the file structure.';
 }
 function splitShellSegments(cmd) {
   const segments = [];
@@ -7782,7 +7926,7 @@ var PS_FILE_METHOD_RE = /\[(?:System\.)?IO\.File\]::(?:ReadAllText|ReadAllLines|
 var PS_TEMP_READ_FLOOD_BYTES = 16 * 1024;
 function isLargeFileOnDisk(filePath, floor) {
   try {
-    return statSync4(filePath).size >= floor;
+    return statSync6(filePath).size >= floor;
   } catch {
     return false;
   }
@@ -8215,27 +8359,21 @@ function extractLineRangeReadsCompound(cmd) {
   }
   return [...merged.values()];
 }
-function sedRangeHint(filePath, ranges, tool) {
-  const lang = detectLanguage(filePath);
-  const rangeReads = ranges.map(([s, e]) => '`token-goat read "' + filePath + "@" + s + "-" + e + '"`');
-  const allReads = rangeReads.length === 2 ? rangeReads.join(" and ") : rangeReads.length >= 3 ? rangeReads.slice(0, -1).join(", ") + ", and " + rangeReads[rangeReads.length - 1] : rangeReads[0];
-  const prefix = "`" + (tool === "awk" ? "awk" : "sed -n") + "` line-range reads bypass read hooks. ";
-  if (lang === "markdown") {
-    return prefix + 'For Markdown, `token-goat section "' + filePath + '::<heading>"` extracts a whole section by name (robust to line shifts); or ' + allReads + " for exactly those lines.";
-  }
-  if (lang === "toml" || lang === "json" || lang === "yaml" || lang === "ini") {
-    return prefix + 'For config, `token-goat config-get "' + filePath + '" <key>` or `token-goat section "' + filePath + '::<block>"` extracts one value; or ' + allReads + " for exactly those lines.";
-  }
-  if (languageHasFlag(lang, "symbolBearing")) {
-    return prefix + 'For a whole function/class, `token-goat symbol <name>` or `token-goat read "' + filePath + '::<Symbol>"` is robust to line shifts; or ' + allReads + " for exactly those lines.";
-  }
-  return prefix + "Use " + allReads + " to read exactly those lines.";
+function sedRangeHint(filePath, ranges, tool, sub) {
+  return "`" + (tool === "awk" ? "awk" : "sed -n") + "` line-range reads bypass read hooks. " + substituteSentence(filePath, ranges, sub);
 }
-function leadingLinesHint(lead, hintPath, start, end, flags, preHookCwd) {
+function substituteSentence(filePath, ranges, sub) {
+  const spans = ranges.map(([s, e]) => s + "-" + e).join(", ");
+  const reads = sub.commands.map((c) => "`" + c + "`");
+  const allReads = reads.length === 2 ? reads.join(" and ") : reads.length >= 3 ? reads.slice(0, -1).join(", ") + ", and " + reads[reads.length - 1] : reads[0];
+  return "Lines " + spans + " of " + filePath + " cost " + sub.requestedBytes + " bytes; " + allReads + " returns the same content as " + sub.replacementBytes + " bytes, resolved to whole regions and robust to line shifts.";
+}
+function leadingLinesHint(lead, hintPath, start, end, preHookCwd, substitute) {
   const key = resolveIndexPath(hintPath, preHookCwd ?? process.cwd());
   const prior = findRangeOverlap(getFileLineRanges(key), start, end);
   if (prior !== null) return sedOverlapHint(hintPath, prior, start, end);
-  return lead + surgicalHintForConfigDoc(hintPath, flags.isConfig, flags.isDoc, flags.isSql, flags.isXml ?? false);
+  if (substitute === null) return null;
+  return lead + substituteSentence(hintPath, [[start, end]], substitute);
 }
 function findRangeOverlap(prior, start, end) {
   let best = null;
@@ -8379,7 +8517,7 @@ function extractTasksOutput(cmd) {
   return null;
 }
 function extractToolResultsFile(cmd) {
-  const toolResultsRe = /[/\\]tool-results[/\\]([a-z0-9-]+)\.txt$/i;
+  const toolResultsRe = new RegExp("[/\\\\]tool-results[/\\\\](" + TOOL_RESULTS_ID_CHARS + ")\\.txt$", "i");
   const catM = /^cat(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+))*\s+(?:"([^"]+)"|'([^']+)'|(\S+))\s*$/.exec(cmd);
   if (catM) {
     const fp = catM[1] ?? catM[2] ?? catM[3];
@@ -8733,7 +8871,43 @@ function extractTerminalXmlParsing(cmd) {
   return null;
 }
 
+// src/bash_surgical_target.ts
+var ALL_SYMBOLS_IN_FILE2 = -1;
+function quotableName(name2) {
+  const safe = escapeHintName(name2);
+  return safe === "" || safe.includes("::") ? null : safe;
+}
+function runnableTargetFor(hintPath, cwd, event) {
+  try {
+    if (!commandPathIsTouchable(hintPath, event)) return null;
+    const resolved = resolveIndexPath(hintPath, cwd);
+    if (!statSync7(resolved).isFile()) return null;
+    const entry = getFileEntry(resolved);
+    if (entry === null) return null;
+    if (entry.sha !== "") {
+      const diskSha = fingerprintFile(resolved);
+      if (diskSha === null || diskSha !== entry.sha) return null;
+    }
+    const symbols = querySymbols({ filePath: resolved, limit: ALL_SYMBOLS_IN_FILE2 });
+    if (symbols.length === 0) return null;
+    const inLineOrder = [...symbols].sort((a, b) => a.lineStart - b.lineStart);
+    for (const s of inLineOrder) {
+      const safe = quotableName(s.name);
+      if (safe !== null) return safe;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+// src/hooks_bash.ts
+import { statSync as statSync9, existsSync, readFileSync as readFileSync4 } from "node:fs";
+import * as path4 from "node:path";
+
 // src/hooks_bash_commands.ts
+init_define_import_meta_env();
+import { statSync as statSync8 } from "node:fs";
 var CD_PREFIX_RE = /^(?:cd\s+(?:"[^"]*"|'[^']*'|\S+)[ \t]*(?:&&|;|\r?\n)\s*)+/;
 function stripCdPrefix(cmd) {
   const stripped = cmd.replace(CD_PREFIX_RE, "");
@@ -8949,7 +9123,7 @@ function workingTreeStatusPaths(gitDir) {
 function enqueueRewrittenPath(absPath) {
   if (/(?:^|[/\\])(?:NUL|nul)$/.test(absPath) || absPath.replace(/\\/g, "/").endsWith("/dev/null")) return;
   try {
-    if (!statSync5(absPath).isFile()) return;
+    if (!statSync8(absPath).isFile()) return;
   } catch {
     return;
   }
@@ -9014,6 +9188,15 @@ function pipelineShapeFilter(cmd, cwd) {
   const detected = detectFromCommand(stripOutputPipeline(cmd), cwd ?? void 0);
   return detected === null ? null : detected.filter;
 }
+function isFullRecallCommand(cmd) {
+  const forSplit = cmd.replace(/\s2>(?:&1|\/dev\/null)/g, "");
+  if (hasBareBackgroundOrNewline(forSplit)) return false;
+  const first2 = splitShellSegments(forSplit)[0];
+  if (first2 === void 0 || !segmentCommandIs(first2, "token-goat")) return false;
+  const tokens = safeShlexSplit(stripOutputPipeline(first2));
+  if (tokens === null) return false;
+  return Object.values(RECALL_COMMAND).includes(tokens[1] ?? "") && tokens.includes("--full");
+}
 function pureFileReadPath(cmd) {
   const single = extractCatFile(cmd)?.filePath ?? extractHeadFile(cmd)?.filePath ?? extractTailFile(cmd)?.filePath ?? extractLineRangeRead(cmd)?.filePath;
   if (single !== void 0) return single;
@@ -9218,6 +9401,7 @@ function detectUnbalancedShellSyntax(cmd) {
 function maybeCompressRewrite(event, rawCmd, cmd) {
   if (process.env["TOKEN_GOAT_BASH_COMPRESS"] === "0") return null;
   if (event.raw["_tg_harness"] === "vscode") return null;
+  if ((event.raw["_tg_harness"] === "codex" || event.raw["_tg_harness"] === "copilot_cli") && process.platform === "win32") return null;
   let cfg;
   try {
     cfg = loadConfig().bash_compress;
@@ -9297,7 +9481,7 @@ function foldShellReadStructure(cmd, filePath, output, fileKey, cwd) {
   const originalBytes = Buffer.byteLength(output, "utf-8");
   let onDisk;
   try {
-    onDisk = statSync6(fileKey).size;
+    onDisk = statSync9(fileKey).size;
   } catch {
     return null;
   }
@@ -9405,6 +9589,7 @@ async function maybeElideServedGenericOutput(cmd, output, exitCode, cwd, cacheMi
 async function maybeCompressCompoundOutput(cmd, output, exitCode, cwd, cacheMinBytes, isUnwrapped = false) {
   if (process.env["TOKEN_GOAT_BASH_COMPRESS"] === "0") return null;
   if (!isUnwrapped && isCompressibleSingleCommand(cmd)) return null;
+  if (isFullRecallCommand(cmd)) return null;
   if (exitCode !== null && exitCode !== 0) return null;
   let cfg;
   try {
@@ -9423,7 +9608,7 @@ async function maybeCompressCompoundOutput(cmd, output, exitCode, cwd, cacheMinB
   });
   const minNet = resolveMinNetSavingsBytes();
   if (!compressed.worthApplying(minNet)) return null;
-  const id = await commandHash(cmd, cwd);
+  const id = bashOutputIdSync(cmd, output, cwd);
   const { body: untrusted, notices } = splitOwnTrailingNotices(compressed.text);
   const marker = compressed.withMarker(minNet).slice(compressed.text.length);
   const body = fenceUntrusted(untrusted, UNTRUSTED_TOOL_TAG) + notices + marker + "\n[token-goat] full output: bash-output " + id + " --full";
@@ -9502,6 +9687,15 @@ function preBashHandlerInner(event) {
   const cdStripped = cmd !== rawCmd;
   const preHookCwd = getCwd(event) ?? null;
   const hintCwd = preHookCwd ?? process.cwd();
+  const pathHint = (paths, text) => contextOutput(text, typeof paths === "string" ? [paths] : paths);
+  const pricedSubstitute = (hintPath, start, end) => {
+    const sub = rangeSubstituteFor(hintPath, hintCwd, [[start, end]]);
+    return sub !== null && meetsSavingsFloor(sub.requestedBytes - sub.replacementBytes) ? sub : null;
+  };
+  const declineUnpriced = (paths) => {
+    for (const p of typeof paths === "string" ? [paths] : paths) logSuppressedDetection("bash_redirect", event.sessionId, p);
+    return passOutput();
+  };
   const cfg = loadConfig();
   if (cfg.hints.warn_unbalanced_shell_quoting) {
     const quoteError = detectUnbalancedShellSyntax(cmd);
@@ -9562,17 +9756,19 @@ function preBashHandlerInner(event) {
     const { filePath, toolOrScript } = terminalXml;
     recordStat("session_hint", 0, 0);
     const target = filePath ? displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath) : "<file>";
-    return contextOutput(
+    return pathHint(
+      filePath ? [target] : [],
       `token-goat available for this file type, consider 'token-goat xml-query "${target}" "<xpath>"' or 'token-goat xml-outline "${target}"' first instead of terminal XML parsing (${toolOrScript}).`
     );
   }
   const singleLineRangeRead = extractLineRangeRead(cmd);
   const sedReads = singleLineRangeRead !== null ? [singleLineRangeRead] : extractLineRangeReadsCompound(cmd);
   if (sedReads !== null) {
-    recordStat("session_hint", 0, 0);
     const hints = [];
+    const hintPaths = [];
     for (const { filePath, ranges, tool } of sedReads) {
       const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
+      hintPaths.push(hintPath);
       const sedDedupKey = resolveIndexPath(hintPath, preHookCwd ?? process.cwd());
       const overlapHints = [];
       const freshRanges = [];
@@ -9586,23 +9782,30 @@ function preBashHandlerInner(event) {
         }
       }
       hints.push(...overlapHints);
-      if (freshRanges.length > 0) hints.push(sedRangeHint(hintPath, freshRanges, tool));
+      const sub = freshRanges.length > 0 ? rangeSubstituteFor(hintPath, hintCwd, freshRanges) : null;
+      if (sub !== null && meetsSavingsFloor(sub.requestedBytes - sub.replacementBytes)) {
+        hints.push(sedRangeHint(hintPath, freshRanges, tool, sub));
+      }
     }
-    return contextOutput(hints.join(" "));
+    if (hints.length === 0) return declineUnpriced(hintPaths);
+    recordStat("session_hint", 0, 0);
+    return pathHint(hintPaths, hints.join(" "));
   }
   const gcTailResult = extractGetContentTail(cmd);
   if (gcTailResult !== null) {
     const { filePath, isDoc, isConfig, isSql, isXml } = gcTailResult;
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
     recordStat("session_hint", 0, 0);
-    return contextOutput("`Get-Content -Tail` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql, isXml));
+    return pathHint(hintPath, "`Get-Content -Tail` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql, isXml));
   }
   const gcSelectResult = extractGetContentSelectFirst(cmd);
   if (gcSelectResult !== null) {
-    const { filePath, isDoc, isConfig, isSql, isXml, n } = gcSelectResult;
+    const { filePath, n } = gcSelectResult;
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
+    const gcSelectHint = leadingLinesHint("`Select-Object -First` bypasses read hooks. ", hintPath, 1, n, preHookCwd, pricedSubstitute(hintPath, 1, n));
+    if (gcSelectHint === null) return declineUnpriced(hintPath);
     recordStat("session_hint", 0, 0);
-    return contextOutput(leadingLinesHint("`Select-Object -First` bypasses read hooks. ", hintPath, 1, n, { isConfig, isDoc, isSql, isXml }, preHookCwd));
+    return pathHint(hintPath, gcSelectHint);
   }
   const catJsonPipe = extractCatJsonPipe(cmd);
   if (catJsonPipe !== null) {
@@ -9610,7 +9813,8 @@ function preBashHandlerInner(event) {
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
     recordStat("session_hint", 0, 0);
     const label = isDirectJq ? "`jq`" : "`cat | jq`";
-    return contextOutput(
+    return pathHint(
+      hintPath,
       label + ' loads the whole file. Use `token-goat json-query "' + hintPath + '" "<key>"` or `token-goat config-get "' + hintPath + '" KEY_NAME` to slice one value.'
     );
   }
@@ -9619,7 +9823,8 @@ function preBashHandlerInner(event) {
     recordStat("session_hint", 0, 0);
     if (psJsonPipe.filePath) {
       const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, psJsonPipe.filePath, hintCwd) : psJsonPipe.filePath);
-      return contextOutput(
+      return pathHint(
+        hintPath,
         'PowerShell `ConvertFrom-Json` pipeline detected. Use `token-goat json-query "' + hintPath + '" "<selector>"` to extract fields directly without shell conversion scripts.'
       );
     }
@@ -9633,12 +9838,13 @@ function preBashHandlerInner(event) {
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
     recordStat("session_hint", 0, 0);
     if (isSql) {
-      return contextOutput(
+      return pathHint(
+        hintPath,
         "`" + cmd0 + '` loads the entire file into context. Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.'
       );
     }
-    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml);
-    return cdStripped || advisoryOnly ? contextOutput("`" + cmd0 + "` loads the entire file into context. " + hint) : denyOutput("`" + cmd0 + "` loads the entire file into context. " + hint);
+    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml, runnableTargetFor(hintPath, hintCwd, event));
+    return cdStripped || advisoryOnly ? pathHint(hintPath, "`" + cmd0 + "` loads the entire file into context. " + hint) : denyOutput("`" + cmd0 + "` loads the entire file into context. " + hint);
   }
   const catMulti = extractCatFilesMulti(cmd);
   if (catMulti !== null) {
@@ -9650,7 +9856,7 @@ function preBashHandlerInner(event) {
       return "  " + hintPath + " -> `" + how + "`";
     });
     const msg = "`" + cmd0 + "` on multiple files loads them all into context. Read each surgically instead:\n" + perPath.join("\n");
-    return cdStripped ? contextOutput(msg) : denyOutput(msg);
+    return cdStripped ? pathHint(catMulti.map((m) => displaySafePath(resolveCdHintPath(rawCmd, m.filePath, hintCwd))), msg) : denyOutput(msg);
   }
   const psGetContentResult = extractPowerShellWrappedGetContent(cmd, event);
   if (psGetContentResult !== null) {
@@ -9659,10 +9865,10 @@ function preBashHandlerInner(event) {
     recordStat("session_hint", 0, 0);
     const lead = "`Get-Content` via a `powershell -Command` wrapper bypasses read hooks and loads the entire file into context. ";
     if (isSql) {
-      return contextOutput(lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
+      return pathHint(hintPath, lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
     }
-    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml);
-    return cdStripped ? contextOutput(lead + hint) : denyOutput(lead + hint);
+    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml, runnableTargetFor(hintPath, hintCwd, event));
+    return cdStripped ? pathHint(hintPath, lead + hint) : denyOutput(lead + hint);
   }
   const wslCatResult = extractWslCatFile(cmd);
   if (wslCatResult !== null) {
@@ -9670,12 +9876,13 @@ function preBashHandlerInner(event) {
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
     recordStat("session_hint", 0, 0);
     if (isSql) {
-      return contextOutput(
+      return pathHint(
+        hintPath,
         '`cat` loads the entire file into context. Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.'
       );
     }
-    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml);
-    return cdStripped ? contextOutput("`cat` loads the entire file into context. " + hint) : denyOutput("`cat` loads the entire file into context. " + hint);
+    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml, runnableTargetFor(hintPath, hintCwd, event));
+    return cdStripped ? pathHint(hintPath, "`cat` loads the entire file into context. " + hint) : denyOutput("`cat` loads the entire file into context. " + hint);
   }
   const pyRead = extractPythonFileRead(cmd);
   if (pyRead !== null) {
@@ -9685,33 +9892,37 @@ function preBashHandlerInner(event) {
     if (isOutputFile) {
       if (taskOutputIsJsonlTranscript(filePath)) {
         const tHint = 'This `.output` file is a JSONL agent transcript. Use `token-goat bash-output --file "' + hintPath + '" --transcript` to read the assistant text, then narrow with `--grep PATTERN` or `--tail N`, instead of hand-parsing the JSONL.';
-        return cdStripped ? contextOutput(tHint) : denyOutput(tHint);
+        return cdStripped ? pathHint(hintPath, tHint) : denyOutput(tHint);
       }
-      return contextOutput(
+      return pathHint(
+        hintPath,
         "This `.output` file is a background command's stdout. Use `token-goat bash-output --file \"" + hintPath + '"` to narrow it with `--grep PATTERN`, `--tail N` or `--head N`, instead of reading the whole file.'
       );
     }
     if (isSql) {
-      return contextOutput(
+      return pathHint(
+        hintPath,
         'Python `open()` file reads bypass read hooks. Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.'
       );
     }
-    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml);
-    return cdStripped ? contextOutput("Python `open()` file reads bypass read hooks. " + hint) : denyOutput("Python `open()` file reads bypass read hooks. " + hint);
+    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml, runnableTargetFor(hintPath, hintCwd, event));
+    return cdStripped ? pathHint(hintPath, "Python `open()` file reads bypass read hooks. " + hint) : denyOutput("Python `open()` file reads bypass read hooks. " + hint);
   }
   const tailResult = extractTailFile(cmd);
   if (tailResult !== null) {
     const { filePath, isDoc, isConfig, isSql, isXml } = tailResult;
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
     recordStat("session_hint", 0, 0);
-    return contextOutput("`tail` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql, isXml));
+    return pathHint(hintPath, "`tail` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql, isXml));
   }
   const headResult = extractHeadFile(cmd);
   if (headResult !== null) {
-    const { filePath, isDoc, isConfig, isSql, isXml, n } = headResult;
+    const { filePath, n } = headResult;
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
+    const headHint = leadingLinesHint("`head` bypasses read hooks. ", hintPath, 1, n, preHookCwd, pricedSubstitute(hintPath, 1, n));
+    if (headHint === null) return declineUnpriced(hintPath);
     recordStat("session_hint", 0, 0);
-    return contextOutput(leadingLinesHint("`head` bypasses read hooks. ", hintPath, 1, n, { isConfig, isDoc, isSql, isXml }, preHookCwd));
+    return pathHint(hintPath, headHint);
   }
   const nodeRead = extractNodeFileRead(cmd);
   if (nodeRead !== null) {
@@ -9720,11 +9931,11 @@ function preBashHandlerInner(event) {
     const lead = "Node.js `fs.readFileSync()` bypasses read hooks. ";
     if (isSql) {
       recordStat("session_hint", 0, 0);
-      return contextOutput(lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
+      return pathHint(hintPath, lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
     }
-    const hint = isDoc ? 'Use `token-goat section "' + hintPath + '::SectionHeading"` to read one section.' : isConfig ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` or `token-goat section "' + hintPath + '::sectionName"` to read a specific value.' : 'Use `token-goat read "' + hintPath + '::SymbolName"` to extract a specific symbol.';
+    const hint = surgicalHintFor(hintPath, false, isConfig, isDoc, false, runnableTargetFor(hintPath, hintCwd, event));
     recordStat("session_hint", 0, 0);
-    return cdStripped ? contextOutput(lead + hint) : denyOutput(lead + hint);
+    return cdStripped ? pathHint(hintPath, lead + hint) : denyOutput(lead + hint);
   }
   const psMethodRead = extractPowerShellFileMethodRead(cmd, event);
   if (psMethodRead !== null) {
@@ -9733,11 +9944,15 @@ function preBashHandlerInner(event) {
     const lead = "PowerShell `[IO.File]::ReadAllText()` bypasses read hooks. ";
     if (isSql) {
       recordStat("session_hint", 0, 0);
-      return contextOutput(lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
+      return pathHint(hintPath, lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
     }
-    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml);
+    const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc, isXml, runnableTargetFor(hintPath, hintCwd, event));
     recordStat("session_hint", 0, 0);
-    return cdStripped ? contextOutput(lead + hint) : denyOutput(lead + hint);
+    return cdStripped ? pathHint(hintPath, lead + hint) : denyOutput(lead + hint);
+  }
+  const structuralRewrite = detectStructuralIndexRewrite(rawCmd, hintCwd);
+  if (structuralRewrite !== null) {
+    return { hookType: "rewriteInput", updatedInput: { ...event.toolInput, command: structuralRewrite.command } };
   }
   if (extractGrepPipeChain(cmd)) {
     recordStat("session_hint", 0, 0);
@@ -9750,7 +9965,8 @@ function preBashHandlerInner(event) {
     const { filePath } = mdHeadingGrep;
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
     recordStat("session_hint", 0, 0);
-    return contextOutput(
+    return pathHint(
+      hintPath,
       'Use `token-goat outline "' + hintPath + '"` to get all headings with line ranges \u2014 then `token-goat section "' + hintPath + '::Heading"` to read one section.'
     );
   }
@@ -9759,7 +9975,8 @@ function preBashHandlerInner(event) {
     const { identifier } = rgSymbol;
     recordStat("session_hint", 0, 0);
     return contextOutput(
-      "Use `token-goat symbol " + identifier + "` to jump directly to the definition without scanning the file."
+      "Use `token-goat symbol " + identifier + "` to jump directly to the definition without scanning the file.",
+      [identifier]
     );
   }
   const rgStructural = extractRgStructuralSearch(cmd);
@@ -9767,7 +9984,8 @@ function preBashHandlerInner(event) {
     const { filePath } = rgStructural;
     const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
     recordStat("session_hint", 0, 0);
-    return contextOutput(
+    return pathHint(
+      hintPath,
       'Searching for code definitions with `rg`/`grep` is slower than surgical reads. Use `token-goat skeleton "' + hintPath + '"` to see all symbols with line numbers, or `token-goat outline "' + hintPath + '"` for symbols with docstrings and line ranges.'
     );
   }
@@ -9799,7 +10017,7 @@ function preBashHandlerInner(event) {
     const prevResolvedPath = prevPath !== null && commandPathIsTouchable(prevPath, event) ? resolveIndexPath(prevPath, preHookCwd ?? process.cwd()) : null;
     if (prevPath !== null && prevResolvedPath !== null && !existsSync(prevResolvedPath)) {
       clearCurlDownload(curlDl.url);
-    } else if (prevPath !== null && prevResolvedPath !== null && statSync6(prevResolvedPath).size >= loadConfig().hints.bash_dedup_min_bytes) {
+    } else if (prevPath !== null && prevResolvedPath !== null && statSync9(prevResolvedPath).size >= loadConfig().hints.bash_dedup_min_bytes) {
       recordStat("session_hint", 0, 0);
       return denyOutput(
         "Already downloaded to " + prevPath + " earlier this session. Use `rg '<pattern>' " + prevPath + '` to search it, or `token-goat read "' + prevPath + '::SectionName"` to read a part of it.'
@@ -9861,7 +10079,7 @@ function preBashHandlerInner(event) {
     }
     if (notes.length > 0) {
       recordStat("session_hint", 0, 0);
-      return contextOutput(notes.join(" "));
+      return pathHint(tgRead.filePath !== null ? [tgRead.filePath] : [], notes.join(" "));
     }
     return passOutput();
   }
@@ -9893,7 +10111,28 @@ function preBashHandler(event) {
   return applyHintTracking(event, preBashHandlerInner(event), classifyBashHint);
 }
 registerHook("pre_tool_use", preBashHandler, { toolName: "Bash" });
-function extractBashOutput(raw) {
+function readPersistedBashOutput(resp, cwd, sessionId) {
+  const persistedPath = resp["persistedOutputPath"];
+  if (typeof persistedPath !== "string" || persistedPath === "" || sessionId === "") return null;
+  const root = path4.join(projectTranscriptsDir(cwd ?? process.cwd()), sessionId, "tool-results");
+  if (!isInsideRoot(persistedPath, root)) return null;
+  try {
+    const stat = statSync9(persistedPath);
+    if (!stat.isFile() || stat.size > MAX_CAPTURE_BYTES) return null;
+    const persistedSize = resp["persistedOutputSize"];
+    if (typeof persistedSize === "number" && Math.abs(stat.size - persistedSize) > 8) return null;
+    return readFileSync4(persistedPath, "utf-8");
+  } catch {
+    return null;
+  }
+}
+function extractBashOutput(event) {
+  const raw = event.raw;
+  const resp = raw["tool_response"];
+  if (resp !== null && typeof resp === "object") {
+    const persisted = readPersistedBashOutput(resp, getCwd(event) ?? null, event.sessionId);
+    if (persisted !== null) return persisted;
+  }
   return extractToolResponseField(raw, OUTPUT_FIRST_TOOL_RESPONSE_KEYS);
 }
 function extractExitCode(raw) {
@@ -10021,7 +10260,7 @@ async function postBashHandler(event) {
     const isUnwrapped = unwrapCompressCommand(rawCmdRaw) === null;
     const rawCmd = unwrapCompressCommand(rawCmdRaw) ?? rawCmdRaw;
     const cmd = stripCdPrefix(rawCmd);
-    const output = extractBashOutput(event.raw);
+    const output = extractBashOutput(event);
     const exitCode = extractExitCode(event.raw);
     const cwd = getCwd(event) ?? null;
     const cacheMinBytes = loadConfig().bash_compress.cache_min_bytes;
@@ -10208,9 +10447,11 @@ function postBashOutputHandler(event) {
     const delta = output.slice(prior.output.length);
     storePollSnapshot(event.sessionId, bashId, output);
     if (Buffer.byteLength(delta, "utf-8") < minBytes) return passOutput();
+    const compressedDelta = looksLikePytestOutput(delta) ? pytestFilter.apply(delta, "", 0, []) : null;
+    const deltaBody = compressedDelta !== null && compressedDelta.worthApplying(resolveMinNetSavingsBytes()) ? compressedDelta.withMarker(resolveMinNetSavingsBytes()) : delta;
     const deltaNotice = `[token-goat: bash_id ${bashId} delta since last poll]
 `;
-    const fenced = fenceUntrusted(delta, UNTRUSTED_TOOL_TAG);
+    const fenced = fenceUntrusted(deltaBody, UNTRUSTED_TOOL_TAG);
     const body = `${deltaNotice}${fenced}`;
     if (!isRewriteWorthwhile({
       originalBytes: Buffer.byteLength(output, "utf-8"),
@@ -10332,7 +10573,7 @@ registerHook("post_tool_use", postTaskOutputHandler, { toolName: "TaskOutput" })
 
 // src/hooks_tool_failure.ts
 init_define_import_meta_env();
-import { existsSync as existsSync2, readFileSync as readFileSync3, statSync as statSync7, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync5, statSync as statSync10, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname as dirname2, relative as relative2 } from "node:path";
 var FAILURE_SUFFIX = ".tool-failures.json";
 var MAX_TRACKED_FAILURES = 64;
@@ -10360,7 +10601,7 @@ function ledgerPath(sessionId) {
 }
 function readLedger(target) {
   try {
-    const parsed = JSON.parse(readFileSync3(target, "utf8"));
+    const parsed = JSON.parse(readFileSync5(target, "utf8"));
     if (parsed !== null && typeof parsed === "object") {
       const seen = parsed.seen;
       const order = parsed.order;
@@ -10401,9 +10642,9 @@ function diagnoseEditFailure(event, errorText) {
   const absPath = normalizePath(filePath);
   if (!existsSync2(absPath)) return null;
   try {
-    const stat = statSync7(absPath);
+    const stat = statSync10(absPath);
     if (stat.size > MAX_EDIT_DIAGNOSE_BYTES) return null;
-    const fileContent = readFileSync3(absPath, "utf8");
+    const fileContent = readFileSync5(absPath, "utf8");
     const relDisplay = displaySafeText(relative2(process.cwd(), absPath).replace(/\\/g, "/") || absPath);
     if (isMultiple) {
       const matchLines = [];
@@ -11051,8 +11292,8 @@ The full payload was cached to prevent harness context spill. Slicing commands:
   }
   return passOrFence();
 }
-registerHook("pre_tool_use", preMcpHandler, { toolPattern: "^mcp__" });
-registerHook("post_tool_use", postMcpHandler, { toolPattern: "^mcp__" });
+registerHook("pre_tool_use", preMcpHandler, { toolPattern: MCP_TOOL_PATTERN });
+registerHook("post_tool_use", postMcpHandler, { toolPattern: MCP_TOOL_PATTERN });
 
 // src/hooks_websearch.ts
 init_define_import_meta_env();
@@ -11253,8 +11494,7 @@ registerHook("post_tool_use", postBrowserImageHandler, { toolPattern: "^mcp__" }
 init_define_import_meta_env();
 import { createHash as createHash2 } from "node:crypto";
 import * as fs2 from "node:fs";
-import * as os2 from "node:os";
-import * as path4 from "node:path";
+import * as path5 from "node:path";
 var BRIEFING_TARGET_TOKENS = 550;
 function buildSubagentBriefing() {
   try {
@@ -11479,8 +11719,8 @@ function parseAgentDefinition(text, fallbackName) {
   return { name: name2, restricted: false };
 }
 function findRestrictedAgentNames(roots) {
-  const projectAgentsRoot = path4.join(process.cwd(), ".claude", "agents");
-  const scanRoots = roots ?? [path4.join(os2.homedir(), ".claude", "agents"), projectAgentsRoot];
+  const projectAgentsRoot = path5.join(process.cwd(), ".claude", "agents");
+  const scanRoots = roots ?? [path5.join(claudeConfigDir(), "agents"), projectAgentsRoot];
   const names = /* @__PURE__ */ new Set();
   const visited = /* @__PURE__ */ new Set();
   let filesSeen = 0;
@@ -11504,7 +11744,7 @@ function findRestrictedAgentNames(roots) {
     }
     for (const entry of entries) {
       if (filesSeen >= ROSTER_WALK_MAX_FILES) return;
-      const full = path4.join(dir, entry.name);
+      const full = path5.join(dir, entry.name);
       let stat;
       try {
         stat = fs2.statSync(full);
@@ -11523,12 +11763,12 @@ function findRestrictedAgentNames(roots) {
       } catch {
         continue;
       }
-      const parsed = parseAgentDefinition(text, path4.basename(entry.name, path4.extname(entry.name)));
+      const parsed = parseAgentDefinition(text, path5.basename(entry.name, path5.extname(entry.name)));
       if (parsed !== null && parsed.restricted) names.add(parsed.name);
     }
   };
   for (const root of scanRoots) {
-    const isProjectRoot = roots === void 0 && path4.resolve(root) === path4.resolve(projectAgentsRoot);
+    const isProjectRoot = roots === void 0 && path5.resolve(root) === path5.resolve(projectAgentsRoot);
     if (!isProjectRoot) {
       walk(root, 0, null);
       continue;
@@ -11658,11 +11898,11 @@ function safeSuggestions(output) {
   if (output.hookType === "context") return { hookType: "context", context: stripUnsafeSuggestions(output.context) };
   return output;
 }
-async function relayInProcess(eventName, rawPayload) {
+async function relayInProcess(eventName, rawPayload, harnessWaitMs) {
+  if (!isHookEventName(eventName)) {
+    return "{}";
+  }
   try {
-    if (!isHookEventName(eventName)) {
-      return "{}";
-    }
     const harness = detectHarness();
     const payload = eventName === "pre_tool_use" || eventName === "post_tool_use" ? normalizePayload(rawPayload, harnessForNormalization()) : rawPayload;
     const event = buildEvent(eventName, payload);
@@ -11693,6 +11933,8 @@ async function relayInProcess(eventName, rawPayload) {
     return serializeOutput(output, event.eventName, harness, event);
   } catch {
     return "{}";
+  } finally {
+    recordStat(`hook:${eventName}`, 0, 0, void 0, void 0, void 0, harnessWaitMs ?? performance.now());
   }
 }
 async function relay(eventName) {