token-goat 2.9.12 → 2.9.14

package/dist/{token-goat-chunk-THLHC6QJ.mjs → token-goat-chunk-XVZ4MNQC.mjs}

@@ -4,31 +4,25 @@ import {
   canRunWrappedShell,
   clipToDeliveryCap,
   deliveredOutputBytes
-} from "./token-goat-chunk-6NIGPPN6.mjs";
+} from "./token-goat-chunk-3XQPEJMV.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
-  accumulateResidentLines,
   buildCommandManifest,
   checkSymbolBodySize,
   flattenCommandNames,
   getWebOutput,
   isReconcileClean,
-  lineMayCarryResidentSignal,
   readStdinJson,
-  readTranscriptTail,
   reconcileProject,
-  repeatedSkillBodyHint,
-  storeWebOutput,
-  summarizeResidentContext,
-  taskListPruneHint
-} from "./token-goat-chunk-A6QTLAWO.mjs";
+  storeWebOutput
+} from "./token-goat-chunk-ZYNNQ36L.mjs";
 import {
-  BASH_OUTPUT_SUBDIR,
   GENERIC_SERVED_OUTPUT_KEY,
   OUTLINE_MAX_REPLACEMENT_RATIO,
   OUTLINE_MIN_HEADINGS,
   WEB_FETCH_KEY_SEP,
+  accumulateResidentLines,
   appendDirtyPath,
   applyHintTracking,
   buildDeltaCapsule,
@@ -36,10 +30,8 @@ import {
   classifyBashHint,
   classifyEditHint,
   clearCurlDownload,
-  commandHash,
   compactPathFor,
   computeAdaptiveBudget,
-  countSymbols,
   enqueueDirtyPathSafe,
   ensureWorkerAlive,
   extractCompactFromMarker,
@@ -53,7 +45,6 @@ import {
   formatHeadingTreeParts,
   formatProjectMap,
   formatShrinkSummary,
-  getBashOutput,
   getBashOutputId,
   getContextPressure,
   getCurlDownloadPath,
@@ -61,7 +52,6 @@ import {
   getFileServedOutputs,
   getGlobMatchCount,
   getGrepMatchCount,
-  getMonitoringRecallHint,
   getOutstandingAgentSpawns,
   getSessionBashOutputs,
   getSessionBashReruns,
@@ -71,15 +61,11 @@ import {
   hasSessionOutput,
   imageQualifiesForShrink,
   incrementSkillHit,
-  indexRecallEntry,
   indexServedBody,
   installedSkillPath,
-  isBashEntryStale,
-  isBuildCommand,
-  isScopedGitStatusOrDiffStatCommand,
   isStructuralRewriteAccepted,
-  isTestRunnerCommand,
   lastTabContextMatches,
+  lineMayCarryResidentSignal,
   listSiblingSessionStates,
   loadSessionCache,
   loadSessionState,
@@ -96,6 +82,7 @@ import {
   planSourceSkeleton,
   preToolPathDeclined,
   probeImageMeta,
+  readTranscriptTail,
   recordBashOutput,
   recordBashRerun,
   recordCliRead,
@@ -113,74 +100,96 @@ import {
   recordSymbolRead,
   recordWebFetch,
   removeOutstandingAgentSpawn,
+  repeatedSkillBodyHint,
   saveSessionState,
   scanAndRecord,
   servedRunNotice,
   sessionOutputBodyBytes,
   sessionSidecarPath,
   setLastTabContext,
+  setTranscriptPath,
   shrinkImage,
-  storeBashOutput,
-  storeBlob,
   storeOutput,
-  summarizeOutputDelta,
+  summarizeResidentContext,
   takePendingLargeFileHint,
+  taskListPruneHint,
   visionTokens,
   visionTokensSaved,
   vscodePathAllowed,
   wasCliReadThisSession,
   wasFileReadThisSession,
   wasHintShown
-} from "./token-goat-chunk-GM6QZWCF.mjs";
+} from "./token-goat-chunk-IT6O3PNN.mjs";
 import {
+  BASH_OUTPUT_SUBDIR,
   BODY_FIRST_TOOL_RESPONSE_KEYS,
   OUTPUT_FIRST_TOOL_RESPONSE_KEYS,
+  commandHash,
   compressOutput,
   contextOutput,
+  countSymbols,
   dedupeConsecutive,
   denyOutput,
   detectFromCommand,
-  detectHarness,
-  detectLanguage,
   emitRewrite,
   emitRewriteIfChanged,
-  envBool,
-  envInt,
   estimateTokens,
   extractToolResponseField,
   extractToolResultText,
   filterByName,
-  findProject,
+  getBashOutput,
   getCwd,
-  getDb,
   getFilePath,
-  getHarnessName,
+  getMonitoringRecallHint,
   getToolInput,
   getToolName,
+  getTranscriptPath,
   hasBareBackgroundOrNewline,
   hasUnquotedOperator,
+  indexRecallEntry,
+  isBashEntryStale,
+  isBuildCommand,
   isMcpErrorResponse,
   isRewriteWorthwhile,
-  isUnderSystemTemp,
-  languageHasFlag,
-  loadConfig,
+  isScopedGitStatusOrDiffStatCommand,
+  isTestRunnerCommand,
+  isTextualContentBlock,
   makeDedupHintHandlers,
+  mcpContentBlocks,
   normalizePayload,
   passOutput,
   readCopilotHooksOwners,
-  recordStat,
-  redactSecrets,
   registerHook,
   resolveMinNetSavingsBytes,
   runHook,
-  savedTokensFromBytes,
   serializeOutput,
   sessionStateKey,
   shlexSplit,
-  shortFingerprint,
   splitOwnTrailingNotices,
+  storeBashOutput,
+  summarizeOutputDelta,
+  withPreservedBlocks
+} from "./token-goat-chunk-VZYD4OZB.mjs";
+import {
+  detectLanguage,
+  getDb,
+  languageHasFlag,
+  recordStat,
+  redactSecrets,
+  savedTokensFromBytes,
+  storeBlob,
   stripAnsiEscapes
-} from "./token-goat-chunk-TOGYS5A7.mjs";
+} from "./token-goat-chunk-T2IWWTHB.mjs";
+import {
+  detectHarness,
+  envBool,
+  envInt,
+  findProject,
+  getHarnessName,
+  isUnderSystemTemp,
+  loadConfig,
+  shortFingerprint
+} from "./token-goat-chunk-SAQ5PG4L.mjs";
 import {
   ENV_KEYS,
   IDENTICAL_READ_MIN_BODY_BYTES,
@@ -207,7 +216,7 @@ import {
   runGit,
   toDisplayPath,
   toKB
-} from "./token-goat-chunk-LOCOX2ML.mjs";
+} from "./token-goat-chunk-AMYCQJX4.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -740,7 +749,7 @@ function mergeManifestFiles(parent, siblingFiles) {
   }
   return Array.from(byPath.values());
 }
-function buildManifest(sessionId, cwd) {
+function buildManifest(sessionId, cwd, transcriptPath) {
   const ownFiles = [...getSessionFiles().values()];
   const siblingFiles = sessionId !== void 0 ? listSiblingSessionStates(sessionId).flatMap((s) => s.files) : [];
   const files = siblingFiles.length > 0 ? mergeManifestFiles(ownFiles, siblingFiles) : ownFiles;
@@ -772,7 +781,7 @@ function buildManifest(sessionId, cwd) {
   );
   lines.push(...buildSafeToDiscardSection(files));
   lines.push(...buildMemEpochSection());
-  return capManifestChars(lines.join("\n"), sessionId, cwd);
+  return capManifestChars(lines.join("\n"), sessionId, cwd, transcriptPath);
 }
 function gitDirtySignals(cwd) {
   const timeoutMs = loadConfig().hints.git_hint_max_ms;
@@ -790,11 +799,11 @@ function gitDirtySignals(cwd) {
   }
   return { hasPendingDiff, hasUncommittedChanges };
 }
-function adaptiveCharBonus(sessionId, cwd) {
+function adaptiveCharBonus(sessionId, cwd, transcriptPath) {
   if (!cwd) return 0;
   const cache = loadSessionCache(sessionId ?? "") ?? {};
   const ageSecs = cache.created_ts !== void 0 ? Math.max(0, Date.now() / 1e3 - cache.created_ts) : 0;
-  const contextPressure = getContextPressure(cache);
+  const contextPressure = getContextPressure(cache, transcriptPath);
   const { hasPendingDiff, hasUncommittedChanges } = gitDirtySignals(cwd);
   if (!hasPendingDiff && !hasUncommittedChanges) return 0;
   const baseline = computeAdaptiveBudget(cache, ageSecs, { contextPressure });
@@ -802,11 +811,11 @@ function adaptiveCharBonus(sessionId, cwd) {
   const deltaTokens = Math.max(0, withGitSignal - baseline);
   return deltaTokens * 3;
 }
-function capManifestChars(manifest, sessionId, cwd) {
+function capManifestChars(manifest, sessionId, cwd, transcriptPath) {
   const cap = loadConfig().compact_assist.max_manifest_chars;
   if (cap <= 0) return manifest;
   if (manifest.length <= cap) return manifest;
-  const effectiveCap = cap + adaptiveCharBonus(sessionId, cwd);
+  const effectiveCap = cap + adaptiveCharBonus(sessionId, cwd, transcriptPath);
   if (manifest.length <= effectiveCap) return manifest;
   const omitted = manifest.length - effectiveCap;
   return manifest.slice(0, effectiveCap) + `
@@ -879,7 +888,7 @@ function summaryBudgetDirective(budgetChars) {
 function preCompactHandler(event) {
   const out = loadConfig().compact_assist.enabled ? contextOutput(`${MANIFEST_PREAMBLE}${summaryBudgetDirective(loadConfig().compact_assist.summary_budget_chars)}
 
-${buildManifest(event.sessionId, getCwd(event))}`) : passOutput();
+${buildManifest(event.sessionId, getCwd(event), getTranscriptPath(event))}`) : passOutput();
   markCompacted();
   return out;
 }
@@ -927,7 +936,7 @@ init_define_import_meta_env();
 var TRACKED_SKILL = "token-goat";
 var MAX_COMMANDS_SHOWN = 8;
 async function currentCommandNames() {
-  const { buildProgram } = await import("./token-goat-chunk-HKFOH6JH.mjs");
+  const { buildProgram } = await import("./token-goat-chunk-O5WAMISC.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -7638,115 +7647,21 @@ registerHook("post_tool_use", postSkillHandler, { toolName: "Skill" });
 
 // src/hooks_bash.ts
 init_define_import_meta_env();
-import { statSync as statSync4, existsSync, openSync as openSync2, readSync, closeSync as closeSync2 } from "node:fs";
-var CD_PREFIX_RE = /^(?:cd\s+(?:"[^"]*"|'[^']*'|\S+)[ \t]*(?:&&|;|\r?\n)\s*)+/;
-function stripCdPrefix(cmd) {
-  const stripped = cmd.replace(CD_PREFIX_RE, "");
-  return stripped.trim() || cmd;
-}
-function stripTrailingStderrRedirect(cmd) {
-  const stripped = cmd.replace(/\s*2>&1\s*$/, "");
-  return stripped.trim() || cmd;
-}
-function hasTestRunScopeOrBudget(cmd) {
-  const hasTimeout = /(?:^|\s)(?:timeout(?:\.exe)?\s+\S+|--(?:test)?timeout(?:=|\s)\S+)/i.test(cmd);
-  const hasSelector = /(?:\s::\S+|\s(?:-k|-t|-run|--(?:testNamePattern|last-failed|test|project))(?:=|\s)|\b(?:tests?|spec)\S*\.(?:[cm]?[jt]sx?|py|go|rs)\b|(?:^|\s)\.\/\S+)/i.test(cmd);
-  return hasTimeout || hasSelector;
-}
-function isDirectTestRunnerCommand(cmd) {
-  return /^(?:pytest|(?:npx\s+)?(?:jest|vitest)|go\s+test|cargo\s+test)\b/i.test(cmd);
-}
-function extractCdPrefixDirs(rawCmd) {
-  const prefixMatch = rawCmd.match(CD_PREFIX_RE);
-  if (prefixMatch === null) return [];
-  const dirs = [];
-  const segmentPattern = /cd\s+(?:"([^"]*)"|'([^']*)'|(\S+))[ \t]*(?:&&|;|\r?\n)/g;
-  let match;
-  while ((match = segmentPattern.exec(prefixMatch[0])) !== null) {
-    const dir = match[1] ?? match[2] ?? match[3];
-    if (dir !== void 0) dirs.push(dir);
-  }
-  return dirs;
-}
-function resolveCdHintPath(rawCmd, filePath, cwd) {
-  if (extractCdPrefixDirs(rawCmd).length === 0) return filePath;
-  return resolveIndexPath(filePath, cdPrefixCwd(rawCmd, cwd));
-}
-function cdPrefixCwd(rawCmd, cwd) {
-  let dir = cwd;
-  for (const target of extractCdPrefixDirs(rawCmd)) dir = resolveIndexPath(target, dir);
-  return dir;
-}
+import { statSync as statSync6, existsSync } from "node:fs";
+
+// src/hooks_bash_commands.ts
+init_define_import_meta_env();
+import { statSync as statSync5 } from "node:fs";
+
+// src/bash_extractors.ts
+init_define_import_meta_env();
+import { statSync as statSync4, openSync as openSync2, readSync, closeSync as closeSync2 } from "node:fs";
 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, 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;
-  let inDouble = false;
-  let cut = cmd.length;
-  let backslashes = 0;
-  for (let i = 0; i < cmd.length; i++) {
-    const ch = cmd[i];
-    if (ch === "\\") {
-      backslashes++;
-      continue;
-    }
-    const escaped = backslashes % 2 === 1;
-    backslashes = 0;
-    if (ch === "'" && !inDouble) {
-      if (!escaped) inSingle = !inSingle;
-    } else if (ch === '"' && !inSingle) {
-      if (!escaped) inDouble = !inDouble;
-    } else if (ch === "|" && !inSingle && !inDouble) {
-      if (cmd[i + 1] === "|") {
-        i++;
-        continue;
-      }
-      cut = i;
-      break;
-    }
-  }
-  let base = cmd.slice(0, cut);
-  let prev;
-  do {
-    prev = base;
-    const masked = base.replace(/"((?:[^"\\]|\\.)*)"/g, (_m, inner) => '"' + " ".repeat(inner.length) + '"').replace(/'([^']*)'/g, (_m, inner) => "'" + " ".repeat(inner.length) + "'");
-    const newMasked = masked.replace(/\s*(?:[0-9]*>&[0-9]+|[0-9&]*>>?\s*(?:"[^"]*"|'[^']*'|[^\s|]+))\s*$/, "");
-    if (newMasked.length < masked.length) {
-      base = base.slice(0, newMasked.length);
-    }
-  } while (base !== prev);
-  return base.trim();
-}
-function pipelineDivergenceNote(cmd, entryCommand) {
-  if (entryCommand === cmd) return "";
-  const preview = entryCommand.length > 60 ? entryCommand.slice(0, 57) + "..." : entryCommand;
-  return " (cached from a differently-piped run, `" + preview + "` \u2014 verify it covers what you need before trusting it)";
-}
-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;
-var GIT_RESTORE_RE = /^\s*git\s+restore\b/i;
-var GIT_RESTORE_STAGED_ONLY_RE = /(?:^|\s)(?:--staged|-S)(?:\s|$)/;
-var GIT_STASH_APPLY_RE = /^\s*git\s+stash\s+(?:pop|apply)\b/i;
-var PATCH_APPLY_SEGMENT_RE = /^\s*(?:\S*[/\\])?(?:git\s+apply|patch)\b/i;
-var PATCH_APPLY_INSPECT_ONLY_RE = /(?:^|\s)--(?:check|stat|numstat|summary|dry-run)(?:\s|=|$)/i;
-function isFormatterWriteSegment(segment) {
-  return /(?:^|\s|[/\\])(?:prettier|eslint)\b/i.test(segment) && /(?:^|\s)--(?:write|fix)(?:\s|$)/i.test(segment);
-}
 function splitShellSegments(cmd) {
   const segments = [];
   let cur = "";
@@ -7779,174 +7694,38 @@ function splitShellSegments(cmd) {
   segments.push(cur);
   return segments.map((s) => s.trim()).filter((s) => s.length > 0);
 }
-function safeShlexSplit(segment) {
-  try {
-    return shlexSplit(segment);
-  } catch {
-    return null;
-  }
+function isTempPath(fp) {
+  const norm = fp.replace(/\\/g, "/");
+  return /^\/tmp\//i.test(norm) || /\/var\/folders\//i.test(norm) || // Anchored to a local drive root on purpose. Unanchored, this clause said yes to
+  // `//host/share/AppData/Local/Temp/x.md`, and the caller's answer to yes is to stat the path --
+  // which on Windows opens an SMB session to whatever host a command named. A temp directory is
+  // somewhere on a local volume; nothing that starts with two separators is one.
+  /^[a-z]:\/(?:[^/]+\/)*AppData\/Local\/Temp\//i.test(norm) || norm.startsWith("/c/Users/") && norm.includes("/AppData/Local/Temp/") || isUnderSystemTemp(fp);
 }
-function segmentCommandIs(segment, name2) {
-  return new RegExp("^\\s*(?:\\S*[/\\\\])?" + name2 + "(?:\\.exe)?\\b", "i").test(segment);
+function isOrchestratorStateFile(filePath) {
+  const basename3 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
+  return /^\.improve-state-/.test(basename3);
 }
-function extractSedInPlaceFiles(segment) {
-  if (!segmentCommandIs(segment, "sed")) return [];
-  const tokens = safeShlexSplit(segment);
-  if (tokens === null) return [];
-  const rest = tokens.slice(1);
-  const inPlaceIdx = rest.findIndex((t) => t === "--in-place" || t.startsWith("--in-place=") || /^-[a-zA-Z]*i/.test(t));
-  if (inPlaceIdx === -1) return [];
-  const files = [];
-  let scriptTaken = rest.some((t) => t === "-e" || t === "-f" || t.startsWith("--expression") || t.startsWith("--file"));
-  for (let i = 0; i < rest.length; i++) {
-    const t = rest[i];
-    if (i === inPlaceIdx) {
-      if (t === "-i" && rest[i + 1] === "") i++;
-      continue;
-    }
-    if (t === "-e" || t === "-f" || t === "--expression" || t === "--file") {
-      i++;
-      continue;
-    }
-    if (t.length > 1 && t.startsWith("-")) continue;
-    if (!scriptTaken) {
-      scriptTaken = true;
-      continue;
-    }
-    files.push(t);
-  }
-  return files;
+function extractCatSourceFile(cmd) {
+  const m = /^cat\s+(\S+\.(?:java|py|ts|tsx|js|jsx|go|rb|rs|cpp|cc|cxx|c|h|hpp|kt|swift|cs|php|scala|clj|css|scss|sass|less))\s*$/.exec(cmd);
+  return m?.[1] ?? null;
 }
-function extractTeeFiles(segment) {
-  if (!segmentCommandIs(segment, "tee")) return [];
-  const tokens = safeShlexSplit(segment);
-  if (tokens === null) return [];
-  return tokens.slice(1).filter((t) => t.length > 0 && !t.startsWith("-"));
+function classifyFileExtensions(filePath) {
+  const basename3 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
+  const isEnvFile = /^\.env(\.\w+)?$/i.test(basename3);
+  const hasKnownExt = /\.(?:java|py|ts|tsx|js|jsx|go|rb|rs|cpp|cc|cxx|c|h|hpp|kt|swift|cs|php|scala|clj|css|scss|sass|less|md|mdx|rst|txt|json|yaml|yml|toml|xml|conf|cfg|ini|properties|sql|ps1|psm1|env)$/i.test(filePath);
+  if (!hasKnownExt && !isEnvFile) return null;
+  const isSql = /\.sql$/i.test(filePath);
+  const isDoc = /\.(?:md|mdx|rst|txt)$/i.test(filePath);
+  const isEnv = isEnvFile || /\.env$/i.test(filePath);
+  const isConfig = /\.(?:json|yaml|yml|toml|conf|cfg|ini|properties)$/i.test(filePath);
+  return { isDoc, isEnv, isConfig, isSql };
 }
-function extractRedirectTargets(segment) {
-  const targets = [];
-  const re = /(?:^|\s)[0-9]?>>?\s*("[^"]*"|'[^']*'|[^\s|&<>]+)/g;
-  let m;
-  while ((m = re.exec(segment)) !== null) {
-    const raw = m[1];
-    targets.push(raw.length >= 2 && (raw[0] === '"' || raw[0] === "'") ? raw.slice(1, -1) : raw);
-  }
-  return targets;
-}
-function extractGitRestorePathspecs(cmd) {
-  const m = /^\s*git\s+restore\b(.*)$/i.exec(cmd);
-  if (m === null) return [];
-  const tokens = safeShlexSplit(m[1] ?? "");
-  if (tokens === null) return [];
-  const dashDash = tokens.indexOf("--");
-  if (dashDash !== -1) return tokens.slice(dashDash + 1);
-  const specs = [];
-  let skipNext = false;
-  for (const t of tokens) {
-    if (skipNext) {
-      skipNext = false;
-      continue;
-    }
-    if (t === "-s" || t === "--source") {
-      skipNext = true;
-      continue;
-    }
-    if (t.startsWith("-")) continue;
-    specs.push(t);
-  }
-  return specs;
-}
-function gitRepoRoot(gitDir) {
-  const toplevel = runGit(["rev-parse", "--show-toplevel"], { cwd: gitDir, timeoutMs: 5e3 });
-  return toplevel.exitCode === 0 && toplevel.stdout.trim() !== "" ? toplevel.stdout.trim() : gitDir;
-}
-function expandGitPathspecs(specs, gitDir) {
-  if (specs.length === 0) return [];
-  const listed = runGit(["ls-files", "--full-name", "--", ...specs], { cwd: gitDir, timeoutMs: 5e3 });
-  if (listed.exitCode !== 0) return [];
-  const repoRoot = gitRepoRoot(gitDir);
-  return listed.stdout.split("\n").map((l) => l.trim()).filter((l) => l.length > 0).map((rel) => resolveIndexPath(rel, repoRoot));
-}
-function workingTreeStatusPaths(gitDir) {
-  const status = runGit(["status", "--porcelain"], { cwd: gitDir, timeoutMs: 5e3 });
-  if (status.exitCode !== 0) return [];
-  const repoRoot = gitRepoRoot(gitDir);
-  const out = [];
-  for (const line of status.stdout.split("\n")) {
-    if (line.length < 4) continue;
-    let rel = line.slice(3).trim();
-    if (rel.length === 0) continue;
-    const arrow = rel.lastIndexOf(" -> ");
-    if (arrow !== -1) rel = rel.slice(arrow + 4);
-    if (rel.startsWith('"')) {
-      try {
-        rel = JSON.parse(rel);
-      } catch {
-        continue;
-      }
-    }
-    out.push(resolveIndexPath(rel, repoRoot));
-  }
-  return out;
-}
-function enqueueRewrittenPath(absPath) {
-  if (/(?:^|[/\\])(?:NUL|nul)$/.test(absPath) || absPath.replace(/\\/g, "/").endsWith("/dev/null")) return;
-  try {
-    if (!statSync4(absPath).isFile()) return;
-  } catch {
-    return;
-  }
-  enqueueDirtyPathSafe(absPath, { alreadyResolved: true });
-}
-function enqueueNonHeadMovingRewrites(cmd, rawCmd, cwd) {
-  const atCwd = (f) => resolveIndexPath(resolveCdHintPath(rawCmd, f, cwd), cwd);
-  const paths = [];
-  let needsStatusSweep = GIT_STASH_APPLY_RE.test(cmd);
-  if (GIT_RESTORE_RE.test(cmd) && !GIT_RESTORE_STAGED_ONLY_RE.test(cmd)) {
-    paths.push(...expandGitPathspecs(extractGitRestorePathspecs(cmd), cwd));
-  }
-  for (const segment of splitShellSegments(cmd)) {
-    if (PATCH_APPLY_SEGMENT_RE.test(segment) && !PATCH_APPLY_INSPECT_ONLY_RE.test(segment)) needsStatusSweep = true;
-    if (isFormatterWriteSegment(segment)) needsStatusSweep = true;
-    for (const f of extractSedInPlaceFiles(segment)) paths.push(atCwd(f));
-    for (const f of extractTeeFiles(segment)) paths.push(atCwd(f));
-    for (const f of extractRedirectTargets(segment)) paths.push(atCwd(f));
-  }
-  if (needsStatusSweep) paths.push(...workingTreeStatusPaths(cwd));
-  for (const p of paths) enqueueRewrittenPath(p);
-}
-function isTempPath(fp) {
-  const norm = fp.replace(/\\/g, "/");
-  return /^\/tmp\//i.test(norm) || /\/var\/folders\//i.test(norm) || // Anchored to a local drive root on purpose. Unanchored, this clause said yes to
-  // `//host/share/AppData/Local/Temp/x.md`, and the caller's answer to yes is to stat the path --
-  // which on Windows opens an SMB session to whatever host a command named. A temp directory is
-  // somewhere on a local volume; nothing that starts with two separators is one.
-  /^[a-z]:\/(?:[^/]+\/)*AppData\/Local\/Temp\//i.test(norm) || norm.startsWith("/c/Users/") && norm.includes("/AppData/Local/Temp/") || isUnderSystemTemp(fp);
-}
-function isOrchestratorStateFile(filePath) {
-  const basename3 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
-  return /^\.improve-state-/.test(basename3);
-}
-function extractCatSourceFile(cmd) {
-  const m = /^cat\s+(\S+\.(?:java|py|ts|tsx|js|jsx|go|rb|rs|cpp|cc|cxx|c|h|hpp|kt|swift|cs|php|scala|clj|css|scss|sass|less))\s*$/.exec(cmd);
-  return m?.[1] ?? null;
-}
-function classifyFileExtensions(filePath) {
-  const basename3 = (filePath.includes("/") ? filePath.split("/").at(-1) : filePath.split("\\").at(-1)) ?? filePath;
-  const isEnvFile = /^\.env(\.\w+)?$/i.test(basename3);
-  const hasKnownExt = /\.(?:java|py|ts|tsx|js|jsx|go|rb|rs|cpp|cc|cxx|c|h|hpp|kt|swift|cs|php|scala|clj|css|scss|sass|less|md|mdx|rst|txt|json|yaml|yml|toml|xml|conf|cfg|ini|properties|sql|ps1|psm1|env)$/i.test(filePath);
-  if (!hasKnownExt && !isEnvFile) return null;
-  const isSql = /\.sql$/i.test(filePath);
-  const isDoc = /\.(?:md|mdx|rst|txt)$/i.test(filePath);
-  const isEnv = isEnvFile || /\.env$/i.test(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 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;
@@ -8817,21 +8596,504 @@ function buildRecallHint(cmd, outputId) {
   if (isTscCommand(cmd)) {
     return "Output from a prior `" + cmdPreview + "` run is cached. Use `token-goat bash-output " + outputId + ' --grep "error TS"` to filter TypeScript errors, or `--grep "Cannot find"` for missing module errors.';
   }
-  if (isDevServerCommand(cmd)) {
-    return "Dev server output cached (`" + cmdPreview + "`). Use `token-goat bash-output " + outputId + ' --tail 20` to see the latest output, or `--grep "error\\|warn"` to filter issues.';
+  if (isDevServerCommand(cmd)) {
+    return "Dev server output cached (`" + cmdPreview + "`). Use `token-goat bash-output " + outputId + ' --tail 20` to see the latest output, or `--grep "error\\|warn"` to filter issues.';
+  }
+  return "Output from a prior `" + cmdPreview + "` run is cached. Use `token-goat bash-output " + outputId + "` (or `--tail 50`, `--grep ERROR`) to re-inspect it without re-running.";
+}
+function shellQuoteSingle(s) {
+  return `'${s.replace(/'/g, `'\\''`)}'`;
+}
+function isCompressibleSingleCommand(cmd) {
+  if (!cmd || cmd.length > 65536) return false;
+  if (["$(", "`"].some((op) => cmd.includes(op))) return false;
+  if (hasUnquotedOperator(cmd, ["&&", "||", "|", ";", "<", ">"])) return false;
+  if (hasBareBackgroundOrNewline(cmd)) return false;
+  return true;
+}
+
+// src/hooks_bash_commands.ts
+var CD_PREFIX_RE = /^(?:cd\s+(?:"[^"]*"|'[^']*'|\S+)[ \t]*(?:&&|;|\r?\n)\s*)+/;
+function stripCdPrefix(cmd) {
+  const stripped = cmd.replace(CD_PREFIX_RE, "");
+  return stripped.trim() || cmd;
+}
+function stripTrailingStderrRedirect(cmd) {
+  const stripped = cmd.replace(/\s*2>&1\s*$/, "");
+  return stripped.trim() || cmd;
+}
+function hasTestRunScopeOrBudget(cmd) {
+  const hasTimeout = /(?:^|\s)(?:timeout(?:\.exe)?\s+\S+|--(?:test)?timeout(?:=|\s)\S+)/i.test(cmd);
+  const hasSelector = /(?:\s::\S+|\s(?:-k|-t|-run|--(?:testNamePattern|last-failed|test|project))(?:=|\s)|\b(?:tests?|spec)\S*\.(?:[cm]?[jt]sx?|py|go|rs)\b|(?:^|\s)\.\/\S+)/i.test(cmd);
+  return hasTimeout || hasSelector;
+}
+function isDirectTestRunnerCommand(cmd) {
+  return /^(?:pytest|(?:npx\s+)?(?:jest|vitest)|go\s+test|cargo\s+test)\b/i.test(cmd);
+}
+function extractCdPrefixDirs(rawCmd) {
+  const prefixMatch = rawCmd.match(CD_PREFIX_RE);
+  if (prefixMatch === null) return [];
+  const dirs = [];
+  const segmentPattern = /cd\s+(?:"([^"]*)"|'([^']*)'|(\S+))[ \t]*(?:&&|;|\r?\n)/g;
+  let match;
+  while ((match = segmentPattern.exec(prefixMatch[0])) !== null) {
+    const dir = match[1] ?? match[2] ?? match[3];
+    if (dir !== void 0) dirs.push(dir);
+  }
+  return dirs;
+}
+function resolveCdHintPath(rawCmd, filePath, cwd) {
+  if (extractCdPrefixDirs(rawCmd).length === 0) return filePath;
+  return resolveIndexPath(filePath, cdPrefixCwd(rawCmd, cwd));
+}
+function cdPrefixCwd(rawCmd, cwd) {
+  let dir = cwd;
+  for (const target of extractCdPrefixDirs(rawCmd)) dir = resolveIndexPath(target, dir);
+  return dir;
+}
+function stripOutputPipeline(cmd) {
+  let inSingle = false;
+  let inDouble = false;
+  let cut = cmd.length;
+  let backslashes = 0;
+  for (let i = 0; i < cmd.length; i++) {
+    const ch = cmd[i];
+    if (ch === "\\") {
+      backslashes++;
+      continue;
+    }
+    const escaped = backslashes % 2 === 1;
+    backslashes = 0;
+    if (ch === "'" && !inDouble) {
+      if (!escaped) inSingle = !inSingle;
+    } else if (ch === '"' && !inSingle) {
+      if (!escaped) inDouble = !inDouble;
+    } else if (ch === "|" && !inSingle && !inDouble) {
+      if (cmd[i + 1] === "|") {
+        i++;
+        continue;
+      }
+      cut = i;
+      break;
+    }
+  }
+  let base = cmd.slice(0, cut);
+  let prev;
+  do {
+    prev = base;
+    const masked = base.replace(/"((?:[^"\\]|\\.)*)"/g, (_m, inner) => '"' + " ".repeat(inner.length) + '"').replace(/'([^']*)'/g, (_m, inner) => "'" + " ".repeat(inner.length) + "'");
+    const newMasked = masked.replace(/\s*(?:[0-9]*>&[0-9]+|[0-9&]*>>?\s*(?:"[^"]*"|'[^']*'|[^\s|]+))\s*$/, "");
+    if (newMasked.length < masked.length) {
+      base = base.slice(0, newMasked.length);
+    }
+  } while (base !== prev);
+  return base.trim();
+}
+function pipelineDivergenceNote(cmd, entryCommand) {
+  if (entryCommand === cmd) return "";
+  const preview = entryCommand.length > 60 ? entryCommand.slice(0, 57) + "..." : entryCommand;
+  return " (cached from a differently-piped run, `" + preview + "` \u2014 verify it covers what you need before trusting it)";
+}
+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)?--(?:\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;
+var GIT_RESTORE_RE = /^\s*git\s+restore\b/i;
+var GIT_RESTORE_STAGED_ONLY_RE = /(?:^|\s)(?:--staged|-S)(?:\s|$)/;
+var GIT_STASH_APPLY_RE = /^\s*git\s+stash\s+(?:pop|apply)\b/i;
+var PATCH_APPLY_SEGMENT_RE = /^\s*(?:\S*[/\\])?(?:git\s+apply|patch)\b/i;
+var PATCH_APPLY_INSPECT_ONLY_RE = /(?:^|\s)--(?:check|stat|numstat|summary|dry-run)(?:\s|=|$)/i;
+function isFormatterWriteSegment(segment) {
+  return /(?:^|\s|[/\\])(?:prettier|eslint)\b/i.test(segment) && /(?:^|\s)--(?:write|fix)(?:\s|$)/i.test(segment);
+}
+function safeShlexSplit(segment) {
+  try {
+    return shlexSplit(segment);
+  } catch {
+    return null;
+  }
+}
+function segmentCommandIs(segment, name2) {
+  return new RegExp("^\\s*(?:\\S*[/\\\\])?" + name2 + "(?:\\.exe)?\\b", "i").test(segment);
+}
+function extractSedInPlaceFiles(segment) {
+  if (!segmentCommandIs(segment, "sed")) return [];
+  const tokens = safeShlexSplit(segment);
+  if (tokens === null) return [];
+  const rest = tokens.slice(1);
+  const inPlaceIdx = rest.findIndex((t) => t === "--in-place" || t.startsWith("--in-place=") || /^-[a-zA-Z]*i/.test(t));
+  if (inPlaceIdx === -1) return [];
+  const files = [];
+  let scriptTaken = rest.some((t) => t === "-e" || t === "-f" || t.startsWith("--expression") || t.startsWith("--file"));
+  for (let i = 0; i < rest.length; i++) {
+    const t = rest[i];
+    if (i === inPlaceIdx) {
+      if (t === "-i" && rest[i + 1] === "") i++;
+      continue;
+    }
+    if (t === "-e" || t === "-f" || t === "--expression" || t === "--file") {
+      i++;
+      continue;
+    }
+    if (t.length > 1 && t.startsWith("-")) continue;
+    if (!scriptTaken) {
+      scriptTaken = true;
+      continue;
+    }
+    files.push(t);
+  }
+  return files;
+}
+function extractTeeFiles(segment) {
+  if (!segmentCommandIs(segment, "tee")) return [];
+  const tokens = safeShlexSplit(segment);
+  if (tokens === null) return [];
+  return tokens.slice(1).filter((t) => t.length > 0 && !t.startsWith("-"));
+}
+function extractRedirectTargets(segment) {
+  const targets = [];
+  const re = /(?:^|\s)[0-9]?>>?\s*("[^"]*"|'[^']*'|[^\s|&<>]+)/g;
+  let m;
+  while ((m = re.exec(segment)) !== null) {
+    const raw = m[1];
+    targets.push(raw.length >= 2 && (raw[0] === '"' || raw[0] === "'") ? raw.slice(1, -1) : raw);
+  }
+  return targets;
+}
+function extractGitRestorePathspecs(cmd) {
+  const m = /^\s*git\s+restore\b(.*)$/i.exec(cmd);
+  if (m === null) return [];
+  const tokens = safeShlexSplit(m[1] ?? "");
+  if (tokens === null) return [];
+  const dashDash = tokens.indexOf("--");
+  if (dashDash !== -1) return tokens.slice(dashDash + 1);
+  const specs = [];
+  let skipNext = false;
+  for (const t of tokens) {
+    if (skipNext) {
+      skipNext = false;
+      continue;
+    }
+    if (t === "-s" || t === "--source") {
+      skipNext = true;
+      continue;
+    }
+    if (t.startsWith("-")) continue;
+    specs.push(t);
+  }
+  return specs;
+}
+function gitRepoRoot(gitDir) {
+  const toplevel = runGit(["rev-parse", "--show-toplevel"], { cwd: gitDir, timeoutMs: 5e3 });
+  return toplevel.exitCode === 0 && toplevel.stdout.trim() !== "" ? toplevel.stdout.trim() : gitDir;
+}
+function expandGitPathspecs(specs, gitDir) {
+  if (specs.length === 0) return [];
+  const listed = runGit(["ls-files", "--full-name", "--", ...specs], { cwd: gitDir, timeoutMs: 5e3 });
+  if (listed.exitCode !== 0) return [];
+  const repoRoot = gitRepoRoot(gitDir);
+  return listed.stdout.split("\n").map((l) => l.trim()).filter((l) => l.length > 0).map((rel) => resolveIndexPath(rel, repoRoot));
+}
+function workingTreeStatusPaths(gitDir) {
+  const status = runGit(["status", "--porcelain"], { cwd: gitDir, timeoutMs: 5e3 });
+  if (status.exitCode !== 0) return [];
+  const repoRoot = gitRepoRoot(gitDir);
+  const out = [];
+  for (const line of status.stdout.split("\n")) {
+    if (line.length < 4) continue;
+    let rel = line.slice(3).trim();
+    if (rel.length === 0) continue;
+    const arrow = rel.lastIndexOf(" -> ");
+    if (arrow !== -1) rel = rel.slice(arrow + 4);
+    if (rel.startsWith('"')) {
+      try {
+        rel = JSON.parse(rel);
+      } catch {
+        continue;
+      }
+    }
+    out.push(resolveIndexPath(rel, repoRoot));
+  }
+  return out;
+}
+function enqueueRewrittenPath(absPath) {
+  if (/(?:^|[/\\])(?:NUL|nul)$/.test(absPath) || absPath.replace(/\\/g, "/").endsWith("/dev/null")) return;
+  try {
+    if (!statSync5(absPath).isFile()) return;
+  } catch {
+    return;
+  }
+  enqueueDirtyPathSafe(absPath, { alreadyResolved: true });
+}
+function enqueueNonHeadMovingRewrites(cmd, rawCmd, cwd) {
+  const atCwd = (f) => resolveIndexPath(resolveCdHintPath(rawCmd, f, cwd), cwd);
+  const paths = [];
+  let needsStatusSweep = GIT_STASH_APPLY_RE.test(cmd);
+  if (GIT_RESTORE_RE.test(cmd) && !GIT_RESTORE_STAGED_ONLY_RE.test(cmd)) {
+    paths.push(...expandGitPathspecs(extractGitRestorePathspecs(cmd), cwd));
+  }
+  for (const segment of splitShellSegments(cmd)) {
+    if (PATCH_APPLY_SEGMENT_RE.test(segment) && !PATCH_APPLY_INSPECT_ONLY_RE.test(segment)) needsStatusSweep = true;
+    if (isFormatterWriteSegment(segment)) needsStatusSweep = true;
+    for (const f of extractSedInPlaceFiles(segment)) paths.push(atCwd(f));
+    for (const f of extractTeeFiles(segment)) paths.push(atCwd(f));
+    for (const f of extractRedirectTargets(segment)) paths.push(atCwd(f));
+  }
+  if (needsStatusSweep) paths.push(...workingTreeStatusPaths(cwd));
+  for (const p of paths) enqueueRewrittenPath(p);
+}
+var PIPELINE_PASSTHROUGH_HEADS = /* @__PURE__ */ new Set(["head", "tail", "cat", "tee", "less", "more"]);
+var CI_FILTER_NAMES = /^(?:generic-ci|jest|vitest|pytest|go_test|cargo_test|cargo|go|make|cmake|gradle|maven|dotnet|turbo|nx|lerna|webpack|eslint|ruff|clippy|flake8|mypy|prettier|tsc)$/;
+function isCiBuildTestSegment(cleaned, cwd) {
+  if (isTestRunnerCommand(cleaned) || isBuildCommand(cleaned) || isTscCommand(cleaned)) return true;
+  if (/^\s*(npm|pnpm|yarn|bun)\s+(run\s+)?(test|build|lint|typecheck|check|ci|guards)\b/i.test(cleaned)) return true;
+  if (/^\s*(cargo|go|dotnet|make|gradle|mvn|pytest|vitest|jest|eslint|ruff)\b/i.test(cleaned)) return true;
+  const detected = detectFromCommand(cleaned, cwd ?? void 0);
+  if (detected !== null && CI_FILTER_NAMES.test(detected.filter.name)) return true;
+  return false;
+}
+function pipelineShapeFilter(cmd, cwd) {
+  if (hasUnquotedOperator(cmd, ["&&", "||", ";"])) {
+    const forSplit2 = cmd.replace(/\s2>(?:&1|\/dev\/null)/g, "");
+    if (hasBareBackgroundOrNewline(forSplit2)) return null;
+    const segments2 = splitShellSegments(forSplit2);
+    if (segments2.length >= 2) {
+      let recognizedCiCount = 0;
+      for (const segment of segments2) {
+        const cleaned = stripOutputPipeline(segment.trim());
+        if (cleaned.length === 0) continue;
+        if (isCiBuildTestSegment(cleaned, cwd)) {
+          recognizedCiCount++;
+        }
+      }
+      if (recognizedCiCount > 0) {
+        return filterByName("generic-ci");
+      }
+    }
+    return null;
+  }
+  const forSplit = cmd.replace(/\s2>(?:&1|\/dev\/null)/g, "");
+  if (hasBareBackgroundOrNewline(forSplit)) return null;
+  const segments = splitShellSegments(forSplit);
+  if (segments.length < 2) return null;
+  for (const segment of segments.slice(1)) {
+    const head = safeShlexSplit(segment)?.[0];
+    if (head === void 0) return null;
+    if (!PIPELINE_PASSTHROUGH_HEADS.has(head.replace(/^.*[/\\]/, ""))) return null;
+  }
+  const detected = detectFromCommand(stripOutputPipeline(cmd), cwd ?? void 0);
+  return detected === null ? null : detected.filter;
+}
+function pureFileReadPath(cmd) {
+  const single = extractCatFile(cmd)?.filePath ?? extractHeadFile(cmd)?.filePath ?? extractTailFile(cmd)?.filePath ?? extractLineRangeRead(cmd)?.filePath;
+  if (single !== void 0) return single;
+  return singleFileCompoundReadPath(cmd);
+}
+function singleFileCompoundReadPath(cmd) {
+  const reads = extractLineRangeReadsCompound(cmd);
+  if (reads === null || reads.length !== 1) return null;
+  return reads[0]?.filePath ?? null;
+}
+function deliveredLineNumbers(cmd, lineCount) {
+  const ranged = extractLineRangeRead(cmd);
+  if (ranged !== null) {
+    const nums = [];
+    for (const [lo, hi] of ranged.ranges) for (let n = lo; n <= hi; n++) nums.push(n);
+    if (nums.length === 0) return null;
+    while (nums.length < lineCount) nums.push((nums[nums.length - 1] ?? 0) + 1);
+    return nums;
+  }
+  if (extractCatFile(cmd) !== null || extractHeadFile(cmd) !== null) return Array.from({ length: lineCount }, (_, i) => i + 1);
+  if (singleFileCompoundReadPath(cmd) !== null) return Array.from({ length: lineCount }, () => null);
+  return null;
+}
+var WHOLE_FILE_DUMP_RE = /^(?:(?:cat|type|Get-Content|gc)|(?:head|tail)[ \t]+-n[ \t]+\d+)[ \t]+(?:"([A-Za-z0-9._\-/\\:+@ ]+)"|'([A-Za-z0-9._\-/\\:+@ ]+)'|([A-Za-z0-9._\-/\\:+@]+))(?:[ \t]+2>(?:&1|\/dev\/null))?[ \t]*$/i;
+function isWholeFileDump(cmd, extractedPath) {
+  const m = WHOLE_FILE_DUMP_RE.exec(cmd);
+  if (m === null) return false;
+  const shaped = m[1] ?? m[2] ?? m[3];
+  return shaped !== void 0 && shaped === extractedPath;
+}
+function unwrapCompressCommand(executed) {
+  const t = executed.trim();
+  if (!/^(?:token-goat|tg)\s+compress\b/.test(t)) return null;
+  let argv;
+  try {
+    argv = shlexSplit(t);
+  } catch {
+    return null;
+  }
+  for (let i = 0; i + 1 < argv.length; i++) {
+    const tok = argv[i];
+    if (tok === "-c" || tok === "--cmd") return argv[i + 1] ?? null;
+    if (tok === "--cmd-b64") {
+      try {
+        return Buffer.from(argv[i + 1] ?? "", "base64").toString("utf8");
+      } catch {
+        return null;
+      }
+    }
+  }
+  return null;
+}
+function detectUnbalancedShellSyntax(cmd) {
+  let inSingle = false;
+  let inDouble = false;
+  let i = 0;
+  while (i < cmd.length) {
+    const ch = cmd[i];
+    if (inSingle) {
+      if (ch === "'") {
+        inSingle = false;
+      }
+      i++;
+      continue;
+    }
+    if (inDouble) {
+      if (ch === "\\" && i + 1 < cmd.length) {
+        i += 2;
+        continue;
+      }
+      if (ch === '"') {
+        inDouble = false;
+      }
+      i++;
+      continue;
+    }
+    if (ch === "\\" && i + 1 < cmd.length) {
+      i += 2;
+      continue;
+    }
+    if (ch === "$" && cmd[i + 1] === "(" && cmd[i + 2] === "(") {
+      let depth = 2;
+      let j = i + 3;
+      while (j < cmd.length && depth > 0) {
+        if (cmd[j] === "(") depth++;
+        else if (cmd[j] === ")") depth--;
+        j++;
+      }
+      i = j;
+      continue;
+    }
+    if (ch === "$" && cmd[i + 1] === "'") {
+      let j = i + 2;
+      let closed = false;
+      while (j < cmd.length) {
+        if (cmd[j] === "\\") {
+          j += 2;
+          continue;
+        }
+        if (cmd[j] === "'") {
+          j++;
+          closed = true;
+          break;
+        }
+        j++;
+      }
+      if (!closed) {
+        inSingle = true;
+        break;
+      }
+      i = j;
+      continue;
+    }
+    if (ch === "#" && (i === 0 || /\s/.test(cmd[i - 1] ?? ""))) {
+      const nl2 = cmd.indexOf("\n", i);
+      i = nl2 === -1 ? cmd.length : nl2 + 1;
+      continue;
+    }
+    if (ch === "'") {
+      inSingle = true;
+      i++;
+      continue;
+    }
+    if (ch === '"') {
+      inDouble = true;
+      i++;
+      continue;
+    }
+    if (ch === "<" && i + 1 < cmd.length && cmd[i + 1] === "<") {
+      if (i + 2 < cmd.length && cmd[i + 2] === "<") {
+        i += 3;
+        continue;
+      }
+      let j = i + 2;
+      let hasIndentModifier = false;
+      if (j < cmd.length && (cmd[j] === "-" || cmd[j] === "~")) {
+        hasIndentModifier = true;
+        j++;
+      }
+      while (j < cmd.length && cmd[j] === " ") {
+        j++;
+      }
+      if (j < cmd.length) {
+        let delimStart = j;
+        if (cmd[j] === '"' || cmd[j] === "'") {
+          delimStart = j + 1;
+          const quoteChar = cmd[j];
+          let delimEnd = delimStart;
+          while (delimEnd < cmd.length && cmd[delimEnd] !== quoteChar) {
+            delimEnd++;
+          }
+          if (delimEnd >= cmd.length) {
+            return "an unclosed quote in a heredoc opener";
+          }
+          j = delimEnd + 1;
+        } else {
+          let delimEnd = delimStart;
+          while (delimEnd < cmd.length && /\w/.test(cmd.charAt(delimEnd))) {
+            delimEnd++;
+          }
+          j = delimEnd;
+        }
+        const delimiter = cmd.slice(delimStart, j).replace(/["']/g, "");
+        if (delimiter) {
+          let scanPos = j;
+          let terminatorEnd = -1;
+          while (scanPos <= cmd.length) {
+            const nl2 = cmd.indexOf("\n", scanPos);
+            const lineEnd = nl2 === -1 ? cmd.length : nl2;
+            let line = cmd.slice(scanPos, lineEnd);
+            if (line.endsWith("\r")) {
+              line = line.slice(0, -1);
+            }
+            const isMatch = hasIndentModifier ? line.trim() === delimiter : line === delimiter;
+            if (isMatch) {
+              terminatorEnd = nl2 === -1 ? cmd.length : nl2 + 1;
+              break;
+            }
+            if (nl2 === -1) break;
+            scanPos = nl2 + 1;
+          }
+          if (terminatorEnd === -1) {
+            return `an unterminated heredoc (${delimiter} never appears on its own line)`;
+          }
+          i = terminatorEnd;
+          continue;
+        }
+      }
+    }
+    i++;
+  }
+  if (inSingle) {
+    return "an unclosed single quote";
   }
-  return "Output from a prior `" + cmdPreview + "` run is cached. Use `token-goat bash-output " + outputId + "` (or `--tail 50`, `--grep ERROR`) to re-inspect it without re-running.";
-}
-function shellQuoteSingle(s) {
-  return `'${s.replace(/'/g, `'\\''`)}'`;
-}
-function isCompressibleSingleCommand(cmd) {
-  if (!cmd || cmd.length > 65536) return false;
-  if (["$(", "`"].some((op) => cmd.includes(op))) return false;
-  if (hasUnquotedOperator(cmd, ["&&", "||", "|", ";", "<", ">"])) return false;
-  if (hasBareBackgroundOrNewline(cmd)) return false;
-  return true;
+  if (inDouble) {
+    return "an unclosed double quote";
+  }
+  return null;
 }
+
+// src/hooks_bash.ts
 function maybeCompressRewrite(event, rawCmd, cmd) {
   if (process.env["TOKEN_GOAT_BASH_COMPRESS"] === "0") return null;
   if (event.raw["_tg_harness"] === "vscode") return null;
@@ -8857,96 +9119,6 @@ function maybeCompressRewrite(event, rawCmd, cmd) {
   const wrapped = `token-goat compress -f ${filterName} --timeout ${cfg.timeout_seconds} -c ${shellQuoteSingle(rawCmd)}`;
   return { hookType: "rewriteInput", updatedInput: { ...event.toolInput, command: wrapped } };
 }
-var PIPELINE_PASSTHROUGH_HEADS = /* @__PURE__ */ new Set(["head", "tail", "cat", "tee", "less", "more"]);
-var CI_BUILD_TEST_FILTER_NAMES = /* @__PURE__ */ new Set([
-  "generic-ci",
-  "jest",
-  "vitest",
-  "pytest",
-  "go_test",
-  "cargo_test",
-  "cargo",
-  "go",
-  "make",
-  "cmake",
-  "gradle",
-  "maven",
-  "dotnet",
-  "turbo",
-  "nx",
-  "lerna",
-  "webpack",
-  "eslint",
-  "ruff",
-  "clippy",
-  "flake8",
-  "mypy",
-  "prettier",
-  "tsc"
-]);
-function isCiBuildTestSegment(cleaned, cwd) {
-  if (isTestRunnerCommand(cleaned) || isBuildCommand(cleaned) || isTscCommand(cleaned)) return true;
-  if (/^\s*(npm|pnpm|yarn|bun)\s+(run\s+)?(test|build|lint|typecheck|check|ci|guards)\b/i.test(cleaned)) return true;
-  if (/^\s*(cargo|go|dotnet|make|gradle|mvn|pytest|vitest|jest|eslint|ruff)\b/i.test(cleaned)) return true;
-  const detected = detectFromCommand(cleaned, cwd ?? void 0);
-  if (detected !== null && CI_BUILD_TEST_FILTER_NAMES.has(detected.filter.name)) return true;
-  return false;
-}
-function pipelineShapeFilter(cmd, cwd) {
-  if (hasUnquotedOperator(cmd, ["&&", "||", ";"])) {
-    const forSplit2 = cmd.replace(/\s2>(?:&1|\/dev\/null)/g, "");
-    if (hasBareBackgroundOrNewline(forSplit2)) return null;
-    const segments2 = splitShellSegments(forSplit2);
-    if (segments2.length >= 2) {
-      let recognizedCiCount = 0;
-      for (const segment of segments2) {
-        const cleaned = stripOutputPipeline(segment.trim());
-        if (cleaned.length === 0) continue;
-        if (isCiBuildTestSegment(cleaned, cwd)) {
-          recognizedCiCount++;
-        }
-      }
-      if (recognizedCiCount > 0) {
-        return filterByName("generic-ci");
-      }
-    }
-    return null;
-  }
-  const forSplit = cmd.replace(/\s2>(?:&1|\/dev\/null)/g, "");
-  if (hasBareBackgroundOrNewline(forSplit)) return null;
-  const segments = splitShellSegments(forSplit);
-  if (segments.length < 2) return null;
-  for (const segment of segments.slice(1)) {
-    const head = safeShlexSplit(segment)?.[0];
-    if (head === void 0) return null;
-    if (!PIPELINE_PASSTHROUGH_HEADS.has(head.replace(/^.*[/\\]/, ""))) return null;
-  }
-  const detected = detectFromCommand(stripOutputPipeline(cmd), cwd ?? void 0);
-  return detected === null ? null : detected.filter;
-}
-function pureFileReadPath(cmd) {
-  const single = extractCatFile(cmd)?.filePath ?? extractHeadFile(cmd)?.filePath ?? extractTailFile(cmd)?.filePath ?? extractLineRangeRead(cmd)?.filePath;
-  if (single !== void 0) return single;
-  return singleFileCompoundReadPath(cmd);
-}
-function singleFileCompoundReadPath(cmd) {
-  const reads = extractLineRangeReadsCompound(cmd);
-  if (reads === null || reads.length !== 1) return null;
-  return reads[0]?.filePath ?? null;
-}
-function deliveredLineNumbers(cmd, lineCount) {
-  const ranged = extractLineRangeRead(cmd);
-  if (ranged !== null) {
-    const nums = [];
-    for (const [lo, hi] of ranged.ranges) for (let n = lo; n <= hi; n++) nums.push(n);
-    if (nums.length === 0) return null;
-    while (nums.length < lineCount) nums.push((nums[nums.length - 1] ?? 0) + 1);
-    return nums;
-  }
-  if (extractCatFile(cmd) !== null || extractHeadFile(cmd) !== null) return Array.from({ length: lineCount }, (_, i) => i + 1);
-  if (singleFileCompoundReadPath(cmd) !== null) return Array.from({ length: lineCount }, () => null);
-  return null;
-}
 function elideServedShellLines(cmd, output, priorIds, unknownLineNumbers = false) {
   if (priorIds.length === 0) return null;
   const lines = output.split("\n");
@@ -8999,19 +9171,12 @@ function foldShellReadBodies(cmd, output, fileKey, cwd) {
   if (folded === null) return null;
   return { text: folded.numbered.join("\n"), folds: folded.folds };
 }
-var WHOLE_FILE_DUMP_RE = /^(?:(?:cat|type|Get-Content|gc)|(?:head|tail)[ \t]+-n[ \t]+\d+)[ \t]+(?:"([A-Za-z0-9._\-/\\:+@ ]+)"|'([A-Za-z0-9._\-/\\:+@ ]+)'|([A-Za-z0-9._\-/\\:+@]+))(?:[ \t]+2>(?:&1|\/dev\/null))?[ \t]*$/i;
-function isWholeFileDump(cmd, extractedPath) {
-  const m = WHOLE_FILE_DUMP_RE.exec(cmd);
-  if (m === null) return false;
-  const shaped = m[1] ?? m[2] ?? m[3];
-  return shaped !== void 0 && shaped === extractedPath;
-}
 function foldShellReadStructure(cmd, filePath, output, fileKey, cwd) {
   if (!isWholeFileDump(cmd, filePath)) return null;
   const originalBytes = Buffer.byteLength(output, "utf-8");
   let onDisk;
   try {
-    onDisk = statSync4(fileKey).size;
+    onDisk = statSync6(fileKey).size;
   } catch {
     return null;
   }
@@ -9209,168 +9374,6 @@ function maybeFoldCurlHtml(cmd, output, id) {
   }
   return emitRewrite(notice + fenced, "curl HTML body cleaned", { kind: "bash_compress:curl-html", originalBytes: deliveredOutputBytes(originalBytes) });
 }
-function unwrapCompressCommand(executed) {
-  const t = executed.trim();
-  if (!/^(?:token-goat|tg)\s+compress\b/.test(t)) return null;
-  let argv;
-  try {
-    argv = shlexSplit(t);
-  } catch {
-    return null;
-  }
-  for (let i = 0; i + 1 < argv.length; i++) {
-    const tok = argv[i];
-    if (tok === "-c" || tok === "--cmd") return argv[i + 1] ?? null;
-  }
-  return null;
-}
-function detectUnbalancedShellSyntax(cmd) {
-  let inSingle = false;
-  let inDouble = false;
-  let i = 0;
-  while (i < cmd.length) {
-    const ch = cmd[i];
-    if (inSingle) {
-      if (ch === "'") {
-        inSingle = false;
-      }
-      i++;
-      continue;
-    }
-    if (inDouble) {
-      if (ch === "\\" && i + 1 < cmd.length) {
-        i += 2;
-        continue;
-      }
-      if (ch === '"') {
-        inDouble = false;
-      }
-      i++;
-      continue;
-    }
-    if (ch === "\\" && i + 1 < cmd.length) {
-      i += 2;
-      continue;
-    }
-    if (ch === "$" && cmd[i + 1] === "(" && cmd[i + 2] === "(") {
-      let depth = 2;
-      let j = i + 3;
-      while (j < cmd.length && depth > 0) {
-        if (cmd[j] === "(") depth++;
-        else if (cmd[j] === ")") depth--;
-        j++;
-      }
-      i = j;
-      continue;
-    }
-    if (ch === "$" && cmd[i + 1] === "'") {
-      let j = i + 2;
-      let closed = false;
-      while (j < cmd.length) {
-        if (cmd[j] === "\\") {
-          j += 2;
-          continue;
-        }
-        if (cmd[j] === "'") {
-          j++;
-          closed = true;
-          break;
-        }
-        j++;
-      }
-      if (!closed) {
-        inSingle = true;
-        break;
-      }
-      i = j;
-      continue;
-    }
-    if (ch === "#" && (i === 0 || /\s/.test(cmd[i - 1] ?? ""))) {
-      const nl2 = cmd.indexOf("\n", i);
-      i = nl2 === -1 ? cmd.length : nl2 + 1;
-      continue;
-    }
-    if (ch === "'") {
-      inSingle = true;
-      i++;
-      continue;
-    }
-    if (ch === '"') {
-      inDouble = true;
-      i++;
-      continue;
-    }
-    if (ch === "<" && i + 1 < cmd.length && cmd[i + 1] === "<") {
-      if (i + 2 < cmd.length && cmd[i + 2] === "<") {
-        i += 3;
-        continue;
-      }
-      let j = i + 2;
-      let hasIndentModifier = false;
-      if (j < cmd.length && (cmd[j] === "-" || cmd[j] === "~")) {
-        hasIndentModifier = true;
-        j++;
-      }
-      while (j < cmd.length && cmd[j] === " ") {
-        j++;
-      }
-      if (j < cmd.length) {
-        let delimStart = j;
-        if (cmd[j] === '"' || cmd[j] === "'") {
-          delimStart = j + 1;
-          const quoteChar = cmd[j];
-          let delimEnd = delimStart;
-          while (delimEnd < cmd.length && cmd[delimEnd] !== quoteChar) {
-            delimEnd++;
-          }
-          if (delimEnd >= cmd.length) {
-            return "an unclosed quote in a heredoc opener";
-          }
-          j = delimEnd + 1;
-        } else {
-          let delimEnd = delimStart;
-          while (delimEnd < cmd.length && /\w/.test(cmd.charAt(delimEnd))) {
-            delimEnd++;
-          }
-          j = delimEnd;
-        }
-        const delimiter = cmd.slice(delimStart, j).replace(/["']/g, "");
-        if (delimiter) {
-          let scanPos = j;
-          let terminatorEnd = -1;
-          while (scanPos <= cmd.length) {
-            const nl2 = cmd.indexOf("\n", scanPos);
-            const lineEnd = nl2 === -1 ? cmd.length : nl2;
-            let line = cmd.slice(scanPos, lineEnd);
-            if (line.endsWith("\r")) {
-              line = line.slice(0, -1);
-            }
-            const isMatch = hasIndentModifier ? line.trim() === delimiter : line === delimiter;
-            if (isMatch) {
-              terminatorEnd = nl2 === -1 ? cmd.length : nl2 + 1;
-              break;
-            }
-            if (nl2 === -1) break;
-            scanPos = nl2 + 1;
-          }
-          if (terminatorEnd === -1) {
-            return `an unterminated heredoc (${delimiter} never appears on its own line)`;
-          }
-          i = terminatorEnd;
-          continue;
-        }
-      }
-    }
-    i++;
-  }
-  if (inSingle) {
-    return "an unclosed single quote";
-  }
-  if (inDouble) {
-    return "an unclosed double quote";
-  }
-  return null;
-}
 function preBashHandlerInner(event) {
   const rawCmd = extractCommand(event);
   if (rawCmd === void 0) return passOutput();
@@ -9401,7 +9404,7 @@ function preBashHandlerInner(event) {
   }
   const toolResults = extractToolResultsFile(cmd);
   if (toolResults !== null) {
-    const { path: outPath } = toolResults;
+    const outPath = displaySafePath(toolResults.path);
     recordStat("session_hint", 0, 0);
     return contextOutput(
       "Tool output " + outPath + ' is a plain-text artifact. Use `token-goat bash-output --file "' + outPath + '"` to read it with surgical narrowing via `--grep PATTERN` or `--tail N`, instead of reading the whole file.'
@@ -9652,7 +9655,7 @@ function preBashHandlerInner(event) {
     const prevResolvedPath = prevPath !== null && commandPathIsTouchable(prevPath, event) ? resolveIndexPath(prevPath, preHookCwd ?? process.cwd()) : null;
     if (prevPath !== null && prevResolvedPath !== null && !existsSync(prevResolvedPath)) {
       clearCurlDownload(curlDl.url);
-    } else if (prevPath !== null && prevResolvedPath !== null && statSync4(prevResolvedPath).size >= loadConfig().hints.bash_dedup_min_bytes) {
+    } else if (prevPath !== null && prevResolvedPath !== null && statSync6(prevResolvedPath).size >= loadConfig().hints.bash_dedup_min_bytes) {
       recordStat("session_hint", 0, 0);
       return denyOutput(
         "Already downloaded to " + prevPath + " earlier this session. Use `rg '<pattern>' " + prevPath + '` to search it, or `token-goat read "' + prevPath + '::SectionName"` to read a part of it.'
@@ -10144,7 +10147,7 @@ registerHook("post_tool_use", postTaskOutputHandler, { toolName: "TaskOutput" })
 
 // src/hooks_tool_failure.ts
 init_define_import_meta_env();
-import { existsSync as existsSync2, readFileSync as readFileSync3, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync3, statSync as statSync7, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname as dirname2, relative } from "node:path";
 var FAILURE_SUFFIX = ".tool-failures.json";
 var MAX_TRACKED_FAILURES = 64;
@@ -10213,7 +10216,7 @@ function diagnoseEditFailure(event, errorText) {
   const absPath = normalizePath(filePath);
   if (!existsSync2(absPath)) return null;
   try {
-    const stat = statSync5(absPath);
+    const stat = statSync7(absPath);
     if (stat.size > MAX_EDIT_DIAGNOSE_BYTES) return null;
     const fileContent = readFileSync3(absPath, "utf8");
     const relDisplay = displaySafeText(relative(process.cwd(), absPath).replace(/\\/g, "/") || absPath);
@@ -10745,10 +10748,14 @@ function postMcpHandler(event) {
   if (!resultText) return passOutput();
   const injectionMatches = scanAndRecord(resultText);
   const redactedResult = redactSecrets(resultText);
-  const fenced = () => emitRewriteIfChanged(
-    resultText,
-    fenceWithMatches(redactedResult.text, injectionMatches, UNTRUSTED_TOOL_TAG),
-    "mcp"
+  const preserved = (mcpContentBlocks(event.raw) ?? []).filter((b) => !isTextualContentBlock(b));
+  const preserve = (output) => withPreservedBlocks(output, preserved);
+  const fenced = () => preserve(
+    emitRewriteIfChanged(
+      resultText,
+      fenceWithMatches(redactedResult.text, injectionMatches, UNTRUSTED_TOOL_TAG),
+      "mcp"
+    )
   );
   const passOrFence = () => fenced();
   if (!event.sessionId) return passOrFence();
@@ -10776,10 +10783,12 @@ function postMcpHandler(event) {
           minNetSavingsBytes: resolveMinNetSavingsBytes()
         });
         if (worthwhile) {
-          return emitRewrite(
-            `${notice}${fenceWithMatches(redactedBody, injectionMatches, UNTRUSTED_TOOL_TAG)}`,
-            "mcp",
-            { kind: "mcp:compress", originalBytes }
+          return preserve(
+            emitRewrite(
+              `${notice}${fenceWithMatches(redactedBody, injectionMatches, UNTRUSTED_TOOL_TAG)}`,
+              "mcp",
+              { kind: "mcp:compress", originalBytes }
+            )
           );
         }
       }
@@ -10877,6 +10886,7 @@ import { createHash } from "node:crypto";
 function getResponseContentBlocks(raw) {
   const tr = raw["tool_response"];
   if (!tr || typeof tr !== "object") return null;
+  if (Array.isArray(tr)) return tr;
   const content = tr["content"];
   return Array.isArray(content) ? content : null;
 }
@@ -10915,10 +10925,7 @@ async function shrinkImageBlock(block) {
         changed: true,
         // Decoded image bytes, not base64 characters. Both branches of this function file under the same `image_shrink` kind, and the shrink branch below credits `result.originalBytes - result.shrunkBytes` -- decoded bytes, the convention documented at image_shrink.ts's own recordStat call. Base64 inflates by 4/3, so crediting `originalDataUrl.length` here booked roughly 33% more for a repeat screenshot than an identical shrink of the same image, and the ledger summed the two units into one row. The gate above deliberately still measures the data URL: it decides whether the rewrite pays off on the wire, where base64 characters are what is actually sent.
         savedBytes: buffer.length - Buffer.byteLength(SCREENSHOT_REPEAT_NOTICE, "utf-8"),
-        // The whole image is withheld here rather than resized, so the visual tokens saved are its
-        // entire billed cost less the notice standing in for it. Billed cost, not raw patch count:
-        // an oversized screenshot would have been capped by the API's own downscale, so pricing the
-        // untouched dimensions would credit a bill that was never going to be sent.
+        // The whole image is withheld here rather than resized, so the visual tokens saved are its entire billed cost less the notice standing in for it. Billed cost, not raw patch count: an oversized screenshot would have been capped by the API's own downscale, so pricing the untouched dimensions would credit a bill that was never going to be sent.
         savedTokens: Math.max(0, visionTokens(meta?.width ?? 0, meta?.height ?? 0, tier) - savedTokensFromBytes(Buffer.byteLength(SCREENSHOT_REPEAT_NOTICE, "utf-8")))
       };
     }
@@ -11408,6 +11415,10 @@ async function relayInProcess(eventName, rawPayload) {
     if (!process.env["CLAUDE_CODE_SESSION_ID"] && event.sessionId) {
       process.env["CLAUDE_CODE_SESSION_ID"] = event.sessionId;
     }
+    const rawTranscriptPath = event.raw["transcript_path"];
+    if (typeof rawTranscriptPath === "string" && rawTranscriptPath !== "") {
+      setTranscriptPath(rawTranscriptPath, event.sessionId ?? "");
+    }
     if (!process.env["TRACEPARENT"] && event.traceparent) {
       process.env["TRACEPARENT"] = event.traceparent;
     }