token-goat 2.9.28 → 2.9.30

package/dist/{token-goat-chunk-FSTWAOW6.mjs → token-goat-chunk-WY3L4DVT.mjs}

@@ -6,14 +6,20 @@ import {
   pptxOutline,
   pptxSlideText,
   pptxTextGrep
-} from "./token-goat-chunk-Q4S3UQGO.mjs";
-import "./token-goat-chunk-UBUKHVYW.mjs";
+} from "./token-goat-chunk-JDHE26RP.mjs";
+import "./token-goat-chunk-4FVIAHSI.mjs";
+import "./token-goat-chunk-7IN2MKDS.mjs";
+import "./token-goat-chunk-U4N3BN2W.mjs";
+import "./token-goat-chunk-YZAAZU2S.mjs";
+import "./token-goat-chunk-IVE6U7KV.mjs";
+import "./token-goat-chunk-IVKIZWAB.mjs";
 import "./token-goat-chunk-XTQAOTSO.mjs";
 import "./token-goat-chunk-AH6QILZM.mjs";
-import "./token-goat-chunk-L45ZQRT7.mjs";
-import "./token-goat-chunk-NMTKNYGF.mjs";
 import "./token-goat-chunk-Y4AFKTHK.mjs";
-import "./token-goat-chunk-GMOUBOX4.mjs";
+import "./token-goat-chunk-GOLEOXZP.mjs";
+import "./token-goat-chunk-AM5V6GSX.mjs";
+import "./token-goat-chunk-FNFBKLRD.mjs";
+import "./token-goat-chunk-VES7EL7O.mjs";
 import "./token-goat-chunk-A37V4PBF.mjs";
 export {
   pptxAllSlidesText,

package/dist/{token-goat-chunk-OSUFN2FV.mjs → token-goat-chunk-XB5KKOCG.mjs}

@@ -8,6 +8,7 @@ import {
 init_define_import_meta_env();
 import * as fs from "node:fs";
 import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
 var _require = createRequire(import.meta.url);
 function suppressSqliteExperimentalWarning() {
   const original = process.emit;
@@ -162,18 +163,7 @@ var Statement = class {
   get source() {
     return this.#stmt.sourceSQL;
   }
-  /**
-   * better-sqlite3's `reader` flag: does this statement return rows?
-   *
-   * `node:sqlite` has no equivalent, so it is derived from the prepared statement's own column
-   * count -- SQLite gives a row-producing statement its result columns at prepare time and gives a
-   * non-producing one none. That is a derivation, and this is the third defence-in-depth layer in
-   * `sqlite_query.ts`'s read-only guard, so it is not taken on faith: the driver tests run both
-   * libraries side by side over SELECT, a CTE, VALUES, EXPLAIN, an empty-result SELECT, INSERT,
-   * UPDATE, DELETE, CREATE, a reading PRAGMA and an assigning PRAGMA, and require every verdict to
-   * agree. If a future SQLite statement form ever breaks the equivalence, that test fails rather
-   * than the guard quietly weakening.
-   */
+  /** better-sqlite3's `reader` flag: does this statement return rows? `node:sqlite` has no equivalent, so it is derived from the prepared statement's own column count -- SQLite gives a row-producing statement its result columns at prepare time and gives a non-producing one none. That is a derivation, and this is the third defence-in-depth layer in `sqlite_query.ts`'s read-only guard, so it is not taken on faith: the driver tests run both libraries side by side over SELECT, a CTE, VALUES, EXPLAIN, an empty-result SELECT, INSERT, UPDATE, DELETE, CREATE, a reading PRAGMA and an assigning PRAGMA, and require every verdict to agree. If a future SQLite statement form ever breaks the equivalence, that test fails rather than the guard quietly weakening. */
   get reader() {
     return attempt(() => this.#stmt.columns()).length > 0;
   }
@@ -224,7 +214,8 @@ var Database = class {
     if (wantsExisting && dbPath !== ":memory:" && !fs.existsSync(dbPath)) {
       throw new Error("unable to open database file");
     }
-    this.#db = attempt(() => new DatabaseSync(dbPath, {
+    const target = options.immutable === true ? `${pathToFileURL(dbPath).href}?immutable=1` : dbPath;
+    this.#db = attempt(() => new DatabaseSync(target, {
       readOnly: options.readonly === true,
       // sqlite-vec is loaded through db.loadExtension by initConnection, which node:sqlite refuses unless the connection opted in at construction. Harmless when no extension is ever loaded.
       allowExtension: true,
@@ -269,18 +260,7 @@ var Database = class {
   close() {
     attempt(() => this.#db.close());
   }
-  /**
-   * Wrap `fn` so it runs inside a transaction, committing on return and rolling back on throw.
-   *
-   * Nesting uses SAVEPOINT, which is what makes it safe for a transactional helper to call another
-   * one: an inner `BEGIN` would throw ("cannot start a transaction within a transaction"), an inner
-   * SAVEPOINT composes. Whether we are nested is read from SQLite via `isTransaction` rather than
-   * tracked in a counter here, so a transaction some other code path opened still nests correctly.
-   *
-   * The rollback is best-effort and never replaces the caller's error: if the ROLLBACK itself fails
-   * -- the connection died, the transaction was already unwound -- the original failure is still
-   * what propagates, because that is the one that explains what went wrong.
-   */
+  /** Wrap `fn` so it runs inside a transaction, committing on return and rolling back on throw. Nesting uses SAVEPOINT, which is what makes it safe for a transactional helper to call another one: an inner `BEGIN` would throw ("cannot start a transaction within a transaction"), an inner SAVEPOINT composes. Whether we are nested is read from SQLite via `isTransaction` rather than tracked in a counter here, so a transaction some other code path opened still nests correctly. The rollback is best-effort and never replaces the caller's error: if the ROLLBACK itself fails -- the connection died, the transaction was already unwound -- the original failure is still what propagates, because that is the one that explains what went wrong. */
   transaction(fn) {
     const build = (beginSql) => (...args) => {
       if (this.#db.isTransaction) {

package/dist/token-goat-chunk-XKI4SEMX.mjs

@@ -0,0 +1,66 @@
+import { createRequire as __cjsRequire } from 'node:module';
+const require = __cjsRequire(import.meta.url);
+import {
+  init_define_import_meta_env
+} from "./token-goat-chunk-A37V4PBF.mjs";
+
+// src/jsonc_text.ts
+init_define_import_meta_env();
+import { createRequire } from "node:module";
+var jsoncParser;
+function jsonc() {
+  jsoncParser ??= createRequire(import.meta.url)("jsonc-parser");
+  return jsoncParser;
+}
+var CLOSE_BRACE = 2;
+var CLOSE_BRACKET = 4;
+var COMMA = 5;
+var LINE_COMMENT = 12;
+var BLOCK_COMMENT = 13;
+var LINE_BREAK = 14;
+var WHITESPACE = 15;
+var EOF = 17;
+function jsoncToJson(text) {
+  const scanner = jsonc().createScanner(text, false);
+  const out = [];
+  let heldComma = false;
+  let heldTrivia = [];
+  for (let kind = scanner.scan(); kind !== EOF; kind = scanner.scan()) {
+    if (kind === LINE_COMMENT || kind === BLOCK_COMMENT) continue;
+    const raw = text.slice(scanner.getTokenOffset(), scanner.getTokenOffset() + scanner.getTokenLength());
+    if (heldComma) {
+      if (kind === LINE_BREAK || kind === WHITESPACE) {
+        heldTrivia.push(raw);
+        continue;
+      }
+      if (kind !== CLOSE_BRACE && kind !== CLOSE_BRACKET) out.push(",");
+      out.push(...heldTrivia);
+      heldComma = false;
+      heldTrivia = [];
+    }
+    if (kind === COMMA) heldComma = true;
+    else out.push(raw);
+  }
+  if (heldComma) out.push(",", ...heldTrivia);
+  return out.join("");
+}
+function stripBom(text) {
+  return text.charCodeAt(0) === 65279 ? text.slice(1) : text;
+}
+function parseJsonOrJsonc(raw, opts = {}) {
+  const text = stripBom(raw);
+  try {
+    return JSON.parse(text);
+  } catch (strictError) {
+    const errors = [];
+    jsonc().parse(text, errors, { allowTrailingComma: opts.allowTrailingComma !== false, disallowComments: false, allowEmptyContent: false });
+    if (errors.length > 0) throw strictError;
+    return JSON.parse(jsoncToJson(text));
+  }
+}
+
+export {
+  jsonc,
+  stripBom,
+  parseJsonOrJsonc
+};

package/dist/token-goat-chunk-XU4P6Z24.mjs

@@ -0,0 +1,133 @@
+import { createRequire as __cjsRequire } from 'node:module';
+const require = __cjsRequire(import.meta.url);
+import {
+  BRIDGE_CAPABILITY_MATRIX
+} from "./token-goat-chunk-ETBHVDB6.mjs";
+import {
+  PROBE_EVENT_TAGS,
+  PROBE_NONCE_ENV,
+  probeDir
+} from "./token-goat-chunk-ZEJVMUQH.mjs";
+import "./token-goat-chunk-KKUFXAPD.mjs";
+import {
+  HOOK_PROBE_ENV
+} from "./token-goat-chunk-3Z5S4KGM.mjs";
+import "./token-goat-chunk-VL3YIFHZ.mjs";
+import "./token-goat-chunk-XB5KKOCG.mjs";
+import "./token-goat-chunk-U4N3BN2W.mjs";
+import "./token-goat-chunk-YZAAZU2S.mjs";
+import "./token-goat-chunk-GOLEOXZP.mjs";
+import {
+  resolveOnPath,
+  spawnResolvedSync
+} from "./token-goat-chunk-AM5V6GSX.mjs";
+import {
+  displaySafeText
+} from "./token-goat-chunk-FNFBKLRD.mjs";
+import "./token-goat-chunk-VES7EL7O.mjs";
+import {
+  init_define_import_meta_env
+} from "./token-goat-chunk-A37V4PBF.mjs";
+
+// src/doctor_probe.ts
+init_define_import_meta_env();
+import { randomBytes } from "node:crypto";
+import { readdirSync, rmSync } from "node:fs";
+import path from "node:path";
+var PROBE_PROMPT = "Reply with every line of your context that begins with token-goat probe marker, copied exactly, one per line. If there are none, reply NONE.";
+var PROBE_COMMANDS = {
+  claudecode: { bin: "claude", args: ["-p", PROBE_PROMPT] },
+  codex: { bin: "codex", args: ["exec", PROBE_PROMPT] },
+  copilot_cli: { bin: "copilot", args: ["-p", PROBE_PROMPT] }
+};
+function isProbeHarness(name) {
+  return Object.prototype.hasOwnProperty.call(PROBE_COMMANDS, name);
+}
+var MISLEADING_ENV = ["TOKEN_GOAT_HARNESS_OVERRIDE", "CLAUDE_CODE_SESSION_ID", "CLAUDE_CODE_VERSION", "CLAUDE_CODE_ENTRYPOINT", "CLAUDECODE", "CODEX_SESSION_ID", "CODEX_SESSION"];
+var PROBE_TIMEOUT_MS = 24e4;
+function classifyProbeEvent(opts) {
+  if (!opts.wired) return "not_wired";
+  if (opts.stdout.includes(`${opts.nonce}-${opts.tag}`)) return "reached";
+  return opts.receipts.has(opts.tag) ? "fired_not_delivered" : "not_fired";
+}
+function probeEnv(nonce, env = process.env) {
+  const child = { ...env };
+  for (const key of MISLEADING_ENV) delete child[key];
+  if (child["TERM_PROGRAM"] === "claude-code") delete child["TERM_PROGRAM"];
+  child[PROBE_NONCE_ENV] = nonce;
+  child[HOOK_PROBE_ENV] = "1";
+  return child;
+}
+function receiptTags(nonce) {
+  const tags = /* @__PURE__ */ new Set();
+  try {
+    for (const name of readdirSync(probeDir())) {
+      if (name.startsWith(`${nonce}.`)) tags.add(name.slice(nonce.length + 1));
+    }
+  } catch {
+  }
+  return tags;
+}
+function removeReceipts(nonce) {
+  for (const tag of receiptTags(nonce)) rmSync(path.join(probeDir(), `${nonce}.${tag}`), { force: true });
+}
+function tail(text) {
+  return text.trim().split(/\r?\n/).slice(-5).join("\n");
+}
+function runProbe(harness, opts = {}) {
+  const spec = PROBE_COMMANDS[harness];
+  if (spec === void 0) throw new Error(`no headless probe for ${harness}; supported: ${Object.keys(PROBE_COMMANDS).join(", ")}`);
+  const command = `${spec.bin} ${spec.args[0] ?? ""} "<probe prompt>"`;
+  const implemented = BRIDGE_CAPABILITY_MATRIX.find((r) => r.harness === harness)?.implemented ?? /* @__PURE__ */ new Set();
+  const probed = Object.keys(PROBE_EVENT_TAGS);
+  const resolved = (opts.resolve ?? resolveOnPath)(spec.bin);
+  if (resolved === null) {
+    return { harness, command, status: "not_installed", exitCode: null, events: probed.map((event) => ({ event, result: implemented.has(event) ? "not_fired" : "not_wired" })) };
+  }
+  const nonce = randomBytes(10).toString("hex");
+  try {
+    const run = spawnResolvedSync(resolved, spec.args, { cwd: opts.cwd ?? process.cwd(), env: probeEnv(nonce), encoding: "utf8", timeout: opts.timeoutMs ?? PROBE_TIMEOUT_MS, windowsHide: true, stdio: ["ignore", "pipe", "pipe"] });
+    const stdout = run.stdout ?? "";
+    const receipts = receiptTags(nonce);
+    const events = probed.map((event) => ({ event, result: classifyProbeEvent({ wired: implemented.has(event), nonce, tag: PROBE_EVENT_TAGS[event] ?? "", stdout, receipts }) }));
+    const timedOut = run.error?.code === "ETIMEDOUT";
+    const status = timedOut ? "timeout" : run.status === 0 ? "ok" : "failed";
+    const report = { harness, command, status, exitCode: run.status, events };
+    return status === "ok" ? report : { ...report, detail: tail(run.stderr ?? run.error?.message ?? "") };
+  } finally {
+    removeReceipts(nonce);
+  }
+}
+var RESULT_TEXT = {
+  reached: "reached the model",
+  fired_not_delivered: "hook ran, but the model never saw its output",
+  not_fired: "hook did not run",
+  not_wired: "not wired for this harness"
+};
+function probePassed(report) {
+  return report.status === "ok" && report.events.every((e) => e.result === "reached" || e.result === "not_wired");
+}
+function formatProbeReport(report) {
+  const lines = [`Probe: ${report.command} (one real prompt on your account)`];
+  if (report.status === "not_installed") lines.push(`  [FAIL] ${PROBE_COMMANDS[report.harness]?.bin ?? report.harness} is not on PATH`);
+  else if (report.status === "timeout") lines.push("  [FAIL] the harness did not finish in time");
+  else if (report.status === "failed") lines.push(`  [FAIL] the harness exited with code ${report.exitCode ?? "unknown"}`);
+  if (report.status !== "not_installed") {
+    for (const e of report.events) {
+      const mark = e.result === "reached" ? "[OK]  " : e.result === "not_wired" ? "[--]  " : "[FAIL]";
+      lines.push(`  ${mark} ${e.event.padEnd(19)} ${RESULT_TEXT[e.result]}`);
+    }
+  }
+  if (report.detail !== void 0 && report.detail !== "") lines.push(...displaySafeText(report.detail).split("\n").map((l) => `         ${l}`));
+  return lines.join("\n");
+}
+export {
+  PROBE_COMMANDS,
+  PROBE_PROMPT,
+  classifyProbeEvent,
+  formatProbeReport,
+  isProbeHarness,
+  probeEnv,
+  probePassed,
+  runProbe
+};

package/dist/{token-goat-chunk-6CCQDAYY.mjs → token-goat-chunk-Y776AENC.mjs}

@@ -1,12 +1,21 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
+import {
+  readTranscriptTail
+} from "./token-goat-chunk-SJHWVNDQ.mjs";
+import {
+  claudeConfigDir
+} from "./token-goat-chunk-BPGCUMR7.mjs";
 import {
   GENERIC_SERVED_OUTPUT_KEY,
+  MAX_BASH_START_CWDS,
   MAX_GENERIC_SERVED_OUTPUTS,
   MAX_OUTSTANDING_AGENT_SPAWNS,
   MAX_RANGES_PER_FILE,
   MAX_SEEN_IMAGE_HASHES,
   MAX_SERVED_OUTPUTS_PER_FILE,
+  bashStartCwdsAtLoad,
+  consumedBashStartCwdKeys,
   consumedCurlDownloadKeys,
   consumedFileLineRangeKeys,
   consumedFileServedOutputKeys,
@@ -17,49 +26,56 @@ import {
   filesFullReadCountAtLoad,
   filesReadCountAtLoad,
   importSessionState,
+  markCompacted,
   migrateCurlDownloadKey,
   migrateWebFetchKey,
   outstandingAgentSpawnKey,
   outstandingAgentSpawnsAtLoad,
   pendingLargeFileHintsAtLoad
-} from "./token-goat-chunk-GGLEE35R.mjs";
-import {
-  claudeConfigDir,
-  readTranscriptTail
-} from "./token-goat-chunk-MAMQPC43.mjs";
+} from "./token-goat-chunk-C63JQV5K.mjs";
 import {
   DEFAULT_MAX_AGE_MS,
   DEFAULT_MAX_COUNT
-} from "./token-goat-chunk-BJBRGPBX.mjs";
+} from "./token-goat-chunk-ARDNEC2U.mjs";
+import {
+  recordStat
+} from "./token-goat-chunk-3Z5S4KGM.mjs";
 import {
-  recordStat,
-  redactSecrets
-} from "./token-goat-chunk-MVSWBNMD.mjs";
+  redactSecrets,
+  redactSerializedJson
+} from "./token-goat-chunk-4FVIAHSI.mjs";
 import {
-  detectHarness,
   isAutoTriggerMultiplierExplicit,
   loadConfig,
   shortFingerprint
-} from "./token-goat-chunk-CC2PYJM7.mjs";
+} from "./token-goat-chunk-7IN2MKDS.mjs";
+import {
+  detectHarness
+} from "./token-goat-chunk-U4N3BN2W.mjs";
 import {
   registerReset
-} from "./token-goat-chunk-EEIDFMEM.mjs";
+} from "./token-goat-chunk-YZAAZU2S.mjs";
 import {
   LOCK_WAIT_MS_HARDENED,
   atomicWriteText,
-  dataDir,
   ensureDirSync,
-  foldPath,
   isCodeFenceDelimiter,
   normalizePathForwardSlash,
   sanitizeIdForFilename,
   stripLower,
-  tokenGoatHome,
-  withFileLock
-} from "./token-goat-chunk-L45ZQRT7.mjs";
+  withFileLock,
+  withRetryOnLock
+} from "./token-goat-chunk-GOLEOXZP.mjs";
+import {
+  foldPath
+} from "./token-goat-chunk-AM5V6GSX.mjs";
 import {
   normalizePath
-} from "./token-goat-chunk-NMTKNYGF.mjs";
+} from "./token-goat-chunk-FNFBKLRD.mjs";
+import {
+  dataDir,
+  tokenGoatHome
+} from "./token-goat-chunk-VES7EL7O.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -234,6 +250,7 @@ function coerce(raw) {
     cliReads,
     bashReruns,
     pendingLargeFileHints,
+    bashStartCwds: asStringPairs(o["bashStartCwds"]),
     grepQueries,
     globQueries,
     outstandingAgentSpawns,
@@ -325,6 +342,17 @@ function mergeCurlDownloads(disk, mem) {
   }
   return Array.from(merged.entries());
 }
+function mergeBashStartCwds(disk, mem) {
+  const merged = new Map(disk);
+  for (const key of consumedBashStartCwdKeys()) merged.delete(key);
+  const atLoad = bashStartCwdsAtLoad();
+  for (const [toolUseId, cwd] of mem) {
+    if (atLoad.get(toolUseId) === cwd) continue;
+    merged.set(toolUseId, cwd);
+  }
+  const entries = Array.from(merged.entries());
+  return entries.length > MAX_BASH_START_CWDS ? entries.slice(entries.length - MAX_BASH_START_CWDS) : entries;
+}
 function mergeOutstandingAgentSpawns(disk, mem) {
   const merged = new Map(disk.map(([prompt, ts]) => [outstandingAgentSpawnKey(prompt, ts), [prompt, ts]]));
   for (const key of consumedOutstandingAgentSpawnKeys()) merged.delete(key);
@@ -353,6 +381,8 @@ function mergeSessionState(disk, mem) {
   const memRanges = (mem.compactedAt ?? 0) === compactedAt ? mem.fileLineRanges ?? [] : [];
   const rawDiskServed = (disk.compactedAt ?? 0) === compactedAt ? disk.fileServedOutputs ?? [] : [];
   const memServed = (mem.compactedAt ?? 0) === compactedAt ? mem.fileServedOutputs ?? [] : [];
+  const rawDiskCliReads = (disk.compactedAt ?? 0) === compactedAt ? disk.cliReads ?? [] : [];
+  const memCliReads = (mem.compactedAt ?? 0) === compactedAt ? mem.cliReads ?? [] : [];
   const clearedRangeFiles = new Set(consumedFileLineRangeKeys());
   const clearedServedFiles = new Set(consumedFileServedOutputKeys());
   const diskRanges = rawDiskRanges.filter(([path4]) => !clearedRangeFiles.has(path4));
@@ -367,9 +397,11 @@ function mergeSessionState(disk, mem) {
     fileLineRanges: mergeLineRanges(diskRanges, memRanges),
     fileServedOutputs: mergeServedOutputs(diskServed, memServed),
     ...compactedAt > 0 ? { compactedAt } : {},
-    cliReads: Array.from(/* @__PURE__ */ new Set([...disk.cliReads ?? [], ...mem.cliReads ?? []])),
+    // Same epoch filter as the line ranges above: a CLI read recorded before the winning compaction is not in the model's context any more, so merging it back would resurrect the "you already ran this" note the compaction just cleared.
+    cliReads: Array.from(/* @__PURE__ */ new Set([...rawDiskCliReads, ...memCliReads])),
     bashReruns: Array.from(/* @__PURE__ */ new Set([...disk.bashReruns ?? [], ...mem.bashReruns ?? []])),
     pendingLargeFileHints: mergePendingLargeFileHints(disk.pendingLargeFileHints ?? [], mem.pendingLargeFileHints ?? []),
+    bashStartCwds: mergeBashStartCwds(disk.bashStartCwds ?? [], mem.bashStartCwds ?? []),
     grepQueries: mergePairs(disk.grepQueries ?? [], mem.grepQueries ?? []),
     globQueries: mergePairs(disk.globQueries ?? [], mem.globQueries ?? []),
     outstandingAgentSpawns: mergeOutstandingAgentSpawns(disk.outstandingAgentSpawns ?? [], mem.outstandingAgentSpawns ?? []),
@@ -392,8 +424,23 @@ function capFiles(s, max) {
 }
 function readDiskState(p) {
   try {
-    if (!fs.existsSync(p)) return null;
-    return coerce(JSON.parse(fs.readFileSync(p, "utf8")));
+    return readDiskStateForMerge(p);
+  } catch {
+    return null;
+  }
+}
+function readDiskStateForMerge(p) {
+  let text = "";
+  try {
+    withRetryOnLock(() => {
+      text = fs.readFileSync(p, "utf8");
+    });
+  } catch (err) {
+    if (err.code === "ENOENT") return null;
+    throw err;
+  }
+  try {
+    return coerce(JSON.parse(text));
   } catch {
     return null;
   }
@@ -424,8 +471,20 @@ function listSiblingSessionStates(sessionId) {
 var EMPTY_SESSION = { files: [], hintsShown: [], webFetches: [], bashOutputs: [], curlDownloads: [] };
 function loadSessionState(sessionId) {
   const p = sessionPath(sessionId);
+  importSessionState((p ? readDiskState(p) : null) ?? EMPTY_SESSION);
+  applySessionCompaction(sessionId);
+}
+var COMPACTED_AT_SUFFIX = ".compacted-at";
+function applySessionCompaction(stateKey) {
+  const at = stateKey.indexOf(":agent:");
+  if (at < 0) return;
+  const p = sessionSidecarPath(stateKey.slice(0, at), COMPACTED_AT_SUFFIX);
   if (!p) return;
-  importSessionState(readDiskState(p) ?? EMPTY_SESSION);
+  try {
+    const epoch = Number(fs.readFileSync(p, "utf8").trim());
+    if (Number.isFinite(epoch) && epoch > 0) markCompacted(epoch);
+  } catch {
+  }
 }
 function saveSessionState(sessionId) {
   const p = sessionPath(sessionId);
@@ -435,12 +494,12 @@ function saveSessionState(sessionId) {
     if (!fs.existsSync(dir)) ensureDirSync(dir);
     const mem = exportSessionState();
     const writeMerged = () => {
-      const disk = readDiskState(p);
+      const disk = readDiskStateForMerge(p);
       const merged = capFiles(disk ? mergeSessionState(disk, mem) : mem, MAX_FILES);
       if (merged.created_ts === void 0) merged.created_ts = Date.now() / 1e3;
       let json;
       try {
-        json = redactSecrets(JSON.stringify(merged)).text;
+        json = redactSerializedJson(JSON.stringify(merged)).text;
       } catch {
         return true;
       }
@@ -510,6 +569,36 @@ function sessionSkillPrefix(sessionId, skillName) {
 function outputIdFor(sessionId, skillName, contentSha) {
   return `${sessionSkillPrefix(sessionId, skillName)}${contentSha}`;
 }
+var LOAD_RECORD_EXT = ".load";
+function readLoadRecordsSync(dir) {
+  const records = [];
+  let files;
+  try {
+    files = readdirSync2(dir);
+  } catch {
+    return records;
+  }
+  for (const file of files) {
+    if (!file.endsWith(LOAD_RECORD_EXT)) continue;
+    try {
+      const parsed = JSON.parse(readFileSync2(resolve(dir, file), "utf-8"));
+      if (typeof parsed.skillName !== "string" || typeof parsed.bodyOutputId !== "string") continue;
+      records.push({ ...parsed, loadId: file.slice(0, -LOAD_RECORD_EXT.length) });
+    } catch {
+      continue;
+    }
+  }
+  return records;
+}
+async function sessionLoads(safeSession, name) {
+  const metas = await listOutputs();
+  const own = metas.filter((m) => m.skillName === name && m.outputId.startsWith(`${safeSession}-`));
+  const storedIds = new Set(metas.map((m) => m.outputId));
+  const recorded = readLoadRecordsSync(skillOutputsDir()).filter(
+    (r) => r.skillName === name && r.loadId.startsWith(`${safeSession}-`) && storedIds.has(r.bodyOutputId)
+  );
+  return [...own, ...recorded].map((e) => ({ bodyBytes: e.bodyBytes, ts: e.ts }));
+}
 function* contentLineEntries(lines) {
   let inCodeBlock = false;
   for (let i = 0; i < lines.length; i++) {
@@ -645,9 +734,7 @@ async function hasSessionOutput(sessionId, skillName) {
     if (!sessionId) return false;
     const name = safeSkillName(skillName);
     if (!name) return false;
-    const safeSession = safeSessionFragment(sessionId);
-    const metas = await listOutputs();
-    return metas.some((m) => m.skillName === name && m.outputId.startsWith(`${safeSession}-`));
+    return (await sessionLoads(safeSessionFragment(sessionId), name)).length > 0;
   } catch {
     return false;
   }
@@ -657,9 +744,7 @@ async function sessionOutputBodyBytes(sessionId, skillName) {
     if (!sessionId) return null;
     const name = safeSkillName(skillName);
     if (!name) return null;
-    const safeSession = safeSessionFragment(sessionId);
-    const metas = await listOutputs();
-    const matches = metas.filter((m) => m.skillName === name && m.outputId.startsWith(`${safeSession}-`));
+    const matches = await sessionLoads(safeSessionFragment(sessionId), name);
     if (matches.length === 0) return null;
     matches.sort((a, b) => b.ts - a.ts);
     return matches[0].bodyBytes;
@@ -698,13 +783,23 @@ async function storeOutput(sessionId, skillName, body, opts) {
     const name = safeSkillName(skillName);
     if (!name) return null;
     const sha = contentHash(body);
+    const outId = outputIdFor(sessionId, skillName, sha);
+    const dir = skillOutputsDir();
+    const ts = Date.now();
     const existing = await findCrossSessionEntry(skillName, sha);
     if (existing) {
+      if (existing.outputId !== outId && sessionId) {
+        const record = {
+          skillName: name,
+          contentSha: sha,
+          bodyOutputId: existing.outputId,
+          bodyBytes: Buffer.byteLength(body, "utf-8"),
+          ts
+        };
+        await atomicWriteText(resolve(dir, `${outId}${LOAD_RECORD_EXT}`), JSON.stringify(record, null, 2));
+      }
       return existing;
     }
-    const outId = outputIdFor(sessionId, skillName, sha);
-    const dir = skillOutputsDir();
-    const ts = Date.now();
     const bodyBytes = Buffer.byteLength(body, "utf-8");
     const truncated = bodyBytes > 256 * 1024;
     const redactedBody = redactSecrets(body);
@@ -1054,6 +1149,13 @@ function pruneSkillOutputs(maxCount = DEFAULT_MAX_COUNT, maxAgeMs = DEFAULT_MAX_
         removeEntry(entry.outputId);
       }
     }
+    for (const record of readLoadRecordsSync(dir)) {
+      if (record.ts >= cutoff && existsSync2(resolve(dir, `${record.bodyOutputId}.meta`))) continue;
+      try {
+        unlinkSync(resolve(dir, `${record.loadId}${LOAD_RECORD_EXT}`));
+      } catch {
+      }
+    }
   } catch {
     return removed;
   }
@@ -1458,8 +1560,10 @@ export {
   sessionsDir,
   AGENT_SALT_MARKER,
   sessionSidecarPath,
+  readSessionStateFile,
   listSiblingSessionStates,
   loadSessionState,
+  COMPACTED_AT_SUFFIX,
   saveSessionState,
   CONTEXT_AUTOCOMPACT_TOKENS,
   getContextPressure,
@@ -1473,6 +1577,7 @@ export {
   SKILLS_OUTPUT_SUBDIR,
   skillOutputsDir,
   contentHash,
+  safeSkillName,
   extractCompactFromMarker,
   extractNamedSection,
   extractChecklistSection,