@askexenow/exe-os 0.8.33 → 0.8.37

package/dist/hooks/prompt-submit.js

@@ -277,12 +277,68 @@ var init_memory = __esm({
   }
 });
 
+// src/lib/db-retry.ts
+function isBusyError(err) {
+  if (err instanceof Error) {
+    const msg = err.message.toLowerCase();
+    return msg.includes("sqlite_busy") || msg.includes("database is locked");
+  }
+  return false;
+}
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function retryOnBusy(fn, label) {
+  let lastError;
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      return await fn();
+    } catch (err) {
+      lastError = err;
+      if (!isBusyError(err) || attempt === MAX_RETRIES) {
+        throw err;
+      }
+      const backoff = BASE_DELAY_MS * Math.pow(2, attempt);
+      const jitter = Math.floor(Math.random() * MAX_JITTER_MS);
+      process.stderr.write(
+        `[exe-os] SQLITE_BUSY ${label} retry ${attempt + 1}/${MAX_RETRIES} \u2014 waiting ${backoff + jitter}ms
+`
+      );
+      await delay(backoff + jitter);
+    }
+  }
+  throw lastError;
+}
+function wrapWithRetry(client) {
+  return new Proxy(client, {
+    get(target, prop, receiver) {
+      if (prop === "execute") {
+        return (sql) => retryOnBusy(() => target.execute(sql), "execute");
+      }
+      if (prop === "batch") {
+        return (stmts) => retryOnBusy(() => target.batch(stmts), "batch");
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+var MAX_RETRIES, BASE_DELAY_MS, MAX_JITTER_MS;
+var init_db_retry = __esm({
+  "src/lib/db-retry.ts"() {
+    "use strict";
+    MAX_RETRIES = 3;
+    BASE_DELAY_MS = 200;
+    MAX_JITTER_MS = 300;
+  }
+});
+
 // src/lib/database.ts
 import { createClient } from "@libsql/client";
 async function initDatabase(config) {
   if (_client) {
     _client.close();
     _client = null;
+    _resilientClient = null;
   }
   const opts = {
     url: `file:${config.dbPath}`
@@ -291,17 +347,24 @@ async function initDatabase(config) {
     opts.encryptionKey = config.encryptionKey;
   }
   _client = createClient(opts);
+  _resilientClient = wrapWithRetry(_client);
 }
 function getClient() {
+  if (!_resilientClient) {
+    throw new Error("Database client not initialized. Call initDatabase() first.");
+  }
+  return _resilientClient;
+}
+function getRawClient() {
   if (!_client) {
     throw new Error("Database client not initialized. Call initDatabase() first.");
   }
   return _client;
 }
 async function ensureSchema() {
-  const client = getClient();
+  const client = getRawClient();
   await client.execute("PRAGMA journal_mode = WAL");
-  await client.execute("PRAGMA busy_timeout = 5000");
+  await client.execute("PRAGMA busy_timeout = 30000");
   try {
     await client.execute("PRAGMA libsql_vector_search_ef = 128");
   } catch {
@@ -1094,13 +1157,16 @@ async function disposeDatabase() {
   if (_client) {
     _client.close();
     _client = null;
+    _resilientClient = null;
   }
 }
-var _client, initTurso, disposeTurso;
+var _client, _resilientClient, initTurso, disposeTurso;
 var init_database = __esm({
   "src/lib/database.ts"() {
     "use strict";
+    init_db_retry();
     _client = null;
+    _resilientClient = null;
     initTurso = initDatabase;
     disposeTurso = disposeDatabase;
   }
@@ -1213,7 +1279,7 @@ function listShards() {
 }
 async function ensureShardSchema(client) {
   await client.execute("PRAGMA journal_mode = WAL");
-  await client.execute("PRAGMA busy_timeout = 5000");
+  await client.execute("PRAGMA busy_timeout = 30000");
   try {
     await client.execute("PRAGMA libsql_vector_search_ef = 128");
   } catch {
@@ -1474,7 +1540,8 @@ async function writeMemory(record) {
     has_error: record.has_error ? 1 : 0,
     raw_text: record.raw_text,
     vector: record.vector,
-    version: _nextVersion++,
+    version: 0,
+    // Placeholder — assigned atomically at flush time
     task_id: record.task_id ?? null,
     importance: record.importance ?? 5,
     status: record.status ?? "active",
@@ -1508,6 +1575,13 @@ async function flushBatch() {
   _flushing = true;
   try {
     const batch = _pendingRecords.slice(0);
+    const client = getClient();
+    const vResult = await client.execute("SELECT MAX(version) as max_v FROM memories");
+    let baseVersion = (Number(vResult.rows[0]?.max_v) || 0) + 1;
+    for (const row of batch) {
+      row.version = baseVersion++;
+    }
+    _nextVersion = baseVersion;
     const buildStmt = (row) => {
       const hasVector = row.vector !== null;
       const taskId = row.task_id ?? null;
@@ -2098,11 +2172,11 @@ async function connectEmbedDaemon() {
     }
   }
   const start = Date.now();
-  let delay = 100;
+  let delay2 = 100;
   while (Date.now() - start < CONNECT_TIMEOUT_MS) {
-    await new Promise((r) => setTimeout(r, delay));
+    await new Promise((r) => setTimeout(r, delay2));
     if (await connectToSocket()) return true;
-    delay = Math.min(delay * 2, 3e3);
+    delay2 = Math.min(delay2 * 2, 3e3);
   }
   return false;
 }
@@ -2194,11 +2268,11 @@ async function embedViaClient(text, priority = "high") {
 `);
       killAndRespawnDaemon();
       const start = Date.now();
-      let delay = 200;
+      let delay2 = 200;
       while (Date.now() - start < CONNECT_TIMEOUT_MS) {
-        await new Promise((r) => setTimeout(r, delay));
+        await new Promise((r) => setTimeout(r, delay2));
         if (await connectToSocket()) break;
-        delay = Math.min(delay * 2, 3e3);
+        delay2 = Math.min(delay2 * 2, 3e3);
       }
       if (!_connected) return null;
     }
@@ -2210,11 +2284,11 @@ async function embedViaClient(text, priority = "high") {
 `);
     killAndRespawnDaemon();
     const start = Date.now();
-    let delay = 200;
+    let delay2 = 200;
     while (Date.now() - start < CONNECT_TIMEOUT_MS) {
-      await new Promise((r) => setTimeout(r, delay));
+      await new Promise((r) => setTimeout(r, delay2));
       if (await connectToSocket()) break;
-      delay = Math.min(delay * 2, 3e3);
+      delay2 = Math.min(delay2 * 2, 3e3);
     }
     if (!_connected) return null;
     const retry = await sendRequest([text], priority);
@@ -3035,8 +3109,8 @@ function drainQueue(isSessionBusy, sendKeys) {
     } catch {
     }
     item.attempts++;
-    if (item.attempts >= MAX_RETRIES) {
-      logQueue(`FAILED \u2192 ${item.targetSession} (${MAX_RETRIES} retries exhausted, reason: ${item.reason})`);
+    if (item.attempts >= MAX_RETRIES2) {
+      logQueue(`FAILED \u2192 ${item.targetSession} (${MAX_RETRIES2} retries exhausted, reason: ${item.reason})`);
       failed++;
       continue;
     }
@@ -3069,12 +3143,12 @@ function logQueue(msg) {
   } catch {
   }
 }
-var QUEUE_PATH, MAX_RETRIES, TTL_MS, INTERCOM_LOG;
+var QUEUE_PATH, MAX_RETRIES2, TTL_MS, INTERCOM_LOG;
 var init_intercom_queue = __esm({
   "src/lib/intercom-queue.ts"() {
     "use strict";
     QUEUE_PATH = path10.join(os3.homedir(), ".exe-os", "intercom-queue.json");
-    MAX_RETRIES = 5;
+    MAX_RETRIES2 = 5;
     TTL_MS = 60 * 60 * 1e3;
     INTERCOM_LOG = path10.join(os3.homedir(), ".exe-os", "intercom.log");
   }
@@ -3082,7 +3156,7 @@ var init_intercom_queue = __esm({
 
 // src/lib/employees.ts
 import { readFile as readFile3, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
-import { existsSync as existsSync9, symlinkSync, readlinkSync } from "fs";
+import { existsSync as existsSync9, symlinkSync, readlinkSync, readFileSync as readFileSync7 } from "fs";
 import { execSync as execSync6 } from "child_process";
 import path11 from "path";
 async function loadEmployees(employeesPath = EMPLOYEES_PATH) {
@@ -3109,7 +3183,7 @@ var init_employees = __esm({
 });
 
 // src/lib/license.ts
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync4, existsSync as existsSync10, mkdirSync as mkdirSync5 } from "fs";
+import { readFileSync as readFileSync8, writeFileSync as writeFileSync4, existsSync as existsSync10, mkdirSync as mkdirSync5 } from "fs";
 import { randomUUID as randomUUID2 } from "crypto";
 import path12 from "path";
 import { jwtVerify, importSPKI } from "jose";
@@ -3132,12 +3206,12 @@ var init_license = __esm({
 });
 
 // src/lib/plan-limits.ts
-import { readFileSync as readFileSync8, existsSync as existsSync11 } from "fs";
+import { readFileSync as readFileSync9, existsSync as existsSync11 } from "fs";
 import path13 from "path";
 function getLicenseSync() {
   try {
     if (!existsSync11(CACHE_PATH2)) return freeLicense();
-    const raw = JSON.parse(readFileSync8(CACHE_PATH2, "utf8"));
+    const raw = JSON.parse(readFileSync9(CACHE_PATH2, "utf8"));
     if (!raw.token || typeof raw.token !== "string") return freeLicense();
     const parts = raw.token.split(".");
     if (parts.length !== 3) return freeLicense();
@@ -3176,7 +3250,7 @@ function assertEmployeeLimitSync(rosterPath) {
   let count = 0;
   try {
     if (existsSync11(filePath)) {
-      const raw = readFileSync8(filePath, "utf8");
+      const raw = readFileSync9(filePath, "utf8");
       const employees = JSON.parse(raw);
       count = Array.isArray(employees) ? employees.length : 0;
     }
@@ -3211,10 +3285,46 @@ var init_plan_limits = __esm({
 
 // src/lib/tmux-routing.ts
 import { execFileSync as execFileSync2, execSync as execSync7 } from "child_process";
-import { readFileSync as readFileSync9, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6, existsSync as existsSync12, appendFileSync } from "fs";
+import { readFileSync as readFileSync10, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6, existsSync as existsSync12, appendFileSync } from "fs";
 import path14 from "path";
 import os4 from "os";
 import { fileURLToPath as fileURLToPath2 } from "url";
+import { unlinkSync as unlinkSync3 } from "fs";
+function spawnLockPath(sessionName) {
+  return path14.join(SPAWN_LOCK_DIR, `${sessionName}.lock`);
+}
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function acquireSpawnLock2(sessionName) {
+  if (!existsSync12(SPAWN_LOCK_DIR)) {
+    mkdirSync6(SPAWN_LOCK_DIR, { recursive: true });
+  }
+  const lockFile = spawnLockPath(sessionName);
+  if (existsSync12(lockFile)) {
+    try {
+      const lock = JSON.parse(readFileSync10(lockFile, "utf8"));
+      const age = Date.now() - lock.timestamp;
+      if (isProcessAlive(lock.pid) && age < 6e4) {
+        return false;
+      }
+    } catch {
+    }
+  }
+  writeFileSync5(lockFile, JSON.stringify({ pid: process.pid, timestamp: Date.now() }));
+  return true;
+}
+function releaseSpawnLock2(sessionName) {
+  try {
+    unlinkSync3(spawnLockPath(sessionName));
+  } catch {
+  }
+}
 function resolveBehaviorsExporterScript() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
@@ -3260,7 +3370,7 @@ function extractRootExe(name) {
 }
 function getParentExe(sessionKey) {
   try {
-    const data = JSON.parse(readFileSync9(path14.join(SESSION_CACHE, `parent-exe-${sessionKey}.json`), "utf8"));
+    const data = JSON.parse(readFileSync10(path14.join(SESSION_CACHE, `parent-exe-${sessionKey}.json`), "utf8"));
     return data.parentExe || null;
   } catch {
     return null;
@@ -3284,17 +3394,17 @@ function isEmployeeAlive(sessionName) {
 }
 function findFreeInstance(employeeName, exeSession, maxInstances = 10, isAlive = isEmployeeAlive) {
   const base = employeeSessionName(employeeName, exeSession);
-  if (!isAlive(base)) return 0;
+  if (!isAlive(base) && acquireSpawnLock2(base)) return 0;
   for (let i = 2; i <= maxInstances; i++) {
     const candidate = employeeSessionName(employeeName, exeSession, i);
-    if (!isAlive(candidate)) return i;
+    if (!isAlive(candidate) && acquireSpawnLock2(candidate)) return i;
   }
   return null;
 }
 function readDebounceState() {
   try {
     if (!existsSync12(DEBOUNCE_FILE)) return {};
-    return JSON.parse(readFileSync9(DEBOUNCE_FILE, "utf8"));
+    return JSON.parse(readFileSync10(DEBOUNCE_FILE, "utf8"));
   } catch {
     return {};
   }
@@ -3468,7 +3578,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
     const claudeJsonPath = path14.join(os4.homedir(), ".claude.json");
     let claudeJson = {};
     try {
-      claudeJson = JSON.parse(readFileSync9(claudeJsonPath, "utf8"));
+      claudeJson = JSON.parse(readFileSync10(claudeJsonPath, "utf8"));
     } catch {
     }
     if (!claudeJson.projects) claudeJson.projects = {};
@@ -3486,7 +3596,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
     const settingsPath = path14.join(projSettingsDir, "settings.json");
     let settings = {};
     try {
-      settings = JSON.parse(readFileSync9(settingsPath, "utf8"));
+      settings = JSON.parse(readFileSync10(settingsPath, "utf8"));
     } catch {
     }
     const perms = settings.permissions ?? {};
@@ -3599,6 +3709,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
     command: spawnCommand
   });
   if (spawnResult.error) {
+    releaseSpawnLock2(sessionName);
     return { sessionName, error: `tmux new-session failed: ${spawnResult.error}` };
   }
   transport.pipeLog(sessionName, logFile);
@@ -3636,6 +3747,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
     }
   }
   if (!booted) {
+    releaseSpawnLock2(sessionName);
     return { sessionName, error: `${useExeAgent ? "exe-agent" : "claude"} did not boot within 15s` };
   }
   if (!useExeAgent) {
@@ -3652,9 +3764,10 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
     pid: 0,
     registeredAt: (/* @__PURE__ */ new Date()).toISOString()
   });
+  releaseSpawnLock2(sessionName);
   return { sessionName };
 }
-var SESSION_CACHE, BEHAVIORS_EXPORT_TIMEOUT_MS, INTERCOM_DEBOUNCE_MS, INTERCOM_LOG2, DEBOUNCE_FILE, DEBOUNCE_CLEANUP_AGE_MS, BUSY_PATTERN;
+var SPAWN_LOCK_DIR, SESSION_CACHE, BEHAVIORS_EXPORT_TIMEOUT_MS, INTERCOM_DEBOUNCE_MS, INTERCOM_LOG2, DEBOUNCE_FILE, DEBOUNCE_CLEANUP_AGE_MS, BUSY_PATTERN;
 var init_tmux_routing = __esm({
   "src/lib/tmux-routing.ts"() {
     "use strict";
@@ -3666,6 +3779,7 @@ var init_tmux_routing = __esm({
     init_provider_table();
     init_intercom_queue();
     init_plan_limits();
+    SPAWN_LOCK_DIR = path14.join(os4.homedir(), ".exe-os", "spawn-locks");
     SESSION_CACHE = path14.join(os4.homedir(), ".exe-os", "session-cache");
     BEHAVIORS_EXPORT_TIMEOUT_MS = 1e4;
     INTERCOM_DEBOUNCE_MS = 3e4;
@@ -3813,7 +3927,7 @@ async function deliverLocalMessage(messageId) {
     return true;
   } catch {
     const newRetryCount = msg.retryCount + 1;
-    if (newRetryCount >= MAX_RETRIES2) {
+    if (newRetryCount >= MAX_RETRIES3) {
       await markFailed(messageId, "session unavailable after 10 retries");
     } else {
       await client.execute({
@@ -3902,7 +4016,7 @@ async function retryPendingMessages() {
     sql: `SELECT * FROM messages
           WHERE status = 'pending' AND retry_count < ?
           ORDER BY id`,
-    args: [MAX_RETRIES2]
+    args: [MAX_RETRIES3]
   });
   let delivered = 0;
   for (const row of result.rows) {
@@ -3915,13 +4029,13 @@ async function retryPendingMessages() {
   }
   return delivered;
 }
-var MAX_RETRIES2, _wsClientSend;
+var MAX_RETRIES3, _wsClientSend;
 var init_messaging = __esm({
   "src/lib/messaging.ts"() {
     "use strict";
     init_database();
     init_tmux_routing();
-    MAX_RETRIES2 = 10;
+    MAX_RETRIES3 = 10;
     _wsClientSend = null;
   }
 });
@@ -3931,9 +4045,9 @@ import crypto4 from "crypto";
 import path15 from "path";
 import os5 from "os";
 import {
-  readFileSync as readFileSync10,
+  readFileSync as readFileSync11,
   readdirSync as readdirSync3,
-  unlinkSync as unlinkSync3,
+  unlinkSync as unlinkSync4,
   existsSync as existsSync13,
   rmdirSync
 } from "fs";
@@ -3973,7 +4087,7 @@ import crypto5 from "crypto";
 import path16 from "path";
 import { execSync as execSync8 } from "child_process";
 import { mkdir as mkdir4, writeFile as writeFile4, appendFile } from "fs/promises";
-import { existsSync as existsSync14, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync12 } from "fs";
 function extractParentFromContext(contextBody) {
   if (!contextBody) return null;
   const match = contextBody.match(
@@ -4163,7 +4277,7 @@ async function ensureGitignoreExe(baseDir) {
   const gitignorePath = path16.join(baseDir, ".gitignore");
   try {
     if (existsSync14(gitignorePath)) {
-      const content = readFileSync11(gitignorePath, "utf-8");
+      const content = readFileSync12(gitignorePath, "utf-8");
       if (/^\/?exe\/?$/m.test(content)) return;
       await appendFile(gitignorePath, "\n# Employee task assignments (private)\n/exe/\n");
     } else {
@@ -4190,7 +4304,7 @@ __export(tasks_review_exports, {
   listPendingReviews: () => listPendingReviews
 });
 import path17 from "path";
-import { existsSync as existsSync15, readdirSync as readdirSync4, unlinkSync as unlinkSync4 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync4, unlinkSync as unlinkSync5 } from "fs";
 async function countPendingReviews() {
   const client = getClient();
   const result = await client.execute({
@@ -4404,7 +4518,7 @@ async function cleanupReviewFile(row, taskFile, _baseDir) {
     if (existsSync15(cacheDir)) {
       for (const f of readdirSync4(cacheDir)) {
         if (f.startsWith("review-notified-")) {
-          unlinkSync4(path17.join(cacheDir, f));
+          unlinkSync5(path17.join(cacheDir, f));
         }
       }
     }
@@ -4429,7 +4543,7 @@ init_config();
 init_config();
 init_store();
 import { spawn as spawn2 } from "child_process";
-import { readFileSync as readFileSync12, writeFileSync as writeFileSync6, mkdirSync as mkdirSync7, existsSync as existsSync16, openSync as openSync2, closeSync as closeSync2 } from "fs";
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync6, mkdirSync as mkdirSync7, existsSync as existsSync16, openSync as openSync2, closeSync as closeSync2 } from "fs";
 import path18 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
@@ -4838,7 +4952,7 @@ function getActiveAgent() {
       "tmux display-message -p '#{session_name}' 2>/dev/null",
       { encoding: "utf8", timeout: 2e3 }
     ).trim();
-    const empMatch = sessionName.match(/^(\w+)-exe\d+$/);
+    const empMatch = sessionName.match(/^([a-zA-Z]+)\d*-exe\d+$/);
     if (empMatch && empMatch[1] !== "exe") {
       return { agentId: empMatch[1], agentRole: "employee" };
     }
@@ -4872,7 +4986,7 @@ function openWorkerLog() {
 var CACHE_DIR2 = path18.join(EXE_AI_DIR, "session-cache");
 function loadInjectedIds(sessionId) {
   try {
-    const raw = readFileSync12(path18.join(CACHE_DIR2, `${sessionId}.json`), "utf8");
+    const raw = readFileSync13(path18.join(CACHE_DIR2, `${sessionId}.json`), "utf8");
     return new Set(JSON.parse(raw));
   } catch {
     return /* @__PURE__ */ new Set();
@@ -4967,7 +5081,7 @@ ${fresh.map(
         const lastCheckPath = path18.join(CACHE_DIR2, `review-lastcheck-${sessionKey}.json`);
         let lastCheckedAt = "";
         try {
-          lastCheckedAt = readFileSync12(lastCheckPath, "utf8").trim();
+          lastCheckedAt = readFileSync13(lastCheckPath, "utf8").trim();
         } catch {
         }
         const totalCount = await countPendingReviews2();