token-goat 2.9.18 → 2.9.20

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

@@ -1,13 +1,16 @@
 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-ITWYDOKP.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
+  MCP_TOOL_PATTERN,
+  RECALL_COMMAND,
   buildCommandManifest,
   checkSymbolBodySize,
   diagnoseSqlFailure,
@@ -17,32 +20,37 @@ import {
   readStdinJson,
   reconcileProject,
   storeWebOutput
-} from "./token-goat-chunk-V3ZWBEHM.mjs";
+} from "./token-goat-chunk-I5PQRHFE.mjs";
+import {
+  projectTranscriptsDir
+} from "./token-goat-chunk-BQIC3AVL.mjs";
+import {
+  BUDGET_ESCALATION_MARKER,
+  MANIFEST_PREAMBLE,
+  MANIFEST_RECOVERY_PREAMBLE,
+  buildManifest,
+  manifestPrintedPaths,
+  summaryBudgetDirective
+} from "./token-goat-chunk-VSJGPEBB.mjs";
 import {
   BODY_FIRST_TOOL_RESPONSE_KEYS,
-  GENERIC_SERVED_OUTPUT_KEY,
   OUTLINE_MAX_REPLACEMENT_RATIO,
   OUTLINE_MIN_HEADINGS,
   OUTPUT_FIRST_TOOL_RESPONSE_KEYS,
-  WEB_FETCH_KEY_SEP,
-  accumulateResidentLines,
   appendDirtyPath,
   applyHintTracking,
   buildDeltaCapsule,
   buildProjectMap,
   classifyBashHint,
   classifyEditHint,
-  clearCurlDownload,
   compactPathFor,
-  computeAdaptiveBudget,
   contextOutput,
   denyOutput,
   emitRewrite,
   emitRewriteIfChanged,
   enqueueDirtyPathSafe,
   ensureWorkerAlive,
-  estimateTokens,
-  extractCompactFromMarker,
+  escapeHintName,
   extractToolResponseField,
   extractToolResultText,
   fenceUntrusted,
@@ -53,42 +61,19 @@ import {
   foldingEnabled,
   formatProjectMap,
   formatShrinkSummary,
-  getBashOutputId,
-  getContextPressure,
-  getCurlDownloadPath,
   getCwd,
-  getFileLineRanges,
   getFilePath,
-  getFileServedOutputs,
-  getGlobMatchCount,
-  getGrepMatchCount,
-  getOutstandingAgentSpawns,
-  getSessionBashOutputs,
-  getSessionBashReruns,
-  getSessionFiles,
-  getSessionWebFetches,
   getToolInput,
   getToolName,
   getTranscriptPath,
-  hasSeenImage,
-  hasSessionOutput,
   imageQualifiesForShrink,
-  incrementSkillHit,
   indexServedBody,
-  installedSkillPath,
   isMcpErrorResponse,
   isStructuralRewriteAccepted,
   isTextualContentBlock,
-  lastTabContextMatches,
-  lineMayCarryResidentSignal,
-  listSiblingSessionStates,
-  loadSessionCache,
-  loadSessionState,
+  logSuppressedDetection,
   makeDedupHintHandlers,
   markCompactStale,
-  markCompacted,
-  markFileTruncated,
-  markHintShown,
   matchesAllowPattern,
   matchesDenyPattern,
   mcpContentBlocks,
@@ -101,8 +86,53 @@ import {
   planSourceSkeleton,
   preToolPathDeclined,
   probeImageMeta,
-  readCopilotHooksOwners,
-  readTranscriptTail,
+  recordKnownRootThrottled,
+  registerHook,
+  resolveLineRegions,
+  runHook,
+  scanAndRecord,
+  serializeOutput,
+  servedRunNotice,
+  sessionStateKey,
+  shrinkImage,
+  visionTokens,
+  visionTokensSaved,
+  vscodePathAllowed,
+  withPreservedBlocks
+} from "./token-goat-chunk-DPHJU3P7.mjs";
+import {
+  compressOutput,
+  detectFromCommand,
+  filterByName,
+  isRewriteWorthwhile,
+  looksLikePytestOutput,
+  pytestFilter,
+  resolveMinNetSavingsBytes
+} from "./token-goat-chunk-PAVWB4L4.mjs";
+import {
+  readCopilotHooksOwners
+} from "./token-goat-chunk-SP5QR2HN.mjs";
+import {
+  GENERIC_SERVED_OUTPUT_KEY,
+  clearCurlDownload,
+  extractCompactFromMarker,
+  getBashOutputId,
+  getCurlDownloadPath,
+  getFileLineRanges,
+  getFileServedOutputs,
+  getGlobMatchCount,
+  getGrepMatchCount,
+  getOutstandingAgentSpawns,
+  getSessionBashOutputs,
+  hasSeenImage,
+  hasSessionOutput,
+  incrementSkillHit,
+  installedSkillPath,
+  lastTabContextMatches,
+  loadSessionState,
+  markCompacted,
+  markFileTruncated,
+  markHintShown,
   recordBashOutput,
   recordBashRerun,
   recordCliRead,
@@ -113,45 +143,38 @@ import {
   recordFileServedOutput,
   recordGlobQuery,
   recordGrepQuery,
-  recordKnownRootThrottled,
   recordOutstandingAgentSpawn,
   recordScheduledPrompt,
   recordSeenImage,
   recordSymbolRead,
   recordWebFetch,
-  registerHook,
   removeOutstandingAgentSpawn,
-  repeatedSkillBodyHint,
-  runHook,
   saveSessionState,
-  scanAndRecord,
-  serializeOutput,
-  servedRunNotice,
   sessionOutputBodyBytes,
   sessionSidecarPath,
-  sessionStateKey,
   setLastTabContext,
   setTranscriptPath,
-  shrinkImage,
   storeOutput,
-  summarizeResidentContext,
   takePendingLargeFileHint,
-  taskListPruneHint,
-  visionTokens,
-  visionTokensSaved,
-  vscodePathAllowed,
   wasCliReadThisSession,
   wasFileReadThisSession,
-  wasHintShown,
-  withPreservedBlocks
-} from "./token-goat-chunk-BFEWOMA3.mjs";
+  wasHintShown
+} from "./token-goat-chunk-KT75DZK4.mjs";
+import {
+  accumulateResidentLines,
+  claudeConfigDir,
+  estimateTokens,
+  lineMayCarryResidentSignal,
+  readTranscriptTail,
+  repeatedSkillBodyHint,
+  summarizeResidentContext,
+  taskListPruneHint
+} from "./token-goat-chunk-ZHFM4DHJ.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
+  bashOutputIdSync,
   commandHash,
-  compressOutput,
   dedupeConsecutive,
-  detectFromCommand,
-  filterByName,
   getBashOutput,
   getMonitoringRecallHint,
   hasBareBackgroundOrNewline,
@@ -159,44 +182,47 @@ import {
   indexRecallEntry,
   isBashEntryStale,
   isBuildCommand,
-  isRewriteWorthwhile,
+  isRedirectAmpersand,
   isScopedGitStatusOrDiffStatCommand,
   isTestRunnerCommand,
-  resolveMinNetSavingsBytes,
+  pathStem,
   shlexSplit,
   splitOwnTrailingNotices,
   storeBashOutput,
   summarizeOutputDelta
-} from "./token-goat-chunk-CTOYJ232.mjs";
+} from "./token-goat-chunk-SL454EN5.mjs";
 import {
   recordStat,
   redactSecrets,
   savedTokensFromBytes,
   storeBlob,
   stripAnsiEscapes
-} from "./token-goat-chunk-HPOFR6QX.mjs";
+} from "./token-goat-chunk-K5XPIUVB.mjs";
 import {
   extractMarkdownHeadings,
   formatHeadingTreeParts
-} from "./token-goat-chunk-W3E65QOW.mjs";
+} from "./token-goat-chunk-ERGHDBC6.mjs";
 import {
-  countSymbols
-} from "./token-goat-chunk-I67CPTDD.mjs";
+  countSymbols,
+  getFileEntry,
+  querySymbols
+} from "./token-goat-chunk-K3ZNBN4U.mjs";
 import {
   detectLanguage,
   getDb,
   languageHasFlag
-} from "./token-goat-chunk-L7VCX33I.mjs";
+} from "./token-goat-chunk-T63VHOL3.mjs";
 import {
   detectHarness,
   envBool,
   envInt,
   findProject,
+  fingerprintFile,
   getHarnessName,
   isUnderSystemTemp,
   loadConfig,
   shortFingerprint
-} from "./token-goat-chunk-CA6V36KW.mjs";
+} from "./token-goat-chunk-74ADIZZX.mjs";
 import {
   ENV_KEYS,
   IDENTICAL_READ_MIN_BODY_BYTES,
@@ -216,8 +242,9 @@ import {
   isInsideRoot,
   runGit,
   toKB
-} from "./token-goat-chunk-QIDLJGXZ.mjs";
+} from "./token-goat-chunk-6LJNM4ZZ.mjs";
 import {
+  TOOL_RESULTS_ID_CHARS,
   UNTRUSTED_TOOL_TAG,
   displaySafePath,
   displaySafeText,
@@ -226,7 +253,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";
@@ -276,6 +303,52 @@ function stripUnsafeSuggestions(text) {
   }
 }
 
