@hasna/economy 0.3.7 → 0.3.8

package/dist/cli/index.js

@@ -17,6 +17,62 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
+// src/db/sqlite-adapter.ts
+import { Database } from "bun:sqlite";
+
+class SqliteAdapter {
+  db;
+  constructor(path) {
+    this.db = new Database(path, { create: true });
+    this.db.exec("PRAGMA journal_mode=WAL");
+    this.db.exec("PRAGMA foreign_keys=ON");
+  }
+  run(sql, ...params) {
+    const result = this.db.prepare(sql).run(...params);
+    return { changes: result.changes, lastInsertRowid: result.lastInsertRowid };
+  }
+  get(sql, ...params) {
+    return this.db.prepare(sql).get(...params);
+  }
+  all(sql, ...params) {
+    return this.db.prepare(sql).all(...params);
+  }
+  exec(sql) {
+    this.db.exec(sql);
+  }
+  query(sql) {
+    return this.db.query(sql);
+  }
+  prepare(sql) {
+    const stmt = this.db.prepare(sql);
+    return {
+      run(...params) {
+        const r = stmt.run(...params);
+        return { changes: r.changes, lastInsertRowid: r.lastInsertRowid };
+      },
+      get(...params) {
+        return stmt.get(...params);
+      },
+      all(...params) {
+        return stmt.all(...params);
+      },
+      finalize() {
+        stmt.finalize();
+      }
+    };
+  }
+  close() {
+    this.db.close();
+  }
+  transaction(fn) {
+    return this.db.transaction(fn)();
+  }
+  get raw() {
+    return this.db;
+  }
+}
+var init_sqlite_adapter = () => {};
+
 // src/lib/pricing.ts
 var exports_pricing = {};
 __export(exports_pricing, {
@@ -596,7 +652,6 @@ __export(exports_database, {
   clearBillingRange: () => clearBillingRange,
   bulkIngest: () => bulkIngest
 });
-import { SqliteAdapter as Database } from "@hasna/cloud";
 import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
 import { hostname, platform } from "os";
@@ -689,7 +744,7 @@ function openDatabase(dbPath, skipSeed = false) {
       mkdirSync(dir, { recursive: true });
   }
   const db = withSqliteBusyRetry(() => {
-    const opened = new Database(path);
+    const opened = new SqliteAdapter(path);
     try {
       opened.exec("PRAGMA busy_timeout = 10000");
       opened.exec("PRAGMA journal_mode = WAL");
@@ -1295,9 +1350,12 @@ function labelForPath(projectPath, projectName) {
 function groupKeyForPath(projectPath, projectName) {
   return labelForPath(projectPath, projectName).trim().toLowerCase();
 }
-function queryProjectBreakdown(db, period = "all", machine) {
-  const requestWhere = requestPeriodWhere(period);
-  const sessionWhere = sessionPeriodWhere(period);
+function laterTimestamp(current, candidate) {
+  if (!candidate)
+    return current;
+  return candidate > current ? candidate : current;
+}
+function queryProjectBreakdownScoped(db, requestWhere, sessionWhere, requestScopeParams = [], sessionScopeParams = [], machine) {
   const sessionMachineClause = machine ? " AND (machine_id = ? OR id IN (SELECT DISTINCT session_id FROM requests WHERE machine_id = ?))" : "";
   const requestMachineClause = machine ? " AND machine_id = ?" : "";
   const sessionMachineParams = machine ? [machine, machine] : [];
@@ -1305,67 +1363,89 @@ function queryProjectBreakdown(db, period = "all", machine) {
   const sessionOnlyMachineClause = machine ? " AND machine_id = ?" : "";
   const sessionOnlyMachineParams = machine ? [machine] : [];
   const sessions = db.prepare(`
-    SELECT id, project_path, project_name, total_cost_usd, started_at
+    SELECT id, project_path, project_name
     FROM sessions
     WHERE (project_path != '' OR project_name != '')${sessionMachineClause}
   `).all(...sessionMachineParams);
   const groups = new Map;
+  const groupKeyBySession = new Map;
   for (const s of sessions) {
     const label = labelForPath(s.project_path, s.project_name);
     if (!label)
       continue;
     const key = groupKeyForPath(s.project_path, s.project_name);
-    const g = groups.get(key) ?? { label, sessionIds: [], samplePath: s.project_path };
-    g.sessionIds.push(s.id);
+    const g = groups.get(key) ?? { label, samplePath: s.project_path, sessions: 0, requests: 0, total_tokens: 0, cost_usd: 0, last_active: "" };
     if (!g.samplePath)
       g.samplePath = s.project_path;
     groups.set(key, g);
+    groupKeyBySession.set(s.id, key);
+  }
+  const groupFor = (sessionId) => {
+    const key = groupKeyBySession.get(sessionId);
+    return key === undefined ? undefined : groups.get(key);
+  };
+  const requestRows = db.prepare(`
+    SELECT session_id,
+           COUNT(*) as requests,
+           COALESCE(SUM(cost_usd), 0) as cost_usd,
+           COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+           MAX(timestamp) as last_active
+    FROM requests
+    WHERE ${requestWhere}${requestMachineClause}
+    GROUP BY session_id
+  `).all(...requestScopeParams, ...requestMachineParams);
+  for (const row of requestRows) {
+    const g = groupFor(row.session_id);
+    if (!g)
+      continue;
+    g.sessions += 1;
+    g.requests += row.requests;
+    g.cost_usd += row.cost_usd;
+    g.total_tokens += row.total_tokens;
+    g.last_active = laterTimestamp(g.last_active, row.last_active);
+  }
+  const sessionsWithRequests = new Set(db.prepare(`SELECT DISTINCT session_id FROM requests`).all().map((row) => row.session_id));
+  const sessionOnlyRows = db.prepare(`
+    SELECT id,
+           COALESCE(request_count, 0) as request_count,
+           COALESCE(total_tokens, 0) as total_tokens,
+           COALESCE(total_cost_usd, 0) as total_cost_usd,
+           started_at
+    FROM sessions
+    WHERE ${sessionWhere}${sessionOnlyMachineClause}
+  `).all(...sessionScopeParams, ...sessionOnlyMachineParams);
+  for (const row of sessionOnlyRows) {
+    if (sessionsWithRequests.has(row.id))
+      continue;
+    const g = groupFor(row.id);
+    if (!g)
+      continue;
+    g.sessions += 1;
+    g.requests += row.request_count;
+    g.total_tokens += row.total_tokens;
+    g.cost_usd += row.total_cost_usd;
+    g.last_active = laterTimestamp(g.last_active, row.started_at);
   }
   const result = [];
   for (const g of groups.values()) {
-    const placeholders = g.sessionIds.map(() => "?").join(",");
-    const reqStats = placeholders.length ? db.prepare(`
-          SELECT
-            COUNT(DISTINCT session_id) as sessions,
-            COUNT(*) as requests,
-            COALESCE(SUM(cost_usd), 0) as cost_usd,
-            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
-            MAX(timestamp) as last_active
-          FROM requests
-          WHERE session_id IN (${placeholders})
-            AND ${requestWhere}
-            ${requestMachineClause}
-        `).get(...g.sessionIds, ...requestMachineParams) : { sessions: 0, requests: 0, cost_usd: 0, total_tokens: 0, last_active: null };
-    const sessionOnlyStats = placeholders.length ? db.prepare(`
-          SELECT
-            COUNT(*) as sessions,
-            COALESCE(SUM(request_count), 0) as requests,
-            COALESCE(SUM(total_tokens), 0) as total_tokens,
-            COALESCE(SUM(total_cost_usd), 0) as cost_usd,
-            MAX(started_at) as last_active
-          FROM sessions
-          WHERE id IN (${placeholders})
-            AND ${sessionWhere}
-            ${sessionOnlyMachineClause}
-            AND id NOT IN (SELECT DISTINCT session_id FROM requests)
-        `).get(...g.sessionIds, ...sessionOnlyMachineParams) : { sessions: 0, requests: 0, total_tokens: 0, cost_usd: 0, last_active: null };
-    const totalSessions = reqStats.sessions + sessionOnlyStats.sessions;
-    if (totalSessions === 0)
+    if (g.sessions === 0)
       continue;
-    const lastActive = [reqStats.last_active, sessionOnlyStats.last_active].filter(Boolean).sort().at(-1) ?? "";
     result.push({
       project_path: g.samplePath,
       project_name: g.label,
-      sessions: totalSessions,
-      requests: reqStats.requests + sessionOnlyStats.requests,
-      total_tokens: reqStats.total_tokens + sessionOnlyStats.total_tokens,
-      cost_usd: reqStats.cost_usd + sessionOnlyStats.cost_usd,
-      last_active: lastActive
+      sessions: g.sessions,
+      requests: g.requests,
+      total_tokens: g.total_tokens,
+      cost_usd: g.cost_usd,
+      last_active: g.last_active
     });
   }
   result.sort((a, b) => b.cost_usd - a.cost_usd);
   return result;
 }
+function queryProjectBreakdown(db, period = "all", machine) {
+  return queryProjectBreakdownScoped(db, requestPeriodWhere(period), sessionPeriodWhere(period), [], [], machine);
+}
 function normalizeAccountEmail(email) {
   return (email ?? "").trim().toLowerCase();
 }
@@ -1639,17 +1719,8 @@ function queryCostCenterBreakdown(db, period = "all", filter = {}) {
   filtered.sort((a, b) => b.cost_usd - a.cost_usd);
   return filtered;
 }
-function queryProjectBreakdownSince(db, since) {
-  return db.prepare(`
-    SELECT project_path, project_name,
-           COUNT(*) as sessions,
-           COALESCE(SUM(total_tokens), 0) as total_tokens,
-           COALESCE(SUM(request_count), 0) as requests,
-           COALESCE(SUM(total_cost_usd), 0) as cost_usd,
-           MAX(started_at) as last_active
-    FROM sessions WHERE started_at >= ?
-    GROUP BY project_path ORDER BY cost_usd DESC
-  `).all(since);
+function queryProjectBreakdownSince(db, since, machine) {
+  return queryProjectBreakdownScoped(db, "timestamp >= ?", "started_at >= ?", [since], [since], machine);
 }
 function queryAgentBreakdownSince(db, since) {
   return db.prepare(`
@@ -2353,7 +2424,9 @@ var numOr = (v, d = 0) => {
   const num = Number(v);
   return Number.isFinite(num) ? num : d;
 }, strOr = (v, d = "") => v == null ? d : String(v);
-var init_database = () => {};
+var init_database = __esm(() => {
+  init_sqlite_adapter();
+});
 
 // src/lib/package-metadata.ts
 import { readFileSync } from "fs";
@@ -3833,7 +3906,7 @@ class LocalStore {
     return query.since ? queryAgentBreakdownSince(this.db(), query.since) : queryAgentBreakdown(this.db(), query.period ?? "all", query.machine);
   }
   async projectBreakdown(query = {}) {
-    return query.since ? queryProjectBreakdownSince(this.db(), query.since) : queryProjectBreakdown(this.db(), query.period ?? "all", query.machine);
+    return query.since ? queryProjectBreakdownSince(this.db(), query.since, query.machine) : queryProjectBreakdown(this.db(), query.period ?? "all", query.machine);
   }
   async accountBreakdown(query = {}) {
     return query.since ? queryAccountBreakdownSince(this.db(), query.since) : queryAccountBreakdown(this.db(), query.period ?? "all", query.machine);
@@ -4029,7 +4102,7 @@ class ApiStore {
     return cloudListItems(this.cloud, "breakdown", q({ by: "agent", period: query.period, since: query.since }));
   }
   async projectBreakdown(query = {}) {
-    return cloudListItems(this.cloud, "breakdown", q({ by: "project", period: query.period, since: query.since }));
+    return cloudListItems(this.cloud, "breakdown", q({ by: "project", period: query.period, since: query.since, machine: query.machine }));
   }
   async accountBreakdown(query = {}) {
     return cloudListItems(this.cloud, "breakdown", q({ by: "account", period: query.period, since: query.since }));
@@ -4393,6 +4466,7 @@ function agentPaths() {
 var init_paths = () => {};
 
 // src/lib/accounts.ts
+import { appliedProfileName, resolveStore } from "@hasna/accounts";
 function normalizeEmail(email) {
   return (email ?? "").trim().toLowerCase();
 }
@@ -4447,57 +4521,35 @@ function envOverride(agent, env) {
     account_source: "override"
   };
 }
-function knownToolIds(api) {
-  try {
-    return new Set(api.listTools().map((tool) => tool.id));
-  } catch {
-    return new Set;
-  }
-}
-function profileForEnvDir(api, tool, env) {
+async function profileForEnvDir(store, tool, env) {
   const configuredDir = env[tool.envVar];
   if (!configuredDir)
     return null;
   const normalized = normalizeDir(configuredDir);
-  try {
-    return api.listProfiles(tool.id).find((profile) => normalizeDir(profile.dir) === normalized) ?? null;
-  } catch {
-    return null;
-  }
+  return (await store.listProfiles(tool.id)).find((profile) => normalizeDir(profile.dir) === normalized) ?? null;
 }
 async function resolveAccountForAgent(agent, env = process.env) {
   const override = envOverride(agent, env);
   if (override)
     return override;
-  let api;
-  try {
-    api = await import("@hasna/accounts");
-  } catch {
-    return null;
-  }
-  const toolIds = knownToolIds(api);
+  const store = resolveStore(env);
+  const tools = new Map((await store.listTools()).map((tool) => [tool.id, tool]));
   for (const toolId of AGENT_ACCOUNT_TOOLS[agent]) {
-    if (!toolIds.has(toolId))
-      continue;
-    let tool;
-    try {
-      tool = api.getTool(toolId);
-    } catch {
+    const tool = tools.get(toolId);
+    if (!tool)
       continue;
-    }
-    const envProfile = profileForEnvDir(api, tool, env);
+    const envProfile = await profileForEnvDir(store, tool, env);
     if (envProfile)
       return fromProfile(envProfile, "env");
-    try {
-      const applied = api.appliedProfile(toolId);
+    const appliedName = appliedProfileName(toolId);
+    if (appliedName) {
+      const applied = await store.findProfile(appliedName, toolId);
       if (applied)
         return fromProfile(applied, "applied");
-    } catch {}
-    try {
-      const current = api.currentProfile(toolId);
-      if (current)
-        return fromProfile(current, "current");
-    } catch {}
+    }
+    const current = await store.currentProfile(toolId);
+    if (current)
+      return fromProfile(current, "current");
   }
   return null;
 }
@@ -6363,13 +6415,14 @@ async function syncOpenProjectsRegistry(db, listActiveProjects) {
   let imported = 0;
   let skipped = 0;
   for (const project of projects) {
-    if (!project.path) {
+    const path = resolveProjectPath(project);
+    if (!path) {
       skipped++;
       continue;
     }
     upsertProject(db, {
       id: project.id,
-      path: project.path,
+      path,
       name: project.name,
       description: project.description,
       tags: project.tags ?? [],
@@ -6379,6 +6432,7 @@ async function syncOpenProjectsRegistry(db, listActiveProjects) {
   }
   return { imported, skipped };
 }
+var resolveProjectPath = (project) => project.primary_path || project.path || "";
 var init_open_projects = __esm(() => {
   init_database();
 });
@@ -6743,12 +6797,48 @@ var init_watch = __esm(() => {
   init_notification();
 });
 
+// src/db/dialect.ts
+function translateSql(sql, dialect) {
+  if (dialect === "sqlite")
+    return sql;
+  return sqliteToPostgres(sql);
+}
+function translateParams(params) {
+  const flat = params.length === 1 && Array.isArray(params[0]) ? params[0] : params;
+  return flat.map((p) => p === undefined ? null : p);
+}
+function sqliteToPostgres(sql) {
+  let out = sql;
+  let paramIdx = 0;
+  out = out.replace(/\?/g, () => `$${++paramIdx}`);
+  out = out.replace(/datetime\s*\(\s*'now'\s*\)/gi, "NOW()");
+  out = out.replace(/datetime\s*\(\s*'now'\s*,\s*'(-?\d+)\s+(minutes?|hours?|days?|seconds?)'\s*\)/gi, (_match, amount, unit) => {
+    const n = parseInt(amount, 10);
+    const absN = Math.abs(n);
+    const normalizedUnit = unit.toLowerCase().replace(/s$/, "");
+    const plural = absN === 1 ? normalizedUnit : `${normalizedUnit}s`;
+    return n < 0 ? `NOW() - INTERVAL '${absN} ${plural}'` : `NOW() + INTERVAL '${absN} ${plural}'`;
+  });
+  out = out.replace(/lower\s*\(\s*hex\s*\(\s*randomblob\s*\(\s*\d+\s*\)\s*\)\s*\)/gi, "gen_random_uuid()::text");
+  out = out.replace(/GROUP_CONCAT\s*\(/gi, "STRING_AGG(");
+  out = out.replace(/json_extract\s*\(\s*(\w+)\s*,\s*'\$\.(\w+)'\s*\)/gi, (_match, col, key) => `${col}->>'${key}'`);
+  out = out.replace(/\bAUTOINCREMENT\b/gi, "GENERATED ALWAYS AS IDENTITY");
+  out = out.replace(/(?<![I])LIKE/gi, "ILIKE");
+  out = out.replace(/\bIFNULL\s*\(/gi, "COALESCE(");
+  out = out.replace(/INSERT\s+OR\s+REPLACE\s+INTO\s+"?(\w+)"?\s*\(([^)]+)\)\s*VALUES/gi, (_match, table2, colList) => `INSERT INTO "${table2}" (${colList}) VALUES`);
+  out = out.replace(/INSERT\s+OR\s+REPLACE\s+INTO/gi, "INSERT INTO");
+  if (/INSERT\s+OR\s+IGNORE\s+INTO/i.test(out)) {
+    out = out.replace(/INSERT\s+OR\s+IGNORE\s+INTO/gi, "INSERT INTO");
+    out = out.replace(/;?\s*$/, " ON CONFLICT DO NOTHING");
+  }
+  return out;
+}
+
 // src/db/sync-pg.ts
 import { Worker, MessageChannel, receiveMessageOnPort } from "worker_threads";
 import { fileURLToPath } from "url";
 import { dirname as dirname3, join as join14 } from "path";
 import { existsSync as existsSync15 } from "fs";
-import { translateSql, translateParams } from "@hasna/cloud";
 function translateSqliteDates(sql) {
   let s = sql;
   const isoDate = (expr) => `to_char(${expr}, 'YYYY-MM-DD')`;
@@ -6870,11 +6960,18 @@ class SyncPgAdapter {
 }
 var init_sync_pg = () => {};
 
+// src/db/pg-migrate.ts
+import pg from "pg";
+function resolvePgSsl(dsn) {
+  return dsn.includes("sslmode=require") || dsn.includes("ssl=true") ? { rejectUnauthorized: false } : undefined;
+}
+var init_pg_migrate = () => {};
+
 // src/db/pg-migrations.ts
 var init_pg_migrations = () => {};
 
 // src/db/cloud.ts
-import pg from "pg";
+import pg2 from "pg";
 function getCloudDatabaseUrl() {
   return process.env["HASNA_ECONOMY_DATABASE_URL"]?.trim() || process.env["ECONOMY_DATABASE_URL"]?.trim() || process.env["DATABASE_URL"]?.trim() || undefined;
 }
@@ -6898,8 +6995,7 @@ function openCloudDatabase(dsn = getCloudDatabaseUrl()) {
 function createCloudPool(dsn = getCloudDatabaseUrl()) {
   if (!dsn)
     throw new Error("economy cloud mode requires a Postgres DSN (HASNA_ECONOMY_DATABASE_URL)");
-  const ssl = dsn.includes("sslmode=require") || dsn.includes("ssl=true") ? { rejectUnauthorized: false } : undefined;
-  const pool = new pg.Pool({ connectionString: dsn, ssl, max: Number(process.env["ECONOMY_PG_POOL_MAX"] ?? "5"), connectionTimeoutMillis: 1e4 });
+  const pool = new pg2.Pool({ connectionString: dsn, ssl: resolvePgSsl(dsn), max: Number(process.env["ECONOMY_PG_POOL_MAX"] ?? "5"), connectionTimeoutMillis: 1e4 });
   pool.on("error", (err) => {
     console.error(JSON.stringify({ evt: "pg_pool_error", message: err.message }));
   });
@@ -6922,6 +7018,7 @@ function authClientFromPool(pool) {
 }
 var init_cloud = __esm(() => {
   init_sync_pg();
+  init_pg_migrate();
   init_pg_migrations();
 });
 
@@ -7690,6 +7787,15 @@ var init_openapi = __esm(() => {
                 type: "string"
               }
             },
+            {
+              name: "since",
+              in: "query",
+              description: "ISO timestamp lower bound; takes precedence over period",
+              schema: {
+                type: "string",
+                format: "date-time"
+              }
+            },
             {
               name: "machine",
               in: "query",
@@ -8783,9 +8889,10 @@ function createHandler(db, options = {}) {
     if (path === "/api/breakdown" && method === "GET") {
       const by = url.searchParams.get("by") ?? "model";
       const period = url.searchParams.get("period") ?? "all";
+      const since = url.searchParams.get("since") ?? undefined;
       const machine = url.searchParams.get("machine") ?? undefined;
       if (by === "project")
-        return ok(queryProjectBreakdown(db, period, machine));
+        return ok(since ? queryProjectBreakdownSince(db, since, machine) : queryProjectBreakdown(db, period, machine));
       if (by === "agent")
         return ok(queryAgentBreakdown(db, period, machine));
       if (by === "account")
@@ -10038,7 +10145,7 @@ var ROADMAP_PHASES = [
   {
     id: "phase-9",
     title: "Multi-machine auto sync (4-machine fleet)",
-    summary: "Investigation: machine_id + listMachines + manual cloud push/pull exist; @hasna/cloud has incremental sync, conflict resolution, and launchd/systemd schedulers \u2014 but economy does not use them, requests/sessions lack updated_at, ingest is local-only, RDS is hardcoded, and default commands never pull before query.",
+    summary: "Investigation: machine_id + listMachines + manual cloud push/pull exist; the (since-retired) shared sync package had incremental sync, conflict resolution, and launchd/systemd schedulers \u2014 but economy does not use them, requests/sessions lack updated_at, ingest is local-only, RDS is hardcoded, and default commands never pull before query.",
     tasks: [
       {
         id: "9.1",
@@ -10053,7 +10160,7 @@ var ROADMAP_PHASES = [
       },
       {
         id: "9.3",
-        title: "Switch cloud sync to @hasna/cloud incrementalSyncPush/Pull with _sync_meta (replace full table scans)",
+        title: "Switch cloud sync to incrementalSyncPush/Pull with _sync_meta (replace full table scans)",
         status: "done",
         deps: ["9.2"]
       },
@@ -10077,7 +10184,7 @@ var ROADMAP_PHASES = [
       },
       {
         id: "9.7",
-        title: "CLI economy cloud schedule install|status|remove \u2014 wrap @hasna/cloud registerSyncSchedule (launchd/systemd every 5\u201315m)",
+        title: "CLI economy cloud schedule install|status|remove \u2014 wrap registerSyncSchedule (launchd/systemd every 5\u201315m)",
         status: "done",
         deps: ["9.5"]
       },
@@ -10397,10 +10504,10 @@ function printTodosHelp() {
   console.log("    economy todos list --phase <id>   Tasks for one phase (e.g. phase-9)");
   console.log("    economy todos show <task-id>      Task detail (e.g. 9.7)");
   console.log();
-  console.log(chalk2.bold("  Multi-machine (current vs target)"));
-  console.log("    today       machine_id on rows, economy machines, manual cloud push/pull/sync");
-  console.log("    gap         no auto-sync, no updated_at, hardcoded RDS, queries are local-only");
-  console.log("    target      4 machines \u2192 cloud PG hub \u2192 auto push/pull every 5\u201315m \u2192 fleet today");
+  console.log(chalk2.bold("  Multi-machine storage"));
+  console.log("    local       on-box SQLite; economy sync ingests this machine's agent data");
+  console.log("    cloud       CLI/MCP reads and writes the shared /v1 API directly with URL + key");
+  console.log("    fleet       machine_id keeps shared summaries and per-machine filters distinct");
   console.log();
   console.log(chalk2.bold("  Agents covered"));
   console.log("    claude       Claude Code telemetry + Pro/Max quota (partial)");
@@ -10765,7 +10872,7 @@ function registerExtendedCommands(program) {
   ${chalk4.dim(spendLabel)} ${fmt2(summary.total_usd)}`);
     console.log();
   });
-  program.command("savings [period]").description("Subscription vs API-equivalent savings breakdown").option("--agent <agent>", "Filter by agent").option("--json", "Output JSON").action(async (periodArg, opts) => {
+  program.command("savings [period]").description("Subscription vs API-equivalent savings breakdown").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--json", "Output JSON").action(async (periodArg, opts) => {
     const period = parsePeriod(periodArg, "month");
     const agent = parseAgent(opts.agent, "--agent");
     const savings = await getStore().savings(period, agent);
@@ -10784,7 +10891,7 @@ function registerExtendedCommands(program) {
     console.log();
   });
   const subsCmd = program.command("subscriptions").description("Manage subscription plans");
-  subsCmd.command("set").description("Set a subscription plan").requiredOption("--provider <name>", "Provider name").requiredOption("--plan <name>", "Plan name").option("--agent <agent>", "Agent scope").option("--fee <usd>", "Monthly fee USD", "0").option("--included <usd>", "Included usage USD", "0").action(async (opts) => {
+  subsCmd.command("set").description("Set a subscription plan").requiredOption("--provider <name>", "Provider name").requiredOption("--plan <name>", "Plan name").option("--agent <agent>", `Agent scope (${AGENTS.join("|")})`).option("--fee <usd>", "Monthly fee USD", "0").option("--included <usd>", "Included usage USD", "0").action(async (opts) => {
     const agent = parseAgent(opts.agent, "--agent") ?? null;
     await getStore().setSubscription({
       agent,
@@ -11115,7 +11222,7 @@ init_store();
 init_transport();
 import { execSync } from "child_process";
 var program = new Command;
-program.name("economy").description("AI coding cost tracker \u2014 Claude, Codex, Gemini, OpenCode, Cursor, Pi, Hermes").version(packageMetadata.version);
+program.name("economy").description("AI coding cost tracker \u2014 Claude, Takumi, Codex, Gemini, OpenCode, Cursor, Pi, Hermes").version(packageMetadata.version);
 async function autoSync(opts = {}) {
   if (isCloudStore())
     return;
@@ -11429,7 +11536,7 @@ program.command("month").description("Cost summary for this month").action(async
   await autoSync();
   await printSummary("This Month", "month");
 });
-program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|takumi|codex|gemini)").option("--project <path>", "Filter by project path").option("--account <query>", "Filter by account key, name, or email").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) => {
+program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--project <path>", "Filter by project path").option("--account <query>", "Filter by account key, name, or email").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) => {
   const limit = parsePositiveCliInteger(opts.limit ?? "20", "--limit");
   const agent = parseOptionalCliAgent(opts.agent);
   await autoSync();
@@ -11476,7 +11583,7 @@ program.command("sessions").description("List coding sessions with costs").optio
   ]));
   console.log();
 });
-program.command("top").description("Most expensive sessions").option("-n <n>", "Number of sessions", "10").option("--agent <agent>", "Filter by agent").option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").action(async (opts) => {
+program.command("top").description("Most expensive sessions").option("-n <n>", "Number of sessions", "10").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").action(async (opts) => {
   const count = parsePositiveCliInteger(opts.n ?? "10", "-n");
   const agent = parseOptionalCliAgent(opts.agent);
   const sinceDate = opts.since ? parseSinceDate2(opts.since) : undefined;
@@ -11607,7 +11714,7 @@ program.command("accounts [period]").description("List account usage by email ad
   printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
   console.log();
 });
-program.command("watch").description("Live stream of incoming costs").option("--interval <seconds>", "Poll interval in seconds", "10").option("--daemon", "Watch agent data directories and sync on change").option("--agent <agent>", "Filter by agent").option("--notify <amount>", "Fire macOS notification when cumulative cost crosses this USD threshold").action(async (opts) => {
+program.command("watch").description("Live stream of incoming costs").option("--interval <seconds>", "Poll interval in seconds", "10").option("--daemon", "Watch agent data directories and sync on change").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--notify <amount>", "Fire macOS notification when cumulative cost crosses this USD threshold").action(async (opts) => {
   const { watchCosts: watchCosts2 } = await Promise.resolve().then(() => (init_watch(), exports_watch));
   await watchCosts2({
     interval: parsePositiveCliInteger(opts.interval ?? "10", "--interval"),
@@ -11617,7 +11724,7 @@ program.command("watch").description("Live stream of incoming costs").option("--
   });
 });
 var budgetCmd = program.command("budget").description("Manage spending budgets");
-budgetCmd.command("set").description("Set a budget").option("--project <path>", "Project path (omit for global)").option("--cost-center <id>", "Cost center id (for example loop:fleet-evaluator)").option("--period <period>", "Period: daily|weekly|monthly", "monthly").option("--limit <usd>", "Budget limit in USD").option("--alert <percent>", "Alert threshold %", "80").option("--agent <agent>", "Limit to agent (claude|takumi|codex|gemini)").action(async (opts) => {
+budgetCmd.command("set").description("Set a budget").option("--project <path>", "Project path (omit for global)").option("--cost-center <id>", "Cost center id (for example loop:fleet-evaluator)").option("--period <period>", "Period: daily|weekly|monthly", "monthly").option("--limit <usd>", "Budget limit in USD").option("--alert <percent>", "Alert threshold %", "80").option("--agent <agent>", `Limit to agent (${AGENTS.join("|")})`).action(async (opts) => {
   const limitUsd = parsePositiveCliNumber(opts.limit, "--limit");
   const alertAtPercent = parsePositiveCliNumber(opts.alert ?? "80", "--alert");
   if (alertAtPercent > 100)
@@ -12126,7 +12233,7 @@ menubarCmd.command("stop").description("Quit Economy Bar").action(async () => {
   menubarStop2();
 });
 var goalCmd = program.command("goal").description("Manage spending goals");
-goalCmd.command("set").description("Set a spending goal").option("--period <period>", "Period: day|week|month|year", "month").option("--limit <usd>", "Goal limit in USD").option("--project <path>", "Scope to project path").option("--agent <agent>", "Scope to agent").action(async (opts) => {
+goalCmd.command("set").description("Set a spending goal").option("--period <period>", "Period: day|week|month|year", "month").option("--limit <usd>", "Goal limit in USD").option("--project <path>", "Scope to project path").option("--agent <agent>", `Scope to agent (${AGENTS.join("|")})`).action(async (opts) => {
   const limitUsd = parsePositiveCliNumber(opts.limit, "--limit");
   const period = requireCliChoice(opts.period, "--period", ["day", "week", "month", "year"]);
   const agent = parseOptionalCliAgent(opts.agent) ?? null;

package/dist/db/cloud.d.ts

@@ -1,7 +1,6 @@
-import type { DbAdapter } from '@hasna/cloud';
 import type { AuthQueryClient } from '@hasna/contracts/auth';
 import pg from 'pg';
-import type { SqliteAdapter as Database } from '@hasna/cloud';
+import type { DbAdapter, SqliteAdapter as Database } from './sqlite-adapter.js';
 /** Resolve the cloud Postgres DSN from the standard env aliases. */
 export declare function getCloudDatabaseUrl(): string | undefined;
 /** True when the serve should run in cloud (RDS-direct) mode. */
@@ -10,7 +9,7 @@ export declare function isCloudMode(): boolean;
 export declare function resolveSigningSecret(): string | undefined;
 /**
  * Open a pooled Postgres connection to the shared RDS. Returns a value typed as
- * the SQLite `Database` the query layer expects — safe because `PgAdapter`
+ * the SQLite `Database` the query layer expects — safe because `SyncPgAdapter`
  * implements the identical `DbAdapter` surface those functions rely on.
  */
 export declare function openCloudDatabase(dsn?: string | undefined): Database;
@@ -19,7 +18,7 @@ export declare function createCloudPool(dsn?: string | undefined): pg.Pool;
 /**
  * Adapt a pg Pool to the `@hasna/contracts/auth` `AuthQueryClient` surface
  * (many/get/execute). This backs the `ApiKeyStore` without pulling in the
- * generic vendored kit — economy's storage is the `@hasna/cloud` PG pool.
+ * generic vendored kit — economy's storage is this pg pool.
  */
 export declare function authClientFromPool(pool: pg.Pool): AuthQueryClient;
 /** Ordered PG migrations applied by the migration runner (index = version). */

package/dist/db/cloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["../../src/db/cloud.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AAI7D,oEAAoE;AACpE,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAOxD;AAED,iEAAiE;AACjE,wBAAgB,WAAW,IAAI,OAAO,CAKrC;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,SAAS,CAOzD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,qBAAwB,GAAG,QAAQ,CASvE;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,GAAG,qBAAwB,GAAG,EAAE,CAAC,IAAI,CAYpE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,eAAe,CAcjE;AAED,+EAA+E;AAC/E,wBAAgB,eAAe,IAAI,MAAM,EAAE,CAE1C;AAED,YAAY,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["../../src/db/cloud.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAK/E,oEAAoE;AACpE,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAOxD;AAED,iEAAiE;AACjE,wBAAgB,WAAW,IAAI,OAAO,CAKrC;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,SAAS,CAOzD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,qBAAwB,GAAG,QAAQ,CASvE;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,GAAG,qBAAwB,GAAG,EAAE,CAAC,IAAI,CAWpE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,eAAe,CAcjE;AAED,+EAA+E;AAC/E,wBAAgB,eAAe,IAAI,MAAM,EAAE,CAE1C;AAED,YAAY,EAAE,SAAS,EAAE,CAAA"}

package/dist/db/database.d.ts

@@ -1,4 +1,4 @@
-import { SqliteAdapter as Database } from '@hasna/cloud';
+import { SqliteAdapter as Database } from './sqlite-adapter.js';
 import type { EconomyRequest, EconomySession, EconomyProject, CostCenter, CostCenterBreakdown, CostCenterKind, Budget, BudgetStatus, CostSummary, ZeroCostModelBreakdown, ModelBreakdown, ProjectBreakdown, AgentBreakdown, AccountBreakdown, Period, Agent, SessionFilter } from '../types/index.js';
 export declare function getMachineId(): string;
 export declare function getDataDir(): string;
@@ -22,7 +22,7 @@ export declare function queryCostCenterBreakdown(db: Database, period?: Period,
     machine?: string;
     since?: string;
 }): CostCenterBreakdown[];
-export declare function queryProjectBreakdownSince(db: Database, since: string): ProjectBreakdown[];
+export declare function queryProjectBreakdownSince(db: Database, since: string, machine?: string): ProjectBreakdown[];
 export declare function queryAgentBreakdownSince(db: Database, since: string): AgentBreakdown[];
 export declare function queryModelBreakdownSince(db: Database, since: string): ModelBreakdown[];
 export declare function queryAccountBreakdownSince(db: Database, since: string): AccountBreakdown[];