@askexenow/exe-os 0.9.229 → 0.9.232

package/dist/{chunk-JBKA7F5V.js → chunk-JR6S6JD7.js}

@@ -1,6 +1,6 @@
 import {
   isCrdtSyncEnabled
-} from "./chunk-EEAKFEEA.js";
+} from "./chunk-TPOWVHXP.js";
 import {
   decryptSyncBlob,
   encryptSyncBlob,
@@ -12,13 +12,13 @@ import {
   loadEmployees,
   registerBinSymlinks,
   saveEmployees
-} from "./chunk-UJOSFVWG.js";
+} from "./chunk-IYHYMEEV.js";
 import {
   loadDeviceId
-} from "./chunk-D4IVTUNN.js";
+} from "./chunk-OZCZNEYI.js";
 import {
   EXE_AI_DIR
-} from "./chunk-TNTFEWU5.js";
+} from "./chunk-XBXKLACW.js";
 import {
   atomicWriteJsonSync,
   atomicWriteSync,
@@ -48,6 +48,7 @@ function decompress(input) {
 }
 
 // src/lib/cloud-sync.ts
+var _cloudSyncInProgress = false;
 function sqlSafe(v) {
   return v === void 0 ? null : v;
 }
@@ -155,6 +156,16 @@ function loadPgClient() {
   }
   return _pgPromise;
 }
