token-goat 2.8.2 → 2.8.3

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

@@ -23,7 +23,7 @@ import {
   summarizeOutputDelta,
   summarizeResidentContext,
   taskListPruneHint
-} from "./token-goat-chunk-5MLXFSRI.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-AM23GDIS.mjs";
+} from "./token-goat-chunk-PWVXXPCC.mjs";
 import {
   canRunWrappedShell,
   compressOutput,
@@ -129,8 +131,9 @@ import {
   isRewriteWorthwhile,
   resolveMinNetSavingsBytes,
   shlexSplit
-} from "./token-goat-chunk-TF5NT3H5.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-IVCTQPZD.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-SE6V7LUZ.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}`;

package/dist/{token-goat-chunk-AM23GDIS.mjs → token-goat-chunk-PWVXXPCC.mjs}

@@ -13,6 +13,7 @@ import {
   buildLineIndex,
   countContentLines,
   countNoun,
+  countRedactionPlaceholders,
   dataDir,
   decodeSource,
   detectHarness,
@@ -91,7 +92,7 @@ import {
   withFileLock,
   writeIfDifferent,
   writeJsonSettings
-} from "./token-goat-chunk-IVCTQPZD.mjs";
+} from "./token-goat-chunk-6ODZ6PZK.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-AO2QD2AG.mjs";
@@ -325,12 +326,81 @@ function parseXml(xml) {
   return Object.fromEntries(root.children);
 }
 
+// src/zip_bounds.ts
+var MAX_ZIP_INPUT_BYTES = 50 * 1024 * 1024;
+var MAX_ZIP_OUTPUT_BYTES = 500 * 1024 * 1024;
+var STREAM_CHUNK_BYTES = 64 * 1024;
+var ZipOutputTooLargeError = class extends Error {
+  constructor(entryName, limitBytes, decompressedSoFarBytes) {
+    super(
+      `zip entry '${entryName}' is over the ${Math.round(limitBytes / (1024 * 1024))}MB decompressed-size limit (over ${Math.round(decompressedSoFarBytes / (1024 * 1024))}MB decompressed so far)`
+    );
+    this.name = "ZipOutputTooLargeError";
+  }
+};
+var ZipInputTooLargeError = class extends Error {
+  constructor(filePath, sizeBytes, limitBytes) {
+    super(`${filePath} is ${Math.round(sizeBytes / (1024 * 1024))}MB, over the ${Math.round(limitBytes / (1024 * 1024))}MB limit for zip-format archives`);
+    this.name = "ZipInputTooLargeError";
+  }
+};
+function concatChunks(chunks, total) {
+  const out = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    out.set(chunk, offset);
+    offset += chunk.length;
+  }
+  return out;
+}
+function unzipBounded(mod, data, opts) {
+  mod.unzipSync(data, { filter: () => false });
+  const results = {};
+  let firstError;
+  let totalDecompressed = 0;
+  const unzip = new mod.Unzip((file) => {
+    if (firstError !== void 0 || !opts.shouldExtract(file.name)) return;
+    if (typeof file.originalSize === "number" && totalDecompressed + file.originalSize > opts.limitBytes) {
+      firstError = new ZipOutputTooLargeError(file.name, opts.limitBytes, totalDecompressed + file.originalSize);
+      return;
+    }
+    const chunks = [];
+    let entryTotal = 0;
+    file.ondata = (err, chunk, final) => {
+      if (firstError !== void 0) return;
+      if (err) {
+        firstError = err instanceof Error ? err : new Error(String(err));
+        return;
+      }
+      entryTotal += chunk.length;
+      totalDecompressed += chunk.length;
+      if (totalDecompressed > opts.limitBytes) {
+        firstError = new ZipOutputTooLargeError(file.name, opts.limitBytes, totalDecompressed);
+        return;
+      }
+      chunks.push(chunk);
+      if (final) results[file.name] = concatChunks(chunks, entryTotal);
+    };
+    file.start();
+  });
+  unzip.register(mod.UnzipInflate);
+  let offset = 0;
+  for (; ; ) {
+    const end = Math.min(offset + STREAM_CHUNK_BYTES, data.length);
+    const isFinal = end >= data.length;
+    unzip.push(data.subarray(offset, end), isFinal);
+    offset = end;
+    if (firstError !== void 0 || isFinal) break;
+  }
+  if (firstError !== void 0) throw firstError;
+  return results;
+}
+
 // src/ooxml_extract.ts
 var loadFflate = createLazyModuleLoader(
   async () => await import("fflate"),
   "office-file reading disabled (fflate unavailable)"
 );
