token-goat 2.9.19 → 2.9.21

package/dist/{token-goat-chunk-HPMMLV37.mjs → token-goat-chunk-CZ5ZFJSN.mjs}

@@ -5,7 +5,7 @@ import {
   canRunWrappedShell,
   clipToDeliveryCap,
   deliveredOutputBytes
-} from "./token-goat-chunk-MU6I4IDI.mjs";
+} from "./token-goat-chunk-CMAJGP3E.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
@@ -17,29 +17,33 @@ import {
   flattenCommandNames,
   getWebOutput,
   isReconcileClean,
-  projectTranscriptsDir,
   readStdinJson,
   reconcileProject,
   storeWebOutput
-} from "./token-goat-chunk-2GTB5RBZ.mjs";
+} from "./token-goat-chunk-4V4OZHHV.mjs";
+import {
+  projectTranscriptsDir
+} from "./token-goat-chunk-KQI24O4B.mjs";
+import {
+  BUDGET_ESCALATION_MARKER,
+  MANIFEST_PREAMBLE,
+  MANIFEST_RECOVERY_PREAMBLE,
+  buildManifest,
+  manifestPrintedPaths,
+  summaryBudgetDirective
+} from "./token-goat-chunk-PDYQA3AP.mjs";
 import {
   BODY_FIRST_TOOL_RESPONSE_KEYS,
-  GENERIC_SERVED_OUTPUT_KEY,
   OUTLINE_MAX_REPLACEMENT_RATIO,
   OUTLINE_MIN_HEADINGS,
   OUTPUT_FIRST_TOOL_RESPONSE_KEYS,
-  WEB_FETCH_KEY_SEP,
-  accumulateResidentLines,
   appendDirtyPath,
   applyHintTracking,
   buildDeltaCapsule,
   buildProjectMap,
   classifyBashHint,
   classifyEditHint,
-  claudeConfigDir,
-  clearCurlDownload,
   compactPathFor,
-  computeAdaptiveBudget,
   contextOutput,
   denyOutput,
   emitRewrite,
@@ -47,8 +51,6 @@ import {
   enqueueDirtyPathSafe,
   ensureWorkerAlive,
   escapeHintName,
-  estimateTokens,
-  extractCompactFromMarker,
   extractToolResponseField,
   extractToolResultText,
   fenceUntrusted,
@@ -59,43 +61,19 @@ import {
   foldingEnabled,
   formatProjectMap,
   formatShrinkSummary,
-  getBashOutputId,
-  getContextPressure,
-  getCurlDownloadPath,
   getCwd,
-  getFileLineRanges,
   getFilePath,
-  getFileServedOutputs,
-  getGlobMatchCount,
-  getGrepMatchCount,
-  getOutstandingAgentSpawns,
-  getSessionBashOutputs,
-  getSessionBashReruns,
-  getSessionFiles,
-  getSessionWebFetches,
   getToolInput,
   getToolName,
   getTranscriptPath,
-  hasSeenImage,
-  hasSessionOutput,
   imageQualifiesForShrink,
-  incrementSkillHit,
   indexServedBody,
-  installedSkillPath,
   isMcpErrorResponse,
   isStructuralRewriteAccepted,
   isTextualContentBlock,
-  lastTabContextMatches,
-  lineMayCarryResidentSignal,
-  listSiblingSessionStates,
-  loadSessionCache,
-  loadSessionState,
   logSuppressedDetection,
   makeDedupHintHandlers,
   markCompactStale,
-  markCompacted,
-  markFileTruncated,
-  markHintShown,
   matchesAllowPattern,
   matchesDenyPattern,
   mcpContentBlocks,
@@ -108,8 +86,53 @@ import {
   planSourceSkeleton,
   preToolPathDeclined,
   probeImageMeta,
-  readCopilotHooksOwners,
-  readTranscriptTail,
+  recordKnownRootThrottled,
+  registerHook,
+  resolveLineRegions,
+  runHook,
+  scanAndRecord,
+  serializeOutput,
+  servedRunNotice,
+  sessionStateKey,
+  shrinkImage,
+  visionTokens,
+  visionTokensSaved,
+  vscodePathAllowed,
+  withPreservedBlocks
+} from "./token-goat-chunk-SMUYPBF5.mjs";
+import {
+  compressOutput,
+  detectFromCommand,
+  filterByName,
+  isRewriteWorthwhile,
+  looksLikePytestOutput,
+  pytestFilter,
+  resolveMinNetSavingsBytes
+} from "./token-goat-chunk-DDP64XR7.mjs";
+import {
+  readCopilotHooksOwners
+} from "./token-goat-chunk-MQACN7VG.mjs";
+import {
+  GENERIC_SERVED_OUTPUT_KEY,
+  clearCurlDownload,
+  extractCompactFromMarker,
+  getBashOutputId,
+  getCurlDownloadPath,
+  getFileLineRanges,
+  getFileServedOutputs,
+  getGlobMatchCount,
+  getGrepMatchCount,
+  getOutstandingAgentSpawns,
+  getSessionBashOutputs,
+  hasSeenImage,
+  hasSessionOutput,
+  incrementSkillHit,
+  installedSkillPath,
+  lastTabContextMatches,
+  loadSessionState,
+  markCompacted,
+  markFileTruncated,
+  markHintShown,
   recordBashOutput,
   recordBashRerun,
   recordCliRead,
@@ -120,47 +143,38 @@ import {
   recordFileServedOutput,
   recordGlobQuery,
   recordGrepQuery,
-  recordKnownRootThrottled,
   recordOutstandingAgentSpawn,
   recordScheduledPrompt,
   recordSeenImage,
   recordSymbolRead,
   recordWebFetch,
-  registerHook,
   removeOutstandingAgentSpawn,
-  repeatedSkillBodyHint,
-  resolveLineRegions,
-  runHook,
   saveSessionState,
-  scanAndRecord,
-  serializeOutput,
-  servedRunNotice,
   sessionOutputBodyBytes,
   sessionSidecarPath,
-  sessionStateKey,
   setLastTabContext,
   setTranscriptPath,
-  shrinkImage,
   storeOutput,
-  summarizeResidentContext,
   takePendingLargeFileHint,
-  taskListPruneHint,
-  visionTokens,
-  visionTokensSaved,
-  vscodePathAllowed,
   wasCliReadThisSession,
   wasFileReadThisSession,
-  wasHintShown,
-  withPreservedBlocks
-} from "./token-goat-chunk-FQYMZASI.mjs";
+  wasHintShown
+} from "./token-goat-chunk-MECDAPXB.mjs";
+import {
+  accumulateResidentLines,
+  claudeConfigDir,
+  estimateTokens,
+  lineMayCarryResidentSignal,
+  readTranscriptTail,
+  repeatedSkillBodyHint,
+  summarizeResidentContext,
+  taskListPruneHint
+} from "./token-goat-chunk-MEKVJZUN.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
   bashOutputIdSync,
   commandHash,
-  compressOutput,
   dedupeConsecutive,
-  detectFromCommand,
-  filterByName,
   getBashOutput,
   getMonitoringRecallHint,
   hasBareBackgroundOrNewline,
@@ -168,39 +182,36 @@ import {
   indexRecallEntry,
   isBashEntryStale,
   isBuildCommand,
-  isRewriteWorthwhile,
+  isRedirectAmpersand,
   isScopedGitStatusOrDiffStatCommand,
   isTestRunnerCommand,
-  looksLikePytestOutput,
   pathStem,
-  pytestFilter,
-  resolveMinNetSavingsBytes,
   shlexSplit,
   splitOwnTrailingNotices,
   storeBashOutput,
   summarizeOutputDelta
-} from "./token-goat-chunk-7DGTVBWP.mjs";
+} from "./token-goat-chunk-M43UJVYQ.mjs";
 import {
   recordStat,
   redactSecrets,
   savedTokensFromBytes,
   storeBlob,
   stripAnsiEscapes
-} from "./token-goat-chunk-S7RFIX4Y.mjs";
+} from "./token-goat-chunk-PHDNWISV.mjs";
 import {
   extractMarkdownHeadings,
   formatHeadingTreeParts
-} from "./token-goat-chunk-EP7TCWHM.mjs";
+} from "./token-goat-chunk-IAMIQLCV.mjs";
 import {
   countSymbols,
   getFileEntry,
   querySymbols
-} from "./token-goat-chunk-IBTFGZBX.mjs";
+} from "./token-goat-chunk-XQSSPX3X.mjs";
 import {
   detectLanguage,
   getDb,
   languageHasFlag
-} from "./token-goat-chunk-JNIFSVWM.mjs";
+} from "./token-goat-chunk-2ZHD3XCD.mjs";
 import {
   detectHarness,
   envBool,
@@ -211,7 +222,7 @@ import {
   isUnderSystemTemp,
   loadConfig,
   shortFingerprint
-} from "./token-goat-chunk-SOKAPOOC.mjs";
+} from "./token-goat-chunk-M6CDVASA.mjs";
 import {
   ENV_KEYS,
   IDENTICAL_READ_MIN_BODY_BYTES,
@@ -231,7 +242,7 @@ import {
   isInsideRoot,
   runGit,
   toKB
-} from "./token-goat-chunk-ZGQXRYKE.mjs";
+} from "./token-goat-chunk-TGBSMHPM.mjs";
 import {
   TOOL_RESULTS_ID_CHARS,
   UNTRUSTED_TOOL_TAG,
@@ -292,6 +303,52 @@ function stripUnsafeSuggestions(text) {
   }
 }
 
