token-goat 2.8.2 → 2.8.4

package/dist/{token-goat-chunk-IVCTQPZD.mjs → token-goat-chunk-E76UNTVK.mjs}

@@ -8,7 +8,7 @@ import {
 import { createRequire } from "node:module";
 function resolveVersion() {
   if (true) {
-    return "2.8.2";
+    return "2.8.4";
   }
   const require2 = createRequire(import.meta.url);
   const pkg = require2("../package.json");
@@ -263,6 +263,16 @@ function lowercaseDriveLetter(s) {
 }
 var EXTENDED_UNC_PREFIX_RE = /^\\\\\?\\UNC\\/i;
 var EXTENDED_PREFIX_RE = /^\\\\\?\\/;
+function shellMountToWindowsPath(p) {
+  const s = p.includes("\\") ? p.replace(/\\/g, "/") : p;
+  const m = WSL_PATH_RE.exec(s);
+  if (m) return `${m[1].toLowerCase()}:/${m[2].replace(/^\/+/, "")}`;
+  if (process.platform === "win32") {
+    const g = MSYS_PATH_RE.exec(s);
+    if (g) return `${g[1].toLowerCase()}:${g[2] ?? "/"}`;
+  }
+  return s;
+}
 function normalizePath(p) {
   let s = p;
   if (EXTENDED_UNC_PREFIX_RE.test(s)) {
@@ -270,20 +280,7 @@ function normalizePath(p) {
   } else if (EXTENDED_PREFIX_RE.test(s)) {
     s = s.slice(4);
   }
-  if (s.includes("\\")) {
-    s = s.replace(/\\/g, "/");
-  }
-  const m = WSL_PATH_RE.exec(s);
-  if (m) {
-    const driveLetter = m[1].toLowerCase();
-    const rest = m[2];
-    const restStripped = rest.replace(/^\/+/, "");
-    s = `${driveLetter}:/${restStripped}`;
-  }
-  if (process.platform === "win32") {
-    const g = MSYS_PATH_RE.exec(s);
-    if (g) s = `${g[1].toLowerCase()}:${g[2] ?? "/"}`;
-  }
+  s = shellMountToWindowsPath(s);
   s = expandShortPath(s);
   s = lowercaseDriveLetter(s);
   s = normalizeDarwinSystemAlias(s);
@@ -297,8 +294,10 @@ function normalizeDarwinSystemAlias(p) {
 }
 function resolveIndexPath(file, base = process.cwd()) {
   const isWindowsAbsolute = (s) => /^[a-zA-Z]:[/\\]/.test(s);
-  const resolve5 = isWindowsAbsolute(file) || isWindowsAbsolute(base) ? path2.win32.resolve : path2.resolve;
-  return normalizePath(resolve5(base, file));
+  const f = shellMountToWindowsPath(file);
+  const b = shellMountToWindowsPath(base);
+  const resolve5 = isWindowsAbsolute(f) || isWindowsAbsolute(b) ? path2.win32.resolve : path2.resolve;
+  return normalizePath(resolve5(b, f));
 }
 function toDisplayPath(root, target) {
   if (root === void 0) return target;
@@ -759,6 +758,14 @@ function grepFilteredToEmptyNotice(preFilterCount, grep, nounSingular, nounPlura
   const pronoun = preFilterCount === 1 ? "it" : "them";
   return `  (all ${preFilterCount} ${noun} ${verb} filtered out by --grep ${grep} -- widen or drop the filter to see ${pronoun})`;
 }
+function filtersFilteredToEmptyNotice(preFilterCount, activeFilters, nounSingular, nounPlural, reassurance) {
+  const noun = preFilterCount === 1 ? nounSingular : nounPlural;
+  const cause = activeFilters.length === 0 ? "the active filter" : activeFilters.join(" + ");
+  const knob = activeFilters.length > 1 ? "filters" : "filter";
+  const verb = preFilterCount === 1 ? "was" : "were";
+  const tail = reassurance === void 0 ? "" : `; ${reassurance}`;
+  return `  (all ${preFilterCount} ${noun} ${verb} filtered out by ${cause}${tail} -- widen or drop the ${knob} to see them)`;
+}
 function countNoun(count, singular, plural = `${singular}s`) {
   return `${count} ${count === 1 ? singular : plural}`;
 }
@@ -2161,7 +2168,15 @@ var CONFIG_DEFAULTS = {
     // 85+, while a photo with an incidental sign or logo in frame scores much lower and
     // noisier -- padding the threshold below the terminal/code norm still comfortably
     // excludes photographic false positives without needing a second heuristic.
-    ocr_min_confidence: 65
+    ocr_min_confidence: 65,
+    // Which resolution tier the model being shown the image is on, which decides what its pixels
+    // cost. 'standard' (1568px long edge, 1568 visual tokens) is every model before Claude 4.7;
+    // 'high' (2576px, 4784 tokens) is 4.7 and later, and bills the same large image up to roughly
+    // three times higher. Only the saving *reported* by `token-goat stats` depends on this -- no
+    // image is encoded differently -- and 'standard' is the default because it is the floor: it
+    // caps the counterfactual at the smaller of the two bills and so can never credit a saving
+    // that was not there. Set it to 'high' on a Claude 4.7+ model to see the larger real figure.
+    vision_tier: "standard"
   },
   screenshot: {
     chrome_path: "",
@@ -2321,6 +2336,9 @@ function validatedFloat(raw, def, min, max) {
   if (!Number.isFinite(n)) return def;
   return Math.max(min, Math.min(max, n));
 }
+function validatedVisionTier(raw, def) {
+  return raw === "standard" || raw === "high" ? raw : def;
+}
 function validatedStr(raw, def) {
   return typeof raw === "string" ? raw : def;
 }
@@ -2684,6 +2702,8 @@ function mergeRawConfig(base, override) {
       const baseSection = baseVal !== null && typeof baseVal === "object" && !Array.isArray(baseVal) ? baseVal : {};
       merged[key] = { ...baseSection, ...overrideVal };
     } else {
+      const baseVal = base[key];
+      if (baseVal !== null && typeof baseVal === "object" && !Array.isArray(baseVal)) continue;
       merged[key] = overrideVal;
     }
   }
@@ -2877,8 +2897,10 @@ function _buildConfig(raw, projectRaw = {}) {
   is_cfg.screenshot_redirect = validatedBool(is_raw["screenshot_redirect"], is_cfg.screenshot_redirect);
   is_cfg.ocr_enabled = validatedBool(is_raw["ocr_enabled"], is_cfg.ocr_enabled);
   is_cfg.ocr_min_confidence = validatedInt(is_raw["ocr_min_confidence"], is_cfg.ocr_min_confidence, ...boundsOf("image_shrink.ocr_min_confidence"));
+  is_cfg.vision_tier = validatedVisionTier(is_raw["vision_tier"], is_cfg.vision_tier);
   is_cfg.max_image_pixels = envInt("TOKEN_GOAT_MAX_IMAGE_PIXELS", is_cfg.max_image_pixels, ...boundsOf("image_shrink.max_image_pixels"));
   is_cfg.ocr_enabled = envBool("TOKEN_GOAT_OCR_ENABLED", is_cfg.ocr_enabled);
+  is_cfg.vision_tier = validatedVisionTier(process.env["TOKEN_GOAT_VISION_TIER"], is_cfg.vision_tier);
   const sc_raw = section(raw, "screenshot");
   const sc_cfg = getDefaultConfig("screenshot");
   sc_cfg.chrome_path = validatedStr(sc_raw["chrome_path"], sc_cfg.chrome_path);
@@ -3077,6 +3099,7 @@ var CONFIG_KEY_ENV_OVERRIDES = {
   "skill_preservation.orphan_sweep_enabled": ["TOKEN_GOAT_ORPHAN_SWEEP"],
   "image_shrink.max_image_pixels": ["TOKEN_GOAT_MAX_IMAGE_PIXELS"],
   "image_shrink.ocr_enabled": ["TOKEN_GOAT_OCR_ENABLED"],
+  "image_shrink.vision_tier": ["TOKEN_GOAT_VISION_TIER"],
   "screenshot.block_private_targets": ["TOKEN_GOAT_SCREENSHOT_BLOCK_PRIVATE_TARGETS"],
   "repomap.compact_file_threshold": ["TOKEN_GOAT_REPOMAP_COMPACT_THRESHOLD"],
   "repomap.exclude_tests": ["TOKEN_GOAT_REPOMAP_EXCLUDE_TESTS"],
@@ -3199,7 +3222,8 @@ function saveConfig(config) {
       max_image_pixels: is_cfg.max_image_pixels,
       screenshot_redirect: is_cfg.screenshot_redirect,
       ocr_enabled: is_cfg.ocr_enabled,
-      ocr_min_confidence: is_cfg.ocr_min_confidence
+      ocr_min_confidence: is_cfg.ocr_min_confidence,
+      vision_tier: is_cfg.vision_tier
     },
     screenshot: {
       chrome_path: config.screenshot.chrome_path,
@@ -3787,7 +3811,12 @@ function lineCommentStartIndex(line, markers, from = 0) {
   }
   return cutIdx;
 }
-function stripStringLiterals(line) {
+function stripStringLiterals(line, opts = {}) {
+  const openDelim = (idx) => {
+    const q = line[idx];
+    if (opts.tripleQuotes && line[idx + 1] === q && line[idx + 2] === q) return q + q + q;
+    return q;
+  };
   let out = "";
   let i = 0;
   const stack = [];
@@ -3803,9 +3832,10 @@ function stripStringLiterals(line) {
     if (top === void 0) {
       if (ch === '"' || ch === "'") {
         const bareBraceHole = ch === '"' && i > 0 && line[i - 1] === "$";
-        stack.push({ kind: "string", quote: ch, bareBraceHole });
-        out += ch;
-        i++;
+        const delim = openDelim(i);
+        stack.push({ kind: "string", quote: delim, bareBraceHole });
+        out += delim;
+        i += delim.length;
         continue;
       }
       out += ch;
@@ -3815,9 +3845,10 @@ function stripStringLiterals(line) {
     if (top.kind === "hole") {
       if (ch === '"' || ch === "'") {
         const bareBraceHole = ch === '"' && i > 0 && line[i - 1] === "$";
-        stack.push({ kind: "string", quote: ch, bareBraceHole });
-        out += ch;
-        i++;
+        const delim = openDelim(i);
+        stack.push({ kind: "string", quote: delim, bareBraceHole });
+        out += delim;
+        i += delim.length;
         continue;
       }
       if (ch === "{") {
@@ -3845,10 +3876,10 @@ function stripStringLiterals(line) {
       i += 2;
       continue;
     }
-    if (ch === top.quote) {
+    if (ch === top.quote[0] && (top.quote.length === 1 || line.startsWith(top.quote, i))) {
       stack.pop();
-      out += ch;
-      i++;
+      out += top.quote;
+      i += top.quote.length;
       continue;
     }
     if (top.quote === '"') {
@@ -4168,9 +4199,11 @@ function makeSymbolEmitter(symbols, sections, seen, filePath, maxSymbols = 500,
 }
 function assignFlatEndLines(sections, totalLines) {
   for (let i = 0; i < sections.length; i++) {
-    const next = sections[i + 1];
     const s = sections[i];
     if (s === void 0) continue;
+    let j = i + 1;
+    while (j < sections.length && (sections[j]?.line ?? 0) <= s.line) j++;
+    const next = sections[j];
     const end = next !== void 0 ? next.line - 1 : totalLines;
     s.endLine = end < s.line ? s.line : end;
   }
@@ -4192,14 +4225,95 @@ function propagateEndLinesToSymbols(symbols, sections) {
     return sym;
   });
 }
+function tripleQuoteDelimiters(opts) {
+  const delims = [];
+  if (opts?.tripleQuote === true) delims.push('"""');
+  if (opts?.tripleSingleQuote === true) delims.push("'''");
+  return delims;
+}
+function quoteRunLength(content, i) {
+  let n = 0;
+  while (content[i + n] === '"') n++;
+  return n;
+}
+function skipRawStringQuotes(content, from, min) {
+  for (let i = from; i < content.length; i++) {
+    if (content[i] !== '"') continue;
+    const run = quoteRunLength(content, i);
+    if (run >= min) return i + run;
+    i += run - 1;
+  }
+  return -1;
+}
+function stepPowershellString(content, i, quote) {
+  const ch = content[i];
+  if (quote === '"' && ch === "`") return { next: i + 1, open: true };
+  return { next: i, open: ch !== quote };
+}
+function opensCsharpVerbatimString(content, i) {
+  const prev = content[i - 1];
+  return prev === "@" || prev === "$" && content[i - 2] === "@";
+}
+function toLineCommentPrefixes(prefix) {
+  if (prefix === void 0) return [];
+  return typeof prefix === "string" ? [prefix] : prefix;
+}
+function atLineComment(content, i, prefixes, exceptions) {
+  if (exceptions.some((e) => content.startsWith(e, i))) return false;
+  return prefixes.some((prefix) => content.startsWith(prefix, i));
+}
+function skipBlockComment(content, start, block, nested) {
+  let i = start + block[0].length;
+  let depth = 1;
+  while (i < content.length) {
+    if (nested && content.startsWith(block[0], i)) {
+      depth++;
+      i += block[0].length;
+      continue;
+    }
+    if (content.startsWith(block[1], i)) {
+      depth--;
+      i += block[1].length;
+      if (depth === 0) return i;
+      continue;
+    }
+    i++;
+  }
+  return -1;
+}
 function findMatchingBraceEndLine(content, openBraceIndex, totalLines, lineIndex, lineCommentPrefix, opts) {
+  const linePrefixes = toLineCommentPrefixes(lineCommentPrefix);
+  const lineExceptions = opts?.lineCommentExceptions ?? [];
   const block = opts?.blockComment;
   const backtick = opts?.backtickQuote === true;
+  const escapes = opts?.stringEscapes ?? "backslash";
+  const nestedBlock = opts?.nestedBlockComments === true;
+  const rawString = opts?.rawStringQuotes === true;
+  const tripleDelims = tripleQuoteDelimiters(opts);
+  const lineString = opts?.lineStringPrefix;
   let depth = 0;
   let quote = null;
+  let verbatim = false;
   for (let i = openBraceIndex; i < content.length; i++) {
     const ch = content[i];
     if (quote !== null) {
+      if (verbatim) {
+        if (ch === quote) {
+          if (content[i + 1] === quote) {
+            i++;
+            continue;
+          }
+          quote = null;
+          verbatim = false;
+        }
+        continue;
+      }
+      if (escapes === "powershell") {
+        const step = stepPowershellString(content, i, quote);
+        i = step.next;
+        if (!step.open) quote = null;
+        continue;
+      }
       if (ch === "\\") {
         i++;
         continue;
@@ -4208,16 +4322,35 @@ function findMatchingBraceEndLine(content, openBraceIndex, totalLines, lineIndex
       continue;
     }
     if (block !== void 0 && content.startsWith(block[0], i)) {
-      const close = content.indexOf(block[1], i + block[0].length);
-      i = close === -1 ? content.length : close + block[1].length - 1;
+      const end = skipBlockComment(content, i, block, nestedBlock);
+      i = end === -1 ? content.length : end - 1;
+      continue;
+    }
+    if (atLineComment(content, i, linePrefixes, lineExceptions)) {
+      while (i < content.length && content[i] !== "\n") i++;
       continue;
     }
-    if (lineCommentPrefix !== void 0 && content.startsWith(lineCommentPrefix, i)) {
+    if (lineString !== void 0 && content.startsWith(lineString, i)) {
       while (i < content.length && content[i] !== "\n") i++;
       continue;
     }
+    if (rawString && ch === '"') {
+      const run = quoteRunLength(content, i);
+      if (run >= 3) {
+        const end = skipRawStringQuotes(content, i + run, run);
+        i = end === -1 ? content.length : end - 1;
+        continue;
+      }
+    }
+    const tripleAt = tripleDelims.find((t) => content.startsWith(t, i));
+    if (tripleAt !== void 0) {
+      const end = content.indexOf(tripleAt, i + 3);
+      i = end === -1 ? content.length : end + 2;
+      continue;
+    }
     if (ch === '"' || ch === "'" || backtick && ch === "`") {
       quote = ch;
+      verbatim = escapes === "csharp" && ch === '"' && opensCsharpVerbatimString(content, i);
       continue;
     }
     if (ch === "{") depth++;
@@ -4230,18 +4363,34 @@ function findMatchingBraceEndLine(content, openBraceIndex, totalLines, lineIndex
   }
   return opts?.noMatchValue ?? totalLines;
 }
-function assignBraceBlockSpans(symbols, content, lineCommentPrefix) {
+function assignBraceBlockSpans(symbols, content, opts = {}) {
+  const lineCommentPrefix = opts.lineComment;
+  const stringEscapes = opts.stringEscapes ?? "backslash";
+  const nestedBlockComments = opts.nestedBlockComments ?? false;
+  const tripleQuote = opts.tripleQuote ?? false;
+  const lineStringPrefix = opts.lineStringPrefix;
+  const firstLinePrefix = toLineCommentPrefixes(lineCommentPrefix)[0];
   if (symbols.length === 0) return [...symbols];
   const lines = content.split("\n");
   const totalLines = lines.length;
   const lineIndex = buildLineIndex(content);
   const starts = [...new Set(symbols.map((s) => s.lineStart))].sort((a, b) => a - b);
-  const blockComment = lineCommentPrefix === "//" ? ["/*", "*/"] : lineCommentPrefix === "#" ? ["<#", "#>"] : void 0;
+  const blockComment = opts.blockComment !== void 0 ? opts.blockComment ?? void 0 : firstLinePrefix === "//" ? ["/*", "*/"] : firstLinePrefix === "#" ? ["<#", "#>"] : void 0;
+  const scanOpts = {
+    noMatchValue: -1,
+    stringEscapes,
+    tripleQuote,
+    rawStringQuotes: opts.rawStringQuotes ?? false,
+    tripleSingleQuote: opts.tripleSingleQuote ?? false,
+    ...blockComment === void 0 ? {} : { blockComment, nestedBlockComments },
+    ...lineStringPrefix === void 0 ? {} : { lineStringPrefix },
+    ...opts.lineCommentExceptions === void 0 ? {} : { lineCommentExceptions: opts.lineCommentExceptions }
+  };
   return symbols.map((sym) => {
     if (sym.lineEnd !== sym.lineStart) return sym;
     const nextStart = starts.find((s) => s > sym.lineStart);
     const lastSearchLine = Math.min(nextStart !== void 0 ? nextStart - 1 : totalLines, sym.lineStart + BRACE_SEARCH_MAX_LINES);
-    const openIndex = findBlockOpenBrace(content, lineIndex, sym.lineStart, lastSearchLine, lineCommentPrefix, blockComment);
+    const openIndex = findBlockOpenBrace(content, lineIndex, sym.lineStart, lastSearchLine, lineCommentPrefix, scanOpts);
     if (openIndex === null) return sym;
     const endLine = findMatchingBraceEndLine(
       content,
@@ -4249,14 +4398,22 @@ function assignBraceBlockSpans(symbols, content, lineCommentPrefix) {
       totalLines,
       lineIndex,
       lineCommentPrefix,
-      blockComment === void 0 ? { noMatchValue: -1 } : { blockComment, noMatchValue: -1 }
+      scanOpts
     );
     if (endLine <= sym.lineStart) return sym;
     return { ...sym, lineEnd: endLine, body: lines.slice(sym.lineStart - 1, endLine).join("\n") };
   });
 }
 var BRACE_SEARCH_MAX_LINES = 10;
-function findBlockOpenBrace(content, lineIndex, startLine, lastSearchLine, lineCommentPrefix, blockComment) {
+function findBlockOpenBrace(content, lineIndex, startLine, lastSearchLine, lineCommentPrefix, opts) {
+  const blockComment = opts?.blockComment;
+  const stringEscapes = opts?.stringEscapes ?? "backslash";
+  const nestedBlockComments = opts?.nestedBlockComments === true;
+  const rawString = opts?.rawStringQuotes === true;
+  const tripleDelims = tripleQuoteDelimiters(opts);
+  const lineString = opts?.lineStringPrefix;
+  const linePrefixes = toLineCommentPrefixes(lineCommentPrefix);
+  const lineExceptions = opts?.lineCommentExceptions ?? [];
   const from = lineIndex[startLine - 1];
   if (from === void 0) return null;
   const to = lineIndex[lastSearchLine] ?? content.length;
@@ -4264,10 +4421,28 @@ function findBlockOpenBrace(content, lineIndex, startLine, lastSearchLine, lineC
   let parenDepth = 0;
   let linesSeen = 0;
   let atLineStart = false;
+  let verbatim = false;
   for (let i = from; i < to; i++) {
     const ch = content[i];
     if (ch === void 0) break;
     if (quote !== null) {
+      if (verbatim) {
+        if (ch === quote) {
+          if (content[i + 1] === quote) {
+            i++;
+            continue;
+          }
+          quote = null;
+          verbatim = false;
+        }
+        continue;
+      }
+      if (stringEscapes === "powershell") {
+        const step = stepPowershellString(content, i, quote);
+        i = step.next;
+        if (!step.open) quote = null;
+        continue;
+      }
       if (ch === "\\") {
         i++;
         continue;
@@ -4281,12 +4456,12 @@ function findBlockOpenBrace(content, lineIndex, startLine, lastSearchLine, lineC
       continue;
     }
     if (blockComment !== void 0 && content.startsWith(blockComment[0], i)) {
-      const close = content.indexOf(blockComment[1], i + blockComment[0].length);
-      if (close === -1) return null;
-      i = close + blockComment[1].length - 1;
+      const end = skipBlockComment(content, i, blockComment, nestedBlockComments);
+      if (end === -1) return null;
+      i = end - 1;
       continue;
     }
-    if (lineCommentPrefix !== void 0 && content.startsWith(lineCommentPrefix, i)) {
+    if (atLineComment(content, i, linePrefixes, lineExceptions)) {
       while (i + 1 < to && content[i + 1] !== "\n") i++;
       continue;
     }
@@ -4294,14 +4469,36 @@ function findBlockOpenBrace(content, lineIndex, startLine, lastSearchLine, lineC
       atLineStart = false;
       if (parenDepth === 0 && linesSeen >= 1 && startsWithBlockKeyword(content, i, to)) return null;
     }
+    if (lineString !== void 0 && content.startsWith(lineString, i)) {
+      while (i + 1 < to && content[i + 1] !== "\n") i++;
+      continue;
+    }
+    if (rawString && ch === '"') {
+      const run = quoteRunLength(content, i);
+      if (run >= 3) {
+        const end = skipRawStringQuotes(content, i + run, run);
+        if (end === -1) return null;
+        i = end - 1;
+        continue;
+      }
+    }
+    const tripleAt = tripleDelims.find((t) => content.startsWith(t, i));
+    if (tripleAt !== void 0) {
+      const end = content.indexOf(tripleAt, i + 3);
+      if (end === -1) return null;
+      i = end + 2;
+      continue;
+    }
     if (ch === '"' || ch === "'") {
       quote = ch;
+      verbatim = stringEscapes === "csharp" && ch === '"' && opensCsharpVerbatimString(content, i);
       continue;
     }
     if (ch === "(" || ch === "[") parenDepth++;
     else if (ch === ")" || ch === "]") {
       if (parenDepth > 0) parenDepth--;
     } else if (ch === ";") return null;
+    else if (ch === "}" && parenDepth === 0) return null;
     else if (ch === "{") return i;
   }
   return null;
@@ -4397,8 +4594,9 @@ function extractEnv(content, filePath) {
       if (_lineClosesQuote(line, openQuote)) openQuote = null;
       continue;
     }
-    if (!line || line[0] === "#" || line[0] === ";" || line[0] === " " || line[0] === "	") continue;
-    const m = ENV_KEY_RE.exec(line);
+    const trimmed = line.replace(/^[ \t]+/, "");
+    if (!trimmed || trimmed[0] === "#" || trimmed[0] === ";") continue;
+    const m = ENV_KEY_RE.exec(trimmed);
     if (m === null) continue;
     const name = m[1]?.trim() ?? "";
     if (!name || name.length > MAX_HEADING_LEN) continue;
@@ -4406,7 +4604,7 @@ function extractEnv(content, filePath) {
     if (seen.has(key)) continue;
     seen.add(key);
     symbols.push(makeLineSymbol(filePath, name, "env_key", i + 1));
-    openQuote = _detectOpenQuote(line.slice(m[0].length));
+    openQuote = _detectOpenQuote(trimmed.slice(m[0].length));
   }
   return symbols;
 }
@@ -4785,7 +4983,8 @@ CREATE TABLE IF NOT EXISTS files (
   language TEXT,
   indexed_at REAL,
   embed_sha TEXT,
-  retry_count INTEGER NOT NULL DEFAULT 0
+  retry_count INTEGER NOT NULL DEFAULT 0,
+  parser_sha TEXT
 );
 -- Expression index on TG_LOWER(path) -- see pathEqClause (sql_path.ts) and TG_LOWER's
 -- registration above. TG_LOWER is registered { deterministic: true }, which is required for
@@ -5045,7 +5244,7 @@ CREATE TRIGGER IF NOT EXISTS cache_recall_au AFTER UPDATE ON cache_recall BEGIN
   VALUES (new.row_id, new.label, new.content);
 END;
 `;
-var SCHEMA_VERSION = 12;
+var SCHEMA_VERSION = 13;
 function alterTableIdempotent(conn, sql) {
   try {
     conn.exec(sql);
@@ -5089,7 +5288,9 @@ var MIGRATIONS = {
   // .env would have kept serving its pre-fix chunks indefinitely. Deleting the rows here both
   // removes the stored secrets and, by clearing embed_sha, makes the next drain re-embed the file
   // through the redacting path.
-  10: purgeDotenvEmbeddings
+  10: purgeDotenvEmbeddings,
+  // v12 -> v13: adds files.parser_sha, the digest of the extraction logic that produced this file's rows, tracked separately from files.sha for the same reason embed_sha is -- content freshness and parse freshness are different questions, and the content sha alone could only ever answer the first. A pre-existing v12 database's `files` table predates the column, so it needs an explicit ALTER TABLE here; a brand-new database already has it from SCHEMA_SQL's CREATE TABLE above, so the ALTER TABLE would fail with "duplicate column name" there -- swallow exactly that error and rethrow anything else, same pattern as v1 -> v2 / v2 -> v3 / v8 -> v9 / v9 -> v10 above. Deliberately left NULL for every existing row rather than backfilled with the current fingerprint: NULL is the truthful answer (nobody recorded which parser wrote those rows), and it is also the answer that makes the freshness gates reparse them once, which is exactly what a database indexed by an older parser needs.
+  12: (conn) => alterTableIdempotent(conn, "ALTER TABLE files ADD COLUMN parser_sha TEXT")
 };
 function runMigrations(conn, fromVersion, toVersion) {
   for (let v = fromVersion; v < toVersion; v++) {
@@ -5575,7 +5776,51 @@ var _KIND_GROUPS = [
       "exports",
       "imports",
       "changed_lookup",
-      "dep_docs"
+      "dep_docs",
+      // Every other SOURCE_READ kind in stats.ts's KIND_TO_SOURCE: the surgical-read commands over documents, structured data and session/PR state. They were registered and produced but grouped nowhere, so `stats --full` printed the whole family under 'Other', away from the read-savings siblings they are measured against. image_meta/image_text sit here rather than under 'Images' because stats.ts files them as SOURCE_READ: they save read bytes, they do not shrink an image.
+      "brief_view",
+      "conflicts",
+      "coverage_report_gaps",
+      "csv_query",
+      "csv_profile",
+      "compact_doc",
+      "docx_outline",
+      "docx_text",
+      "gdrive_sections",
+      "image_meta",
+      "image_text",
+      "json_query",
+      "json_outline",
+      "note_read",
+      "note_list",
+      "openapi_op",
+      "openapi_outline",
+      "pdf_extract",
+      "pdf_locate",
+      "pdf_outline",
+      "pdf_meta",
+      "pptx_outline",
+      "pptx_slide",
+      "pptx_notes",
+      "pptx_text",
+      "pr_slice",
+      "session_outline",
+      "session_slice",
+      "sqlite_query",
+      "sqlite_schema",
+      "transcript",
+      "transcript_outline",
+      "video_chapters",
+      "xlsx_sheets",
+      "xlsx_head",
+      "xlsx_range",
+      "xlsx_query",
+      "xml_query",
+      "xml_outline",
+      "yaml_query",
+      "yaml_outline",
+      "zip_list",
+      "zip_read"
     ])
   },
   { label: "Lookups", members: /* @__PURE__ */ new Set(["symbol_lookup", "semantic_search", "map_lookup"]) },
@@ -5597,74 +5842,72 @@ var _KIND_GROUPS = [
       "session_hint_overhead",
       "session_hint_suppressed",
       "read_count_deny",
-      "read_dedup_hint",
       "grep_dedup_hint",
       "glob_dedup_hint",
       "diff_hint",
       "predictive_prefetch_hit",
-      "read_partial_overlap_hint",
       "structured_file_hint",
       "write_rewrite_hint",
       "websearch_dedup_hint",
       "large_file_hint_followed",
-      "large_file_hint_ignored"
-    ])
-  },
-  {
-    label: "Bash",
-    members: /* @__PURE__ */ new Set([
-      "bash_dedup_hint",
-      "bash_output_cached",
-      "bash_output_recall",
-      "bash_output_recall_miss",
-      "bash_dedup_stale",
-      "bash_range_read_hint",
-      "bash_streak_hint",
-      "bash_poll_hint",
-      "env_probe_cache_hit",
-      "git_diff_scope_hint",
-      "dep_list_cache_hit",
-      "bash_read_equiv_already_read",
-      "bash_grep_result_cache_hit",
-      "git_diff_context_trimmed"
+      "large_file_hint_ignored",
+      "evidence_cache_hit"
     ])
   },
+  // Empty for the same reason as MCP below: every live Bash kind arrives through _kindGroupLabel's `bash_compress:` prefix branch, not through a literal name. The fifteen literal names this set used to carry (bash_output_cached, bash_dedup_hint, env_probe_cache_hit and the rest) came over with the Python port and were never recorded or registered anywhere in this tree, so they grouped rows that could not exist.
+  { label: "Bash", members: /* @__PURE__ */ new Set() },
   {
     label: "Web",
     members: /* @__PURE__ */ new Set([
-      "web_dedup_hint",
-      "web_output_cached",
-      "web_output_recall",
-      "web_output_recall_miss",
-      "web_dedup_stale",
       "web_fetch",
       "injection_detected"
     ])
   },
+  // Membership comes from _kindGroupLabel's `mcp:` prefix branch, not from this set, which is why
+  // it is empty. The entry still has to exist: _renderByKindSection iterates _KIND_GROUPS' labels
+  // (plus 'Other') to decide what to print, so a label _kindGroupLabel returns but that is missing
+  // here does not fall back to 'Other' -- its rows disappear from the table entirely.
+  { label: "MCP", members: /* @__PURE__ */ new Set() },
   {
     label: "Compact / Skills",
     members: /* @__PURE__ */ new Set([
-      "compact_manifest",
-      "compact_assist",
-      "compact_recovery",
-      "skill_body_recall",
-      "skill_compact_served",
-      "skill_cached",
       "skill_load",
       "skill_oversized_first_load",
-      "skill_compact_inlined",
-      "resume_packet",
-      "decision_log"
+      "skill_compact_inlined"
+    ])
+  },
+  // SOURCE_CONTENT: real rewrites of tool output that remove real bytes (agent report compaction, Grep fold, browser tab dedup, bash/content compression and the handoff pair). The by-source table has shown a 'content' row since the source was added, but the by-kind table had no member set for it, so every one of these kinds printed under 'Other'. The taskoutput: prefix branch in _kindGroupLabel routes here too.
+  {
+    label: "Content",
+    members: /* @__PURE__ */ new Set([
+      "content_compress",
+      "content_retrieve",
+      "agent_report_compact",
+      "agent_report_compact_declined",
+      "browser_tab_dedup",
+      "grep:fold",
+      "handoff_create",
+      "handoff_resolve",
+      "plan_echo_collapse"
     ])
   }
 ];
 function _kindGroupLabel(kind) {
-  if (kind.startsWith("bash_compress:")) {
+  if (kind.startsWith("bash_compress:") || kind.startsWith("bashoutput:")) {
     return "Bash";
   }
-  if (kind.startsWith("webfetch:")) {
+  if (kind.startsWith("webfetch:") || kind.startsWith("gdrive:")) {
     return "Web";
   }
+  if (kind.startsWith("mcp:")) {
+    return "MCP";
+  }
+  if (kind.startsWith("skill_body:") || kind.startsWith("skill_compact:")) {
+    return "Compact / Skills";
+  }
+  if (kind.startsWith("taskoutput:")) {
+    return "Content";
+  }
   for (const group of _KIND_GROUPS) {
     if (group.members.has(kind)) {
       return group.label;
@@ -5968,6 +6211,10 @@ var SOURCE_SKILL = "skill";
 var SOURCE_CONTENT = "content";
 var SOURCE_OTHER = "other";
 var _BYTES_MODE_ONLY_KINDS = /* @__PURE__ */ new Set(["webfetch_image", "gdrive_image"]);
+var COUNT_ONLY_KINDS = /* @__PURE__ */ new Set(["secret_redacted"]);
+function savedTokensFromBytes(bytes) {
+  return Math.round(Math.max(0, bytes) / 4);
+}
 var KIND_TO_SOURCE = {
   image_shrink: SOURCE_IMAGE,
   image_shrink_cache_hit: SOURCE_IMAGE,
@@ -6057,6 +6304,10 @@ var KIND_TO_SOURCE = {
   // Cold first load of an oversized skill where preSkillHandler inlined the compact slice in its reply instead of pointing at `skill-body --compact`. Unlike its skill_oversized_first_load sibling (event-only, 0 bytes -- the pointer deny saves nothing by itself, the follow-up command does) this one records real savings: the full body never landed, the slice did, so bytesSaved is body minus slice.
   skill_compact_inlined: SOURCE_SKILL,
   secret_redacted: SOURCE_OTHER,
+  // Fail-soft diagnostic counters from hooks_edit.ts: they record that a side task threw, never a byte saving, so "other" is the right home. Listed explicitly rather than left to kindToSource()'s fallback so the registration guard can tell a deliberate placement from an unregistered kind.
+  dirty_queue_append_failed: SOURCE_OTHER,
+  worker_healthcheck_failed: SOURCE_OTHER,
+  known_root_record_failed: SOURCE_OTHER,
   // Measurement of what a compaction produced (hooks_compact.ts postCompactHandler): summary size and how many manifest paths survived into it. SOURCE_OTHER and always recorded at (0, 0) -- the summary was written whether or not token-goat was watching, so there is no counterfactual in which those bytes were saved. Filing it anywhere with a savings total would credit token-goat for the whole summary, which is the accounting mistake this registry exists to prevent.
   compact_summary: SOURCE_OTHER,
   // Envelope compaction of an oversized subagent report (hooks_agent_spawn.ts). SOURCE_CONTENT, not SOURCE_HINT: the handler's sibling session_hint entry is advisory (it only appends a recall pointer and genuinely saves nothing), whereas this kind records a real rewrite with real bytes removed, so filing it under the advisory bucket would understate the compaction and repeat the zero-savings desync this registry keeps getting bitten by.
@@ -6064,6 +6315,10 @@ var KIND_TO_SOURCE = {
   // Decline counterpart to agent_report_compact: the fence-collapse net-benefit gate ran and found at least one over-long fence, but declined to rewrite because net savings did not clear the notice cost. Always recorded at (0, 0) -- see the recordStat call site -- so it never contributes to any savings total; it exists purely to make gate hit-rate and near-misses visible instead of the decline being invisible.
   agent_report_compact_declined: SOURCE_CONTENT,
   content_compress: SOURCE_CONTENT,
+  // Verbatim-repeat collapse of a browser tool's "Tab Context:" text block (hooks_browser_image.ts postBrowserImageHandler). SOURCE_CONTENT for the same reason as agent_report_compact above: it is a real rewrite with real bytes removed, not an advisory nudge. Deliberately not SOURCE_IMAGE -- it shares a handler with image_shrink but collapses text, and folding text bytes into the image ledger is the two-units-under-one-label mistake this file's image_shrink entry was just fixed for.
+  browser_tab_dedup: SOURCE_CONTENT,
+  // Collapse of the plan echo in an approved ExitPlanMode result (hooks_exitplanmode.ts). SOURCE_CONTENT for the same reason as agent_report_compact: real bytes removed from a tool result, not an advisory nudge. The handler shipped for releases emitting this rewrite and recording nothing at all, so the mechanism was invisible in `stats` and its net benefit could not be checked against the gate that admits it.
+  plan_echo_collapse: SOURCE_CONTENT,
   // Lossless re-layout of Grep content-mode output (hooks_grep.ts foldGrepContentHandler). SOURCE_CONTENT, not SOURCE_HINT, for the same reason as agent_report_compact above: its sibling grep_dedup_hint is advisory and saves nothing directly, whereas this is a real rewrite with real bytes removed. Filing it under the advisory bucket would silently add non-hint savings to hint_stats.ts's savedBytes (which reads by_source[SOURCE_HINT] wholesale) and overstate the hint ledger's net benefit.
   "grep:fold": SOURCE_CONTENT,
   content_retrieve: SOURCE_CONTENT,
@@ -6076,7 +6331,9 @@ var KIND_PREFIX_TO_SOURCE = [
   ["gdrive:", SOURCE_WEB],
   ["mcp:", SOURCE_MCP],
   ["skill_body:", SOURCE_SKILL],
-  ["skill_compact:", SOURCE_SKILL]
+  ["skill_compact:", SOURCE_SKILL],
+  ["bashoutput:", SOURCE_BASH],
+  ["taskoutput:", SOURCE_CONTENT]
 ];
 var COMMAND_KINDS = {
   symbol: /* @__PURE__ */ new Set(["symbol_lookup"]),
@@ -6190,7 +6447,8 @@ CREATE TABLE IF NOT EXISTS stats (
   tokens_saved INTEGER NOT NULL DEFAULT 0,
   bytes_saved INTEGER NOT NULL DEFAULT 0,
   detail TEXT,
-  harness TEXT
+  harness TEXT,
+  traceparent TEXT
 );
 CREATE INDEX IF NOT EXISTS idx_stats_ts ON stats(ts);
 CREATE INDEX IF NOT EXISTS idx_stats_kind ON stats(kind);
@@ -6213,6 +6471,11 @@ function migrateGlobalSchema(db) {
   } catch (err) {
     if (!(err instanceof Error) || !/duplicate column/i.test(err.message)) throw err;
   }
+  try {
+    db.exec("ALTER TABLE stats ADD COLUMN traceparent TEXT");
+  } catch (err) {
+    if (!(err instanceof Error) || !/duplicate column/i.test(err.message)) throw err;
+  }
 }
 var _harnessColumnByDb = /* @__PURE__ */ new WeakMap();
 function statsHasHarnessColumn(db) {
@@ -6229,6 +6492,21 @@ function statsHasHarnessColumn(db) {
   _harnessColumnByDb.set(db, present);
   return present;
 }
+var _traceparentColumnByDb = /* @__PURE__ */ new WeakMap();
+function statsHasTraceparentColumn(db) {
+  const cached = _traceparentColumnByDb.get(db);
+  if (cached !== void 0) return cached;
+  let present;
+  try {
+    present = db.prepare("PRAGMA table_info(stats)").all().some(
+      (c) => c.name === "traceparent"
+    );
+  } catch {
+    present = false;
+  }
+  _traceparentColumnByDb.set(db, present);
+  return present;
+}
 function getGlobalDb(homeDir) {
   const basePath = homeDir ? dataDirForHome(homeDir) : dataDir();
   const dbPath = path8.join(basePath, "global.db");
@@ -6247,11 +6525,18 @@ function noStatsMessage(windowDays, homeDir) {
   if (total === 0) return "No stats recorded yet.";
   return `No stats in the last ${countNoun(windowDays, "day")} (${total} recorded outside this window; use --window-days 0 for all time).`;
 }
-function recordStat(kind, bytesSaved = 0, tokensSaved = 0, _testDb, detail) {
+function recordStat(kind, bytesSaved = 0, tokensSaved = 0, _testDb, detail, traceparent) {
   try {
     const db = _testDb ?? getGlobalDb();
     const ts = Math.floor(Date.now() / 1e3);
-    if (statsHasHarnessColumn(db)) {
+    const tp = traceparent ?? process.env["TRACEPARENT"] ?? process.env["traceparent"] ?? null;
+    const hasHarness = statsHasHarnessColumn(db);
+    const hasTraceparent = statsHasTraceparentColumn(db);
+    if (hasHarness && hasTraceparent) {
+      db.prepare(
+        "INSERT INTO stats (ts, kind, bytes_saved, tokens_saved, detail, harness, traceparent) VALUES (?, ?, ?, ?, ?, ?, ?)"
+      ).run(ts, kind, bytesSaved, tokensSaved, detail ?? null, getHarnessName(), tp);
+    } else if (hasHarness) {
       db.prepare(
         "INSERT INTO stats (ts, kind, bytes_saved, tokens_saved, detail, harness) VALUES (?, ?, ?, ?, ?, ?)"
       ).run(ts, kind, bytesSaved, tokensSaved, detail ?? null, getHarnessName());
@@ -6306,10 +6591,14 @@ function summarize(windowDays = 30, testDb, homeDir) {
   const stmt = db.prepare(query);
   const rows = sinceTs !== null ? stmt.all(sinceTs) : stmt.all();
   const tsToDateCache = {};
+  const counts = {};
   for (const row of rows) {
     const bytesSaved = row.bytes_saved ?? 0;
-    const tokensSaved = row.tokens_saved ?? 0;
+    const recorded = row.tokens_saved ?? 0;
     const kind = row.kind;
+    const isCount = COUNT_ONLY_KINDS.has(kind);
+    if (isCount) counts[kind] = (counts[kind] ?? 0) + recorded;
+    const tokensSaved = isCount ? 0 : recorded;
     const tsRaw = row.ts;
     if (tsRaw === void 0) continue;
     const ts = tsRaw;
@@ -6368,6 +6657,7 @@ function summarize(windowDays = 30, testDb, homeDir) {
     by_project: byProjectList,
     by_source: bySourceDict,
     by_harness: byHarness,
+    counts,
     by_command: Object.entries(byCommandDict).map(([command, bucket]) => ({ ...bucket, command })).filter((r) => r.events > 0),
     window_days: windowDays
   };
@@ -6378,6 +6668,10 @@ function _totalsLines(summary) {
     `Total events:   ${summary.total_events}`,
     `Bytes saved:    ${fmtBytes(summary.total_bytes_saved)}`,
     `Tokens saved:   ${summary.total_tokens_saved}`,
+    // Printed on its own line, below the token total and never inside it, because it counts
+    // placeholders rather than tokens. Omitted entirely when nothing was redacted, so the line is
+    // information rather than a permanent zero. See COUNT_ONLY_KINDS.
+    ...summary.counts["secret_redacted"] ? [`Secrets hidden: ${summary.counts["secret_redacted"]} (a count, not tokens)`] : [],
     `Window:         ${summary.window_days} days`
   ];
 }
@@ -6529,150 +6823,45 @@ function renderStats2(opts) {
 
 // src/secret_redact.ts
 var SECRET_PATTERNS = [
-  // Anthropic keys share OpenAI's "sk-" prefix but are more specific
-  // ("sk-ant-"), so they're matched first — the generic OpenAI pattern's
-  // negative lookahead below is defense in depth, not the sole guard.
+  // Anthropic keys share OpenAI's "sk-" prefix but are more specific ("sk-ant-"), so they're matched first — the generic OpenAI pattern's negative lookahead below is defense in depth, not the sole guard.
   ["anthropic_api_key", /sk-ant-[A-Za-z0-9_-]{20,}/g],
-  // Modern (post-2024, now the default) OpenAI project keys: "sk-proj-" followed by a long
-  // base64url-ish body that legitimately contains '-' and '_' -- the generic pattern below
-  // deliberately excludes those characters (hyphenated prose would false-fire), so this needs
-  // its own entry with the more specific prefix matched first, like sk-ant- above.
+  // Modern (post-2024, now the default) OpenAI project keys: "sk-proj-" followed by a long base64url-ish body that legitimately contains '-' and '_' -- the generic pattern below deliberately excludes those characters (hyphenated prose would false-fire), so this needs its own entry with the more specific prefix matched first, like sk-ant- above.
   ["openai_project_key", /sk-proj-[A-Za-z0-9_-]{20,}/g],
   ["openai_api_key", /sk-(?!ant-|proj-)[A-Za-z0-9]{20,}/g],
   ["aws_access_key", /AKIA[0-9A-Z]{16}/g],
-  // Fine-grained PATs ("github_pat_...") are matched before the classic gh[oprsu]_ pattern so
-  // the full token is always consumed as one match -- a fine-grained token's own body can
-  // contain '_' and could otherwise partially match the classic pattern.
+  // Fine-grained PATs ("github_pat_...") are matched before the classic gh[oprsu]_ pattern so the full token is always consumed as one match -- a fine-grained token's own body can contain '_' and could otherwise partially match the classic pattern.
   ["github_token", /github_pat_[A-Za-z0-9_]{22,}/g],
   ["github_token", /gh[oprsu]_[A-Za-z0-9]{36,}/g],
-  // xapp- is Slack's app-level token (Socket Mode), a bearer credential in its own right that
-  // the xox[baprs]- prefix does not cover. It gets its own entry rather than joining the
-  // alternation above because it needs the full segmented shape (xapp-<ver>-<app id>-<digits>-
-  // <hex>) to be safe: a bare /xapp-[A-Za-z0-9-]+/ redacted ordinary identifiers like
-  // "xapp-config" and the css class "xapp-container", mangling normal source. The xox* prefixes
-  // are distinctive enough on their own; "xapp-" is not.
+  // xapp- is Slack's app-level token (Socket Mode), a bearer credential in its own right that the xox[baprs]- prefix does not cover. It gets its own entry rather than joining the alternation above because it needs the full segmented shape (xapp-<ver>-<app id>-<digits>- <hex>) to be safe: a bare /xapp-[A-Za-z0-9-]+/ redacted ordinary identifiers like "xapp-config" and the css class "xapp-container", mangling normal source. The xox* prefixes are distinctive enough on their own; "xapp-" is not.
   ["slack_token", /xox[baprs]-[A-Za-z0-9-]+/g],
   ["slack_token", /xapp-\d-[A-Za-z0-9]{6,}-\d{8,}-[A-Za-z0-9]{16,}/g],
-  // Matches the full block (BEGIN marker through its matching END marker), not just the
-  // header -- the actual secret material is the base64 body between them, so redacting only
-  // the header line would leave the key bytes themselves fully readable in the cached blob.
-  // The body is lazy and additionally refuses to cross a following BEGIN marker. Both halves
-  // matter. The laziness bounds a successful match at the very next END marker; the negative
-  // lookahead bounds a *failing* one, because a BEGIN with no END of its own would otherwise
-  // scan to end-of-input, and a blob full of such markers made the pass quadratic -- 6 ms, 20 ms
-  // and 78 ms for 2000, 4000 and 8000 of them, four times the work for twice the input, the same
-  // shape as the lookbehind incident described above. Private key blocks do not nest, so
-  // refusing to cross a BEGIN costs nothing in correctness.
-  // The algorithm and ` BLOCK` groups are backreferenced in the END marker rather than repeated,
-  // so a BEGIN only ever pairs with its own END spelling. Written as two independent optional
-  // groups, `BEGIN PGP PRIVATE KEY` would happily close on a distant `END RSA PRIVATE KEY BLOCK`
-  // and redact everything in between. A non-participating group backreferences as the empty
-  // string in JS, which is exactly what the unprefixed `BEGIN PRIVATE KEY` form needs.
-  // The algorithm list covers every armored private-key header openssl, ssh-keygen and gpg
-  // actually emit, not just the ones a first draft happened to think of. ENCRYPTED is the
-  // PKCS#8 passphrase-protected form (`openssl genpkey -aes256`, `ssh-keygen -m PKCS8`) and is
-  // the most common shape of all; DSA is legacy but still written verbatim; PGP carries the
-  // ` BLOCK` suffix, which is why that suffix is optional here. All three used to fall through
-  // to disk in full. An encrypted key is still key material: the passphrase can be attacked
-  // offline once the bytes are cached, so it is redacted like any other.
-  // PuTTY `.ppk` files are deliberately not matched. They have no END marker -- the private
-  // section is a `Private-Lines: N` count followed by exactly N base64 lines -- so bounding a
-  // match would take a stateful parse rather than a regex, on a path that runs over every
-  // command output. A regex guess at where the body ends is exactly the over-eager match this
-  // module's header warns against.
+  // Matches the full block (BEGIN marker through its matching END marker), not just the header -- the actual secret material is the base64 body between them, so redacting only the header line would leave the key bytes themselves fully readable in the cached blob. The body is lazy and additionally refuses to cross a following BEGIN marker. Both halves matter. The laziness bounds a successful match at the very next END marker; the negative lookahead bounds a *failing* one, because a BEGIN with no END of its own would otherwise scan to end-of-input, and a blob full of such markers made the pass quadratic -- 6 ms, 20 ms and 78 ms for 2000, 4000 and 8000 of them, four times the work for twice the input, the same shape as the lookbehind incident described above. Private key blocks do not nest, so refusing to cross a BEGIN costs nothing in correctness. The algorithm and ` BLOCK` groups are backreferenced in the END marker rather than repeated, so a BEGIN only ever pairs with its own END spelling. Written as two independent optional groups, `BEGIN PGP PRIVATE KEY` would happily close on a distant `END RSA PRIVATE KEY BLOCK` and redact everything in between. A non-participating group backreferences as the empty string in JS, which is exactly what the unprefixed `BEGIN PRIVATE KEY` form needs. The algorithm list covers every armored private-key header openssl, ssh-keygen and gpg actually emit, not just the ones a first draft happened to think of. ENCRYPTED is the PKCS#8 passphrase-protected form (`openssl genpkey -aes256`, `ssh-keygen -m PKCS8`) and is the most common shape of all; DSA is legacy but still written verbatim; PGP carries the ` BLOCK` suffix, which is why that suffix is optional here. All three used to fall through to disk in full. An encrypted key is still key material: the passphrase can be attacked offline once the bytes are cached, so it is redacted like any other. PuTTY `.ppk` files are deliberately not matched. They have no END marker -- the private section is a `Private-Lines: N` count followed by exactly N base64 lines -- so bounding a match would take a stateful parse rather than a regex, on a path that runs over every command output. A regex guess at where the body ends is exactly the over-eager match this module's header warns against.
   ["private_key_block", /-----BEGIN (RSA |DSA |EC |OPENSSH |ENCRYPTED |PGP )?PRIVATE KEY( BLOCK)?-----(?:(?!-----BEGIN )[\s\S])*?-----END \1PRIVATE KEY\2-----/g],
-  // Redacts only the token itself, not the "Authorization: Bearer " prefix -- the lookbehind
-  // anchors on the header name and scheme so the surrounding request-log line stays readable,
-  // matching how AWS_ACCESS_KEY_ID=... above keeps its own prefix intact.
-  // The optional quotes on either side of the colon are what let this see a header carried in
-  // JSON rather than in raw wire format. Without them the lookbehind demanded the colon sit
-  // directly against the header name and the scheme directly against the space, so a body like
-  // {"Authorization": "Bearer <token>"} -- the shape any logged fetch or MCP result arrives in
-  // -- matched nothing and the token was cached verbatim.
-  // `token` is the second scheme spelling in wide use -- it is what curl and gh examples pass for
-  // GitHub and many other APIs -- and an opaque value behind it carries exactly the same authority
-  // as one behind `Bearer`. The trailing gap is `{1,8}` rather than a single space for the same
-  // reason every other gap in this lookbehind already is: a hand-aligned or reformatted header
-  // ("Authorization:  Bearer  <token>") is ordinary, and demanding exactly one space there made
-  // this the one position in the pattern that a second space defeated.
+  // Redacts only the token itself, not the "Authorization: Bearer " prefix -- the lookbehind anchors on the header name and scheme so the surrounding request-log line stays readable, matching how AWS_ACCESS_KEY_ID=... above keeps its own prefix intact. The optional quotes on either side of the colon are what let this see a header carried in JSON rather than in raw wire format. Without them the lookbehind demanded the colon sit directly against the header name and the scheme directly against the space, so a body like {"Authorization": "Bearer <token>"} -- the shape any logged fetch or MCP result arrives in -- matched nothing and the token was cached verbatim. `token` is the second scheme spelling in wide use -- it is what curl and gh examples pass for GitHub and many other APIs -- and an opaque value behind it carries exactly the same authority as one behind `Bearer`. The trailing gap is `{1,8}` rather than a single space for the same reason every other gap in this lookbehind already is: a hand-aligned or reformatted header ("Authorization: Bearer <token>") is ordinary, and demanding exactly one space there made this the one position in the pattern that a second space defeated.
   ["auth_bearer_token", /(?<=Authorization["']?[ \t]{0,8}:[ \t]{0,8}["']?[ \t]{0,8}(?:Bearer|token)[ \t]{1,8})[A-Za-z0-9\-._~+/]{10,}=*/gi],
   ["auth_basic_token", /(?<=Authorization["']?[ \t]{0,8}:[ \t]{0,8}["']?[ \t]{0,8}Basic[ \t])[A-Za-z0-9+/]{6,}=*/gi],
-  // JWTs have no distinctive prefix of their own, but the base64url encoding of the smallest
-  // realistic header ('{"alg":' or similar) always starts with "eyJ", so that's the practical
-  // anchor here -- each of the three dot-separated segments requires a minimum length to avoid
-  // matching a short, coincidentally dotted token.
+  // JWTs have no distinctive prefix of their own, but the base64url encoding of the smallest realistic header ('{"alg":' or similar) always starts with "eyJ", so that's the practical anchor here -- each of the three dot-separated segments requires a minimum length to avoid matching a short, coincidentally dotted token.
   //
-  // The trailing `={0,2}` on each segment is what makes a padded token match. Base64url as the JWT
-  // spec defines it drops the `=` padding, but producers that reach for a plain base64 encoder
-  // emit it anyway, and a `=` in the header or payload segment used to defeat the match outright:
-  // not a partial redaction, but none at all, so the entire token was printed. `=` cannot appear
-  // anywhere except the end of a segment, since it is not one of the characters the segment body
-  // allows, so accepting it here cannot widen the match onto anything else.
+  // The trailing `={0,2}` on each segment is what makes a padded token match. Base64url as the JWT spec defines it drops the `=` padding, but producers that reach for a plain base64 encoder emit it anyway, and a `=` in the header or payload segment used to defeat the match outright: not a partial redaction, but none at all, so the entire token was printed. `=` cannot appear anywhere except the end of a segment, since it is not one of the characters the segment body allows, so accepting it here cannot widen the match onto anything else.
   ["jwt", /eyJ[A-Za-z0-9_-]{10,}={0,2}\.[A-Za-z0-9_-]{10,}={0,2}\.[A-Za-z0-9_-]{10,}={0,2}/g],
   ["npm_token", /npm_[A-Za-z0-9]{36}/g],
-  // rk_live_ (restricted keys) share the sk_live_/sk_test_ secret-key shape and risk level, so
-  // one pattern covers all three rather than adding a near-duplicate entry.
+  // rk_live_ (restricted keys) share the sk_live_/sk_test_ secret-key shape and risk level, so one pattern covers all three rather than adding a near-duplicate entry.
   ["stripe_key", /(?:sk_live_|sk_test_|rk_live_)[A-Za-z0-9]{20,}/g],
   ["google_api_key", /AIza[A-Za-z0-9_-]{35}/g],
-  // Presigned-url signatures: AWS SigV4 (X-Amz-Signature), Google Cloud Storage
-  // (X-Goog-Signature), and Azure blob SAS (sig). These are bearer credentials in query-string
-  // clothing -- anyone holding the whole url can read or write the object until it expires, and
-  // none of the prefix-anchored patterns above match them because the signature is a bare hex or
-  // base64 blob with no distinctive prefix of its own. The '[?&]' anchor and the 16-char floor
-  // are what make the short, generic 'sig' name safe to key on: a prose or code mention of "sig"
-  // never sits directly after a query separator followed by that much opaque token.
+  // Presigned-url signatures: AWS SigV4 (X-Amz-Signature), Google Cloud Storage (X-Goog-Signature), and Azure blob SAS (sig). These are bearer credentials in query-string clothing -- anyone holding the whole url can read or write the object until it expires, and none of the prefix-anchored patterns above match them because the signature is a bare hex or base64 blob with no distinctive prefix of its own. The '[?&]' anchor and the 16-char floor are what make the short, generic 'sig' name safe to key on: a prose or code mention of "sig" never sits directly after a query separator followed by that much opaque token.
   ["presigned_signature", /(?<=[?&](?:X-Amz-Signature|X-Goog-Signature|sig)=)[A-Za-z0-9%+/=_-]{16,}/gi],
-  // A password inside a connection url. `postgres://user:hunter2@db.internal` carries the
-  // credential in the authority section, where there is no `key=value` separator for the
-  // generic pattern below to anchor on, so a DATABASE_URL echoed by a failing migration or a
-  // psql error went through untouched. The anchors are what keep this narrow: a scheme's `://`,
-  // a userinfo segment, the colon, and a following `@`. `http://host:8080/path` has no `@` and
-  // is left alone; so is any url without credentials.
+  // A password inside a connection url. `postgres://user:hunter2@db.internal` carries the credential in the authority section, where there is no `key=value` separator for the generic pattern below to anchor on, so a DATABASE_URL echoed by a failing migration or a psql error went through untouched. The anchors are what keep this narrow: a scheme's `://`, a userinfo segment, the colon, and a following `@`. `http://host:8080/path` has no `@` and is left alone; so is any url without credentials.
   ["url_credentials", /(?<=:\/\/[^\s:@/]{1,64}:)[^\s:@/]{1,256}(?=@)/g],
-  // Generic key=value assignments in .env-file and connection-string/query-string shape. The
-  // lookbehind again redacts only the value, and the value's character class deliberately
-  // excludes whitespace, '&', ';', '#', quote characters, and '[' ']' ':' -- that exclusion is
-  // what stops this from swallowing the rest of the line (a trailing comment or the next
-  // key=value pair) or the remainder of a query string past the matched parameter, which is
-  // exactly the kind of over-eager match this module's own design note above warns broad
-  // heuristics produce. The '[' ']' ':' exclusion also matters because this pattern runs last: an
-  // earlier pattern's own "OPENAI_API_KEY=[REDACTED:openai_project_key]" replacement text
-  // contains "API_KEY=" too, and without excluding those characters this pattern would re-match
-  // and double-redact its own placeholder. The length has a lower bound only (no upper bound):
-  // capping it at 64 used to leave the tail of any longer secret unredacted in plain text, which
-  // is worse than no redaction because it looks handled. A single negated-class quantifier like
-  // this cannot backtrack catastrophically -- there is no nested or overlapping quantifier for
-  // the engine to explore multiple ways of matching, so removing the upper bound does not
-  // introduce a ReDoS risk.
-  // Quotes are permitted around the separator, but never inside the value class. A quoted value
-  // is the ordinary way secrets are written -- .env files, JSON, YAML, TOML all quote by default
-  // -- and the lookbehind used to stop dead at the opening quote, so `API_KEY="..."` passed
-  // through in full while the bare `API_KEY=...` was caught. The closing quote of the key name
-  // blocked it from the other side too, which is what kept every JSON body unredacted. Keeping
-  // quotes out of the value class is still what stops the match running past the closing quote.
-  // The keyword may be a prefix of a longer key name rather than the whole of it, so the
-  // trailing identifier class below is load-bearing: without it the lookbehind required the
-  // keyword to sit immediately before the separator, and AWS_SECRET_ACCESS_KEY=,
-  // SECRET_KEY=, and DB_PASSWORD_HASH= all passed through in full. That class matches
-  // identifier characters only, so prose that merely mentions a keyword still never reaches
-  // a separator and stays unredacted. api[_-]?key covers the apikey and api-key spellings too.
-  // `& ; # , :` play two incompatible roles. They separate one field from the next (a query
-  // string, a cookie header, an inline env list), and they are also perfectly ordinary credential
-  // characters. Rejecting them outright got the first role right and the second badly wrong: the
-  // match stopped at the first one and left everything after it in plain text, so
-  // `password=corr&horse&battery` redacted four characters and printed the rest, and
-  // `DB_PASSWORD=Aa1:xyz` matched nothing at all because the run before the `:` was under the
-  // four-character floor. A tail left sitting in the open is the outcome this module's header
-  // calls worse than no redaction, because it reads as handled.
+  // Azure storage account connection strings (`DefaultEndpointsProtocol=https;AccountName=...; AccountKey=<base64>==;EndpointSuffix=core.windows.net`) carry a full read/write key to the account in the AccountKey field, and none of the generic patterns above catch it: generic_secret_assignment's keyword list (password|passwd|secret|api[_-]?key| access[_-]?token|refresh[_-]?token|id[_-]?token) has nothing that matches "AccountKey", and an unanchored base64-shape pattern was deliberately rejected -- this module's header already warns that a bare high-entropy-blob heuristic false-fires on ordinary code, JSON and log output, and an 88-char base64 value is exactly the shape a hash, a compiled asset digest or a generated id can also take. Anchoring on the literal `AccountKey=` field name instead keeps the match specific to this one connection-string field. The value class is base64 proper (letters, digits, `+`, `/`, trailing `=` padding) and none of those characters include `;`, so the match terminates on its own at the `;` that starts the next `Name=` field -- unlike generic_secret_assignment's separator characters (`& ; # , :`), which double as ordinary credential characters and need a lookahead to tell the two roles apart, `;` is never valid base64 and needs no such lookahead here. The lookbehind keeps `AccountKey=` itself in the output, matching auth_bearer_token and presigned_signature above, so `;EndpointSuffix=core.windows.net` after it stays fully readable too. `SharedAccessKey` is the same credential one Azure service over: Service Bus, Event Hubs and Relay spell it that way (`Endpoint=sb://ns.servicebus.windows.net/;SharedAccessKeyName=Root; SharedAccessKey=<base64>`) and it carries the same authority over that namespace that AccountKey does over a storage account. `SharedAccessKeyName` is a plain identifier rather than a secret, and never matches: the separator in the lookbehind sits directly against the key name, so the `Name` in between stops it dead. The separator is spelled the way auth_bearer_token above spells its own, for the same reasons that comment records having learned the hard way. Optional quotes on either side of it, so the JSON and YAML forms a logged MCP result or api response actually arrives in are matched rather than stopped dead at the opening quote. A bounded gap rather than exactly one space, so a hand-aligned or reformatted `AccountKey = ...` in an appsettings file is not the single variant that defeats the whole pattern. Case-insensitive for the same reason presigned_signature is. The leading word boundary is what keeps the widened name from reaching into the middle of a longer identifier such as `myaccountkey=`.
+  ["azure_storage_key", /(?<=\b(?:AccountKey|SharedAccessKey)["']?[ \t]{0,8}[:=][ \t]{0,8}["']?)[A-Za-z0-9+/]{40,}=*/gi],
+  // Generic key=value assignments in .env-file and connection-string/query-string shape. The lookbehind again redacts only the value, and the value's character class deliberately excludes whitespace, '&', ';', '#', quote characters, and '[' ']' ':' -- that exclusion is what stops this from swallowing the rest of the line (a trailing comment or the next key=value pair) or the remainder of a query string past the matched parameter, which is exactly the kind of over-eager match this module's own design note above warns broad heuristics produce. The '[' ']' ':' exclusion also matters because this pattern runs last: an earlier pattern's own "OPENAI_API_KEY=[REDACTED:openai_project_key]" replacement text contains "API_KEY=" too, and without excluding those characters this pattern would re-match and double-redact its own placeholder. The length has a lower bound only (no upper bound): capping it at 64 used to leave the tail of any longer secret unredacted in plain text, which is worse than no redaction because it looks handled. A single negated-class quantifier like this cannot backtrack catastrophically -- there is no nested or overlapping quantifier for the engine to explore multiple ways of matching, so removing the upper bound does not introduce a ReDoS risk. Quotes are permitted around the separator, but never inside the value class. A quoted value is the ordinary way secrets are written -- .env files, JSON, YAML, TOML all quote by default -- and the lookbehind used to stop dead at the opening quote, so `API_KEY="..."` passed through in full while the bare `API_KEY=...` was caught. The closing quote of the key name blocked it from the other side too, which is what kept every JSON body unredacted. Keeping quotes out of the value class is still what stops the match running past the closing quote. The keyword may be a prefix of a longer key name rather than the whole of it, so the trailing identifier class below is load-bearing: without it the lookbehind required the keyword to sit immediately before the separator, and AWS_SECRET_ACCESS_KEY=, SECRET_KEY=, and DB_PASSWORD_HASH= all passed through in full. That class matches identifier characters only, so prose that merely mentions a keyword still never reaches a separator and stays unredacted. api[_-]?key covers the apikey and api-key spellings too. `& ; # , :` play two incompatible roles. They separate one field from the next (a query string, a cookie header, an inline env list), and they are also perfectly ordinary credential characters. Rejecting them outright got the first role right and the second badly wrong: the match stopped at the first one and left everything after it in plain text, so `password=corr&horse&battery` redacted four characters and printed the rest, and `DB_PASSWORD=Aa1:xyz` matched nothing at all because the run before the `:` was under the four-character floor. A tail left sitting in the open is the outcome this module's header calls worse than no redaction, because it reads as handled.
   //
-  // So the separator role is decided by what follows rather than assumed: one of these characters
-  // ends the value only when the next thing along is another `name=` / `name:` pair, which is what
-  // an actual field separator is always followed by. `,OTHER=public` and `; other=1` still end it;
-  // the `&` in the middle of a passphrase does not. Whitespace, quotes and brackets are unchanged
-  // -- they end a value unconditionally, which is also what keeps this pattern from re-matching
-  // the `[REDACTED:...]` placeholder it just wrote.
+  // So the separator role is decided by what follows rather than assumed: one of these characters ends the value only when the next thing along is another `name=` / `name:` pair, which is what an actual field separator is always followed by. `,OTHER=public` and `; other=1` still end it; the `&` in the middle of a passphrase does not. Whitespace, quotes and brackets are unchanged -- they end a value unconditionally, which is also what keeps this pattern from re-matching the `[REDACTED:...]` placeholder it just wrote.
   ["generic_secret_assignment", /(?<=(?:password|passwd|secret|api[_-]?key|access[_-]?token|refresh[_-]?token|id[_-]?token)[a-z0-9_-]{0,64}["']?[ \t]{0,8}[:=][ \t]{0,8}["']?)(?:\\[^\n]|[^\s\\&;#,:'"[\]{}]|[&;#,:](?![ \t]*[A-Za-z_][A-Za-z0-9_.-]*[ \t]*[:=])){4,}/gi]
 ];
+function countRedactionPlaceholders(text) {
+  return text.match(/\[REDACTED:[a-z0-9_]+\]/g)?.length ?? 0;
+}
 function redactSecrets(text) {
   let count = 0;
   let out = text;
@@ -6801,6 +6990,7 @@ export {
   toKB,
   compileGrepMatcher,
   grepFilteredToEmptyNotice,
+  filtersFilteredToEmptyNotice,
   countNoun,
   excludeTestsHiddenNote,
   countContentLines,
@@ -6888,6 +7078,7 @@ export {
   fg,
   C,
   SOURCE_HINT,
+  savedTokensFromBytes,
   formatLocalTimestamp,
   recordStat,
   recordUnmappedTool,
@@ -6896,6 +7087,7 @@ export {
   _useRichStats,
   renderShortStats,
   renderStats2 as renderStats,
+  countRedactionPlaceholders,
   redactSecrets,
   FILTERS,
   stripAnsiCodes