token-goat 2.9.26 → 2.9.29

package/dist/{token-goat-chunk-M6CVNHTW.mjs → token-goat-chunk-H5J3C56Q.mjs}

@@ -1,516 +1,74 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
+import {
+  GENERIC_SERVED_OUTPUT_KEY,
+  MAX_GENERIC_SERVED_OUTPUTS,
+  MAX_OUTSTANDING_AGENT_SPAWNS,
+  MAX_RANGES_PER_FILE,
+  MAX_SEEN_IMAGE_HASHES,
+  MAX_SERVED_OUTPUTS_PER_FILE,
+  consumedCurlDownloadKeys,
+  consumedFileLineRangeKeys,
+  consumedFileServedOutputKeys,
+  consumedOutstandingAgentSpawnKeys,
+  consumedPendingLargeFileHintKeys,
+  curlDownloadsAtLoad,
+  exportSessionState,
+  filesFullReadCountAtLoad,
+  filesReadCountAtLoad,
+  importSessionState,
+  migrateCurlDownloadKey,
+  migrateWebFetchKey,
+  outstandingAgentSpawnKey,
+  outstandingAgentSpawnsAtLoad,
+  pendingLargeFileHintsAtLoad
+} from "./token-goat-chunk-TDUT2CL6.mjs";
 import {
   claudeConfigDir,
   readTranscriptTail
-} from "./token-goat-chunk-G6EYO5CD.mjs";
+} from "./token-goat-chunk-ONXH6NZ5.mjs";
 import {
   DEFAULT_MAX_AGE_MS,
-  DEFAULT_MAX_COUNT,
+  DEFAULT_MAX_COUNT
+} from "./token-goat-chunk-D4ETHJD6.mjs";
+import {
   recordStat,
   redactSecrets
-} from "./token-goat-chunk-D2X7XN5M.mjs";
+} from "./token-goat-chunk-CIQ2FTY3.mjs";
 import {
   detectHarness,
   isAutoTriggerMultiplierExplicit,
   loadConfig,
   shortFingerprint
-} from "./token-goat-chunk-LRIZ7K3F.mjs";
+} from "./token-goat-chunk-TGOXNAHW.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-6E2IDLHF.mjs";
+  withFileLock,
+  withRetryOnLock
+} from "./token-goat-chunk-XYWPOSCN.mjs";
+import {
+  foldPath
+} from "./token-goat-chunk-TCQANXYC.mjs";
 import {
   normalizePath
 } from "./token-goat-chunk-NMTKNYGF.mjs";
+import {
+  dataDir,
+  tokenGoatHome
+} from "./token-goat-chunk-MELOKFDJ.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
 
