token-goat 2.8.2 → 2.8.4

package/dist/{token-goat-chunk-KBVN4ELV.mjs → token-goat-chunk-ZQ3PUOP3.mjs}

@@ -23,7 +23,7 @@ import {
   summarizeOutputDelta,
   summarizeResidentContext,
   taskListPruneHint
-} from "./token-goat-chunk-5MLXFSRI.mjs";
+} from "./token-goat-chunk-IZRXU64B.mjs";
 import {
   BODY_FIRST_TOOL_RESPONSE_KEYS,
   OUTPUT_FIRST_TOOL_RESPONSE_KEYS,
@@ -41,10 +41,10 @@ import {
   contextOutput,
   countSymbols,
   denyOutput,
+  emitRewrite,
   enqueueDirtyPathSafe,
   ensureWorkerAlive,
   estimateTokens,
-  estimateTokensFromLength,
   extractCompactFromMarker,
   extractToolResponseField,
   extractToolResultText,
@@ -88,6 +88,7 @@ import {
   matchesDenyPattern,
   meetsSavingsFloor,
   passOutput,
+  probeImageMeta,
   recordBashOutput,
   recordBashRerun,
   recordCliRead,
@@ -109,16 +110,19 @@ import {
   saveSessionState,
   scanForInjectionPatterns,
   serializeOutput,
+  sessionOutputBodyBytes,
   sessionSidecarPath,
   setLastTabContext,
   shrinkImage,
   storeBlob,
   storeOutput,
   takePendingLargeFileHint,
+  visionTokens,
+  visionTokensSaved,
   wasCliReadThisSession,
   wasFileReadThisSession,
   wasHintShown
-} from "./token-goat-chunk-AM23GDIS.mjs";
+} from "./token-goat-chunk-4OTIB7SB.mjs";
 import {
   canRunWrappedShell,
   compressOutput,
@@ -129,8 +133,9 @@ import {
   isRewriteWorthwhile,
   resolveMinNetSavingsBytes,
   shlexSplit
-} from "./token-goat-chunk-TF5NT3H5.mjs";
+} from "./token-goat-chunk-CZALRRGN.mjs";
 import {
+  PER_FILE_COUNTERFACTUAL_CEILING,
   VERSION,
   detectHarness,
   detectLanguage,
@@ -147,9 +152,10 @@ import {
   redactSecrets,
   resolveIndexPath,
   runGit,
+  savedTokensFromBytes,
   shortFingerprint,
   toKB
-} from "./token-goat-chunk-IVCTQPZD.mjs";
+} from "./token-goat-chunk-E76UNTVK.mjs";
 
 // src/hooks_grep.ts
 function grepIntInput(toolInput, key) {
@@ -164,7 +170,7 @@ function grepIntInput(toolInput, key) {
 function grepSignature(toolInput) {
   const pattern = toolInput["pattern"];
   if (typeof pattern !== "string" || pattern === "") return null;
-  const path2 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
+  const path3 = 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"] : "";
@@ -179,7 +185,7 @@ function grepSignature(toolInput) {
   const offset = grepIntInput(toolInput, "offset");
   return JSON.stringify([
     pattern,
-    path2,
+    path3,
     outputMode,
     glob,
     type,
@@ -213,8 +219,9 @@ function foldGrepContentHandler(event) {
       return passOutput();
     }
     if (toolInput["-n"] === false) return passOutput();
-    const text = extractToolResponseField(event.raw, OUTPUT_FIRST_TOOL_RESPONSE_KEYS);
-    if (!text) return passOutput();
+    const rawText = extractToolResponseField(event.raw, OUTPUT_FIRST_TOOL_RESPONSE_KEYS);
+    if (!rawText) return passOutput();
+    const text = redactSecrets(rawText).text;
     const rawLines = text.split(/\r\n|\r|\n/);
     const parsed = [];
     for (const line of rawLines) {
@@ -255,9 +262,7 @@ function foldGrepContentHandler(event) {
     })) {
       return passOutput();
     }
-    const bytesDelta = originalBytes - rewrittenBytes;
-    recordStat("grep:fold", bytesDelta, Math.round(bytesDelta / 4));
-    return { hookType: "rewriteOutput", updatedOutput: rewritten };
+    return emitRewrite(rewritten, "grep", { kind: "grep:fold", originalBytes });
   } catch {
     return passOutput();
   }
@@ -275,8 +280,8 @@ registerHook("post_tool_use", postGrepHandler, { toolName: "Grep" });
 function globSignature(toolInput) {
   const pattern = toolInput["pattern"];
   if (typeof pattern !== "string" || pattern === "") return null;
-  const path2 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
-  return JSON.stringify([pattern, path2]);
+  const path3 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
+  return JSON.stringify([pattern, path3]);
 }
 var { post: postGlobHandler, pre: preGlobDedupHandler } = makeDedupHintHandlers({
   toolName: "Glob",
@@ -424,6 +429,9 @@ function renderReadRow(entry) {
   const edited = entry.wasEdited ? ", edited" : "";
   return `- ${entry.path} (${kb}kb, ${entry.readCount} ${plural}${edited})`;
 }
+function renderSymbolReadRow(entry) {
+  return `- ${entry.path} (symbols: ${(entry.symbols_read ?? []).join(", ")})`;
+}
 function mergeManifestFiles(parent, siblingFiles) {
   const byPath = /* @__PURE__ */ new Map();
   for (const f of parent) byPath.set(foldPath(f.path), f);
@@ -451,6 +459,7 @@ function buildManifest(sessionId, cwd) {
   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");
@@ -463,6 +472,7 @@ function buildManifest(sessionId, cwd) {
     editedFiles.map((entry) => `- ${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",
@@ -607,7 +617,7 @@ function postCompactHandler(event) {
     0,
     0,
     void 0,
-    `trigger=${trigger} bytes=${bytes} est_tokens=${estimateTokensFromLength(summary.length)} manifest_paths=${survived}/${sample.length}`
+    `trigger=${trigger} bytes=${bytes} est_tokens=${savedTokensFromBytes(bytes)} manifest_paths=${survived}/${sample.length}`
   );
   return passOutput();
 }
@@ -620,7 +630,7 @@ import crypto from "node:crypto";
 var TRACKED_SKILL = "token-goat";
 var MAX_COMMANDS_SHOWN = 8;
 async function currentCommandNames() {
-  const { buildProgram } = await import("./token-goat-chunk-SE6V7LUZ.mjs");
+  const { buildProgram } = await import("./token-goat-chunk-HNODKNWO.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -1464,11 +1474,11 @@ function mapInner(r, f) {
 function mapOuter(r, f) {
   return r.matched ? f(r) : r;
 }
-function ab(pa, pb, join) {
-  return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join(ma.value, vb, data, i, j)));
+function ab(pa, pb, join2) {
+  return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join2(ma.value, vb, data, i, j)));
 }
-function abc(pa, pb, pc, join) {
-  return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join(ma.value, mb.value, vc, data, i, j))));
+function abc(pa, pb, pc, join2) {
+  return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join2(ma.value, mb.value, vc, data, i, j))));
 }
 function ahead(p) {
   return (data, i) => mapOuter(p(data, i), (m1) => ({
@@ -5385,8 +5395,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, path2) {
-  for (const key of path2) {
+function get(obj, path3) {
+  for (const key of path3) {
     if (!obj) {
       return void 0;
     }
@@ -6587,8 +6597,8 @@ function withBrackets(str, brackets) {
   const rbr = typeof brackets[1] === "string" ? brackets[1] : "]";
   return lbr + str + rbr;
 }
-function pathRewrite(path2, rewriter, baseUrl, metadata, elem) {
-  const modifiedPath = typeof rewriter === "function" ? rewriter(path2, metadata, elem) : path2;
+function pathRewrite(path3, rewriter, baseUrl, metadata, elem) {
+  const modifiedPath = typeof rewriter === "function" ? rewriter(path3, metadata, elem) : path3;
   return modifiedPath[0] === "/" && baseUrl ? trimCharacterEnd(baseUrl, "/") + modifiedPath : modifiedPath;
 }
 function formatImage(elem, walk, builder, formatOptions) {
@@ -6912,9 +6922,9 @@ function handleDeprecatedOptions(options) {
     options.selectors.push(...tagDefinitions);
     options.selectors = mergeDuplicatesPreferLast(options.selectors, ((s) => s.selector));
   }
-  function set(obj, path2, value) {
-    const valueKey = path2.pop();
-    for (const key of path2) {
+  function set(obj, path3, value) {
+    const valueKey = path3.pop();
+    for (const key of path3) {
       let nested = obj[key];
       if (!nested) {
         nested = {};
@@ -7005,7 +7015,7 @@ function preFetchHandler(event) {
     if (cached !== null) {
       const cachedBytes = Buffer.byteLength(cached, "utf-8");
       if (cachedBytes >= loadConfig().hints.web_dedup_min_bytes) {
-        recordStat("webfetch:recall", cachedBytes, Math.round(cachedBytes / 4));
+        recordStat("webfetch:recall", cachedBytes, savedTokensFromBytes(cachedBytes));
         return denyOutput(
           "Already fetched this URL with this prompt; the response is cached. Use `token-goat web-output " + cacheId + "` to recall it (append `--grep PATTERN` to filter or `--section Heading` for a markdown section) instead of re-fetching."
         );
@@ -7030,15 +7040,22 @@ function postFetchHandler(event) {
     if (injectionMatches.length > 0) {
       recordStat("injection_detected", 0, 0, void 0, injectionMatches.join(","));
     }
+    const bodyRedacted = body ? redactSecrets(body) : { text: body, count: 0 };
     if (!event.sessionId) {
       if (injectionMatches.length > 0) {
-        return { hookType: "rewriteOutput", updatedOutput: fenceUntrustedContent(body, injectionMatches) };
+        return emitRewrite(fenceUntrustedContent(bodyRedacted.text, injectionMatches), "fetch");
+      }
+      if (bodyRedacted.count > 0) {
+        return emitRewrite(bodyRedacted.text, "fetch");
       }
       return passOutput();
     }
     if (!body || body.length < 1024) {
       if (injectionMatches.length > 0) {
-        return { hookType: "rewriteOutput", updatedOutput: fenceUntrustedContent(body, injectionMatches) };
+        return emitRewrite(fenceUntrustedContent(bodyRedacted.text, injectionMatches), "fetch");
+      }
+      if (bodyRedacted.count > 0) {
+        return emitRewrite(bodyRedacted.text, "fetch");
       }
       return passOutput();
     }
@@ -7054,8 +7071,9 @@ function postFetchHandler(event) {
     }
     const cacheId = storeWebOutput(url, storedBody, `${url}\0${prompt}`, storedBody !== body ? body : void 0);
     recordWebFetch(url, prompt, cacheId);
+    const storedRedacted = storedBody === body ? bodyRedacted : redactSecrets(storedBody);
     if (injectionMatches.length > 0) {
-      return { hookType: "rewriteOutput", updatedOutput: fenceUntrustedContent(storedBody, injectionMatches) };
+      return emitRewrite(fenceUntrustedContent(storedRedacted.text, injectionMatches), "fetch");
     }
     if (storedBody !== body) {
       const noticeFor = (id) => `
@@ -7070,11 +7088,12 @@ function postFetchHandler(event) {
         noticeBytes,
         minNetSavingsBytes: resolveMinNetSavingsBytes()
       })) {
-        const bytesDelta = originalBytes - rewrittenBytes;
-        recordStat("webfetch:compress", bytesDelta, Math.round(bytesDelta / 4));
-        return { hookType: "rewriteOutput", updatedOutput: storedBody + notice };
+        return emitRewrite(storedRedacted.text + notice, "fetch", { kind: "webfetch:compress", originalBytes });
       }
     }
+    if (storedRedacted.count > 0) {
+      return emitRewrite(storedRedacted.text, "fetch");
+    }
     return passOutput();
   } catch {
     return passOutput();
@@ -7127,7 +7146,9 @@ async function preSkillHandler(event) {
       return passOutput();
     }
     if (await hasSessionOutput(event.sessionId, skillName)) {
-      recordStat("session_hint");
+      const cachedBytes = await sessionOutputBodyBytes(event.sessionId, skillName);
+      const denyCredit = cachedBytes !== null ? Math.min(cachedBytes, PER_FILE_COUNTERFACTUAL_CEILING) : 0;
+      recordStat("session_hint", denyCredit, savedTokensFromBytes(denyCredit));
       return denyOutput(
         "Skill `" + skillName + "` was already loaded this session and is cached. Use `token-goat skill-body " + skillName + " --compact` to recall the compact slice (or `token-goat skill-body " + skillName + "` for the full body) instead of re-loading it."
       );
@@ -7142,7 +7163,7 @@ async function preSkillHandler(event) {
           const compactBytes = Buffer.byteLength(compact, "utf-8");
           if (compactBytes * 2 <= bodyBytes && compactBytes <= COMPACT_INLINE_MAX_BYTES) {
             const savedBytes = bodyBytes - compactBytes;
-            recordStat("skill_compact_inlined", savedBytes, Math.round(savedBytes / 4));
+            recordStat("skill_compact_inlined", savedBytes, savedTokensFromBytes(savedBytes));
             return denyOutput(
               "Skill `" + skillName + "` is large (" + bodyBytes + " bytes); its compact slice (" + compactBytes + " bytes) is inlined below instead of the full body. Run `token-goat skill-body " + skillName + "` if you need the full body.\n\n" + compact
             );
@@ -7466,16 +7487,16 @@ function isTempPath(fp) {
   return /^\/tmp\//i.test(norm) || /\/var\/folders\//i.test(norm) || /AppData\/Local\/Temp\//i.test(norm) || norm.startsWith("/c/Users/") && norm.includes("/AppData/Local/Temp/") || isUnderSystemTemp(fp);
 }
 function isOrchestratorStateFile(filePath) {
-  const basename2 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
-  return /^\.improve-state-/.test(basename2);
+  const basename3 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
+  return /^\.improve-state-/.test(basename3);
 }
 function extractCatSourceFile(cmd) {
   const m = /^cat\s+(\S+\.(?:java|py|ts|tsx|js|jsx|go|rb|rs|cpp|cc|cxx|c|h|hpp|kt|swift|cs|php|scala|clj|css|scss|sass|less))\s*$/.exec(cmd);
   return m?.[1] ?? null;
 }
 function classifyFileExtensions(filePath) {
-  const basename2 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
-  const isEnvFile = /^\.env(\.\w+)?$/i.test(basename2);
+  const basename3 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
+  const isEnvFile = /^\.env(\.\w+)?$/i.test(basename3);
   const hasKnownExt = /\.(?:java|py|ts|tsx|js|jsx|go|rb|rs|cpp|cc|cxx|c|h|hpp|kt|swift|cs|php|scala|clj|css|scss|sass|less|md|mdx|rst|txt|json|yaml|yml|toml|xml|conf|cfg|ini|properties|sql|ps1|psm1|env)$/i.test(filePath);
   if (!hasKnownExt && !isEnvFile) return null;
   const isSql = /\.sql$/i.test(filePath);
@@ -7497,12 +7518,14 @@ function classifyCatPath(filePath, cmd0) {
   return { filePath, ...flags, cmd0 };
 }
 function extractCatFile(cmd) {
-  const m = /^(cat|bat|type|Get-Content|gc)(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+))*\s+(?:"([^"]+)"|'([^']+)'|(\S+?))(?:\s+-[a-zA-Z].*)?\s*$/i.exec(cmd);
+  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];
   const filePath = m[2] ?? m[3] ?? m[4];
   if (filePath === void 0) return null;
-  return classifyCatPath(filePath, cmd0);
+  const r = classifyCatPath(filePath, cmd0);
+  if (r === null) return null;
+  return { ...r, advisoryOnly: m[5] === "/dev/null" };
 }
 function extractCatFilesMulti(cmd) {
   if (/[|<>;&`]/.test(cmd) || cmd.includes("$(")) return null;
@@ -7750,11 +7773,12 @@ function extractPythonFileRead(cmd) {
   return null;
 }
 function extractHeadFile(cmd) {
-  const m = /^head(?:\s+-n\s+(\d+)|\s+-(\d+))?\s+(?:"([^"]+)"|'([^']+)'|(\S+))\s*$/.exec(cmd);
-  if (!m) return null;
-  const n = parseInt(m[1] ?? m[2] ?? "0", 10);
+  const direct = /^head(?:\s+-n\s+(\d+)|\s+-(\d+))?\s+(?:"([^"]+)"|'([^']+)'|(\S+))\s*$/.exec(cmd);
+  const piped = direct === null ? /^cat(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+))*\s+(?:"([^"]+)"|'([^']+)'|(\S+?))(?:\s+2>(?:&1|\/dev\/null))?\s*\|\s*head(?:\s+-n\s+(\d+)|\s+-(\d+))?\s*$/.exec(cmd) : null;
+  if (direct === null && piped === null) return null;
+  const n = parseInt((direct !== null ? direct[1] ?? direct[2] : piped[4] ?? piped[5]) ?? "0", 10);
   if (n <= 10) return null;
-  const filePath = m[3] ?? m[4] ?? m[5];
+  const filePath = direct !== null ? direct[3] ?? direct[4] ?? direct[5] : piped[1] ?? piped[2] ?? piped[3];
   if (filePath === void 0) 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)$/i.test(filePath)) return null;
@@ -7762,12 +7786,12 @@ function extractHeadFile(cmd) {
   return { filePath, isDoc, isConfig, isSql, n };
 }
 function extractSedRange(cmd) {
-  const m = /^sed\s+-n\s+['"](?:\d+,\d+p)(?:;\d+,\d+p)*['"]\s+(?:"([^"]+)"|'([^']+)'|(\S+))(?:\s+2>\/dev\/null)?\s*$/.exec(cmd);
+  const m = /^sed\s+-n\s+(?:['"]((?:\d+,\d+p)(?:;\d+,\d+p)*)['"]|(\d+,\d+p))\s+(?:"([^"]+)"|'([^']+)'|(\S+))(?:\s+2>(?:\/dev\/null|&1))?\s*$/.exec(cmd);
   if (!m) return null;
-  const quotedAddress = /['"]([^'"]+)['"]/.exec(cmd);
-  if (!quotedAddress) return null;
+  const addressList = m[1] ?? m[2];
+  if (addressList === void 0) return null;
   const ranges = [];
-  for (const clause of quotedAddress[1].split(";")) {
+  for (const clause of addressList.split(";")) {
     const cm = /^(\d+),(\d+)p$/.exec(clause ?? "");
     if (!cm) return null;
     const start = parseInt(cm[1], 10);
@@ -7776,19 +7800,21 @@ function extractSedRange(cmd) {
     ranges.push([start, end]);
   }
   if (ranges.length === 0) return null;
-  const filePath = m[1] ?? m[2] ?? m[3];
+  const filePath = m[3] ?? m[4] ?? m[5];
   if (filePath === void 0) return null;
   if (isTempPath(filePath)) return null;
   return { filePath, ranges };
 }
 function extractAwkRange(cmd) {
-  const m = /^awk\s+(?:'([^']+)'|"([^"]+)")\s+(?:"([^"]+)"|'([^']+)'|(\S+))(?:\s+2>\/dev\/null)?\s*$/.exec(cmd);
+  const m = /^awk\s+(?:'([^']+)'|"([^"]+)")\s+(?:"([^"]+)"|'([^']+)'|(\S+))(?:\s+2>(?:\/dev\/null|&1))?\s*$/.exec(cmd);
   if (!m) return null;
   const program = m[1] ?? m[2];
   if (program === void 0) return null;
-  const cmp = /^\s*NR\s*>=\s*(\d+)\s*&&\s*NR\s*<=\s*(\d+)\s*$/.exec(program);
-  const rng = /^\s*NR\s*==\s*(\d+)\s*,\s*NR\s*==\s*(\d+)\s*$/.exec(program);
+  const cmp = /^\s*NR\s*>=\s*(\d+)\s*&&\s*NR\s*<=\s*(\d+)\s*(\{.*\})?\s*$/.exec(program);
+  const rng = /^\s*NR\s*==\s*(\d+)\s*,\s*NR\s*==\s*(\d+)\s*(\{.*\})?\s*$/.exec(program);
   const hit = cmp ?? rng;
+  const action = hit?.[3];
+  if (action !== void 0 && !/^\{\s*(?:print(?:\s+NR\s*"[^"%]*"\s*\$0|\s+\$0)?|printf\s*"%d[^%"]*%s\\n"\s*,\s*NR\s*,\s*\$0)\s*\}$/.test(action)) return null;
   if (!hit) return null;
   const start = parseInt(hit[1], 10);
   const end = parseInt(hit[2], 10);
@@ -7798,13 +7824,47 @@ function extractAwkRange(cmd) {
   if (isTempPath(filePath)) return null;
   return { filePath, ranges: [[start, end]] };
 }
+function normalizeCatSedPipe(cmd) {
+  const m = /^cat(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+))*\s+(?:"([^"]+)"|'([^']+)'|(\S+?))(?:\s+2>(?:&1|\/dev\/null))?\s*\|\s*sed\s+-n\s+('[^']+'|"[^"]+"|\d+,\d+p)\s*$/.exec(cmd);
+  if (!m) return null;
+  const filePath = m[1] ?? m[2] ?? m[3];
+  if (filePath === void 0 || filePath.includes('"')) return null;
+  return "sed -n " + m[4] + ' "' + filePath + '"';
+}
 function extractLineRangeRead(cmd) {
+  const catSed = normalizeCatSedPipe(cmd);
+  if (catSed !== null) cmd = catSed;
   const sed = extractSedRange(cmd);
   if (sed !== null) return { ...sed, tool: "sed" };
   const awk = extractAwkRange(cmd);
   if (awk !== null) return { ...awk, tool: "awk" };
   return null;
 }
+var FORMATTING_STAGE_RE = /^(?:fold|cut|cat|nl|head|tail)(?:\s+(?:-\S+|[\d,+-]+))*\s*$/;
+function extractLineRangeReadsCompound(cmd) {
+  const cleaned = cmd.replace(/\s2>(?:&1|\/dev\/null)/g, "");
+  const segments = splitShellSegments(cleaned);
+  if (segments.length < 2) return null;
+  const reads = [];
+  for (const seg of segments) {
+    const r = extractLineRangeRead(seg);
+    if (r !== null) {
+      reads.push(r);
+      continue;
+    }
+    if (/^echo\b[^<>]*$/.test(seg)) continue;
+    if (FORMATTING_STAGE_RE.test(seg)) continue;
+    return null;
+  }
+  if (reads.length === 0) return null;
+  const merged = /* @__PURE__ */ new Map();
+  for (const r of reads) {
+    const prev = merged.get(r.filePath);
+    if (prev !== void 0) prev.ranges.push(...r.ranges);
+    else merged.set(r.filePath, { filePath: r.filePath, ranges: [...r.ranges], tool: r.tool });
+  }
+  return [...merged.values()];
+}
 var SYMBOL_BEARING_LANGUAGES = /* @__PURE__ */ new Set([
   "python",
   "typescript",
@@ -7904,11 +7964,12 @@ function extractTailFile(cmd) {
   if (/-f\b/.test(cmd)) return null;
   if (/-c\b/.test(cmd)) return null;
   if (/-n\s*\+/.test(cmd)) return null;
-  const m = /^tail(?:\s+-n\s+(\d+)|\s+-(\d+))?\s+(?:"([^"]+)"|'([^']+)'|(\S+))\s*$/.exec(cmd);
-  if (!m) return null;
-  const n = parseInt(m[1] ?? m[2] ?? "0", 10);
+  const direct = /^tail(?:\s+-n\s+(\d+)|\s+-(\d+))?\s+(?:"([^"]+)"|'([^']+)'|(\S+))\s*$/.exec(cmd);
+  const piped = direct === null ? /^cat(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+))*\s+(?:"([^"]+)"|'([^']+)'|(\S+?))(?:\s+2>(?:&1|\/dev\/null))?\s*\|\s*tail(?:\s+-n\s+(\d+)|\s+-(\d+))?\s*$/.exec(cmd) : null;
+  if (direct === null && piped === null) return null;
+  const n = parseInt((direct !== null ? direct[1] ?? direct[2] : piped[4] ?? piped[5]) ?? "0", 10);
   if (n <= 10) return null;
-  const filePath = m[3] ?? m[4] ?? m[5];
+  const filePath = direct !== null ? direct[3] ?? direct[4] ?? direct[5] : piped[1] ?? piped[2] ?? piped[3];
   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)$/i.test(filePath)) return null;
@@ -8362,10 +8423,19 @@ async function maybeCompressCompoundOutput(cmd, output, exitCode, cwd, cacheMinB
   });
   const minNet = resolveMinNetSavingsBytes();
   if (!compressed.worthApplying(minNet)) return null;
-  const id = await storeBashOutput(cmd, output, exitCode ?? 0, cwd);
-  recordStat("bash_compress:generic", compressed.bytesSaved, compressed.tokensSaved);
+  const id = await commandHash(cmd, cwd);
   const body = compressed.withMarker(minNet) + "\n[token-goat] full output: bash-output " + id + " --full";
-  return { hookType: "rewriteOutput", updatedOutput: body };
+  const emittedBytes = Buffer.byteLength(body, "utf-8");
+  if (!isRewriteWorthwhile({
+    originalBytes: compressed.originalBytes,
+    rewrittenBytes: emittedBytes,
+    noticeBytes: 0,
+    minNetSavingsBytes: minNet
+  })) {
+    return null;
+  }
+  await storeBashOutput(cmd, output, exitCode ?? 0, cwd);
+  return emitRewrite(body, "bash", { kind: "bash_compress:generic", originalBytes: compressed.originalBytes });
 }
 function unwrapCompressCommand(executed) {
   const t = executed.trim();
@@ -8591,25 +8661,28 @@ function preBashHandlerInner(event) {
       "Use `token-goat outline <file>` to see symbol names and line counts without loading files."
     );
   }
-  const sedRange = extractLineRangeRead(cmd);
-  if (sedRange !== null) {
-    const { filePath, ranges, tool } = sedRange;
-    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
+  const singleLineRangeRead = extractLineRangeRead(cmd);
+  const sedReads = singleLineRangeRead !== null ? [singleLineRangeRead] : extractLineRangeReadsCompound(cmd);
+  if (sedReads !== null) {
     recordStat("session_hint", 0, 0);
-    const sedDedupKey = resolveIndexPath(hintPath, preHookCwd ?? process.cwd());
-    const overlapHints = [];
-    const freshRanges = [];
-    for (const [start, end] of ranges) {
-      const priorOverlap = findRangeOverlap(getFileLineRanges(sedDedupKey), start, end);
-      recordFileLineRange(sedDedupKey, start, end);
-      if (priorOverlap !== null) {
-        overlapHints.push(sedOverlapHint(hintPath, priorOverlap, start, end));
-      } else {
-        freshRanges.push([start, end]);
+    const hints = [];
+    for (const { filePath, ranges, tool } of sedReads) {
+      const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
+      const sedDedupKey = resolveIndexPath(hintPath, preHookCwd ?? process.cwd());
+      const overlapHints = [];
+      const freshRanges = [];
+      for (const [start, end] of ranges) {
+        const priorOverlap = findRangeOverlap(getFileLineRanges(sedDedupKey), start, end);
+        recordFileLineRange(sedDedupKey, start, end);
+        if (priorOverlap !== null) {
+          overlapHints.push(sedOverlapHint(hintPath, priorOverlap, start, end));
+        } else {
+          freshRanges.push([start, end]);
+        }
       }
+      hints.push(...overlapHints);
+      if (freshRanges.length > 0) hints.push(sedRangeHint(hintPath, freshRanges, tool));
     }
-    const hints = [...overlapHints];
-    if (freshRanges.length > 0) hints.push(sedRangeHint(hintPath, freshRanges, tool));
     return contextOutput(hints.join(" "));
   }
   const catJsonPipe = extractCatJsonPipe(cmd);
@@ -8623,7 +8696,7 @@ function preBashHandlerInner(event) {
   }
   const catResult = extractCatFile(cmd);
   if (catResult !== null) {
-    const { filePath, isDoc, isEnv, isConfig, isSql, cmd0 } = catResult;
+    const { filePath, isDoc, isEnv, isConfig, isSql, cmd0, advisoryOnly } = catResult;
     const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
     if (isSql) {
@@ -8632,7 +8705,7 @@ function preBashHandlerInner(event) {
       );
     }
     const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc);
-    return cdStripped ? contextOutput("`" + cmd0 + "` loads the entire file into context. " + hint) : denyOutput("`" + cmd0 + "` loads the entire file into context. " + hint);
+    return cdStripped || advisoryOnly ? contextOutput("`" + cmd0 + "` loads the entire file into context. " + hint) : denyOutput("`" + cmd0 + "` loads the entire file into context. " + hint);
   }
   const catMulti = extractCatFilesMulti(cmd);
   if (catMulti !== null) {
@@ -8771,13 +8844,13 @@ function preBashHandlerInner(event) {
       const monBytes = monEntry.sizeBytes;
       const catFile = extractCatSourceFile(cmd);
       if (catFile !== null) {
-        recordStat("bash_compress:recall", monBytes, Math.round(monBytes / 4));
+        recordStat("bash_compress:recall", monBytes, savedTokensFromBytes(monBytes));
         return contextOutput(
           "Prior output from `" + cmd + "`" + pipelineDivergenceNote(cmd, monEntry.command) + " is cached. Use `token-goat bash-output " + monOutputId + "` to recall the full file, or `token-goat read '" + catFile + "::SymbolName'` to extract only the symbol you need."
         );
       }
       const cmdSummary = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
-      recordStat("bash_compress:recall", monBytes, Math.round(monBytes / 4));
+      recordStat("bash_compress:recall", monBytes, savedTokensFromBytes(monBytes));
       return contextOutput(
         "Prior output from `" + cmdSummary + "`" + pipelineDivergenceNote(cmd, monEntry.command) + " is cached.\nUse `token-goat bash-output " + monOutputId + " " + monitoringHint + "` to re-inspect without re-running."
       );
@@ -8804,7 +8877,7 @@ function preBashHandlerInner(event) {
     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)) {
       const curlBytes = curlEntry.sizeBytes;
-      recordStat("bash_compress:recall", curlBytes, Math.round(curlBytes / 4));
+      recordStat("bash_compress:recall", curlBytes, savedTokensFromBytes(curlBytes));
       const curlPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
       return contextOutput(
         "curl response cached (`" + curlPreview + "`)." + pipelineDivergenceNote(cmd, curlEntry.command) + " Use `token-goat bash-output " + curlOutputId + "` to recall it. Append `--grep PATTERN` to filter or `--section HeadingName` for a markdown section."
@@ -8818,7 +8891,7 @@ function preBashHandlerInner(event) {
     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)) {
       const ghBytes = ghEntry.sizeBytes;
-      recordStat("bash_compress:recall", ghBytes, Math.round(ghBytes / 4));
+      recordStat("bash_compress:recall", ghBytes, savedTokensFromBytes(ghBytes));
       const ghPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
       return contextOutput(
         "gh api response cached (`" + ghPreview + "`)." + pipelineDivergenceNote(cmd, ghEntry.command) + " Use `token-goat bash-output " + ghOutputId + "` to recall it. Append `--jq '.field'` on the original call, or `--grep PATTERN` / `--max-matches N` here, to narrow it."
@@ -8832,7 +8905,7 @@ function preBashHandlerInner(event) {
     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)) {
       const gitScopedBytes = gitScopedEntry.sizeBytes;
-      recordStat("bash_compress:recall", gitScopedBytes, Math.round(gitScopedBytes / 4));
+      recordStat("bash_compress:recall", gitScopedBytes, savedTokensFromBytes(gitScopedBytes));
       const gitScopedPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
       return contextOutput(
         "Output from `" + gitScopedPreview + "`" + pipelineDivergenceNote(cmd, gitScopedEntry.command) + " is cached and unchanged (no edits to that path or HEAD since). Use `token-goat bash-output " + gitScopedOutputId + "` to recall it instead of re-running."
@@ -8874,7 +8947,7 @@ function preBashHandlerInner(event) {
   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)) {
     const bytes = entry.sizeBytes;
-    recordStat("bash_compress:recall", bytes, Math.round(bytes / 4));
+    recordStat("bash_compress:recall", bytes, savedTokensFromBytes(bytes));
     return contextOutput(buildRecallHint(cmd, outputId));
   }
   return maybeCompressRewrite(event, rawCmd, cmd) ?? passOutput();
@@ -9121,10 +9194,7 @@ function postBashOutputHandler(event) {
       })) {
         return passOutput();
       }
-      return {
-        hookType: "rewriteOutput",
-        updatedOutput: unchangedNotice
-      };
+      return emitRewrite(unchangedNotice, "bashoutput", { kind: "bashoutput:unchanged", originalBytes: Buffer.byteLength(rawOutput, "utf-8") });
     }
     if (!output.startsWith(prior.output)) {
       storePollSnapshot(event.sessionId, bashId, output);
@@ -9143,10 +9213,7 @@ function postBashOutputHandler(event) {
     })) {
       return passOutput();
     }
-    return {
-      hookType: "rewriteOutput",
-      updatedOutput: `${deltaNotice}${delta}`
-    };
+    return emitRewrite(`${deltaNotice}${delta}`, "bashoutput", { kind: "bashoutput:delta", originalBytes: Buffer.byteLength(rawOutput, "utf-8") });
   } catch {
     return passOutput();
   }
@@ -9176,12 +9243,23 @@ function getTaskId(toolInput) {
   const value = toolInput["task_id"];
   return typeof value === "string" && value !== "" ? value : void 0;
 }
+function extractTaskOutputText(raw) {
+  const tr = raw["tool_response"];
+  if (tr !== null && typeof tr === "object" && !Array.isArray(tr)) {
+    const task = tr["task"];
+    if (task !== null && typeof task === "object" && !Array.isArray(task)) {
+      const output = task["output"];
+      if (typeof output === "string") return output;
+    }
+  }
+  return extractToolResultText(raw);
+}
 function postTaskOutputHandler(event) {
   try {
     if (getToolName(event) !== "TaskOutput" || !event.sessionId) return passOutput();
     const taskId = getTaskId(getToolInput(event));
     if (taskId === void 0) return passOutput();
-    const rawOutput = extractToolResultText(event.raw);
+    const rawOutput = extractTaskOutputText(event.raw);
     if (!rawOutput) return passOutput();
     const output = redactSecrets(rawOutput).text;
     if (!output) return passOutput();
@@ -9201,10 +9279,7 @@ function postTaskOutputHandler(event) {
       })) {
         return passOutput();
       }
-      return {
-        hookType: "rewriteOutput",
-        updatedOutput: collapsed
-      };
+      return emitRewrite(collapsed, "taskoutput", { kind: "taskoutput:collapse", originalBytes: Buffer.byteLength(rawOutput, "utf-8") });
     }
     if (output === prior.output) {
       storePollSnapshot2(event.sessionId, taskId, output);
@@ -9218,10 +9293,7 @@ function postTaskOutputHandler(event) {
       })) {
         return passOutput();
       }
-      return {
-        hookType: "rewriteOutput",
-        updatedOutput: unchangedNotice
-      };
+      return emitRewrite(unchangedNotice, "taskoutput", { kind: "taskoutput:unchanged", originalBytes: Buffer.byteLength(rawOutput, "utf-8") });
     }
     if (!output.startsWith(prior.output)) {
       storePollSnapshot2(event.sessionId, taskId, output);
@@ -9241,10 +9313,7 @@ function postTaskOutputHandler(event) {
     })) {
       return passOutput();
     }
-    return {
-      hookType: "rewriteOutput",
-      updatedOutput: `${deltaNotice}${collapsedDelta}`
-    };
+    return emitRewrite(`${deltaNotice}${collapsedDelta}`, "taskoutput", { kind: "taskoutput:delta", originalBytes: Buffer.byteLength(rawOutput, "utf-8") });
   } catch {
     return passOutput();
   }
@@ -9340,8 +9409,10 @@ var APPROVED_PLAN_MARKER = "## Approved Plan:";
 function postExitPlanModeHandler(event) {
   try {
     if (getToolName(event) !== "ExitPlanMode") return passOutput();
-    const output = extractToolResultText(event.raw);
-    if (!output) return passOutput();
+    const rawOutput = extractToolResultText(event.raw);
+    if (!rawOutput) return passOutput();
+    const redacted = redactSecrets(rawOutput);
+    const output = redacted.text;
     const markerIndex = output.indexOf(APPROVED_PLAN_MARKER);
     if (markerIndex === -1) return passOutput();
     const planValue = getToolInput(event)["plan"];
@@ -9360,10 +9431,10 @@ ${PLAN_OMIT_POINTER}`;
     })) {
       return passOutput();
     }
-    return {
-      hookType: "rewriteOutput",
-      updatedOutput: `${prefix}${notice}`
-    };
+    return emitRewrite(`${prefix}${notice}`, "exitplanmode", {
+      kind: "plan_echo_collapse",
+      originalBytes: Buffer.byteLength(output, "utf-8")
+    });
   } catch {
     return passOutput();
   }
@@ -9431,6 +9502,9 @@ function storeMcpOutput(sessionId, toolName, toolInput, resultText) {
 ${redactedOutput}`, entry.storedAt);
   return id;
 }
+function mcpOutputBytes(id) {
+  return getBashOutput(id)?.sizeBytes ?? 0;
+}
 function getMcpOutput(sessionId, toolName, toolInput, ttlMs = Number.POSITIVE_INFINITY) {
   if (!sessionId) return null;
   const id = mcpOutputId(sessionId, mcpHash(toolName, toolInput));
@@ -9753,6 +9827,8 @@ function preMcpHandler(event) {
   const ttlMs = loadConfig().hints.mcp_dedup_ttl_secs * 1e3;
   const id = getMcpOutput(event.sessionId, toolName, toolInput, ttlMs);
   if (!id) return passOutput();
+  const denyCredit = Math.min(mcpOutputBytes(id), PER_FILE_COUNTERFACTUAL_CEILING);
+  recordStat("mcp:recall", denyCredit, savedTokensFromBytes(denyCredit));
   return denyOutput(
     "Identical read-only MCP call already cached this session. Use `token-goat bash-output " + id + "` to recall the result (add `--grep PATTERN`, `--tail N`, or `--head N` to slice) instead of repeating the call."
   );
@@ -9770,11 +9846,16 @@ function postMcpHandler(event) {
     injectionMatches = [];
   }
   if (injectionMatches.length > 0) recordStat("injection_detected", 0, 0, void 0, injectionMatches.join(","));
-  const fenced = () => ({
-    hookType: "rewriteOutput",
-    updatedOutput: fenceUntrustedContent(redactSecrets(resultText).text, injectionMatches, UNTRUSTED_TOOL_TAG)
-  });
-  const passOrFence = () => injectionMatches.length > 0 ? fenced() : passOutput();
+  const redactedResult = redactSecrets(resultText);
+  const fenced = () => emitRewrite(
+    fenceUntrustedContent(redactedResult.text, injectionMatches, UNTRUSTED_TOOL_TAG),
+    "mcp"
+  );
+  const passOrFence = () => {
+    if (injectionMatches.length > 0) return fenced();
+    if (redactedResult.count > 0) return emitRewrite(redactedResult.text, "mcp");
+    return passOutput();
+  };
   if (!event.sessionId) return passOrFence();
   if (isMcpErrorResponse(event.raw)) return passOrFence();
   const readOnly = isMcpReadOnly(toolName, toolInput);
@@ -9792,17 +9873,19 @@ function postMcpHandler(event) {
         const redactedBody = redactSecrets(compressed).text;
         const notice = `[token-goat: compressed, full via mcp-output ${id}]
 `;
+        const originalBytes = Buffer.byteLength(resultText, "utf-8");
         const worthwhile = isRewriteWorthwhile({
-          originalBytes: Buffer.byteLength(resultText, "utf-8"),
+          originalBytes,
           rewrittenBytes: Buffer.byteLength(redactedBody, "utf-8"),
           noticeBytes: Buffer.byteLength(notice, "utf-8"),
           minNetSavingsBytes: resolveMinNetSavingsBytes()
         });
         if (worthwhile) {
-          return {
-            hookType: "rewriteOutput",
-            updatedOutput: injectionMatches.length > 0 ? `${notice}${fenceUntrustedContent(redactedBody, injectionMatches, UNTRUSTED_TOOL_TAG)}` : `${notice}${redactedBody}`
-          };
+          return emitRewrite(
+            injectionMatches.length > 0 ? `${notice}${fenceUntrustedContent(redactedBody, injectionMatches, UNTRUSTED_TOOL_TAG)}` : `${notice}${redactedBody}`,
+            "mcp",
+            { kind: "mcp:compress", originalBytes }
+          );
         }
       }
     }
@@ -9848,14 +9931,32 @@ function preWebSearchDedupHandler(event) {
 }
 function postWebSearchHandler(event) {
   try {
-    if (getToolName(event) !== "WebSearch" || !event.sessionId) return passOutput();
-    const signature = webSearchSignatureInput(getToolInput(event));
-    if (signature === null) return passOutput();
-    if (isMcpErrorResponse(event.raw)) return passOutput();
+    if (getToolName(event) !== "WebSearch") return passOutput();
     const resultText = extractToolResultText(event.raw);
     if (!resultText) return passOutput();
+    let injectionMatches = [];
+    try {
+      if (loadConfig().injection.enabled) injectionMatches = scanForInjectionPatterns(resultText);
+    } catch {
+      injectionMatches = [];
+    }
+    if (injectionMatches.length > 0) recordStat("injection_detected", 0, 0, void 0, injectionMatches.join(","));
+    const redacted = redactSecrets(resultText);
+    const passOrFence = () => {
+      if (injectionMatches.length > 0) {
+        return emitRewrite(fenceUntrustedContent(redacted.text, injectionMatches), "websearch");
+      }
+      if (redacted.count > 0) {
+        return emitRewrite(redacted.text, "websearch");
+      }
+      return passOutput();
+    };
+    if (!event.sessionId) return passOrFence();
+    const signature = webSearchSignatureInput(getToolInput(event));
+    if (signature === null) return passOrFence();
+    if (isMcpErrorResponse(event.raw)) return passOrFence();
     storeMcpOutput(event.sessionId, "WebSearch", signature, resultText);
-    return passOutput();
+    return passOrFence();
   } catch {
     return passOutput();
   }
@@ -9905,13 +10006,15 @@ async function shrinkImageBlock(block) {
   const mediaType = typeof source?.media_type === "string" ? source.media_type : "image/png";
   const data = typeof source?.data === "string" ? source.data : "";
   const originalDataUrl = `data:${mediaType};base64,${data}`;
-  if (source?.type !== "base64" || data === "") return { text: originalDataUrl, changed: false, savedBytes: 0 };
+  if (source?.type !== "base64" || data === "") return { text: originalDataUrl, changed: false, savedBytes: 0, savedTokens: 0 };
   let buffer;
   try {
     buffer = Buffer.from(data, "base64");
   } catch {
-    return { text: originalDataUrl, changed: false, savedBytes: 0 };
+    return { text: originalDataUrl, changed: false, savedBytes: 0, savedTokens: 0 };
   }
+  const meta = await probeImageMeta(buffer);
+  const tier = loadConfig().image_shrink.vision_tier;
   const fingerprint = screenshotFingerprint(data);
   const alreadyShown = hasSeenImage(fingerprint);
   recordSeenImage(fingerprint);
@@ -9926,16 +10029,23 @@ async function shrinkImageBlock(block) {
       return {
         text: SCREENSHOT_REPEAT_NOTICE,
         changed: true,
-        savedBytes: originalDataUrl.length - SCREENSHOT_REPEAT_NOTICE.length
+        // Decoded image bytes, not base64 characters. Both branches of this function file under the same `image_shrink` kind, and the shrink branch below credits `result.originalBytes - result.shrunkBytes` -- decoded bytes, the convention documented at image_shrink.ts's own recordStat call. Base64 inflates by 4/3, so crediting `originalDataUrl.length` here booked roughly 33% more for a repeat screenshot than an identical shrink of the same image, and the ledger summed the two units into one row. The gate above deliberately still measures the data URL: it decides whether the rewrite pays off on the wire, where base64 characters are what is actually sent.
+        savedBytes: buffer.length - Buffer.byteLength(SCREENSHOT_REPEAT_NOTICE, "utf-8"),
+        // The whole image is withheld here rather than resized, so the visual tokens saved are its
+        // entire billed cost less the notice standing in for it. Billed cost, not raw patch count:
+        // an oversized screenshot would have been capped by the API's own downscale, so pricing the
+        // untouched dimensions would credit a bill that was never going to be sent.
+        savedTokens: Math.max(0, visionTokens(meta?.width ?? 0, meta?.height ?? 0, tier) - savedTokensFromBytes(Buffer.byteLength(SCREENSHOT_REPEAT_NOTICE, "utf-8")))
       };
     }
   }
   const result = await imageQualifiesForShrink(buffer) ? await shrinkImage(buffer, { sizeThresholdBytes: 0 }) : null;
-  if (result === null) return { text: originalDataUrl, changed: false, savedBytes: 0 };
+  if (result === null) return { text: originalDataUrl, changed: false, savedBytes: 0, savedTokens: 0 };
   const saved = result.originalBytes - result.shrunkBytes;
   const { summary, dataUrl } = formatShrinkSummary(result, "an inline browser screenshot");
+  const savedTokens = visionTokensSaved(result.originalWidth, result.originalHeight, result.width, result.height, tier);
   return { text: `${summary}
-${dataUrl}`, changed: true, savedBytes: saved };
+${dataUrl}`, changed: true, savedBytes: saved, savedTokens };
 }
 var TAB_CONTEXT_UNCHANGED_NOTICE = "(tabs unchanged since last check)";
 function dedupTabContext(text) {
@@ -9963,15 +10073,19 @@ async function postBrowserImageHandler(event) {
     const parts = [];
     for (const block of blocks) {
       if (block.type === "image") {
-        const { text, changed, savedBytes } = await shrinkImageBlock(block);
+        const { text, changed, savedBytes, savedTokens } = await shrinkImageBlock(block);
         if (changed) {
           anyChanged = true;
-          recordStat("image_shrink", savedBytes, Math.round(savedBytes / 4), void 0, toolName);
+          recordStat("image_shrink", savedBytes, savedTokens, void 0, toolName);
         }
         parts.push(text);
       } else if (block.type === "text" && typeof block.text === "string") {
         const { text, changed } = dedupTabContext(block.text);
-        if (changed) anyChanged = true;
+        if (changed) {
+          anyChanged = true;
+          const savedBytes = Buffer.byteLength(block.text, "utf-8") - Buffer.byteLength(text, "utf-8");
+          if (savedBytes > 0) recordStat("browser_tab_dedup", savedBytes, savedTokensFromBytes(savedBytes), void 0, toolName);
+        }
         parts.push(text);
       } else {
         try {
@@ -9982,7 +10096,7 @@ async function postBrowserImageHandler(event) {
       }
     }
     if (!anyChanged) return passOutput();
-    return { hookType: "rewriteOutput", updatedOutput: parts.join("\n") };
+    return emitRewrite(parts.join("\n"), toolName);
   } catch {
     return passOutput();
   }
@@ -9991,6 +10105,9 @@ registerHook("post_tool_use", postBrowserImageHandler, { toolPattern: "^mcp__" }
 
 // src/hooks_agent_spawn.ts
 import { createHash as createHash2 } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path2 from "node:path";
 var BRIEFING_TARGET_TOKENS = 550;
 function buildSubagentBriefing() {
   try {
@@ -10062,8 +10179,11 @@ function findDuplicateOutstandingPrompt(prompt) {
 function truncateForWarning(text, max) {
   return text.length > max ? text.slice(0, max) + "..." : text;
 }
+function isAgentTool(toolName) {
+  return toolName === "Agent" || toolName === "task" || toolName === "Task";
+}
 function preAgentHandler(event) {
-  if (event.toolName !== "Agent") return passOutput();
+  if (!isAgentTool(event.toolName)) return passOutput();
   const toolInput = event.toolInput;
   const prompt = toolInput["prompt"];
   if (typeof prompt !== "string" || prompt.trim() === "") return passOutput();
@@ -10085,7 +10205,7 @@ function preAgentHandler(event) {
     return passOutput();
   }
 }
-var FENCE_LINE_RE = /^ {0,3}(`{3,}|~{3,})(.*)$/;
+var FENCE_LINE_RE = /^ {0,3}(`{3,}|~{3,})([^\n]*)$/;
 function findFencedBlockLines(lines) {
   const blocks = [];
   let fenceStart = -1;
@@ -10185,21 +10305,118 @@ function collapseBlankRunsInFences(text) {
   out.push(...lines.slice(cursor));
   return changedAny ? out.join("\n") : text;
 }
+var SPAWN_RESTRICT_HINT_KEY = "agent-spawn-restrict-hint";
+var SPAWN_RESTRICT_MAX_NAMES = 3;
+var ROSTER_WALK_MAX_DEPTH = 4;
+var ROSTER_WALK_MAX_FILES = 400;
+function parseAgentDefinition(text, fallbackName) {
+  const fmMatch = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/.exec(text);
+  if (!fmMatch) return null;
+  const fm = fmMatch[1];
+  const nameMatch = /^name:(.*)$/m.exec(fm);
+  const rawName = nameMatch ? nameMatch[1].trim().replace(/^["']|["']$/g, "") : "";
+  const name2 = rawName !== "" ? rawName : fallbackName;
+  const toolsMatch = /^tools:(.*)$/m.exec(fm);
+  if (!toolsMatch) return { name: name2, restricted: false };
+  const inline = toolsMatch[1].trim();
+  if (inline === "*" || inline === '"*"' || inline === "'*'") return { name: name2, restricted: false };
+  if (inline !== "") return { name: name2, restricted: true };
+  const after = fm.slice(toolsMatch.index + toolsMatch[0].length);
+  for (const line of after.split(/\r?\n/)) {
+    if (/^\s+-\s*\S/.test(line)) return { name: name2, restricted: true };
+    if (/^\S/.test(line)) break;
+  }
+  return { name: name2, restricted: false };
+}
+function findRestrictedAgentNames(roots) {
+  const scanRoots = roots ?? [path2.join(os.homedir(), ".claude", "agents")];
+  const names = /* @__PURE__ */ new Set();
+  const visited = /* @__PURE__ */ new Set();
+  let filesSeen = 0;
+  const walk = (dir, depth) => {
+    if (depth > ROSTER_WALK_MAX_DEPTH || filesSeen >= ROSTER_WALK_MAX_FILES) return;
+    let real;
+    try {
+      real = fs.realpathSync(dir);
+    } catch {
+      return;
+    }
+    const key = process.platform === "win32" ? real.toLocaleLowerCase() : real;
+    if (visited.has(key)) return;
+    visited.add(key);
+    let entries;
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (filesSeen >= ROSTER_WALK_MAX_FILES) return;
+      const full = path2.join(dir, entry.name);
+      let stat;
+      try {
+        stat = fs.statSync(full);
+      } catch {
+        continue;
+      }
+      if (stat.isDirectory()) {
+        walk(full, depth + 1);
+        continue;
+      }
+      if (!stat.isFile() || !entry.name.toLowerCase().endsWith(".md")) continue;
+      filesSeen++;
+      let text;
+      try {
+        text = fs.readFileSync(full, "utf-8");
+      } catch {
+        continue;
+      }
+      const parsed = parseAgentDefinition(text, path2.basename(entry.name, path2.extname(entry.name)));
+      if (parsed !== null && parsed.restricted) names.add(parsed.name);
+    }
+  };
+  for (const root of scanRoots) walk(root, 0);
+  return Array.from(names).sort();
+}
+function buildUnrestrictedSpawnAdvisory(toolInput) {
+  try {
+    if (getHarnessName() === "copilot_cli") return "";
+    const rawType = toolInput["subagent_type"];
+    const spawnType = typeof rawType === "string" ? rawType.trim() : "";
+    if (spawnType !== "" && spawnType !== "general-purpose") return "";
+    if (wasHintShown(SPAWN_RESTRICT_HINT_KEY)) return "";
+    const names = findRestrictedAgentNames();
+    if (names.length === 0) return "";
+    markHintShown(SPAWN_RESTRICT_HINT_KEY);
+    recordStat("session_hint", 0, 0, void 0, "agent-spawn-restrict");
+    const shown = names.slice(0, SPAWN_RESTRICT_MAX_NAMES).join(", ");
+    const more = names.length > SPAWN_RESTRICT_MAX_NAMES ? ` and ${names.length - SPAWN_RESTRICT_MAX_NAMES} more` : "";
+    return `[token-goat] This spawn ran as general-purpose (the default when subagent_type is omitted), which is unrestricted: its lane starts by paying for every tool and MCP schema on the machine. Tools-restricted agent definitions exist here: ${shown}${more}. A future spawn that fits one of them can pass that name as subagent_type to start with a much smaller prefix. Advisory only: this spawn has already run, and this notice saved nothing.`;
+  } catch {
+    return "";
+  }
+}
 function postAgentHandler(event) {
   try {
-    if (event.toolName !== "Agent" || !event.sessionId) return passOutput();
+    if (!isAgentTool(event.toolName) || !event.sessionId) return passOutput();
     const finishedPrompt = event.toolInput["prompt"];
     if (typeof finishedPrompt === "string" && finishedPrompt !== "") {
       removeOutstandingAgentSpawn(finishedPrompt);
     }
-    const resultText = extractToolResultText(event.raw);
+    const redactedReport = redactSecrets(extractToolResultText(event.raw));
+    const resultText = redactedReport.text;
     const agentReportCfg = loadConfig().agent_report;
-    if (!resultText || resultText.length < agentReportCfg.min_bytes) return passOutput();
-    const id = storeMcpOutput(event.sessionId, "Agent", event.toolInput, resultText);
-    if (id === null) return passOutput();
+    const spawnAdvisory = buildUnrestrictedSpawnAdvisory(event.toolInput);
+    if (!resultText || resultText.length < agentReportCfg.min_bytes) {
+      return spawnAdvisory === "" ? passOutput() : contextOutput(spawnAdvisory);
+    }
+    const id = storeMcpOutput(event.sessionId, event.toolName ?? "Agent", event.toolInput, resultText);
+    if (id === null) return spawnAdvisory === "" ? passOutput() : contextOutput(spawnAdvisory);
+    if (redactedReport.count > 0) recordStat("secret_redacted", 0, redactedReport.count, void 0, "agent");
     recordStat("session_hint", 0, 0);
     const recallHint = `token-goat mcp-output ${id} --full`;
-    const notice = `[token-goat] This subagent report (${toKB(resultText.length)}KB) is cached for later recall: ${recallHint}`;
+    const notice = `[token-goat] This subagent report (${toKB(resultText.length)}KB) is cached for later recall: ${recallHint}${spawnAdvisory === "" ? "" : `
+${spawnAdvisory}`}`;
     const collapsed = collapseFencedBlocks(resultText, recallHint, agentReportCfg.fence_collapse_min_lines, agentReportCfg.fence_collapse_keep_lines);
     const deduped = dedupeFencedBlocks(collapsed, resultText, recallHint);
     const final = collapseBlankRunsInFences(deduped);
@@ -10216,8 +10433,8 @@ function postAgentHandler(event) {
 
 ${notice}`;
         const savedBytes = originalBytes - Buffer.byteLength(updatedOutput, "utf-8");
-        if (savedBytes > 0) recordStat("agent_report_compact", savedBytes, Math.round(savedBytes / 4));
-        return { hookType: "rewriteOutput", updatedOutput };
+        if (savedBytes > 0) recordStat("agent_report_compact", savedBytes, savedTokensFromBytes(savedBytes));
+        return emitRewrite(updatedOutput, "agent", void 0, "counted-elsewhere");
       }
       recordStat("agent_report_compact_declined", 0, 0);
     }
@@ -10227,7 +10444,11 @@ ${notice}`;
   }
 }
 registerHook("pre_tool_use", preAgentHandler, { toolName: "Agent" });
+registerHook("pre_tool_use", preAgentHandler, { toolName: "task" });
+registerHook("pre_tool_use", preAgentHandler, { toolName: "Task" });
 registerHook("post_tool_use", postAgentHandler, { toolName: "Agent" });
+registerHook("post_tool_use", postAgentHandler, { toolName: "task" });
+registerHook("post_tool_use", postAgentHandler, { toolName: "Task" });
 
 // src/relay.ts
 function isHookEventName(name2) {
@@ -10243,7 +10464,11 @@ function buildEvent(eventName, payload) {
   const sessionId = typeof rawSession === "string" ? rawSession : "";
   const rawAgentId = obj["agent_id"] ?? obj["agentId"];
   const agentId = typeof rawAgentId === "string" && rawAgentId !== "" ? rawAgentId : void 0;
-  return { eventName, toolName, toolInput, sessionId, agentId, raw: obj };
+  const rawTraceparent = obj["traceparent"] ?? obj["traceParent"] ?? process.env["TRACEPARENT"] ?? process.env["traceparent"];
+  const traceparent = typeof rawTraceparent === "string" && rawTraceparent.trim() !== "" ? rawTraceparent.trim() : void 0;
+  const rawTracestate = obj["tracestate"] ?? obj["traceState"] ?? process.env["TRACESTATE"] ?? process.env["tracestate"];
+  const tracestate = typeof rawTracestate === "string" && rawTracestate.trim() !== "" ? rawTracestate.trim() : void 0;
+  return { eventName, toolName, toolInput, sessionId, agentId, traceparent, tracestate, raw: obj };
 }
 function sessionStateKey(event) {
   return event.agentId !== void 0 ? `${event.sessionId}:agent:${event.agentId}` : event.sessionId;
@@ -10254,6 +10479,7 @@ function harnessForNormalization() {
   if (detected === "gemini") return "gemini";
   if (detected === "grok") return "grok";
   if (detected === "kimi") return "kimi";
+  if (detected === "qwen") return "qwen";
   if (detected === "copilot_cli") return "copilot_cli";
   return "claude";
 }
@@ -10268,6 +10494,12 @@ async function relayInProcess(eventName, rawPayload) {
     if (!process.env["CLAUDE_CODE_SESSION_ID"] && event.sessionId) {
       process.env["CLAUDE_CODE_SESSION_ID"] = event.sessionId;
     }
+    if (!process.env["TRACEPARENT"] && event.traceparent) {
+      process.env["TRACEPARENT"] = event.traceparent;
+    }
+    if (!process.env["TRACESTATE"] && event.tracestate) {
+      process.env["TRACESTATE"] = event.tracestate;
+    }
     const stateKey = sessionStateKey(event);
     try {
       loadSessionState(stateKey);