token-goat 2.9.28 → 2.9.29

package/dist/{token-goat-chunk-L7SDVGBT.mjs → token-goat-chunk-G7IWXCFF.mjs}

@@ -6,35 +6,42 @@ import {
   isNoisePath,
   listSiblingSessionStates,
   loadSessionCache
-} from "./token-goat-chunk-6CCQDAYY.mjs";
+} from "./token-goat-chunk-H5J3C56Q.mjs";
 import {
   WEB_FETCH_KEY_SEP,
   getSessionBashOutputs,
   getSessionBashReruns,
   getSessionFiles,
   getSessionWebFetches
-} from "./token-goat-chunk-GGLEE35R.mjs";
+} from "./token-goat-chunk-TDUT2CL6.mjs";
 import {
   getBashOutput
-} from "./token-goat-chunk-HXNAC4ZF.mjs";
+} from "./token-goat-chunk-O6I2XU4P.mjs";
 import {
   findProject,
   loadConfig
-} from "./token-goat-chunk-CC2PYJM7.mjs";
+} from "./token-goat-chunk-TGOXNAHW.mjs";
 import {
+  LOCK_WAIT_MS_HARDENED,
   atomicWriteText,
-  dataDir,
   ensureDirSync,
-  foldPath,
   runGit,
   toKB,
-  withFileLock
-} from "./token-goat-chunk-L45ZQRT7.mjs";
+  withFileLock,
+  withRetryOnLock
+} from "./token-goat-chunk-XYWPOSCN.mjs";
+import {
+  foldPath,
+  sleepSync
+} from "./token-goat-chunk-TCQANXYC.mjs";
 import {
   displaySafePath,
   displaySafeText,
   neutralizeSpokenMarkers
 } from "./token-goat-chunk-NMTKNYGF.mjs";
+import {
+  dataDir
+} from "./token-goat-chunk-MELOKFDJ.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -64,9 +71,9 @@ function validateKey(key) {
     );
   }
 }
-function parseTOML(content) {
+function parseTOML(content, unparsed = []) {
   const result = {};
-  for (const line of content.split("\n")) {
+  for (const [i, line] of content.split("\n").entries()) {
     const trimmed = line.trim();
     if (!trimmed || trimmed.startsWith("#")) {
       continue;
@@ -91,20 +98,29 @@ function parseTOML(content) {
         });
         result[key] = unescaped;
       }
+    } else {
+      unparsed.push(i + 1);
     }
   }
   return result;
 }