-// src/session.ts
-init_define_import_meta_env();
-import { randomBytes, randomUUID } from "node:crypto";
-import * as fs from "node:fs";
-var _files = /* @__PURE__ */ new Map();
-var _filesAtLoad = /* @__PURE__ */ new Map();
-var _filesFullReadCountAtLoad = /* @__PURE__ */ new Map();
-var _hintsShown = /* @__PURE__ */ new Set();
-var _scheduledPromptCounts = /* @__PURE__ */ new Map();
-var _webFetches = /* @__PURE__ */ new Map();
-var _bashOutputs = /* @__PURE__ */ new Map();
-var _grepQueries = /* @__PURE__ */ new Map();
-var _globQueries = /* @__PURE__ */ new Map();
-var _lastTabContext = null;
-var _seenImageHashes = [];
-var _outstandingAgentSpawns = [];
-var _outstandingAgentSpawnsAtLoad = [];
-var _bashReruns = /* @__PURE__ */ new Set();
-var _curlDownloads = /* @__PURE__ */ new Map();
-var _curlDownloadsAtLoad = /* @__PURE__ */ new Map();
-var _fileLineRanges = /* @__PURE__ */ new Map();
-var _fileServedOutputs = /* @__PURE__ */ new Map();
-var _fileLineRangesAtLoad = /* @__PURE__ */ new Map();
-var _fileServedOutputsAtLoad = /* @__PURE__ */ new Map();
-var _compactedAt = 0;
-var _cliReads = /* @__PURE__ */ new Set();
-var _pendingLargeFileHints = /* @__PURE__ */ new Map();
-var _pendingLargeFileHintsAtLoad = /* @__PURE__ */ new Map();
-var _sessionId = null;
-var _transcriptPath = null;
-function fileSize(absPath) {
-  try {
-    return fs.statSync(absPath).size;
-  } catch {
-    return 0;
-  }
-}
-function resolveFilesKey(normalized) {
-  if (_files.has(normalized)) return normalized;
-  const folded = foldPath(normalized);
-  if (folded === normalized) return normalized;
-  for (const existingKey of _files.keys()) {
-    if (foldPath(existingKey) === folded) return existingKey;
-  }
-  return normalized;
-}
-function recordFileRead(filePath, isFullRead = true) {
-  const normalized = normalizePath(filePath);
-  const key = resolveFilesKey(normalized);
-  const now = Date.now();
-  const size = fileSize(normalized);
-  const prev = _files.get(key);
-  if (prev === void 0) {
-    _files.set(key, {
-      path: key,
-      readCount: 1,
-      lastReadAt: now,
-      wasEdited: false,
-      sizeBytes: size,
-      ...isFullRead ? { lastFullReadAt: now, fullReadCount: 1 } : {}
-    });
-    return;
-  }
-  _files.set(key, {
-    ...prev,
-    readCount: prev.readCount + 1,
-    lastReadAt: now,
-    sizeBytes: size,
-    ...isFullRead ? { lastFullReadAt: now, fullReadCount: (prev.fullReadCount ?? 0) + 1 } : {}
-  });
-}
-var MAX_SYMBOLS_PER_FILE = 25;
-function recordSymbolRead(filePath, symbol) {
-  const normalized = normalizePath(filePath);
-  const key = resolveFilesKey(normalized);
-  const prev = _files.get(key);
-  if (prev === void 0) {
-    _files.set(key, {
-      path: key,
-      readCount: 0,
-      lastReadAt: Date.now(),
-      wasEdited: false,
-      sizeBytes: fileSize(normalized),
-      symbols_read: [symbol]
-    });
-    return;
-  }
-  const existing = prev.symbols_read ?? [];
-  if (existing.includes(symbol)) return;
-  const symbols_read = [...existing, symbol].slice(-MAX_SYMBOLS_PER_FILE);
-  _files.set(key, { ...prev, symbols_read });
-}
-function filesReadCountAtLoad() {
-  return _filesAtLoad;
-}
-function filesFullReadCountAtLoad() {
-  return _filesFullReadCountAtLoad;
-}
-function recordFileEdit(filePath) {
-  const normalized = normalizePath(filePath);
-  const key = resolveFilesKey(normalized);
-  _fileLineRanges.delete(foldPath(normalized));
-  const prev = _files.get(key);
-  if (prev === void 0) {
-    _files.set(key, {
-      path: key,
-      readCount: 0,
-      lastReadAt: 0,
-      wasEdited: true,
-      sizeBytes: fileSize(normalized)
-    });
-    return;
-  }
-  _files.set(key, { ...prev, wasEdited: true });
-}
-function getSessionFiles() {
-  return _files;
-}
-function wasFileReadThisSession(filePath) {
-  const entry = _files.get(resolveFilesKey(normalizePath(filePath)));
-  return entry !== void 0 && entry.readCount > 0 && entry.lastReadAt >= _compactedAt;
-}
-function wasFileFullyReadThisSession(filePath) {
-  const entry = _files.get(resolveFilesKey(normalizePath(filePath)));
-  return entry !== void 0 && entry.lastFullReadAt !== void 0 && entry.lastFullReadAt >= _compactedAt;
-}
-function getCompactedAt() {
-  return _compactedAt;
-}
-function markCompacted(now = Date.now()) {
-  if (now <= _compactedAt) return;
-  _compactedAt = now;
-  _fileLineRanges = /* @__PURE__ */ new Map();
-  _fileServedOutputs = /* @__PURE__ */ new Map();
-}
-function getSessionFileEntry(filePath) {
-  return _files.get(resolveFilesKey(normalizePath(filePath)));
-}
-function wasHintShown(hintKey) {
-  return _hintsShown.has(hintKey);
-}
-function markHintShown(hintKey) {
-  _hintsShown.add(hintKey);
-}
-function recordScheduledPrompt(sessionId) {
-  const count = (_scheduledPromptCounts.get(sessionId) ?? 0) + 1;
-  _scheduledPromptCounts.set(sessionId, count);
-  return count;
-}
-function wasCliReadThisSession(cliReadKey) {
-  return _cliReads.has(cliReadKey);
-}
-function recordCliRead(cliReadKey) {
-  _cliReads.add(cliReadKey);
-}
-function recordLargeFileHintPending(filePath, sizeBytes) {
-  _pendingLargeFileHints.set(foldPath(normalizePath(filePath)), sizeBytes);
-}
-function takePendingLargeFileHint(filePath) {
-  const key = foldPath(normalizePath(filePath));
-  const size = _pendingLargeFileHints.get(key);
-  if (size === void 0) return null;
-  _pendingLargeFileHints.delete(key);
-  return size;
-}
-function consumedPendingLargeFileHintKeys() {
-  const consumed = [];
-  for (const key of _pendingLargeFileHintsAtLoad.keys()) {
-    if (!_pendingLargeFileHints.has(key)) consumed.push(key);
-  }
-  return consumed;
-}
-function pendingLargeFileHintsAtLoad() {
-  return _pendingLargeFileHintsAtLoad;
-}
-var WEB_FETCH_KEY_SEP = "\0";
-function webFetchKey(url, prompt) {
-  const digest = shortFingerprint(`${url}${WEB_FETCH_KEY_SEP}${prompt}`);
-  return [redactSecrets(url).text, redactSecrets(prompt).text, digest].join(WEB_FETCH_KEY_SEP);
-}
-function recordWebFetch(url, prompt, cacheId) {
-  _webFetches.set(webFetchKey(url, prompt), cacheId);
-}
-function migrateCurlDownloadKey(key) {
-  if (/^[0-9a-f]{16}$/.test(key)) return key;
-  return curlDownloadKey(key);
-}
-function migrateWebFetchKey(key) {
-  const parts = key.split(WEB_FETCH_KEY_SEP);
-  if (parts.length !== 2) return key;
-  return webFetchKey(parts[0] ?? "", parts[1] ?? "");
-}
-function getSessionWebFetches() {
-  return _webFetches;
-}
-function recordBashOutput(commandHash, outputId, _sizeBytes) {
-  _bashOutputs.set(commandHash, outputId);
-}
-function getSessionBashOutputs() {
-  return Array.from(_bashOutputs.entries());
-}
-function recordBashRerun(commandHash) {
-  _bashReruns.add(commandHash);
-}
-function getSessionBashReruns() {
-  return Array.from(_bashReruns);
-}
-function getBashOutputId(commandHash) {
-  return _bashOutputs.get(commandHash) ?? null;
-}
-function recordGrepQuery(signature, matchCount) {
-  _grepQueries.set(signature, matchCount);
-}
-function getGrepMatchCount(signature) {
-  return _grepQueries.get(signature) ?? null;
-}
-function recordGlobQuery(signature, matchCount) {
-  _globQueries.set(signature, matchCount);
-}
-function getGlobMatchCount(signature) {
-  return _globQueries.get(signature) ?? null;
-}
-function setLastTabContext(text) {
-  _lastTabContext = shortFingerprint(text);
-}
-function lastTabContextMatches(text) {
-  return _lastTabContext !== null && _lastTabContext === shortFingerprint(text);
-}
-var MAX_SEEN_IMAGE_HASHES = 16;
-function hasSeenImage(hash) {
-  return _seenImageHashes.includes(hash);
-}
-function recordSeenImage(hash) {
-  const at = _seenImageHashes.indexOf(hash);
-  if (at !== -1) _seenImageHashes.splice(at, 1);
-  _seenImageHashes.push(hash);
-  if (_seenImageHashes.length > MAX_SEEN_IMAGE_HASHES) {
-    _seenImageHashes.splice(0, _seenImageHashes.length - MAX_SEEN_IMAGE_HASHES);
-  }
-}
-var MAX_OUTSTANDING_AGENT_SPAWNS = 30;
-function recordOutstandingAgentSpawn(prompt) {
-  _outstandingAgentSpawns.push({ prompt: redactSecrets(prompt).text, ts: Date.now() });
-  if (_outstandingAgentSpawns.length > MAX_OUTSTANDING_AGENT_SPAWNS) {
-    _outstandingAgentSpawns.splice(0, _outstandingAgentSpawns.length - MAX_OUTSTANDING_AGENT_SPAWNS);
-  }
-}
-function getOutstandingAgentSpawns() {
-  return _outstandingAgentSpawns;
-}
-function removeOutstandingAgentSpawn(finishedPrompt) {
-  const idx = _outstandingAgentSpawns.findIndex((e) => finishedPrompt.startsWith(e.prompt));
-  if (idx !== -1) _outstandingAgentSpawns.splice(idx, 1);
-}
-function outstandingAgentSpawnKey(prompt, ts) {
-  return `${prompt} ${ts}`;
-}
-function outstandingAgentSpawnsAtLoad() {
-  return _outstandingAgentSpawnsAtLoad;
-}
-function consumedOutstandingAgentSpawnKeys() {
-  const currentKeys = new Set(_outstandingAgentSpawns.map((e) => outstandingAgentSpawnKey(e.prompt, e.ts)));
-  const consumed = [];
-  for (const e of _outstandingAgentSpawnsAtLoad) {
-    const key = outstandingAgentSpawnKey(e.prompt, e.ts);
-    if (!currentKeys.has(key)) consumed.push(key);
-  }
-  return consumed;
-}
-function curlDownloadKey(url) {
-  return shortFingerprint(url);
-}
-function recordCurlDownload(url, savedPath) {
-  _curlDownloads.set(curlDownloadKey(url), savedPath);
-}
-function getCurlDownloadPath(url) {
-  return _curlDownloads.get(curlDownloadKey(url)) ?? null;
-}
-function clearCurlDownload(url) {
-  _curlDownloads.delete(curlDownloadKey(url));
-}
-function curlDownloadsAtLoad() {
-  return _curlDownloadsAtLoad;
-}
-function consumedCurlDownloadKeys() {
-  const consumed = [];
-  for (const url of _curlDownloadsAtLoad.keys()) {
-    if (!_curlDownloads.has(url)) consumed.push(url);
-  }
-  return consumed;
-}
-function consumedFileLineRangeKeys() {
-  const consumed = [];
-  for (const key of _fileLineRangesAtLoad.keys()) {
-    if (!_fileLineRanges.has(key)) consumed.push(key);
-  }
-  return consumed;
-}
-function consumedFileServedOutputKeys() {
-  const consumed = [];
-  for (const key of _fileServedOutputsAtLoad.keys()) {
-    if (!_fileServedOutputs.has(key)) consumed.push(key);
-  }
-  return consumed;
-}
-var MAX_RANGES_PER_FILE = 64;
-function statIdentity(absPath) {
-  try {
-    const st = fs.statSync(absPath);
-    return { size: st.size, mtimeMs: st.mtimeMs };
-  } catch {
-    return void 0;
-  }
-}
-function recordFileLineRange(filePath, start, end) {
-  const normalized = normalizePath(filePath);
-  const key = foldPath(normalized);
-  const ranges = _fileLineRanges.get(key) ?? [];
-  if (!ranges.some(([s, e]) => s === start && e === end)) {
-    ranges.push([start, end]);
-    if (ranges.length > MAX_RANGES_PER_FILE) ranges.splice(0, ranges.length - MAX_RANGES_PER_FILE);
-    _fileLineRanges.set(key, ranges);
-  }
-  const entryKey = resolveFilesKey(normalized);
-  const entry = _files.get(entryKey);
-  const identity = statIdentity(normalized);
-  if (entry && identity) _files.set(entryKey, { ...entry, rangeFileIdentity: identity });
-}
-function getFileLineRanges(filePath) {
-  return _fileLineRanges.get(foldPath(normalizePath(filePath))) ?? [];
-}
-function resetFileLineRanges(filePath) {
-  _fileLineRanges.delete(foldPath(normalizePath(filePath)));
-}
-var MAX_SERVED_OUTPUTS_PER_FILE = 8;
-var GENERIC_SERVED_OUTPUT_KEY = "\0<bash-generic-served>";
-var GENERIC_SERVED_OUTPUT_FOLDED_KEY = foldPath(normalizePath(GENERIC_SERVED_OUTPUT_KEY));
-var MAX_GENERIC_SERVED_OUTPUTS = 32;
-function recordFileServedOutput(filePath, outputId) {
-  const key = foldPath(normalizePath(filePath));
-  const cap = key === GENERIC_SERVED_OUTPUT_FOLDED_KEY ? MAX_GENERIC_SERVED_OUTPUTS : MAX_SERVED_OUTPUTS_PER_FILE;
-  const ids = (_fileServedOutputs.get(key) ?? []).filter((id) => id !== outputId);
-  ids.push(outputId);
-  if (ids.length > cap) ids.splice(0, ids.length - cap);
-  _fileServedOutputs.set(key, ids);
-}
-function getFileServedOutputs(filePath) {
-  return _fileServedOutputs.get(foldPath(normalizePath(filePath))) ?? [];
-}
-function markFileTruncated(filePath, isFullRead = true) {
-  const normalized = normalizePath(filePath);
-  const key = resolveFilesKey(normalized);
-  const prev = _files.get(key);
-  const now = Date.now();
-  if (prev === void 0) {
-    _files.set(key, {
-      path: key,
-      readCount: 1,
-      lastReadAt: now,
-      wasEdited: false,
-      sizeBytes: fileSize(normalized),
-      wasTruncated: true,
-      ...isFullRead ? { lastFullReadAt: now, fullReadCount: 1 } : {}
-    });
-    return;
-  }
-  _files.set(key, { ...prev, wasTruncated: true });
-}
-function wasFileTruncatedThisSession(filePath) {
-  const entry = _files.get(resolveFilesKey(normalizePath(filePath)));
-  return entry?.wasTruncated === true;
-}
-function generateSessionId() {
-  try {
-    return randomUUID();
-  } catch {
-    return randomBytes(16).toString("hex");
-  }
-}
-function getSessionId() {
-  if (_sessionId !== null) return _sessionId;
-  const fromEnv = process.env["CLAUDE_CODE_SESSION_ID"];
-  _sessionId = fromEnv !== void 0 && fromEnv !== "" ? fromEnv : generateSessionId();
-  return _sessionId;
-}
-function setTranscriptPath(path4, sessionId) {
-  if (path4 === "") return;
-  _transcriptPath = { path: path4, sessionId };
-}
-function getTranscriptPath() {
-  if (_transcriptPath === null) return void 0;
-  return _transcriptPath.sessionId === getSessionId() ? _transcriptPath.path : void 0;
-}
-function exportSessionState() {
-  return {
-    files: Array.from(_files.values()),
-    hintsShown: Array.from(_hintsShown),
-    ..._scheduledPromptCounts.size > 0 ? { scheduledPromptCounts: Array.from(_scheduledPromptCounts.entries()) } : {},
-    webFetches: Array.from(_webFetches.entries()),
-    bashOutputs: Array.from(_bashOutputs.entries()),
-    bashReruns: Array.from(_bashReruns),
-    curlDownloads: Array.from(_curlDownloads.entries()),
-    fileLineRanges: Array.from(_fileLineRanges.entries()),
-    ..._fileServedOutputs.size > 0 ? { fileServedOutputs: Array.from(_fileServedOutputs.entries()) } : {},
-    cliReads: Array.from(_cliReads),
-    pendingLargeFileHints: Array.from(_pendingLargeFileHints.entries()),
-    grepQueries: Array.from(_grepQueries.entries()),
-    globQueries: Array.from(_globQueries.entries()),
-    outstandingAgentSpawns: _outstandingAgentSpawns.map((e) => [e.prompt, e.ts]),
-    ..._lastTabContext !== null ? { lastTabContextDigest: _lastTabContext } : {},
-    ..._seenImageHashes.length > 0 ? { seenImageHashes: [..._seenImageHashes] } : {},
-    ..._compactedAt > 0 ? { compactedAt: _compactedAt } : {}
-  };
-}
-function importSessionState(s) {
-  _files = /* @__PURE__ */ new Map();
-  for (const e of s.files) {
-    if (e && typeof e.path === "string") _files.set(e.path, e);
-  }
-  _filesAtLoad = new Map(Array.from(_files, ([key, e]) => [key, e.readCount]));
-  _filesFullReadCountAtLoad = new Map(Array.from(_files, ([key, e]) => [key, e.fullReadCount ?? 0]));
-  _hintsShown = new Set(s.hintsShown);
-  _scheduledPromptCounts = new Map(s.scheduledPromptCounts ?? []);
-  _webFetches = new Map(s.webFetches);
-  _bashOutputs = new Map(s.bashOutputs);
-  _bashReruns = new Set(s.bashReruns ?? []);
-  _curlDownloads = new Map(s.curlDownloads);
-  _curlDownloadsAtLoad = new Map(_curlDownloads);
-  _fileLineRanges = new Map(s.fileLineRanges ?? []);
-  _fileLineRangesAtLoad = new Map(_fileLineRanges);
-  _fileServedOutputs = new Map(s.fileServedOutputs ?? []);
-  _fileServedOutputsAtLoad = new Map(_fileServedOutputs);
-  _cliReads = new Set(s.cliReads ?? []);
-  _pendingLargeFileHints = new Map(s.pendingLargeFileHints ?? []);
-  _pendingLargeFileHintsAtLoad = new Map(_pendingLargeFileHints);
-  _grepQueries = new Map(s.grepQueries ?? []);
-  _globQueries = new Map(s.globQueries ?? []);
-  _outstandingAgentSpawns = (s.outstandingAgentSpawns ?? []).map(([prompt, ts]) => ({ prompt, ts }));
-  _outstandingAgentSpawnsAtLoad = [..._outstandingAgentSpawns];
-  _lastTabContext = s.lastTabContextDigest ?? null;
-  _seenImageHashes = [...s.seenImageHashes ?? []];
-  _compactedAt = s.compactedAt ?? 0;
-}
-registerReset(() => {
-  _files = /* @__PURE__ */ new Map();
-  _filesAtLoad = /* @__PURE__ */ new Map();
-  _filesFullReadCountAtLoad = /* @__PURE__ */ new Map();
-  _hintsShown = /* @__PURE__ */ new Set();
-  _scheduledPromptCounts = /* @__PURE__ */ new Map();
-  _webFetches = /* @__PURE__ */ new Map();
-  _bashOutputs = /* @__PURE__ */ new Map();
-  _bashReruns = /* @__PURE__ */ new Set();
-  _curlDownloads = /* @__PURE__ */ new Map();
-  _curlDownloadsAtLoad = /* @__PURE__ */ new Map();
-  _fileLineRanges = /* @__PURE__ */ new Map();
-  _fileLineRangesAtLoad = /* @__PURE__ */ new Map();
-  _fileServedOutputs = /* @__PURE__ */ new Map();
-  _fileServedOutputsAtLoad = /* @__PURE__ */ new Map();
-  _cliReads = /* @__PURE__ */ new Set();
-  _pendingLargeFileHints = /* @__PURE__ */ new Map();
-  _pendingLargeFileHintsAtLoad = /* @__PURE__ */ new Map();
-  _grepQueries = /* @__PURE__ */ new Map();
-  _globQueries = /* @__PURE__ */ new Map();
-  _outstandingAgentSpawns = [];
-  _outstandingAgentSpawnsAtLoad = [];
-  _lastTabContext = null;
-  _seenImageHashes = [];
-  _compactedAt = 0;
-  _sessionId = null;
-  _transcriptPath = null;
-});
-
 // src/sessions_dir.ts
 init_define_import_meta_env();
 import * as path from "node:path";