+// src/pending_context.ts
+init_define_import_meta_env();
+import { readFileSync, rmSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+var PENDING_SUFFIX = ".pending-context.txt";
+var MAX_PENDING_CONTEXT_BYTES = 4096;
+function queuePendingContext(stateKey, text) {
+  const trimmed = text.trim();
+  if (trimmed === "") return;
+  const target = sessionSidecarPath(stateKey, PENDING_SUFFIX);
+  if (target === null) return;
+  try {
+    const existing = readPending(target);
+    const merged = existing === null ? trimmed : `${existing}
+${trimmed}`;
+    const capped = merged.length <= MAX_PENDING_CONTEXT_BYTES ? merged : merged.slice(merged.length - MAX_PENDING_CONTEXT_BYTES);
+    ensureDirSync(dirname(target));
+    writeFileSync(target, capped, "utf8");
+  } catch {
+  }
+}
+function peekPendingContext(stateKey) {
+  const target = sessionSidecarPath(stateKey, PENDING_SUFFIX);
+  return target === null ? null : readPending(target);
+}
+function commitPendingContext(stateKey, delivered) {
+  if (delivered === null || delivered === "") return;
+  const target = sessionSidecarPath(stateKey, PENDING_SUFFIX);
+  if (target === null) return;
+  const queued = readPending(target);
+  if (queued === null) return;
+  if (!delivered.includes(queued) && !delivered.includes(stripUnsafeSuggestions(queued))) return;
+  try {
+    rmSync(target, { force: true });
+  } catch {
+  }
+}
+function readPending(target) {
+  try {
+    const raw = readFileSync(target, "utf8").trim();
+    return raw === "" ? null : raw;
+  } catch {
+    return null;
+  }
+}
+
 // src/vscode_duplicate.ts
 init_define_import_meta_env();
 import * as fs from "node:fs";
@@ -404,7 +477,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 +492,7 @@ function grepSignature(toolInput) {
   const offset = grepIntInput(toolInput, "offset");
   return JSON.stringify([
     pattern,
-    path5,
+    path6,
     outputMode,
     glob,
     type,
@@ -563,8 +636,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",
@@ -631,7 +704,9 @@ function postEditHandlerInner(event) {
       editedSize = statSync2(normalized).size;
     } catch {
     }
-    if (meetsSavingsFloor(editedSize)) {
+    if (!meetsSavingsFloor(editedSize)) {
+      logSuppressedDetection("edit_reread_suggest", event.sessionId, normalized);
+    } else {
       const escapedPath = displaySafePath(normalized).replace(/`/g, "\\`").replace(/"/g, '\\"');
       return contextOutput(
         displaySafePath(editedBasename) + ' was edited. Use `token-goat section "' + escapedPath + '::HeadingName"` to re-read a specific section rather than the full file.'
@@ -650,7 +725,7 @@ registerHook("post_tool_use", postEditHandler, { toolName: "NotebookEdit" });
 
 // src/hooks_write.ts
 init_define_import_meta_env();
-import { readFileSync, statSync as statSync3 } from "node:fs";
+import { readFileSync as readFileSync2, statSync as statSync3 } from "node:fs";
 var MAX_LINES_FOR_DIFF = 4e3;
 var MAX_OLD_FILE_BYTES_FOR_DIFF = 4 * 1024 * 1024;
 function splitLines(text) {
@@ -691,7 +766,7 @@ function preWriteRewriteHandler(event) {
     if (stat.size > MAX_OLD_FILE_BYTES_FOR_DIFF) return passOutput();
     let oldContent;
     try {
-      oldContent = readFileSync(filePath, "utf-8");
+      oldContent = readFileSync2(filePath, "utf-8");
     } catch {
       return passOutput();
     }
@@ -717,210 +792,48 @@ registerHook("pre_tool_use", preWriteRewriteHandler, { toolName: "Write" });
 
 // src/hooks_compact.ts
 init_define_import_meta_env();
-import { spawnSync } from "node:child_process";
 import * as path3 from "node:path";
-var MEM_EPOCH_TIMEOUT_MS = 800;
-var MAX_ROWS = 40;
-function appendCappedSection(lines, header, rows, cap) {
-  if (rows.length === 0) return;
-  lines.push("");
-  lines.push(header);
-  for (const row of rows.slice(0, cap)) lines.push(row);
-  if (rows.length > cap) lines.push(`- ...and ${rows.length - cap} more`);
-}
-function renderReadRow(entry) {
-  const kb = Math.max(1, toKB(entry.sizeBytes));
-  const plural = entry.readCount === 1 ? "read" : "reads";
-  const edited = entry.wasEdited ? ", edited" : "";
-  return `- ${displaySafePath(entry.path)} (${kb}kb, ${entry.readCount} ${plural}${edited})`;
-}
-function renderSymbolReadRow(entry) {
-  return `- ${displaySafePath(entry.path)} (symbols: ${(entry.symbols_read ?? []).map(displaySafeText).join(", ")})`;
-}
-function mergeManifestFiles(parent, siblingFiles) {
-  const byPath = /* @__PURE__ */ new Map();
-  for (const f of parent) byPath.set(foldPath(f.path), f);
-  for (const f of siblingFiles) {
-    const key = foldPath(f.path);
-    const prev = byPath.get(key);
-    if (prev === void 0) {
-      byPath.set(key, f);
-      continue;
-    }
-    const mergedSymbols = [.../* @__PURE__ */ new Set([...prev.symbols_read ?? [], ...f.symbols_read ?? []])];
-    byPath.set(key, {
-      path: prev.path,
-      readCount: Math.max(prev.readCount, f.readCount),
-      lastReadAt: Math.max(prev.lastReadAt, f.lastReadAt),
-      wasEdited: prev.wasEdited || f.wasEdited,
-      sizeBytes: f.lastReadAt >= prev.lastReadAt ? f.sizeBytes : prev.sizeBytes,
-      ...prev.wasTruncated || f.wasTruncated ? { wasTruncated: true } : {},
-      ...mergedSymbols.length > 0 ? { symbols_read: mergedSymbols } : {}
-    });
-  }
-  return Array.from(byPath.values());
-}
-function buildManifest(sessionId, cwd, transcriptPath) {
-  const ownFiles = [...getSessionFiles().values()];
-  const siblingFiles = sessionId !== void 0 ? listSiblingSessionStates(sessionId).flatMap((s) => s.files) : [];
-  const files = siblingFiles.length > 0 ? mergeManifestFiles(ownFiles, siblingFiles) : ownFiles;
-  const editedFiles = files.filter((f) => f.wasEdited);
-  const readFiles = files.filter((f) => f.readCount > 0 && !f.wasEdited);
-  const symbolOnlyFiles = files.filter((f) => f.readCount === 0 && !f.wasEdited && (f.symbols_read?.length ?? 0) > 0);
-  const webFetches = [...getSessionWebFetches().entries()];
-  const lines = [];
-  lines.push("## Session context");
-  lines.push(`Files read: ${readFiles.length}`);
-  lines.push(`Files edited: ${editedFiles.length}`);
-  appendCappedSection(lines, "### Read files", readFiles.map(renderReadRow), MAX_ROWS);
-  appendCappedSection(
-    lines,
-    "### Edited files",
-    editedFiles.map((entry) => `- ${displaySafePath(entry.path)}`),
-    MAX_ROWS
-  );
-  appendCappedSection(lines, "### Surgically read files (symbol/section reads, never read whole)", symbolOnlyFiles.map(renderSymbolReadRow), MAX_ROWS);
-  appendCappedSection(
-    lines,
-    "### Web URLs fetched",
-    webFetches.map(([key, cacheId]) => {
-      const [url = key, prompt = ""] = key.split(WEB_FETCH_KEY_SEP);
-      const promptSuffix = prompt ? `, prompt: ${neutralizeSpokenMarkers(JSON.stringify(prompt))}` : "";
-      return `- ${displaySafeText(url)} (cacheId: ${cacheId}${promptSuffix})`;
-    }),
-    MAX_ROWS
-  );
-  lines.push(...buildSafeToDiscardSection(files));
-  lines.push(...buildMemEpochSection());
-  return capManifestChars(lines.join("\n"), sessionId, cwd, transcriptPath);
-}
-function gitDirtySignals(cwd) {
-  const timeoutMs = loadConfig().hints.git_hint_max_ms;
-  let hasPendingDiff = false;
-  try {
-    const diffResult = runGit(["diff", "--no-color", "--stat", "HEAD"], { cwd, timeoutMs });
-    hasPendingDiff = diffResult.exitCode === 0 && diffResult.stdout.trim() !== "";
-  } catch {
-  }
-  let hasUncommittedChanges = false;
-  try {
-    const statusResult = runGit(["status", "--porcelain"], { cwd, timeoutMs });
-    hasUncommittedChanges = statusResult.exitCode === 0 && statusResult.stdout.trim() !== "";
-  } catch {
-  }
-  return { hasPendingDiff, hasUncommittedChanges };
-}
-function adaptiveCharBonus(sessionId, cwd, transcriptPath) {
-  if (!cwd) return 0;
-  const cache = loadSessionCache(sessionId ?? "") ?? {};
-  const ageSecs = cache.created_ts !== void 0 ? Math.max(0, Date.now() / 1e3 - cache.created_ts) : 0;
-  const contextPressure = getContextPressure(cache, transcriptPath);
-  const { hasPendingDiff, hasUncommittedChanges } = gitDirtySignals(cwd);
-  if (!hasPendingDiff && !hasUncommittedChanges) return 0;
-  const baseline = computeAdaptiveBudget(cache, ageSecs, { contextPressure });
-  const withGitSignal = computeAdaptiveBudget(cache, ageSecs, { hasPendingDiff, hasUncommittedChanges, contextPressure });
-  const deltaTokens = Math.max(0, withGitSignal - baseline);
-  return deltaTokens * 3;
-}
-function capManifestChars(manifest, sessionId, cwd, transcriptPath) {
-  const cap = loadConfig().compact_assist.max_manifest_chars;
-  if (cap <= 0) return manifest;
-  if (manifest.length <= cap) return manifest;
-  const effectiveCap = cap + adaptiveCharBonus(sessionId, cwd, transcriptPath);
-  if (manifest.length <= effectiveCap) return manifest;
-  const omitted = manifest.length - effectiveCap;
-  return manifest.slice(0, effectiveCap) + `
-...(manifest truncated at ${effectiveCap} chars; ${omitted} chars omitted)`;
-}
-function buildSafeToDiscardSection(files) {
-  const rerunHashes = getSessionBashReruns();
-  const bashOutputs = getSessionBashOutputs();
-  const rerunHashSet = new Set(rerunHashes);
-  const rerunRows = [];
-  for (const hash of rerunHashes) {
-    const id = bashOutputs.find(([h]) => h === hash)?.[1];
-    if (id === void 0) continue;
-    const entry = getBashOutput(id);
-    if (entry === null) continue;
-    const flatCommand = neutralizeSpokenMarkers(entry.command.replace(/[\t\r\n]+/g, " "));
-    rerunRows.push("- `" + flatCommand + "` \u2014 an older run of this exact command was superseded; recall the surviving copy with `bash-output " + id + " --full`");
-  }
-  const supersededReadRows = [];
-  for (const f of files) {
-    if (f.readCount > 1 || f.wasEdited) {
-      const reason = f.wasEdited ? "edited after being read" : "re-read " + f.readCount + "x";
-      supersededReadRows.push("- " + displaySafePath(f.path) + " (" + reason + " \u2014 only the latest content already in context is current)");
-    }
-  }
-  const cachedOutputRows = [];
-  for (const [hash, id] of bashOutputs) {
-    if (rerunHashSet.has(hash)) continue;
-    const entry = getBashOutput(id);
-    if (entry === null) continue;
-    const flatCommand = neutralizeSpokenMarkers(entry.command.replace(/[\t\r\n]+/g, " "));
-    cachedOutputRows.push("- `" + flatCommand + "` \u2014 recallable via `bash-output " + id + " --full`");
-  }
-  const total = rerunRows.length + supersededReadRows.length + cachedOutputRows.length;
-  if (total === 0) return [];
-  const lines = [];
-  lines.push("");
-  lines.push("### SAFE_TO_DISCARD (" + total + " items \u2014 provably inert; each is recallable, not gone)");
-  appendCappedSection(lines, "Superseded reruns (" + rerunRows.length + "):", rerunRows, MAX_ROWS);
-  appendCappedSection(lines, "Superseded file reads (" + supersededReadRows.length + "):", supersededReadRows, MAX_ROWS);
-  appendCappedSection(lines, "Other cached bash outputs (" + cachedOutputRows.length + "):", cachedOutputRows, MAX_ROWS);
-  return lines;
+
+// src/harness_channels.ts
+init_define_import_meta_env();
+var PROMPT_SUBMIT_CONTEXT_DROPPED = /* @__PURE__ */ new Set([]);
+function dropsPromptSubmitContext() {
+  return PROMPT_SUBMIT_CONTEXT_DROPPED.has(getHarnessName());
 }
-function buildMemEpochSection() {
-  let result;
-  try {
-    result = spawnSync("mem", ["epoch"], {
-      encoding: "utf-8",
-      timeout: MEM_EPOCH_TIMEOUT_MS,
-      windowsHide: true
-    });
-  } catch {
-    return [];
-  }
-  if (result.error !== void 0 || result.status !== 0) return [];
-  const stdout = typeof result.stdout === "string" ? result.stdout.trim() : "";
-  if (!/^\d+$/.test(stdout)) return [];
-  return [
-    "",
-    "### mem epoch",
-    `mem epoch: ${stdout} (no live TGMEM block is tracked in this session -- only the epoch counter is folded in; see buildMemEpochSection's doc comment)`
-  ];
-}
-var MANIFEST_PREAMBLE = "When summarizing this session, keep the file paths and symbol names below exactly as written -- they are the handles the next turn needs to resume work. Do not paraphrase them into prose.";
-var BUDGET_ESCALATION_MARKER = "TG-BUDGET-ESCALATION:";
-function summaryBudgetDirective(budgetChars) {
-  if (budgetChars <= 0) return "";
-  return ` Aim for at most ${budgetChars} characters. Prefer a shorter summary that keeps every path, symbol, command and decision over a longer one that reproduces tool output verbatim: cite the recall id (\`token-goat bash-output <id> --full\`) rather than quoting the output again. If this session genuinely cannot be summarized within that target without losing state the next turn needs, exceed it and open the summary with a single line reading \`${BUDGET_ESCALATION_MARKER} <one-sentence reason>\`.`;
+var PRE_COMPACT_CONTEXT_DROPPED = /* @__PURE__ */ new Set(["copilot_cli", "codex"]);
+function dropsPreCompactContext() {
+  return PRE_COMPACT_CONTEXT_DROPPED.has(getHarnessName());
 }
+
+// src/hooks_compact.ts
 function preCompactHandler(event) {
-  const out = loadConfig().compact_assist.enabled ? contextOutput(`${MANIFEST_PREAMBLE}${summaryBudgetDirective(loadConfig().compact_assist.summary_budget_chars)}
+  const cfg = loadConfig().compact_assist;
+  let out = passOutput();
+  if (cfg.enabled) {
+    const manifest = buildManifest(event.sessionId, getCwd(event), getTranscriptPath(event));
+    if (!dropsPreCompactContext()) {
+      out = contextOutput(`${MANIFEST_PREAMBLE}${summaryBudgetDirective(cfg.summary_budget_chars)}
 
-${buildManifest(event.sessionId, getCwd(event), getTranscriptPath(event))}`) : passOutput();
+${manifest}`);
+    } else if (event.sessionId) {
+      queuePendingContext(sessionStateKey(event), `${MANIFEST_RECOVERY_PREAMBLE}
+
+${manifest.slice(0, MAX_PENDING_CONTEXT_BYTES - MANIFEST_RECOVERY_PREAMBLE.length - 2)}`);
+    }
+  }
   markCompacted();
   return out;
 }
 registerHook("pre_compact", preCompactHandler);
 var MANIFEST_SURVIVAL_SAMPLE = 64;
-function manifestPathSample(sessionId) {
-  const ownFiles = [...getSessionFiles().values()];
-  const siblingFiles = sessionId !== void 0 ? listSiblingSessionStates(sessionId).flatMap((s) => s.files) : [];
-  const files = siblingFiles.length > 0 ? mergeManifestFiles(ownFiles, siblingFiles) : ownFiles;
-  const seen = /* @__PURE__ */ new Set();
-  for (const entry of files) {
-    if (entry.path) seen.add(entry.path);
-    if (seen.size >= MANIFEST_SURVIVAL_SAMPLE) break;
-  }
-  return [...seen];
+function manifestPathSample(event) {
+  return manifestPrintedPaths(event.sessionId, MANIFEST_SURVIVAL_SAMPLE, getCwd(event), getTranscriptPath(event));
 }
 function postCompactHandler(event) {
   const raw = event.raw["compact_summary"];
   const summary = typeof raw === "string" ? raw : "";
   const bytes = Buffer.byteLength(summary, "utf-8");
-  const sample = manifestPathSample(event.sessionId);
+  const sample = typeof raw === "string" ? manifestPathSample(event) : [];
   const cwd = normalizePath(getCwd(event) ?? process.cwd());
   const spell = (p) => foldPath(p.replaceAll("\\", "/"));
   const haystack = spell(summary);
@@ -953,7 +866,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-H4VC5TR6.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -1005,55 +918,11 @@ async function checkSkillVersionDrift(sessionId) {
   }
 }
 
-// src/pending_context.ts
-init_define_import_meta_env();
-import { readFileSync as readFileSync2, rmSync as rmSync2, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
-var PENDING_SUFFIX = ".pending-context.txt";
-var MAX_PENDING_CONTEXT_BYTES = 4096;
-function queuePendingContext(sessionId, text) {
-  const trimmed = text.trim();
-  if (trimmed === "") return;
-  const target = sessionSidecarPath(sessionId, PENDING_SUFFIX);
-  if (target === null) return;
-  try {
-    const existing = readPending(target);
-    const merged = existing === null ? trimmed : `${existing}
-${trimmed}`;
-    const capped = merged.length <= MAX_PENDING_CONTEXT_BYTES ? merged : merged.slice(merged.length - MAX_PENDING_CONTEXT_BYTES);
-    ensureDirSync(dirname(target));
-    writeFileSync(target, capped, "utf8");
-  } catch {
-  }
-}
-function drainPendingContext(sessionId) {
-  const target = sessionSidecarPath(sessionId, PENDING_SUFFIX);
-  if (target === null) return null;
-  const text = readPending(target);
-  try {
-    rmSync2(target, { force: true });
-  } catch {
-  }
-  return text;
-}
-function readPending(target) {
-  try {
-    const raw = readFileSync2(target, "utf8").trim();
-    return raw === "" ? null : raw;
-  } catch {
-    return null;
-  }
-}
-
 // src/hooks_session.ts
-var PROMPT_SUBMIT_CONTEXT_DROPPED = /* @__PURE__ */ new Set([]);
-function dropsPromptSubmitContext() {
-  return PROMPT_SUBMIT_CONTEXT_DROPPED.has(getHarnessName());
-}
 function pendingContextHandler(event) {
   try {
-    if (!event.sessionId || !dropsPromptSubmitContext()) return passOutput();
-    const pending = drainPendingContext(event.sessionId);
+    if (!event.sessionId || !dropsPromptSubmitContext() && !dropsPreCompactContext()) return passOutput();
+    const pending = peekPendingContext(sessionStateKey(event));
     return pending === null ? passOutput() : contextOutput(pending);
   } catch {
     return passOutput();
@@ -1161,7 +1030,7 @@ async function userPromptSubmitHandler(event) {
     }
     const text = lines.join("\n");
     if (dropsPromptSubmitContext()) {
-      queuePendingContext(event.sessionId, text);
+      queuePendingContext(sessionStateKey(event), text);
       return passOutput();
     }
     return contextOutput(text);
@@ -1259,13 +1128,25 @@ 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 (e) {
+    recordStat("reconcile_note_failed", 0, 0, void 0, extractErrorMessage(e));
+    return null;
+  }
+}
+async function postCompactRecovery(event) {
+  if (event.raw["source"] !== "compact" || event.sessionId === void 0) return null;
+  if (!loadConfig().compact_assist.enabled) return null;
+  try {
+    const { buildResumePacket } = await import("./token-goat-chunk-2CLWWRFR.mjs");
+    return await buildResumePacket(event.sessionId);
   } catch {
     return null;
   }
 }
-function sessionStartHandler(event) {
+async function sessionStartHandler(event) {
+  const recovery = await postCompactRecovery(event);
   try {
-    if (!loadConfig().hints.session_start_reminder) return passOutput();
+    if (!loadConfig().hints.session_start_reminder) return recovery === null ? passOutput() : contextOutput(recovery);
     const cwd = getCwd(event);
     const indexed = isIndexedProject(cwd);
     let context = buildReminder(indexed);
@@ -1286,9 +1167,12 @@ ${capsule}`;
       }
     } catch {
     }
+    if (recovery !== null) context += `
+
+${recovery}`;
     return contextOutput(context);
   } catch {
-    return passOutput();
+    return recovery === null ? passOutput() : contextOutput(recovery);
   }
 }
 registerHook("session_start", sessionStartHandler);
@@ -1870,11 +1754,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 +5735,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 +6937,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 +7262,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 +7554,149 @@ 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();
+
+// src/index_freshness.ts
 init_define_import_meta_env();
-import { statSync as statSync5 } from "node:fs";
+function indexMatchesDisk(resolved) {
+  const entry = getFileEntry(resolved);
+  if (entry === null) return false;
+  if (entry.sha === "") return true;
+  const diskSha = fingerprintFile(resolved);
+  return diskSha !== null && diskSha === entry.sha;
+}
+
+// src/bash_structural_index.ts
+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;
+    if (!indexMatchesDisk(resolved)) 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, 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;
+    if (!indexMatchesDisk(resolved)) 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 = [];
@@ -7706,6 +7719,10 @@ function splitShellSegments(cmd) {
       i++;
       continue;
     }
+    if (ch === "&" && isRedirectAmpersand(cmd, i)) {
+      cur += ch;
+      continue;
+    }
     if (ch === "|" || ch === ";" || ch === "\n" || ch === "&") {
       segments.push(cur);
       cur = "";
@@ -7756,6 +7773,7 @@ function classifyCatPath(filePath, cmd0) {
   return { filePath, ...flags, cmd0 };
 }
 function extractCatFile(cmd) {
+  if (/-(?:TotalCount|Head|First|Tail)\b/i.test(cmd)) return null;
   const m = /^(cat|bat|type|Get-Content|gc)(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+))*\s+(?:"([^"]+)"|'([^']+)'|(\S+?))(?:\s+-[a-zA-Z].*?)?(?:\s+2>(&1|\/dev\/null))?\s*$/i.exec(cmd);
   if (!m) return null;
   const cmd0 = m[1];
@@ -7782,7 +7800,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;
   }
@@ -7796,6 +7814,7 @@ function extractPowerShellWrappedGetContent(cmd, event) {
   if (!w) return null;
   const inner = (w[1] ?? w[2] ?? "").trim();
   if (!inner) return null;
+  if (/-(?:TotalCount|Head|First|Tail)\b/i.test(inner)) return null;
   const m = PS_GETCONTENT_INNER_RE.exec(inner);
   if (!m) return null;
   const filePath = m[1] ?? m[2] ?? m[3];
@@ -8215,27 +8234,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 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, flags, preHookCwd) {
+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;
@@ -8326,6 +8339,25 @@ function extractGetContentSelectFirst(cmd) {
   const { isDoc, isConfig, isSql, isXml } = classifyDocConfig(filePath);
   return { filePath, isDoc, isConfig, isSql, isXml, n };
 }
+function extractGetContentHead(cmd) {
+  const headMatch = /-(?:TotalCount|Head|First)\s+(\d+)/i.exec(cmd);
+  if (!headMatch) return null;
+  const n = parseInt(headMatch[1], 10);
+  if (n <= 10) return null;
+  const getnMatch = /^(Get-Content|gc)\s+/i.exec(cmd);
+  if (!getnMatch) return null;
+  const afterCmd = cmd.slice(getnMatch[0].length).replace(/-Path\s+/i, "");
+  const beforeHead = afterCmd.split(/-(?:TotalCount|Head|First)/i)[0]?.trim() ?? "";
+  const afterHead = afterCmd.split(/-(?:TotalCount|Head|First)\s+\d+/i)[1]?.trim() ?? "";
+  const cleanedBefore = beforeHead.replace(/-(?:Encoding|Delimiter|Wait)\s+\S+/gi, "").replace(/-[a-zA-Z]+/g, "").trim();
+  const cleanedAfter = afterHead.replace(/-(?:Encoding|Delimiter|Wait)\s+\S+/gi, "").replace(/-[a-zA-Z]+/g, "").trim();
+  const filePath = (cleanedBefore || cleanedAfter).replace(/^["']|["']$/g, "");
+  if (!filePath) return null;
+  if (isTempPath(filePath)) return null;
+  if (!/\.(?:ts|tsx|js|jsx|py|go|java|rs|rb|cs|md|mdx|rst|txt|json|yaml|yml|toml|sql|sh|ps1|psm1|xml|dtsx|ampkg|xaml)$/i.test(filePath)) return null;
+  const { isDoc, isConfig, isSql, isXml } = classifyDocConfig(filePath);
+  return { filePath, isDoc, isConfig, isSql, isXml, n };
+}
 function taskOutputIsJsonlTranscript(outPath) {
   let fd = null;
   try {
@@ -8379,7 +8411,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 +8765,38 @@ 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;
+    if (!indexMatchesDisk(resolved)) 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 +9012,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;
   }
@@ -8997,7 +9060,8 @@ function pipelineShapeFilter(cmd, cwd) {
         }
       }
       if (recognizedCiCount > 0) {
-        return filterByName("generic-ci");
+        const ci = filterByName("generic-ci");
+        return ci === null ? null : { filter: ci, argv: [] };
       }
     }
     return null;
@@ -9012,7 +9076,16 @@ function pipelineShapeFilter(cmd, cwd) {
     if (!PIPELINE_PASSTHROUGH_HEADS.has(head.replace(/^.*[/\\]/, ""))) return null;
   }
   const detected = detectFromCommand(stripOutputPipeline(cmd), cwd ?? void 0);
-  return detected === null ? null : detected.filter;
+  return detected === null ? null : { filter: detected.filter, argv: detected.argv };
+}
+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;
@@ -9218,6 +9291,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;
@@ -9286,7 +9360,7 @@ function foldShellReadBodies(cmd, output, fileKey, cwd) {
     if (no === void 0 || no === null) return null;
     rows.push({ no, text: lines[i] ?? "", raw: lines[i] ?? "" });
   }
-  const headRead = extractHeadFile(cmd);
+  const headRead = extractHeadFile(cmd) ?? extractGetContentHead(cmd);
   const windowed = extractLineRangeRead(cmd) !== null || headRead !== null && lines.length >= headRead.n;
   const folded = foldDelivery(rows, fileKey, displaySafePath(toDisplayPath(findProject(cwd ?? process.cwd())?.root, fileKey)), windowed);
   if (folded === null) return null;
@@ -9297,7 +9371,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 +9479,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 {
@@ -9414,16 +9489,18 @@ async function maybeCompressCompoundOutput(cmd, output, exitCode, cwd, cacheMinB
   }
   if (!cfg.enabled || cfg.disabled_filters.includes("generic")) return null;
   if (Buffer.byteLength(output, "utf-8") < cacheMinBytes) return null;
-  const shaped = pipelineShapeFilter(cmd, cwd) ?? (isUnwrapped ? detectFromCommand(cmd, cwd ?? void 0)?.filter ?? null : null);
-  const filter3 = shaped !== null && !cfg.disabled_filters.includes(shaped.name) ? shaped : filterByName("generic");
+  const shaped = pipelineShapeFilter(cmd, cwd) ?? (isUnwrapped ? detectFromCommand(cmd, cwd ?? void 0) ?? null : null);
+  const useShaped = shaped !== null && !cfg.disabled_filters.includes(shaped.filter.name);
+  const filter3 = useShaped ? shaped.filter : filterByName("generic");
   if (filter3 === null) return null;
-  const compressed = compressOutput(filter3, output, "", exitCode ?? 0, [], {
+  const filterArgv = useShaped ? shaped.argv : [];
+  const compressed = compressOutput(filter3, output, "", exitCode ?? 0, filterArgv, {
     maxLines: cfg.max_lines,
     maxBytes: cfg.max_bytes
   });
   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 +9579,21 @@ 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 recallWorthShowing = (outputId2, entry2) => {
+    if (entry2.sizeBytes < loadConfig().hints.bash_dedup_min_bytes) return false;
+    if (meetsSavingsFloor(entry2.sizeBytes)) return true;
+    logSuppressedDetection("bash_recall", event.sessionId, outputId2);
+    return false;
+  };
   const cfg = loadConfig();
   if (cfg.hints.warn_unbalanced_shell_quoting) {
     const quoteError = detectUnbalancedShellSyntax(cmd);
@@ -9562,17 +9654,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 +9680,39 @@ 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 gcHeadResult = extractGetContentHead(cmd);
+  if (gcHeadResult !== null) {
+    const { filePath, n } = gcHeadResult;
+    const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
+    const gcHeadHint = leadingLinesHint("`Get-Content -TotalCount` bypasses read hooks. ", hintPath, 1, n, preHookCwd, pricedSubstitute(hintPath, 1, n));
+    if (gcHeadHint === null) return declineUnpriced(hintPath);
+    recordStat("session_hint", 0, 0);
+    return pathHint(hintPath, gcHeadHint);
   }
   const catJsonPipe = extractCatJsonPipe(cmd);
   if (catJsonPipe !== null) {
@@ -9610,7 +9720,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 +9730,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 +9745,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 +9763,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 +9772,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 +9783,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 +9799,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 +9838,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 +9851,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 +9872,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 +9882,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 +9891,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.'
     );
   }
@@ -9777,7 +9902,7 @@ function preBashHandlerInner(event) {
     const monOutputId = getBashOutputId(monCmdHash);
     const monEntryRaw = monOutputId !== null ? getBashOutput(monOutputId) : null;
     const monEntry = monEntryRaw !== null && !isBashEntryStale(monEntryRaw, cmd, preHookCwd) ? monEntryRaw : null;
-    if (monOutputId !== null && monEntry !== null && monEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(monEntry.sizeBytes)) {
+    if (monOutputId !== null && monEntry !== null && recallWorthShowing(monOutputId, monEntry)) {
       const monBytes = monEntry.sizeBytes;
       const catFile = extractCatSourceFile(cmd);
       if (catFile !== null) {
@@ -9799,7 +9924,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.'
@@ -9812,7 +9937,7 @@ function preBashHandlerInner(event) {
     const curlOutputId = getBashOutputId(curlHash);
     const curlEntryRaw = curlOutputId !== null ? getBashOutput(curlOutputId) : null;
     const curlEntry = curlEntryRaw !== null && !isBashEntryStale(curlEntryRaw, cmd, preHookCwd) ? curlEntryRaw : null;
-    if (curlOutputId !== null && curlEntry !== null && curlEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(curlEntry.sizeBytes)) {
+    if (curlOutputId !== null && curlEntry !== null && recallWorthShowing(curlOutputId, curlEntry)) {
       const curlBytes = curlEntry.sizeBytes;
       recordStat("bash_compress:recall", curlBytes, savedTokensFromBytes(curlBytes));
       const curlPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
@@ -9826,7 +9951,7 @@ function preBashHandlerInner(event) {
     const ghOutputId = getBashOutputId(ghHash);
     const ghEntryRaw = ghOutputId !== null ? getBashOutput(ghOutputId) : null;
     const ghEntry = ghEntryRaw !== null && !isBashEntryStale(ghEntryRaw, cmd, preHookCwd) ? ghEntryRaw : null;
-    if (ghOutputId !== null && ghEntry !== null && ghEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(ghEntry.sizeBytes)) {
+    if (ghOutputId !== null && ghEntry !== null && recallWorthShowing(ghOutputId, ghEntry)) {
       const ghBytes = ghEntry.sizeBytes;
       recordStat("bash_compress:recall", ghBytes, savedTokensFromBytes(ghBytes));
       const ghPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
@@ -9840,7 +9965,7 @@ function preBashHandlerInner(event) {
     const gitScopedOutputId = getBashOutputId(gitScopedHash);
     const gitScopedEntryRaw = gitScopedOutputId !== null ? getBashOutput(gitScopedOutputId) : null;
     const gitScopedEntry = gitScopedEntryRaw !== null && !isBashEntryStale(gitScopedEntryRaw, cmd, preHookCwd) ? gitScopedEntryRaw : null;
-    if (gitScopedOutputId !== null && gitScopedEntry !== null && gitScopedEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(gitScopedEntry.sizeBytes)) {
+    if (gitScopedOutputId !== null && gitScopedEntry !== null && recallWorthShowing(gitScopedOutputId, gitScopedEntry)) {
       const gitScopedBytes = gitScopedEntry.sizeBytes;
       recordStat("bash_compress:recall", gitScopedBytes, savedTokensFromBytes(gitScopedBytes));
       const gitScopedPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
@@ -9861,7 +9986,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();
   }
@@ -9882,7 +10007,7 @@ function preBashHandlerInner(event) {
   const outputId = getBashOutputId(cmdHash);
   const entryRaw = outputId !== null ? getBashOutput(outputId) : null;
   const entry = entryRaw !== null && !isBashEntryStale(entryRaw, cmd, preHookCwd) ? entryRaw : null;
-  if (outputId !== null && entry !== null && entry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(entry.sizeBytes)) {
+  if (outputId !== null && entry !== null && recallWorthShowing(outputId, entry)) {
     const bytes = entry.sizeBytes;
     recordStat("bash_compress:recall", bytes, savedTokensFromBytes(bytes));
     return contextOutput(buildRecallHint(cmd, outputId));
@@ -9893,7 +10018,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) {
@@ -9959,6 +10105,11 @@ function recordBashFileReadsForSessionCache(cmd, cwd) {
     recordFileLineRange(resolve2(gcSelect.filePath), 1, gcSelect.n);
     return;
   }
+  const gcHead = extractGetContentHead(cmd);
+  if (gcHead !== null) {
+    recordFileLineRange(resolve2(gcHead.filePath), 1, gcHead.n);
+    return;
+  }
   const head = extractHeadFile(cmd);
   if (head !== null) {
     recordFileLineRange(resolve2(head.filePath), 1, head.n);
@@ -10021,7 +10172,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 +10359,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 +10485,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 +10513,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 +10554,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 +11204,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 +11406,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 +11631,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 +11656,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 +11675,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 +11810,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);
@@ -11686,6 +11838,9 @@ async function relayInProcess(eventName, rawPayload) {
     } catch {
     }
     const output = safeSuggestions(await runHook(event));
+    if (event.sessionId) {
+      commitPendingContext(stateKey, output.hookType === "context" ? output.context : null);
+    }
     try {
       saveSessionState(stateKey);
     } catch {
@@ -11693,6 +11848,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) {