@hasna/cloud 0.1.24 → 0.1.26

package/dist/auto-sync.d.ts

@@ -1,4 +1,5 @@
 import type { DbAdapter } from "./adapter.js";
+import { PgAdapterAsync } from "./adapter.js";
 export interface AutoSyncConfig {
     auto_sync_on_start: boolean;
     auto_sync_on_stop: boolean;
@@ -6,7 +7,6 @@ export interface AutoSyncConfig {
 export interface AutoSyncContext {
     serviceName: string;
     local: DbAdapter;
-    remote: DbAdapter;
     tables: string[];
     config: AutoSyncConfig;
 }
@@ -18,40 +18,11 @@ export interface AutoSyncResult {
     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;
+export declare function setupAutoSync(serviceName: string, server: any, local: DbAdapter, remote: DbAdapter | PgAdapterAsync, tables: string[]): {
+    syncOnStart: () => Promise<AutoSyncResult | null>;
+    syncOnStop: () => Promise<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;
+export declare function enableAutoSync(serviceName: string, mcpServer: any, local: DbAdapter, remote: DbAdapter | PgAdapterAsync, tables: string[]): void;
 //# sourceMappingURL=auto-sync.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"auto-sync.d.ts","sourceRoot":"","sources":["../src/auto-sync.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAS9C,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,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,wBAAgB,iBAAiB,IAAI,cAAc,CAmBlD;AAiGD,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,GAAG,cAAc,EAClC,MAAM,EAAE,MAAM,EAAE,GACf;IACD,WAAW,EAAE,MAAM,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAClD,UAAU,EAAE,MAAM,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACjD,MAAM,EAAE,cAAc,CAAC;CACxB,CA0CA;AAMD,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,GAAG,EACd,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,GAAG,cAAc,EAClC,MAAM,EAAE,MAAM,EAAE,GACf,IAAI,CAEN"}

package/dist/cli/index.js

@@ -12810,8 +12810,21 @@ function logSync(direction, service, rows, errors2) {
   } catch {}
 }
 program2.name("cloud").description("Shared cloud infrastructure \u2014 database adapter, sync engine, feedback, dotfile migration").version("0.1.8");
-program2.command("setup").description("Configure cloud settings").option("--host <host>", "RDS hostname").option("--port <port>", "RDS port", "5432").option("--username <user>", "RDS username").option("--password-env <env>", "Env var for RDS password", "HASNA_RDS_PASSWORD").option("--ssl", "Enable SSL", true).option("--no-ssl", "Disable SSL").option("--mode <mode>", "Mode: local, cloud, or hybrid", "local").option("--sync-interval <minutes>", "Auto-sync interval in minutes", "0").action((opts) => {
+program2.command("setup").description("Configure cloud settings \u2014 interactive wizard or flags").option("--host <host>", "RDS hostname").option("--port <port>", "RDS port", "5432").option("--username <user>", "RDS username").option("--password-env <env>", "Env var for RDS password", "HASNA_RDS_PASSWORD").option("--ssl", "Enable SSL", true).option("--no-ssl", "Disable SSL").option("--mode <mode>", "Mode: local, cloud, or hybrid").option("--schedule <interval>", "Sync schedule (e.g. 30m, 1h)").option("--migrate", "Run PG migrations after setup").option("--pull", "Pull data from cloud after setup").action(async (opts) => {
   const config = getCloudConfig();
+  const isAutoDetect = !opts.host && !opts.username;
+  if (isAutoDetect) {
+    const envHost = process.env.HASNA_RDS_HOST;
+    const envUser = process.env.HASNA_RDS_USERNAME;
+    if (envHost && !config.rds.host) {
+      config.rds.host = envHost;
+      console.log(`Auto-detected RDS host: ${envHost}`);
+    }
+    if (envUser && !config.rds.username) {
+      config.rds.username = envUser;
+      console.log(`Auto-detected RDS username: ${envUser}`);
+    }
+  }
   if (opts.host)
     config.rds.host = opts.host;
   if (opts.port)
@@ -12821,13 +12834,86 @@ program2.command("setup").description("Configure cloud settings").option("--host
   if (opts.passwordEnv)
     config.rds.password_env = opts.passwordEnv;
   config.rds.ssl = opts.ssl;
-  if (opts.mode)
+  if (opts.mode) {
     config.mode = opts.mode;
-  if (opts.syncInterval)
-    config.auto_sync_interval_minutes = parseInt(opts.syncInterval, 10);
+  } else if (config.mode === "local" && config.rds.host) {
+    config.mode = "hybrid";
+    console.log("Mode set to: hybrid (auto-upgraded from local)");
+  }
   saveCloudConfig(config);
-  console.log("Cloud configuration saved.");
-  console.log(JSON.stringify(config, null, 2));
+  console.log(`
+\u2713 Configuration saved
+`);
+  const password = process.env[config.rds.password_env];
+  if (!password) {
+    console.error(`\u2717 ${config.rds.password_env} not set in environment`);
+    console.error(`  Add it to ~/.secrets/hasna/rds/live.env and source it`);
+    return;
+  }
+  if (config.rds.host) {
+    process.stdout.write("Testing PG connection... ");
+    try {
+      const connStr = getConnectionString("postgres");
+      const pg2 = new PgAdapterAsync2(connStr);
+      await pg2.all("SELECT 1");
+      await pg2.close();
+      console.log(`\u2713 Connected
+`);
+    } catch (err) {
+      console.log(`\u2717 Failed: ${err?.message ?? String(err)}`);
+      return;
+    }
+    if (opts.migrate !== false) {
+      console.log("Creating databases & running migrations...");
+      const dbResults = await ensureAllPgDatabases();
+      const created = dbResults.filter((r) => r.created);
+      if (created.length > 0) {
+        console.log(`  Created ${created.length} database(s): ${created.map((r) => r.service).join(", ")}`);
+      }
+      const migResults = await migrateAllServices();
+      const applied = migResults.filter((r) => r.applied.length > 0);
+      const totalApplied = migResults.reduce((s, r) => s + r.applied.length, 0);
+      if (totalApplied > 0) {
+        console.log(`  Applied ${totalApplied} migration(s) across ${applied.length} service(s)`);
+      } else {
+        console.log("  All migrations up to date");
+      }
+      console.log("");
+    }
+    if (opts.schedule) {
+      try {
+        const minutes = parseInterval(opts.schedule);
+        await registerSyncSchedule(minutes);
+        console.log(`\u2713 Sync scheduled every ${minutes}m
+`);
+      } catch (err) {
+        console.error(`\u2717 Schedule failed: ${err?.message}`);
+      }
+    }
+    if (opts.pull) {
+      console.log("Pulling data from cloud...");
+      const services = discoverServices();
+      for (const service of services) {
+        try {
+          const dbPath = getDbPath2(service);
+          const local = new SqliteAdapter2(dbPath);
+          const connStr = getConnectionString(service);
+          const cloud = new PgAdapterAsync2(connStr);
+          const tables = (await listPgTables(cloud)).filter((t) => !isSyncExcludedTable(t));
+          if (tables.length > 0) {
+            const results = await syncPull(cloud, local, { tables });
+            const written = results.reduce((s, r) => s + r.rowsWritten, 0);
+            if (written > 0)
+              console.log(`  ${service}: ${written} rows`);
+          }
+          local.close();
+          await cloud.close();
+        } catch {}
+      }
+      console.log("");
+    }
+  }
+  console.log("Setup complete. Run `cloud doctor` to verify everything.");
 });
 program2.command("status").description("Show current cloud configuration and connection health").action(async () => {
   const config = getCloudConfig();

package/dist/index.js

@@ -9355,23 +9355,23 @@ var exports_discover = {};
 __export(exports_discover, {
   isSyncExcludedTable: () => isSyncExcludedTable,
   getServiceDbPath: () => getServiceDbPath,
-  discoverSyncableServices: () => discoverSyncableServices2,
+  discoverSyncableServices: () => discoverSyncableServices,
   discoverServices: () => discoverServices,
   SYNC_EXCLUDED_TABLE_PATTERNS: () => SYNC_EXCLUDED_TABLE_PATTERNS,
   KNOWN_PG_SERVICES: () => KNOWN_PG_SERVICES
 });
-import { readdirSync as readdirSync3, existsSync as existsSync6 } from "fs";
-import { join as join6 } from "path";
-import { homedir as homedir5 } from "os";
+import { readdirSync as readdirSync2, existsSync as existsSync3 } from "fs";
+import { join as join3 } from "path";
+import { homedir as homedir3 } from "os";
 function isSyncExcludedTable(table) {
   return SYNC_EXCLUDED_TABLE_PATTERNS.some((p) => p.test(table));
 }
 function discoverServices() {
-  const dataDir = join6(homedir5(), ".hasna");
-  if (!existsSync6(dataDir))
+  const dataDir = join3(homedir3(), ".hasna");
+  if (!existsSync3(dataDir))
     return [];
   try {
-    const entries = readdirSync3(dataDir, { withFileTypes: true });
+    const entries = readdirSync2(dataDir, { withFileTypes: true });
     return entries.filter((e) => {
       if (!e.isDirectory())
         return false;
@@ -9383,30 +9383,30 @@ function discoverServices() {
     return [];
   }
 }
-function discoverSyncableServices2() {
+function discoverSyncableServices() {
   const local = discoverServices();
   const pgSet = new Set(KNOWN_PG_SERVICES);
   return local.filter((s) => pgSet.has(s));
 }
 function getServiceDbPath(service) {
-  const dataDir = join6(homedir5(), ".hasna", service);
-  if (!existsSync6(dataDir))
+  const dataDir = join3(homedir3(), ".hasna", service);
+  if (!existsSync3(dataDir))
     return null;
   const candidates = [
-    join6(dataDir, `${service}.db`),
-    join6(dataDir, "data.db"),
-    join6(dataDir, "database.db")
+    join3(dataDir, `${service}.db`),
+    join3(dataDir, "data.db"),
+    join3(dataDir, "database.db")
   ];
   try {
-    const files = readdirSync3(dataDir);
+    const files = readdirSync2(dataDir);
     for (const f of files) {
       if (f.endsWith(".db") && !f.endsWith("-wal") && !f.endsWith("-shm")) {
-        candidates.push(join6(dataDir, f));
+        candidates.push(join3(dataDir, f));
       }
     }
   } catch {}
   for (const p of candidates) {
-    if (existsSync6(p))
+    if (existsSync3(p))
       return p;
   }
   return null;
@@ -10403,18 +10403,20 @@ function resetAllSyncMeta(db) {
   db.run(`DELETE FROM _sync_meta`);
 }
 // src/auto-sync.ts
+init_adapter();
 init_config();
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
-var AUTO_SYNC_CONFIG_PATH = join3(homedir3(), ".hasna", "cloud", "config.json");
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join4 } from "path";
+init_discover();
+var AUTO_SYNC_CONFIG_PATH = join4(homedir4(), ".hasna", "cloud", "config.json");
 var DEFAULT_AUTO_SYNC_CONFIG = {
   auto_sync_on_start: true,
   auto_sync_on_stop: true
 };
 function getAutoSyncConfig() {
   try {
-    if (!existsSync3(AUTO_SYNC_CONFIG_PATH)) {
+    if (!existsSync4(AUTO_SYNC_CONFIG_PATH)) {
       return { ...DEFAULT_AUTO_SYNC_CONFIG };
     }
     const raw = JSON.parse(readFileSync2(AUTO_SYNC_CONFIG_PATH, "utf-8"));
@@ -10426,7 +10428,7 @@ function getAutoSyncConfig() {
     return { ...DEFAULT_AUTO_SYNC_CONFIG };
   }
 }
-function executeAutoSync(event, local, remote, tables) {
+async function executeAutoSync(event, serviceName, local, tables) {
   const direction = event === "start" ? "pull" : "push";
   const result = {
     event,
@@ -10436,18 +10438,31 @@ function executeAutoSync(event, local, remote, tables) {
     total_rows_synced: 0,
     errors: []
   };
+  let remote = null;
   try {
-    const stats = direction === "pull" ? incrementalSyncPull(remote, local, tables) : incrementalSyncPush(local, remote, tables);
-    for (const s of stats) {
-      if (s.errors.length === 0) {
+    const connStr = getConnectionString(serviceName);
+    remote = new PgAdapterAsync(connStr);
+    const syncTables = tables.length > 0 ? tables.filter((t) => !isSyncExcludedTable(t)) : direction === "push" ? listSqliteTables(local).filter((t) => !isSyncExcludedTable(t)) : (await listPgTables(remote)).filter((t) => !isSyncExcludedTable(t));
+    if (syncTables.length === 0) {
+      result.success = true;
+      return result;
+    }
+    const results = direction === "pull" ? await syncPull(remote, local, { tables: syncTables }) : await syncPush(local, remote, { tables: syncTables });
+    for (const r of results) {
+      if (r.errors.length === 0)
         result.tables_synced++;
-      }
-      result.total_rows_synced += s.synced_rows;
-      result.errors.push(...s.errors);
+      result.total_rows_synced += r.rowsWritten;
+      result.errors.push(...r.errors);
     }
     result.success = result.errors.length === 0;
   } catch (err) {
     result.errors.push(err?.message ?? String(err));
+  } finally {
+    if (remote) {
+      try {
+        await remote.close();
+      } catch {}
+    }
   }
   return result;
 }
@@ -10457,64 +10472,60 @@ function installSignalHandlers() {
   if (signalHandlersInstalled)
     return;
   signalHandlersInstalled = true;
-  const handleExit = () => {
+  const handleExit = async () => {
     for (const fn of cleanupHandlers) {
       try {
-        fn();
+        await fn();
       } catch {}
     }
   };
-  process.on("SIGTERM", () => {
-    handleExit();
+  process.on("SIGTERM", async () => {
+    await handleExit();
     process.exit(0);
   });
-  process.on("SIGINT", () => {
-    handleExit();
+  process.on("SIGINT", async () => {
+    await handleExit();
     process.exit(0);
   });
-  process.on("beforeExit", () => {
-    handleExit();
+  process.on("beforeExit", async () => {
+    await handleExit();
   });
 }
 function setupAutoSync(serviceName, server, local, remote, tables) {
   const config = getAutoSyncConfig();
   const cloudConfig = getCloudConfig();
   const isSyncEnabled = cloudConfig.mode === "hybrid" || cloudConfig.mode === "cloud";
-  const syncOnStart = () => {
+  const syncOnStart = async () => {
     if (!config.auto_sync_on_start || !isSyncEnabled)
       return null;
-    return executeAutoSync("start", local, remote, tables);
+    return executeAutoSync("start", serviceName, local, tables);
   };
-  const syncOnStop = () => {
+  const syncOnStop = async () => {
     if (!config.auto_sync_on_stop || !isSyncEnabled)
       return null;
-    return executeAutoSync("stop", local, remote, tables);
+    return executeAutoSync("stop", serviceName, local, tables);
   };
   if (server && typeof server.onconnect === "function") {
     const origOnConnect = server.onconnect;
-    server.onconnect = (...args) => {
-      syncOnStart();
+    server.onconnect = async (...args) => {
+      await syncOnStart();
       return origOnConnect.apply(server, args);
     };
   } else if (server && typeof server.on === "function") {
-    server.on("connect", () => {
-      syncOnStart();
-    });
+    server.on("connect", () => syncOnStart());
   }
   if (server && typeof server.ondisconnect === "function") {
     const origOnDisconnect = server.ondisconnect;
-    server.ondisconnect = (...args) => {
-      syncOnStop();
+    server.ondisconnect = async (...args) => {
+      await syncOnStop();
       return origOnDisconnect.apply(server, args);
     };
   } else if (server && typeof server.on === "function") {
-    server.on("disconnect", () => {
-      syncOnStop();
-    });
+    server.on("disconnect", () => syncOnStop());
   }
   installSignalHandlers();
-  cleanupHandlers.push(() => {
-    syncOnStop();
+  cleanupHandlers.push(async () => {
+    await syncOnStop();
   });
   return { syncOnStart, syncOnStop, config };
 }
@@ -10524,19 +10535,19 @@ function enableAutoSync(serviceName, mcpServer, local, remote, tables) {
 // src/scheduled-sync.ts
 init_config();
 init_adapter();
-import { existsSync as existsSync4, readdirSync as readdirSync2 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync5, readdirSync as readdirSync3 } from "fs";
+import { join as join5 } from "path";
 init_dotfile();
-function discoverSyncableServices() {
+function discoverSyncableServices2() {
   const hasnaDir = getHasnaDir();
   const services = [];
   try {
-    const entries = readdirSync2(hasnaDir, { withFileTypes: true });
+    const entries = readdirSync3(hasnaDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
-      const dbPath = join4(hasnaDir, entry.name, `${entry.name}.db`);
-      if (existsSync4(dbPath)) {
+      const dbPath = join5(hasnaDir, entry.name, `${entry.name}.db`);
+      if (existsSync5(dbPath)) {
         services.push(entry.name);
       }
     }
@@ -10547,7 +10558,7 @@ async function runScheduledSync() {
   const config = getCloudConfig();
   if (config.mode === "local")
     return [];
-  const services = discoverSyncableServices();
+  const services = discoverSyncableServices2();
   const results = [];
   let remote = null;
   for (const service of services) {
@@ -10558,8 +10569,8 @@ async function runScheduledSync() {
       errors: []
     };
     try {
-      const dbPath = join4(getDataDir(service), `${service}.db`);
-      if (!existsSync4(dbPath)) {
+      const dbPath = join5(getDataDir(service), `${service}.db`);
+      if (!existsSync5(dbPath)) {
         continue;
       }
       const local = new SqliteAdapter(dbPath);
@@ -10602,11 +10613,11 @@ async function runScheduledSync() {
 }
 // src/sync-schedule.ts
 init_config();
-import { join as join5, dirname } from "path";
-import { existsSync as existsSync5, writeFileSync as writeFileSync2, unlinkSync, mkdirSync as mkdirSync3 } from "fs";
-import { homedir as homedir4, platform } from "os";
+import { join as join6, dirname } from "path";
+import { existsSync as existsSync6, writeFileSync as writeFileSync2, unlinkSync, mkdirSync as mkdirSync3 } from "fs";
+import { homedir as homedir5, platform } from "os";
 var SERVICE_NAME = "hasna-cloud-sync";
-var CONFIG_DIR2 = join5(homedir4(), ".hasna", "cloud");
+var CONFIG_DIR2 = join6(homedir5(), ".hasna", "cloud");
 function parseInterval(input) {
   const trimmed = input.trim().toLowerCase();
   const hourMatch = trimmed.match(/^(\d+)\s*h$/);
@@ -10647,34 +10658,34 @@ function minutesToCron(minutes) {
 }
 function getWorkerPath() {
   const dir = typeof import.meta.dir === "string" ? import.meta.dir : dirname(import.meta.url.replace("file://", ""));
-  const tsPath = join5(dir, "scheduled-sync.ts");
-  const jsPath = join5(dir, "scheduled-sync.js");
+  const tsPath = join6(dir, "scheduled-sync.ts");
+  const jsPath = join6(dir, "scheduled-sync.js");
   try {
-    if (existsSync5(tsPath))
+    if (existsSync6(tsPath))
       return tsPath;
   } catch {}
   return jsPath;
 }
 function getBunPath() {
   const candidates = [
-    join5(homedir4(), ".bun", "bin", "bun"),
+    join6(homedir5(), ".bun", "bin", "bun"),
     "/usr/local/bin/bun",
     "/usr/bin/bun"
   ];
   for (const p of candidates) {
-    if (existsSync5(p))
+    if (existsSync6(p))
       return p;
   }
   return "bun";
 }
 function getLaunchdPlistPath() {
-  return join5(homedir4(), "Library", "LaunchAgents", `com.hasna.cloud-sync.plist`);
+  return join6(homedir5(), "Library", "LaunchAgents", `com.hasna.cloud-sync.plist`);
 }
 function createLaunchdPlist(intervalMinutes) {
   const workerPath = getWorkerPath();
   const bunPath = getBunPath();
-  const logPath = join5(CONFIG_DIR2, "sync.log");
-  const errorLogPath = join5(CONFIG_DIR2, "sync-error.log");
+  const logPath = join6(CONFIG_DIR2, "sync.log");
+  const errorLogPath = join6(CONFIG_DIR2, "sync-error.log");
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -10700,7 +10711,7 @@ function createLaunchdPlist(intervalMinutes) {
     <key>PATH</key>
     <string>${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}</string>
     <key>HOME</key>
-    <string>${homedir4()}</string>
+    <string>${homedir5()}</string>
   </dict>
 </dict>
 </plist>`;
@@ -10725,7 +10736,7 @@ async function removeLaunchd() {
   } catch {}
 }
 function getSystemdDir() {
-  return join5(homedir4(), ".config", "systemd", "user");
+  return join6(homedir5(), ".config", "systemd", "user");
 }
 function createSystemdService() {
   const workerPath = getWorkerPath();
@@ -10737,7 +10748,7 @@ After=network.target
 [Service]
 Type=oneshot
 ExecStart=${bunPath} run ${workerPath}
-Environment=HOME=${homedir4()}
+Environment=HOME=${homedir5()}
 Environment=PATH=${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}
 
 [Install]
@@ -10760,8 +10771,8 @@ WantedBy=timers.target
 async function registerSystemd(intervalMinutes) {
   const dir = getSystemdDir();
   mkdirSync3(dir, { recursive: true });
-  writeFileSync2(join5(dir, `${SERVICE_NAME}.service`), createSystemdService());
-  writeFileSync2(join5(dir, `${SERVICE_NAME}.timer`), createSystemdTimer(intervalMinutes));
+  writeFileSync2(join6(dir, `${SERVICE_NAME}.service`), createSystemdService());
+  writeFileSync2(join6(dir, `${SERVICE_NAME}.timer`), createSystemdTimer(intervalMinutes));
   await Bun.spawn(["systemctl", "--user", "daemon-reload"]).exited;
   await Bun.spawn(["systemctl", "--user", "enable", "--now", `${SERVICE_NAME}.timer`]).exited;
 }
@@ -10771,10 +10782,10 @@ async function removeSystemd() {
   } catch {}
   const dir = getSystemdDir();
   try {
-    unlinkSync(join5(dir, `${SERVICE_NAME}.service`));
+    unlinkSync(join6(dir, `${SERVICE_NAME}.service`));
   } catch {}
   try {
-    unlinkSync(join5(dir, `${SERVICE_NAME}.timer`));
+    unlinkSync(join6(dir, `${SERVICE_NAME}.timer`));
   } catch {}
   try {
     await Bun.spawn(["systemctl", "--user", "daemon-reload"]).exited;
@@ -10811,9 +10822,9 @@ function getSyncScheduleStatus() {
   let mechanism = "none";
   if (registered) {
     if (platform() === "darwin") {
-      mechanism = existsSync5(getLaunchdPlistPath()) ? "launchd" : "none";
+      mechanism = existsSync6(getLaunchdPlistPath()) ? "launchd" : "none";
     } else {
-      mechanism = existsSync5(join5(getSystemdDir(), `${SERVICE_NAME}.timer`)) ? "systemd" : "none";
+      mechanism = existsSync6(join6(getSystemdDir(), `${SERVICE_NAME}.timer`)) ? "systemd" : "none";
     }
   }
   return {
@@ -11199,8 +11210,8 @@ export {
   ensureConflictsTable,
   ensureAllPgDatabases,
   enableAutoSync,
-  discoverSyncableServices2 as discoverSyncableServicesV2,
-  discoverSyncableServices,
+  discoverSyncableServices as discoverSyncableServicesV2,
+  discoverSyncableServices2 as discoverSyncableServices,
   discoverServices,
   detectConflicts,
   createDatabase,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/cloud",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "Shared cloud infrastructure — database adapter (SQLite + PostgreSQL), sync engine, feedback system, unified dotfile config",
   "license": "Apache-2.0",
   "type": "module",