@@ -522,7 +80,7 @@ function sessionsDir() {
 // src/session_store.ts
 init_define_import_meta_env();
 import { createHash } from "node:crypto";
-import * as fs2 from "node:fs";
+import * as fs from "node:fs";
 import * as path2 from "node:path";
 var MAX_FILES = 500;
 var AGENT_SALT_MARKER = sanitizeIdForFilename(":agent:");
@@ -547,6 +105,7 @@ function sessionSidecarPath(sessionId, suffix) {
   const safe = sessionFileStem(sessionId);
   if (!safe) return null;
   if (suffix.includes("/") || suffix.includes("\\") || suffix.includes("..")) return null;
+  if (suffix !== ".json" && suffix.endsWith(".json")) return null;
   const dir = sessionsDir();
   const candidate = path2.join(dir, `${safe}${suffix}`);
   try {
@@ -738,14 +297,14 @@ function mergeLineRanges(disk, mem) {
   }
   return Array.from(byPath.entries());
 }
-var GENERIC_SERVED_OUTPUT_FOLDED_KEY2 = foldPath(normalizePath(GENERIC_SERVED_OUTPUT_KEY));
+var GENERIC_SERVED_OUTPUT_FOLDED_KEY = foldPath(normalizePath(GENERIC_SERVED_OUTPUT_KEY));
 function mergeServedOutputs(disk, mem) {
   const byPath = /* @__PURE__ */ new Map();
   for (const [filePath, ids] of disk) byPath.set(filePath, [...ids]);
   for (const [filePath, ids] of mem) {
     const prev = byPath.get(filePath) ?? [];
     const merged = [...prev.filter((id) => !ids.includes(id)), ...ids];
-    const cap = filePath === GENERIC_SERVED_OUTPUT_FOLDED_KEY2 ? MAX_GENERIC_SERVED_OUTPUTS : MAX_SERVED_OUTPUTS_PER_FILE;
+    const cap = filePath === GENERIC_SERVED_OUTPUT_FOLDED_KEY ? MAX_GENERIC_SERVED_OUTPUTS : MAX_SERVED_OUTPUTS_PER_FILE;
     if (merged.length > cap) merged.splice(0, merged.length - cap);
     byPath.set(filePath, merged);
   }
@@ -838,8 +397,23 @@ function capFiles(s, max) {
 }
 function readDiskState(p) {
   try {
-    if (!fs2.existsSync(p)) return null;
-    return coerce(JSON.parse(fs2.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;
   }
@@ -856,8 +430,8 @@ function listSiblingSessionStates(sessionId) {
   const dir = sessionsDir();
   const out = [];
   try {
-    if (!fs2.existsSync(dir)) return out;
-    for (const file of fs2.readdirSync(dir)) {
+    if (!fs.existsSync(dir)) return out;
+    for (const file of fs.readdirSync(dir)) {
       if (!file.endsWith(".json") || !file.startsWith(prefix)) continue;
       const state = readDiskState(path2.join(dir, file));
       if (state !== null) out.push(state);
@@ -867,22 +441,20 @@ function listSiblingSessionStates(sessionId) {
   }
   return out;
 }
+var EMPTY_SESSION = { files: [], hintsShown: [], webFetches: [], bashOutputs: [], curlDownloads: [] };
 function loadSessionState(sessionId) {
   const p = sessionPath(sessionId);
-  if (!p) return;
-  const disk = readDiskState(p);
-  if (disk === null) return;
-  importSessionState(disk);
+  importSessionState((p ? readDiskState(p) : null) ?? EMPTY_SESSION);
 }
 function saveSessionState(sessionId) {
   const p = sessionPath(sessionId);
   if (!p) return;
   try {
     const dir = path2.dirname(p);
-    if (!fs2.existsSync(dir)) ensureDirSync(dir);
+    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;
@@ -901,9 +473,9 @@ function saveSessionState(sessionId) {
 
 // src/skill_cache.ts
 init_define_import_meta_env();
-import * as fs3 from "fs/promises";
+import * as fs2 from "fs/promises";
 import { resolve } from "path";
-import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync2, statSync as statSync2, unlinkSync } from "node:fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync2, statSync, unlinkSync } from "node:fs";
 var COMPACT_END_MARKER = "<!-- COMPACT_END -->";
 var SKILLS_OUTPUT_SUBDIR = "skills";
 var _skillOutputsDirOverride = null;
@@ -1068,14 +640,14 @@ function extractChecklistSection(body) {
 async function listOutputs() {
   try {
     const dir = skillOutputsDir();
-    const entries = await fs3.readdir(dir, { withFileTypes: true });
+    const entries = await fs2.readdir(dir, { withFileTypes: true });
     const metas = [];
     for (const entry of entries) {
       if (!entry.isFile() || !entry.name.endsWith(".meta")) {
         continue;
       }
       try {
-        const content = await fs3.readFile(resolve(dir, entry.name), "utf-8");
+        const content = await fs2.readFile(resolve(dir, entry.name), "utf-8");
         const meta = JSON.parse(content);
         metas.push(meta);
       } catch {
@@ -1126,7 +698,7 @@ async function findCrossSessionEntry(skillName, contentSha) {
       const dir = skillOutputsDir();
       const bodyPath = resolve(dir, `${meta.outputId}.txt`);
       try {
-        const bodyExists = await fs3.access(bodyPath).then(() => true).catch(() => false);
+        const bodyExists = await fs2.access(bodyPath).then(() => true).catch(() => false);
         if (bodyExists) {
           return meta;
         }
@@ -1262,7 +834,7 @@ async function readSkillHits(skillName) {
     if (!name) return { count: 0, lastTs: 0 };
     const dir = skillOutputsDir();
     const hitsFile = resolve(dir, `${sanitizeSkillId(name)}.hits`);
-    const content = await fs3.readFile(hitsFile, "utf-8").catch(() => null);
+    const content = await fs2.readFile(hitsFile, "utf-8").catch(() => null);
     if (content) {
       const parsed = JSON.parse(content);
       return parsed;
@@ -1290,14 +862,14 @@ function runExclusiveInProcess(key, fn) {
 async function acquireSkillHitLock(lockPath) {
   for (let attempt = 0; attempt < SKILL_HIT_LOCK_MAX_ATTEMPTS; attempt++) {
     try {
-      await fs3.mkdir(lockPath);
+      await fs2.mkdir(lockPath);
       return true;
     } catch (err) {
       if (err.code !== "EEXIST") return false;
       try {
-        const st = await fs3.stat(lockPath);
+        const st = await fs2.stat(lockPath);
         if (Date.now() - st.mtimeMs > SKILL_HIT_LOCK_STALE_MS) {
-          await fs3.rmdir(lockPath).catch(() => {
+          await fs2.rmdir(lockPath).catch(() => {
           });
           continue;
         }
@@ -1326,7 +898,7 @@ async function incrementSkillHit(skillName) {
         hits.lastTs = Date.now();
         await atomicWriteText(hitsFile, JSON.stringify(hits, null, 2));
       } finally {
-        await fs3.rmdir(lockPath).catch(() => {
+        await fs2.rmdir(lockPath).catch(() => {
         });
       }
     });
@@ -1362,14 +934,14 @@ async function listSkills(sessionId) {
       let compactLen = 0;
       let compactText = "";
       try {
-        const stat2 = await fs3.stat(resolve(dir, compactFileId));
+        const stat2 = await fs2.stat(resolve(dir, compactFileId));
         compactLen = stat2.size;
-        compactText = await fs3.readFile(resolve(dir, compactFileId), "utf-8").catch(() => "");
+        compactText = await fs2.readFile(resolve(dir, compactFileId), "utf-8").catch(() => "");
       } catch {
         compactLen = 0;
       }
       const hasMarker = extractCompactFromMarker(
-        await fs3.readFile(resolve(dir, `${meta.outputId}.txt`), "utf-8").catch(() => "")
+        await fs2.readFile(resolve(dir, `${meta.outputId}.txt`), "utf-8").catch(() => "")
       ) !== null;
       const compactStale = isCompactStale(compactText, meta.skillName, meta.contentSha);
       const { count: hitCount } = await readSkillHits(meta.skillName);
@@ -1408,7 +980,7 @@ async function resolvePluginSkillPath(pluginName, skillSlug) {
   const manifestPath = _pluginsManifestPathOverride ?? resolve(claudeConfigDir(), "plugins", "installed_plugins.json");
   let raw;
   try {
-    raw = await fs3.readFile(manifestPath, "utf8");
+    raw = await fs2.readFile(manifestPath, "utf8");
   } catch {
     return null;
   }
@@ -1430,7 +1002,7 @@ async function resolvePluginSkillPath(pluginName, skillSlug) {
       if (typeof installPath !== "string" || installPath === "") continue;
       const diskPath = resolve(installPath, "skills", skillSlug, "SKILL.md");
       try {
-        await fs3.access(diskPath);
+        await fs2.access(diskPath);
         return diskPath;
       } catch {
         continue;
@@ -1449,7 +1021,7 @@ async function installedSkillPath(skillName) {
   }
   const diskPath = resolve(skillsSourceDir(), name, "SKILL.md");
   try {
-    await fs3.access(diskPath);
+    await fs2.access(diskPath);
     return diskPath;
   } catch {
     return null;
@@ -1471,7 +1043,7 @@ function pruneSkillOutputs(maxCount = DEFAULT_MAX_COUNT, maxAgeMs = DEFAULT_MAX_
         ts = parsed.ts;
       } catch {
         try {
-          ts = statSync2(resolve(dir, file)).mtimeMs;
+          ts = statSync(resolve(dir, file)).mtimeMs;
         } catch {
           continue;
         }
@@ -1509,7 +1081,7 @@ function pruneSkillOutputs(maxCount = DEFAULT_MAX_COUNT, maxAgeMs = DEFAULT_MAX_
 
 // src/compact.ts
 init_define_import_meta_env();
-import * as fs4 from "node:fs";
+import * as fs3 from "node:fs";
 import * as path3 from "node:path";
 var CONTEXT_AUTOCOMPACT_TOKENS = 66e4;
 var CATALOG_TOKENS = 10800;
@@ -1747,10 +1319,10 @@ function isNoisePath(inputPath) {
 function findLatestSessionId() {
   try {
     const sessionsDir2 = path3.join(tokenGoatHome(), "sessions");
-    if (!fs4.existsSync(sessionsDir2)) {
+    if (!fs3.existsSync(sessionsDir2)) {
       return null;
     }
-    const files = fs4.readdirSync(sessionsDir2);
+    const files = fs3.readdirSync(sessionsDir2);
     const jsonFiles = files.filter((f) => f.endsWith(".json") && !f.includes(AGENT_SALT_MARKER));
     if (jsonFiles.length === 0) {
       return null;
@@ -1760,9 +1332,9 @@ function findLatestSessionId() {
       return null;
     }
     let latestFile = firstFile;
-    let latestMtime = fs4.statSync(path3.join(sessionsDir2, firstFile)).mtimeMs;
+    let latestMtime = fs3.statSync(path3.join(sessionsDir2, firstFile)).mtimeMs;
     for (const file of jsonFiles) {
-      const mtime = fs4.statSync(path3.join(sessionsDir2, file)).mtimeMs;
+      const mtime = fs3.statSync(path3.join(sessionsDir2, file)).mtimeMs;
       if (mtime > latestMtime) {
         latestFile = file;
         latestMtime = mtime;
@@ -1785,7 +1357,7 @@ function writeSessionManifest(projectHash, sessionId, manifestJson) {
   const safeSessionId = sessionFileStem(sessionId);
   if (!safeSessionId) return;
   const sessionsDir2 = path3.join(dataDir(), "projects", projectHash, "sessions");
-  if (!fs4.existsSync(sessionsDir2)) {
+  if (!fs3.existsSync(sessionsDir2)) {
     ensureDirSync(sessionsDir2);
   }
   const dest = path3.join(sessionsDir2, `${safeSessionId}.json`);
@@ -1793,28 +1365,28 @@ function writeSessionManifest(projectHash, sessionId, manifestJson) {
 }
 function readAllSessionManifests(projectHash, maxAgeSecs = 3600) {
   const sessionsDir2 = path3.join(dataDir(), "projects", projectHash, "sessions");
-  if (!fs4.existsSync(sessionsDir2)) {
+  if (!fs3.existsSync(sessionsDir2)) {
     return [];
   }
   const now = Date.now() / 1e3;
   const results = [];
   try {
-    const files = fs4.readdirSync(sessionsDir2);
+    const files = fs3.readdirSync(sessionsDir2);
     for (const file of files) {
       if (!file.endsWith(".json")) {
         continue;
       }
       try {
         const fullPath = path3.join(sessionsDir2, file);
-        const stat2 = fs4.statSync(fullPath);
+        const stat2 = fs3.statSync(fullPath);
         if (now - stat2.mtimeMs / 1e3 > maxAgeSecs) {
           try {
-            fs4.unlinkSync(fullPath);
+            fs3.unlinkSync(fullPath);
           } catch {
           }
           continue;
         }
-        const text = fs4.readFileSync(fullPath, "utf8");
+        const text = fs3.readFileSync(fullPath, "utf8");
         const data = JSON.parse(text);
         if (typeof data === "object" && data !== null && "files" in data) {
           results.push(data);
@@ -1901,56 +1473,6 @@ function computeAdaptiveBudget(cache, ageSecs = 0, opts) {
 }
 
 export {
-  recordFileRead,
-  recordSymbolRead,
-  recordFileEdit,
-  getSessionFiles,
-  wasFileReadThisSession,
-  wasFileFullyReadThisSession,
-  getCompactedAt,
-  markCompacted,
-  getSessionFileEntry,
-  wasHintShown,
-  markHintShown,
-  recordScheduledPrompt,
-  wasCliReadThisSession,
-  recordCliRead,
-  recordLargeFileHintPending,
-  takePendingLargeFileHint,
-  WEB_FETCH_KEY_SEP,
-  recordWebFetch,
-  getSessionWebFetches,
-  recordBashOutput,
-  getSessionBashOutputs,
-  recordBashRerun,
-  getSessionBashReruns,
-  getBashOutputId,
-  recordGrepQuery,
-  getGrepMatchCount,
-  recordGlobQuery,
-  getGlobMatchCount,
-  setLastTabContext,
-  lastTabContextMatches,
-  hasSeenImage,
-  recordSeenImage,
-  recordOutstandingAgentSpawn,
-  getOutstandingAgentSpawns,
-  removeOutstandingAgentSpawn,
-  recordCurlDownload,
-  getCurlDownloadPath,
-  clearCurlDownload,
-  recordFileLineRange,
-  getFileLineRanges,
-  resetFileLineRanges,
-  GENERIC_SERVED_OUTPUT_KEY,
-  recordFileServedOutput,
-  getFileServedOutputs,
-  markFileTruncated,
-  wasFileTruncatedThisSession,
-  getSessionId,
-  setTranscriptPath,
-  getTranscriptPath,
-  exportSessionState,
   SESSIONS_SUBDIR,
   sessionsDir,
   AGENT_SALT_MARKER,