@hasna/economy 0.2.40 → 0.2.42

package/dist/cli/index.js

@@ -528,6 +528,7 @@ __export(exports_database, {
   setIngestState: () => setIngestState,
   seedModelPricing: () => seedModelPricing,
   rollupSession: () => rollupSession,
+  queryZeroCostTokenizedModels: () => queryZeroCostTokenizedModels,
   queryUsageSnapshots: () => queryUsageSnapshots,
   queryTopSessions: () => queryTopSessions,
   querySummary: () => querySummary,
@@ -623,6 +624,32 @@ function getDbPath() {
     return process.env["ECONOMY_DB"];
   return join(getDataDir(), "economy.db");
 }
+function isSqliteBusyError(error) {
+  const candidate = error;
+  const code = typeof candidate.code === "string" ? candidate.code : "";
+  const message = typeof candidate.message === "string" ? candidate.message : String(error);
+  return code === "SQLITE_BUSY" || code === "SQLITE_BUSY_RECOVERY" || /database is locked|SQLITE_BUSY/i.test(message);
+}
+function retryDelayMs(attempt) {
+  return Math.min(1000, 50 * 2 ** attempt);
+}
+function withSqliteBusyRetry(operation, context) {
+  const maxAttempts = 8;
+  let lastError;
+  for (let attempt = 0;attempt < maxAttempts; attempt++) {
+    try {
+      return operation();
+    } catch (error) {
+      if (!isSqliteBusyError(error))
+        throw error;
+      lastError = error;
+      if (attempt === maxAttempts - 1)
+        break;
+      Bun.sleepSync(retryDelayMs(attempt));
+    }
+  }
+  throw new Error(`SQLite database is locked after ${maxAttempts} attempts while ${context}. Another economy sync/merge may be recovering the database; retry shortly.`, { cause: lastError });
+}
 function openDatabase(dbPath, skipSeed = false) {
   const path = dbPath ?? getDbPath();
   if (path !== ":memory:") {
@@ -630,11 +657,21 @@ function openDatabase(dbPath, skipSeed = false) {
     if (dir && !existsSync(dir))
       mkdirSync(dir, { recursive: true });
   }
-  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);
+  const db = withSqliteBusyRetry(() => {
+    const opened = new Database(path);
+    try {
+      opened.exec("PRAGMA busy_timeout = 10000");
+      opened.exec("PRAGMA journal_mode = WAL");
+      opened.exec("PRAGMA foreign_keys = ON");
+      initSchema(opened);
+      return opened;
+    } catch (error) {
+      try {
+        opened.close();
+      } catch {}
+      throw error;
+    }
+  }, `opening ${path}`);
   if (!skipSeed) {
     Promise.resolve().then(() => (init_pricing(), exports_pricing)).then(({ ensurePricingSeeded: ensurePricingSeeded2 }) => ensurePricingSeeded2(db)).catch(() => {});
   }
@@ -996,36 +1033,50 @@ function querySessions(db, filter = {}) {
     SELECT * FROM sessions ${where} ORDER BY started_at DESC LIMIT ? OFFSET ?
   `).all(...params, limit, offset);
 }
-function queryTopSessions(db, n = 10, agent) {
+function queryTopSessions(db, n = 10, agent, since) {
+  const conditions = [];
+  const params = [];
   if (agent) {
-    return db.prepare(`SELECT * FROM sessions WHERE agent = ? ORDER BY total_cost_usd DESC LIMIT ?`).all(agent, n);
+    conditions.push("agent = ?");
+    params.push(agent);
+  }
+  if (since) {
+    conditions.push("started_at >= ?");
+    params.push(since);
   }
-  return db.prepare(`SELECT * FROM sessions ORDER BY total_cost_usd DESC LIMIT ?`).all(n);
+  const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
+  return db.prepare(`SELECT * FROM sessions ${where} ORDER BY total_cost_usd DESC LIMIT ?`).all(...params, n);
 }
-function querySummary(db, period, machine, allMachines = false) {
+function querySummary(db, period, machine, allMachines = false, agent) {
   const rWhere = periodWhere(period);
   const sWhere = sessionPeriodWhere(period);
-  const machineClause = !allMachines && machine ? ` AND machine_id = '${machine.replace(/'/g, "''")}'` : "";
+  const machineClause = !allMachines && machine ? " AND machine_id = ?" : "";
+  const agentClause = agent ? " AND agent = ?" : "";
+  const params = [];
+  if (!allMachines && machine)
+    params.push(machine);
+  if (agent)
+    params.push(agent);
   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}${machineClause}
-  `).get();
+    FROM requests WHERE ${rWhere}${machineClause}${agentClause}
+  `).get(...params);
   const codexTotals = db.prepare(`
     SELECT COALESCE(SUM(total_cost_usd), 0) as cost_usd,
            COALESCE(SUM(total_tokens), 0) as tokens,
            COALESCE(SUM(request_count), 0) as requests,
            COUNT(*) as sessions
     FROM sessions
-    WHERE ${sWhere}${machineClause}
+    WHERE ${sWhere}${machineClause}${agentClause}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
-  `).get();
+  `).get(...params);
   const requestSessionCount = db.prepare(`
     SELECT COUNT(DISTINCT session_id) as sessions
     FROM requests
