token-goat 2.6.16 → 2.6.17

package/dist/token-goat-hook.mjs

@@ -9,7 +9,7 @@ import * as path from "node:path";
 import { createRequire } from "node:module";
 function resolveVersion() {
   if (true) {
-    return "2.6.16";
+    return "2.6.17";
   }
   const require2 = createRequire(import.meta.url);
   const pkg = require2("../package.json");
@@ -126,6 +126,7 @@ var KNOWN_HARNESS_NAMES = /* @__PURE__ */ new Set([
   "pi",
   "copilot_cli",
   "grok",
+  "qwen",
   "generic"
 ]);
 function detectHarness() {
@@ -1728,10 +1729,8 @@ var CONFIG_DEFAULTS = {
     record_zero_savings: false
   },
   hints: {
-    suppress_after_ignored: 5,
     quiet_hours: "",
     json_sidecar: false,
-    verbose_until_seen_count: 2,
     min_file_lines_for_hint: 0,
     bash_dedup_min_bytes: 200,
     web_dedup_min_bytes: 200,
@@ -1874,8 +1873,6 @@ var NUMERIC_FIELD_BOUNDS = {
   "image_shrink.ocr_min_confidence": { min: 0, max: 100 },
   "repomap.compact_file_threshold": { min: 0, max: 1e5 },
   "overflow_guard.max_tokens": { min: 1e3, max: 1e6 },
-  "hints.suppress_after_ignored": { min: 0, max: 1e3 },
-  "hints.verbose_until_seen_count": { min: 0, max: 1e4 },
   "hints.min_file_lines_for_hint": { min: 0, max: 1e6 },
   "hints.bash_dedup_min_bytes": { min: 0, max: 1e5 },
   "hints.web_dedup_min_bytes": { min: 0, max: 1e5 },
@@ -1957,9 +1954,12 @@ var ENV_KEYS2 = [
   "TOKEN_GOAT_WRITE_REWRITE_MIN_LINES",
   "TOKEN_GOAT_WRITE_REWRITE_UNCHANGED_PCT"
 ];
+function allEnvKeys() {
+  return [.../* @__PURE__ */ new Set([...ENV_KEYS2, ...Object.values(CONFIG_KEY_ENV_OVERRIDES).flat()])];
+}
 function configEnvFingerprint() {
   const snap = {};
-  for (const k of ENV_KEYS2) {
+  for (const k of allEnvKeys()) {
     snap[k] = process.env[k];
   }
   return JSON.stringify(snap);
@@ -2007,6 +2007,25 @@ function resolveConfigProjectRoot() {
   _projectRootCache = { cwd, root };
   return root;
 }
+function isAutoTriggerMultiplierExplicit() {
+  const setsMultiplier = (text) => {
+    const raw = parse(text);
+    const ca_raw = raw["compact_assist"];
+    if (ca_raw === null || typeof ca_raw !== "object" || Array.isArray(ca_raw)) {
+      return false;
+    }
+    return ca_raw["auto_trigger_multiplier"] !== void 0;
+  };
+  try {
+    if (setsMultiplier(fs3.readFileSync(configPath(), "utf8"))) return true;
+  } catch {
+  }
+  try {
+    return setsMultiplier(fs3.readFileSync(projectConfigPath(resolveConfigProjectRoot()), "utf8"));
+  } catch {
+    return false;
+  }
+}
 function loadConfig(projectRoot) {
   const p = configPath();
   const root = projectRoot ?? resolveConfigProjectRoot();
@@ -2143,10 +2162,8 @@ function _buildConfig(raw, projectRaw = {}) {
   st.record_zero_savings = validatedBool(st_raw["record_zero_savings"], st.record_zero_savings);
   const hi_raw = section(raw, "hints");
   const hi = getDefaultConfig("hints");
-  hi.suppress_after_ignored = validatedInt(hi_raw["suppress_after_ignored"], hi.suppress_after_ignored, ...boundsOf("hints.suppress_after_ignored"));
   hi.quiet_hours = validatedStr(hi_raw["quiet_hours"], hi.quiet_hours);
   hi.json_sidecar = validatedBool(hi_raw["json_sidecar"], hi.json_sidecar);
-  hi.verbose_until_seen_count = validatedInt(hi_raw["verbose_until_seen_count"], hi.verbose_until_seen_count, ...boundsOf("hints.verbose_until_seen_count"));
   hi.min_file_lines_for_hint = validatedInt(hi_raw["min_file_lines_for_hint"], hi.min_file_lines_for_hint, ...boundsOf("hints.min_file_lines_for_hint"));
   hi.bash_dedup_min_bytes = validatedInt(hi_raw["bash_dedup_min_bytes"], hi.bash_dedup_min_bytes, ...boundsOf("hints.bash_dedup_min_bytes"));
   hi.bash_dedup_min_bytes = envInt("TOKEN_GOAT_BASH_DEDUP_MIN_BYTES", hi.bash_dedup_min_bytes, ...boundsOf("hints.bash_dedup_min_bytes"));
@@ -2262,6 +2279,49 @@ function _buildConfig(raw, projectRaw = {}) {
     hint_stats: hs
   };
 }
+var CONFIG_KEY_ENV_OVERRIDES = {
+  "compact_assist.enabled": ["TOKEN_GOAT_COMPACT_ASSIST", "TOKENWISE_COMPACT_ASSIST"],
+  "bash_compress.enabled": ["TOKEN_GOAT_BASH_COMPRESS"],
+  "bash_compress.cache_min_bytes": ["TOKEN_GOAT_BASH_CACHE_MIN_BYTES"],
+  "bash_compress.cache_max_file_count": ["TOKEN_GOAT_BASH_CACHE_MAX_FILES"],
+  "bash_compress.cache_max_bytes": ["TOKEN_GOAT_BASH_CACHE_MAX_BYTES"],
+  "bash_compress.cache_max_bytes_per_output": ["TOKEN_GOAT_BASH_CACHE_MAX_BYTES_PER_OUTPUT"],
+  "session_brief.enabled": ["TOKEN_GOAT_SESSION_BRIEF"],
+  "skill_preservation.enabled": ["TOKEN_GOAT_SKILL_PRESERVATION"],
+  "skill_preservation.compress_bodies": ["TOKEN_GOAT_SKILL_COMPRESS"],
+  "skill_preservation.pre_skill_enabled": ["TOKEN_GOAT_PRE_SKILL"],
+  "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"],
+  "repomap.compact_file_threshold": ["TOKEN_GOAT_REPOMAP_COMPACT_THRESHOLD"],
+  "repomap.exclude_tests": ["TOKEN_GOAT_REPOMAP_EXCLUDE_TESTS"],
+  "overflow_guard.enabled": ["TOKEN_GOAT_OVERFLOW_GUARD"],
+  "overflow_guard.max_tokens": ["TOKEN_GOAT_OVERFLOW_MAX_TOKENS"],
+  "hints.json_sidecar": ["TOKEN_GOAT_HINT_JSON_SIDECAR"],
+  "hints.bash_dedup_min_bytes": ["TOKEN_GOAT_BASH_DEDUP_MIN_BYTES"],
+  "hints.web_dedup_min_bytes": ["TOKEN_GOAT_WEB_DEDUP_MIN_BYTES"],
+  "hints.grep_dedup_min_matches": ["TOKEN_GOAT_GREP_DEDUP_MIN_MATCHES"],
+  "hints.glob_dedup_min_matches": ["TOKEN_GOAT_GLOB_DEDUP_MIN_MATCHES"],
+  "hints.write_rewrite_min_lines": ["TOKEN_GOAT_WRITE_REWRITE_MIN_LINES"],
+  "hints.write_rewrite_unchanged_pct": ["TOKEN_GOAT_WRITE_REWRITE_UNCHANGED_PCT"],
+  "hints.large_read_redirect_bytes": ["TOKEN_GOAT_LARGE_READ_BYTES"],
+  "hints.warn_unbalanced_shell_quoting": ["TOKEN_GOAT_WARN_UNBALANCED_SHELL_QUOTING"],
+  "hints.serve_diff_on_reread": ["TOKEN_GOAT_SERVE_DIFF_ON_REREAD"],
+  "hints.log_large_file_hint_outcomes": ["TOKEN_GOAT_LOG_LARGE_FILE_HINT_OUTCOMES"],
+  "hints.cross_session_read_dedup": ["TOKEN_GOAT_CROSS_SESSION_READ_DEDUP"],
+  "hints.cross_session_read_dedup_ttl_secs": ["TOKEN_GOAT_CROSS_SESSION_READ_DEDUP_TTL_SECS"],
+  "hints.mcp_dedup_ttl_secs": ["TOKEN_GOAT_MCP_DEDUP_TTL_SECS"],
+  "hints.min_session_hint_savings_bytes": ["TOKEN_GOAT_SESSION_HINT_MIN_BYTES"],
+  "hooks.watchdog_ms": ["TOKEN_GOAT_HOOK_WATCHDOG_MS"],
+  "webfetch.max_file_count": ["TOKEN_GOAT_WEB_CACHE_MAX_FILES"],
+  "webfetch.max_bytes": ["TOKEN_GOAT_WEB_CACHE_MAX_BYTES"],
+  "webfetch.compress_bodies": ["TOKEN_GOAT_WEB_COMPRESS"],
+  "worker.max_pool_workers": ["TOKEN_GOAT_WORKER_MAX_POOL"],
+  "compression.profile": ["TOKEN_GOAT_COMPRESS_PROFILE"],
+  "context.model_window_tokens": ["TOKEN_GOAT_MODEL_WINDOW_TOKENS"],
+  "injection.enabled": ["TOKEN_GOAT_INJECTION_ENABLED"],
+  "indexing.embeddings_enabled": ["TOKEN_GOAT_EMBEDDINGS_ENABLED"]
+};
 
 // src/secret_redact.ts
 var SECRET_PATTERNS = [
@@ -2269,8 +2329,17 @@ var SECRET_PATTERNS = [
   // ("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],
-  ["openai_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.
+  ["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.
+  ["github_token", /github_pat_[A-Za-z0-9_]{22,}/g],
   ["github_token", /gh[oprsu]_[A-Za-z0-9]{36,}/g],
   ["slack_token", /xox[baprs]-[A-Za-z0-9-]+/g],
   // Matches the full block (BEGIN marker through its matching END marker), not just the
@@ -2425,6 +2494,23 @@ CREATE TABLE IF NOT EXISTS hint_manual_marks (
   effective_count INTEGER NOT NULL DEFAULT 0,
   ineffective_count INTEGER NOT NULL DEFAULT 0
 );
+
+-- Durable counter backing hint_stats.ts's backoff-threshold probe-recovery schedule: how many
+-- CONSECUTIVE suppressed occasions have elapsed for (category, harness) since a hint in this
+-- category was last actually shown (either organically, because shouldSuppress no longer holds,
+-- or via a prior probe). shouldSuppress itself stays a pure function of hint_emissions -- this
+-- table exists only because a suppressed occasion is deliberately never written to
+-- hint_emissions (see that table's own comment), so without a separate durable counter here
+-- there would be no way to know "how many suppressed occasions have we seen" across the
+-- short-lived hook CLI processes that call applyHintTracking. Keyed by (category, harness), not
+-- category alone, to match shouldSuppress/categoryStats' own per-harness scoping -- unlike
+-- hint_manual_marks (a human-entered vote, deliberately not harness-split).
+CREATE TABLE IF NOT EXISTS hint_suppression_probes (
+  category TEXT NOT NULL,
+  harness TEXT NOT NULL,
+  streak INTEGER NOT NULL DEFAULT 0,
+  PRIMARY KEY (category, harness)
+);
 `;
 var FTS_SQL = `
 CREATE VIRTUAL TABLE IF NOT EXISTS symbols_fts USING fts5(
@@ -2475,7 +2561,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 = 5;
+var SCHEMA_VERSION = 6;
 function alterTableIdempotent(conn, sql) {
   try {
     conn.exec(sql);
@@ -3521,6 +3607,42 @@ function denyOutput(message) {
 function contextOutput(context) {
   return { hookType: "context", context };
 }
+function countNonEmptyLines(text) {
+  return text.split(/\r\n|\r|\n/).filter((line) => line.length > 0).length;
+}
+function makeDedupHintHandlers(opts) {
+  const post = (event) => {
+    try {
+      if (getToolName(event) !== opts.toolName) return passOutput();
+      const signature = opts.buildSignature(getToolInput(event));
+      if (signature === null) return passOutput();
+      const text = extractToolResponseField(event.raw, OUTPUT_FIRST_TOOL_RESPONSE_KEYS);
+      opts.recordQuery(signature, countNonEmptyLines(text));
+      return passOutput();
+    } catch {
+      return passOutput();
+    }
+  };
+  const pre = (event) => {
+    try {
+      if (getToolName(event) !== opts.toolName) return passOutput();
+      const toolInput = getToolInput(event);
+      const signature = opts.buildSignature(toolInput);
+      if (signature === null) return passOutput();
+      const priorCount = opts.getMatchCount(signature);
+      if (priorCount === null) return passOutput();
+      if (priorCount < loadConfig().hints[opts.minMatchesConfigKey]) return passOutput();
+      recordStat(opts.statName, 0, 0);
+      const pattern = typeof toolInput["pattern"] === "string" ? toolInput["pattern"] : "";
+      return contextOutput(
+        "Note: an identical " + opts.toolName + ' for "' + pattern + '" already ran this session and returned ' + priorCount + (priorCount === 1 ? " match" : " matches") + ". If that result already answers this, you can skip re-running it."
+      );
+    } catch {
+      return passOutput();
+    }
+  };
+  return { post, pre };
+}
 
 // src/hint_stats.ts
 var HINT_CATEGORIES = [
@@ -3555,6 +3677,10 @@ function extractPathCorrelator(text) {
   return cleaned;
 }
 function classifyBashHint(text) {
+  const fileMatch = /token-goat bash-output --file "([^"]+)"/.exec(text);
+  if (fileMatch?.[1] !== void 0) {
+    return { category: "bash_recall", correlator: fileMatch[1] };
+  }
   const idMatch = /token-goat bash-output ([A-Za-z0-9_.-]+)/.exec(text);
   if (idMatch?.[1] !== void 0) {
     return { category: "bash_recall", correlator: idMatch[1] };
@@ -3568,13 +3694,49 @@ function classifyReadHint(text) {
 function classifyEditHint(text) {
   return { category: "edit_reread_suggest", correlator: extractPathCorrelator(text) };
 }
+function isProbeOccasion(occasion, thresholds) {
+  const sorted = [...new Set(thresholds.filter((t) => t > 0))].sort((a, b) => a - b);
+  if (sorted.length === 0) return false;
+  if (sorted.includes(occasion)) return true;
+  const last = sorted[sorted.length - 1];
+  return occasion > last && occasion % last === 0;
+}
+function bumpSuppressionStreak(category) {
+  try {
+    const db = getDb(globalDbPath());
+    const harness = getHarnessName();
+    db.prepare(
+      `INSERT INTO hint_suppression_probes (category, harness, streak) VALUES (@category, @harness, 1)
+       ON CONFLICT(category, harness) DO UPDATE SET streak = streak + 1`
+    ).run({ category, harness });
+    const row = db.prepare(`SELECT streak FROM hint_suppression_probes WHERE category = ? AND harness = ?`).get(category, harness);
+    return row?.streak ?? 0;
+  } catch {
+    return 0;
+  }
+}
+function resetSuppressionStreak(category) {
+  try {
+    const db = getDb(globalDbPath());
+    db.prepare(`UPDATE hint_suppression_probes SET streak = 0 WHERE category = ? AND harness = ?`).run(category, getHarnessName());
+  } catch {
+  }
+}
 function applyHintTracking(event, output, classify) {
   if (output.hookType !== "context") return output;
   const { category, correlator } = classify(output.context);
+  const compensateSelfResolve = event.eventName === "pre_tool_use";
   if (shouldSuppress(category, event.sessionId)) {
-    return passOutput();
+    const occasion = bumpSuppressionStreak(category);
+    const thresholds = loadConfig().hints.backoff_thresholds;
+    if (!isProbeOccasion(occasion, thresholds)) {
+      return passOutput();
+    }
+    logHintEmission(category, event.sessionId, correlator, compensateSelfResolve);
+    return output;
   }
-  logHintEmission(category, event.sessionId, correlator, event.eventName === "pre_tool_use");
+  resetSuppressionStreak(category);
+  logHintEmission(category, event.sessionId, correlator, compensateSelfResolve);
   return output;
 }
 function logHintEmission(category, sessionId, correlator, compensateSelfResolve = false) {
@@ -3598,12 +3760,21 @@ function logHintEmission(category, sessionId, correlator, compensateSelfResolve
   }
 }
 var TOKEN_GOAT_INVOCATION_RE = /(?:^|[\s;&|])token-goat(?=[\s]|$)/;
+function commandMentionsCorrelator(command, correlator) {
+  let idx = command.indexOf(correlator);
+  while (idx !== -1) {
+    const after = command[idx + correlator.length];
+    if (after === void 0 || !/[A-Za-z0-9_.-]/.test(after)) return true;
+    idx = command.indexOf(correlator, idx + 1);
+  }
+  return false;
+}
 function isActedOn(category, correlator, command) {
   if (!TOKEN_GOAT_INVOCATION_RE.test(command)) return false;
   if (category === "bash_recall") {
-    return command.includes("bash-output") && command.includes(correlator);
+    return command.includes("bash-output") && commandMentionsCorrelator(command, correlator);
   }
-  return command.includes(correlator);
+  return commandMentionsCorrelator(command, correlator);
 }
 function resolvePendingHintsForEvent(event) {
   try {
@@ -3660,6 +3831,18 @@ function meetsSavingsFloor(bytesSaved) {
 // src/compact.ts
 import * as fs8 from "node:fs";
 import * as path9 from "node:path";
+
+// src/bash_compress.ts
+var ANSI_ESCAPE_RE = (
+  // eslint-disable-next-line no-control-regex -- intentionally matches ESC (\x1B) and BEL (\x07) control bytes
+  /\x1B\[[0-?]*[ -/]*[@-~]|\x1B\].*?(?:\x07|\x1B\\|$)|\x1B[PX^_].*?\x1B\\|\x1B[@-_]/gs
+);
+function stripAnsiCodes(text) {
+  if (!text.includes("\x1B")) return text;
+  return text.replace(ANSI_ESCAPE_RE, "");
+}
+
+// src/compact.ts
 var CONTEXT_AUTOCOMPACT_TOKENS = 66e4;
 var CATALOG_TOKENS = 10800;
 var CONTEXT_TIER_WARM = 0.5;
@@ -3676,7 +3859,8 @@ var HARNESS_MULTIPLIER_DEFAULTS = {
   generic: 1
 };
 function estimateTokens(text) {
-  return Math.max(1, Math.floor(text.length / 3) + 1);
+  const stripped = stripAnsiCodes(text);
+  return Math.max(1, Math.floor(stripped.length / 3) + 1);
 }
 function tierForFraction(fill) {
   if (fill >= CONTEXT_TIER_CRITICAL) return "critical";
@@ -3704,19 +3888,6 @@ function getEffectiveAutoTriggerWindow() {
   );
   return CONTEXT_AUTOCOMPACT_TOKENS * multiplier;
 }
-function isAutoTriggerMultiplierExplicit() {
-  try {
-    const text = fs8.readFileSync(configPath(), "utf8");
-    const raw = parse(text);
-    const ca_raw = raw["compact_assist"];
-    if (ca_raw === null || typeof ca_raw !== "object" || Array.isArray(ca_raw)) {
-      return false;
-    }
-    return ca_raw["auto_trigger_multiplier"] !== void 0;
-  } catch {
-    return false;
-  }
-}
 function getContextPressure(cache) {
   try {
     if (!cache) {
@@ -3984,11 +4155,11 @@ function buildPackageManifestHint(options) {
     return null;
   }
 }
-function _sanitizeHintPath(path23) {
-  if (typeof path23 !== "string") {
+function _sanitizeHintPath(path24) {
+  if (typeof path24 !== "string") {
     return "???";
   }
-  return path23.replace(/[\x00]/g, "").slice(0, 200);
+  return path24.replace(/[\x00]/g, "").slice(0, 200);
 }
 
 // src/hints/lang_patterns.ts
@@ -6435,11 +6606,9 @@ async function findCrossSessionEntry(skillName, contentSha) {
       }
       const dir = skillOutputsDir();
       const bodyPath = resolve5(dir, `${meta.outputId}.txt`);
-      const gzPath = resolve5(dir, `${meta.outputId}.gz`);
       try {
         const bodyExists = await fs10.access(bodyPath).then(() => true).catch(() => false);
-        const gzExists = await fs10.access(gzPath).then(() => true).catch(() => false);
-        if (bodyExists || gzExists) {
+        if (bodyExists) {
           return meta;
         }
       } catch {
@@ -6684,7 +6853,7 @@ function pruneSkillOutputs(maxCount = DEFAULT_MAX_COUNT, maxAgeMs = DEFAULT_MAX_
       entries.push({ outputId, ts });
     }
     const removeEntry = (outputId) => {
-      for (const ext of [".meta", ".txt", ".gz"]) {
+      for (const ext of [".meta", ".txt"]) {
         try {
           unlinkSync5(resolve5(dir, `${outputId}${ext}`));
         } catch {
@@ -6716,6 +6885,22 @@ function pruneSkillOutputs(maxCount = DEFAULT_MAX_COUNT, maxAgeMs = DEFAULT_MAX_
 import * as fs11 from "node:fs";
 import * as path12 from "node:path";
 
+// src/lazy_module.ts
+function createLazyModuleLoader(load2, errorLabel) {
+  let cache;
+  return async () => {
+    if (cache !== void 0) return cache;
+    try {
+      cache = await load2();
+    } catch (err) {
+      process.stderr.write(`token-goat: ${errorLabel}: ${String(err)}
+`);
+      cache = null;
+    }
+    return cache;
+  };
+}
+
 // src/image_ocr.ts
 import { spawn as spawn2 } from "node:child_process";
 import { createRequire as createRequire3 } from "node:module";
@@ -6838,19 +7023,10 @@ function formatShrinkSummary(result, subject) {
   const dataUrl = `data:image/${result.format};base64,${result.data.toString("base64")}`;
   return { summary, dataUrl };
 }
-var _sharpCache;
-async function loadSharp() {
-  if (_sharpCache !== void 0) return _sharpCache;
-  try {
-    const mod = await import("sharp");
-    _sharpCache = mod.default;
-  } catch (err) {
-    process.stderr.write(`token-goat: image shrink disabled (sharp unavailable): ${String(err)}
-`);
-    _sharpCache = null;
-  }
-  return _sharpCache;
-}
+var loadSharp = createLazyModuleLoader(async () => {
+  const mod = await import("sharp");
+  return mod.default;
+}, "image shrink disabled (sharp unavailable)");
 function isImagePath(p) {
   return IMAGE_EXTENSIONS.has(path12.extname(p).toLowerCase());
 }
@@ -6897,14 +7073,36 @@ async function preReadImageHandler(event) {
   if (filePath === void 0) return passOutput();
   if (!isImagePath(filePath)) return passOutput();
   const size = statSize(filePath);
-  if (size === null || size < DEFAULT_SIZE_THRESHOLD_BYTES) return passOutput();
-  let input;
-  try {
-    input = fs11.readFileSync(filePath);
-  } catch {
-    return passOutput();
+  if (size === null) return passOutput();
+  let input = null;
+  let qualifies = size >= DEFAULT_SIZE_THRESHOLD_BYTES;
+  if (!qualifies) {
+    try {
+      input = fs11.readFileSync(filePath);
+    } catch {
+      return passOutput();
+    }
+    const sharp = await loadSharp();
+    if (sharp === null) return passOutput();
+    try {
+      const cfg = loadConfig().image_shrink;
+      const limitInputPixels = cfg.max_image_pixels > 0 ? cfg.max_image_pixels : false;
+      const meta = await sharp(input, { limitInputPixels }).metadata();
+      const longestEdge = Math.max(meta.width ?? 0, meta.height ?? 0);
+      qualifies = longestEdge > DEFAULT_MAX_DIMENSION;
+    } catch {
+      return passOutput();
+    }
   }
-  const result = await shrinkImage(input);
+  if (!qualifies) return passOutput();
+  if (input === null) {
+    try {
+      input = fs11.readFileSync(filePath);
+    } catch {
+      return passOutput();
+    }
+  }
+  const result = await shrinkImage(input, { sizeThresholdBytes: 0 });
   if (result === null) return passOutput();
   const basename9 = path12.basename(filePath);
   if (loadConfig().image_shrink.ocr_enabled) {
@@ -7160,7 +7358,11 @@ var EXTENSION_LANGUAGE = /* @__PURE__ */ new Map([
   [".tokens", "salesforce_markup"],
   [".page", "salesforce_markup"],
   [".component", "salesforce_markup"],
-  [".email", "salesforce_markup"]
+  [".email", "salesforce_markup"],
+  [".vue", "vue"],
+  [".svelte", "svelte"],
+  [".astro", "astro"],
+  [".ipynb", "ipynb"]
 ]);
 var FILENAME_LANGUAGE = /* @__PURE__ */ new Map([
   ["dockerfile", "dockerfile"],
@@ -7878,12 +8080,6 @@ function postReadHandler(event) {
 registerHook("post_tool_use", postReadHandler, { toolName: "Read" });
 
 // src/hooks_grep.ts
-function extractToolResponse(raw) {
-  return extractToolResponseField(raw, OUTPUT_FIRST_TOOL_RESPONSE_KEYS);
-}
-function countNonEmptyLines(text) {
-  return text.split(/\r\n|\r|\n/).filter((line) => line.length > 0).length;
-}
 function grepIntInput(toolInput, key) {
   const value = toolInput[key];
   if (typeof value === "number" && Number.isFinite(value)) return value;
@@ -7896,7 +8092,7 @@ function grepIntInput(toolInput, key) {
 function grepSignature(toolInput) {
   const pattern = toolInput["pattern"];
   if (typeof pattern !== "string" || pattern === "") return null;
-  const path23 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
+  const path24 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
   const outputMode = typeof toolInput["output_mode"] === "string" ? toolInput["output_mode"] : "files_with_matches";
   const glob = typeof toolInput["glob"] === "string" ? toolInput["glob"] : "";
   const type = typeof toolInput["type"] === "string" ? toolInput["type"] : "";
@@ -7911,7 +8107,7 @@ function grepSignature(toolInput) {
   const offset = grepIntInput(toolInput, "offset");
   return JSON.stringify([
     pattern,
-    path23,
+    path24,
     outputMode,
     glob,
     type,
@@ -7926,95 +8122,47 @@ function grepSignature(toolInput) {
     offset
   ]);
 }
-function postGrepHandler(event) {
-  try {
-    if (getToolName(event) !== "Grep") return passOutput();
-    const signature = grepSignature(getToolInput(event));
-    if (signature === null) return passOutput();
-    recordGrepQuery(signature, countNonEmptyLines(extractToolResponse(event.raw)));
-    return passOutput();
-  } catch {
-    return passOutput();
-  }
-}
-function preGrepDedupHandler(event) {
-  try {
-    if (getToolName(event) !== "Grep") return passOutput();
-    const toolInput = getToolInput(event);
-    const signature = grepSignature(toolInput);
-    if (signature === null) return passOutput();
-    const priorCount = getGrepMatchCount(signature);
-    if (priorCount === null) return passOutput();
-    if (priorCount < loadConfig().hints.grep_dedup_min_matches) return passOutput();
-    recordStat("grep_dedup_hint", 0, 0);
-    const pattern = typeof toolInput["pattern"] === "string" ? toolInput["pattern"] : "";
-    return contextOutput(
-      'Note: an identical Grep for "' + pattern + '" already ran this session and returned ' + priorCount + (priorCount === 1 ? " match" : " matches") + ". If that result already answers this, you can skip re-running it."
-    );
-  } catch {
-    return passOutput();
-  }
-}
+var { post: postGrepHandler, pre: preGrepDedupHandler } = makeDedupHintHandlers({
+  toolName: "Grep",
+  buildSignature: grepSignature,
+  recordQuery: recordGrepQuery,
+  getMatchCount: getGrepMatchCount,
+  minMatchesConfigKey: "grep_dedup_min_matches",
+  statName: "grep_dedup_hint"
+});
 registerHook("pre_tool_use", preGrepDedupHandler, { toolName: "Grep" });
 registerHook("post_tool_use", postGrepHandler, { toolName: "Grep" });
 
 // src/hooks_glob.ts
-function extractToolResponse2(raw) {
-  return extractToolResponseField(raw, OUTPUT_FIRST_TOOL_RESPONSE_KEYS);
-}
-function countNonEmptyLines2(text) {
-  return text.split(/\r\n|\r|\n/).filter((line) => line.length > 0).length;
-}
 function globSignature(toolInput) {
   const pattern = toolInput["pattern"];
   if (typeof pattern !== "string" || pattern === "") return null;
-  const path23 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
-  return JSON.stringify([pattern, path23]);
-}
-function postGlobHandler(event) {
-  try {
-    if (getToolName(event) !== "Glob") return passOutput();
-    const signature = globSignature(getToolInput(event));
-    if (signature === null) return passOutput();
-    recordGlobQuery(signature, countNonEmptyLines2(extractToolResponse2(event.raw)));
-    return passOutput();
-  } catch {
-    return passOutput();
-  }
-}
-function preGlobDedupHandler(event) {
-  try {
-    if (getToolName(event) !== "Glob") return passOutput();
-    const toolInput = getToolInput(event);
-    const signature = globSignature(toolInput);
-    if (signature === null) return passOutput();
-    const priorCount = getGlobMatchCount(signature);
-    if (priorCount === null) return passOutput();
-    if (priorCount < loadConfig().hints.glob_dedup_min_matches) return passOutput();
-    recordStat("glob_dedup_hint", 0, 0);
-    const pattern = typeof toolInput["pattern"] === "string" ? toolInput["pattern"] : "";
-    return contextOutput(
-      'Note: an identical Glob for "' + pattern + '" already ran this session and returned ' + priorCount + (priorCount === 1 ? " match" : " matches") + ". If that result already answers this, you can skip re-running it."
-    );
-  } catch {
-    return passOutput();
-  }
-}
+  const path24 = typeof toolInput["path"] === "string" ? toolInput["path"] : "";
+  return JSON.stringify([pattern, path24]);
+}
+var { post: postGlobHandler, pre: preGlobDedupHandler } = makeDedupHintHandlers({
+  toolName: "Glob",
+  buildSignature: globSignature,
+  recordQuery: recordGlobQuery,
+  getMatchCount: getGlobMatchCount,
+  minMatchesConfigKey: "glob_dedup_min_matches",
+  statName: "glob_dedup_hint"
+});
 registerHook("pre_tool_use", preGlobDedupHandler, { toolName: "Glob" });
 registerHook("post_tool_use", postGlobHandler, { toolName: "Glob" });
 
 // src/hooks_edit.ts
-import * as path20 from "node:path";
+import * as path21 from "node:path";
 import { statSync as statSync11 } from "node:fs";
 
 // src/hooks_index.ts
 import * as fs17 from "node:fs";
-import * as path19 from "node:path";
+import * as path20 from "node:path";
 
 // src/worker.ts
 import { spawn as spawn3 } from "node:child_process";
 import * as fs16 from "node:fs";
-import * as path18 from "node:path";
+import * as path19 from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/parser.ts
@@ -8052,6 +8200,44 @@ registerReset(() => {
   PIPELINE_RETRY_DELAY_MS = DEFAULT_PIPELINE_RETRY_DELAY_MS;
 });
 
+// src/doc_embed_extract.ts
+import * as path17 from "node:path";
+
+// src/pdf_extract.ts
+var loadPdfjs = createLazyModuleLoader(async () => {
+  const mod = await import("pdfjs-dist/legacy/build/pdf.mjs");
+  if (typeof import.meta.resolve === "function") {
+    try {
+      mod.GlobalWorkerOptions.workerSrc = await import.meta.resolve("pdfjs-dist/legacy/build/pdf.worker.mjs");
+    } catch {
+    }
+  }
+  return mod;
+}, "pdf-extract disabled (pdfjs-dist unavailable)");
+
+// src/ooxml_extract.ts
+var loadFflate = createLazyModuleLoader(
+  async () => await import("fflate"),
+  "office-file reading disabled (fflate unavailable)"
+);
+var loadXmlParser = createLazyModuleLoader(
+  async () => await import("fast-xml-parser"),
+  "office-file reading disabled (fast-xml-parser unavailable)"
+);
+var MAX_OOXML_INPUT_BYTES = 50 * 1024 * 1024;
+
+// src/xlsx_extract.ts
+var loadExcelJs = createLazyModuleLoader(async () => {
+  const mod = await import("exceljs");
+  return mod.default ?? mod;
+}, "xlsx reading disabled (exceljs package unavailable)");
+
+// src/doc_embed_extract.ts
+var EMBEDDABLE_DOCUMENT_EXTENSIONS = /* @__PURE__ */ new Set([".pdf", ".docx", ".pptx", ".xlsx"]);
+function isEmbeddableDocument(filePath) {
+  return EMBEDDABLE_DOCUMENT_EXTENSIONS.has(path17.extname(filePath).toLowerCase());
+}
+
 // src/languages/csharp.ts
 var DELEGATE_RE = new RegExp(
   "^\\s*(?:public|protected|private|internal)?\\s*delegate\\s+(?:[A-Za-z_][A-Za-z0-9_<>?,\\[\\]\\s]*?)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*[<(]"
@@ -8084,20 +8270,21 @@ var PROP_RE = new RegExp(
 );
 
 // src/languages/kotlin.ts
+var RECEIVER_RE = "(?:[A-Za-z_][A-Za-z0-9_<>?.,\\s]*\\.)?";
 var FUN_RE = new RegExp(
-  "^\\s*(?:(?:public|internal|protected|private|open|override|abstract|suspend|inline|infix|operator|external|actual|expect|final|sealed|tailrec)\\s+)*fun\\s+(?:<[^>]*>\\s*)?([A-Za-z_][A-Za-z0-9_]*)\\s*[(<]"
+  "^\\s*(?:(?:public|internal|protected|private|open|override|abstract|suspend|inline|infix|operator|external|actual|expect|final|sealed|tailrec)\\s+)*fun\\s+(?:<[^>]*>\\s*)?" + RECEIVER_RE + "([A-Za-z_][A-Za-z0-9_]*)\\s*[(<]"
 );
 var CONST_RE = new RegExp(
   "^\\s*(?:(?:public|internal|protected|private|open|override|abstract|final|actual|expect|const|lateinit|companion)\\s+)*(?:const\\s+)?val\\s+([A-Z_][A-Z0-9_]*)\\s*(?::|=)"
 );
 var CLASS_HEADER_RE2 = new RegExp(
-  "^(?:(?:public|internal|protected|private|open|abstract|sealed|data|inner|expect|actual|value|annotation|fun)\\s+)*(?:class|interface|object|enum\\s+class)\\s+([A-Za-z_][A-Za-z0-9_]*)"
+  "^(?:(?:public|internal|protected|private|open|abstract|sealed|data|inner|expect|actual|value|annotation|fun)\\s+)*(class|interface|object|enum\\s+class)\\s+([A-Za-z_][A-Za-z0-9_]*)"
 );
 var COMPANION_RE = new RegExp(
   "^(?:(?:public|internal|protected|private)\\s+)*companion\\s+object(?:\\s+([A-Za-z_][A-Za-z0-9_]*))?\\b"
 );
 var TOP_FUN_RE = new RegExp(
-  "^(?:(?:public|internal|private|suspend|inline|infix|operator|external|actual|expect|tailrec)\\s+)*fun\\s+(?:<[^>]*>\\s*)?([A-Za-z_][A-Za-z0-9_]*)\\s*[(<]"
+  "^(?:(?:public|internal|private|suspend|inline|infix|operator|external|actual|expect|tailrec)\\s+)*fun\\s+(?:<[^>]*>\\s*)?" + RECEIVER_RE + "([A-Za-z_][A-Za-z0-9_]*)\\s*[(<]"
 );
 
 // src/languages/sql_idx.ts
@@ -8141,6 +8328,7 @@ var METHOD_RE3 = new RegExp(
   "gm"
 );
 var PURE_ANNOTATION_LINE_RE = new RegExp(`^(?:@${IDENT}(?:\\([^)]*\\))?[ \\t]*)+$`);
+var ANNOTATION_OPENER_RE = new RegExp(`^@${IDENT}\\(`);
 
 // src/parser.ts
 var _require4 = createRequire5(import.meta.url);
@@ -8305,14 +8493,14 @@ var JS_NOISE = REF_NOISE_BY_LANG.get("typescript") ?? /* @__PURE__ */ new Set();
 
 // src/index_prune.ts
 import * as fs15 from "node:fs";
-import * as path17 from "node:path";
+import * as path18 from "node:path";
 function isTooShallowToPrune(rootPrefix) {
   const segments = rootPrefix.split("/").filter((s) => s.length > 0 && !/^[a-z]:$/i.test(s));
   if (segments.length === 2 && segments[0]?.toLowerCase() === "mnt" && /^[a-z]$/i.test(segments[1] ?? "")) return true;
   return segments.length === 0;
 }
 function recordKnownRoot(filePath, dbPath = globalDbPath()) {
-  const project = findProject(path17.dirname(filePath));
+  const project = findProject(path18.dirname(filePath));
   if (project === null || isTooShallowToPrune(project.root)) return;
   const db = getDb(dbPath);
   db.prepare(
@@ -8323,7 +8511,7 @@ function recordKnownRoot(filePath, dbPath = globalDbPath()) {
 var KNOWN_ROOT_MISSING_GRACE_MS = 7 * 24 * 60 * 60 * 1e3;
 var KNOWN_ROOT_RECORD_MIN_INTERVAL_MS = 60 * 60 * 1e3;
 function knownRootRecordMarkerPath(dir) {
-  return path17.join(dir, "known-root-record.marker");
+  return path18.join(dir, "known-root-record.marker");
 }
 function recordKnownRootThrottled(filePath, dir = dataDir(), dbPath = globalDbPath()) {
   const markerPath = knownRootRecordMarkerPath(dir);
@@ -8358,10 +8546,10 @@ function parseDirtyQueueLines(raw) {
   return out;
 }
 function workerPidPath(dir = dataDir()) {
-  return path18.join(dir, "worker.pid");
+  return path19.join(dir, "worker.pid");
 }
 function workerErrorLogPath(dir) {
-  return path18.join(dir, "worker-errors.log");
+  return path19.join(dir, "worker-errors.log");
 }
 var WORKER_ERROR_LOG_MAX_BYTES = 5 * 1024 * 1024;
 var CORRUPT_QUARANTINE_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1e3;
@@ -8401,7 +8589,7 @@ function isWorkerRunning(dir = dataDir()) {
   return pidAlive(pid);
 }
 function workerHealthCheckMarkerPath(dir) {
-  return path18.join(dir, "worker-healthcheck.marker");
+  return path19.join(dir, "worker-healthcheck.marker");
 }
 var WORKER_HEALTHCHECK_MIN_INTERVAL_MS = 5 * 60 * 1e3;
 function ensureWorkerAlive(dir = dataDir()) {
@@ -8504,11 +8692,11 @@ var KNOWN_ROOTS_SWEEP_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 
 // src/hooks_index.ts
 function dirtyQueuePath() {
-  return path19.join(dataDir(), "queue", "dirty.txt");
+  return path20.join(dataDir(), "queue", "dirty.txt");
 }
 function appendDirtyPath(normalizedPath) {
   const queuePath = dirtyQueuePath();
-  const dir = path19.dirname(queuePath);
+  const dir = path20.dirname(queuePath);
   try {
     fs17.mkdirSync(dir, { recursive: true });
   } catch (e) {
@@ -8523,6 +8711,12 @@ function appendDirtyPath(normalizedPath) {
   fs17.appendFileSync(queuePath, `${leadingNewline}${normalizedPath}
 `);
 }
+function enqueueDirtyPathSafe(filePath, opts) {
+  try {
+    appendDirtyPath(opts?.alreadyResolved === true ? filePath : resolveIndexPath(filePath));
+  } catch {
+  }
+}
 function getDirtyPaths() {
   const queuePath = dirtyQueuePath();
   let raw;
@@ -8536,9 +8730,9 @@ function getDirtyPaths() {
 function preCompactIndexHandler(_event) {
   const paths = getDirtyPaths();
   if (paths.length > 0) {
-    const sidecar = path19.join(dataDir(), "queue", "pending.txt");
+    const sidecar = path20.join(dataDir(), "queue", "pending.txt");
     try {
-      fs17.mkdirSync(path19.dirname(sidecar), { recursive: true });
+      fs17.mkdirSync(path20.dirname(sidecar), { recursive: true });
       atomicWriteBytes(sidecar, Buffer.from(`${paths.join("\n")}
 `, "utf8"));
     } catch {
@@ -8575,7 +8769,7 @@ function postEditHandlerInner(event) {
   if (loadConfig().hints.stable_doc_compacts) {
     markCompactStale(compactPathFor(normalized));
   }
-  const editedBasename = path20.basename(normalized);
+  const editedBasename = path21.basename(normalized);
   if (/\.(md|mdx|markdown|rst)$/i.test(editedBasename)) {
     let editedSize = Infinity;
     try {
@@ -8602,6 +8796,7 @@ registerHook("post_tool_use", postEditHandler, { toolName: "NotebookEdit" });
 // src/hooks_write.ts
 import { readFileSync as readFileSync13, statSync as statSync12 } from "node:fs";
 var MAX_LINES_FOR_DIFF = 4e3;
+var MAX_OLD_FILE_BYTES_FOR_DIFF = 4 * 1024 * 1024;
 function splitLines(text) {
   return text.split(/\r\n|\r|\n/);
 }
@@ -8634,6 +8829,7 @@ function preWriteRewriteHandler(event) {
       return passOutput();
     }
     if (!stat2.isFile()) return passOutput();
+    if (stat2.size > MAX_OLD_FILE_BYTES_FOR_DIFF) return passOutput();
     let oldContent;
     try {
       oldContent = readFileSync13(filePath, "utf-8");
@@ -8751,11 +8947,11 @@ function gitStateFingerprintSync(cwd) {
   }
 }
 var DIR_FINGERPRINT_LISTING_CAP_ENTRIES = 1e4;
-function dirStateFingerprintSync(path23) {
+function dirStateFingerprintSync(path24) {
   try {
-    const stat2 = statSync13(path23);
+    const stat2 = statSync13(path24);
     if (!stat2.isDirectory()) return null;
-    const entries = readdirSync10(path23);
+    const entries = readdirSync10(path24);
     if (entries.length <= DIR_FINGERPRINT_LISTING_CAP_ENTRIES) {
       return shortFingerprint(entries.slice().sort().join("\0"));
     }
@@ -8765,12 +8961,12 @@ function dirStateFingerprintSync(path23) {
   }
 }
 var FILE_FINGERPRINT_CONTENT_CAP_BYTES = 2 * 1024 * 1024;
-function fileStateFingerprintSync(path23) {
+function fileStateFingerprintSync(path24) {
   try {
-    const stat2 = statSync13(path23);
+    const stat2 = statSync13(path24);
     if (!stat2.isFile()) return null;
     if (stat2.size <= FILE_FINGERPRINT_CONTENT_CAP_BYTES) {
-      return shortFingerprint(readFileSync14(path23));
+      return shortFingerprint(readFileSync14(path24));
     }
     return shortFingerprint(`${stat2.mtimeMs}\0${stat2.size}`);
   } catch {
@@ -8964,19 +9160,20 @@ function summarizeOutputDelta(oldOutput, newOutput) {
 async function storeBashOutput(command, output, exitCode, cwd = null) {
   const id = await commandHash(command, cwd);
   const fingerprints = computeBashFingerprints(command, cwd);
+  const redactedOutput = redactSecrets(output).text;
   const entry = {
     id,
     command,
-    output,
+    output: redactedOutput,
     exitCode,
     storedAt: Date.now(),
-    sizeBytes: Buffer.byteLength(output, "utf-8"),
+    sizeBytes: Buffer.byteLength(redactedOutput, "utf-8"),
     ...fingerprints ? { fingerprints } : {}
   };
   _byId.set(id, entry);
   storeBlob(BASH_OUTPUT_SUBDIR, id, entry);
   indexRecallEntry("bash", id, command, `${command}
-${output}`, entry.storedAt);
+${redactedOutput}`, entry.storedAt);
   return id;
 }
 function coerceBashEntry(raw) {
@@ -9087,7 +9284,14 @@ function buildManifest(sessionId) {
   );
   lines.push(...buildSafeToDiscardSection(files));
   lines.push(...buildMemEpochSection());
-  return lines.join("\n");
+  return capManifestChars(lines.join("\n"));
+}
+function capManifestChars(manifest) {
+  const cap = loadConfig().compact_assist.max_manifest_chars;
+  if (cap <= 0 || manifest.length <= cap) return manifest;
+  const omitted = manifest.length - cap;
+  return manifest.slice(0, cap) + `
+...(manifest truncated at ${cap} chars; ${omitted} chars omitted)`;
 }
 function buildSafeToDiscardSection(files) {
   const rerunHashes = getSessionBashReruns();
@@ -9148,6 +9352,7 @@ function buildMemEpochSection() {
   ];
 }
 function preCompactHandler(event) {
+  if (!loadConfig().compact_assist.enabled) return passOutput();
   return contextOutput(buildManifest(event.sessionId));
 }
 registerHook("pre_compact", preCompactHandler);
@@ -9231,11 +9436,12 @@ function cacheIdForUrl(url) {
 }
 function storeWebOutput(url, content, dedupKey = url) {
   const cacheId = cacheIdForUrl(dedupKey);
-  _byId2.set(cacheId, content);
+  const redactedContent = redactSecrets(content).text;
+  _byId2.set(cacheId, redactedContent);
   _urlIndex.set(url, cacheId);
-  storeBlob(WEB_OUTPUT_SUBDIR, cacheId, { url, content });
+  storeBlob(WEB_OUTPUT_SUBDIR, cacheId, { url, content: redactedContent });
   indexRecallEntry("web", cacheId, url, `${url}
-${content}`, Date.now());
+${redactedContent}`, Date.now());
   return cacheId;
 }
 function coerceWebBlob(raw) {
@@ -13546,8 +13752,8 @@ function trimCharacterEnd(str, char) {
 function unicodeEscape(str) {
   return str.replace(/[\s\S]/g, (c) => "\\u" + c.charCodeAt().toString(16).padStart(4, "0"));
 }
-function get(obj, path23) {
-  for (const key of path23) {
+function get(obj, path24) {
+  for (const key of path24) {
     if (!obj) {
       return void 0;
     }
@@ -14748,8 +14954,8 @@ function withBrackets(str, brackets) {
   const rbr = typeof brackets[1] === "string" ? brackets[1] : "]";
   return lbr + str + rbr;
 }
-function pathRewrite(path23, rewriter, baseUrl, metadata, elem) {
-  const modifiedPath = typeof rewriter === "function" ? rewriter(path23, metadata, elem) : path23;
+function pathRewrite(path24, rewriter, baseUrl, metadata, elem) {
+  const modifiedPath = typeof rewriter === "function" ? rewriter(path24, metadata, elem) : path24;
   return modifiedPath[0] === "/" && baseUrl ? trimCharacterEnd(baseUrl, "/") + modifiedPath : modifiedPath;
 }
 function formatImage(elem, walk, builder, formatOptions) {
@@ -15073,9 +15279,9 @@ function handleDeprecatedOptions(options) {
     options.selectors.push(...tagDefinitions);
     options.selectors = mergeDuplicatesPreferLast(options.selectors, (s) => s.selector);
   }
-  function set(obj, path23, value) {
-    const valueKey = path23.pop();
-    for (const key of path23) {
+  function set(obj, path24, value) {
+    const valueKey = path24.pop();
+    for (const key of path24) {
       let nested = obj[key];
       if (!nested) {
         nested = {};
@@ -15151,7 +15357,7 @@ ${safeText}
 }
 
 // src/hooks_fetch.ts
-function extractToolResponse3(raw) {
+function extractToolResponse(raw) {
   return extractToolResponseField(raw, BODY_FIRST_TOOL_RESPONSE_KEYS);
 }
 function resolveWebFetchContext(event) {
@@ -15201,7 +15407,7 @@ function postFetchHandler(event) {
     }
     const { toolInput, url } = ctx;
     recordStat("web_fetch");
-    const body = extractToolResponse3(event.raw);
+    const body = extractToolResponse(event.raw);
     const injCfg = loadConfig().injection;
     const injectionMatches = injCfg.enabled && body ? scanForInjectionPatterns(body) : [];
     if (injectionMatches.length > 0) {
@@ -15326,16 +15532,6 @@ async function postSkillHandler(event) {
 registerHook("pre_tool_use", preSkillHandler, { toolName: "Skill" });
 registerHook("post_tool_use", postSkillHandler, { toolName: "Skill" });
 
-// src/bash_compress.ts
-var ANSI_ESCAPE_RE = (
-  // eslint-disable-next-line no-control-regex -- intentionally matches ESC (\x1B) and BEL (\x07) control bytes
-  /\x1B\[[0-?]*[ -/]*[@-~]|\x1B\].*?(?:\x07|\x1B\\)|\x1B[PX^_].*?\x1B\\|\x1B[@-Z\\-_]/gs
-);
-function stripAnsiCodes(text) {
-  if (!text.includes("\x1B")) return text;
-  return text.replace(ANSI_ESCAPE_RE, "");
-}
-
 // src/tool_filters/helpers.ts
 var DEFAULT_MAX_LINES = 1e3;
 var DEFAULT_MAX_BYTES = 64 * 1024;
@@ -15407,7 +15603,10 @@ function sanitizeControlChars(text) {
 }
 function stripProgress(text) {
   if (!text.includes("\r")) return text;
-  return text.split("\n").map((line) => line.includes("\r") ? line.slice(line.lastIndexOf("\r") + 1) : line).join("\n");
+  return text.split("\n").map((line) => {
+    const trimmed = line.endsWith("\r") ? line.slice(0, -1) : line;
+    return trimmed.includes("\r") ? trimmed.slice(trimmed.lastIndexOf("\r") + 1) : trimmed;
+  }).join("\n");
 }
 function normalise(text, opts = {}) {
   if (!text) return "";
@@ -16317,7 +16516,7 @@ function makeLanguageFilter(cfg) {
         let deduped = false;
         for (let i = 0; i < dRules.length; i++) {
           if (dRules[i].re.test(line)) {
-            const key = line.slice(0, dRules[i].keyLen ?? 40);
+            const key = dRules[i].keyLen !== void 0 ? line.slice(0, dRules[i].keyLen) : line;
             const ds = dState[i];
             const seen = (ds.seen.get(key) ?? 0) + 1;
             ds.seen.set(key, seen);
@@ -17742,61 +17941,42 @@ function compressNpmAuditJson(text) {
   const result = { ...data, vulnerabilities: keep };
   return JSON.stringify(result, null, 2);
 }
+var _NPM_AUDIT_SEVERITY_LINE_RE = /^Severity:\s*(critical|high|moderate|low)/i;
+var _NPM_AUDIT_LEGACY_HDR_RE = /^(critical|high|moderate|low)\s+\S/i;
 function compressNpmAuditHuman(text) {
-  const lines = text.split("\n");
+  const paragraphs = [[]];
+  for (const line of text.split("\n")) {
+    if (line.trim() === "") paragraphs.push([]);
+    else paragraphs[paragraphs.length - 1].push(line);
+  }
+  const blockSeverity = (para) => {
+    for (const l of para) {
+      const modern = _NPM_AUDIT_SEVERITY_LINE_RE.exec(l);
+      if (modern) return modern[1].toLowerCase();
+      if (_NPM_AUDIT_LEGACY_HDR_RE.test(l)) return l.trim().split(/\s+/)[0].toLowerCase();
+    }
+    return null;
+  };
   const kept = [];
   const severityCounts = {};
   let blockCount = 0;
-  let inBlock = false;
-  let blockLines = [];
-  const SEVERITY_HDR_RE = /^(critical|high|moderate|low)\s+\S/i;
-  const FOUND_SUMMARY_RE = /^found \d+ vulnerabilit/i;
-  for (const line of lines) {
-    if (FOUND_SUMMARY_RE.test(line)) {
-      kept.push(line);
-      continue;
-    }
-    if (SEVERITY_HDR_RE.test(line)) {
-      if (inBlock && blockLines.length) {
-        if (blockCount < 10) kept.push(...blockLines);
-        else {
-          const sev = (blockLines[0] ?? "").split(/\s+/)[0].toLowerCase();
-          severityCounts[sev] = (severityCounts[sev] ?? 0) + 1;
-        }
-        blockCount += 1;
-      }
-      inBlock = true;
-      blockLines = [line];
-      continue;
-    }
-    if (inBlock) {
-      if (line.trim() === "") {
-        blockLines.push(line);
-        if (blockCount < 10) kept.push(...blockLines);
-        else {
-          const sev = (blockLines[0] ?? "").split(/\s+/)[0].toLowerCase();
-          severityCounts[sev] = (severityCounts[sev] ?? 0) + 1;
-        }
-        blockLines = [];
-        blockCount += 1;
-        inBlock = false;
-      } else {
-        blockLines.push(line);
-      }
+  for (const para of paragraphs) {
+    if (!para.length) continue;
+    const severity = blockSeverity(para);
+    if (severity === null || blockCount < 10) {
+      if (kept.length) kept.push("");
+      kept.push(...para);
+      if (severity !== null) blockCount += 1;
     } else {
-      kept.push(line);
-    }
-  }
-  if (inBlock && blockLines.length) {
-    if (blockCount < 10) kept.push(...blockLines);
-    else {
-      const sev = (blockLines[0] ?? "").split(/\s+/)[0].toLowerCase();
-      severityCounts[sev] = (severityCounts[sev] ?? 0) + 1;
+      severityCounts[severity] = (severityCounts[severity] ?? 0) + 1;
+      blockCount += 1;
     }
   }
   if (Object.keys(severityCounts).length) {
-    const parts = Object.entries(severityCounts).map(([s, n]) => `${n} ${s}`);
-    kept.push(`[token-goat: collapsed ${Object.values(severityCounts).reduce((a, b) => a + b, 0)} additional advisory blocks (${parts.join(", ")})]`);
+    kept.push(
+      "",
+      `[token-goat: collapsed ${Object.values(severityCounts).reduce((a, b) => a + b, 0)} additional advisory blocks (${Object.entries(severityCounts).map(([s, n]) => `${n} ${s}`).join(", ")})]`
+    );
   }
   return squeezeBlankLines(kept.join("\n"));
 }
@@ -17872,6 +18052,7 @@ function _compressEslintStanza(text) {
     if (!currentFile.length) return;
     const header = currentFile[0];
     const body = currentFile.slice(1);
+    out.push(header);
     let perRule = /* @__PURE__ */ new Map();
     for (const line of body) {
       if (!_ESLINT_LOC_RE.test(line)) {
@@ -17887,7 +18068,6 @@ function _compressEslintStanza(text) {
       bucket.push(line);
       perRule.set(rule, bucket);
     }
-    out.push(header);
     out.push(..._emitEslintRules(perRule));
     currentFile = [];
   }
@@ -19554,7 +19734,28 @@ function _hunkWhitespaceEolOnlyPairCount(hunkLines) {
   }
   return removed.length;
 }
-function _compressGitDiffBody(stdout, stderr) {
+function _hunkDensity(hunkText) {
+  const content = hunkText.split("\n").slice(1);
+  if (content.length === 0) return 0;
+  const changed = content.filter((l) => l.startsWith("+") || l.startsWith("-")).length;
+  return changed / content.length;
+}
+function _capHunksByDensity(hunks, maxHunksPerFile) {
+  const real = hunks.slice(1);
+  if (maxHunksPerFile <= 0 || real.length <= maxHunksPerFile) return { hunks, note: null };
+  const scored = real.map((h, i) => ({ i, h, d: _hunkDensity(h) }));
+  const keepSet = new Set(
+    scored.slice().sort((a, b) => b.d - a.d).slice(0, maxHunksPerFile).map((x) => x.i)
+  );
+  const dropped = scored.filter((x) => !keepSet.has(x.i));
+  const avg = dropped.length ? dropped.reduce((a, x) => a + x.d, 0) / dropped.length : 0;
+  const kept = scored.filter((x) => keepSet.has(x.i)).map((x) => x.h);
+  return {
+    hunks: [hunks[0] ?? "", ...kept],
+    note: `[token-goat: ${dropped.length} more hunks, avg density ${avg.toFixed(2)} \u2014 likely whitespace/formatting]`
+  };
+}
+function _compressGitDiffBody(stdout, stderr, maxHunksPerFile = 10) {
   const MAX_HUNK_CHANGED = 50;
   const HUNK_HEAD_KEEP = 20;
   const HUNK_TAIL_KEEP = 5;
@@ -19572,11 +19773,13 @@ function _compressGitDiffBody(stdout, stderr) {
       outBlocks.push((blockLines[0] ?? "") + "\n" + binaryLine);
       continue;
     }
-    const hunks = splitBlocks(block, _GIT_DIFF_HUNK_RE);
+    let hunks = splitBlocks(block, _GIT_DIFF_HUNK_RE);
     if (hunks.length <= 1) {
       outBlocks.push(block);
       continue;
     }
+    const { hunks: cappedHunks, note: hunkCapNote } = _capHunksByDensity(hunks, maxHunksPerFile);
+    hunks = cappedHunks;
     const compressedHunks = [];
     for (const hunk of hunks) {
       const hunkLines = hunk.split("\n");
@@ -19623,6 +19826,7 @@ function _compressGitDiffBody(stdout, stderr) {
         }
       }
     }
+    if (hunkCapNote) compressedHunks.push(hunkCapNote);
     outBlocks.push(compressedHunks.join("\n"));
   }
   let text = outBlocks.join("\n");
@@ -19670,7 +19874,13 @@ function _compressGitDiffEnhanced(stdout, stderr, argv) {
   const flags = new Set(argv);
   const isStat = flags.has("--stat") || flags.has("--shortstat") || flags.has("--name-only");
   if (isStat) return _compressGitDiffStat(stdout, stderr, argv);
-  return _compressGitDiffBody(stdout, stderr);
+  let maxHunksPerFile;
+  try {
+    maxHunksPerFile = loadConfig().bash_diff.max_hunks_per_file;
+  } catch {
+    maxHunksPerFile = void 0;
+  }
+  return maxHunksPerFile === void 0 ? _compressGitDiffBody(stdout, stderr) : _compressGitDiffBody(stdout, stderr, maxHunksPerFile);
 }
 var GitDiffFilter = class extends GitBaseFilter {
   name = "git-diff";
@@ -20820,7 +21030,7 @@ var MesonFilter = class extends ToolFilter {
   }
 };
 var MSBUILD_ERROR_RE = /.*\(\d+(?:,\d+)?\)\s*:\s*error\s+/;
-var MSBUILD_WARNING_RE = /(.*?)\((\d+)(?:,\d+)?\)\s*:\s*warning\s+(\w+)/;
+var MSBUILD_WARNING_RE = /(.*?)\((\d+)(?:,(\d+))?\)\s*:\s*warning\s+(\w+)/;
 var MSBUILD_BUILD_STARTED_RE = /^Build started/;
 var MSBUILD_PROJECT_BUILDING_RE = /^------ Build started: Project:/;
 var MSBUILD_COPY_RE = /^\s+(?:Copy|CopyFilesToOutputDirectory|CopyToOutputDirectory)\b/;
@@ -20857,8 +21067,9 @@ var MSBuildFilter = class extends ToolFilter {
       if (warnMatch) {
         const filePath = (warnMatch[1] ?? "").trim();
         const lineNum = warnMatch[2] ?? "";
-        const code = warnMatch[3] ?? "";
-        const dedupKey = `${filePath}|${lineNum}|${code}`;
+        const colNum = warnMatch[3] ?? "";
+        const code = warnMatch[4] ?? "";
+        const dedupKey = `${filePath}|${lineNum}|${colNum}|${code}`;
         if (!seenWarningCodes.has(dedupKey)) {
           seenWarningCodes.add(dedupKey);
           kept.push(line);
@@ -21316,7 +21527,7 @@ ${stdout.replace(/\s+$/, "")}` : stderr : stdout;
     for (const line of benchLines) {
       if (CARGO_TEST_RUNNING_RE.test(line)) {
         runnerHeaderCount++;
-        if (runnerHeaderCount > 1) kept.push(line);
+        if (runnerHeaderCount === 1) kept.push(line);
         continue;
       }
       kept.push(line);
@@ -22519,7 +22730,8 @@ ${stderr.replace(/\s+$/, "")}` : stderr;
     maybeNote(notes, providerCollapsed, `collapsed ${providerCollapsed} provider install/find lines`);
     if (nonEmpty.length > 12) {
       let compressed = headTailCompress(nonEmpty, 5, 5, "lines");
-      if (notes.length) compressed = compressed.replace(/\s+$/, "") + "\n" + notes.join("\n");
+      if (notes.length) compressed = `${compressed.replace(/\s+$/, "")}
+[token-goat: ${notes.join("; ")}]`;
       return compressed;
     }
     this.emitNotes(kept, notes);
@@ -22660,7 +22872,11 @@ var AwsCliFilter = class extends ToolFilter {
         this._JSON_ARRAY_THRESHOLD,
         this._JSON_ARRAY_KEEP
       );
-      if (compressed !== null) text = compressed;
+      if (compressed !== null) {
+        text = compressed;
+      } else if (text.includes("\n") && text.includes("|")) {
+        text = _compressTable(text, 25);
+      }
     }
     if (stderr.trim()) {
       text = text.trim() ? `${text.replace(/\s+$/, "")}
@@ -24157,14 +24373,13 @@ function compressGhRunView(text) {
 }
 function compressGhList(text, subcommand) {
   const lines = text.split("\n");
-  let headerIdx = 0;
+  let dataStart = 0;
   for (let i = 0; i < lines.length; i++) {
     if (lines[i].trim()) {
-      headerIdx = i;
+      dataStart = i;
       break;
     }
   }
-  const dataStart = headerIdx + 1;
   let dataEnd = lines.length;
   for (let i = dataStart; i < lines.length; i++) {
     if (!lines[i].trim()) {
@@ -24519,7 +24734,6 @@ var BanditFilter = class extends ToolFilter {
           inIssue = false;
           issueBuf = [];
           currentSeverity = "";
-          if (line.trim()) kept.push(line);
         } else {
           const sevM = /Severity:\s*(\w+)/i.exec(line);
           if (sevM) currentSeverity = sevM[1] ?? "";
@@ -25049,7 +25263,7 @@ var LsFilter = class _LsFilter extends ToolFilter {
     const entrySet = new Set(entryIdx);
     const keptEntryIdx = new Set(entryIdx.slice(0, _LS_MAX_ENTRIES));
     const hiddenCount = entryIdx.length - keptEntryIdx.size;
-    const fileEntries = entryIdx.map((i) => lines[i]).filter((l) => !_DIR_EXE_DIR_ENTRY_RE.test(l));
+    const fileEntries = entryIdx.slice(_LS_MAX_ENTRIES).map((i) => lines[i]).filter((l) => !_DIR_EXE_DIR_ENTRY_RE.test(l));
     const extPart = _lsExtSummary(fileEntries);
     const hiddenMarker = extPart ? _LS_HIDDEN_MARKER_EXT.replace("{n}", String(hiddenCount)).replace("{ext_summary}", () => extPart) : _LS_HIDDEN_MARKER.replace("{n}", String(hiddenCount));
     const out = [];
@@ -25088,7 +25302,7 @@ var LsFilter = class _LsFilter extends ToolFilter {
     }
     out.push(...entries.slice(0, _LS_MAX_ENTRIES));
     const hidden = entries.length - _LS_MAX_ENTRIES;
-    const extPart = _lsExtSummary(entries);
+    const extPart = _lsExtSummary(entries.slice(_LS_MAX_ENTRIES));
     if (extPart) {
       out.push(_LS_HIDDEN_MARKER_EXT.replace("{n}", String(hidden)).replace("{ext_summary}", () => extPart));
     } else {
@@ -26970,7 +27184,6 @@ var haskellFilter = makeLanguageFilter({
     {
       re: HASKELL_WARNING_RE,
       maxPerKey: 3,
-      keyLen: 40,
       note: (n) => `deduplicated ${n} repeated warning(s)`
     }
   ]
@@ -27572,13 +27785,20 @@ var Sqlite3Filter = class _Sqlite3Filter extends ToolFilter {
     if (nonEmpty.length && schemaLines.length / nonEmpty.length >= 0.5) return merged;
     const errors = lines.filter((ln) => SQLITE3_ERROR_RE.test(ln));
     const dataLines = lines.filter((ln) => !SQLITE3_ERROR_RE.test(ln));
-    const nonEmptyData = dataLines.filter((ln) => ln.trim());
     const kept = [...errors];
-    if (nonEmptyData.length > _Sqlite3Filter.ROW_THRESHOLD) {
-      kept.push(...nonEmptyData.slice(0, _Sqlite3Filter.KEEP_ROWS));
-      kept.push(`[token-goat: ${nonEmptyData.length} rows (showing first ${_Sqlite3Filter.KEEP_ROWS})]`);
+    let headerRows = [];
+    let bodyLines = dataLines;
+    if (dataLines.length >= 2 && dataLines[0].trim() && /^[\s\-+]+$/.test(dataLines[1]) && dataLines[1].trim()) {
+      headerRows = dataLines.slice(0, 2);
+      bodyLines = dataLines.slice(2);
+    }
+    kept.push(...headerRows);
+    const nonEmptyBody = bodyLines.filter((ln) => ln.trim());
+    if (nonEmptyBody.length > _Sqlite3Filter.ROW_THRESHOLD) {
+      kept.push(...nonEmptyBody.slice(0, _Sqlite3Filter.KEEP_ROWS));
+      kept.push(`[token-goat: ${nonEmptyBody.length} rows (showing first ${_Sqlite3Filter.KEEP_ROWS})]`);
     } else {
-      kept.push(...dataLines);
+      kept.push(...bodyLines);
     }
     return this.finalize(kept);
   }
@@ -27786,6 +28006,26 @@ var SysPackageFilter = class extends ToolFilter {
   }
 };
 var sysPackageFilter = new SysPackageFilter();
+var WmicFilter = class extends ToolFilter {
+  name = "wmic";
+  binaries = /* @__PURE__ */ new Set(["wmic"]);
+  compressBody(stdout, stderr, _exitCode, _argv) {
+    const merged = this.combineOutput(stdout, stderr);
+    const lines = merged.split("\n");
+    let padCount = 0;
+    const kept = lines.map(
+      (line) => line.replace(/[ \t]{2,}/g, () => {
+        padCount++;
+        return "  ";
+      }).replace(/[ \t]+$/, "")
+    );
+    const notes = [];
+    maybeNote(notes, padCount, `collapsed ${padCount} runs of fixed-width column padding`);
+    this.emitNotes(kept, notes);
+    return this.finalize(kept);
+  }
+};
+var wmicFilter = new WmicFilter();
 var PROTOC_INFO_RE = /^\[libprotobuf INFO /;
 var PROTOC_LIB_WARN_RE = /^\[libprotobuf (?:WARNING|ERROR) /;
 var PROTOC_DIAG_RE = /^[^\s:][^:]*\.proto:\d+:\d+: (?:warning|error):/i;
@@ -28482,6 +28722,7 @@ var MISC_FILTERS = [
   sqlite3Filter,
   redisCLIFilter,
   sysPackageFilter,
+  wmicFilter,
   protocFilter,
   sassFilter,
   toxFilter,
@@ -28566,7 +28807,7 @@ function detectFromCommand(command) {
 
 // src/shell.ts
 import * as fs18 from "node:fs";
-import * as path21 from "node:path";
+import * as path22 from "node:path";
 var WSL_LAUNCHER_SEGMENTS = /* @__PURE__ */ new Set(["system32", "syswow64", "windowsapps"]);
 function isExecutable(p) {
   try {
@@ -28579,15 +28820,15 @@ function isWslLauncherDir(dir) {
   return dir.toLowerCase().split(/[\\/]+/).some((seg) => WSL_LAUNCHER_SEGMENTS.has(seg));
 }
 function locateBashOnPath(pathValue, isExe = isExecutable) {
-  for (const dir of (pathValue ?? "").split(path21.delimiter)) {
+  for (const dir of (pathValue ?? "").split(path22.delimiter)) {
     if (!dir || isWslLauncherDir(dir)) continue;
-    const cand = path21.join(dir, "bash.exe");
+    const cand = path22.join(dir, "bash.exe");
     if (isExe(cand)) return cand;
   }
   return null;
 }
 function knownGitBashPaths() {
-  const localPrograms = process.env["LOCALAPPDATA"] ? path21.join(process.env["LOCALAPPDATA"], "Programs") : void 0;
+  const localPrograms = process.env["LOCALAPPDATA"] ? path22.join(process.env["LOCALAPPDATA"], "Programs") : void 0;
   const bases = [
     process.env["ProgramFiles"],
     process.env["ProgramFiles(x86)"],
@@ -28597,8 +28838,8 @@ function knownGitBashPaths() {
   const out = [];
   for (const base of bases) {
     if (!base) continue;
-    out.push(path21.join(base, "Git", "bin", "bash.exe"));
-    out.push(path21.join(base, "Git", "usr", "bin", "bash.exe"));
+    out.push(path22.join(base, "Git", "bin", "bash.exe"));
+    out.push(path22.join(base, "Git", "usr", "bin", "bash.exe"));
   }
   return out;
 }
@@ -28647,8 +28888,8 @@ function resolveCdHintPath(rawCmd, filePath, cwd) {
 function surgicalHintFor(hintPath, isEnv, isConfig, isDoc) {
   return isEnv ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` to read a specific variable.' : isConfig ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` or `token-goat section "' + hintPath + '::sectionName"` to read a specific value.' : isDoc ? 'Use `token-goat section "' + hintPath + '::SectionHeading"` to read one section.' : 'Use `token-goat read "' + hintPath + '::SymbolName"` to read one function or class.';
 }
-function surgicalHintForConfigDoc(filePath, isConfig, isDoc) {
-  return isConfig ? 'Use `token-goat config-get "' + filePath + '" KEY_NAME` or `token-goat section "' + filePath + '::sectionName"` to read a specific value.' : isDoc ? 'Use `token-goat section "' + filePath + '::SectionHeading"` to read one section.' : 'Use `token-goat read "' + filePath + '::SymbolName"` or `token-goat skeleton "' + filePath + '"` to see the file structure.';
+function surgicalHintForConfigDoc(filePath, isConfig, isDoc, isSql) {
+  return isConfig ? 'Use `token-goat config-get "' + filePath + '" KEY_NAME` or `token-goat section "' + filePath + '::sectionName"` to read a specific value.' : isSql ? 'Use `token-goat section "' + filePath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.' : isDoc ? 'Use `token-goat section "' + filePath + '::SectionHeading"` to read one section.' : 'Use `token-goat read "' + filePath + '::SymbolName"` or `token-goat skeleton "' + filePath + '"` to see the file structure.';
 }
 function stripOutputPipeline(cmd) {
   let inSingle = false;
@@ -28697,6 +28938,15 @@ function extractCommand(event) {
   const cmd = event.toolInput["command"];
   return typeof cmd === "string" && cmd.trim() !== "" ? cmd.trim() : void 0;
 }
+var HEAD_MOVING_GIT_RE = /^\s*git\s+(?:checkout|switch|pull|merge|rebase|reset|cherry-pick)\b/i;
+var PATH_SCOPED_CHECKOUT_RE = /^\s*git\s+checkout\s+(?:.*\s)?--(?:\s|$)/i;
+function isHeadMovingGitCommand(cmd) {
+  if (!HEAD_MOVING_GIT_RE.test(cmd)) return false;
+  if (PATH_SCOPED_CHECKOUT_RE.test(cmd)) return false;
+  return true;
+}
+var ORIG_HEAD_ELIGIBLE_GIT_RE = /^\s*git\s+(?:pull|merge|rebase)\b/i;
+var ORIG_HEAD_REFLOG_MSG_RE = /^(merge\s|rebase\s\(|pull\s)/i;
 function isTempPath(fp) {
   const norm = fp.replace(/\\/g, "/");
   return /^\/tmp\//i.test(norm) || /\/var\/folders\//i.test(norm) || /AppData\/Local\/Temp\//i.test(norm) || norm.startsWith("/c/Users/") && norm.includes("/AppData/Local/Temp/");
@@ -28720,6 +28970,12 @@ function classifyFileExtensions(filePath) {
   const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
   return { isDoc, isEnv, isConfig, isSql };
 }
+function classifyDocConfig(filePath) {
+  const isDoc = /\.(?:md|mdx|rst|txt)$/i.test(filePath);
+  const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
+  const isSql = /\.sql$/i.test(filePath);
+  return { isDoc, isConfig, isSql };
+}
 function classifyCatPath(filePath, cmd0) {
   if (isTempPath(filePath)) return null;
   const flags = classifyFileExtensions(filePath);
@@ -28871,9 +29127,8 @@ function extractHeadFile(cmd) {
   if (filePath === void 0) return null;
   if (isTempPath(filePath)) return null;
   if (!/\.(?:ts|tsx|js|jsx|py|go|java|rs|rb|cs|md|mdx|rst|txt|json|yaml|yml|toml|sql|sh)$/i.test(filePath)) return null;
-  const isDoc = /\.(?:md|mdx|rst|txt|sql)$/i.test(filePath);
-  const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
-  return { filePath, isDoc, isConfig };
+  const { isDoc, isConfig, isSql } = classifyDocConfig(filePath);
+  return { filePath, isDoc, isConfig, isSql };
 }
 function extractSedRange(cmd) {
   const m = /^sed\s+-n\s+['"](?:\d+,\d+p)(?:;\d+,\d+p)*['"]\s+(?:"([^"]+)"|'([^']+)'|(\S+))(?:\s+2>\/dev\/null)?\s*$/.exec(cmd);
@@ -28964,9 +29219,8 @@ function extractNodeFileRead(cmd) {
     const filePath = readSync2[1];
     if (isOrchestratorStateFile(filePath)) return null;
     if (isTempPath(filePath)) return null;
-    const isDoc = /\.(?:md|mdx|rst|txt|sql)$/i.test(filePath);
-    const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
-    return { filePath, isDoc, isConfig };
+    const { isDoc, isConfig, isSql } = classifyDocConfig(filePath);
+    return { filePath, isDoc, isConfig, isSql };
   }
   const requireM = /require\(['"]([^'"]+\.json)['"]\)/i.exec(cmd);
   if (requireM?.[1]) {
@@ -28974,7 +29228,7 @@ function extractNodeFileRead(cmd) {
     if (filePath.includes("node_modules")) return null;
     if (isOrchestratorStateFile(filePath)) return null;
     if (isTempPath(filePath)) return null;
-    return { filePath, isDoc: false, isConfig: true };
+    return { filePath, isDoc: false, isConfig: true, isSql: false };
   }
   return null;
 }
@@ -28990,9 +29244,8 @@ function extractTailFile(cmd) {
   if (!filePath) return null;
   if (isTempPath(filePath)) return null;
   if (!/\.(?:ts|tsx|js|jsx|py|go|java|rs|rb|cs|md|mdx|rst|txt|json|yaml|yml|toml|sql|sh)$/i.test(filePath)) return null;
-  const isDoc = /\.(?:md|mdx|rst|txt|sql)$/i.test(filePath);
-  const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
-  return { filePath, isDoc, isConfig };
+  const { isDoc, isConfig, isSql } = classifyDocConfig(filePath);
+  return { filePath, isDoc, isConfig, isSql };
 }
 function extractGetContentTail(cmd) {
   const tailMatch = /-Tail\s+(\d+)/i.exec(cmd);
@@ -29004,26 +29257,24 @@ function extractGetContentTail(cmd) {
   const afterCmd = cmd.slice(getnMatch[0].length);
   const beforeTail = afterCmd.split(/-Tail/i)[0]?.trim() ?? "";
   const afterTail = afterCmd.split(/-Tail\s+\d+/i)[1]?.trim() ?? "";
-  const filePath = beforeTail || afterTail;
+  const filePath = (beforeTail || afterTail).replace(/^["']|["']$/g, "");
   if (!filePath) return null;
   if (isTempPath(filePath)) return null;
   if (!/\.(?:ts|tsx|js|jsx|py|go|java|rs|rb|cs|md|mdx|rst|txt|json|yaml|yml|toml|sql|sh|ps1|psm1)$/i.test(filePath)) return null;
-  const isDoc = /\.(?:md|mdx|rst|txt|sql)$/i.test(filePath);
-  const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
-  return { filePath, isDoc, isConfig };
+  const { isDoc, isConfig, isSql } = classifyDocConfig(filePath);
+  return { filePath, isDoc, isConfig, isSql };
 }
 function extractGetContentSelectFirst(cmd) {
   const m = /^(Get-Content|gc)\s+([^|]+)\s*\|\s*(Select-Object|select)\s+(-First\s+(\d+))/i.exec(cmd);
   if (!m) return null;
-  const filePath = m[2]?.trim() ?? "";
+  const filePath = (m[2]?.trim() ?? "").replace(/^["']|["']$/g, "");
   const n = parseInt(m[5] ?? "0", 10);
   if (n <= 10) return null;
   if (!filePath) return null;
   if (isTempPath(filePath)) return null;
   if (!/\.(?:ts|tsx|js|jsx|py|go|java|rs|rb|cs|md|mdx|rst|txt|json|yaml|yml|toml|sql|sh|ps1|psm1)$/i.test(filePath)) return null;
-  const isDoc = /\.(?:md|mdx|rst|txt|sql)$/i.test(filePath);
-  const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
-  return { filePath, isDoc, isConfig };
+  const { isDoc, isConfig, isSql } = classifyDocConfig(filePath);
+  return { filePath, isDoc, isConfig, isSql };
 }
 function extractTasksOutput(cmd) {
   const taskOutputRe = /[/\\]tasks[/\\]([a-z0-9]+)\.output$/;
@@ -29137,10 +29388,10 @@ function extractTgSurgicalRead(cmd, cwd) {
 }
 function curlHasUnsafeFlags(cmd) {
   if (/-X\s+(?:POST|PUT|PATCH|DELETE|HEAD|OPTIONS)/i.test(cmd)) return true;
-  if (/--request\s+(?:POST|PUT|PATCH|DELETE|HEAD|OPTIONS)/i.test(cmd)) return true;
+  if (/--request(?:\s+|=)(?:POST|PUT|PATCH|DELETE|HEAD|OPTIONS)/i.test(cmd)) return true;
   if (/(?:^|\s)(?:-d|--data(?:-raw|-binary|-urlencode)?|-F|--form)\b/.test(cmd)) return true;
   if (/(?:^|\s)(?:-u|--user)\b/.test(cmd)) return true;
-  if (/-H\s+['"]?Authorization/i.test(cmd)) return true;
+  if (/(?:-H|--header)(?:\s+|=)['"]?Authorization/i.test(cmd)) return true;
   return false;
 }
 function isCurlGetCommand(cmd) {
@@ -29150,9 +29401,9 @@ function isCurlGetCommand(cmd) {
 function isReadOnlyGhApi(cmd) {
   if (!/^gh\s+api\b/.test(cmd)) return false;
   if (/\bgraphql\b/.test(cmd)) return false;
-  if (/-H\s+['"]?Authorization/i.test(cmd)) return false;
-  if (/(?:-X|--method)\s+GET\b/i.test(cmd)) return true;
-  if (/(?:-X|--method)\s+(?:POST|PUT|PATCH|DELETE|HEAD|OPTIONS)\b/i.test(cmd)) return false;
+  if (/(?:-H|--header)(?:\s+|=)['"]?Authorization/i.test(cmd)) return false;
+  if (/(?:-X|--method)(?:\s+|=)GET\b/i.test(cmd)) return true;
+  if (/(?:-X|--method)(?:\s+|=)(?:POST|PUT|PATCH|DELETE|HEAD|OPTIONS)\b/i.test(cmd)) return false;
   if (/\s(?:-f|-F|--field|--raw-field|--input)\b/.test(cmd)) return false;
   return true;
 }
@@ -29430,29 +29681,31 @@ function preBashHandlerInner(event) {
   const sedRange = extractSedRange(cmd);
   if (sedRange !== null) {
     const { filePath, ranges } = sedRange;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
-    const sedDedupKey = resolveIndexPath(filePath, preHookCwd ?? process.cwd());
+    const sedDedupKey = resolveIndexPath(hintPath, preHookCwd ?? process.cwd());
     const overlapHints = [];
     const freshRanges = [];
     for (const [start, end] of ranges) {
       const priorOverlap = findRangeOverlap(getFileLineRanges(sedDedupKey), start, end);
       recordFileLineRange(sedDedupKey, start, end);
       if (priorOverlap !== null) {
-        overlapHints.push(sedOverlapHint(filePath, priorOverlap, start, end));
+        overlapHints.push(sedOverlapHint(hintPath, priorOverlap, start, end));
       } else {
         freshRanges.push([start, end]);
       }
     }
     const hints = [...overlapHints];
-    if (freshRanges.length > 0) hints.push(sedRangeHint(filePath, freshRanges));
+    if (freshRanges.length > 0) hints.push(sedRangeHint(hintPath, freshRanges));
     return contextOutput(hints.join(" "));
   }
   const catJsonPipe = extractCatJsonPipe(cmd);
   if (catJsonPipe !== null) {
     const { filePath } = catJsonPipe;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
     return contextOutput(
-      '`cat | jq` loads the whole file. Use `token-goat config-get "' + filePath + '" KEY_NAME` or `token-goat section "' + filePath + '::sectionName"` to slice one value.'
+      '`cat | jq` loads the whole file. Use `token-goat config-get "' + hintPath + '" KEY_NAME` or `token-goat section "' + hintPath + '::sectionName"` to slice one value.'
     );
   }
   const catResult = extractCatFile(cmd);
@@ -29487,7 +29740,7 @@ function preBashHandlerInner(event) {
     recordStat("session_hint", 0, 0);
     const lead = "`Get-Content` via a `powershell -Command` wrapper bypasses read hooks and loads the entire file into context. ";
     if (isSql) {
-      return cdStripped ? contextOutput(lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.') : denyOutput(lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
+      return contextOutput(lead + 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.');
     }
     const hint = surgicalHintFor(hintPath, isEnv, isConfig, isDoc);
     return cdStripped ? contextOutput(lead + hint) : denyOutput(lead + hint);
@@ -29519,33 +29772,37 @@ function preBashHandlerInner(event) {
   }
   const tailResult = extractTailFile(cmd);
   if (tailResult !== null) {
-    const { filePath, isDoc, isConfig } = tailResult;
+    const { filePath, isDoc, isConfig, isSql } = tailResult;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
-    return contextOutput("`tail` bypasses read hooks. " + surgicalHintForConfigDoc(filePath, isConfig, isDoc));
+    return contextOutput("`tail` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql));
   }
   const headResult = extractHeadFile(cmd);
   if (headResult !== null) {
-    const { filePath, isDoc, isConfig } = headResult;
+    const { filePath, isDoc, isConfig, isSql } = headResult;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
-    return contextOutput("`head` bypasses read hooks. " + surgicalHintForConfigDoc(filePath, isConfig, isDoc));
+    return contextOutput("`head` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql));
   }
   const gcTailResult = extractGetContentTail(cmd);
   if (gcTailResult !== null) {
-    const { filePath, isDoc, isConfig } = gcTailResult;
+    const { filePath, isDoc, isConfig, isSql } = gcTailResult;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
-    return contextOutput("`Get-Content -Tail` bypasses read hooks. " + surgicalHintForConfigDoc(filePath, isConfig, isDoc));
+    return contextOutput("`Get-Content -Tail` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql));
   }
   const gcSelectResult = extractGetContentSelectFirst(cmd);
   if (gcSelectResult !== null) {
-    const { filePath, isDoc, isConfig } = gcSelectResult;
+    const { filePath, isDoc, isConfig, isSql } = gcSelectResult;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
-    return contextOutput("`Select-Object -First` bypasses read hooks. " + surgicalHintForConfigDoc(filePath, isConfig, isDoc));
+    return contextOutput("`Select-Object -First` bypasses read hooks. " + surgicalHintForConfigDoc(hintPath, isConfig, isDoc, isSql));
   }
   const nodeRead = extractNodeFileRead(cmd);
   if (nodeRead !== null) {
-    const { filePath, isDoc, isConfig } = nodeRead;
+    const { filePath, isDoc, isConfig, isSql } = nodeRead;
     const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
-    const hint = isDoc ? 'Use `token-goat section "' + hintPath + '::SectionHeading"` to read one section.' : isConfig ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` or `token-goat section "' + hintPath + '::sectionName"` to read a specific value.' : 'Use `token-goat read "' + hintPath + '::SymbolName"` to extract a specific symbol.';
+    const hint = isSql ? 'Use `token-goat section "' + hintPath + '::table_name"` to pull one CREATE TABLE / CREATE TYPE block.' : isDoc ? 'Use `token-goat section "' + hintPath + '::SectionHeading"` to read one section.' : isConfig ? 'Use `token-goat config-get "' + hintPath + '" KEY_NAME` or `token-goat section "' + hintPath + '::sectionName"` to read a specific value.' : 'Use `token-goat read "' + hintPath + '::SymbolName"` to extract a specific symbol.';
     recordStat("session_hint", 0, 0);
     return cdStripped ? contextOutput("Node.js `fs.readFileSync()` bypasses read hooks. " + hint) : denyOutput("Node.js `fs.readFileSync()` bypasses read hooks. " + hint);
   }
@@ -29558,9 +29815,10 @@ function preBashHandlerInner(event) {
   const mdHeadingGrep = extractMarkdownHeadingGrep(cmd);
   if (mdHeadingGrep !== null) {
     const { filePath } = mdHeadingGrep;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
     return contextOutput(
-      'Use `token-goat outline "' + filePath + '"` to get all headings with line ranges \u2014 then `token-goat section "' + filePath + '::Heading"` to read one section.'
+      'Use `token-goat outline "' + hintPath + '"` to get all headings with line ranges \u2014 then `token-goat section "' + hintPath + '::Heading"` to read one section.'
     );
   }
   const rgSymbol = extractRgSymbolSearch(cmd);
@@ -29574,9 +29832,10 @@ function preBashHandlerInner(event) {
   const rgStructural = extractRgStructuralSearch(cmd);
   if (rgStructural !== null) {
     const { filePath } = rgStructural;
+    const hintPath = cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath;
     recordStat("session_hint", 0, 0);
     return contextOutput(
-      'Searching for code definitions with `rg`/`grep` is slower than surgical reads. Use `token-goat skeleton "' + filePath + '"` to see all symbols with line numbers, or `token-goat outline "' + filePath + '"` for symbols with docstrings and line ranges.'
+      'Searching for code definitions with `rg`/`grep` is slower than surgical reads. Use `token-goat skeleton "' + hintPath + '"` to see all symbols with line numbers, or `token-goat outline "' + hintPath + '"` for symbols with docstrings and line ranges.'
     );
   }
   const monitoringHint = getMonitoringRecallHint(cmd);
@@ -29738,6 +29997,27 @@ async function postBashHandler(event) {
     const exitCode = extractExitCode(event.raw);
     const cwd = getCwd(event) ?? null;
     const cacheMinBytes = loadConfig().bash_compress.cache_min_bytes;
+    if (isHeadMovingGitCommand(cmd) && (exitCode === null || exitCode === 0)) {
+      const gitDir = cwd ?? process.cwd();
+      let diffBase = "HEAD@{1}";
+      if (ORIG_HEAD_ELIGIBLE_GIT_RE.test(cmd)) {
+        const reflogTop = runGit(["reflog", "-1", "--format=%gs", "HEAD"], { cwd: gitDir, timeoutMs: 5e3 });
+        if (reflogTop.exitCode === 0 && ORIG_HEAD_REFLOG_MSG_RE.test(reflogTop.stdout.trim())) {
+          const origHead = runGit(["rev-parse", "--verify", "-q", "ORIG_HEAD"], { cwd: gitDir, timeoutMs: 5e3 });
+          if (origHead.exitCode === 0 && origHead.stdout.trim() !== "") diffBase = "ORIG_HEAD";
+        }
+      }
+      const mutationDiff = runGit(["diff", "--name-only", diffBase, "HEAD"], { cwd: gitDir, timeoutMs: 5e3 });
+      if (mutationDiff.exitCode === 0) {
+        const toplevel = runGit(["rev-parse", "--show-toplevel"], { cwd: gitDir, timeoutMs: 5e3 });
+        const repoRoot = toplevel.exitCode === 0 && toplevel.stdout.trim() !== "" ? toplevel.stdout.trim() : gitDir;
+        for (const rel of mutationDiff.stdout.split("\n")) {
+          const trimmed = rel.trim();
+          if (trimmed.length === 0) continue;
+          enqueueDirtyPathSafe(resolveIndexPath(trimmed, repoRoot), { alreadyResolved: true });
+        }
+      }
+    }
     const curlDl = extractCurlDownload(cmd);
     if (curlDl !== null && (exitCode === null || exitCode === 0)) {
       const resolvedOutputPath = resolveIndexPath(curlDl.outputPath, cwd ?? process.cwd());
@@ -29832,7 +30112,9 @@ function postBashOutputHandler(event) {
     if (getToolName(event) !== "BashOutput" || !event.sessionId) return passOutput();
     const bashId = getBashId(getToolInput(event));
     if (bashId === void 0) return passOutput();
-    const output = extractToolResultText(event.raw);
+    const rawOutput = extractToolResultText(event.raw);
+    if (!rawOutput) return passOutput();
+    const output = redactSecrets(rawOutput).text;
     if (!output) return passOutput();
     const prior = getBashOutput(pollCacheId(event.sessionId, bashId));
     const minBytes = loadConfig().bash_compress.cache_min_bytes;
@@ -29866,10 +30148,109 @@ ${delta}`
 }
 registerHook("post_tool_use", postBashOutputHandler, { toolName: "BashOutput" });
 
+// src/hooks_taskoutput.ts
+function pollCacheId2(sessionId, taskId) {
+  return `taskpoll_${shortFingerprint(`${sessionId}\0taskoutput\0${taskId}`)}`;
+}
+function storePollSnapshot2(sessionId, taskId, output) {
+  const id = pollCacheId2(sessionId, taskId);
+  const entry = {
+    id,
+    command: `taskoutput:${taskId}`,
+    output,
+    exitCode: 0,
+    storedAt: Date.now(),
+    sizeBytes: Buffer.byteLength(output, "utf-8")
+  };
+  storeBlob(BASH_OUTPUT_SUBDIR, id, entry);
+}
+function collapseRepeatedLines(text) {
+  return dedupeConsecutive(text.split("\n")).join("\n");
+}
+function getTaskId(toolInput) {
+  const value = toolInput["task_id"];
+  return typeof value === "string" && value !== "" ? value : void 0;
+}
+function postTaskOutputHandler(event) {
+  try {
+    if (getToolName(event) !== "TaskOutput" || !event.sessionId) return passOutput();
+    const taskId = getTaskId(getToolInput(event));
+    if (taskId === void 0) return passOutput();
+    const rawOutput = extractToolResultText(event.raw);
+    if (!rawOutput) return passOutput();
+    const output = redactSecrets(rawOutput).text;
+    if (!output) return passOutput();
+    const prior = getBashOutput(pollCacheId2(event.sessionId, taskId));
+    const minBytes = loadConfig().bash_compress.cache_min_bytes;
+    if (prior === null) {
+      storePollSnapshot2(event.sessionId, taskId, output);
+      const collapsed = collapseRepeatedLines(output);
+      if (collapsed === output) return passOutput();
+      const savings = Buffer.byteLength(output, "utf-8") - Buffer.byteLength(collapsed, "utf-8");
+      if (savings < minBytes) return passOutput();
+      return {
+        hookType: "rewriteOutput",
+        updatedOutput: collapsed
+      };
+    }
+    if (output === prior.output) {
+      storePollSnapshot2(event.sessionId, taskId, output);
+      if (Buffer.byteLength(output, "utf-8") < minBytes) return passOutput();
+      return {
+        hookType: "rewriteOutput",
+        updatedOutput: `[token-goat: task_id ${taskId} unchanged since last poll -- no new output]`
+      };
+    }
+    if (!output.startsWith(prior.output)) {
+      storePollSnapshot2(event.sessionId, taskId, output);
+      return passOutput();
+    }
+    const delta = output.slice(prior.output.length);
+    storePollSnapshot2(event.sessionId, taskId, output);
+    if (Buffer.byteLength(delta, "utf-8") < minBytes) return passOutput();
+    return {
+      hookType: "rewriteOutput",
+      updatedOutput: `[token-goat: task_id ${taskId} delta since last poll]
+${collapseRepeatedLines(delta)}`
+    };
+  } catch {
+    return passOutput();
+  }
+}
+registerHook("post_tool_use", postTaskOutputHandler, { toolName: "TaskOutput" });
+
+// src/hooks_exitplanmode.ts
+var PLAN_OMIT_POINTER = "[token-goat: plan body omitted -- identical to this call's own tool_input, already saved to the plans file]";
+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 markerIndex = output.indexOf(APPROVED_PLAN_MARKER);
+    if (markerIndex === -1) return passOutput();
+    const planValue = getToolInput(event)["plan"];
+    if (typeof planValue !== "string" || planValue.trim() === "") return passOutput();
+    const plan = planValue.trim();
+    const suffix = output.slice(markerIndex + APPROVED_PLAN_MARKER.length).trim();
+    if (suffix !== plan && !suffix.includes(plan) && !plan.includes(suffix)) return passOutput();
+    const prefix = output.slice(0, markerIndex + APPROVED_PLAN_MARKER.length);
+    const rewritten = `${prefix}
+${PLAN_OMIT_POINTER}`;
+    return {
+      hookType: "rewriteOutput",
+      updatedOutput: rewritten
+    };
+  } catch {
+    return passOutput();
+  }
+}
+registerHook("post_tool_use", postExitPlanModeHandler, { toolName: "ExitPlanMode" });
+
 // src/mcp_cache.ts
 var MCP_MAX_CACHE_BYTES = 2 * 1024 * 1024;
 var READ_VERBS_RE = /(?:^|_)(?:get|list|search|read|view|fetch|describe|export|download|find|show|query|resolve|context)(?=_|$)/i;
-var MUTATING_VERBS_RE = /^request(?=_|$)|(?:^|_)(?:create|update|delete|send|write|push|post|remove|label|unlabel|merge|modify|draft|fork|reply|move|rename|set|add|run|execute|close|copy|upload|insert|revoke|reset|archive|restore|annotate|register|unregister|star|unstar|like|unlike|vote|block|unblock|invite|kick|ban|click|fill|press|type|navigate|evaluate|drag|hover|handle|snapshot|wait|emulate|new|select|resize|audit|apply|commit|grant|deploy|toggle|pin|trigger|finalize|approve|cancel|sync)(?=_|$)/i;
+var MUTATING_VERBS_RE = /^(?:request|run)(?=_|$)|(?:^|_)(?:create|update|delete|send|write|push|post|remove|label|unlabel|merge|modify|draft|fork|reply|move|rename|set|add|execute|close|copy|upload|insert|revoke|reset|archive|restore|annotate|register|unregister|star|unstar|like|unlike|vote|block|unblock|invite|kick|ban|click|fill|press|type|navigate|evaluate|drag|hover|handle|snapshot|wait|emulate|new|select|resize|audit|apply|commit|grant|deploy|toggle|pin|trigger|finalize|approve|cancel|sync)(?=_|$)/i;
 var STATE_CHANGING_INPUT_KEYS = ["createIfEmpty", "clear", "save_to_disk"];
 function isMcpReadOnly(toolName, toolInput) {
   if (!toolName.startsWith("mcp__")) {
@@ -29902,21 +30283,28 @@ function mcpInputPreview(toolInput) {
 }
 function storeMcpOutput(sessionId, toolName, toolInput, resultText) {
   if (!sessionId || !resultText) return null;
-  const sizeBytes = Buffer.byteLength(resultText, "utf-8");
-  if (sizeBytes > MCP_MAX_CACHE_BYTES) return null;
+  const rawSizeBytes = Buffer.byteLength(resultText, "utf-8");
+  if (rawSizeBytes > MCP_MAX_CACHE_BYTES) return null;
   const id = mcpOutputId(sessionId, mcpHash(toolName, toolInput));
   const label = `mcp:${toolName} ${mcpInputPreview(toolInput)}`.trim();
+  const redactedOutput = redactSecrets(resultText).text;
   const entry = {
     id,
     command: label,
-    output: resultText,
+    output: redactedOutput,
     exitCode: 0,
     storedAt: Date.now(),
-    sizeBytes
+    // Sized off the redacted output, not the raw pre-redaction resultText (rawSizeBytes is only
+    // the cache-eligibility gate above) -- mirrors bash_output_cache.ts's storeBashOutput, whose
+    // sizeBytes is likewise computed from redactedOutput. Sizing off the raw text here left
+    // mcp-audit's per-call token estimate and `mcp-history`'s byte column reporting a stale byte
+    // count for any entry a secret was actually stripped from, out of sync with the stored/served
+    // (redacted, shorter) output.
+    sizeBytes: Buffer.byteLength(redactedOutput, "utf-8")
   };
   if (!storeBlob(BASH_OUTPUT_SUBDIR, id, entry)) return null;
   indexRecallEntry("mcp", id, label, `${label}
-${resultText}`, entry.storedAt);
+${redactedOutput}`, entry.storedAt);
   return id;
 }
 function getMcpOutput(sessionId, toolName, toolInput, ttlMs = Number.POSITIVE_INFINITY) {
@@ -30041,9 +30429,34 @@ var BROWSER_NETWORK_STRIP_KEYS = /* @__PURE__ */ new Set([
   "responseCookies",
   "cookies"
 ]);
+var BROWSER_SNAPSHOT_METHOD_RE = /(?:^|_)(?:take_snapshot|read_page|page_snapshot|snapshot)$/i;
+var SNAPSHOT_NAME_MAX_CHARS = 200;
+var SNAPSHOT_NODE_LINE_RE = /^( *)(uid=\S+) (\S+) "((?:[^"\\]|\\.)*)"(.*)$/;
+function truncateSnapshotLine(line) {
+  const m = SNAPSHOT_NODE_LINE_RE.exec(line);
+  if (!m) return line;
+  const [, indent, uid, role, name2, rest] = m;
+  if (name2 === void 0) return line;
+  if (name2.length <= SNAPSHOT_NAME_MAX_CHARS) return line;
+  const elided = name2.length - SNAPSHOT_NAME_MAX_CHARS;
+  return `${indent}${uid} ${role} "${name2.slice(0, SNAPSHOT_NAME_MAX_CHARS)}  \u2026 [${elided} chars elided]"${rest}`;
+}
+function compressSnapshotText(resultText) {
+  const compressed = resultText.split("\n").map(truncateSnapshotLine).join("\n");
+  if (compressed.length >= resultText.length) return null;
+  if (compressed.length > resultText.length * (1 - PACK_MIN_SAVINGS_RATIO)) return null;
+  return compressed;
+}
 function compressBrowserMcpResult(toolName, resultText) {
   if (!BROWSER_TOOL_RE.test(toolName)) return null;
   const method = toolName.split("__").pop() || "";
+  if (BROWSER_SNAPSHOT_METHOD_RE.test(method)) {
+    try {
+      return compressSnapshotText(resultText);
+    } catch {
+      return null;
+    }
+  }
   let shouldStrip = null;
   if (BROWSER_CONSOLE_METHOD_RE.test(method)) shouldStrip = (key) => BROWSER_CONSOLE_STRIP_KEYS.has(key);
   else if (BROWSER_NETWORK_METHOD_RE.test(method)) shouldStrip = (key) => BROWSER_NETWORK_STRIP_KEYS.has(key);
@@ -30057,8 +30470,81 @@ function compressBrowserMcpResult(toolName, resultText) {
   const stripped = deepStrip(parsed, shouldStrip);
   return finishWithGenericPass(resultText, stripped);
 }
+var GWORKSPACE_TOOL_RE = /^mcp__.*(?:gmail|drive).*__/i;
+var GWORKSPACE_STRIP_EXACT_KEYS = /* @__PURE__ */ new Set(["htmlBody", "html_body", "raw", "payload"]);
+var GWORKSPACE_BODY_KEYS = /* @__PURE__ */ new Set(["plaintextBody", "plaintext_body", "body"]);
+var GWORKSPACE_ATTACHMENT_KEEP_KEYS = /* @__PURE__ */ new Set(["id", "filename", "name", "mimeType", "mime_type", "size", "inline"]);
+var QUOTED_REPLY_LINE_RE = /^(?:>|On .{0,120} wrote:$|-{2,}\s*Original Message\s*-{2,}$)/i;
+var FORWARD_HEADER_FROM_RE = /^From:\s/i;
+var FORWARD_HEADER_CLUSTER_RE = /^(?:Sent|Date|To|Subject):\s/i;
+var FORWARD_HEADER_CLUSTER_LOOKAHEAD = 3;
+var FORWARD_HEADER_CLUSTER_MIN_MATCHES = 2;
+function findQuotedReplyOffset(text) {
+  const lines = text.split("\n");
+  let offset = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i] ?? "";
+    if (QUOTED_REPLY_LINE_RE.test(line)) return offset;
+    if (FORWARD_HEADER_FROM_RE.test(line)) {
+      let siblingMatches = 0;
+      for (let j = i + 1; j < lines.length && j <= i + FORWARD_HEADER_CLUSTER_LOOKAHEAD; j++) {
+        if (FORWARD_HEADER_CLUSTER_RE.test(lines[j] ?? "")) siblingMatches++;
+      }
+      if (siblingMatches >= FORWARD_HEADER_CLUSTER_MIN_MATCHES) return offset;
+    }
+    offset += line.length + 1;
+  }
+  return -1;
+}
+function trimQuotedReply(text) {
+  const offset = findQuotedReplyOffset(text);
+  if (offset < 0) return text;
+  return text.slice(0, offset).trimEnd();
+}
+function trimGmailBodies(value) {
+  if (Array.isArray(value)) return value.map(trimGmailBodies);
+  if (value === null || typeof value !== "object") return value;
+  const out = {};
+  for (const [key, val] of Object.entries(value)) {
+    out[key] = GWORKSPACE_BODY_KEYS.has(key) && typeof val === "string" ? trimQuotedReply(val) : trimGmailBodies(val);
+  }
+  return out;
+}
+function summarizeAttachments(value) {
+  if (Array.isArray(value)) return value.map(summarizeAttachments);
+  if (value === null || typeof value !== "object") return value;
+  const out = {};
+  for (const [key, val] of Object.entries(value)) {
+    if (key === "attachments" && Array.isArray(val)) {
+      out[key] = val.map((att) => {
+        if (att === null || typeof att !== "object") return att;
+        const kept = {};
+        for (const [k, v] of Object.entries(att)) {
+          if (GWORKSPACE_ATTACHMENT_KEEP_KEYS.has(k)) kept[k] = v;
+        }
+        return kept;
+      });
+    } else {
+      out[key] = summarizeAttachments(val);
+    }
+  }
+  return out;
+}
+function compressGWorkspaceMcpResult(toolName, resultText) {
+  if (!GWORKSPACE_TOOL_RE.test(toolName)) return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(resultText);
+  } catch {
+    return null;
+  }
+  const stripped = deepStrip(parsed, (key) => GWORKSPACE_STRIP_EXACT_KEYS.has(key));
+  const trimmed = trimGmailBodies(stripped);
+  const summarized = summarizeAttachments(trimmed);
+  return finishWithGenericPass(resultText, summarized);
+}
 function compressMcpResultWithPacks(toolName, resultText) {
-  return compressGithubMcpResult(toolName, resultText) ?? compressBrowserMcpResult(toolName, resultText);
+  return compressGithubMcpResult(toolName, resultText) ?? compressBrowserMcpResult(toolName, resultText) ?? compressGWorkspaceMcpResult(toolName, resultText);
 }
 
 // src/hooks_mcp.ts
@@ -30081,23 +30567,29 @@ function preMcpHandler(event) {
 }
 function postMcpHandler(event) {
   const toolName = getToolName(event);
-  if (!toolName || !event.sessionId) return passOutput();
+  if (!toolName || !event.sessionId || !toolName.startsWith("mcp__")) return passOutput();
   const toolInput = getToolInput(event);
-  if (!isMcpReadOnly(toolName, toolInput)) return passOutput();
   if (isMcpErrorResponse(event.raw)) return passOutput();
-  const ttlMs = loadConfig().hints.mcp_dedup_ttl_secs * 1e3;
-  if (getMcpOutput(event.sessionId, toolName, toolInput, ttlMs)) return passOutput();
+  const readOnly = isMcpReadOnly(toolName, toolInput);
   const resultText = extractToolResultText(event.raw);
   if (!resultText) return passOutput();
-  const id = storeMcpOutput(event.sessionId, toolName, toolInput, resultText);
-  if (id !== null && resultText.length >= MCP_COMPRESS_MIN_BYTES && process.env["TOKEN_GOAT_MCP_COMPRESS"] !== "0") {
+  let id = null;
+  if (readOnly) {
+    const ttlMs = loadConfig().hints.mcp_dedup_ttl_secs * 1e3;
+    if (getMcpOutput(event.sessionId, toolName, toolInput, ttlMs)) return passOutput();
+    id = storeMcpOutput(event.sessionId, toolName, toolInput, resultText);
+  }
+  if (resultText.length >= MCP_COMPRESS_MIN_BYTES && process.env["TOKEN_GOAT_MCP_COMPRESS"] !== "0") {
     const compressed = compressMcpResultWithPacks(toolName, resultText) ?? compressMcpResult(resultText);
     if (compressed !== null) {
-      return {
-        hookType: "rewriteOutput",
-        updatedOutput: `[token-goat: compressed, full via mcp-output ${id}]
+      if (id === null) id = storeMcpOutput(event.sessionId, toolName, toolInput, resultText);
+      if (id !== null) {
+        return {
+          hookType: "rewriteOutput",
+          updatedOutput: `[token-goat: compressed, full via mcp-output ${id}]
 ${compressed}`
-      };
+        };
+      }
     }
   }
   return passOutput();
@@ -30252,7 +30744,7 @@ registerHook("post_tool_use", postBrowserImageHandler);
 
 // src/baseline.ts
 import * as fs19 from "node:fs";
-import * as path22 from "node:path";
+import * as path23 from "node:path";
 var SKIP_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -30282,6 +30774,7 @@ function walkProject(rootDir, opts = {}) {
   const languages = {};
   const stack = [rootDir];
   const excludeTests = opts.excludeTests === true;
+  const includeEmbeddableDocuments = opts.includeEmbeddableDocuments === true;
   const extraSkipDirs = loadConfig().indexing.skip_dirs;
   while (stack.length > 0 && files.length < MAX_FILES_SCANNED) {
     const dir = stack.pop();
@@ -30293,7 +30786,7 @@ function walkProject(rootDir, opts = {}) {
       continue;
     }
     for (const entry of entries) {
-      const full = path22.join(dir, entry.name);
+      const full = path23.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (SKIP_DIRS.has(entry.name) || extraSkipDirs.includes(entry.name)) continue;
         if (entry.name.startsWith(".") && entry.name !== ".") {
@@ -30302,7 +30795,7 @@ function walkProject(rootDir, opts = {}) {
         stack.push(full);
       } else if (entry.isFile()) {
         const lang = detectLanguage(full);
-        if (lang === "unknown") continue;
+        if (lang === "unknown" && !(includeEmbeddableDocuments && isEmbeddableDocument(full))) continue;
         if (excludeTests && isTestFile(full)) continue;
         files.push(full);
         languages[lang] = (languages[lang] ?? 0) + 1;
@@ -30338,9 +30831,11 @@ function fetchTopSymbols(limit, dbPath, rootDir) {
   }
 }
 function buildProjectMap(rootDir = process.cwd(), opts = {}) {
-  const root = path22.resolve(rootDir);
-  const { files, languages } = walkProject(root, { excludeTests: loadConfig().repomap.exclude_tests });
-  const symbolLimit = opts.compact ? 10 : 30;
+  const root = path23.resolve(rootDir);
+  const config = loadConfig();
+  const { files, languages } = walkProject(root, { excludeTests: config.repomap.exclude_tests });
+  const compact = opts.compact === true || files.length > config.repomap.compact_file_threshold;
+  const symbolLimit = compact ? 10 : 30;
   const topSymbols = fetchTopSymbols(symbolLimit, globalDbPath(), root);
   const recentFiles = files.map((f) => {
     let mtime;
@@ -30350,18 +30845,19 @@ function buildProjectMap(rootDir = process.cwd(), opts = {}) {
       mtime = 0;
     }
     return { f, mtime };
-  }).sort((a, b) => b.mtime - a.mtime).slice(0, opts.compact ? 5 : 15).map((x) => path22.relative(root, x.f));
+  }).sort((a, b) => b.mtime - a.mtime).slice(0, compact ? 5 : 15).map((x) => path23.relative(root, x.f));
   return {
     rootDir: root,
     fileCount: files.length,
     languages,
     topSymbols,
-    recentFiles
+    recentFiles,
+    compact
   };
 }
 function formatProjectMap(map2, compact = false) {
   const lines = [];
-  const rel = path22.basename(map2.rootDir);
+  const rel = path23.basename(map2.rootDir);
   lines.push(`# Project map: ${rel}`);
   lines.push(`Files: ${map2.fileCount}`);
   const langPairs = Object.entries(map2.languages).sort((a, b) => b[1] - a[1]);
@@ -30374,7 +30870,7 @@ function formatProjectMap(map2, compact = false) {
       if (compact) {
         lines.push(`- ${s.name} (${s.kind})`);
       } else {
-        const loc = `${path22.basename(s.filePath)}:${s.lineStart}-${s.lineEnd}`;
+        const loc = `${path23.basename(s.filePath)}:${s.lineStart}-${s.lineEnd}`;
         lines.push(`- ${s.name} (${s.kind}) \u2014 ${loc}`);
       }
     }
@@ -30398,7 +30894,7 @@ function buildSubagentBriefing() {
     lines.push("## Session briefing (for context)");
     try {
       const map2 = buildProjectMap(process.cwd(), { compact: true });
-      const mapText = formatProjectMap(map2, true);
+      const mapText = formatProjectMap(map2, map2.compact);
       lines.push(mapText);
     } catch {
     }