@askexenow/exe-os 0.8.37 → 0.8.39

package/dist/bin/exe-link.js

@@ -31,15 +31,15 @@ __export(config_exports, {
   migrateConfig: () => migrateConfig,
   saveConfig: () => saveConfig
 });
-import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
+import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, chmod as chmod2 } from "fs/promises";
 import { readFileSync, existsSync as existsSync2, renameSync } from "fs";
 import path2 from "path";
-import os from "os";
+import os2 from "os";
 function resolveDataDir() {
   if (process.env.EXE_OS_DIR) return process.env.EXE_OS_DIR;
   if (process.env.EXE_MEM_DIR) return process.env.EXE_MEM_DIR;
-  const newDir = path2.join(os.homedir(), ".exe-os");
-  const legacyDir = path2.join(os.homedir(), ".exe-mem");
+  const newDir = path2.join(os2.homedir(), ".exe-os");
+  const legacyDir = path2.join(os2.homedir(), ".exe-mem");
   if (!existsSync2(newDir) && existsSync2(legacyDir)) {
     try {
       renameSync(legacyDir, newDir);
@@ -126,7 +126,7 @@ async function loadConfig() {
     normalizeAutoUpdate(migratedCfg);
     const config = { ...DEFAULT_CONFIG, dbPath: path2.join(dir, "memories.db"), ...migratedCfg };
     if (config.dbPath.startsWith("~")) {
-      config.dbPath = config.dbPath.replace(/^~/, os.homedir());
+      config.dbPath = config.dbPath.replace(/^~/, os2.homedir());
     }
     return config;
   } catch {
@@ -157,6 +157,9 @@ async function saveConfig(config) {
   await mkdir2(dir, { recursive: true });
   const configPath = path2.join(dir, "config.json");
   await writeFile2(configPath, JSON.stringify(config, null, 2) + "\n");
+  if (config.cloud?.apiKey) {
+    await chmod2(configPath, 384);
+  }
 }
 async function loadConfigFrom(configPath) {
   const raw = await readFile2(configPath, "utf-8");
@@ -381,15 +384,20 @@ async function saveEmployees(employees, employeesPath = EMPLOYEES_PATH) {
   await mkdir3(path3.dirname(employeesPath), { recursive: true });
   await writeFile3(employeesPath, JSON.stringify(employees, null, 2) + "\n", "utf-8");
 }
+function findExeBin() {
+  try {
+    return execSync(process.platform === "win32" ? "where exe-os" : "which exe-os", { encoding: "utf8" }).trim();
+  } catch {
+    return null;
+  }
+}
 function registerBinSymlinks(name) {
   const created = [];
   const skipped = [];
   const errors = [];
-  let exeBinPath;
-  try {
-    exeBinPath = execSync("which exe", { encoding: "utf-8" }).trim();
-  } catch {
-    errors.push("Could not find 'exe' in PATH");
+  const exeBinPath = findExeBin();
+  if (!exeBinPath) {
+    errors.push("Could not find 'exe-os' in PATH");
     return { created, skipped, errors };
   }
   const binDir = path3.dirname(exeBinPath);
@@ -430,6 +438,14 @@ import { readFileSync as readFileSync3, writeFileSync, existsSync as existsSync4
 import { randomUUID } from "crypto";
 import path4 from "path";
 import { jwtVerify, importSPKI } from "jose";
+async function fetchRetry(url, init) {
+  try {
+    return await fetch(url, init);
+  } catch {
+    await new Promise((r) => setTimeout(r, RETRY_DELAY_MS));
+    return fetch(url, { ...init, signal: AbortSignal.timeout(1e4) });
+  }
+}
 function loadDeviceId() {
   const deviceJsonPath = path4.join(EXE_AI_DIR, "device.json");
   try {
@@ -500,7 +516,7 @@ function cacheResponse(token) {
 async function validateLicense(apiKey, deviceId) {
   const did = deviceId ?? loadDeviceId();
   try {
-    const res = await fetch(`${API_BASE}/auth/activate`, {
+    const res = await fetchRetry(`${API_BASE}/auth/activate`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ apiKey, deviceId: did }),
@@ -535,14 +551,23 @@ async function validateLicense(apiKey, deviceId) {
   } catch {
     const cached = await getCachedLicense();
     if (cached) return cached;
-    return FREE_LICENSE;
+    return { ...FREE_LICENSE, valid: false, error: "offline" };
+  }
+}
+function getCacheAgeMs() {
+  try {
+    const { statSync } = __require("fs");
+    const s = statSync(CACHE_PATH);
+    return Date.now() - s.mtimeMs;
+  } catch {
+    return Infinity;
   }
 }
 async function checkLicense() {
   const key = loadLicense();
   if (!key) return FREE_LICENSE;
   const cached = await getCachedLicense();
-  if (cached) return cached;
+  if (cached && getCacheAgeMs() < CACHE_MAX_AGE_MS) return cached;
   const deviceId = loadDeviceId();
   return validateLicense(key, deviceId);
 }
@@ -556,7 +581,7 @@ function isFeatureAllowed(license, feature) {
       return license.plan === "team" || license.plan === "agency" || license.plan === "enterprise";
   }
 }
-var LICENSE_PATH, CACHE_PATH, DEVICE_ID_PATH, API_BASE, LICENSE_PUBLIC_KEY_PEM, LICENSE_JWT_ALG, PLAN_LIMITS, FREE_LICENSE;
+var LICENSE_PATH, CACHE_PATH, DEVICE_ID_PATH, API_BASE, RETRY_DELAY_MS, LICENSE_PUBLIC_KEY_PEM, LICENSE_JWT_ALG, PLAN_LIMITS, FREE_LICENSE, CACHE_MAX_AGE_MS;
 var init_license = __esm({
   "src/lib/license.ts"() {
     "use strict";
@@ -565,6 +590,7 @@ var init_license = __esm({
     CACHE_PATH = path4.join(EXE_AI_DIR, "license-cache.json");
     DEVICE_ID_PATH = path4.join(EXE_AI_DIR, "device-id");
     API_BASE = "https://askexe.com/cloud";
+    RETRY_DELAY_MS = 500;
     LICENSE_PUBLIC_KEY_PEM = `-----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEeHztAMOpR/ZMh+rWuOASjEZ54CGY
 4uj+UqeKCcvtgNHKmOK278HJaJcANe9xAeji8AFYu27q3WtzCi04pHudow==
@@ -586,6 +612,7 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEeHztAMOpR/ZMh+rWuOASjEZ54CGY
       employeeLimit: 1,
       memoryLimit: 5e3
     };
+    CACHE_MAX_AGE_MS = 36e5;
   }
 });
 
@@ -621,6 +648,7 @@ var init_plan_limits = __esm({
 // src/lib/cloud-sync.ts
 var cloud_sync_exports = {};
 __export(cloud_sync_exports, {
+  assertSecureEndpoint: () => assertSecureEndpoint,
   buildRosterBlob: () => buildRosterBlob,
   cloudPull: () => cloudPull,
   cloudPullBehaviors: () => cloudPullBehaviors,
@@ -640,9 +668,10 @@ __export(cloud_sync_exports, {
   cloudPushTasks: () => cloudPushTasks,
   cloudSync: () => cloudSync,
   mergeConfig: () => mergeConfig,
-  mergeRosterFromRemote: () => mergeRosterFromRemote
+  mergeRosterFromRemote: () => mergeRosterFromRemote,
+  recordRosterDeletion: () => recordRosterDeletion
 });
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync2, existsSync as existsSync6, readdirSync, mkdirSync as mkdirSync2, appendFileSync } from "fs";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync2, existsSync as existsSync6, readdirSync, mkdirSync as mkdirSync2, appendFileSync, unlinkSync } from "fs";
 import path6 from "path";
 import { homedir } from "os";
 function logError(msg) {
@@ -653,16 +682,47 @@ function logError(msg) {
   } catch {
   }
 }
+async function withRosterLock(fn) {
+  if (existsSync6(ROSTER_LOCK_PATH)) {
+    try {
+      const ts = parseInt(readFileSync5(ROSTER_LOCK_PATH, "utf-8"), 10);
+      if (Date.now() - ts < LOCK_STALE_MS) {
+        throw new Error("Roster merge already in progress \u2014 another sync is running");
+      }
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("already in progress")) throw err;
+    }
+  }
+  writeFileSync2(ROSTER_LOCK_PATH, String(Date.now()));
+  try {
+    return await fn();
+  } finally {
+    try {
+      unlinkSync(ROSTER_LOCK_PATH);
+    } catch {
+    }
+  }
+}
 async function fetchWithRetry(url, init) {
-  const attempt = async () => {
-    const signal = AbortSignal.timeout(FETCH_TIMEOUT_MS);
-    return fetch(url, { ...init, signal });
-  };
-  const resp = await attempt();
-  if (resp.status >= 500) {
-    return attempt();
+  const MAX_RETRIES = 3;
+  const BASE_DELAY_MS = 200;
+  let lastError;
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      const signal = AbortSignal.timeout(FETCH_TIMEOUT_MS);
+      const resp = await fetch(url, { ...init, signal });
+      if (resp.status >= 500 && attempt < MAX_RETRIES) {
+        await new Promise((r) => setTimeout(r, BASE_DELAY_MS * Math.pow(2, attempt)));
+        continue;
+      }
+      return resp;
+    } catch (err) {
+      lastError = err;
+      if (attempt === MAX_RETRIES) throw err;
+      await new Promise((r) => setTimeout(r, BASE_DELAY_MS * Math.pow(2, attempt)));
+    }
   }
-  return resp;
+  throw lastError;
 }
 function assertSecureEndpoint(endpoint) {
   if (endpoint.startsWith("https://")) return;
@@ -690,10 +750,15 @@ async function cloudPush(records, maxVersion, config) {
       headers: {
         Authorization: `Bearer ${config.apiKey}`,
         "Content-Type": "application/json",
-        "X-Device-Id": loadDeviceId()
+        "X-Device-Id": loadDeviceId(),
+        "X-Expected-Version": String(maxVersion)
       },
       body: JSON.stringify({ version: maxVersion, blob })
     });
+    if (resp.status === 409) {
+      logError("[cloud-sync] PUSH VERSION CONFLICT \u2014 re-pull required before next push");
+      return false;
+    }
     return resp.ok;
   } catch (err) {
     logError(`[cloud-sync] PUSH FAILED: ${err instanceof Error ? err.message : String(err)}`);
@@ -780,18 +845,21 @@ async function cloudSync(config) {
     "SELECT value FROM sync_meta WHERE key = 'last_cloud_push_version'"
   );
   const lastPushVersion = pushMeta.rows.length > 0 ? Number(pushMeta.rows[0].value) : 0;
-  const recordsResult = await client.execute({
-    sql: `SELECT id, agent_id, agent_role, session_id, timestamp,
-                 tool_name, project_name, has_error, raw_text, version,
-                 author_device_id, scope
-          FROM memories
-          WHERE version > ?
-            AND (scope IS NULL OR scope != 'personal')
-          ORDER BY version ASC`,
-    args: [lastPushVersion]
-  });
   let pushed = 0;
-  if (recordsResult.rows.length > 0) {
+  let batchCursor = lastPushVersion;
+  while (true) {
+    const recordsResult = await client.execute({
+      sql: `SELECT id, agent_id, agent_role, session_id, timestamp,
+                   tool_name, project_name, has_error, raw_text, version,
+                   author_device_id, scope
+            FROM memories
+            WHERE version > ?
+              AND (scope IS NULL OR scope != 'personal')
+            ORDER BY version ASC
+            LIMIT ?`,
+      args: [batchCursor, PUSH_BATCH_SIZE]
+    });
+    if (recordsResult.rows.length === 0) break;
     const records = recordsResult.rows.map((row) => ({
       id: row.id,
       agent_id: row.agent_id,
@@ -808,13 +876,14 @@ async function cloudSync(config) {
     }));
     const maxVersion = Number(records[records.length - 1].version);
     const pushOk = await cloudPush(records, maxVersion, config);
-    if (pushOk) {
-      await client.execute({
-        sql: "INSERT OR REPLACE INTO sync_meta (key, value) VALUES ('last_cloud_push_version', ?)",
-        args: [String(maxVersion)]
-      });
-      pushed = records.length;
-    }
+    if (!pushOk) break;
+    await client.execute({
+      sql: "INSERT OR REPLACE INTO sync_meta (key, value) VALUES ('last_cloud_push_version', ?)",
+      args: [String(maxVersion)]
+    });
+    pushed += records.length;
+    batchCursor = maxVersion;
+    if (recordsResult.rows.length < PUSH_BATCH_SIZE) break;
   }
   try {
     await cloudPushRoster(config);
@@ -896,6 +965,27 @@ async function cloudSync(config) {
     documents: documentsResult
   };
 }
+function recordRosterDeletion(name) {
+  let deletions = [];
+  try {
+    if (existsSync6(ROSTER_DELETIONS_PATH)) {
+      deletions = JSON.parse(readFileSync5(ROSTER_DELETIONS_PATH, "utf-8"));
+    }
+  } catch {
+  }
+  if (!deletions.includes(name)) deletions.push(name);
+  writeFileSync2(ROSTER_DELETIONS_PATH, JSON.stringify(deletions));
+}
+function consumeRosterDeletions() {
+  try {
+    if (!existsSync6(ROSTER_DELETIONS_PATH)) return [];
+    const deletions = JSON.parse(readFileSync5(ROSTER_DELETIONS_PATH, "utf-8"));
+    writeFileSync2(ROSTER_DELETIONS_PATH, "[]");
+    return deletions;
+  } catch {
+    return [];
+  }
+}
 function buildRosterBlob(paths) {
   const rosterPath = paths?.rosterPath ?? path6.join(EXE_AI_DIR, "exe-employees.json");
   const identityDir = paths?.identityDir ?? path6.join(EXE_AI_DIR, "identity");
@@ -923,9 +1013,10 @@ function buildRosterBlob(paths) {
     } catch {
     }
   }
-  const content = JSON.stringify({ roster, identities, config });
+  const deletedNames = consumeRosterDeletions();
+  const content = JSON.stringify({ roster, identities, config, deletedNames });
   const hash = Buffer.from(content).length;
-  return { roster, identities, config, version: hash };
+  return { roster, identities, config, deletedNames, version: hash };
 }
 async function cloudPushRoster(config) {
   assertSecureEndpoint(config.endpoint);
@@ -1008,38 +1099,50 @@ function mergeConfig(remoteConfig, configPath) {
   writeFileSync2(cfgPath, JSON.stringify(merged, null, 2), "utf-8");
 }
 async function mergeRosterFromRemote(remote, paths) {
-  const rosterPath = paths?.rosterPath ?? void 0;
-  const identityDir = paths?.identityDir ?? path6.join(EXE_AI_DIR, "identity");
-  const localEmployees = await loadEmployees(rosterPath);
-  const localNames = new Set(localEmployees.map((e) => e.name));
-  let added = 0;
-  for (const remoteEmp of remote.roster) {
-    if (localNames.has(remoteEmp.name)) continue;
-    localEmployees.push(remoteEmp);
-    localNames.add(remoteEmp.name);
-    added++;
-    if (remote.identities[`${remoteEmp.name}.md`]) {
-      if (!existsSync6(identityDir)) mkdirSync2(identityDir, { recursive: true });
-      const idPath = path6.join(identityDir, `${remoteEmp.name}.md`);
-      if (!existsSync6(idPath)) {
-        writeFileSync2(idPath, remote.identities[`${remoteEmp.name}.md`], "utf-8");
+  return withRosterLock(async () => {
+    const rosterPath = paths?.rosterPath ?? void 0;
+    const identityDir = paths?.identityDir ?? path6.join(EXE_AI_DIR, "identity");
+    const localEmployees = await loadEmployees(rosterPath);
+    const localNames = new Set(localEmployees.map((e) => e.name));
+    let added = 0;
+    for (const remoteEmp of remote.roster) {
+      if (localNames.has(remoteEmp.name)) continue;
+      localEmployees.push(remoteEmp);
+      localNames.add(remoteEmp.name);
+      added++;
+      if (remote.identities[`${remoteEmp.name}.md`]) {
+        if (!existsSync6(identityDir)) mkdirSync2(identityDir, { recursive: true });
+        const idPath = path6.join(identityDir, `${remoteEmp.name}.md`);
+        if (!existsSync6(idPath)) {
+          writeFileSync2(idPath, remote.identities[`${remoteEmp.name}.md`], "utf-8");
+        }
+      }
+      try {
+        registerBinSymlinks(remoteEmp.name);
+      } catch {
       }
     }
-    try {
-      registerBinSymlinks(remoteEmp.name);
-    } catch {
+    let removed = 0;
+    if (remote.deletedNames && remote.deletedNames.length > 0) {
+      const toRemove = new Set(remote.deletedNames);
+      const filtered = localEmployees.filter((e) => !toRemove.has(e.name));
+      removed = localEmployees.length - filtered.length;
+      if (removed > 0) {
+        localEmployees.length = 0;
+        localEmployees.push(...filtered);
+      }
     }
-  }
-  if (added > 0) {
-    await saveEmployees(localEmployees, rosterPath);
-  }
-  if (remote.config && Object.keys(remote.config).length > 0) {
-    try {
-      mergeConfig(remote.config, paths?.configPath);
-    } catch {
+    if (added > 0 || removed > 0) {
+      await saveEmployees(localEmployees, rosterPath);
     }
-  }
-  return { added };
+    if (remote.config && Object.keys(remote.config).length > 0) {
+      try {
+        mergeConfig(remote.config, paths?.configPath);
+      } catch {
+      }
+    }
+    return { added };
+  });
 }
 async function cloudPushBlob(route, data, metaKey, config) {
   if (data.length === 0) return { ok: true };
@@ -1107,7 +1210,7 @@ async function cloudPullBlob(route, config) {
 }
 async function cloudPushBehaviors(config) {
   const client = getClient();
-  const result = await client.execute("SELECT * FROM behaviors");
+  const result = await client.execute("SELECT * FROM behaviors LIMIT 10000");
   const rows = result.rows;
   const { ok } = await cloudPushBlob(
     "/sync/push-behaviors",
@@ -1155,13 +1258,13 @@ async function cloudPullBehaviors(config) {
 async function cloudPushGraphRAG(config) {
   const client = getClient();
   const [entities, relationships, aliases, entityMems, relMems, hyperedges, hyperedgeNodes] = await Promise.all([
-    client.execute("SELECT * FROM entities"),
-    client.execute("SELECT * FROM relationships"),
-    client.execute("SELECT * FROM entity_aliases"),
-    client.execute("SELECT * FROM entity_memories"),
-    client.execute("SELECT * FROM relationship_memories"),
-    client.execute("SELECT * FROM hyperedges"),
-    client.execute("SELECT * FROM hyperedge_nodes")
+    client.execute("SELECT * FROM entities LIMIT 50000"),
+    client.execute("SELECT * FROM relationships LIMIT 50000"),
+    client.execute("SELECT * FROM entity_aliases LIMIT 50000"),
+    client.execute("SELECT * FROM entity_memories LIMIT 50000"),
+    client.execute("SELECT * FROM relationship_memories LIMIT 50000"),
+    client.execute("SELECT * FROM hyperedges LIMIT 50000"),
+    client.execute("SELECT * FROM hyperedge_nodes LIMIT 50000")
   ]);
   const blob = {
     entities: entities.rows,
@@ -1263,7 +1366,7 @@ async function cloudPullGraphRAG(config) {
 }
 async function cloudPushTasks(config) {
   const client = getClient();
-  const result = await client.execute("SELECT * FROM tasks");
+  const result = await client.execute("SELECT * FROM tasks LIMIT 10000");
   const rows = result.rows;
   const { ok } = await cloudPushBlob(
     "/sync/push-tasks",
@@ -1309,7 +1412,7 @@ async function cloudPullTasks(config) {
 }
 async function cloudPushConversations(config) {
   const client = getClient();
-  const result = await client.execute("SELECT * FROM conversations");
+  const result = await client.execute("SELECT * FROM conversations LIMIT 50000");
   const rows = result.rows;
   const { ok } = await cloudPushBlob(
     "/sync/push-conversations",
@@ -1359,8 +1462,8 @@ async function cloudPullConversations(config) {
 async function cloudPushDocuments(config) {
   const client = getClient();
   const [workspaces, documents] = await Promise.all([
-    client.execute("SELECT * FROM workspaces"),
-    client.execute("SELECT * FROM documents")
+    client.execute("SELECT * FROM workspaces LIMIT 1000"),
+    client.execute("SELECT * FROM documents LIMIT 10000")
   ]);
   const blob = {
     workspaces: workspaces.rows,
@@ -1413,7 +1516,7 @@ async function cloudPullDocuments(config) {
   }
   return { pulled };
 }
-var LOCALHOST_PATTERNS, FETCH_TIMEOUT_MS;
+var LOCALHOST_PATTERNS, FETCH_TIMEOUT_MS, PUSH_BATCH_SIZE, ROSTER_LOCK_PATH, LOCK_STALE_MS, ROSTER_DELETIONS_PATH;
 var init_cloud_sync = __esm({
   "src/lib/cloud-sync.ts"() {
     "use strict";
@@ -1426,6 +1529,10 @@ var init_cloud_sync = __esm({
     init_employees();
     LOCALHOST_PATTERNS = /^(localhost|127\.0\.0\.1|\[::1\])$/i;
     FETCH_TIMEOUT_MS = 3e4;
+    PUSH_BATCH_SIZE = 5e3;
+    ROSTER_LOCK_PATH = path6.join(EXE_AI_DIR, "roster-merge.lock");
+    LOCK_STALE_MS = 3e4;
+    ROSTER_DELETIONS_PATH = path6.join(EXE_AI_DIR, "roster-deletions.json");
   }
 });
 
@@ -1436,11 +1543,12 @@ import { createInterface } from "readline";
 import { readFile, writeFile, unlink, mkdir, chmod } from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
+import os from "os";
 import crypto from "crypto";
 var SERVICE = "exe-mem";
 var ACCOUNT = "master-key";
 function getKeyDir() {
-  return process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ?? path.join(process.env.HOME ?? "/tmp", ".exe-os");
+  return process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ?? path.join(os.homedir(), ".exe-os");
 }
 function getKeyPath() {
   return path.join(getKeyDir(), "master.key");
@@ -1580,6 +1688,7 @@ async function main() {
 `);
     console.log("Write this down and enter it on your new device with /exe-link import.");
     console.log("Anyone with this phrase can decrypt your memories.");
+    console.log("\u26A0  Clear your terminal history after copying.");
   } else if (mode === "import") {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     const mnemonic = await new Promise((resolve) => {