@hasna/economy 0.2.13 → 0.2.14

package/dist/cli/index.js

@@ -2858,24 +2858,34 @@ program.command("remove <type> <id>").alias("rm").description("Remove a record.
     process.exit(1);
   }
 });
+var CLOUD_RDS_HOST = "hasnaxyz-prod-opensource.c4limg0qgqvk.us-east-1.rds.amazonaws.com";
+var CLOUD_RDS_USER = "hasna_admin";
+var CLOUD_RDS_DB = "economy";
+var CLOUD_TABLES = ["requests", "sessions", "projects", "budgets", "goals", "model_pricing"];
+async function getCloudPassword() {
+  if (process.env["ECONOMY_PG_PASSWORD"])
+    return process.env["ECONOMY_PG_PASSWORD"];
+  const { execSync: exec } = await import("child_process");
+  const secretJson = exec(`aws --profile hasna-xyz-hq secretsmanager get-secret-value --secret-id 'rds!db-7a451ce6-83a9-40fa-b24a-81e5d5943511' --query SecretString --output text`, { timeout: 1e4, encoding: "utf-8" });
+  return JSON.parse(secretJson).password;
+}
+async function getCloudPg() {
+  const { PgAdapterAsync } = await import("@hasna/cloud");
+  const pw = encodeURIComponent(await getCloudPassword());
+  return new PgAdapterAsync(`postgresql://${CLOUD_RDS_USER}:${pw}@${CLOUD_RDS_HOST}:5432/${CLOUD_RDS_DB}?sslmode=require`);
+}
 var cloudCmd = program.command("cloud").description("Cross-machine sync via cloud PostgreSQL");
 cloudCmd.command("push").description("Push local economy data to cloud PostgreSQL").option("--tables <tables>", "Comma-separated table names (default: all)").action(async (opts) => {
-  const { syncPush, PgAdapterAsync, getCloudConfig, SqliteAdapter } = await import("@hasna/cloud");
+  const { syncPush, SqliteAdapter } = await import("@hasna/cloud");
   const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
-  const config = getCloudConfig();
-  if (!config.rds?.host) {
-    console.error(chalk4.red("Cloud not configured. Set RDS host in ~/.hasna/cloud.json"));
-    process.exit(1);
-  }
-  const connStr = `postgresql://${config.rds.username}:${process.env[config.rds.password_env] ?? ""}@${config.rds.host}:${config.rds.port ?? 5432}/economy?sslmode=require`;
+  const cloud = await getCloudPg();
   const local = new SqliteAdapter(getDbPath());
-  const cloud = new PgAdapterAsync(connStr);
   process.stdout.write(chalk4.cyan("\u2192 Running PG migrations... "));
   for (const sql of PG_MIGRATIONS2) {
     await cloud.run(sql);
   }
   console.log(chalk4.green("\u2713"));
-  const tableList = opts.tables ? opts.tables.split(",").map((t) => t.trim()) : ["requests", "sessions", "projects", "budgets", "goals", "model_pricing"];
+  const tableList = opts.tables ? opts.tables.split(",").map((t) => t.trim()) : CLOUD_TABLES;
   process.stdout.write(chalk4.cyan(`\u2192 Pushing ${tableList.join(", ")}... `));
   const results = await syncPush(local, cloud, { tables: tableList });
   const totalRows = results.reduce((s, r) => s + r.rowsWritten, 0);
@@ -2886,22 +2896,16 @@ cloudCmd.command("push").description("Push local economy data to cloud PostgreSQ
 \u2713 Push complete from ${getMachineId()}`));
 });
 cloudCmd.command("pull").description("Pull cloud PostgreSQL data to local").option("--tables <tables>", "Comma-separated table names (default: all)").action(async (opts) => {
-  const { syncPull, PgAdapterAsync, getCloudConfig, SqliteAdapter } = await import("@hasna/cloud");
+  const { syncPull, SqliteAdapter } = await import("@hasna/cloud");
   const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
-  const config = getCloudConfig();
-  if (!config.rds?.host) {
-    console.error(chalk4.red("Cloud not configured. Set RDS host in ~/.hasna/cloud.json"));
-    process.exit(1);
-  }
-  const connStr = `postgresql://${config.rds.username}:${process.env[config.rds.password_env] ?? ""}@${config.rds.host}:${config.rds.port ?? 5432}/economy?sslmode=require`;
+  const cloud = await getCloudPg();
   const local = new SqliteAdapter(getDbPath());
-  const cloud = new PgAdapterAsync(connStr);
   process.stdout.write(chalk4.cyan("\u2192 Running PG migrations... "));
   for (const sql of PG_MIGRATIONS2) {
     await cloud.run(sql);
   }
   console.log(chalk4.green("\u2713"));
-  const tableList = opts.tables ? opts.tables.split(",").map((t) => t.trim()) : ["requests", "sessions", "projects", "budgets", "goals", "model_pricing"];
+  const tableList = opts.tables ? opts.tables.split(",").map((t) => t.trim()) : CLOUD_TABLES;
   process.stdout.write(chalk4.cyan(`\u2192 Pulling ${tableList.join(", ")}... `));
   const results = await syncPull(cloud, local, { tables: tableList });
   const totalRows = results.reduce((s, r) => s + r.rowsWritten, 0);
@@ -2911,90 +2915,44 @@ cloudCmd.command("pull").description("Pull cloud PostgreSQL data to local").opti
   console.log(chalk4.bold.green(`
 \u2713 Pull complete to ${getMachineId()}`));
 });
-cloudCmd.command("sync").description("Full sync: ingest local, then merge data from all reachable machines via SSH").option("--machines <list>", "Comma-separated machine hostnames (default: spark01,apple01,apple03)").action(async (opts) => {
-  const thisMachine = getMachineId();
-  console.log(chalk4.bold.cyan(`  Cloud Sync \u2014 ${thisMachine}
+cloudCmd.command("sync").description("Full sync: ingest local \u2192 push to cloud \u2192 pull from cloud").action(async () => {
+  console.log(chalk4.bold.cyan(`  Cloud Sync \u2014 ${getMachineId()}
 `));
   process.stdout.write(chalk4.cyan("\u2192 Ingesting local data... "));
   await autoSync();
   console.log(chalk4.green("\u2713"));
-  const allMachines = (opts.machines ?? "spark01,apple01,apple03").split(",").map((m) => m.trim());
-  const remoteMachines = allMachines.filter((m) => m !== thisMachine);
-  const db = openDatabase();
-  const { existsSync: existsSync8, mkdirSync: mkdirSync4, unlinkSync } = await import("fs");
-  const { join: join9 } = await import("path");
-  const { execSync: exec } = await import("child_process");
-  const tmpDir = join9(process.env["TMPDIR"] ?? "/tmp", "economy-sync");
-  mkdirSync4(tmpDir, { recursive: true });
-  const isLinux = process.platform === "linux";
-  const remoteDbPath = isLinux ? ".hasna/economy/economy.db" : ".hasna/economy/economy.db";
-  for (const machine of remoteMachines) {
-    const localCopy = join9(tmpDir, `${machine}.db`);
-    process.stdout.write(chalk4.cyan(`\u2192 Fetching from ${machine}... `));
-    try {
-      exec(`scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no ${machine}:~/${remoteDbPath} "${localCopy}" 2>/dev/null`, { timeout: 30000 });
-      if (!existsSync8(localCopy)) {
-        console.log(chalk4.yellow("skipped (no file)"));
-        continue;
-      }
-      const { SqliteAdapter } = await import("@hasna/cloud");
-      const remoteDb = new SqliteAdapter(localCopy);
-      remoteDb.exec("PRAGMA busy_timeout = 5000");
-      const sessions = remoteDb.prepare("SELECT * FROM sessions").all();
-      let sCount = 0;
-      for (const s of sessions) {
-        const existing = db.prepare("SELECT id FROM sessions WHERE id = ?").get(s["id"]);
-        if (!existing) {
-          db.prepare(`INSERT OR IGNORE INTO sessions (id, agent, project_path, project_name, started_at, ended_at, total_cost_usd, total_tokens, request_count, machine_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(s["id"], s["agent"], s["project_path"], s["project_name"], s["started_at"], s["ended_at"], s["total_cost_usd"], s["total_tokens"], s["request_count"], s["machine_id"] || machine);
-          sCount++;
-        }
-      }
-      let rCount = 0;
-      try {
-        const cols = remoteDb.prepare("PRAGMA table_info(requests)").all();
-        const hasMachineCol = cols.some((c) => c.name === "machine_id");
-        const requests = remoteDb.prepare("SELECT * FROM requests").all();
-        for (const r of requests) {
-          const existing = db.prepare("SELECT id FROM requests WHERE id = ?").get(r["id"]);
-          if (!existing) {
-            db.prepare(`INSERT OR IGNORE INTO requests (id, agent, session_id, model, input_tokens, output_tokens, cache_read_tokens, cache_create_tokens, cost_usd, duration_ms, timestamp, source_request_id, machine_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(r["id"], r["agent"], r["session_id"], r["model"], r["input_tokens"], r["output_tokens"], r["cache_read_tokens"], r["cache_create_tokens"], r["cost_usd"], r["duration_ms"], r["timestamp"], r["source_request_id"], hasMachineCol ? r["machine_id"] || machine : machine);
-            rCount++;
-          }
-        }
-      } catch {}
-      remoteDb.close();
-      try {
-        unlinkSync(localCopy);
-      } catch {}
-      console.log(chalk4.green(`\u2713 ${sCount} sessions, ${rCount} requests`));
-    } catch (e) {
-      console.log(chalk4.yellow(`skipped (${e instanceof Error ? e.message.split(`
-`)[0] : "unreachable"})`));
-      try {
-        unlinkSync(localCopy);
-      } catch {}
-    }
+  const { syncPush, syncPull, SqliteAdapter } = await import("@hasna/cloud");
+  const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
+  const cloud = await getCloudPg();
+  const local = new SqliteAdapter(getDbPath());
+  for (const sql of PG_MIGRATIONS2) {
+    await cloud.run(sql);
   }
+  process.stdout.write(chalk4.cyan("\u2192 Pushing local \u2192 cloud... "));
+  const pushResults = await syncPush(local, cloud, { tables: CLOUD_TABLES });
+  console.log(chalk4.green(`\u2713 ${pushResults.reduce((s, r) => s + r.rowsWritten, 0)} rows`));
+  process.stdout.write(chalk4.cyan("\u2192 Pulling cloud \u2192 local... "));
+  const pullResults = await syncPull(cloud, local, { tables: CLOUD_TABLES });
+  console.log(chalk4.green(`\u2713 ${pullResults.reduce((s, r) => s + r.rowsWritten, 0)} rows`));
+  local.close();
+  await cloud.close();
   console.log(chalk4.bold.green(`
 \u2713 Cloud sync complete`));
 });
 cloudCmd.command("status").description("Check cloud connection status").action(async () => {
-  const { PgAdapterAsync, getCloudConfig } = await import("@hasna/cloud");
-  const config = getCloudConfig();
   console.log();
-  console.log(`  Mode: ${chalk4.white(config.mode)}`);
   console.log(`  Machine: ${chalk4.white(getMachineId())}`);
-  console.log(`  RDS Host: ${chalk4.white(config.rds?.host || "(not configured)")}`);
-  if (config.rds?.host && config.rds?.username) {
-    try {
-      const connStr = `postgresql://${config.rds.username}:${process.env[config.rds.password_env] ?? ""}@${config.rds.host}:${config.rds.port ?? 5432}/economy?sslmode=require`;
-      const pg = new PgAdapterAsync(connStr);
-      await pg.get("SELECT 1 as ok");
-      console.log(`  PostgreSQL: ${chalk4.green("connected")}`);
-      await pg.close();
-    } catch (err2) {
-      console.log(`  PostgreSQL: ${chalk4.red(`failed \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`)}`);
-    }
+  console.log(`  RDS Host: ${chalk4.white(CLOUD_RDS_HOST)}`);
+  console.log(`  Database: ${chalk4.white(CLOUD_RDS_DB)}`);
+  try {
+    const cloud = await getCloudPg();
+    await cloud.get("SELECT 1 as ok");
+    const tables = await cloud.all("SELECT tablename FROM pg_tables WHERE schemaname = 'public'");
+    console.log(`  PostgreSQL: ${chalk4.green("connected")}`);
+    console.log(`  Tables: ${chalk4.white(tables.map((t) => t.tablename).join(", ") || "(none)")}`);
+    await cloud.close();
+  } catch (err2) {
+    console.log(`  PostgreSQL: ${chalk4.red(`failed \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`)}`);
   }
   console.log();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini",
   "type": "module",
   "main": "dist/index.js",