token-goat 2.8.1 → 2.8.3

package/dist/{token-goat-chunk-7JDXDERZ.mjs → token-goat-chunk-EFF2XCLB.mjs}

@@ -3,8 +3,9 @@ const require = __cjsRequire(import.meta.url);
 import {
   loadConfig,
   redactSecrets,
+  resolveIndexPath,
   stripAnsiCodes
-} from "./token-goat-chunk-ELDJRLHZ.mjs";
+} from "./token-goat-chunk-6ODZ6PZK.mjs";
 
 // src/tool_filters/helpers.ts
 import * as fs from "node:fs";
@@ -1424,7 +1425,7 @@ function makeLanguageFilter(cfg) {
 var _GH_COPILOT_SPINNER_RE = /^\s*(?:Asking GitHub Copilot|Generating|Thinking|Fetching)\s*\.{0,3}\s*$/i;
 var _GH_COPILOT_BANNER_RE = /^\s*(?:Welcome to GitHub Copilot|Using GitHub Copilot|Authenticated as|GitHub Copilot\s+v\d+)/i;
 var _GH_COPILOT_DISCLAIMER_RE = /^\s*(?:Disclaimer:|This response was|GitHub Copilot|The commands?\s+(?:above|below)|Please review|Always review|Remember to|Note:|Tip:)/i;
-var _AIDER_APPLYING_RE = /^\s*(?:Applying\s+edit(?:s)?(?:\s+to\s+\S+)?|Applied\s+edit\s+to\s+\S+)\s*\.{0,3}\s*$/i;
+var _AIDER_APPLYING_RE = /^\s*(?:Applying\s+edits?(?:\s+to\s+\S+)?|Applied\s+edit\s+to\s+\S+)\s*(?:\.{1,3})?\s*$/i;
 var _AIDER_TOKENS_RE = /^\s*Tokens:\s+\d[\d,]*\s+sent,\s+\d[\d,]*\s+received/i;
 var _AIDER_COST_RE = /^\s*Cost:\s+\$[\d.]+\s+message,\s+\$[\d.]+\s+session/i;
 var _AIDER_REPOMAP_RE = /^\s*(?:Repo-map:|Added\s+\S+\s+to\s+the\s+chat|Removed\s+\S+\s+from\s+the\s+chat|Loading\s+repo\s+map|Updating\s+repo\s+map|Scanning\s+repo\s+contents|Using\s+\d+\s+tokens\s+of\s+repo\s+map)/i;
@@ -4025,7 +4026,7 @@ var _TF_RESOURCE_COMPLETE_RE = /^[a-z0-9_.[\]"-]+: (?:Creation|Destruction|Modif
 var _TF_PLAN_ATTR_DIFF_RE = /^\s+[~+-]\s+\S/;
 var _TF_KNOWN_AFTER_APPLY_RE = /\(known after apply\)/;
 var _TF_INIT_PROVIDER_RE = /^\s*-\s+(?:Finding|Installing|Installed|Downloading|Locking)\s+\S+/i;
-var _TF_SHOW_RESOURCE_HDR_RE = /^# (?:(?:module\.\S+\.)?[a-z][a-z0-9_]+\.[a-zA-Z0-9_.[\]-]+):$/;
+var _TF_SHOW_RESOURCE_HDR_RE = /^# (?:(?:module\.[^.\s]+\.)?[a-z][a-z0-9_]+\.[a-zA-Z0-9_.[\]-]+):$/;
 var _TF_SHOW_KEY_ATTR_RE = /^\s+(?:id|arn|name|region|account_id|bucket|type|instance_type|endpoint|address|hostname|dns_name|tags(?:_all)?)\s*=/;
 var TerraformFilter = class extends ToolFilter {
   name = "terraform";
@@ -9030,7 +9031,7 @@ var LOG_WARN_RE = /\b(WARN(?:ING)?)\b|\[WARN(?:ING)?\]|level=warn/i;
 var LOG_INFO_RE = /\b(INFO)\b|\[INFO\]|level=info/i;
 var LOG_DEBUG_RE = /\b(DEBUG|TRACE|VERBOSE)\b|\[DEBUG\]|\[TRACE\]|level=(?:debug|trace)/i;
 var LOG_ANY_RE = /\b(?:ERROR|FAIL(?:URE|ED)?|CRITICAL|EXCEPTION|FATAL|WARN(?:ING)?|INFO|DEBUG|TRACE|VERBOSE)\b|\[(?:ERROR|CRITICAL|FATAL|WARN(?:ING)?|INFO|DEBUG|TRACE)\]|level=(?:error|critical|fatal|warn|info|debug|trace)/i;
-var TRACE_CONTINUATION_RE = /^\s+(?:at |File "|in |\w+Error:|\w+Exception:)|^\s+\w+[\w.]+\(.*\)$|^\s+\.{3}\s*\d+\s+more|^Caused by:|^During handling of the above exception/;
+var TRACE_CONTINUATION_RE = /^\s+(?:at |File "|in |\w+Error:|\w+Exception:)|^\s+\w+[\w.]+\([^)\r\n]*\)$|^\s+\.{3}\s*\d+\s+more|^Caused by:|^During handling of the above exception/;
 function scoreLogLine(line) {
   if (LOG_LEVEL_RE.test(line)) return 1;
   if (LOG_WARN_RE.test(line)) return 0.5;
@@ -9846,8 +9847,8 @@ function gitPositionalArgs(args) {
   }
   return out;
 }
-var _GIT_CRLF_MODERN_RE = /^warning: in the working copy of '.*', (?:LF will be replaced by CRLF|CRLF will be replaced by LF) the next time Git touches it\.?\r?$/m;
-var _GIT_CRLF_WARNING_RE = /^warning: (?:LF will be replaced by CRLF|CRLF will be replaced by LF) in .*\.?\r?$/;
+var _GIT_CRLF_MODERN_RE = /^warning: in the working copy of '[^']+', (?:LF will be replaced by CRLF|CRLF will be replaced by LF) the next time Git touches it\.?\r?$/m;
+var _GIT_CRLF_WARNING_RE = /^warning: (?:LF will be replaced by CRLF|CRLF will be replaced by LF) in [^\r\n]+\.?\r?$/;
 var _GIT_CRLF_CONTINUATION_RE = /^The file will have its original line endings in your working directory\.?\r?$/;
 function _stripGitCrlfWarnings(text) {
   if (!text.includes("will be replaced by") && !text.includes("original line endings") && !text.includes("next time Git touches it")) {
@@ -11793,7 +11794,7 @@ var KtlintFilter = class _KtlintFilter extends ToolFilter {
   }
 };
 var _SWIFTLINT_VIOLATION_RE = /^(.+\.swift):(\d+)(?::\d+)?: (warning|error|serious): (.+?) \(([a-z_]+)\)\s*$/i;
-var _SWIFTLINT_PROGRESS_RE = /^(Linting Swift files|Loading configuration|Linting '|Done linting!|Resolved \d|warning: .+ is deprecated|Ignoring '.+' in '|\s*$)/i;
+var _SWIFTLINT_PROGRESS_RE = /^(?:Linting Swift files|Loading configuration|Linting '|Done linting!|Resolved \d|warning: [^\r\n]+ is deprecated|Ignoring '[^']+' in '|\s*$)/i;
 var _SWIFTLINT_SUMMARY_RE = /^Done linting!/i;
 var swiftlintFilter = makeLinterFilter({
   name: "swiftlint",
@@ -12043,7 +12044,7 @@ var _CPPCHECK_PROGRESS_RE = /^\d+\/\d+\s+files\s+checked\s+\d+%\s+done/;
 var _CPPCHECK_DIAGNOSTIC_RE = /^\[.+\.(?:c|cpp|cxx|cc|h|hpp|hxx):\d+\]:/;
 var _CPPCHECK_DIAG_NOLINE_RE = /^\[.+\]:\s*\((?:error|warning|style|performance|portability|information)\)/i;
 var _CPPCHECK_CONFIG_RE = /^(?:Checking\s+configuration|Active\s+checkers:|Enabled\s+checkers:|cppcheck:\s+(?:error:|warning:|note:))/i;
-var _CPPCHECK_SUMMARY_RE = /^(?:\d+\s+(?:error|warning|style|performance|portability)s?(?:\s+(?:found|detected))?|No\s+errors\s+found|Done\s+processing|cppcheck:\s+.*(?:done|finished)|\d+\s+unique\s+error)/i;
+var _CPPCHECK_SUMMARY_RE = /^(?:\d+\s+(?:error|warning|style|performance|portability)s?(?:\s+(?:found|detected))?|No\s+errors\s+found|Done\s+processing|cppcheck:\s+[^\r\n]*(?:done|finished)|\d+\s+unique\s+error)/i;
 var CppcheckFilter = class extends ToolFilter {
   name = "cppcheck";
   binaries = /* @__PURE__ */ new Set(["cppcheck"]);
@@ -12215,14 +12216,14 @@ function dedupLines(lines, maxPerKey = 1, keyFn = (l) => l.trim()) {
 }
 var NPM_DEPRECATED_RE = /^npm warn deprecated\b/i;
 var NPM_NOTICE_RE = /^npm notice\b/i;
-var NPM_NOTICE_LOCKFILE_RE = /^npm notice.*lock/i;
+var NPM_NOTICE_LOCKFILE_RE = /^npm notice[^\r\n]*lock/i;
 var NPM_ZERO_VULN_RE = /^found 0 vulnerabilities\b/i;
 var NPM_FUNDING_RE = /^\d+\s+packages? are looking for funding\b/i;
 var NPM_FUND_RUN_RE = /^\s*run `npm fund`/i;
 var NPM_WARN_RE = /^npm warn\b/i;
 var NPM_VERBOSE_RE = /^npm (?:timing|sill|http fetch|http request|http finish|verb)\b/i;
 var NPM_REIFY_RE = /^[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]\s/;
-var YARN_PEER_DEP_RE = /^warning ".+ > .+" has (?:unmet|incorrect) peer dependency/i;
+var YARN_PEER_DEP_RE = /^warning "[^"\r\n]+ > [^"\r\n]+" has (?:unmet|incorrect) peer dependency/i;
 var YARN_PHASE_RE = /^\[\d+\/\d+\]/;
 var YARN_FETCH_PHASE_RE = /^\[2\/4\]/;
 var YARN_INFO_RE = /^info\b/i;
@@ -12233,7 +12234,7 @@ var YARN_BERRY_DONE_RE = /^➤\s+YN0000:\s+·\s+Done/;
 var YARN_BERRY_PREFIX_RE = /^➤\s+YN\d{4}:/;
 var PNPM_PLUS_BAR_RE = /^\++\s*$/;
 var PNPM_PROGRESS_RE = /^Progress:/i;
-var PNPM_RESOLVER_PROGRESS_RE = /^\s*(?:Resolving|Downloading|Fetching)[:\s].*\d+\/\d+|\s+\d+\s+packages?\s+(?:fetched|resolved|downloaded|linked)/;
+var PNPM_RESOLVER_PROGRESS_RE = /^\s*(?:Resolving|Downloading|Fetching)[:\s][^\r\n]*\d+\/\d+|\s+\d+\s+packages?\s+(?:fetched|resolved|downloaded|linked)/;
 var PNPM_SUMMARY_RE = /^(?:Packages:|Already up to date|Progress:|WARN|ERR!|added|removed|changed)/i;
 var PNPM_LOCKFILE_RE = /^\s*(?:Lockfile|Saved|node_modules|symlink)/i;
 var PIP_VERBOSE_DEBUG_RE = /^(?:DEBUG|VERBOSE|TRACE)\b/;
@@ -12266,13 +12267,13 @@ var BUNDLER_USING_RE = /^Using\s+\S+\s+[\d.]+/;
 var BUNDLER_FETCH_INSTALL_RE = /^(?:Fetching|Installing)\s+\S+\s+[\d.]+/;
 var COMPOSER_INSTALL_RE = /^\s+- Installing \S+ \(/;
 var COMPOSER_DOWNLOADING_RE = /^\s+- Downloading \S+ \(/;
-var COMPOSER_DOWNLOAD_PROGRESS_RE = /^\s+- (?:Installing|Downloading) .+\(\d+%\)/;
+var COMPOSER_DOWNLOAD_PROGRESS_RE = /^\s+- (?:Installing|Downloading) [^\r\n]+\(\d+%\)/;
 var COMPOSER_FUNDING_RE = /^\d+ packages? you are using are looking for funding/;
 var COMPOSER_WARNING_RE = /^\s*(?:Warning|Deprecation|deprecated|constraint):/i;
 var NUGET_INSTALLING_RE = /^\s*Installing\s+\S+\s+\d+\.\d+/i;
 var NUGET_RESTORING_RE = /^\s*Restoring packages for\b/i;
 var NUGET_OK_HTTPS_RE = /^\s*OK\s+https?:\/\//i;
-var NUGET_ALREADY_INSTALLED_RE = /^\s*Package\s+\S+.*\bis already installed/i;
+var NUGET_ALREADY_INSTALLED_RE = /^\s*Package\s+\S+[^\r\n]*\bis already installed/i;
 var NUGET_SUCCESS_INSTALL_RE = /^\s*Successfully installed\s+/i;
 var PUB_KEEP_RE2 = /^(?:Resolving dependencies|Changed \d+|No dependencies changed|Got dependencies|Downloading packages|Building package executable)/;
 var PUB_PKG_LINE_RE2 = /^[+>!]\s+\S+\s+\S+/;
@@ -13278,7 +13279,7 @@ var PREAMBLE_RE = /^collecting\s/;
 var HEADER_RE = /^=+\s*(?:test session starts|FAILURES|ERRORS|short test summary info|warnings summary|slowest \d+ durations|\d+ failed|\d+ passed|\d+ error)\b/;
 var COV_TOTAL_RE = /^TOTAL\s+\d/;
 var WARN_DOCS_RE = /^\s*--\s+Docs:\s+https?:\/\//;
-var WARN_MSG_RE = /^\s+\S.*:\d+:\s+\S.*Warning\b/;
+var WARN_MSG_RE = /^\s+\S[^:\r\n]*:\d+:\s+\S[^\r\n]*Warning\b/;
 var WARN_NODEID_RE = /^\S+::\S+/;
 var SLOW_DURATION_RE = /^\d+\.\d+s\s+(?:call|setup|teardown)\s+\S/;
 var FAIL_LINE_RE = /^(FAILED|ERROR|PASSED|SKIPPED|XFAIL|XPASS)\s+\S/;
@@ -13520,15 +13521,27 @@ var TOOL_FILTERS = [
   ...MISC_FILTERS
 ];
 var PROFILE_CAPS = { aggressive: 50, balanced: 200, minimal: 500 };
+function peelLeadingCd(argv, cwd) {
+  if (argv.length < 3 || argv[0] !== "cd") return null;
+  const sep = argv[2];
+  if (sep !== "&&" && sep !== ";") return null;
+  const remainder = argv.slice(3);
+  if (remainder.length === 0) return null;
+  const dir = argv[1];
+  return { argv: remainder, cwd: cwd === void 0 ? void 0 : resolveIndexPath(dir, cwd) };
+}
 function selectFilter(argv, cwd) {
   if (argv.length === 0) return null;
-  let resolved = stripPrefixes(argv);
+  const peeled = peelLeadingCd(argv, cwd);
+  const effectiveArgv = peeled !== null ? peeled.argv : argv;
+  const effectiveCwd = peeled !== null ? peeled.cwd : cwd;
+  let resolved = stripPrefixes(effectiveArgv);
   if (resolved.length === 0) {
-    resolved = argv.slice(0, 1);
+    resolved = effectiveArgv.slice(0, 1);
     if (resolved.length === 0) return null;
   }
-  if (cwd !== void 0) {
-    const scriptArgv = resolvePackageManagerScript(resolved, cwd);
+  if (effectiveCwd !== void 0) {
+    const scriptArgv = resolvePackageManagerScript(resolved, effectiveCwd);
     if (scriptArgv !== null) {
       const scriptResolved = stripPrefixes(scriptArgv);
       if (scriptResolved.length > 0) {

package/dist/{token-goat-chunk-AOBZUFNJ.mjs → token-goat-chunk-NKNCHJ4H.mjs}

@@ -23,7 +23,7 @@ import {
   summarizeOutputDelta,
   summarizeResidentContext,
   taskListPruneHint
-} from "./token-goat-chunk-XEDQH5DA.mjs";
+} from "./token-goat-chunk-4HIMCBYK.mjs";
 import {
   BODY_FIRST_TOOL_RESPONSE_KEYS,
   OUTPUT_FIRST_TOOL_RESPONSE_KEYS,
@@ -41,6 +41,7 @@ import {
   contextOutput,
   countSymbols,
   denyOutput,
+  emitRewrite,
   enqueueDirtyPathSafe,
   ensureWorkerAlive,
   estimateTokens,
@@ -109,6 +110,7 @@ import {
   saveSessionState,
   scanForInjectionPatterns,
   serializeOutput,
+  sessionOutputBodyBytes,
   sessionSidecarPath,
   setLastTabContext,
   shrinkImage,
@@ -118,7 +120,7 @@ import {
   wasCliReadThisSession,
   wasFileReadThisSession,
   wasHintShown
-} from "./token-goat-chunk-2G6RAB4G.mjs";
+} from "./token-goat-chunk-PWVXXPCC.mjs";
 import {
   canRunWrappedShell,
   compressOutput,
@@ -129,8 +131,9 @@ import {
   isRewriteWorthwhile,
   resolveMinNetSavingsBytes,
   shlexSplit
-} from "./token-goat-chunk-7JDXDERZ.mjs";
+} from "./token-goat-chunk-EFF2XCLB.mjs";
 import {
+  PER_FILE_COUNTERFACTUAL_CEILING,
   VERSION,
   detectHarness,
   detectLanguage,
@@ -149,7 +152,7 @@ import {
   runGit,
   shortFingerprint,
   toKB
-} from "./token-goat-chunk-ELDJRLHZ.mjs";
+} from "./token-goat-chunk-6ODZ6PZK.mjs";
 
 // src/hooks_grep.ts
 function grepIntInput(toolInput, key) {
@@ -213,8 +216,10 @@ 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 redacted = redactSecrets(rawText);
+    const text = redacted.text;
     const rawLines = text.split(/\r\n|\r|\n/);
     const parsed = [];
     for (const line of rawLines) {
@@ -257,6 +262,7 @@ function foldGrepContentHandler(event) {
     }
     const bytesDelta = originalBytes - rewrittenBytes;
     recordStat("grep:fold", bytesDelta, Math.round(bytesDelta / 4));
+    if (redacted.count > 0) recordStat("secret_redacted", 0, redacted.count, void 0, "grep");
     return { hookType: "rewriteOutput", updatedOutput: rewritten };
   } catch {
     return passOutput();
@@ -620,7 +626,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-Y2SYNH3S.mjs");
+  const { buildProgram } = await import("./token-goat-chunk-4OM2Q2SX.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -7030,15 +7036,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 +7067,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) => `
@@ -7072,9 +7086,12 @@ function postFetchHandler(event) {
       })) {
         const bytesDelta = originalBytes - rewrittenBytes;
         recordStat("webfetch:compress", bytesDelta, Math.round(bytesDelta / 4));
-        return { hookType: "rewriteOutput", updatedOutput: storedBody + notice };
+        return emitRewrite(storedRedacted.text + notice, "fetch");
       }
     }
+    if (storedRedacted.count > 0) {
+      return emitRewrite(storedRedacted.text, "fetch");
+    }
     return passOutput();
   } catch {
     return passOutput();
@@ -7127,7 +7144,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, Math.round(denyCredit / 4));
       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."
       );
@@ -9121,10 +9140,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 +9159,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();
   }
@@ -9201,10 +9214,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 +9228,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 +9248,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 +9344,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"];
@@ -9770,11 +9776,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);
@@ -9799,10 +9810,10 @@ function postMcpHandler(event) {
           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"
+          );
         }
       }
     }
@@ -9848,14 +9859,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();
   }
@@ -10192,11 +10221,13 @@ function postAgentHandler(event) {
     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();
+    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}`;