@hasna/cloud 0.1.3 → 0.1.5

package/dist/adapter.d.ts

@@ -26,6 +26,8 @@ export declare class SqliteAdapter implements DbAdapter {
     get(sql: string, ...params: any[]): any;
     all(sql: string, ...params: any[]): any[];
     exec(sql: string): void;
+    /** Passthrough to bun:sqlite's .query() for compatibility with code that uses db.query() */
+    query(sql: string): import("bun:sqlite").Statement<unknown, import("bun:sqlite").SQLQueryBindings[] | [null] | [string] | [number] | [bigint] | [false] | [true] | [Uint8Array<ArrayBufferLike>] | [Uint8ClampedArray<ArrayBufferLike>] | [Uint16Array<ArrayBufferLike>] | [Uint32Array<ArrayBufferLike>] | [Int8Array<ArrayBufferLike>] | [Int16Array<ArrayBufferLike>] | [Int32Array<ArrayBufferLike>] | [BigUint64Array<ArrayBufferLike>] | [BigInt64Array<ArrayBufferLike>] | [Float16Array<ArrayBufferLike>] | [Float32Array<ArrayBufferLike>] | [Float64Array<ArrayBufferLike>] | [Record<string, string | number | bigint | boolean | NodeJS.TypedArray<ArrayBufferLike> | null>]>;
     prepare(sql: string): PreparedStatement;
     close(): void;
     transaction<T>(fn: () => T): T;

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}

package/dist/auto-sync.d.ts

@@ -0,0 +1,57 @@
+import type { DbAdapter } from "./adapter.js";
+export interface AutoSyncConfig {
+    auto_sync_on_start: boolean;
+    auto_sync_on_stop: boolean;
+}
+export interface AutoSyncContext {
+    serviceName: string;
+    local: DbAdapter;
+    remote: DbAdapter;
+    tables: string[];
+    config: AutoSyncConfig;
+}
+export interface AutoSyncResult {
+    event: "start" | "stop";
+    direction: "pull" | "push";
+    success: boolean;
+    tables_synced: number;
+    total_rows_synced: number;
+    errors: string[];
+}
+/**
+ * Read auto-sync configuration from `~/.hasna/cloud/config.json`.
+ * Falls back to defaults if the file does not exist or is malformed.
+ */
+export declare function getAutoSyncConfig(): AutoSyncConfig;
+/**
+ * Set up auto-sync hooks for a service's MCP server.
+ *
+ * - On connect: if `auto_sync_on_start` and mode is `hybrid` or `cloud`,
+ *   pull from cloud to local.
+ * - On disconnect/SIGTERM: if `auto_sync_on_stop` and mode is `hybrid` or `cloud`,
+ *   push from local to cloud.
+ *
+ * @param serviceName - The service identifier.
+ * @param server - The MCP server instance (any object with `onconnect`/`ondisconnect` events).
+ * @param local - The local database adapter.
+ * @param remote - The remote database adapter.
+ * @param tables - Tables to sync.
+ * @returns An object with methods to manually trigger start/stop syncs.
+ */
+export declare function setupAutoSync(serviceName: string, server: any, local: DbAdapter, remote: DbAdapter, tables: string[]): {
+    syncOnStart: () => AutoSyncResult | null;
+    syncOnStop: () => AutoSyncResult | null;
+    config: AutoSyncConfig;
+};
+/**
+ * Enable auto-sync for a service. Simplified entry point that services
+ * can call with minimal configuration.
+ *
+ * @param serviceName - The service name (used for logging context).
+ * @param mcpServer - The MCP server instance.
+ * @param local - The local database adapter.
+ * @param remote - The remote database adapter.
+ * @param tables - Tables to sync on start/stop.
+ */
+export declare function enableAutoSync(serviceName: string, mcpServer: any, local: DbAdapter, remote: DbAdapter, tables: string[]): void;
+//# sourceMappingURL=auto-sync.d.ts.map

package/dist/auto-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-sync.d.ts","sourceRoot":"","sources":["../src/auto-sync.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQ9C,MAAM,WAAW,cAAc;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAaD;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,cAAc,CAmBlD;AAwFD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EAAE,GACf;IACD,WAAW,EAAE,MAAM,cAAc,GAAG,IAAI,CAAC;IACzC,UAAU,EAAE,MAAM,cAAc,GAAG,IAAI,CAAC;IACxC,MAAM,EAAE,cAAc,CAAC;CACxB,CAiDA;AAMD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,GAAG,EACd,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EAAE,GACf,IAAI,CAEN"}