-function loadRaw(filePath) {
+function loadRaw(filePath, forUpdate = false) {
+  let content = "";
   try {
-    if (!fs.existsSync(filePath)) {
-      return {};
-    }
-    const content = fs.readFileSync(filePath, "utf-8");
-    return parseTOML(content);
-  } catch {
-    return {};
+    withRetryOnLock(() => {
+      content = fs.readFileSync(filePath, "utf-8");
+    });
+  } catch (err) {
+    if (err.code === "ENOENT") return {};
+    throw err;
+  }
+  const unparsed = [];
+  const entries = parseTOML(content, unparsed);
+  if (forUpdate && unparsed.length > 0) {
+    const one = unparsed.length === 1;
+    throw new Error(`Not updating ${filePath}: ${one ? "line" : "lines"} ${unparsed.join(", ")} ${one ? "is" : "are"} not in the key = "value" form, and saving would drop ${one ? "it" : "them"}. Fix or remove ${one ? "it" : "them"}, then try again.`);
   }
+  return entries;
 }
 function save(filePath, entries) {
   const lines = [];
@@ -127,7 +143,7 @@ function setEntry(projectHash, key, value) {
   const dir = path.dirname(p);
   ensureDirSync(dir);
   const doSet = () => {
-    const entries = loadRaw(p);
+    const entries = loadRaw(p, true);
     const isNewKey = !(key in entries);
     if (isNewKey && Object.keys(entries).length >= MAX_ENTRIES) {
       const keysToKeep = MAX_ENTRIES - 1;
@@ -140,20 +156,30 @@ function setEntry(projectHash, key, value) {
     save(p, entries);
     return true;
   };
-  if (withFileLock(`${p}.lock`, doSet) === void 0) doSet();
+  underNotesLock(p, doSet);
+}
+function underNotesLock(p, update) {
+  const lockPath = `${p}.lock`;
+  ensureDirSync(path.dirname(p));
+  for (let attempt = 1; attempt <= 3; attempt++) {
+    if (withFileLock(lockPath, update, { waitMs: LOCK_WAIT_MS_HARDENED }) !== void 0) return;
+    if (fs.existsSync(lockPath)) break;
+    if (attempt < 3) sleepSync(50 * attempt);
+  }
+  throw new Error(`Could not lock ${p} for writing; no note was changed. Another token-goat process may be writing notes: try again.`);
 }
 function unsetEntry(projectHash, key) {
   validateKey(key);
   const p = memoryPath(projectHash);
   const doUnset = () => {
-    const entries = loadRaw(p);
+    const entries = loadRaw(p, true);
     if (key in entries) {
       delete entries[key];
       save(p, entries);
     }
     return true;
   };
-  if (withFileLock(`${p}.lock`, doUnset) === void 0) doUnset();
+  underNotesLock(p, doUnset);
 }
 function clearAll(projectHash) {
   const p = memoryPath(projectHash);
@@ -163,7 +189,7 @@ function clearAll(projectHash) {
     }
     return true;
   };
-  if (withFileLock(`${p}.lock`, doClear) === void 0) doClear();
+  underNotesLock(p, doClear);
 }
 function buildInjection(projectHash) {
   try {

package/dist/{token-goat-chunk-NILVK7XM.mjs → token-goat-chunk-GLXRTTLE.mjs}

@@ -10,16 +10,18 @@ import {
   querySheet,
   rangeSheet,
   xlsxColumns
-} from "./token-goat-chunk-RSS3TLXU.mjs";
-import "./token-goat-chunk-YWSP6IU7.mjs";
+} from "./token-goat-chunk-PYSUADX4.mjs";
+import "./token-goat-chunk-DNSPXQXQ.mjs";
 import "./token-goat-chunk-3BTK54F3.mjs";
-import "./token-goat-chunk-UBUKHVYW.mjs";
+import "./token-goat-chunk-UXSXQQIY.mjs";
 import "./token-goat-chunk-XTQAOTSO.mjs";
 import "./token-goat-chunk-AH6QILZM.mjs";
-import "./token-goat-chunk-L45ZQRT7.mjs";
+import "./token-goat-chunk-XYWPOSCN.mjs";
+import "./token-goat-chunk-TCQANXYC.mjs";
 import "./token-goat-chunk-NMTKNYGF.mjs";
+import "./token-goat-chunk-MELOKFDJ.mjs";
 import "./token-goat-chunk-Y4AFKTHK.mjs";
-import "./token-goat-chunk-GMOUBOX4.mjs";
+import "./token-goat-chunk-JTKCQMQA.mjs";
 import "./token-goat-chunk-A37V4PBF.mjs";
 export {
   XlsxScanTooLargeError,

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

@@ -22,44 +22,49 @@ import {
   outstandingAgentSpawnKey,
   outstandingAgentSpawnsAtLoad,
   pendingLargeFileHintsAtLoad
-} from "./token-goat-chunk-GGLEE35R.mjs";
+} from "./token-goat-chunk-TDUT2CL6.mjs";
 import {
   claudeConfigDir,
   readTranscriptTail
-} from "./token-goat-chunk-MAMQPC43.mjs";
+} from "./token-goat-chunk-ONXH6NZ5.mjs";
 import {
   DEFAULT_MAX_AGE_MS,
   DEFAULT_MAX_COUNT
-} from "./token-goat-chunk-BJBRGPBX.mjs";
+} from "./token-goat-chunk-D4ETHJD6.mjs";
 import {
   recordStat,
   redactSecrets
-} from "./token-goat-chunk-MVSWBNMD.mjs";
+} from "./token-goat-chunk-CIQ2FTY3.mjs";
 import {
   detectHarness,
   isAutoTriggerMultiplierExplicit,
   loadConfig,
   shortFingerprint
-} from "./token-goat-chunk-CC2PYJM7.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-L45ZQRT7.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";
@@ -392,8 +397,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 +444,7 @@ function listSiblingSessionStates(sessionId) {
 var EMPTY_SESSION = { files: [], hintsShown: [], webFetches: [], bashOutputs: [], curlDownloads: [] };
 function loadSessionState(sessionId) {
   const p = sessionPath(sessionId);
-  if (!p) return;
-  importSessionState(readDiskState(p) ?? EMPTY_SESSION);
+  importSessionState((p ? readDiskState(p) : null) ?? EMPTY_SESSION);
 }
 function saveSessionState(sessionId) {
   const p = sessionPath(sessionId);
@@ -435,7 +454,7 @@ 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;

package/dist/{token-goat-chunk-Q4S3UQGO.mjs → token-goat-chunk-HNFZZHFW.mjs}

@@ -12,10 +12,10 @@ import {
   parseOoxmlPart,
   readOoxmlZip,
   sortNumberedParts
-} from "./token-goat-chunk-UBUKHVYW.mjs";
+} from "./token-goat-chunk-UXSXQQIY.mjs";
 import {
   compileGuardedRegex
-} from "./token-goat-chunk-GMOUBOX4.mjs";
+} from "./token-goat-chunk-JTKCQMQA.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";