-var MAX_OOXML_INPUT_BYTES = 50 * 1024 * 1024;
 function accessFailureMessage(err, filePath) {
   const code = err?.code;
   if (code === "ENOENT") return `File not found: ${filePath}`;
@@ -346,8 +416,8 @@ async function readOoxmlZip(filePath, kind) {
     throw new Error(accessFailureMessage(err, filePath), { cause: err });
   }
   if (!stat2.isFile()) throw new Error(`not a valid ${kind} file: ${filePath}`);
-  if (stat2.size > MAX_OOXML_INPUT_BYTES) {
-    throw new Error(`${filePath} is ${Math.round(stat2.size / (1024 * 1024))}MB, over the ${MAX_OOXML_INPUT_BYTES / (1024 * 1024)}MB limit for OOXML files`);
+  if (stat2.size > MAX_ZIP_INPUT_BYTES) {
+    throw new Error(`${filePath} is ${Math.round(stat2.size / (1024 * 1024))}MB, over the ${MAX_ZIP_INPUT_BYTES / (1024 * 1024)}MB limit for OOXML files`);
   }
   let data;
   try {
@@ -356,8 +426,9 @@ async function readOoxmlZip(filePath, kind) {
     throw new Error(accessFailureMessage(err, filePath), { cause: err });
   }
   try {
-    return fflate.unzipSync(new Uint8Array(data));
+    return unzipBounded(fflate, new Uint8Array(data), { limitBytes: MAX_ZIP_OUTPUT_BYTES, shouldExtract: () => true });
   } catch (err) {
+    if (err instanceof ZipOutputTooLargeError) throw err;
     throw new Error(`not a valid ${kind} file: ${filePath}`, { cause: err });
   }
 }
@@ -3408,6 +3479,15 @@ function denyOutput(message) {
 function contextOutput(context) {
   return { hookType: "context", context };
 }
+function emitRewrite(updatedOutput, detail, savings) {
+  const count = countRedactionPlaceholders(updatedOutput);
+  if (count > 0) recordStat("secret_redacted", 0, count, void 0, detail);
+  if (savings !== void 0) {
+    const bytesSaved = savings.originalBytes - Buffer.byteLength(updatedOutput, "utf-8");
+    if (bytesSaved > 0) recordStat(savings.kind, bytesSaved, Math.round(bytesSaved / 4));
+  }
+  return { hookType: "rewriteOutput", updatedOutput };
+}
 function countNonEmptyLines(text) {
   return text.split(/\r\n|\r|\n/).filter((line) => line.length > 0).length;
 }
@@ -3735,8 +3815,7 @@ function getHintStatsTotals() {
   return {
     savedBytes,
     spentBytes,
-    legacyEmissions,
-    netBytes: spentBytes === null ? null : savedBytes - spentBytes
+    legacyEmissions
   };
 }
 function resetHintStats() {
@@ -6855,6 +6934,7 @@ ${neutralizeFenceMarkers(text, UNTRUSTED_FILE_TAG)}
 </${UNTRUSTED_FILE_TAG}>`;
 }
 var UNTRUSTED_TOOL_TAG = "untrusted-tool-output";
+var UNTRUSTED_GITHUB_TAG = "untrusted-github-content";
 
 // src/skill_cache.ts
 import * as fs14 from "fs/promises";
@@ -7045,6 +7125,21 @@ async function hasSessionOutput(sessionId, skillName) {
     return false;
   }
 }
+async function sessionOutputBodyBytes(sessionId, skillName) {
+  try {
+    if (!sessionId) return null;
+    const name = safeSkillName(skillName);
+    if (!name) return null;
+    const safeSession = safeSessionFragment(sessionId);
+    const metas = await listOutputs();
+    const matches = metas.filter((m) => m.skillName === name && m.outputId.startsWith(`${safeSession}-`));
+    if (matches.length === 0) return null;
+    matches.sort((a, b) => b.ts - a.ts);
+    return matches[0].bodyBytes;
+  } catch {
+    return null;
+  }
+}
 async function findCrossSessionEntry(skillName, contentSha) {
   const name = safeSkillName(skillName);
   if (!name || !contentSha) return null;
@@ -7085,9 +7180,11 @@ async function storeOutput(sessionId, skillName, body, opts) {
     const ts = Date.now();
     const bodyBytes = Buffer.byteLength(body, "utf-8");
     const truncated = bodyBytes > 256 * 1024;
-    let storedBody = body;
+    const redactedBody = redactSecrets(body);
+    if (redactedBody.count > 0) recordStat("secret_redacted", 0, redactedBody.count, void 0, SKILLS_OUTPUT_SUBDIR);
+    let storedBody = redactedBody.text;
     if (truncated) {
-      const buf = Buffer.from(body, "utf-8");
+      const buf = Buffer.from(redactedBody.text, "utf-8");
       let truncStart = Math.max(0, buf.length - 262144);
       if (truncStart < buf.length) {
         const byte = buf[truncStart];
@@ -7135,7 +7232,9 @@ async function storeCompact(sessionId, skillName, compactText, sourceSha) {
     const safeSession = safeSessionFragment(sessionId);
     const fileId = `${safeSession}@${sanitizeSkillId(name)}@compact`;
     const dir = skillOutputsDir();
-    let text = compactText;
+    const redacted = redactSecrets(compactText);
+    if (redacted.count > 0) recordStat("secret_redacted", 0, redacted.count, void 0, SKILLS_OUTPUT_SUBDIR);
+    let text = redacted.text;
     if (sourceSha) {
       text = `<!-- source_sha: ${sourceSha.slice(0, 12)} -->
 ${text}`;
@@ -7587,7 +7686,9 @@ async function probeImageMeta(input) {
   const sharp = await loadSharp();
   if (sharp === null) return null;
   try {
-    const meta = await sharp(input, { limitInputPixels: false }).metadata();
+    const cfg = loadConfig().image_shrink;
+    const limitInputPixels = cfg.max_image_pixels > 0 ? cfg.max_image_pixels : false;
+    const meta = await sharp(input, { limitInputPixels }).metadata();
     return { width: meta.width ?? 0, height: meta.height ?? 0, format: meta.format ?? null, pages: meta.pages ?? 1 };
   } catch (e) {
     throw new ImageDecodeError(e?.message ?? "image could not be decoded");
@@ -11229,7 +11330,7 @@ function preReadHandlerInner(event) {
       const isSourceExt = isSourceExtension(basename12);
       if (isSourceExt && reads >= 2) {
         recordStat("read_count_deny", rereadCredit, Math.round(rereadCredit / 4));
-        recordStat("session_hint", rereadCredit, Math.round(rereadCredit / 4));
+        recordStat("session_hint", 0, 0);
         return denyOutput(
           "Read this file " + reads + ' times already \u2014 use `token-goat read "' + shown + '::Symbol"`, `token-goat skeleton ' + shown + "`, or `token-goat outline " + shown + "` to pull just the part you need. " + editAnywayHint(normalized)
         );
@@ -12106,13 +12207,8 @@ function mapLookupBytesSaved(map, emittedText) {
     ...map.recentFiles.map((f) => normalizePath(path22.resolve(map.rootDir, f))),
     ...map.topSymbols.map((s) => normalizePath(s.filePath))
   ]);
-  let fullSourceBytes = 0;
-  for (const fp of referencedFiles) {
-    try {
-      fullSourceBytes += fs26.statSync(fp).size;
-    } catch {
-    }
-  }
+  const listingText = Array.from(referencedFiles).sort().join("\n");
+  const fullSourceBytes = Buffer.byteLength(listingText, "utf8");
   const emittedBytes = Buffer.byteLength(emittedText, "utf8");
   return Math.max(1, fullSourceBytes - emittedBytes);
 }
@@ -13581,7 +13677,7 @@ function extractDart(content, filePath) {
     const line = stripLineComment(blockStripped).trimEnd();
     const stripped = line.trim();
     if (!stripped) {
-      const braceLine2 = stripStringLiterals(line);
+      const braceLine2 = stripStringLiterals(line, { tripleQuotes: true });
       braceDepth += (braceLine2.match(/\{/g) ?? []).length - (braceLine2.match(/\}/g) ?? []).length;
       continue;
     }
@@ -13675,7 +13771,7 @@ function extractDart(content, filePath) {
         symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines2, "c"));
       }
     }