package/dist/cli/index.js

@@ -2191,7 +2191,7 @@ var require_arrayParser = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/postgres-date/index.js
+// node_modules/pg-types/node_modules/postgres-date/index.js
 var require_postgres_date = __commonJS((exports, module) => {
   var DATE_TIME = /(\d{1,})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})(\.\d{1,})?.*?( BC)?$/;
   var DATE = /^(\d{1,})-(\d{2})-(\d{2})( BC)?$/;
@@ -2293,7 +2293,7 @@ var require_mutable = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/postgres-interval/index.js
+// node_modules/pg-types/node_modules/postgres-interval/index.js
 var require_postgres_interval = __commonJS((exports, module) => {
   var extend = require_mutable();
   module.exports = PostgresInterval;
@@ -2385,7 +2385,7 @@ var require_postgres_interval = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/postgres-bytea/index.js
+// node_modules/pg-types/node_modules/postgres-bytea/index.js
 var require_postgres_bytea = __commonJS((exports, module) => {
   var bufferFrom = Buffer.from || Buffer;
   module.exports = function parseBytea(input) {
@@ -11026,6 +11026,9 @@ class SqliteAdapter {
   exec(sql) {
     this.db.exec(sql);
   }
+  query(sql) {
+    return this.db.query(sql);
+  }
   prepare(sql) {
     const stmt = this.db.prepare(sql);
     return {
@@ -11257,17 +11260,88 @@ function createDatabase(options) {
 }
 
 // src/sync.ts
-function syncPush(local, cloud, options) {
-  return syncTransfer(local, cloud, options, "push");
+async function syncPush(local, remote, options) {
+  const orderedTables = await getTableOrder(remote, options.tables);
+  return syncTransfer(local, remote, { ...options, tables: orderedTables }, "push");
+}
+async function syncPull(remote, local, options) {
+  const orderedTables = await getTableOrder(remote, options.tables);
+  return syncTransfer(remote, local, { ...options, tables: orderedTables }, "pull");
+}
+async function getTableOrder(remote, tables) {
+  if (tables.length <= 1)
+    return tables;
+  try {
+    const fks = await remote.all(`
+      SELECT DISTINCT
+        tc.table_name AS source_table,
+        ccu.table_name AS referenced_table
+      FROM information_schema.table_constraints tc
+      JOIN information_schema.constraint_column_usage ccu
+        ON tc.constraint_name = ccu.constraint_name
+        AND tc.table_schema = ccu.table_schema
+      WHERE tc.constraint_type = 'FOREIGN KEY'
+        AND tc.table_schema = 'public'
+    `);
+    if (fks.length > 0) {
+      return topoSort(tables, fks);
+    }
+  } catch {}
+  return heuristicOrder(tables);
+}
+function topoSort(tables, fks) {
+  const tableSet = new Set(tables);
+  const deps = new Map;
+  for (const t of tables) {
+    deps.set(t, new Set);
+  }
+  for (const fk of fks) {
+    if (tableSet.has(fk.source_table) && tableSet.has(fk.referenced_table)) {
+      deps.get(fk.source_table).add(fk.referenced_table);
+    }
+  }
+  const sorted = [];
+  const visited = new Set;
+  const visiting = new Set;
+  function visit(table) {
+    if (visited.has(table))
+      return;
+    if (visiting.has(table)) {
+      sorted.push(table);
+      visited.add(table);
+      return;
+    }
+    visiting.add(table);
+    const tableDeps = deps.get(table) ?? new Set;
+    for (const dep of tableDeps) {
+      visit(dep);
+    }
+    visiting.delete(table);
+    visited.add(table);
+    sorted.push(table);
+  }
+  for (const t of tables) {
+    visit(t);
+  }
+  return sorted;
 }
-function syncPull(local, cloud, options) {
-  return syncTransfer(cloud, local, options, "pull");
+function heuristicOrder(tables) {
+  const sorted = [...tables].sort((a, b) => {
+    const aIsChild = a.includes("_") && tables.some((t) => a.startsWith(t + "_") || a.endsWith("_" + t));
+    const bIsChild = b.includes("_") && tables.some((t) => b.startsWith(t + "_") || b.endsWith("_" + t));
+    if (aIsChild && !bIsChild)
+      return 1;
+    if (!aIsChild && bIsChild)
+      return -1;
+    return a.localeCompare(b);
+  });
+  return sorted;
 }
-function syncTransfer(source, target, options, _direction) {
+async function syncTransfer(source, target, options, _direction) {
   const {
     tables,
     onProgress,
-    batchSize = 500,
+    batchSize = 100,
     conflictColumn = "updated_at",
     primaryKey = "id"
   } = options;
@@ -11290,7 +11364,7 @@ function syncTransfer(source, target, options, _direction) {
         totalTables: tables.length,
         currentTableIndex: i
       });
-      const rows = source.all(`SELECT * FROM "${table}"`);
+      const rows = await readAll(source, `SELECT * FROM "${table}"`);
       result.rowsRead = rows.length;
       if (rows.length === 0) {
         onProgress?.({
@@ -11305,7 +11379,6 @@ function syncTransfer(source, target, options, _direction) {
         continue;
       }
       const columns = Object.keys(rows[0]);
-      const hasConflictCol = columns.includes(conflictColumn);
       const hasPrimaryKey = columns.includes(primaryKey);
       if (!hasPrimaryKey) {
         result.errors.push(`Table "${table}" has no "${primaryKey}" column — skipping`);
@@ -11320,34 +11393,18 @@ function syncTransfer(source, target, options, _direction) {
         totalTables: tables.length,
         currentTableIndex: i
       });
+      const updateCols = columns.filter((c) => c !== primaryKey);
       for (let offset = 0;offset < rows.length; offset += batchSize) {
         const batch = rows.slice(offset, offset + batchSize);
-        for (const row of batch) {
-          try {
-            const existing = target.get(`SELECT "${primaryKey}"${hasConflictCol ? `, "${conflictColumn}"` : ""} FROM "${table}" WHERE "${primaryKey}" = ?`, row[primaryKey]);
-            if (existing) {
-              if (hasConflictCol && existing[conflictColumn] && row[conflictColumn]) {
-                const existingTime = new Date(existing[conflictColumn]).getTime();
-                const incomingTime = new Date(row[conflictColumn]).getTime();
-                if (existingTime >= incomingTime) {
-                  result.rowsSkipped++;
-                  continue;
-                }
-              }
-              const setClauses = columns.filter((c) => c !== primaryKey).map((c) => `"${c}" = ?`).join(", ");
-              const values = columns.filter((c) => c !== primaryKey).map((c) => row[c]);
-              values.push(row[primaryKey]);
-              target.run(`UPDATE "${table}" SET ${setClauses} WHERE "${primaryKey}" = ?`, ...values);
-            } else {
-              const placeholders = columns.map(() => "?").join(", ");
-              const colList = columns.map((c) => `"${c}"`).join(", ");
-              const values = columns.map((c) => row[c]);
-              target.run(`INSERT INTO "${table}" (${colList}) VALUES (${placeholders})`, ...values);
-            }
-            result.rowsWritten++;
-          } catch (err) {
-            result.errors.push(`Row ${row[primaryKey]}: ${err?.message ?? String(err)}`);
+        try {
+          if (isAsyncAdapter(target)) {
+            await batchUpsertPg(target, table, columns, updateCols, primaryKey, batch);
+          } else {
+            batchUpsertSqlite(target, table, columns, updateCols, primaryKey, batch);
           }
+          result.rowsWritten += batch.length;
+        } catch (err) {
+          result.errors.push(`Batch at offset ${offset}: ${err?.message ?? String(err)}`);
         }
         onProgress?.({
           table,
@@ -11373,10 +11430,46 @@ function syncTransfer(source, target, options, _direction) {
   }
   return results;
 }
+async function batchUpsertPg(target, table, columns, updateCols, primaryKey, batch) {
+  if (batch.length === 0)
+    return;
+  const colList = columns.map((c) => `"${c}"`).join(", ");
+  const valuePlaceholders = batch.map((_, rowIdx) => {
+    const offset = rowIdx * columns.length;
+    return `(${columns.map((_2, colIdx) => `$${offset + colIdx + 1}`).join(", ")})`;
+  }).join(", ");
+  const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKey}" = EXCLUDED."${primaryKey}"`;
+  const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
+    ON CONFLICT ("${primaryKey}") DO UPDATE SET ${setClause}`;
+  const params = batch.flatMap((row) => columns.map((c) => row[c] ?? null));
+  await target.run(sql, ...params);
+}
+function batchUpsertSqlite(target, table, columns, updateCols, primaryKey, batch) {
+  if (batch.length === 0)
+    return;
+  const colList = columns.map((c) => `"${c}"`).join(", ");
+  const valuePlaceholders = batch.map(() => `(${columns.map(() => "?").join(", ")})`).join(", ");
+  const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKey}" = EXCLUDED."${primaryKey}"`;
+  const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
+    ON CONFLICT ("${primaryKey}") DO UPDATE SET ${setClause}`;
+  const params = batch.flatMap((row) => columns.map((c) => row[c] ?? null));
+  target.run(sql, ...params);
+}
+function isAsyncAdapter(adapter) {
+  return adapter.constructor.name === "PgAdapterAsync" || typeof adapter.raw?.connect === "function";
+}
+async function readAll(adapter, sql) {
+  const result = adapter.all(sql);
+  return result instanceof Promise ? await result : result;
+}
 function listSqliteTables(db) {
   const rows = db.all(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name`);
   return rows.map((r) => r.name);
 }
+async function listPgTables(db) {
+  const rows = await db.all(`SELECT tablename FROM pg_tables WHERE schemaname = 'public' ORDER BY tablename`);
+  return rows.map((r) => r.tablename);
+}
 
 // src/feedback.ts
 import { hostname } from "os";
@@ -11549,6 +11642,9 @@ class SqliteAdapter2 {
   exec(sql) {
     this.db.exec(sql);
   }
+  query(sql) {
+    return this.db.query(sql);
+  }
   prepare(sql) {
     const stmt = this.db.prepare(sql);
     return {
@@ -11578,10 +11674,8 @@ class SqliteAdapter2 {
     return this.db;
   }
 }
-
-class PgAdapter2 {
+class PgAdapterAsync {
   pool;
-  _client = null;
   constructor(arg) {
     if (typeof arg === "string") {
       this.pool = new esm_default.Pool({ connectionString: arg });
@@ -11589,118 +11683,47 @@ class PgAdapter2 {
       this.pool = arg;
     }
   }
-  runSync(fn) {
-    let result;
-    let error;
-    let done = false;
-    fn().then((r) => {
-      result = r;
-      done = true;
-    }).catch((e) => {
-      error = e;
-      done = true;
-    });
-    const deadline = Date.now() + 30000;
-    while (!done && Date.now() < deadline) {
-      Bun.sleepSync(1);
-    }
-    if (error)
-      throw error;
-    if (!done)
-      throw new Error("PgAdapter: query timed out (30s)");
-    return result;
-  }
-  run(sql, ...params) {
+  async run(sql, ...params) {
     const pgSql = translateSql(sql, "pg");
     const pgParams = translateParams(params);
-    return this.runSync(async () => {
-      const res = await this.pool.query(pgSql, pgParams);
-      return {
-        changes: res.rowCount ?? 0,
-        lastInsertRowid: res.rows?.[0]?.id ?? 0
-      };
-    });
+    const res = await this.pool.query(pgSql, pgParams);
+    return {
+      changes: res.rowCount ?? 0,
+      lastInsertRowid: res.rows?.[0]?.id ?? 0
+    };
   }
-  get(sql, ...params) {
+  async get(sql, ...params) {
     const pgSql = translateSql(sql, "pg");
     const pgParams = translateParams(params);
-    return this.runSync(async () => {
-      const res = await this.pool.query(pgSql, pgParams);
-      return res.rows[0] ?? null;
-    });
+    const res = await this.pool.query(pgSql, pgParams);
+    return res.rows[0] ?? null;
   }
-  all(sql, ...params) {
+  async all(sql, ...params) {
     const pgSql = translateSql(sql, "pg");
     const pgParams = translateParams(params);
-    return this.runSync(async () => {
-      const res = await this.pool.query(pgSql, pgParams);
-      return res.rows;
-    });
+    const res = await this.pool.query(pgSql, pgParams);
+    return res.rows;
   }
-  exec(sql) {
+  async exec(sql) {
     const pgSql = translateSql(sql, "pg");
-    this.runSync(async () => {
-      await this.pool.query(pgSql);
-    });
+    await this.pool.query(pgSql);
   }
-  prepare(sql) {
-    const pgSql = translateSql(sql, "pg");
-    const adapter = this;
-    return {
-      run(...params) {
-        const pgParams = translateParams(params);
-        return adapter.runSync(async () => {
-          const res = await adapter.pool.query(pgSql, pgParams);
-          return {
-            changes: res.rowCount ?? 0,
-            lastInsertRowid: res.rows?.[0]?.id ?? 0
-          };
-        });
-      },
-      get(...params) {
-        const pgParams = translateParams(params);
-        return adapter.runSync(async () => {
-          const res = await adapter.pool.query(pgSql, pgParams);
-          return res.rows[0] ?? null;
-        });
-      },
-      all(...params) {
-        const pgParams = translateParams(params);
-        return adapter.runSync(async () => {
-          const res = await adapter.pool.query(pgSql, pgParams);
-          return res.rows;
-        });
-      },
-      finalize() {}
-    };
+  async close() {
+    await this.pool.end();
   }
-  close() {
-    this.runSync(async () => {
-      await this.pool.end();
-    });
-  }
-  transaction(fn) {
-    return this.runSync(async () => {
-      const client = await this.pool.connect();
-      try {
-        await client.query("BEGIN");
-        const origQuery = this.pool.query.bind(this.pool);
-        this.pool.query = client.query.bind(client);
-        let result;
-        try {
-          result = fn();
-        } finally {
-          this.pool.query = origQuery;
-        }
-        await client.query("COMMIT");
-        return result;
-      } catch (err) {
-        await client.query("ROLLBACK");
-        throw err;
-      } finally {
-        client.release();
-      }
-    });
+  async transaction(fn) {
+    const client = await this.pool.connect();
+    try {
+      await client.query("BEGIN");
+      const result = await fn(client);
+      await client.query("COMMIT");
+      return result;
+    } catch (err) {
+      await client.query("ROLLBACK");
+      throw err;
+    } finally {
+      client.release();
+    }
   }
   get raw() {
     return this.pool;
@@ -11742,19 +11765,19 @@ program2.command("status").description("Show current cloud configuration and con
 Checking PostgreSQL connection...`);
     try {
       const connStr = getConnectionString("postgres");
-      const pg2 = new PgAdapter2(connStr);
-      const row = pg2.get("SELECT 1 as ok");
+      const pg2 = new PgAdapterAsync(connStr);
+      const row = await pg2.get("SELECT 1 as ok");
       if (row?.ok === 1) {
         console.log("PostgreSQL: connected");
       }
-      pg2.close();
+      await pg2.close();
     } catch (err) {
       console.log("PostgreSQL: connection failed \u2014", err?.message);
     }
   }
 });
 var syncCmd = program2.command("sync").description("Sync data between local and cloud");
-syncCmd.command("push").description("Push local data to cloud").requiredOption("--service <name>", "Service name").option("--tables <tables>", "Comma-separated table names (default: all)").action((opts) => {
+syncCmd.command("push").description("Push local data to cloud").requiredOption("--service <name>", "Service name").option("--tables <tables>", "Comma-separated table names (default: all)").action(async (opts) => {
   const config = getCloudConfig();
   if (config.mode === "local") {
     console.error("Error: mode is 'local'. Run `cloud setup --mode hybrid` or `--mode cloud` first.");
@@ -11775,8 +11798,8 @@ syncCmd.command("push").description("Push local data to cloud").requiredOption("
   }
   console.log(`Pushing ${tables.length} table(s) to cloud...`);
   const connStr = getConnectionString(opts.service);
-  const cloud = new PgAdapter2(connStr);
-  const results = syncPush(local, cloud, {
+  const cloud = new PgAdapterAsync(connStr);
+  const results = await syncPush(local, cloud, {
     tables,
     onProgress: (p) => {
       if (p.phase === "done") {
@@ -11785,7 +11808,7 @@ syncCmd.command("push").description("Push local data to cloud").requiredOption("
     }
   });
   local.close();
-  cloud.close();
+  await cloud.close();
   const totalWritten = results.reduce((s, r) => s + r.rowsWritten, 0);
   const totalErrors = results.reduce((s, r) => s + r.errors.length, 0);
   console.log(`
@@ -11798,7 +11821,7 @@ Done. ${totalWritten} rows pushed, ${totalErrors} errors.`);
     }
   }
 });
-syncCmd.command("pull").description("Pull cloud data to local").requiredOption("--service <name>", "Service name").option("--tables <tables>", "Comma-separated table names (default: all)").action((opts) => {
+syncCmd.command("pull").description("Pull cloud data to local").requiredOption("--service <name>", "Service name").option("--tables <tables>", "Comma-separated table names (default: all)").action(async (opts) => {
   const config = getCloudConfig();
   if (config.mode === "local") {
     console.error("Error: mode is 'local'. Run `cloud setup --mode hybrid` or `--mode cloud` first.");
@@ -11807,18 +11830,17 @@ syncCmd.command("pull").description("Pull cloud data to local").requiredOption("
   const dbPath = getDbPath2(opts.service);
   const local = new SqliteAdapter2(dbPath);
   const connStr = getConnectionString(opts.service);
-  const cloud = new PgAdapter2(connStr);
+  const cloud = new PgAdapterAsync(connStr);
   let tables;
   if (opts.tables) {
     tables = opts.tables.split(",").map((t) => t.trim());
   } else {
     try {
-      const rows = cloud.all(`SELECT tablename FROM pg_tables WHERE schemaname = 'public' ORDER BY tablename`);
-      tables = rows.map((r) => r.tablename);
+      tables = await listPgTables(cloud);
     } catch {
       console.error("Failed to list tables from cloud.");
       local.close();
-      cloud.close();
+      await cloud.close();
       process.exit(1);
       return;
     }
@@ -11826,11 +11848,11 @@ syncCmd.command("pull").description("Pull cloud data to local").requiredOption("
   if (tables.length === 0) {
     console.log("No tables found to sync.");
     local.close();
-    cloud.close();
+    await cloud.close();
     return;
   }
   console.log(`Pulling ${tables.length} table(s) from cloud...`);
-  const results = syncPull(local, cloud, {
+  const results = await syncPull(cloud, local, {
     tables,
     onProgress: (p) => {
       if (p.phase === "done") {
@@ -11839,7 +11861,7 @@ syncCmd.command("pull").description("Pull cloud data to local").requiredOption("
     }
   });
   local.close();
-  cloud.close();
+  await cloud.close();
   const totalWritten = results.reduce((s, r) => s + r.rowsWritten, 0);
   const totalErrors = results.reduce((s, r) => s + r.errors.length, 0);
   console.log(`

package/dist/cli-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-helpers.d.ts","sourceRoot":"","sources":["../src/cli-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWzC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,GAClB,IAAI,CAwHN"}
+{"version":3,"file":"cli-helpers.d.ts","sourceRoot":"","sources":["../src/cli-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWzC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,GAClB,IAAI,CAqHN"}

package/dist/index.d.ts

@@ -4,6 +4,10 @@ export { getCloudConfig, saveCloudConfig, getConnectionString, createDatabase, g
 export { syncPush, syncPull, listSqliteTables, listPgTables, type SyncOptions, type SyncResult, type SyncProgress, type SyncProgressCallback, } from "./sync.js";
 export { saveFeedback, sendFeedback, listFeedback, ensureFeedbackTable, type Feedback, } from "./feedback.js";
 export { migrateDotfile, getDataDir, getDbPath, hasLegacyDotfile, getHasnaDir, } from "./dotfile.js";
+export { SyncProgressTracker, type SyncProgressInfo, type ProgressCallback, type ResumePoint, } from "./sync-progress.js";
+export { detectConflicts, resolveConflicts, getWinningData, ensureConflictsTable, storeConflicts, listConflicts, resolveConflict, getConflict, purgeResolvedConflicts, type SyncConflict, type ConflictStrategy, type StoredConflict, } from "./sync-conflicts.js";
+export { incrementalSyncPush, incrementalSyncPull, ensureSyncMetaTable, getSyncMetaAll, getSyncMetaForTable, resetSyncMeta, resetAllSyncMeta, type IncrementalSyncStats, type IncrementalSyncOptions, type SyncMeta, } from "./sync-incremental.js";
+export { setupAutoSync, enableAutoSync, getAutoSyncConfig, type AutoSyncConfig, type AutoSyncContext, type AutoSyncResult, } from "./auto-sync.js";
 export { registerCloudTools } from "./mcp-helpers.js";
 export { registerCloudCommands } from "./cli-helpers.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EACb,SAAS,EACT,cAAc,EACd,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,SAAS,GACf,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,KAAK,OAAO,GACb,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,KAAK,WAAW,EAChB,KAAK,qBAAqB,GAC3B,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACZ,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,oBAAoB,GAC1B,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,KAAK,QAAQ,GACd,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,cAAc,EACd,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,WAAW,GACZ,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EACb,SAAS,EACT,cAAc,EACd,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,SAAS,GACf,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,KAAK,OAAO,GACb,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,KAAK,WAAW,EAChB,KAAK,qBAAqB,GAC3B,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACZ,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,oBAAoB,GAC1B,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,KAAK,QAAQ,GACd,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,cAAc,EACd,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,WAAW,GACZ,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,mBAAmB,EACnB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,WAAW,GACjB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,eAAe,EACf,WAAW,EACX,sBAAsB,EACtB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,cAAc,GACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,gBAAgB,EAChB,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,GACd,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,GACpB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC"}