+async function disposeCloudSync() {
+  if (_pgPromise) {
+    try {
+      const pg = await _pgPromise;
+      if (pg.$disconnect) await pg.$disconnect();
+    } catch {
+    }
+    _pgPromise = null;
+  }
+}
 async function pushToPostgres(records) {
   const loader = loadPgClient();
   if (!loader) return 0;
@@ -441,76 +452,82 @@ async function markCloudReuploadRequired(client = getClient()) {
   await client.execute("INSERT INTO sync_meta (key, value) VALUES ('cloud_reupload_required', '1') ON CONFLICT(key) DO UPDATE SET value = excluded.value");
 }
 async function cloudSync(config) {
-  config = { ...config, endpoint: migrateEndpoint(config.endpoint) };
-  if (!isSyncCryptoInitialized()) {
-    try {
-      const { getMasterKey } = await import("./lib/keychain.js");
-      const masterKey = await getMasterKey();
-      if (masterKey) {
-        initSyncCrypto(masterKey);
-      } else {
-        throw new Error("No master key found");
+  if (_cloudSyncInProgress) {
+    process.stderr.write("[cloud-sync] Sync already in progress \u2014 skipping concurrent call.\n");
+    return { pushed: 0, pulled: 0, totalMemories: 0, behaviors: { pushed: 0, pulled: 0 }, graphrag: { pushed: 0, pulled: 0 }, tasks: { pushed: 0, pulled: 0 }, conversations: { pushed: 0, pulled: 0 }, documents: { pushed: 0, pulled: 0 }, roster: { employees: 0, identities: 0 } };
+  }
+  _cloudSyncInProgress = true;
+  try {
+    config = { ...config, endpoint: migrateEndpoint(config.endpoint) };
+    if (!isSyncCryptoInitialized()) {
+      try {
+        const { getMasterKey } = await import("./lib/keychain.js");
+        const masterKey = await getMasterKey();
+        if (masterKey) {
+          initSyncCrypto(masterKey);
+        } else {
+          throw new Error("No master key found");
+        }
+      } catch (err) {
+        throw new Error(`[cloud-sync] Cannot initialize encryption: ${err instanceof Error ? err.message : String(err)}`);
       }
+    }
+    let client;
+    try {
+      client = getClient();
+    } catch (e) {
+      process.stderr.write("[cloud-sync] getClient() failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
+      throw new Error("[cloud-sync] Database not initialized. Call initStore() before cloudSync().");
+    }
+    try {
+      if (await getCloudReuploadRequired(client)) throw new Error(CLOUD_REUPLOAD_REQUIRED_MESSAGE);
     } catch (err) {
-      throw new Error(`[cloud-sync] Cannot initialize encryption: ${err instanceof Error ? err.message : String(err)}`);
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg === CLOUD_REUPLOAD_REQUIRED_MESSAGE || msg.includes("key rotation")) throw err;
     }
-  }
-  let client;
-  try {
-    client = getClient();
-  } catch (e) {
-    process.stderr.write("[cloud-sync] getClient() failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
-    throw new Error("[cloud-sync] Database not initialized. Call initStore() before cloudSync().");
-  }
-  try {
-    if (await getCloudReuploadRequired(client)) throw new Error(CLOUD_REUPLOAD_REQUIRED_MESSAGE);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    if (msg === CLOUD_REUPLOAD_REQUIRED_MESSAGE || msg.includes("key rotation")) throw err;
-  }
-  try {
-    const { getRawClient } = await import("./lib/database.js");
-    await getRawClient().execute("PRAGMA wal_checkpoint(PASSIVE)");
-  } catch (e) {
-    process.stderr.write("[cloud-sync] WAL checkpoint failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
-  }
-  try {
-    await client.execute(
-      "CREATE TABLE IF NOT EXISTS sync_meta (key TEXT PRIMARY KEY, value TEXT NOT NULL)"
-    );
-  } catch (e) {
-    logError(`[cloud-sync] sync_meta CREATE failed: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  const pullMeta = await client.execute(
-    "SELECT value FROM sync_meta WHERE key = 'last_cloud_pull_version'"
-  );
-  const lastPullVersion = pullMeta.rows.length > 0 ? Number(pullMeta.rows[0].value) : 0;
-  const pullResult = await cloudPull(lastPullVersion, config);
-  let pulled = 0;
-  if (pullResult.records.length > 0) {
-    if (isCrdtSyncEnabled()) {
-      const { initCrdtDoc, importExistingMemories, readAllMemories } = await import("./crdt-sync-K25AKQAD.js");
-      initCrdtDoc();
-      importExistingMemories(
-        pullResult.records.map((rec) => ({
-          id: String(rec.id ?? ""),
-          agent_id: rec.agent_id,
-          agent_role: rec.agent_role,
-          session_id: rec.session_id,
-          timestamp: rec.timestamp,
-          tool_name: rec.tool_name,
-          project_name: rec.project_name,
-          has_error: rec.has_error ?? 0,
-          raw_text: rec.raw_text ?? "",
-          version: rec.version ?? 0,
-          author_device_id: rec.author_device_id,
-          scope: rec.scope ?? "business"
-        }))
+    try {
+      const { getRawClient } = await import("./lib/database.js");
+      await getRawClient().execute("PRAGMA wal_checkpoint(PASSIVE)");
+    } catch (e) {
+      process.stderr.write("[cloud-sync] WAL checkpoint failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
+    }
+    try {
+      await client.execute(
+        "CREATE TABLE IF NOT EXISTS sync_meta (key TEXT PRIMARY KEY, value TEXT NOT NULL)"
       );
-      const pulledIds = new Set(pullResult.records.map((r) => String(r.id ?? "")));
-      const merged = readAllMemories().filter((rec) => pulledIds.has(rec.id));
-      const stmts = merged.map((rec) => ({
-        sql: `INSERT INTO memories
+    } catch (e) {
+      logError(`[cloud-sync] sync_meta CREATE failed: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    const pullMeta = await client.execute(
+      "SELECT value FROM sync_meta WHERE key = 'last_cloud_pull_version'"
+    );
+    const lastPullVersion = pullMeta.rows.length > 0 ? Number(pullMeta.rows[0].value) : 0;
+    const pullResult = await cloudPull(lastPullVersion, config);
+    let pulled = 0;
+    if (pullResult.records.length > 0) {
+      if (isCrdtSyncEnabled()) {
+        const { initCrdtDoc, importExistingMemories, readAllMemories } = await import("./crdt-sync-UDQLFKQ4.js");
+        initCrdtDoc();
+        importExistingMemories(
+          pullResult.records.map((rec) => ({
+            id: String(rec.id ?? ""),
+            agent_id: rec.agent_id,
+            agent_role: rec.agent_role,
+            session_id: rec.session_id,
+            timestamp: rec.timestamp,
+            tool_name: rec.tool_name,
+            project_name: rec.project_name,
+            has_error: rec.has_error ?? 0,
+            raw_text: rec.raw_text ?? "",
+            version: rec.version ?? 0,
+            author_device_id: rec.author_device_id,
+            scope: rec.scope ?? "business"
+          }))
+        );
+        const pulledIds = new Set(pullResult.records.map((r) => String(r.id ?? "")));
+        const merged = readAllMemories().filter((rec) => pulledIds.has(rec.id));
+        const stmts = merged.map((rec) => ({
+          sql: `INSERT INTO memories
               (id, agent_id, agent_role, session_id, timestamp,
                tool_name, project_name, has_error, raw_text, version,
                author_device_id, scope, memory_type, session_scope)
@@ -534,74 +551,74 @@ async function cloudSync(config) {
                 confidence = COALESCE(memories.confidence, excluded.confidence),
                 tier = COALESCE(memories.tier, excluded.tier),
                 strength = COALESCE(memories.strength, excluded.strength)`,
-        args: [
-          sqlSafe(rec.id),
-          sqlSafe(rec.agent_id),
-          sqlSafe(rec.agent_role),
-          sqlSafe(rec.session_id),
-          sqlSafe(rec.timestamp),
-          sqlSafe(rec.tool_name),
-          sqlSafe(rec.project_name),
-          sqlSafe(rec.has_error ?? 0),
-          sqlSafe(rec.raw_text ?? ""),
-          sqlSafe(rec.version ?? 0),
-          sqlSafe(rec.author_device_id),
-          sqlSafe(rec.scope ?? "business"),
-          sqlSafe(rec.memory_type),
-          sqlSafe(rec.session_scope)
-        ]
-      }));
-      if (stmts.length > 0) await client.batch(stmts, "write");
-      pulled = pullResult.records.length;
-    } else {
-      try {
-        const incomingIds = pullResult.records.map((r) => sqlSafe(r.id));
-        if (incomingIds.length > 0) {
-          const ph = incomingIds.map(() => "?").join(",");
-          const existing = await client.execute({
-            sql: `SELECT id, version, timestamp FROM memories WHERE id IN (${ph})`,
-            args: incomingIds
-          });
-          const localMap = new Map(existing.rows.map((r) => [String(r.id), r]));
-          for (const rec of pullResult.records) {
-            const local = localMap.get(String(rec.id));
-            if (local && Number(local.version) > 0 && Number(local.version) !== Number(rec.version ?? 0)) {
-              process.stderr.write(
-                `[cloud-sync] CONFLICT: memory ${String(rec.id).slice(0, 8)} \u2014 local v${local.version} vs remote v${rec.version ?? 0}. Remote wins (LWW).
+          args: [
+            sqlSafe(rec.id),
+            sqlSafe(rec.agent_id),
+            sqlSafe(rec.agent_role),
+            sqlSafe(rec.session_id),
+            sqlSafe(rec.timestamp),
+            sqlSafe(rec.tool_name),
+            sqlSafe(rec.project_name),
+            sqlSafe(rec.has_error ?? 0),
+            sqlSafe(rec.raw_text ?? ""),
+            sqlSafe(rec.version ?? 0),
+            sqlSafe(rec.author_device_id),
+            sqlSafe(rec.scope ?? "business"),
+            sqlSafe(rec.memory_type),
+            sqlSafe(rec.session_scope)
+          ]
+        }));
+        if (stmts.length > 0) await client.batch(stmts, "write");
+        pulled = pullResult.records.length;
+      } else {
+        try {
+          const incomingIds = pullResult.records.map((r) => sqlSafe(r.id));
+          if (incomingIds.length > 0) {
+            const ph = incomingIds.map(() => "?").join(",");
+            const existing = await client.execute({
+              sql: `SELECT id, version, timestamp FROM memories WHERE id IN (${ph})`,
+              args: incomingIds
+            });
+            const localMap = new Map(existing.rows.map((r) => [String(r.id), r]));
+            for (const rec of pullResult.records) {
+              const local = localMap.get(String(rec.id));
+              if (local && Number(local.version) > 0 && Number(local.version) !== Number(rec.version ?? 0)) {
+                process.stderr.write(
+                  `[cloud-sync] CONFLICT: memory ${String(rec.id).slice(0, 8)} \u2014 local v${local.version} vs remote v${rec.version ?? 0}. Remote wins (LWW).
 `
-              );
-              client.execute({
-                sql: `INSERT OR IGNORE INTO sync_conflicts (id, memory_id, local_version, remote_version, local_timestamp, remote_timestamp, local_device_id, resolution, created_at)
+                );
+                client.execute({
+                  sql: `INSERT OR IGNORE INTO sync_conflicts (id, memory_id, local_version, remote_version, local_timestamp, remote_timestamp, local_device_id, resolution, created_at)
                       VALUES (?, ?, ?, ?, ?, ?, ?, 'remote_wins', ?)`,
-                args: [
-                  `conflict-${String(rec.id).slice(0, 8)}-${Date.now()}`,
-                  String(rec.id),
-                  Number(local.version),
-                  Number(rec.version ?? 0),
-                  String(local.timestamp ?? ""),
-                  String(rec.timestamp ?? ""),
-                  process.env.EXE_DEVICE_ID ?? "",
-                  (/* @__PURE__ */ new Date()).toISOString()
-                ]
-              }).catch((err) => {
-                process.stderr.write(`[cloud-sync] conflict audit insert failed: ${err instanceof Error ? err.message : String(err)}
+                  args: [
+                    `conflict-${String(rec.id).slice(0, 8)}-${Date.now()}`,
+                    String(rec.id),
+                    Number(local.version),
+                    Number(rec.version ?? 0),
+                    String(local.timestamp ?? ""),
+                    String(rec.timestamp ?? ""),
+                    process.env.EXE_DEVICE_ID ?? "",
+                    (/* @__PURE__ */ new Date()).toISOString()
+                  ]
+                }).catch((err) => {
+                  process.stderr.write(`[cloud-sync] conflict audit insert failed: ${err instanceof Error ? err.message : String(err)}
 `);
-              });
+                });
+              }
             }
           }
+        } catch (e) {
+          process.stderr.write("[cloud-sync] conflict detection query failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
         }
-      } catch (e) {
-        process.stderr.write("[cloud-sync] conflict detection query failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
-      }
-      const localDeviceId = loadDeviceId();
-      const deviceFilteredRecords = pullResult.records.filter((rec) => {
-        const authorDevice = rec.author_device_id;
-        if (!authorDevice) return true;
-        if (String(authorDevice) === localDeviceId) return true;
-        return true;
-      });
-      const stmts = deviceFilteredRecords.map((rec) => ({
-        sql: `INSERT INTO memories
+        const localDeviceId = loadDeviceId();
+        const deviceFilteredRecords = pullResult.records.filter((rec) => {
+          const authorDevice = rec.author_device_id;
+          if (!authorDevice) return true;
+          if (String(authorDevice) === localDeviceId) return true;
+          return true;
+        });
+        const stmts = deviceFilteredRecords.map((rec) => ({
+          sql: `INSERT INTO memories
               (id, agent_id, agent_role, session_id, timestamp,
                tool_name, project_name, has_error, raw_text, version,
                author_device_id, scope, memory_type, session_scope)
@@ -625,79 +642,79 @@ async function cloudSync(config) {
                 confidence = COALESCE(memories.confidence, excluded.confidence),
                 tier = COALESCE(memories.tier, excluded.tier),
                 strength = COALESCE(memories.strength, excluded.strength)`,
-        args: [
-          sqlSafe(rec.id),
-          sqlSafeRequired(rec.agent_id, "unknown"),
-          sqlSafeRequired(rec.agent_role, "employee"),
-          sqlSafeRequired(rec.session_id, "cloud-sync"),
-          sqlSafeRequired(rec.timestamp, (/* @__PURE__ */ new Date()).toISOString()),
-          sqlSafeRequired(rec.tool_name, "cloud_sync"),
-          sqlSafeRequired(rec.project_name, "unknown"),
-          sqlSafe(rec.has_error ?? 0),
-          sqlSafe(rec.raw_text ?? ""),
-          sqlSafe(rec.version ?? 0),
-          sqlSafe(rec.author_device_id),
-          sqlSafe(rec.scope ?? "business"),
-          sqlSafe(rec.memory_type),
-          sqlSafe(rec.session_scope)
-        ]
-      }));
-      let syncErrors = 0;
-      const BATCH_SIZE = 100;
-      for (let i = 0; i < stmts.length; i += BATCH_SIZE) {
-        const batch = stmts.slice(i, i + BATCH_SIZE);
-        try {
-          await client.batch(batch, "write");
-        } catch (batchErr) {
-          for (const stmt of batch) {
-            try {
-              await client.execute(stmt);
-            } catch (recErr) {
-              syncErrors++;
-              process.stderr.write(
-                `[cloud-sync] Skipped bad record (${recErr instanceof Error ? recErr.message : String(recErr)})
+          args: [
+            sqlSafe(rec.id),
+            sqlSafeRequired(rec.agent_id, "unknown"),
+            sqlSafeRequired(rec.agent_role, "employee"),
+            sqlSafeRequired(rec.session_id, "cloud-sync"),
+            sqlSafeRequired(rec.timestamp, (/* @__PURE__ */ new Date()).toISOString()),
+            sqlSafeRequired(rec.tool_name, "cloud_sync"),
+            sqlSafeRequired(rec.project_name, "unknown"),
+            sqlSafe(rec.has_error ?? 0),
+            sqlSafe(rec.raw_text ?? ""),
+            sqlSafe(rec.version ?? 0),
+            sqlSafe(rec.author_device_id),
+            sqlSafe(rec.scope ?? "business"),
+            sqlSafe(rec.memory_type),
+            sqlSafe(rec.session_scope)
+          ]
+        }));
+        let syncErrors = 0;
+        const BATCH_SIZE = 100;
+        for (let i = 0; i < stmts.length; i += BATCH_SIZE) {
+          const batch = stmts.slice(i, i + BATCH_SIZE);
+          try {
+            await client.batch(batch, "write");
+          } catch (batchErr) {
+            for (const stmt of batch) {
+              try {
+                await client.execute(stmt);
+              } catch (recErr) {
+                syncErrors++;
+                process.stderr.write(
+                  `[cloud-sync] Skipped bad record (${recErr instanceof Error ? recErr.message : String(recErr)})
 `
-              );
+                );
+              }
             }
           }
+          if (i + BATCH_SIZE < stmts.length) {
+            await new Promise((resolve) => setImmediate(resolve));
+          }
         }
-        if (i + BATCH_SIZE < stmts.length) {
-          await new Promise((resolve) => setImmediate(resolve));
+        pulled = stmts.length - syncErrors;
+        if (syncErrors > 0) {
+          process.stderr.write(`[cloud-sync] Pull completed with ${syncErrors} skipped record(s)
+`);
         }
       }
-      pulled = stmts.length - syncErrors;
-      if (syncErrors > 0) {
-        process.stderr.write(`[cloud-sync] Pull completed with ${syncErrors} skipped record(s)
-`);
+    }
+    if (pulled > 0) {
+      try {
+        await pushToPostgres(pullResult.records);
+      } catch (e) {
+        process.stderr.write("[cloud-sync] Postgres push of pulled records failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
       }
     }
-  }
-  if (pulled > 0) {
-    try {
-      await pushToPostgres(pullResult.records);
-    } catch (e) {
-      process.stderr.write("[cloud-sync] Postgres push of pulled records failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
+    if (pullResult.maxVersion > lastPullVersion) {
+      await client.execute({
+        sql: "INSERT INTO sync_meta (key, value) VALUES ('last_cloud_pull_version', ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value",
+        args: [String(pullResult.maxVersion)]
+      });
     }
-  }
-  if (pullResult.maxVersion > lastPullVersion) {
-    await client.execute({
-      sql: "INSERT INTO sync_meta (key, value) VALUES ('last_cloud_pull_version', ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value",
-      args: [String(pullResult.maxVersion)]
-    });
-  }
-  const pushMeta = await client.execute(
-    "SELECT value FROM sync_meta WHERE key = 'last_cloud_push_version'"
-  );
-  const lastPushVersion = pushMeta.rows.length > 0 ? Number(pushMeta.rows[0].value) : 0;
-  let pushed = 0;
-  let batchCursor = lastPushVersion;
-  const nowMs = Date.now();
-  const pushCooldownActive = lastPushVersion > 0 && lastPushVersion === _lastSyncPushVersion && nowMs - _lastSyncPushTimestamp < SYNC_COOLDOWN_MS;
-  if (pushCooldownActive) {
-  } else {
-    while (true) {
-      const recordsResult = await client.execute({
-        sql: `SELECT id, agent_id, agent_role, session_id, timestamp,
+    const pushMeta = await client.execute(
+      "SELECT value FROM sync_meta WHERE key = 'last_cloud_push_version'"
+    );
+    const lastPushVersion = pushMeta.rows.length > 0 ? Number(pushMeta.rows[0].value) : 0;
+    let pushed = 0;
+    let batchCursor = lastPushVersion;
+    const nowMs = Date.now();
+    const pushCooldownActive = lastPushVersion > 0 && lastPushVersion === _lastSyncPushVersion && nowMs - _lastSyncPushTimestamp < SYNC_COOLDOWN_MS;
+    if (pushCooldownActive) {
+    } else {
+      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, session_scope
             FROM memories
@@ -705,266 +722,273 @@ async function cloudSync(config) {
               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,
-        agent_role: row.agent_role,
-        session_id: row.session_id,
-        timestamp: row.timestamp,
-        tool_name: row.tool_name,
-        project_name: row.project_name,
-        has_error: row.has_error,
-        raw_text: row.raw_text,
-        version: row.version,
-        author_device_id: row.author_device_id,
-        scope: row.scope,
-        session_scope: row.session_scope
-      }));
-      const maxVersion = Number(records[records.length - 1].version);
-      const pushOk = await cloudPush(records, maxVersion, config);
-      if (!pushOk) break;
+          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,
+          agent_role: row.agent_role,
+          session_id: row.session_id,
+          timestamp: row.timestamp,
+          tool_name: row.tool_name,
+          project_name: row.project_name,
+          has_error: row.has_error,
+          raw_text: row.raw_text,
+          version: row.version,
+          author_device_id: row.author_device_id,
+          scope: row.scope,
+          session_scope: row.session_scope
+        }));
+        const maxVersion = Number(records[records.length - 1].version);
+        let pushOk = await cloudPush(records, maxVersion, config);
+        if (!pushOk) {
+          await cloudPull(lastPullVersion, config);
+          pushOk = await cloudPush(records, maxVersion, config);
+          if (!pushOk) break;
+        }
+        try {
+          await pushToPostgres(records);
+        } catch (e) {
+          process.stderr.write("[cloud-sync] Postgres push of local records failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
+        }
+        await client.execute({
+          sql: "INSERT INTO sync_meta (key, value) VALUES ('last_cloud_push_version', ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value",
+          args: [String(maxVersion)]
+        });
+        pushed += records.length;
+        batchCursor = maxVersion;
+        _lastSyncPushVersion = maxVersion;
+        _lastSyncPushTimestamp = Date.now();
+        if (recordsResult.rows.length < PUSH_BATCH_SIZE) break;
+        await new Promise((resolve) => setImmediate(resolve));
+      }
+    }
+    try {
+      await cloudPushRoster(config);
+    } catch (err) {
+      logError(`[cloud-sync] Roster push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      await cloudPullRoster(config);
+    } catch (err) {
+      logError(`[cloud-sync] Roster pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      await cloudPushGlobalProcedures(config);
+    } catch (err) {
+      logError(`[cloud-sync] Company procedures push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      await cloudPullGlobalProcedures(config);
+    } catch (err) {
+      logError(`[cloud-sync] Company procedures pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const countRows = async (sql) => {
       try {
-        await pushToPostgres(records);
+        return Number((await client.execute(sql)).rows[0]?.cnt ?? 0);
       } catch (e) {
-        process.stderr.write("[cloud-sync] Postgres push of local records failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
+        process.stderr.write("[cloud-sync] countRows failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
+        return 0;
       }
-      await client.execute({
-        sql: "INSERT INTO sync_meta (key, value) VALUES ('last_cloud_push_version', ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value",
-        args: [String(maxVersion)]
-      });
-      pushed += records.length;
-      batchCursor = maxVersion;
-      _lastSyncPushVersion = maxVersion;
-      _lastSyncPushTimestamp = Date.now();
-      if (recordsResult.rows.length < PUSH_BATCH_SIZE) break;
-      await new Promise((resolve) => setImmediate(resolve));
+    };
+    const behaviorsResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushBehaviors(config);
+      behaviorsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM behaviors WHERE active = 1");
+    } catch (err) {
+      logError(`[cloud-sync] Behaviors push: ${err instanceof Error ? err.message : String(err)}`);
     }
-  }
-  try {
-    await cloudPushRoster(config);
-  } catch (err) {
-    logError(`[cloud-sync] Roster push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    await cloudPullRoster(config);
-  } catch (err) {
-    logError(`[cloud-sync] Roster pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    await cloudPushGlobalProcedures(config);
-  } catch (err) {
-    logError(`[cloud-sync] Company procedures push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    await cloudPullGlobalProcedures(config);
-  } catch (err) {
-    logError(`[cloud-sync] Company procedures pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const countRows = async (sql) => {
     try {
-      return Number((await client.execute(sql)).rows[0]?.cnt ?? 0);
-    } catch (e) {
-      process.stderr.write("[cloud-sync] countRows failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
-      return 0;
+      const pullResult2 = await cloudPullBehaviors(config);
+      behaviorsResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Behaviors pull: ${err instanceof Error ? err.message : String(err)}`);
     }
-  };
-  const behaviorsResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushBehaviors(config);
-    behaviorsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM behaviors WHERE active = 1");
-  } catch (err) {
-    logError(`[cloud-sync] Behaviors push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullBehaviors(config);
-    behaviorsResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Behaviors pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const graphragResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushGraphRAG(config);
-    graphragResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM entities");
-  } catch (err) {
-    logError(`[cloud-sync] GraphRAG push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullGraphRAG(config);
-    graphragResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] GraphRAG pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const tasksResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushTasks(config);
-    tasksResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM tasks");
-  } catch (err) {
-    logError(`[cloud-sync] Tasks push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullTasks(config);
-    tasksResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Tasks pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const conversationsResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushConversations(config);
-    conversationsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM conversations");
-  } catch (err) {
-    logError(`[cloud-sync] Conversations push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullConversations(config);
-    conversationsResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Conversations pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const schedulesResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushSchedules(config);
-    schedulesResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM schedules");
-  } catch (err) {
-    logError(`[cloud-sync] Schedules push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullSchedules(config);
-    schedulesResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Schedules pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const trajectoriesResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushTrajectories(config);
-    trajectoriesResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM trajectories");
-  } catch (err) {
-    logError(`[cloud-sync] Trajectories push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullTrajectories(config);
-    trajectoriesResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Trajectories pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const consolidationsResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushConsolidations(config);
-    consolidationsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM consolidations");
-  } catch (err) {
-    logError(`[cloud-sync] Consolidations push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullConsolidations(config);
-    consolidationsResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Consolidations pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const identityResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushIdentityMeta(config);
-    identityResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM identity");
-  } catch (err) {
-    logError(`[cloud-sync] Identity push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullIdentityMeta(config);
-    identityResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Identity pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const documentsResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushDocuments(config);
-    documentsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM documents");
-  } catch (err) {
-    logError(`[cloud-sync] Documents push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullDocuments(config);
-    documentsResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Documents pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const coreMemoryResult = { pushed: 0, pulled: 0 };
-  try {
-    await cloudPushCoreMemory(config);
-    coreMemoryResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM core_memory");
-  } catch (err) {
-    logError(`[cloud-sync] Core memory push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    const pullResult2 = await cloudPullCoreMemory(config);
-    coreMemoryResult.pulled = pullResult2.pulled;
-  } catch (err) {
-    logError(`[cloud-sync] Core memory pull: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const rosterResult = { employees: 0, identities: 0 };
-  try {
-    const employees = await loadEmployees();
-    rosterResult.employees = employees.length;
-    const idDir = path.join(EXE_AI_DIR, "identity");
-    if (existsSync(idDir)) {
-      rosterResult.identities = readdirSync(idDir).filter((f) => f.endsWith(".md")).length;
+    const graphragResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushGraphRAG(config);
+      graphragResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM entities");
+    } catch (err) {
+      logError(`[cloud-sync] GraphRAG push: ${err instanceof Error ? err.message : String(err)}`);
     }
-  } catch (e) {
-    process.stderr.write("[cloud-sync] roster count failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
-  }
-  const totalMemories = await countRows("SELECT COUNT(*) as cnt FROM memories WHERE status = 'active' OR status IS NULL");
-  try {
-    const { getLatestBackup } = await import("./db-backup-MSQKO6M5.js");
-    const latestBackup = getLatestBackup();
-    if (latestBackup) {
-      const backupSize = statSync(latestBackup).size;
-      const MAX_CLOUD_BACKUP_BYTES = 50 * 1024 * 1024;
-      if (backupSize <= MAX_CLOUD_BACKUP_BYTES) {
-        const backupData = readFileSync(latestBackup);
-        const deviceId = loadDeviceId() ?? "unknown";
-        const encrypted = encryptSyncBlob(backupData);
-        const backupRes = await fetchWithRetry(`${config.endpoint}/sync/push-db-backup`, {
-          method: "POST",
-          headers: { "Content-Type": "application/json", Authorization: `Bearer ${config.apiKey}` },
-          body: JSON.stringify({
-            device_id: deviceId,
-            filename: path.basename(latestBackup),
-            blob: encrypted,
-            size: backupData.length
-          })
-        });
-        if (backupRes && !backupRes.ok) {
-          logError(`[cloud-sync] DB backup upload failed: ${backupRes.status}`);
+    try {
+      const pullResult2 = await cloudPullGraphRAG(config);
+      graphragResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] GraphRAG pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const tasksResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushTasks(config);
+      tasksResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM tasks");
+    } catch (err) {
+      logError(`[cloud-sync] Tasks push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullTasks(config);
+      tasksResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Tasks pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const conversationsResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushConversations(config);
+      conversationsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM conversations");
+    } catch (err) {
+      logError(`[cloud-sync] Conversations push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullConversations(config);
+      conversationsResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Conversations pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const schedulesResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushSchedules(config);
+      schedulesResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM schedules");
+    } catch (err) {
+      logError(`[cloud-sync] Schedules push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullSchedules(config);
+      schedulesResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Schedules pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const trajectoriesResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushTrajectories(config);
+      trajectoriesResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM trajectories");
+    } catch (err) {
+      logError(`[cloud-sync] Trajectories push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullTrajectories(config);
+      trajectoriesResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Trajectories pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const consolidationsResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushConsolidations(config);
+      consolidationsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM consolidations");
+    } catch (err) {
+      logError(`[cloud-sync] Consolidations push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullConsolidations(config);
+      consolidationsResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Consolidations pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const identityResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushIdentityMeta(config);
+      identityResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM identity");
+    } catch (err) {
+      logError(`[cloud-sync] Identity push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullIdentityMeta(config);
+      identityResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Identity pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const documentsResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushDocuments(config);
+      documentsResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM documents");
+    } catch (err) {
+      logError(`[cloud-sync] Documents push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullDocuments(config);
+      documentsResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Documents pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const coreMemoryResult = { pushed: 0, pulled: 0 };
+    try {
+      await cloudPushCoreMemory(config);
+      coreMemoryResult.pushed = await countRows("SELECT COUNT(*) as cnt FROM core_memory");
+    } catch (err) {
+      logError(`[cloud-sync] Core memory push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      const pullResult2 = await cloudPullCoreMemory(config);
+      coreMemoryResult.pulled = pullResult2.pulled;
+    } catch (err) {
+      logError(`[cloud-sync] Core memory pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const rosterResult = { employees: 0, identities: 0 };
+    try {
+      const employees = await loadEmployees();
+      rosterResult.employees = employees.length;
+      const idDir = path.join(EXE_AI_DIR, "identity");
+      if (existsSync(idDir)) {
+        rosterResult.identities = readdirSync(idDir).filter((f) => f.endsWith(".md")).length;
+      }
+    } catch (e) {
+      process.stderr.write("[cloud-sync] roster count failed: " + (e instanceof Error ? e.message : String(e)) + "\n");
+    }
+    const totalMemories = await countRows("SELECT COUNT(*) as cnt FROM memories WHERE status = 'active' OR status IS NULL");
+    try {
+      const { getLatestBackup } = await import("./db-backup-3ZQQPS5G.js");
+      const latestBackup = getLatestBackup();
+      if (latestBackup) {
+        const backupSize = statSync(latestBackup).size;
+        const MAX_CLOUD_BACKUP_BYTES = 50 * 1024 * 1024;
+        if (backupSize <= MAX_CLOUD_BACKUP_BYTES) {
+          const backupData = readFileSync(latestBackup);
+          const deviceId = loadDeviceId() ?? "unknown";
+          const encrypted = encryptSyncBlob(backupData);
+          const backupRes = await fetchWithRetry(`${config.endpoint}/sync/push-db-backup`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json", Authorization: `Bearer ${config.apiKey}` },
+            body: JSON.stringify({
+              device_id: deviceId,
+              filename: path.basename(latestBackup),
+              blob: encrypted,
+              size: backupData.length
+            })
+          });
+          if (backupRes && !backupRes.ok) {
+            logError(`[cloud-sync] DB backup upload failed: ${backupRes.status}`);
+          }
         }
       }
+    } catch (err) {
+      logError(`[cloud-sync] DB backup upload error: ${err instanceof Error ? err.message : String(err)}`);
     }
-  } catch (err) {
-    logError(`[cloud-sync] DB backup upload error: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  const codeContextResult = { pushed: 0, pulled: 0 };
-  try {
-    codeContextResult.pushed = await cloudPushCodeContext(config);
-  } catch (err) {
-    logError(`[cloud-sync] Code context push: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  try {
-    codeContextResult.pulled = await cloudPullCodeContext(config);
-  } catch (err) {
-    logError(`[cloud-sync] Code context pull: ${err instanceof Error ? err.message : String(err)}`);
+    const codeContextResult = { pushed: 0, pulled: 0 };
+    try {
+      codeContextResult.pushed = await cloudPushCodeContext(config);
+    } catch (err) {
+      logError(`[cloud-sync] Code context push: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+      codeContextResult.pulled = await cloudPullCodeContext(config);
+    } catch (err) {
+      logError(`[cloud-sync] Code context pull: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    return {
+      pushed,
+      pulled,
+      totalMemories,
+      behaviors: behaviorsResult,
+      graphrag: graphragResult,
+      tasks: tasksResult,
+      conversations: conversationsResult,
+      documents: documentsResult,
+      coreMemory: coreMemoryResult,
+      roster: rosterResult,
+      codeContext: codeContextResult
+    };
+  } finally {
+    _cloudSyncInProgress = false;
   }
-  return {
-    pushed,
-    pulled,
-    totalMemories,
-    behaviors: behaviorsResult,
-    graphrag: graphragResult,
-    tasks: tasksResult,
-    conversations: conversationsResult,
-    documents: documentsResult,
-    coreMemory: coreMemoryResult,
-    roster: rosterResult,
-    codeContext: codeContextResult
-  };
 }
 var ROSTER_DELETIONS_PATH = path.join(EXE_AI_DIR, "roster-deletions.json");
 function recordRosterDeletion(name) {
@@ -1969,6 +1993,7 @@ async function cloudPullCoreMemory(config) {
 }
 
 export {
+  disposeCloudSync,
   pushToPostgres,
   migrateEndpoint,
   assertSecureEndpoint,