-    WHERE ${rWhere}${machineClause}
-  `).get();
+    WHERE ${rWhere}${machineClause}${agentClause}
+  `).get(...params);
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
     requests: r.requests + codexTotals.requests,
@@ -1034,6 +1085,21 @@ function querySummary(db, period, machine, allMachines = false) {
     period
   };
 }
+function queryZeroCostTokenizedModels(db, limit = 10) {
+  return db.prepare(`
+    SELECT agent,
+           model,
+           COUNT(*) as requests,
+           COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+           MAX(timestamp) as last_seen
+    FROM requests
+    WHERE cost_usd = 0
+      AND (input_tokens > 0 OR output_tokens > 0 OR cache_read_tokens > 0 OR cache_create_tokens > 0)
+    GROUP BY agent, model
+    ORDER BY requests DESC, total_tokens DESC
+    LIMIT ?
+  `).all(limit);
+}
 function queryModelBreakdown(db) {
   return db.prepare(`
     SELECT model, agent,
@@ -4270,15 +4336,15 @@ __export(exports_config, {
   loadConfig: () => loadConfig2,
   getConfigValue: () => getConfigValue
 });
-import { existsSync as existsSync13, readFileSync as readFileSync11, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
-import { dirname as dirname2, join as join12 } from "path";
+import { existsSync as existsSync14, readFileSync as readFileSync11, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4 } from "fs";
+import { dirname as dirname2, join as join13 } from "path";
 function getConfigPath() {
-  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join12(getDataDir(), "config.json");
+  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join13(getDataDir(), "config.json");
 }
 function loadConfig2() {
   try {
     const configPath = getConfigPath();
-    if (existsSync13(configPath)) {
+    if (existsSync14(configPath)) {
       const raw = readFileSync11(configPath, "utf-8");
       return { ...DEFAULTS, ...JSON.parse(raw) };
     }
@@ -4288,9 +4354,9 @@ function loadConfig2() {
 function saveConfig2(config) {
   const configPath = getConfigPath();
   const dir = dirname2(configPath);
-  if (!existsSync13(dir))
-    mkdirSync3(dir, { recursive: true });
-  writeFileSync2(configPath, JSON.stringify(config, null, 2) + `
+  if (!existsSync14(dir))
+    mkdirSync4(dir, { recursive: true });
+  writeFileSync3(configPath, JSON.stringify(config, null, 2) + `
 `);
 }
 function getConfigValue(key) {
@@ -4432,7 +4498,7 @@ var init_webhooks = __esm(() => {
 });
 
 // src/lib/watch-paths.ts
-import { existsSync as existsSync14 } from "fs";
+import { existsSync as existsSync15 } from "fs";
 function getWatchPaths() {
   const p = agentPaths();
   const candidates = [
@@ -4445,7 +4511,7 @@ function getWatchPaths() {
     p.piSessions,
     p.hermesDir
   ];
-  return candidates.filter((path) => existsSync14(path));
+  return candidates.filter((path) => existsSync15(path));
 }
 var init_watch_paths = __esm(() => {
   init_paths();
@@ -4615,8 +4681,8 @@ __export(exports_serve, {
   createHandler: () => createHandler
 });
 import { randomUUID as randomUUID2 } from "crypto";
-import { existsSync as existsSync15 } from "fs";
-import { resolve, sep } from "path";
+import { existsSync as existsSync16 } from "fs";
+import { resolve as resolve2, sep } from "path";
 function json(data, status = 200) {
   return new Response(JSON.stringify(data), {
     status,
@@ -4670,8 +4736,8 @@ function dashboardPath(root, pathname) {
     return null;
   }
   const relativePath = decoded === "/" ? "index.html" : decoded.replace(/^\/+/, "");
-  const rootPath = resolve(root);
-  const filePath = resolve(rootPath, relativePath);
+  const rootPath = resolve2(root);
+  const filePath = resolve2(rootPath, relativePath);
   return filePath === rootPath || filePath.startsWith(rootPath + sep) ? filePath : null;
 }
 function createServerFetch(apiHandler, dashboardDir = DEFAULT_DASHBOARD_DIR) {
@@ -4680,13 +4746,13 @@ function createServerFetch(apiHandler, dashboardDir = DEFAULT_DASHBOARD_DIR) {
     if (url.pathname.startsWith("/api") || url.pathname === "/health") {
       return apiHandler(req);
     }
-    if (existsSync15(dashboardDir)) {
+    if (existsSync16(dashboardDir)) {
       const filePath = dashboardPath(dashboardDir, url.pathname);
-      if (filePath && existsSync15(filePath)) {
+      if (filePath && existsSync16(filePath)) {
         return new Response(Bun.file(filePath));
       }
       const indexPath = dashboardPath(dashboardDir, "/");
-      if (indexPath && existsSync15(indexPath)) {
+      if (indexPath && existsSync16(indexPath)) {
         return new Response(Bun.file(indexPath));
       }
     }
@@ -4771,7 +4837,8 @@ function createHandler(db) {
     if (path === "/api/top" && method === "GET") {
       const n = Number(url.searchParams.get("n") ?? 10);
       const agent = url.searchParams.get("agent") ?? undefined;
-      return ok(queryTopSessions(db, n, agent));
+      const since = url.searchParams.get("since") ?? undefined;
+      return ok(queryTopSessions(db, n, agent, since));
     }
     if (path === "/api/models" && method === "GET") {
       return ok(queryModelBreakdown(db));
@@ -5101,14 +5168,14 @@ __export(exports_menubar, {
 });
 import chalk6 from "chalk";
 import { execFileSync as execFileSync3 } from "child_process";
-import { cpSync, existsSync as existsSync16, mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync3 } from "fs";
+import { cpSync, existsSync as existsSync17, mkdirSync as mkdirSync5, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "fs";
 import { tmpdir, arch } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 function getArch() {
   return arch() === "arm64" ? "arm64" : "x86_64";
 }
 function isInstalled() {
-  return existsSync16(APP_PATH);
+  return existsSync17(APP_PATH);
 }
 function isRunning() {
   try {
@@ -5145,15 +5212,15 @@ async function menubarInstall(opts) {
     console.error(chalk6.red(`\u2717 Failed to fetch release info: ${e instanceof Error ? e.message : String(e)}`));
     process.exit(1);
   }
-  const zipPath = join13(tmpdir(), `economy-bar-${cpuArch}.zip`);
-  const extractDir = join13(tmpdir(), "economy-bar-extracted");
+  const zipPath = join14(tmpdir(), `economy-bar-${cpuArch}.zip`);
+  const extractDir = join14(tmpdir(), "economy-bar-extracted");
   console.log(chalk6.cyan(`\u2192 Downloading ${assetUrl}...`));
   try {
     const res = await fetch(assetUrl, { signal: AbortSignal.timeout(60000) });
     if (!res.ok)
       throw new Error(`Download failed: ${res.status}`);
     const buffer = await res.arrayBuffer();
-    writeFileSync3(zipPath, Buffer.from(buffer));
+    writeFileSync4(zipPath, Buffer.from(buffer));
     console.log(chalk6.green(`\u2713 Downloaded (${(buffer.byteLength / 1024 / 1024).toFixed(1)} MB)`));
   } catch (e) {
     console.error(chalk6.red(`\u2717 Download failed: ${e instanceof Error ? e.message : String(e)}`));
@@ -5161,17 +5228,17 @@ async function menubarInstall(opts) {
   }
   console.log(chalk6.cyan("\u2192 Installing to /Applications..."));
   try {
-    rmSync(extractDir, { recursive: true, force: true });
-    mkdirSync4(extractDir, { recursive: true });
+    rmSync2(extractDir, { recursive: true, force: true });
+    mkdirSync5(extractDir, { recursive: true });
     execFileSync3("unzip", ["-q", zipPath, "-d", extractDir], { stdio: "ignore" });
     if (isInstalled())
-      rmSync(APP_PATH, { recursive: true, force: true });
-    cpSync(join13(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
+      rmSync2(APP_PATH, { recursive: true, force: true });
+    cpSync(join14(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
     try {
       execFileSync3("xattr", ["-rd", "com.apple.quarantine", APP_PATH], { stdio: "ignore" });
     } catch {}
-    rmSync(zipPath, { force: true });
-    rmSync(extractDir, { recursive: true, force: true });
+    rmSync2(zipPath, { force: true });
+    rmSync2(extractDir, { recursive: true, force: true });
     console.log(chalk6.green(`\u2713 Installed to ${APP_PATH}`));
   } catch (e) {
     console.error(chalk6.red(`\u2717 Install failed: ${e instanceof Error ? e.message : String(e)}`));
@@ -5198,7 +5265,7 @@ function menubarUninstall() {
       execFileSync3("sleep", ["1"], { stdio: "ignore" });
     } catch {}
   }
-  rmSync(APP_PATH, { recursive: true, force: true });
+  rmSync2(APP_PATH, { recursive: true, force: true });
   console.log(chalk6.green("\u2713 Economy Bar uninstalled"));
 }
 function menubarStart() {
@@ -6564,6 +6631,15 @@ init_paths();
 function fmt2(usd) {
   return "$" + usd.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
+function fmtTokens(n) {
+  if (n >= 1e9)
+    return `${(n / 1e9).toFixed(1)}B`;
+  if (n >= 1e6)
+    return `${(n / 1e6).toFixed(1)}M`;
+  if (n >= 1000)
+    return `${(n / 1000).toFixed(1)}k`;
+  return n.toLocaleString("en-US");
+}
 function parsePeriod(value, fallback = "month") {
   const p = value ?? fallback;
   if (!["today", "yesterday", "week", "month", "year", "all"].includes(p)) {
@@ -6578,7 +6654,7 @@ function registerExtendedCommands(program) {
     const period = parsePeriod(periodArg, "month");
     const agent = parseAgent(opts.agent, "--agent");
     const snaps = queryUsageSnapshots(db, { agent, ...usageSnapshotFilterForPeriod(period) });
-    const summary = querySummary(db, period, undefined, true);
+    const summary = querySummary(db, period, undefined, true, agent);
     if (opts.json) {
       console.log(JSON.stringify({ period, agent: agent ?? "all", snapshots: snaps, summary }, null, 2));
       return;
@@ -6593,8 +6669,9 @@ function registerExtendedCommands(program) {
         console.log(`  ${chalk4.white(s.agent.padEnd(10))} ${s.metric.padEnd(28)} ${s.value}${s.unit ? ` ${s.unit}` : ""}  ${chalk4.dim(s.date)}`);
       }
     }
+    const spendLabel = agent ? `${agent} API-equivalent spend:` : "Fleet API-equivalent spend:";
     console.log(`
-  ${chalk4.dim("Fleet API-equivalent spend:")} ${fmt2(summary.total_usd)}`);
+  ${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((periodArg, opts) => {
@@ -6676,8 +6753,19 @@ function registerExtendedCommands(program) {
     }
     checks.push({ ok: Boolean(process.env["CURSOR_SESSION_TOKEN"]), msg: `cursor token: ${process.env["CURSOR_SESSION_TOKEN"] ? "set" : "missing CURSOR_SESSION_TOKEN"}` });
     checks.push({ ok: Boolean(getCloudDatabaseUrl()), msg: `cloud: ${getCloudDatabaseUrl() ? "ECONOMY_CLOUD_DATABASE_URL set" : "not configured"}` });
-    const zeroCost = db.prepare(`SELECT COUNT(*) as c FROM requests WHERE cost_usd = 0 AND (input_tokens > 0 OR output_tokens > 0)`).get();
-    checks.push({ ok: zeroCost.c === 0, msg: `zero-cost requests with tokens: ${zeroCost.c}` });
+    const zeroCostBuckets = queryZeroCostTokenizedModels(db, 5);
+    const zeroCost = db.prepare(`
+        SELECT COUNT(*) as c
+        FROM requests
+        WHERE cost_usd = 0
+          AND (input_tokens > 0 OR output_tokens > 0 OR cache_read_tokens > 0 OR cache_create_tokens > 0)
+      `).get();
+    const zeroCostSuffix = zeroCostBuckets.length > 0 ? `; top buckets: ${zeroCostBuckets.map((row) => {
+      const pricing = getPricingFromDb(db, row.model);
+      const status = pricing ? "pricing configured" : "missing pricing";
+      return `${row.agent}/${row.model} ${row.requests} req ${fmtTokens(row.total_tokens)} tok (${status})`;
+    }).join("; ")}` : "";
+    checks.push({ ok: zeroCost.c === 0, msg: `zero-cost requests with tokens: ${zeroCost.c}${zeroCostSuffix}` });
     const estimated = querySummary(db, "month", undefined, true);
     const actual = queryBillingSummary(db, "month");
     const drift = actual.total_usd > 0 ? Math.abs(estimated.total_usd - actual.total_usd) / actual.total_usd : 0;
@@ -7824,6 +7912,187 @@ function mergePeerDatabase(target, sourcePath, opts = {}) {
   };
 }
 
+// src/lib/fleet-sync.ts
+init_database();
+import { spawnSync } from "child_process";
+import { existsSync as existsSync13, mkdirSync as mkdirSync3, renameSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
+import { join as join12, resolve } from "path";
+import { homedir as homedir9 } from "os";
+import { Database as Database2 } from "bun:sqlite";
+var DEFAULT_TIMEOUT_MS = 120000;
+var DEFAULT_MACHINES = ["spark02", "apple03"];
+function runEconomyFleetSync(options = {}) {
+  const generatedAt = (options.now ?? new Date).toISOString();
+  const timeoutMs = normalizePositiveInteger(options.timeoutMs, DEFAULT_TIMEOUT_MS);
+  const runner = options.runner ?? spawnCommand;
+  const dryRun = Boolean(options.dryRun);
+  const machines = ((options.machines?.length) ? options.machines : DEFAULT_MACHINES).filter(Boolean);
+  const cacheDir = resolve(options.cacheDir ?? join12(homedir9(), ".hasna", "economy", "fleet-sync-cache"));
+  const remoteSnapshotDir = options.remoteSnapshotDir ?? "$HOME/.hasna/economy/fleet-sync-snapshots";
+  const localSync = options.localSync !== false;
+  const remoteSync = options.remoteSync !== false;
+  const local = {
+    status: dryRun ? "dry_run" : localSync ? "skipped" : "skipped",
+    db_path: getDbPath()
+  };
+  if (localSync) {
+    if (dryRun) {
+      local.status = "dry_run";
+    } else {
+      local.sync = runner("economy", ["sync"], { timeoutMs });
+      local.status = local.sync.code === 0 ? "synced" : "failed";
+    }
+  }
+  const remote = machines.map((machine) => syncMachine(machine, {
+    generatedAt,
+    timeoutMs,
+    runner,
+    dryRun,
+    remoteSync,
+    cacheDir,
+    remoteSnapshotDir
+  }));
+  return {
+    schema: "open-economy.fleet-sync.v1",
+    generated_at: generatedAt,
+    dry_run: dryRun,
+    local,
+    remote,
+    summary: {
+      machines: remote.length,
+      merged: remote.filter((row) => row.status === "merged").length,
+      failed: remote.filter((row) => row.status === "failed").length,
+      dry_run: remote.filter((row) => row.status === "dry_run").length + (dryRun ? 1 : 0)
+    }
+  };
+}
+function syncMachine(machine, context) {
+  const safeMachine = machine.replace(/[^A-Za-z0-9_.-]/g, "_");
+  const stamp = context.generatedAt.replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
+  const snapshotName = `${safeMachine}-${stamp}.economy.db`;
+  const remoteSnapshotPath = `${context.remoteSnapshotDir.replace(/\/$/, "")}/${snapshotName}`;
+  const tmpLocal = join12(context.cacheDir, `${snapshotName}.tmp`);
+  const verifiedLocal = join12(context.cacheDir, snapshotName);
+  if (context.dryRun) {
+    return { machine, status: "dry_run", remote_snapshot_path: remoteSnapshotPath };
+  }
+  mkdirSync3(context.cacheDir, { recursive: true });
+  rmSync(tmpLocal, { force: true });
+  const result = {
+    machine,
+    status: "failed",
+    remote_snapshot_path: remoteSnapshotPath
+  };
+  if (context.remoteSync) {
+    result.remote_sync = context.runner("ssh", [machine, "economy sync"], { timeoutMs: context.timeoutMs });
+    if (result.remote_sync.code !== 0) {
+      result.error = "remote economy sync failed";
+      return result;
+    }
+  }
+  result.remote_snapshot = context.runner("ssh", [machine, remoteSnapshotCommand(context.remoteSnapshotDir, snapshotName)], { timeoutMs: context.timeoutMs });
+  if (result.remote_snapshot.code !== 0) {
+    result.error = "remote snapshot failed";
+    return result;
+  }
+  const emittedPath = result.remote_snapshot.stdout.trim().split(/\r?\n/).at(-1)?.trim() || remoteSnapshotPath;
+  if (!isSafeRemoteSnapshotPath(emittedPath, context.remoteSnapshotDir)) {
+    result.error = `remote snapshot path refused: ${emittedPath}`;
+    return result;
+  }
+  result.remote_snapshot_path = emittedPath;
+  result.pull = context.runner("scp", [`${machine}:${emittedPath}`, tmpLocal], { timeoutMs: context.timeoutMs });
+  context.runner("ssh", [machine, `rm -f ${shellQuote(emittedPath)}`], { timeoutMs: context.timeoutMs });
+  if (result.pull.code !== 0) {
+    result.error = "snapshot pull failed; no cached DB merged";
+    rmSync(tmpLocal, { force: true });
+    return result;
+  }
+  const integrity = verifySqliteIntegrity(tmpLocal);
+  result.local_integrity = integrity;
+  if (!integrity.ok) {
+    result.error = "pulled snapshot failed local integrity check";
+    rmSync(tmpLocal, { force: true });
+    return result;
+  }
+  renameSync(tmpLocal, verifiedLocal);
+  const db = openDatabase();
+  result.merge = mergePeerDatabase(db, verifiedLocal, { sourceMachine: machine });
+  result.status = "merged";
+  return result;
+}
+function remoteSnapshotCommand(remoteDir, filename) {
+  const dirExpr = remoteDir.startsWith("$HOME/") ? `"${remoteDir.replace(/"/g, "\\\"")}"` : shellQuote(remoteDir);
+  const safeFilename = filename.replace(/[^A-Za-z0-9_.-]/g, "_");
+  return [
+    "set -euo pipefail",
+    'db="${HASNA_ECONOMY_DB_PATH:-${ECONOMY_DB:-$HOME/.hasna/economy/economy.db}}"',
+    `snapshot_dir=${dirExpr}`,
+    `out="$snapshot_dir/${safeFilename}"`,
+    'test -f "$db"',
+    'mkdir -p "$snapshot_dir"',
+    'rm -f "$out"',
+    `sqlite3 "$db" "VACUUM INTO '$out'"`,
+    'test "$(sqlite3 "$out" "PRAGMA integrity_check;")" = "ok"',
+    'printf "%s\\n" "$out"'
+  ].join("; ");
+}
+function isSafeRemoteSnapshotPath(path, remoteSnapshotDir = "$HOME/.hasna/economy/fleet-sync-snapshots") {
+  if (!path || path.includes("\x00") || path.includes(`
+`) || path.includes("\r"))
+    return false;
+  if (!path.endsWith(".db"))
+    return false;
+  if (path.includes(".."))
+    return false;
+  const prefix = remoteSnapshotDir.replace(/\/$/, "");
+  return path.startsWith(`${prefix}/`) || path.startsWith("$HOME/.hasna/economy/fleet-sync-snapshots/") || path.includes("/.hasna/economy/fleet-sync-snapshots/");
+}
+function verifySqliteIntegrity(path) {
+  if (!existsSync13(path))
+    return { ok: false, detail: "file does not exist" };
+  let db;
+  try {
+    db = new Database2(path, { readonly: true });
+    const row = db.query("PRAGMA integrity_check").get();
+    const detail = Object.values(row ?? {})[0] ?? "";
+    return { ok: detail.toLowerCase() === "ok", detail: detail || "no integrity result" };
+  } catch (error) {
+    return { ok: false, detail: error instanceof Error ? error.message : String(error) };
+  } finally {
+    db?.close();
+  }
+}
+function writeFleetSyncReport(reportDir, result) {
+  mkdirSync3(reportDir, { recursive: true });
+  const path = join12(resolve(reportDir), `${result.generated_at.replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z")}.json`);
+  writeFileSync2(path, `${JSON.stringify(result, null, 2)}
+`);
+  return path;
+}
+function spawnCommand(command, args, options) {
+  const result = spawnSync(command, args, {
+    encoding: "utf8",
+    timeout: options.timeoutMs,
+    maxBuffer: 1024 * 1024,
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  return {
+    code: result.status,
+    stdout: result.stdout ?? "",
+    stderr: result.stderr ?? "",
+    ...result.error ? { error: result.error.message } : {}
+  };
+}
+function shellQuote(value) {
+  return `'${value.replace(/'/g, "'\\''")}'`;
+}
+function normalizePositiveInteger(value, fallback) {
+  if (value == null || !Number.isFinite(value) || value < 1)
+    return fallback;
+  return Math.floor(value);
+}
+
 // src/cli/index.ts
 init_database();
 init_database();
@@ -7863,7 +8132,7 @@ function fmt4(usd) {
   }
   return chalk7.green(formatted);
 }
-function fmtTokens(n) {
+function fmtTokens2(n) {
   if (n >= 1e9)
     return `${(n / 1e9).toFixed(1)}B`;
   if (n >= 1e6)
@@ -7971,7 +8240,7 @@ function printAccountBreakdown(rows) {
     chalk7.dim(r.account_source || "unknown"),
     String(r.sessions),
     String(r.requests),
-    chalk7.cyan(fmtTokens(r.total_tokens)),
+    chalk7.cyan(fmtTokens2(r.total_tokens)),
     fmt4(r.api_equivalent_usd),
     fmt4(r.billable_usd),
     fmt4(r.subscription_included_usd)
@@ -7998,7 +8267,7 @@ function printSummary(label, period) {
     ["Total cost", fmt4(s.total_usd)],
     ["Sessions", chalk7.yellow(fmtCount(s.sessions))],
     ["Requests", chalk7.yellow(fmtCount(s.requests))],
-    ["Tokens", chalk7.yellow(fmtTokens(s.tokens))]
+    ["Tokens", chalk7.yellow(fmtTokens2(s.tokens))]
   ]);
   console.log();
 }
@@ -8018,9 +8287,9 @@ program.action(async () => {
   console.log(chalk7.bold.cyan("  Economy"));
   console.log();
   printTable(["Period", "Cost", "Sessions", "Requests", "Tokens"], [
-    ["Today", fmt4(t.total_usd), fmtCount(t.sessions), fmtCount(t.requests), fmtTokens(t.tokens)],
-    ["This Week", fmt4(w.total_usd), fmtCount(w.sessions), fmtCount(w.requests), fmtTokens(w.tokens)],
-    ["This Month", fmt4(m.total_usd), fmtCount(m.sessions), fmtCount(m.requests), fmtTokens(m.tokens)]
+    ["Today", fmt4(t.total_usd), fmtCount(t.sessions), fmtCount(t.requests), fmtTokens2(t.tokens)],
+    ["This Week", fmt4(w.total_usd), fmtCount(w.sessions), fmtCount(w.requests), fmtTokens2(w.tokens)],
+    ["This Month", fmt4(m.total_usd), fmtCount(m.sessions), fmtCount(m.requests), fmtTokens2(m.tokens)]
   ]);
   if (dailyValues.length > 0) {
     console.log(`
@@ -8076,7 +8345,7 @@ program.command("sync").description("Ingest cost data from all coding agents").o
     console.log(chalk7.cyan(`\u2192 Backfilled machine_id='${machine}': ${reqCount.changes} requests, ${sessCount.changes} sessions`));
   }
   if (opts.recalculate) {
-    const { computeCostFromDb: computeCostFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
+    const { computeCostFromDb: computeCostFromDb2, getPricingFromDb: getPricingFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
     const zeroRows = db.prepare(`SELECT id, model, input_tokens, output_tokens, cache_read_tokens, cache_create_tokens, cache_create_5m_tokens, cache_create_1h_tokens FROM requests WHERE cost_usd = 0 AND (input_tokens > 0 OR output_tokens > 0 OR cache_read_tokens > 0 OR cache_create_tokens > 0)`).all();
     let fixed = 0;
     for (const r of zeroRows) {
@@ -8098,6 +8367,16 @@ program.command("sync").description("Ingest cost data from all coding agents").o
       }
     }
     console.log(chalk7.cyan(`\u2192 Recalculated: ${fixed}/${zeroRows.length} zero-cost requests now have pricing`));
+    const zeroCostBuckets = queryZeroCostTokenizedModels(db, 8);
+    if (zeroCostBuckets.length > 0) {
+      console.log(chalk7.yellow("\u2192 Zero-cost token buckets remain:"));
+      for (const row of zeroCostBuckets) {
+        const pricing = getPricingFromDb2(db, row.model);
+        const status = pricing ? pricing.inputPer1M === 0 && pricing.outputPer1M === 0 && pricing.cacheReadPer1M === 0 && pricing.cacheWritePer1M === 0 ? "explicit zero/free pricing" : "pricing configured; inspect/recalculate" : "missing pricing";
+        console.log(chalk7.yellow(`  ${row.agent}/${row.model}: ${row.requests} requests, ${fmtTokens2(row.total_tokens)} tokens (${status})`));
+      }
+      console.log(chalk7.dim("  Add pricing with `economy pricing set <model> --input ... --output ...`, then rerun `economy sync --recalculate`."));
+    }
   }
   try {
     const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
@@ -8140,7 +8419,7 @@ program.command("sessions").description("List coding sessions with costs").optio
   const f = opts.format ?? "table";
   if (f === "compact") {
     for (const s of sessions)
-      process.stdout.write(`${s.id.slice(0, 8)} ${s.agent} ${fmt4(s.total_cost_usd)} ${fmtTokens(s.total_tokens)} ${s.project_name || "\u2014"}
+      process.stdout.write(`${s.id.slice(0, 8)} ${s.agent} ${fmt4(s.total_cost_usd)} ${fmtTokens2(s.total_tokens)} ${s.project_name || "\u2014"}
 `);
     return;
   }
@@ -8160,7 +8439,7 @@ program.command("sessions").description("List coding sessions with costs").optio
     fmtAgent(s.agent),
     chalk7.white(s.project_name || chalk7.dim("unknown")),
     fmt4(s.total_cost_usd),
-    chalk7.cyan(fmtTokens(s.total_tokens)),
+    chalk7.cyan(fmtTokens2(s.total_tokens)),
     fmtCount(s.request_count),
     chalk7.dim(s.started_at.substring(0, 16))
   ]));
@@ -8171,9 +8450,7 @@ program.command("top").description("Most expensive sessions").option("-n <n>", "
   const agent = parseOptionalCliAgent(opts.agent);
   const db = openDatabase();
   const sinceDate = opts.since ? parseSinceDate2(opts.since) : undefined;
-  let sessions = queryTopSessions(db, count, agent);
-  if (sinceDate)
-    sessions = sessions.filter((s) => s.started_at >= sinceDate);
+  const sessions = queryTopSessions(db, count, agent, sinceDate);
   if (sessions.length === 0) {
     console.log(chalk7.yellow("No sessions found. Run `economy sync` first."));
     return;
@@ -8184,7 +8461,7 @@ program.command("top").description("Most expensive sessions").option("-n <n>", "
     chalk7.white(s.project_name || chalk7.dim("unknown")),
     fmtAgent(s.agent),
     fmt4(s.total_cost_usd),
-    chalk7.cyan(fmtTokens(s.total_tokens)),
+    chalk7.cyan(fmtTokens2(s.total_tokens)),
     chalk7.dim(s.started_at.substring(0, 16))
   ]));
   console.log();
@@ -8208,7 +8485,7 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
       chalk7.white(r.project_name || chalk7.dim("unknown")),
       String(r.sessions),
       String(r.requests),
-      chalk7.cyan(fmtTokens(r.total_tokens)),
+      chalk7.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.cost_usd)
     ]));
   } else if (opts.by === "agent") {
@@ -8230,7 +8507,7 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
       fmtAgent(r.agent),
       String(r.sessions),
       String(r.requests),
-      chalk7.cyan(fmtTokens(r.total_tokens)),
+      chalk7.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.api_equivalent_usd),
       fmt4(r.billable_usd),
       fmt4(r.subscription_included_usd)
@@ -8352,7 +8629,7 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
       chalk7.white(r.model),
       fmtAgent(r.agent),
       String(r.requests),
-      chalk7.cyan(fmtTokens(r.total_tokens)),
+      chalk7.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.cost_usd)
     ]));
   }
@@ -8514,7 +8791,7 @@ projectCmd.command("show <nameOrPath>").description("Detailed project breakdown
   printTable(["Metric", "Value"], [
     ["Total cost", fmt4(totalCost)],
     ["Sessions", fmtCount(sessions.length)],
-    ["Total tokens", fmtTokens(totalTokens)]
+    ["Total tokens", fmtTokens2(totalTokens)]
   ]);
   if (dailyValues.length > 0) {
     console.log(`
@@ -8647,8 +8924,8 @@ program.command("dashboard").description("Open the web dashboard (auto-starts se
   if (!serverRunning) {
     console.log(chalk7.cyan(`\u2192 Starting economy server on port ${port}...`));
     const { spawn } = await import("child_process");
-    const { resolve: resolve2, dirname: dirname3 } = await import("path");
-    const serveScript = resolve2(dirname3(process.argv[1]), "..", "server", "index.js");
+    const { resolve: resolve3, dirname: dirname3 } = await import("path");
+    const serveScript = resolve3(dirname3(process.argv[1]), "..", "server", "index.js");
     const child = spawn(process.execPath, [serveScript], {
       detached: true,
       stdio: "ignore",
@@ -8719,7 +8996,7 @@ program.command("session <id>").description("Show detailed breakdown of a single
     ["Started", String(session["started_at"]).substring(0, 19)],
     ["Ended", session["ended_at"] ? String(session["ended_at"]).substring(0, 19) : "\u2014"],
     ["Total cost", fmt4(session["total_cost_usd"])],
-    ["Total tokens", fmtTokens(session["total_tokens"])],
+    ["Total tokens", fmtTokens2(session["total_tokens"])],
     ["Requests", fmtCount(session["request_count"])]
   ]);
   if (requests.length > 0) {
@@ -8729,10 +9006,10 @@ program.command("session <id>").description("Show detailed breakdown of a single
     printTable(["Time", "Model", "Input", "Output", "Cache R", "Cache W", "Cost"], requests.slice(0, 50).map((r) => [
       chalk7.dim(String(r["timestamp"]).substring(11, 19)),
       chalk7.white(String(r["model"]).substring(0, 22)),
-      fmtTokens(r["input_tokens"]),
-      fmtTokens(r["output_tokens"]),
-      fmtTokens(r["cache_read_tokens"]),
-      fmtTokens(r["cache_create_tokens"]),
+      fmtTokens2(r["input_tokens"]),
+      fmtTokens2(r["output_tokens"]),
+      fmtTokens2(r["cache_read_tokens"]),
+      fmtTokens2(r["cache_create_tokens"]),
       fmt4(r["cost_usd"])
     ]));
     if (requests.length > 50)
@@ -8763,6 +9040,31 @@ program.command("machines").description("List all machines that have synced data
   ${chalk7.dim("Current machine:")} ${chalk7.bold(current)}`);
   console.log();
 });
+program.command("fleet-sync").description("Loop-safe cross-machine sync using remote SQLite snapshots").option("--machine <ids>", "Comma-separated remote machines", "spark02,apple03").option("--no-local-sync", "Skip local economy sync before remote merge").option("--no-remote-sync", "Skip remote economy sync before snapshot").option("--cache-dir <path>", "Directory for verified pulled DB snapshots").option("--report-dir <path>", "Directory for JSON evidence reports").option("--remote-snapshot-dir <path>", "Remote snapshot directory", "$HOME/.hasna/economy/fleet-sync-snapshots").option("--timeout-ms <n>", "Per remote command timeout", "120000").option("--dry-run", "Plan without syncing, pulling, or merging").option("--json", "Output JSON").action((opts) => {
+  const result = runEconomyFleetSync({
+    machines: opts.machine?.split(",").map((entry) => entry.trim()).filter(Boolean),
+    localSync: opts.localSync !== false,
+    remoteSync: opts.remoteSync !== false,
+    cacheDir: opts.cacheDir,
+    remoteSnapshotDir: opts.remoteSnapshotDir,
+    timeoutMs: parsePositiveCliInteger(opts.timeoutMs, "--timeout-ms"),
+    dryRun: opts.dryRun
+  });
+  const reportPath = opts.reportDir ? writeFleetSyncReport(opts.reportDir, result) : undefined;
+  if (opts.json) {
+    console.log(JSON.stringify({ ...result, ...reportPath ? { report_path: reportPath } : {} }, null, 2));
+    return;
+  }
+  const status = result.summary.failed === 0 ? chalk7.green("ok") : chalk7.red("failed");
+  console.log(`${status} machines=${result.summary.machines} merged=${result.summary.merged} failed=${result.summary.failed} dry_run=${result.summary.dry_run}`);
+  if (reportPath)
+    console.log(chalk7.dim(`report=${reportPath}`));
+  for (const row of result.remote.filter((entry) => entry.status !== "merged").slice(0, 20)) {
+    console.log(`${row.status === "failed" ? chalk7.red("failed") : chalk7.yellow(row.status)} ${row.machine} ${chalk7.dim(row.error ?? "")}`);
+  }
+  if (result.local.status === "failed" || result.summary.failed > 0)
+    process.exitCode = 1;
+});
 program.command("merge-db <source-db>").description("Merge another Economy SQLite database into this machine").option("--source-machine <id>", "Machine id to use for source rows that do not have one").option("--json", "Output JSON").action((sourceDb, opts) => {
   const db = openDatabase();
   const result = mergePeerDatabase(db, sourceDb, { sourceMachine: opts.sourceMachine });
@@ -8802,8 +9104,8 @@ program.command("export").description("Export data as CSV").option("--type <type
     }
   }
   if (opts.output) {
-    const { writeFileSync: writeFileSync4 } = await import("fs");
-    writeFileSync4(opts.output, csv);
+    const { writeFileSync: writeFileSync5 } = await import("fs");
+    writeFileSync5(opts.output, csv);
     console.log(chalk7.green(`\u2713 Exported to ${opts.output}`));
   } else {
     process.stdout.write(csv);
@@ -8875,7 +9177,7 @@ program.command("compare <period1> <period2>").description("Compare two periods
     ["Cost", fmt4(a.cost), fmt4(b.cost), delta(a.cost, b.cost)],
     ["Sessions", fmtCount(a.sessions), fmtCount(b.sessions), delta(a.sessions, b.sessions)],
     ["Requests", fmtCount(a.requests), fmtCount(b.requests), delta(a.requests, b.requests)],
-    ["Tokens", fmtTokens(a.tokens), fmtTokens(b.tokens), delta(a.tokens, b.tokens)]
+    ["Tokens", fmtTokens2(a.tokens), fmtTokens2(b.tokens), delta(a.tokens, b.tokens)]
   ]);
   console.log();
 });