+// src/pending_context.ts
+init_define_import_meta_env();
+import { readFileSync, rmSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+var PENDING_SUFFIX = ".pending-context.txt";
+var MAX_PENDING_CONTEXT_BYTES = 4096;
+function queuePendingContext(stateKey, text) {
+  const trimmed = text.trim();
+  if (trimmed === "") return;
+  const target = sessionSidecarPath(stateKey, PENDING_SUFFIX);
+  if (target === null) return;
+  try {
+    const existing = readPending(target);
+    const merged = existing === null ? trimmed : `${existing}
+${trimmed}`;
+    const capped = merged.length <= MAX_PENDING_CONTEXT_BYTES ? merged : merged.slice(merged.length - MAX_PENDING_CONTEXT_BYTES);
+    ensureDirSync(dirname(target));
+    writeFileSync(target, capped, "utf8");
+  } catch {
+  }
+}
+function peekPendingContext(stateKey) {
+  const target = sessionSidecarPath(stateKey, PENDING_SUFFIX);
+  return target === null ? null : readPending(target);
+}
+function commitPendingContext(stateKey, delivered) {
+  if (delivered === null || delivered === "") return;
+  const target = sessionSidecarPath(stateKey, PENDING_SUFFIX);
+  if (target === null) return;
+  const queued = readPending(target);
+  if (queued === null) return;
+  if (!delivered.includes(queued) && !delivered.includes(stripUnsafeSuggestions(queued))) return;
+  try {
+    rmSync(target, { force: true });
+  } catch {
+  }
+}
+function readPending(target) {
+  try {
+    const raw = readFileSync(target, "utf8").trim();
+    return raw === "" ? null : raw;
+  } catch {
+    return null;
+  }
+}
+
 // src/vscode_duplicate.ts
 init_define_import_meta_env();
 import * as fs from "node:fs";
@@ -647,7 +704,9 @@ function postEditHandlerInner(event) {
       editedSize = statSync2(normalized).size;
     } catch {
     }
-    if (meetsSavingsFloor(editedSize)) {
+    if (!meetsSavingsFloor(editedSize)) {
+      logSuppressedDetection("edit_reread_suggest", event.sessionId, normalized);
+    } else {
       const escapedPath = displaySafePath(normalized).replace(/`/g, "\\`").replace(/"/g, '\\"');
       return contextOutput(
         displaySafePath(editedBasename) + ' was edited. Use `token-goat section "' + escapedPath + '::HeadingName"` to re-read a specific section rather than the full file.'
@@ -666,7 +725,7 @@ registerHook("post_tool_use", postEditHandler, { toolName: "NotebookEdit" });
 
 // src/hooks_write.ts
 init_define_import_meta_env();
-import { readFileSync, statSync as statSync3 } from "node:fs";
+import { readFileSync as readFileSync2, statSync as statSync3 } from "node:fs";
 var MAX_LINES_FOR_DIFF = 4e3;
 var MAX_OLD_FILE_BYTES_FOR_DIFF = 4 * 1024 * 1024;
 function splitLines(text) {
@@ -707,7 +766,7 @@ function preWriteRewriteHandler(event) {
     if (stat.size > MAX_OLD_FILE_BYTES_FOR_DIFF) return passOutput();
     let oldContent;
     try {
-      oldContent = readFileSync(filePath, "utf-8");
+      oldContent = readFileSync2(filePath, "utf-8");
     } catch {
       return passOutput();
     }
@@ -733,210 +792,48 @@ registerHook("pre_tool_use", preWriteRewriteHandler, { toolName: "Write" });
 
 // src/hooks_compact.ts
 init_define_import_meta_env();
-import { spawnSync } from "node:child_process";
 import * as path3 from "node:path";
-var MEM_EPOCH_TIMEOUT_MS = 800;
-var MAX_ROWS = 40;
-function appendCappedSection(lines, header, rows, cap) {
-  if (rows.length === 0) return;
-  lines.push("");
-  lines.push(header);
-  for (const row of rows.slice(0, cap)) lines.push(row);
-  if (rows.length > cap) lines.push(`- ...and ${rows.length - cap} more`);
-}
-function renderReadRow(entry) {
-  const kb = Math.max(1, toKB(entry.sizeBytes));
-  const plural = entry.readCount === 1 ? "read" : "reads";
-  const edited = entry.wasEdited ? ", edited" : "";
-  return `- ${displaySafePath(entry.path)} (${kb}kb, ${entry.readCount} ${plural}${edited})`;
-}
-function renderSymbolReadRow(entry) {
-  return `- ${displaySafePath(entry.path)} (symbols: ${(entry.symbols_read ?? []).map(displaySafeText).join(", ")})`;
-}
-function mergeManifestFiles(parent, siblingFiles) {
-  const byPath = /* @__PURE__ */ new Map();
-  for (const f of parent) byPath.set(foldPath(f.path), f);
-  for (const f of siblingFiles) {
-    const key = foldPath(f.path);
-    const prev = byPath.get(key);
-    if (prev === void 0) {
-      byPath.set(key, f);
-      continue;
-    }
-    const mergedSymbols = [.../* @__PURE__ */ new Set([...prev.symbols_read ?? [], ...f.symbols_read ?? []])];
-    byPath.set(key, {
-      path: prev.path,
-      readCount: Math.max(prev.readCount, f.readCount),
-      lastReadAt: Math.max(prev.lastReadAt, f.lastReadAt),
-      wasEdited: prev.wasEdited || f.wasEdited,
-      sizeBytes: f.lastReadAt >= prev.lastReadAt ? f.sizeBytes : prev.sizeBytes,
-      ...prev.wasTruncated || f.wasTruncated ? { wasTruncated: true } : {},
-      ...mergedSymbols.length > 0 ? { symbols_read: mergedSymbols } : {}
-    });
-  }
-  return Array.from(byPath.values());
-}
-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;
-  const editedFiles = files.filter((f) => f.wasEdited);
-  const readFiles = files.filter((f) => f.readCount > 0 && !f.wasEdited);
-  const symbolOnlyFiles = files.filter((f) => f.readCount === 0 && !f.wasEdited && (f.symbols_read?.length ?? 0) > 0);
-  const webFetches = [...getSessionWebFetches().entries()];
-  const lines = [];
-  lines.push("## Session context");
-  lines.push(`Files read: ${readFiles.length}`);
-  lines.push(`Files edited: ${editedFiles.length}`);
-  appendCappedSection(lines, "### Read files", readFiles.map(renderReadRow), MAX_ROWS);
-  appendCappedSection(
-    lines,
-    "### Edited files",
-    editedFiles.map((entry) => `- ${displaySafePath(entry.path)}`),
-    MAX_ROWS
-  );
-  appendCappedSection(lines, "### Surgically read files (symbol/section reads, never read whole)", symbolOnlyFiles.map(renderSymbolReadRow), MAX_ROWS);
-  appendCappedSection(
-    lines,
-    "### Web URLs fetched",
-    webFetches.map(([key, cacheId]) => {
-      const [url = key, prompt = ""] = key.split(WEB_FETCH_KEY_SEP);
-      const promptSuffix = prompt ? `, prompt: ${neutralizeSpokenMarkers(JSON.stringify(prompt))}` : "";
-      return `- ${displaySafeText(url)} (cacheId: ${cacheId}${promptSuffix})`;
-    }),
-    MAX_ROWS
-  );
-  lines.push(...buildSafeToDiscardSection(files));
-  lines.push(...buildMemEpochSection());
-  return capManifestChars(lines.join("\n"), sessionId, cwd, transcriptPath);
-}
-function gitDirtySignals(cwd) {
-  const timeoutMs = loadConfig().hints.git_hint_max_ms;
-  let hasPendingDiff = false;
-  try {
-    const diffResult = runGit(["diff", "--no-color", "--stat", "HEAD"], { cwd, timeoutMs });
-    hasPendingDiff = diffResult.exitCode === 0 && diffResult.stdout.trim() !== "";
-  } catch {
-  }
-  let hasUncommittedChanges = false;
-  try {
-    const statusResult = runGit(["status", "--porcelain"], { cwd, timeoutMs });
-    hasUncommittedChanges = statusResult.exitCode === 0 && statusResult.stdout.trim() !== "";
-  } catch {
-  }
-  return { hasPendingDiff, hasUncommittedChanges };
-}
-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, transcriptPath);
-  const { hasPendingDiff, hasUncommittedChanges } = gitDirtySignals(cwd);
-  if (!hasPendingDiff && !hasUncommittedChanges) return 0;
-  const baseline = computeAdaptiveBudget(cache, ageSecs, { contextPressure });
-  const withGitSignal = computeAdaptiveBudget(cache, ageSecs, { hasPendingDiff, hasUncommittedChanges, contextPressure });
-  const deltaTokens = Math.max(0, withGitSignal - baseline);
-  return deltaTokens * 3;
-}
-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, transcriptPath);
-  if (manifest.length <= effectiveCap) return manifest;
-  const omitted = manifest.length - effectiveCap;
-  return manifest.slice(0, effectiveCap) + `
-...(manifest truncated at ${effectiveCap} chars; ${omitted} chars omitted)`;
-}
-function buildSafeToDiscardSection(files) {
-  const rerunHashes = getSessionBashReruns();
-  const bashOutputs = getSessionBashOutputs();
-  const rerunHashSet = new Set(rerunHashes);
-  const rerunRows = [];
-  for (const hash of rerunHashes) {
-    const id = bashOutputs.find(([h]) => h === hash)?.[1];
-    if (id === void 0) continue;
-    const entry = getBashOutput(id);
-    if (entry === null) continue;
-    const flatCommand = neutralizeSpokenMarkers(entry.command.replace(/[\t\r\n]+/g, " "));
-    rerunRows.push("- `" + flatCommand + "` \u2014 an older run of this exact command was superseded; recall the surviving copy with `bash-output " + id + " --full`");
-  }
-  const supersededReadRows = [];
-  for (const f of files) {
-    if (f.readCount > 1 || f.wasEdited) {
-      const reason = f.wasEdited ? "edited after being read" : "re-read " + f.readCount + "x";
-      supersededReadRows.push("- " + displaySafePath(f.path) + " (" + reason + " \u2014 only the latest content already in context is current)");
-    }
-  }
-  const cachedOutputRows = [];
-  for (const [hash, id] of bashOutputs) {
-    if (rerunHashSet.has(hash)) continue;
-    const entry = getBashOutput(id);
-    if (entry === null) continue;
-    const flatCommand = neutralizeSpokenMarkers(entry.command.replace(/[\t\r\n]+/g, " "));
-    cachedOutputRows.push("- `" + flatCommand + "` \u2014 recallable via `bash-output " + id + " --full`");
-  }
-  const total = rerunRows.length + supersededReadRows.length + cachedOutputRows.length;
-  if (total === 0) return [];
-  const lines = [];
-  lines.push("");
-  lines.push("### SAFE_TO_DISCARD (" + total + " items \u2014 provably inert; each is recallable, not gone)");
-  appendCappedSection(lines, "Superseded reruns (" + rerunRows.length + "):", rerunRows, MAX_ROWS);
-  appendCappedSection(lines, "Superseded file reads (" + supersededReadRows.length + "):", supersededReadRows, MAX_ROWS);
-  appendCappedSection(lines, "Other cached bash outputs (" + cachedOutputRows.length + "):", cachedOutputRows, MAX_ROWS);
-  return lines;
+
+// src/harness_channels.ts
+init_define_import_meta_env();
+var PROMPT_SUBMIT_CONTEXT_DROPPED = /* @__PURE__ */ new Set([]);
+function dropsPromptSubmitContext() {
+  return PROMPT_SUBMIT_CONTEXT_DROPPED.has(getHarnessName());
 }
-function buildMemEpochSection() {
-  let result;
-  try {
-    result = spawnSync("mem", ["epoch"], {
-      encoding: "utf-8",
-      timeout: MEM_EPOCH_TIMEOUT_MS,
-      windowsHide: true
-    });
-  } catch {
-    return [];
-  }
-  if (result.error !== void 0 || result.status !== 0) return [];
-  const stdout = typeof result.stdout === "string" ? result.stdout.trim() : "";
-  if (!/^\d+$/.test(stdout)) return [];
-  return [
-    "",
-    "### mem epoch",
-    `mem epoch: ${stdout} (no live TGMEM block is tracked in this session -- only the epoch counter is folded in; see buildMemEpochSection's doc comment)`
-  ];
-}
-var MANIFEST_PREAMBLE = "When summarizing this session, keep the file paths and symbol names below exactly as written -- they are the handles the next turn needs to resume work. Do not paraphrase them into prose.";
-var BUDGET_ESCALATION_MARKER = "TG-BUDGET-ESCALATION:";
-function summaryBudgetDirective(budgetChars) {
-  if (budgetChars <= 0) return "";
-  return ` Aim for at most ${budgetChars} characters. Prefer a shorter summary that keeps every path, symbol, command and decision over a longer one that reproduces tool output verbatim: cite the recall id (\`token-goat bash-output <id> --full\`) rather than quoting the output again. If this session genuinely cannot be summarized within that target without losing state the next turn needs, exceed it and open the summary with a single line reading \`${BUDGET_ESCALATION_MARKER} <one-sentence reason>\`.`;
+var PRE_COMPACT_CONTEXT_DROPPED = /* @__PURE__ */ new Set(["copilot_cli", "codex"]);
+function dropsPreCompactContext() {
+  return PRE_COMPACT_CONTEXT_DROPPED.has(getHarnessName());
 }
+
+// src/hooks_compact.ts
 function preCompactHandler(event) {
-  const out = loadConfig().compact_assist.enabled ? contextOutput(`${MANIFEST_PREAMBLE}${summaryBudgetDirective(loadConfig().compact_assist.summary_budget_chars)}
+  const cfg = loadConfig().compact_assist;
+  let out = passOutput();
+  if (cfg.enabled) {
+    const manifest = buildManifest(event.sessionId, getCwd(event), getTranscriptPath(event));
+    if (!dropsPreCompactContext()) {
+      out = contextOutput(`${MANIFEST_PREAMBLE}${summaryBudgetDirective(cfg.summary_budget_chars)}
+
+${manifest}`);
+    } else if (event.sessionId) {
+      queuePendingContext(sessionStateKey(event), `${MANIFEST_RECOVERY_PREAMBLE}
 
-${buildManifest(event.sessionId, getCwd(event), getTranscriptPath(event))}`) : passOutput();
+${manifest.slice(0, MAX_PENDING_CONTEXT_BYTES - MANIFEST_RECOVERY_PREAMBLE.length - 2)}`);
+    }
+  }
   markCompacted();
   return out;
 }
 registerHook("pre_compact", preCompactHandler);
 var MANIFEST_SURVIVAL_SAMPLE = 64;
-function manifestPathSample(sessionId) {
-  const ownFiles = [...getSessionFiles().values()];
-  const siblingFiles = sessionId !== void 0 ? listSiblingSessionStates(sessionId).flatMap((s) => s.files) : [];
-  const files = siblingFiles.length > 0 ? mergeManifestFiles(ownFiles, siblingFiles) : ownFiles;
-  const seen = /* @__PURE__ */ new Set();
-  for (const entry of files) {
-    if (entry.path) seen.add(entry.path);
-    if (seen.size >= MANIFEST_SURVIVAL_SAMPLE) break;
-  }
-  return [...seen];
+function manifestPathSample(event) {
+  return manifestPrintedPaths(event.sessionId, MANIFEST_SURVIVAL_SAMPLE, getCwd(event), getTranscriptPath(event));
 }
 function postCompactHandler(event) {
   const raw = event.raw["compact_summary"];
   const summary = typeof raw === "string" ? raw : "";
   const bytes = Buffer.byteLength(summary, "utf-8");
-  const sample = manifestPathSample(event.sessionId);
+  const sample = typeof raw === "string" ? manifestPathSample(event) : [];
   const cwd = normalizePath(getCwd(event) ?? process.cwd());
   const spell = (p) => foldPath(p.replaceAll("\\", "/"));
   const haystack = spell(summary);
@@ -969,7 +866,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-L2UOJBV4.mjs");
+  const { buildProgram } = await import("./token-goat-chunk-FZN77SZD.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -1021,55 +918,11 @@ async function checkSkillVersionDrift(sessionId) {
   }
 }
 
-// src/pending_context.ts
-init_define_import_meta_env();
-import { readFileSync as readFileSync2, rmSync as rmSync2, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
-var PENDING_SUFFIX = ".pending-context.txt";
-var MAX_PENDING_CONTEXT_BYTES = 4096;
-function queuePendingContext(sessionId, text) {
-  const trimmed = text.trim();
-  if (trimmed === "") return;
-  const target = sessionSidecarPath(sessionId, PENDING_SUFFIX);
-  if (target === null) return;
-  try {
-    const existing = readPending(target);
-    const merged = existing === null ? trimmed : `${existing}
-${trimmed}`;
-    const capped = merged.length <= MAX_PENDING_CONTEXT_BYTES ? merged : merged.slice(merged.length - MAX_PENDING_CONTEXT_BYTES);
-    ensureDirSync(dirname(target));
-    writeFileSync(target, capped, "utf8");
-  } catch {
-  }
-}
-function drainPendingContext(sessionId) {
-  const target = sessionSidecarPath(sessionId, PENDING_SUFFIX);
-  if (target === null) return null;
-  const text = readPending(target);
-  try {
-    rmSync2(target, { force: true });
-  } catch {
-  }
-  return text;
-}
-function readPending(target) {
-  try {
-    const raw = readFileSync2(target, "utf8").trim();
-    return raw === "" ? null : raw;
-  } catch {
-    return null;
-  }
-}
-
 // src/hooks_session.ts
-var PROMPT_SUBMIT_CONTEXT_DROPPED = /* @__PURE__ */ new Set([]);
-function dropsPromptSubmitContext() {
-  return PROMPT_SUBMIT_CONTEXT_DROPPED.has(getHarnessName());
-}
 function pendingContextHandler(event) {
   try {
-    if (!event.sessionId || !dropsPromptSubmitContext()) return passOutput();
-    const pending = drainPendingContext(event.sessionId);
+    if (!event.sessionId || !dropsPromptSubmitContext() && !dropsPreCompactContext()) return passOutput();
+    const pending = peekPendingContext(sessionStateKey(event));
     return pending === null ? passOutput() : contextOutput(pending);
   } catch {
     return passOutput();
@@ -1177,7 +1030,7 @@ async function userPromptSubmitHandler(event) {
     }
     const text = lines.join("\n");
     if (dropsPromptSubmitContext()) {
-      queuePendingContext(event.sessionId, text);
+      queuePendingContext(sessionStateKey(event), text);
       return passOutput();
     }
     return contextOutput(text);
@@ -1280,9 +1133,20 @@ function reconcileNote(cwd, indexed) {
     return null;
   }
 }
-function sessionStartHandler(event) {
+async function postCompactRecovery(event) {
+  if (event.raw["source"] !== "compact" || event.sessionId === void 0) return null;
+  if (!loadConfig().compact_assist.enabled) return null;
   try {
-    if (!loadConfig().hints.session_start_reminder) return passOutput();
+    const { buildResumePacket } = await import("./token-goat-chunk-CAHN4QU7.mjs");
+    return await buildResumePacket(event.sessionId);
+  } catch {
+    return null;
+  }
+}
+async function sessionStartHandler(event) {
+  const recovery = await postCompactRecovery(event);
+  try {
+    if (!loadConfig().hints.session_start_reminder) return recovery === null ? passOutput() : contextOutput(recovery);
     const cwd = getCwd(event);
     const indexed = isIndexedProject(cwd);
     let context = buildReminder(indexed);
@@ -1303,9 +1167,12 @@ ${capsule}`;
       }
     } catch {
     }
+    if (recovery !== null) context += `
+
+${recovery}`;
     return contextOutput(context);
   } catch {
-    return passOutput();
+    return recovery === null ? passOutput() : contextOutput(recovery);
   }
 }
 registerHook("session_start", sessionStartHandler);
@@ -7690,6 +7557,18 @@ init_define_import_meta_env();
 
 // src/bash_structural_index.ts
 init_define_import_meta_env();
+
+// src/index_freshness.ts
+init_define_import_meta_env();
+function indexMatchesDisk(resolved) {
+  const entry = getFileEntry(resolved);
+  if (entry === null) return false;
+  if (entry.sha === "") return true;
+  const diskSha = fingerprintFile(resolved);
+  return diskSha !== null && diskSha === entry.sha;
+}
+
+// src/bash_structural_index.ts
 import { statSync as statSync4 } from "node:fs";
 var ALLOWED_BINARIES = /* @__PURE__ */ new Set(["rg", "grep", "egrep", "fgrep"]);
 var PY_DEF_RE = /^\^?(?:async\s+)?def\b(?:\s+([A-Za-z_]\w*))?$/;
@@ -7720,12 +7599,7 @@ function detectStructuralIndexRewrite(rawCmd, cwd) {
       return null;
     }
     if (!stat.isFile()) return null;
-    const entry = getFileEntry(resolved);
-    if (entry === null) return null;
-    if (entry.sha !== "") {
-      const diskSha = fingerprintFile(resolved);
-      if (diskSha === null || diskSha !== entry.sha) return null;
-    }
+    if (!indexMatchesDisk(resolved)) return null;
     const pathArg = dualShellArg(rawPath);
     if (pathArg === null) return null;
     let target = null;
@@ -7773,12 +7647,7 @@ function rangeSubstituteFor(hintPath, cwd, ranges) {
   try {
     const resolved = resolveIndexPath(hintPath, cwd);
     if (!statSync5(resolved).isFile()) return null;
-    const entry = getFileEntry(resolved);
-    if (entry === null) return null;
-    if (entry.sha !== "") {
-      const diskSha = fingerprintFile(resolved);
-      if (diskSha === null || diskSha !== entry.sha) return null;
-    }
+    if (!indexMatchesDisk(resolved)) return null;
     const lines = readFileSync3(resolved, "utf8").split("\n");
     const symbols = querySymbols({ filePath: resolved, limit: ALL_SYMBOLS_IN_FILE });
     if (symbols.length === 0) return null;
@@ -7850,6 +7719,10 @@ function splitShellSegments(cmd) {
       i++;
       continue;
     }
+    if (ch === "&" && isRedirectAmpersand(cmd, i)) {
+      cur += ch;
+      continue;
+    }
     if (ch === "|" || ch === ";" || ch === "\n" || ch === "&") {
       segments.push(cur);
       cur = "";
@@ -7900,6 +7773,7 @@ function classifyCatPath(filePath, cmd0) {
   return { filePath, ...flags, cmd0 };
 }
 function extractCatFile(cmd) {
+  if (/-(?:TotalCount|Head|First|Tail)\b/i.test(cmd)) return null;
   const m = /^(cat|bat|type|Get-Content|gc)(?:\s+(?:-[a-zA-Z]+|--[a-zA-Z-]+))*\s+(?:"([^"]+)"|'([^']+)'|(\S+?))(?:\s+-[a-zA-Z].*?)?(?:\s+2>(&1|\/dev\/null))?\s*$/i.exec(cmd);
   if (!m) return null;
   const cmd0 = m[1];
@@ -7940,6 +7814,7 @@ function extractPowerShellWrappedGetContent(cmd, event) {
   if (!w) return null;
   const inner = (w[1] ?? w[2] ?? "").trim();
   if (!inner) return null;
+  if (/-(?:TotalCount|Head|First|Tail)\b/i.test(inner)) return null;
   const m = PS_GETCONTENT_INNER_RE.exec(inner);
   if (!m) return null;
   const filePath = m[1] ?? m[2] ?? m[3];
@@ -8464,6 +8339,25 @@ function extractGetContentSelectFirst(cmd) {
   const { isDoc, isConfig, isSql, isXml } = classifyDocConfig(filePath);
   return { filePath, isDoc, isConfig, isSql, isXml, n };
 }
+function extractGetContentHead(cmd) {
+  const headMatch = /-(?:TotalCount|Head|First)\s+(\d+)/i.exec(cmd);
+  if (!headMatch) return null;
+  const n = parseInt(headMatch[1], 10);
+  if (n <= 10) return null;
+  const getnMatch = /^(Get-Content|gc)\s+/i.exec(cmd);
+  if (!getnMatch) return null;
+  const afterCmd = cmd.slice(getnMatch[0].length).replace(/-Path\s+/i, "");
+  const beforeHead = afterCmd.split(/-(?:TotalCount|Head|First)/i)[0]?.trim() ?? "";
+  const afterHead = afterCmd.split(/-(?:TotalCount|Head|First)\s+\d+/i)[1]?.trim() ?? "";
+  const cleanedBefore = beforeHead.replace(/-(?:Encoding|Delimiter|Wait)\s+\S+/gi, "").replace(/-[a-zA-Z]+/g, "").trim();
+  const cleanedAfter = afterHead.replace(/-(?:Encoding|Delimiter|Wait)\s+\S+/gi, "").replace(/-[a-zA-Z]+/g, "").trim();
+  const filePath = (cleanedBefore || cleanedAfter).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|xml|dtsx|ampkg|xaml)$/i.test(filePath)) return null;
+  const { isDoc, isConfig, isSql, isXml } = classifyDocConfig(filePath);
+  return { filePath, isDoc, isConfig, isSql, isXml, n };
+}
 function taskOutputIsJsonlTranscript(outPath) {
   let fd = null;
   try {
@@ -8882,12 +8776,7 @@ function runnableTargetFor(hintPath, cwd, event) {
     if (!commandPathIsTouchable(hintPath, event)) return null;
     const resolved = resolveIndexPath(hintPath, cwd);
     if (!statSync7(resolved).isFile()) return null;
-    const entry = getFileEntry(resolved);
-    if (entry === null) return null;
-    if (entry.sha !== "") {
-      const diskSha = fingerprintFile(resolved);
-      if (diskSha === null || diskSha !== entry.sha) return null;
-    }
+    if (!indexMatchesDisk(resolved)) return null;
     const symbols = querySymbols({ filePath: resolved, limit: ALL_SYMBOLS_IN_FILE2 });
     if (symbols.length === 0) return null;
     const inLineOrder = [...symbols].sort((a, b) => a.lineStart - b.lineStart);
@@ -9171,7 +9060,8 @@ function pipelineShapeFilter(cmd, cwd) {
         }
       }
       if (recognizedCiCount > 0) {
-        return filterByName("generic-ci");
+        const ci = filterByName("generic-ci");
+        return ci === null ? null : { filter: ci, argv: [] };
       }
     }
     return null;
@@ -9186,7 +9076,7 @@ function pipelineShapeFilter(cmd, cwd) {
     if (!PIPELINE_PASSTHROUGH_HEADS.has(head.replace(/^.*[/\\]/, ""))) return null;
   }
   const detected = detectFromCommand(stripOutputPipeline(cmd), cwd ?? void 0);
-  return detected === null ? null : detected.filter;
+  return detected === null ? null : { filter: detected.filter, argv: detected.argv };
 }
 function isFullRecallCommand(cmd) {
   const forSplit = cmd.replace(/\s2>(?:&1|\/dev\/null)/g, "");
@@ -9470,7 +9360,7 @@ function foldShellReadBodies(cmd, output, fileKey, cwd) {
     if (no === void 0 || no === null) return null;
     rows.push({ no, text: lines[i] ?? "", raw: lines[i] ?? "" });
   }
-  const headRead = extractHeadFile(cmd);
+  const headRead = extractHeadFile(cmd) ?? extractGetContentHead(cmd);
   const windowed = extractLineRangeRead(cmd) !== null || headRead !== null && lines.length >= headRead.n;
   const folded = foldDelivery(rows, fileKey, displaySafePath(toDisplayPath(findProject(cwd ?? process.cwd())?.root, fileKey)), windowed);
   if (folded === null) return null;
@@ -9599,10 +9489,12 @@ async function maybeCompressCompoundOutput(cmd, output, exitCode, cwd, cacheMinB
   }
   if (!cfg.enabled || cfg.disabled_filters.includes("generic")) return null;
   if (Buffer.byteLength(output, "utf-8") < cacheMinBytes) return null;
-  const shaped = pipelineShapeFilter(cmd, cwd) ?? (isUnwrapped ? detectFromCommand(cmd, cwd ?? void 0)?.filter ?? null : null);
-  const filter3 = shaped !== null && !cfg.disabled_filters.includes(shaped.name) ? shaped : filterByName("generic");
+  const shaped = pipelineShapeFilter(cmd, cwd) ?? (isUnwrapped ? detectFromCommand(cmd, cwd ?? void 0) ?? null : null);
+  const useShaped = shaped !== null && !cfg.disabled_filters.includes(shaped.filter.name);
+  const filter3 = useShaped ? shaped.filter : filterByName("generic");
   if (filter3 === null) return null;
-  const compressed = compressOutput(filter3, output, "", exitCode ?? 0, [], {
+  const filterArgv = useShaped ? shaped.argv : [];
+  const compressed = compressOutput(filter3, output, "", exitCode ?? 0, filterArgv, {
     maxLines: cfg.max_lines,
     maxBytes: cfg.max_bytes
   });
@@ -9696,6 +9588,12 @@ function preBashHandlerInner(event) {
     for (const p of typeof paths === "string" ? [paths] : paths) logSuppressedDetection("bash_redirect", event.sessionId, p);
     return passOutput();
   };
+  const recallWorthShowing = (outputId2, entry2) => {
+    if (entry2.sizeBytes < loadConfig().hints.bash_dedup_min_bytes) return false;
+    if (meetsSavingsFloor(entry2.sizeBytes)) return true;
+    logSuppressedDetection("bash_recall", event.sessionId, outputId2);
+    return false;
+  };
   const cfg = loadConfig();
   if (cfg.hints.warn_unbalanced_shell_quoting) {
     const quoteError = detectUnbalancedShellSyntax(cmd);
@@ -9807,6 +9705,15 @@ function preBashHandlerInner(event) {
     recordStat("session_hint", 0, 0);
     return pathHint(hintPath, gcSelectHint);
   }
+  const gcHeadResult = extractGetContentHead(cmd);
+  if (gcHeadResult !== null) {
+    const { filePath, n } = gcHeadResult;
+    const hintPath = displaySafePath(cdStripped ? resolveCdHintPath(rawCmd, filePath, hintCwd) : filePath);
+    const gcHeadHint = leadingLinesHint("`Get-Content -TotalCount` bypasses read hooks. ", hintPath, 1, n, preHookCwd, pricedSubstitute(hintPath, 1, n));
+    if (gcHeadHint === null) return declineUnpriced(hintPath);
+    recordStat("session_hint", 0, 0);
+    return pathHint(hintPath, gcHeadHint);
+  }
   const catJsonPipe = extractCatJsonPipe(cmd);
   if (catJsonPipe !== null) {
     const { filePath, isDirectJq } = catJsonPipe;
@@ -9995,7 +9902,7 @@ function preBashHandlerInner(event) {
     const monOutputId = getBashOutputId(monCmdHash);
     const monEntryRaw = monOutputId !== null ? getBashOutput(monOutputId) : null;
     const monEntry = monEntryRaw !== null && !isBashEntryStale(monEntryRaw, cmd, preHookCwd) ? monEntryRaw : null;
-    if (monOutputId !== null && monEntry !== null && monEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(monEntry.sizeBytes)) {
+    if (monOutputId !== null && monEntry !== null && recallWorthShowing(monOutputId, monEntry)) {
       const monBytes = monEntry.sizeBytes;
       const catFile = extractCatSourceFile(cmd);
       if (catFile !== null) {
@@ -10030,7 +9937,7 @@ function preBashHandlerInner(event) {
     const curlOutputId = getBashOutputId(curlHash);
     const curlEntryRaw = curlOutputId !== null ? getBashOutput(curlOutputId) : null;
     const curlEntry = curlEntryRaw !== null && !isBashEntryStale(curlEntryRaw, cmd, preHookCwd) ? curlEntryRaw : null;
-    if (curlOutputId !== null && curlEntry !== null && curlEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(curlEntry.sizeBytes)) {
+    if (curlOutputId !== null && curlEntry !== null && recallWorthShowing(curlOutputId, curlEntry)) {
       const curlBytes = curlEntry.sizeBytes;
       recordStat("bash_compress:recall", curlBytes, savedTokensFromBytes(curlBytes));
       const curlPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
@@ -10044,7 +9951,7 @@ function preBashHandlerInner(event) {
     const ghOutputId = getBashOutputId(ghHash);
     const ghEntryRaw = ghOutputId !== null ? getBashOutput(ghOutputId) : null;
     const ghEntry = ghEntryRaw !== null && !isBashEntryStale(ghEntryRaw, cmd, preHookCwd) ? ghEntryRaw : null;
-    if (ghOutputId !== null && ghEntry !== null && ghEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(ghEntry.sizeBytes)) {
+    if (ghOutputId !== null && ghEntry !== null && recallWorthShowing(ghOutputId, ghEntry)) {
       const ghBytes = ghEntry.sizeBytes;
       recordStat("bash_compress:recall", ghBytes, savedTokensFromBytes(ghBytes));
       const ghPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
@@ -10058,7 +9965,7 @@ function preBashHandlerInner(event) {
     const gitScopedOutputId = getBashOutputId(gitScopedHash);
     const gitScopedEntryRaw = gitScopedOutputId !== null ? getBashOutput(gitScopedOutputId) : null;
     const gitScopedEntry = gitScopedEntryRaw !== null && !isBashEntryStale(gitScopedEntryRaw, cmd, preHookCwd) ? gitScopedEntryRaw : null;
-    if (gitScopedOutputId !== null && gitScopedEntry !== null && gitScopedEntry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(gitScopedEntry.sizeBytes)) {
+    if (gitScopedOutputId !== null && gitScopedEntry !== null && recallWorthShowing(gitScopedOutputId, gitScopedEntry)) {
       const gitScopedBytes = gitScopedEntry.sizeBytes;
       recordStat("bash_compress:recall", gitScopedBytes, savedTokensFromBytes(gitScopedBytes));
       const gitScopedPreview = cmd.length > 60 ? cmd.slice(0, 57) + "..." : cmd;
@@ -10100,7 +10007,7 @@ function preBashHandlerInner(event) {
   const outputId = getBashOutputId(cmdHash);
   const entryRaw = outputId !== null ? getBashOutput(outputId) : null;
   const entry = entryRaw !== null && !isBashEntryStale(entryRaw, cmd, preHookCwd) ? entryRaw : null;
-  if (outputId !== null && entry !== null && entry.sizeBytes >= loadConfig().hints.bash_dedup_min_bytes && meetsSavingsFloor(entry.sizeBytes)) {
+  if (outputId !== null && entry !== null && recallWorthShowing(outputId, entry)) {
     const bytes = entry.sizeBytes;
     recordStat("bash_compress:recall", bytes, savedTokensFromBytes(bytes));
     return contextOutput(buildRecallHint(cmd, outputId));
@@ -10198,6 +10105,11 @@ function recordBashFileReadsForSessionCache(cmd, cwd) {
     recordFileLineRange(resolve2(gcSelect.filePath), 1, gcSelect.n);
     return;
   }
+  const gcHead = extractGetContentHead(cmd);
+  if (gcHead !== null) {
+    recordFileLineRange(resolve2(gcHead.filePath), 1, gcHead.n);
+    return;
+  }
   const head = extractHeadFile(cmd);
   if (head !== null) {
     recordFileLineRange(resolve2(head.filePath), 1, head.n);
@@ -11926,6 +11838,9 @@ async function relayInProcess(eventName, rawPayload, harnessWaitMs) {
     } catch {
     }
     const output = safeSuggestions(await runHook(event));
+    if (event.sessionId) {
+      commitPendingContext(stateKey, output.hookType === "context" ? output.context : null);
+    }
     try {
       saveSessionState(stateKey);
     } catch {