-    const braceLine = stripStringLiterals(line);
+    const braceLine = stripStringLiterals(line, { tripleQuotes: true });
     for (const ch of braceLine) {
       if (ch === "{") {
         braceDepth++;
@@ -17572,8 +17668,8 @@ var NO_TREE_SITTER_EXTRACTORS = {
   toml: extractTomlSymbols,
   css: extractCssSymbols,
   dockerfile: extractDockerfileSymbols,
-  csharp: (content, filePath) => assignBraceBlockSpans(extractCsharp(content, filePath).symbols, content, "//"),
-  php: (content, filePath) => assignBraceBlockSpans(extractPhp(content, filePath).symbols, content, "//"),
+  csharp: (content, filePath) => assignBraceBlockSpans(extractCsharp(content, filePath).symbols, content, { lineComment: "//", stringEscapes: "csharp", rawStringQuotes: true }),
+  php: (content, filePath) => assignBraceBlockSpans(extractPhp(content, filePath).symbols, content, { lineComment: ["//", "#"], lineCommentExceptions: ["#["] }),
   html: (content, filePath) => {
     const r = extractHtml(content, filePath);
     return [...r.symbols, ...sectionsToHeadingSymbols(r.sections, filePath)];
@@ -17582,13 +17678,13 @@ var NO_TREE_SITTER_EXTRACTORS = {
     const r = extractLiquid(content, filePath);
     return [...r.symbols, ...sectionsToHeadingSymbols(r.sections, filePath)];
   },
-  kotlin: (content, filePath) => assignBraceBlockSpans(extractKotlin(content, filePath).symbols, content, "//"),
-  swift: (content, filePath) => assignBraceBlockSpans(extractSwift(content, filePath).symbols, content, "//"),
-  scala: (content, filePath) => assignBraceBlockSpans(extractScala(content, filePath).symbols, content, "//"),
+  kotlin: (content, filePath) => assignBraceBlockSpans(extractKotlin(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true }),
+  swift: (content, filePath) => assignBraceBlockSpans(extractSwift(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true }),
+  scala: (content, filePath) => assignBraceBlockSpans(extractScala(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true }),
   lua: (content, filePath) => extractLua(content, filePath).symbols,
   elixir: (content, filePath) => extractElixir(content, filePath).symbols,
-  dart: (content, filePath) => assignBraceBlockSpans(extractDart(content, filePath).symbols, content, "//"),
-  zig: (content, filePath) => assignBraceBlockSpans(extractZig(content, filePath).symbols, content, "//"),
+  dart: (content, filePath) => assignBraceBlockSpans(extractDart(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleSingleQuote: true }),
+  zig: (content, filePath) => assignBraceBlockSpans(extractZig(content, filePath).symbols, content, { lineComment: "//", blockComment: null, lineStringPrefix: "\\\\" }),
   r: (content, filePath) => extractR(content, filePath).symbols,
   graphql: (content, filePath) => extractGraphql(content, filePath).symbols,
   sql: extractSql,
@@ -17596,7 +17692,7 @@ var NO_TREE_SITTER_EXTRACTORS = {
   makefile: extractMakefile,
   proto: (content, filePath) => extractProto(content, filePath).symbols,
   terraform: extractTerraform,
-  powershell: (content, filePath) => assignBraceBlockSpans(extractPowershell(content, filePath).symbols, content, "#"),
+  powershell: (content, filePath) => assignBraceBlockSpans(extractPowershell(content, filePath).symbols, content, { lineComment: "#", stringEscapes: "powershell" }),
   apex: (content, filePath) => extractApex(content, filePath).symbols,
   salesforce_metadata: (content, filePath) => extractSalesforceMetadata(content, filePath).symbols,
   env_file: extractEnv,
@@ -18945,6 +19041,11 @@ export {
   locatePdfPages,
   extractPdfOutline,
   extractPdfMeta,
+  MAX_ZIP_INPUT_BYTES,
+  MAX_ZIP_OUTPUT_BYTES,
+  ZipOutputTooLargeError,
+  ZipInputTooLargeError,
+  unzipBounded,
   docxOutline,
   docxText,
   pptxOutline,
@@ -18979,6 +19080,7 @@ export {
   passOutput,
   denyOutput,
   contextOutput,
+  emitRewrite,
   makeDedupHintHandlers,
   registerHook,
   runHook,
@@ -19092,7 +19194,9 @@ export {
   scanForInjectionPatterns,
   UNTRUSTED_WEB_TAG,
   fenceUntrustedContent,
+  UNTRUSTED_FILE_TAG,
   UNTRUSTED_TOOL_TAG,
+  UNTRUSTED_GITHUB_TAG,
   SKILLS_OUTPUT_SUBDIR,
   skillOutputsDir,
   contentHash,
@@ -19101,6 +19205,7 @@ export {
   extractChecklistSection,
   listOutputs,
   hasSessionOutput,
+  sessionOutputBodyBytes,
   storeOutput,
   storeCompact,
   incrementSkillHit,