@hasna/economy 0.2.11 → 0.2.13

package/dist/cli/index.js

@@ -109,8 +109,17 @@ var init_pricing = __esm(() => {
 // src/db/database.ts
 import { SqliteAdapter as Database } from "@hasna/cloud";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
+import { hostname } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function getMachineId() {
+  if (process.env["ECONOMY_MACHINE_ID"])
+    return process.env["ECONOMY_MACHINE_ID"];
+  const h = hostname().toLowerCase();
+  if (h.startsWith("spark") || h.startsWith("apple"))
+    return h.split(".")[0];
+  return h.split(".")[0];
+}
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
   const newDir = join(home, ".hasna", "economy");
@@ -143,6 +152,7 @@ function openDatabase(dbPath, skipSeed = false) {
   }
   const db = new Database(path);
   db.exec("PRAGMA journal_mode = WAL");
+  db.exec("PRAGMA busy_timeout = 5000");
   db.exec("PRAGMA foreign_keys = ON");
   initSchema(db);
   if (!skipSeed) {
@@ -164,7 +174,8 @@ function initSchema(db) {
       cost_usd REAL NOT NULL DEFAULT 0,
       duration_ms INTEGER DEFAULT 0,
       timestamp TEXT NOT NULL,
-      source_request_id TEXT
+      source_request_id TEXT,
+      machine_id TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS sessions (
@@ -176,7 +187,8 @@ function initSchema(db) {
       ended_at TEXT,
       total_cost_usd REAL DEFAULT 0,
       total_tokens INTEGER DEFAULT 0,
-      request_count INTEGER DEFAULT 0
+      request_count INTEGER DEFAULT 0,
+      machine_id TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS projects (
@@ -242,6 +254,15 @@ function initSchema(db) {
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
   `);
+  const cols = db.prepare(`PRAGMA table_info(requests)`).all();
+  if (!cols.some((c) => c.name === "machine_id")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN machine_id TEXT DEFAULT ''`);
+    db.exec(`ALTER TABLE sessions ADD COLUMN machine_id TEXT DEFAULT ''`);
+  }
+  db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id);
+    CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
+  `);
 }
 function periodWhere(period) {
   switch (period) {
@@ -280,17 +301,17 @@ function upsertRequest(db, req) {
     INSERT OR REPLACE 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)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cost_usd, req.duration_ms, req.timestamp, req.source_request_id);
+       timestamp, source_request_id, machine_id)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cost_usd, req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "");
 }
 function upsertSession(db, session) {
   db.prepare(`
     INSERT OR REPLACE INTO sessions
       (id, agent, project_path, project_name, started_at, ended_at,
-       total_cost_usd, total_tokens, request_count)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count);
+       total_cost_usd, total_tokens, request_count, machine_id)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -320,6 +341,10 @@ function querySessions(db, filter = {}) {
     conditions.push("started_at >= ?");
     params.push(filter.since);
   }
+  if (filter.machine) {
+    conditions.push("machine_id = ?");
+    params.push(filter.machine);
+  }
   if (filter.search) {
     const q = `%${filter.search}%`;
     conditions.push("(project_name LIKE ? OR agent LIKE ? OR id LIKE ?)");
@@ -338,24 +363,25 @@ function queryTopSessions(db, n = 10, agent) {
   }
   return db.prepare(`SELECT * FROM sessions ORDER BY total_cost_usd DESC LIMIT ?`).all(n);
 }
-function querySummary(db, period) {
+function querySummary(db, period, machine) {
   const rWhere = periodWhere(period);
   const sWhere = sessionPeriodWhere(period);
+  const machineClause = machine ? ` AND machine_id = '${machine.replace(/'/g, "''")}'` : "";
   const r = db.prepare(`
     SELECT COALESCE(SUM(cost_usd), 0) as total_usd,
            COUNT(*) as requests,
            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as tokens
-    FROM requests WHERE ${rWhere}
+    FROM requests WHERE ${rWhere}${machineClause}
   `).get();
   const codexTotals = db.prepare(`
     SELECT COALESCE(SUM(total_cost_usd), 0) as cost_usd,
            COALESCE(SUM(total_tokens), 0) as tokens,
            COUNT(*) as sessions
     FROM sessions
-    WHERE ${sWhere}
+    WHERE ${sWhere}${machineClause}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
   `).get();
-  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}`).get();
+  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}${machineClause}`).get();
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
     requests: r.requests,
@@ -509,6 +535,20 @@ function setIngestState(db, source, key, value) {
 function queryRequestsSince(db, since) {
   return db.prepare(`SELECT * FROM requests WHERE timestamp > ? ORDER BY timestamp ASC`).all(since);
 }
+function listMachines(db) {
+  return db.prepare(`
+    SELECT
+      s.machine_id,
+      COUNT(DISTINCT s.id) as sessions,
+      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.machine_id = s.machine_id), 0) as requests,
+      COALESCE(SUM(s.total_cost_usd), 0) as total_cost_usd,
+      MAX(s.started_at) as last_active
+    FROM sessions s
+    WHERE s.machine_id != ''
+    GROUP BY s.machine_id
+    ORDER BY total_cost_usd DESC
+  `).all();
+}
 function upsertModelPricing(db, p) {
   db.prepare(`
     INSERT OR REPLACE INTO model_pricing
@@ -569,29 +609,36 @@ function collectJsonlFiles(projectDir) {
   return files;
 }
 async function ingestClaude(db, verbose = false, _telemetryDir) {
-  if (!existsSync3(PROJECTS_DIR)) {
+  return ingestJsonlProjects(db, CLAUDE_PROJECTS_DIR, "claude", verbose);
+}
+async function ingestTakumi(db, verbose = false) {
+  return ingestJsonlProjects(db, TAKUMI_PROJECTS_DIR, "takumi", verbose);
+}
+async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false) {
+  if (!existsSync3(projectsDir)) {
     if (verbose)
-      console.log("Claude projects dir not found:", PROJECTS_DIR);
+      console.log(`${agentName} projects dir not found:`, projectsDir);
     return { files: 0, requests: 0, sessions: 0 };
   }
+  const machineId = getMachineId();
   let totalFiles = 0;
   let totalRequests = 0;
   const touchedSessions = new Set;
   const registeredProjects = db.prepare(`SELECT path, name FROM projects ORDER BY LENGTH(path) DESC`).all();
-  const projectDirs = readdirSync2(PROJECTS_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
+  const projectDirs = readdirSync2(projectsDir, { withFileTypes: true }).filter((d) => d.isDirectory());
   for (const projectDirEntry of projectDirs) {
-    const projectDirPath = join4(PROJECTS_DIR, projectDirEntry.name);
+    const projectDirPath = join4(projectsDir, projectDirEntry.name);
     const projectPath = dirNameToPath(projectDirEntry.name);
     const jsonlFiles = collectJsonlFiles(projectDirPath);
     for (const filePath of jsonlFiles) {
-      const stateKey = filePath.replace(PROJECTS_DIR, "");
+      const stateKey = filePath.replace(projectsDir, "");
       let fileMtime = "0";
       try {
         fileMtime = statSync2(filePath).mtimeMs.toString();
       } catch {
         continue;
       }
-      const processed = getIngestState(db, "claude", stateKey);
+      const processed = getIngestState(db, agentName, stateKey);
       if (processed === fileMtime)
         continue;
       let lines;
@@ -632,10 +679,10 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
         if (inputTokens + outputTokens + cacheWriteTokens === 0)
           continue;
         const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
-        const reqId = `claude-${sessionId}-${timestamp}`;
+        const reqId = `${agentName}-${sessionId}-${timestamp}`;
         upsertRequest(db, {
           id: reqId,
-          agent: "claude",
+          agent: agentName,
           session_id: sessionId,
           model,
           input_tokens: inputTokens,
@@ -645,7 +692,8 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
           cost_usd: costUsd,
           duration_ms: 0,
           timestamp,
-          source_request_id: reqId
+          source_request_id: reqId,
+          machine_id: machineId
         });
         if (!touchedSessions.has(sessionId)) {
           const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
@@ -654,14 +702,15 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
             const detectedProject = autoDetectProject(effectiveCwd, registeredProjects);
             const session = {
               id: sessionId,
-              agent: "claude",
+              agent: agentName,
               project_path: detectedProject ? detectedProject.path : effectiveCwd,
               project_name: detectedProject ? detectedProject.name : "",
               started_at: timestamp,
               ended_at: null,
               total_cost_usd: 0,
               total_tokens: 0,
-              request_count: 0
+              request_count: 0,
+              machine_id: machineId
             };
             upsertSession(db, session);
           }
@@ -669,7 +718,7 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
         }
         totalRequests++;
       }
-      setIngestState(db, "claude", stateKey, fileMtime);
+      setIngestState(db, agentName, stateKey, fileMtime);
       totalFiles++;
     }
   }
@@ -678,11 +727,12 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
   }
   return { files: totalFiles, requests: totalRequests, sessions: touchedSessions.size };
 }
-var PROJECTS_DIR;
+var CLAUDE_PROJECTS_DIR, TAKUMI_PROJECTS_DIR;
 var init_claude = __esm(() => {
   init_database();
   init_pricing();
-  PROJECTS_DIR = join4(homedir2(), ".claude", "projects");
+  CLAUDE_PROJECTS_DIR = join4(homedir2(), ".claude", "projects");
+  TAKUMI_PROJECTS_DIR = join4(homedir2(), ".takumi", "projects");
 });
 
 // src/ingest/codex.ts
@@ -696,6 +746,7 @@ async function ingestCodex(db, verbose = false) {
       console.log("Codex DB not found:", CODEX_DB_PATH);
     return { sessions: 0 };
   }
+  const machineId = getMachineId();
   let codexDb = null;
   let ingested = 0;
   try {
@@ -720,7 +771,8 @@ async function ingestCodex(db, verbose = false) {
         ended_at: endedAt,
         total_cost_usd: costUsd,
         total_tokens: thread.tokens_used,
-        request_count: 1
+        request_count: 1,
+        machine_id: machineId
       });
       setIngestState(db, "codex", stateKey, "done");
       ingested++;
@@ -749,6 +801,7 @@ async function ingestGemini(db, verbose) {
       console.log("Gemini tmp dir not found:", GEMINI_TMP_DIR);
     return { sessions: 0 };
   }
+  const machineId = getMachineId();
   let totalSessions = 0;
   const touchedSessions = new Set;
   let projectHashDirs = [];
@@ -799,7 +852,8 @@ async function ingestGemini(db, verbose) {
           ended_at: chatData.lastUpdated ?? null,
           total_cost_usd: 0,
           total_tokens: 0,
-          request_count: 0
+          request_count: 0,
+          machine_id: machineId
         };
         upsertSession(db, session);
         touchedSessions.add(sessionId);
@@ -1072,7 +1126,11 @@ function createHandler(db) {
       return ok({ status: "ok", ts: new Date().toISOString() });
     if (path === "/api/summary" && method === "GET") {
       const period = url.searchParams.get("period") ?? "today";
-      return ok(querySummary(db, period));
+      const machine = url.searchParams.get("machine") ?? undefined;
+      return ok(querySummary(db, period, machine));
+    }
+    if (path === "/api/machines" && method === "GET") {
+      return ok(listMachines(db), { current_machine: getMachineId() });
     }
     if (path === "/api/daily" && method === "GET") {
       const days = Number(url.searchParams.get("days") ?? 30);
@@ -1082,6 +1140,7 @@ function createHandler(db) {
       const agent = url.searchParams.get("agent");
       const project = url.searchParams.get("project") ?? undefined;
       const search = url.searchParams.get("search") ?? undefined;
+      const machine = url.searchParams.get("machine") ?? undefined;
       const limit = Number(url.searchParams.get("limit") ?? 50);
       const offset = Number(url.searchParams.get("offset") ?? 0);
       const since = url.searchParams.get("since") ?? undefined;
@@ -1091,6 +1150,7 @@ function createHandler(db) {
         agent: agent ?? undefined,
         project,
         search,
+        machine,
         limit,
         offset,
         since
@@ -1183,6 +1243,8 @@ function createHandler(db) {
       const results = {};
       if (sources === "all" || sources === "claude")
         results["claude"] = await ingestClaude(db);
+      if (sources === "all" || sources === "takumi")
+        results["takumi"] = await ingestTakumi(db);
       if (sources === "all" || sources === "codex")
         results["codex"] = await ingestCodex(db);
       if (sources === "all" || sources === "gemini")
@@ -1397,6 +1459,102 @@ function menubarStop() {
 var APP_PATH = "/Applications/Economy Bar.app", REPO = "hasna/open-economy";
 var init_menubar = () => {};
 
+// src/db/pg-migrations.ts
+var exports_pg_migrations = {};
+__export(exports_pg_migrations, {
+  PG_MIGRATIONS: () => PG_MIGRATIONS
+});
+var PG_MIGRATIONS;
+var init_pg_migrations = __esm(() => {
+  PG_MIGRATIONS = [
+    `CREATE TABLE IF NOT EXISTS requests (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    session_id TEXT NOT NULL,
+    model TEXT NOT NULL,
+    input_tokens INTEGER DEFAULT 0,
+    output_tokens INTEGER DEFAULT 0,
+    cache_read_tokens INTEGER DEFAULT 0,
+    cache_create_tokens INTEGER DEFAULT 0,
+    cost_usd REAL NOT NULL DEFAULT 0,
+    duration_ms INTEGER DEFAULT 0,
+    timestamp TEXT NOT NULL,
+    source_request_id TEXT,
+    machine_id TEXT DEFAULT ''
+  )`,
+    `CREATE TABLE IF NOT EXISTS sessions (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    project_path TEXT DEFAULT '',
+    project_name TEXT DEFAULT '',
+    started_at TEXT NOT NULL,
+    ended_at TEXT,
+    total_cost_usd REAL DEFAULT 0,
+    total_tokens INTEGER DEFAULT 0,
+    request_count INTEGER DEFAULT 0,
+    machine_id TEXT DEFAULT ''
+  )`,
+    `CREATE TABLE IF NOT EXISTS projects (
+    id TEXT PRIMARY KEY,
+    path TEXT UNIQUE NOT NULL,
+    name TEXT NOT NULL,
+    description TEXT,
+    tags TEXT DEFAULT '[]',
+    created_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS budgets (
+    id TEXT PRIMARY KEY,
+    project_path TEXT,
+    agent TEXT,
+    period TEXT NOT NULL,
+    limit_usd REAL NOT NULL,
+    alert_at_percent INTEGER DEFAULT 80,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS goals (
+    id TEXT PRIMARY KEY,
+    period TEXT NOT NULL,
+    project_path TEXT,
+    agent TEXT,
+    limit_usd REAL NOT NULL,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS ingest_state (
+    source TEXT NOT NULL,
+    key TEXT NOT NULL,
+    value TEXT NOT NULL,
+    PRIMARY KEY (source, key)
+  )`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_session ON requests(session_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_timestamp ON requests(timestamp)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_agent ON requests(agent)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_path)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_started ON sessions(started_at)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id)`,
+    `CREATE TABLE IF NOT EXISTS model_pricing (
+    model TEXT PRIMARY KEY,
+    input_per_1m REAL NOT NULL DEFAULT 0,
+    output_per_1m REAL NOT NULL DEFAULT 0,
+    cache_read_per_1m REAL NOT NULL DEFAULT 0,
+    cache_write_per_1m REAL NOT NULL DEFAULT 0,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS feedback (
+    id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
+    message TEXT NOT NULL,
+    email TEXT,
+    category TEXT DEFAULT 'general',
+    version TEXT,
+    machine_id TEXT,
+    created_at TEXT NOT NULL DEFAULT NOW()::text
+  )`
+  ];
+});
+
 // src/cli/index.ts
 import { Command } from "commander";
 import chalk4 from "chalk";
@@ -1783,6 +1941,7 @@ async function autoSync() {
   const db = openDatabase();
   ensurePricingSeeded(db);
   await ingestClaude(db);
+  await ingestTakumi(db);
   await ingestCodex(db);
   await ingestGemini(db);
 }
@@ -1895,7 +2054,7 @@ program.action(async () => {
   }
   console.log();
 });
-program.command("sync").description("Ingest cost data from Claude Code, Codex, and Gemini").option("--claude", "Only ingest Claude Code telemetry").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").action(async (opts) => {
+program.command("sync").description("Ingest cost data from Claude Code, Codex, and Gemini").option("--claude", "Only ingest Claude Code telemetry").option("--takumi", "Only ingest Takumi sessions").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").option("--backfill-machine", "Tag existing records that have no machine_id with current hostname").action(async (opts) => {
   const db = openDatabase();
   ensurePricingSeeded(db);
   if (opts.force) {
@@ -1903,8 +2062,9 @@ program.command("sync").description("Ingest cost data from Claude Code, Codex, a
     if (opts.verbose)
       console.log(chalk4.dim("Cleared ingest cache"));
   }
-  const anySpecific = opts.claude || opts.codex || opts.gemini;
+  const anySpecific = opts.claude || opts.takumi || opts.codex || opts.gemini;
   const doClaude = opts.claude || !anySpecific;
+  const doTakumi = opts.takumi || !anySpecific;
   const doCodex = opts.codex || !anySpecific;
   const doGemini = opts.gemini || !anySpecific;
   if (doClaude) {
@@ -1912,6 +2072,11 @@ program.command("sync").description("Ingest cost data from Claude Code, Codex, a
     const r = await ingestClaude(db, opts.verbose);
     console.log(chalk4.green(`\u2713 ${r.files} files, ${r.requests} requests, ${r.sessions} sessions`));
   }
+  if (doTakumi) {
+    process.stdout.write(chalk4.cyan("\u2192 Ingesting Takumi sessions... "));
+    const r = await ingestTakumi(db, opts.verbose);
+    console.log(chalk4.green(`\u2713 ${r.files} files, ${r.requests} requests, ${r.sessions} sessions`));
+  }
   if (doCodex) {
     process.stdout.write(chalk4.cyan("\u2192 Ingesting Codex sessions... "));
     const r = await ingestCodex(db, opts.verbose);
@@ -1922,6 +2087,12 @@ program.command("sync").description("Ingest cost data from Claude Code, Codex, a
     const r = await ingestGemini(db, opts.verbose);
     console.log(chalk4.green(`\u2713 ${r.sessions} sessions`));
   }
+  if (opts.backfillMachine) {
+    const machine = getMachineId();
+    const reqCount = db.prepare(`UPDATE requests SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+    const sessCount = db.prepare(`UPDATE sessions SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+    console.log(chalk4.cyan(`\u2192 Backfilled machine_id='${machine}': ${reqCount.changes} requests, ${sessCount.changes} sessions`));
+  }
   try {
     const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
     await checkAndFireWebhooks2(db);
@@ -1941,13 +2112,14 @@ program.command("month").description("Cost summary for this month").action(async
   await autoSync();
   printSummary("This Month", "month");
 });
-program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|codex)").option("--project <path>", "Filter by project path").option("--limit <n>", "Number of sessions", "20").option("--format <fmt>", "Output format: table|compact|csv|json", "table").option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").option("--search <query>", "Search by project name, session id prefix, or agent").action(async (opts) => {
+program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|codex)").option("--project <path>", "Filter by project path").option("--machine <id>", "Filter by machine hostname (e.g. spark01, apple01)").option("--limit <n>", "Number of sessions", "20").option("--format <fmt>", "Output format: table|compact|csv|json", "table").option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").option("--search <query>", "Search by project name, session id prefix, or agent").action(async (opts) => {
   await autoSync();
   const db = openDatabase();
   const sinceDate = opts.since ? parseSinceDate(opts.since) : undefined;
   let sessions = querySessions(db, {
     agent: opts.agent,
     project: opts.project,
+    machine: opts.machine,
     limit: Number(opts.limit ?? 20),
     since: sinceDate,
     search: opts.search
@@ -2396,6 +2568,29 @@ program.command("session <id>").description("Show detailed breakdown of a single
   }
   console.log();
 });
+program.command("machines").description("List all machines that have synced data").action(async () => {
+  await autoSync();
+  const db = openDatabase();
+  const machines = listMachines(db);
+  const current = getMachineId();
+  if (machines.length === 0) {
+    console.log(chalk4.yellow(`No machine data yet. Current machine: ${current}`));
+    return;
+  }
+  console.log();
+  console.log(chalk4.bold.cyan("  Machines"));
+  console.log();
+  printTable(["Machine", "Sessions", "Requests", "Cost", "Last Active"], machines.map((m) => [
+    m.machine_id === current ? chalk4.green(`${m.machine_id} (this)`) : chalk4.white(m.machine_id),
+    fmtCount(m.sessions),
+    fmtCount(m.requests),
+    fmt2(m.total_cost_usd),
+    chalk4.dim(m.last_active?.substring(0, 16) ?? "\u2014")
+  ]));
+  console.log(`
+  ${chalk4.dim("Current machine:")} ${chalk4.bold(current)}`);
+  console.log();
+});
 program.command("export").description("Export data as CSV").option("--type <type>", "Data type: sessions or requests", "sessions").option("--period <period>", "Period: today|week|month|all", "month").option("--output <file>", "Output file path (default: stdout)").action(async (opts) => {
   await autoSync();
   const db = openDatabase();
@@ -2663,5 +2858,145 @@ program.command("remove <type> <id>").alias("rm").description("Remove a record.
     process.exit(1);
   }
 });
+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 { 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 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"];
+  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);
+  console.log(chalk4.green(`\u2713 ${totalRows} rows across ${tableList.length} tables`));
+  local.close();
+  await cloud.close();
+  console.log(chalk4.bold.green(`
+\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 { 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 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"];
+  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);
+  console.log(chalk4.green(`\u2713 ${totalRows} rows across ${tableList.length} tables`));
+  local.close();
+  await cloud.close();
+  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}
+`));
+  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 {}
+    }
+  }
+  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();
+});
 registerBrainsCommand(program);
 program.parse();