@hasna/economy 0.2.17 → 0.2.18

package/dist/cli/index.js

@@ -79,7 +79,6 @@ var DEFAULT_PRICING;
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
-    "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
     "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
     "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
     "claude-sonnet-4-6": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
@@ -90,95 +89,28 @@ var init_pricing = __esm(() => {
     "claude-3-opus": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75 },
     "claude-3-sonnet": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
     "claude-3-haiku": { inputPer1M: 0.25, outputPer1M: 1.25, cacheReadPer1M: 0.03, cacheWritePer1M: 0.3 },
-    "gemini-3.1-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.31, cacheWritePer1M: 0 },
-    "gemini-2.5-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gemini-2.5-flash": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "gemini-2.0-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "gemini-2.5-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "gemini-1.5-pro": { inputPer1M: 1.25, outputPer1M: 5, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "gemini-1.5-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gpt-5.4": { inputPer1M: 2.5, outputPer1M: 15, cacheReadPer1M: 0.25, cacheWritePer1M: 0 },
-    "gpt-5.4-pro": { inputPer1M: 30, outputPer1M: 180, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gpt-5.4-mini": { inputPer1M: 0.75, outputPer1M: 4.5, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
     "gpt-5.3-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
-    "gpt-5.3-chat": { inputPer1M: 2, outputPer1M: 8, cacheReadPer1M: 0.5, cacheWritePer1M: 0 },
     "gpt-5.2-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
     "gpt-5-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
-    "gpt-5-mini": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
-    "gpt-5.2": { inputPer1M: 2, outputPer1M: 8, cacheReadPer1M: 0.5, cacheWritePer1M: 0 },
     "gpt-4o": { inputPer1M: 2.5, outputPer1M: 10, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
     "gpt-4o-mini": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
     o1: { inputPer1M: 15, outputPer1M: 60, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
     "o1-mini": { inputPer1M: 3, outputPer1M: 12, cacheReadPer1M: 1.5, cacheWritePer1M: 0 },
     o3: { inputPer1M: 10, outputPer1M: 40, cacheReadPer1M: 2.5, cacheWritePer1M: 0 },
     "o3-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.55, cacheWritePer1M: 0 },
-    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, cacheWritePer1M: 0 },
-    "qwen3.6-plus": { inputPer1M: 0.8, outputPer1M: 2, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "qwen3.6": { inputPer1M: 0.3, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "minimax-m2.7": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "minimax-m2.7-highspeed": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "minimax-m1": { inputPer1M: 0.2, outputPer1M: 1.1, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "grok-3": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "grok-3-mini": { inputPer1M: 0.3, outputPer1M: 0.5, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "glm-5.1": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "glm-5": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "kimi-k2": { inputPer1M: 0.6, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 }
+    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, cacheWritePer1M: 0 }
   };
 });
 
 // src/db/database.ts
-var exports_database = {};
-__export(exports_database, {
-  upsertSession: () => upsertSession,
-  upsertRequest: () => upsertRequest,
-  upsertProject: () => upsertProject,
-  upsertModelPricing: () => upsertModelPricing,
-  upsertGoal: () => upsertGoal,
-  upsertBudget: () => upsertBudget,
-  upsertBillingDaily: () => upsertBillingDaily,
-  setIngestState: () => setIngestState,
-  seedModelPricing: () => seedModelPricing,
-  rollupSession: () => rollupSession,
-  queryTopSessions: () => queryTopSessions,
-  querySummary: () => querySummary,
-  querySessions: () => querySessions,
-  queryRequestsSince: () => queryRequestsSince,
-  queryProjectBreakdown: () => queryProjectBreakdown,
-  queryModelBreakdown: () => queryModelBreakdown,
-  queryDailyBreakdown: () => queryDailyBreakdown,
-  queryBillingSummary: () => queryBillingSummary,
-  openDatabase: () => openDatabase,
-  listProjects: () => listProjects,
-  listModelPricing: () => listModelPricing,
-  listMachines: () => listMachines,
-  listGoals: () => listGoals,
-  listBudgets: () => listBudgets,
-  getProject: () => getProject,
-  getModelPricing: () => getModelPricing,
-  getMachineId: () => getMachineId,
-  getIngestState: () => getIngestState,
-  getGoalStatuses: () => getGoalStatuses,
-  getDbPath: () => getDbPath,
-  getDataDir: () => getDataDir,
-  getBudgetStatuses: () => getBudgetStatuses,
-  deleteProject: () => deleteProject,
-  deleteModelPricing: () => deleteModelPricing,
-  deleteGoal: () => deleteGoal,
-  deleteBudget: () => deleteBudget,
-  clearBillingRange: () => clearBillingRange
-});
 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");
@@ -211,7 +143,6 @@ 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) {
@@ -233,8 +164,7 @@ function initSchema(db) {
       cost_usd REAL NOT NULL DEFAULT 0,
       duration_ms INTEGER DEFAULT 0,
       timestamp TEXT NOT NULL,
-      source_request_id TEXT,
-      machine_id TEXT DEFAULT ''
+      source_request_id TEXT
     );
 
     CREATE TABLE IF NOT EXISTS sessions (
@@ -246,8 +176,7 @@ function initSchema(db) {
       ended_at TEXT,
       total_cost_usd REAL DEFAULT 0,
       total_tokens INTEGER DEFAULT 0,
-      request_count INTEGER DEFAULT 0,
-      machine_id TEXT DEFAULT ''
+      request_count INTEGER DEFAULT 0
     );
 
     CREATE TABLE IF NOT EXISTS projects (
@@ -312,27 +241,6 @@ function initSchema(db) {
       machine_id TEXT,
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
-
-    CREATE TABLE IF NOT EXISTS billing_daily (
-      date TEXT NOT NULL,
-      provider TEXT NOT NULL,
-      description TEXT DEFAULT '',
-      cost_usd REAL NOT NULL DEFAULT 0,
-      updated_at TEXT NOT NULL,
-      PRIMARY KEY (date, provider, description)
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date);
-    CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider);
-  `);
-  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) {
@@ -342,11 +250,11 @@ function periodWhere(period) {
     case "yesterday":
       return `DATE(timestamp) = DATE('now', '-1 day')`;
     case "week":
-      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
+      return `timestamp >= DATE('now', '-7 days')`;
     case "month":
-      return `timestamp >= DATE('now', 'start of month')`;
+      return `timestamp >= DATE('now', '-30 days')`;
     case "year":
-      return `timestamp >= DATE('now', 'start of year')`;
+      return `timestamp >= DATE('now', '-365 days')`;
     case "all":
       return "1=1";
   }
@@ -358,11 +266,11 @@ function sessionPeriodWhere(period) {
     case "yesterday":
       return `DATE(started_at) = DATE('now', '-1 day')`;
     case "week":
-      return `started_at >= DATE('now', 'weekday 0', '-7 days')`;
+      return `started_at >= DATE('now', '-7 days')`;
     case "month":
-      return `started_at >= DATE('now', 'start of month')`;
+      return `started_at >= DATE('now', '-30 days')`;
     case "year":
-      return `started_at >= DATE('now', 'start of year')`;
+      return `started_at >= DATE('now', '-365 days')`;
     case "all":
       return "1=1";
   }
@@ -372,17 +280,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, 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 ?? "");
+       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);
 }
 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, 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 ?? "");
+       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);
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -412,10 +320,6 @@ 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 ?)");
@@ -434,25 +338,24 @@ 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, machine) {
+function querySummary(db, period) {
   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}${machineClause}
+    FROM requests WHERE ${rWhere}
   `).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}${machineClause}
+    WHERE ${sWhere}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
   `).get();
-  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}${machineClause}`).get();
+  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}`).get();
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
     requests: r.requests,
@@ -472,66 +375,23 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
-function labelForPath(projectPath, projectName) {
-  if (projectName && projectName.trim() !== "")
-    return projectName;
-  if (!projectPath)
-    return "";
-  const segments = projectPath.split("/").filter(Boolean);
-  const projectPrefix = /^(open|skill|hook|service|connect|platform|agent|tool|iapp|project|scaffold|capp)-/;
-  for (const seg of segments) {
-    if (projectPrefix.test(seg))
-      return seg;
-  }
-  const generic = new Set(["web", "app", "apps", "packages", "src", "lib", "server", "client", "api", "frontend", "backend"]);
-  for (let i = segments.length - 1;i >= 0; i--) {
-    if (!generic.has(segments[i].toLowerCase()))
-      return segments[i];
-  }
-  return segments[segments.length - 1] ?? projectPath;
-}
 function queryProjectBreakdown(db) {
-  const sessions = db.prepare(`
-    SELECT id, project_path, project_name, total_cost_usd, started_at
-    FROM sessions
-    WHERE project_path != '' OR project_name != ''
+  return db.prepare(`
+    SELECT
+      s.project_path,
+      COALESCE(p.name, s.project_name) as project_name,
+      COUNT(DISTINCT s.id) as sessions,
+      COUNT(r.id) as requests,
+      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
+      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
+      MAX(s.started_at) as last_active
+    FROM sessions s
+    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
+    LEFT JOIN requests r ON r.session_id = s.id
+    WHERE s.project_path != '' OR s.project_name != ''
+    GROUP BY s.project_path
+    ORDER BY cost_usd DESC
   `).all();
-  const groups = new Map;
-  for (const s of sessions) {
-    const label = labelForPath(s.project_path, s.project_name);
-    if (!label)
-      continue;
-    const g = groups.get(label) ?? { sessionIds: [], samplePath: s.project_path, totalCost: 0, lastActive: "" };
-    g.sessionIds.push(s.id);
-    g.totalCost += s.total_cost_usd || 0;
-    if (!g.lastActive || s.started_at > g.lastActive)
-      g.lastActive = s.started_at;
-    if (!g.samplePath)
-      g.samplePath = s.project_path;
-    groups.set(label, g);
-  }
-  const result = [];
-  for (const [label, g] of groups.entries()) {
-    const placeholders = g.sessionIds.map(() => "?").join(",");
-    const reqStats = placeholders.length ? db.prepare(`
-          SELECT
-            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
-          FROM requests WHERE session_id IN (${placeholders})
-        `).get(...g.sessionIds) : { requests: 0, cost_usd: 0, total_tokens: 0 };
-    result.push({
-      project_path: g.samplePath,
-      project_name: label,
-      sessions: g.sessionIds.length,
-      requests: reqStats.requests,
-      total_tokens: reqStats.total_tokens,
-      cost_usd: reqStats.cost_usd > 0 ? reqStats.cost_usd : g.totalCost,
-      last_active: g.lastActive
-    });
-  }
-  result.sort((a, b) => b.cost_usd - a.cost_usd);
-  return result;
 }
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`
@@ -649,40 +509,6 @@ 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 upsertBillingDaily(db, row) {
-  db.prepare(`
-    INSERT OR REPLACE INTO billing_daily (date, provider, description, cost_usd, updated_at)
-    VALUES (?, ?, ?, ?, ?)
-  `).run(row.date, row.provider, row.description, row.cost_usd, row.updated_at);
-}
-function clearBillingRange(db, provider, fromDate, toDate) {
-  db.prepare(`DELETE FROM billing_daily WHERE provider = ? AND date >= ? AND date <= ?`).run(provider, fromDate, toDate);
-}
-function queryBillingSummary(db, period) {
-  const where = period === "today" ? `date = DATE('now')` : period === "yesterday" ? `date = DATE('now', '-1 day')` : period === "week" ? `date >= DATE('now', 'weekday 0', '-7 days')` : period === "month" ? `date >= DATE('now', 'start of month')` : period === "year" ? `date >= DATE('now', 'start of year')` : "1=1";
-  const rows = db.prepare(`SELECT provider, SUM(cost_usd) as cost FROM billing_daily WHERE ${where} GROUP BY provider`).all();
-  const by_provider = {};
-  let total = 0;
-  for (const r of rows) {
-    by_provider[r.provider] = r.cost;
-    total += r.cost;
-  }
-  return { total_usd: total, by_provider };
-}
-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
@@ -700,11 +526,11 @@ function deleteModelPricing(db, model) {
   db.prepare(`DELETE FROM model_pricing WHERE model = ?`).run(model);
 }
 function seedModelPricing(db, defaults) {
-  const existing = new Set(db.prepare(`SELECT model FROM model_pricing`).all().map((r) => r.model));
+  const existing = db.prepare(`SELECT COUNT(*) as count FROM model_pricing`).get();
+  if (existing.count > 0)
+    return;
   const now = new Date().toISOString();
   for (const [model, p] of Object.entries(defaults)) {
-    if (existing.has(model))
-      continue;
     upsertModelPricing(db, {
       model,
       input_per_1m: p.inputPer1M,
@@ -743,36 +569,29 @@ function collectJsonlFiles(projectDir) {
   return files;
 }
 async function ingestClaude(db, verbose = false, _telemetryDir) {
-  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 (!existsSync3(PROJECTS_DIR)) {
     if (verbose)
-      console.log(`${agentName} projects dir not found:`, projectsDir);
+      console.log("Claude projects dir not found:", PROJECTS_DIR);
     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(projectsDir, { withFileTypes: true }).filter((d) => d.isDirectory());
+  const projectDirs = readdirSync2(PROJECTS_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
   for (const projectDirEntry of projectDirs) {
-    const projectDirPath = join4(projectsDir, projectDirEntry.name);
+    const projectDirPath = join4(PROJECTS_DIR, projectDirEntry.name);
     const projectPath = dirNameToPath(projectDirEntry.name);
     const jsonlFiles = collectJsonlFiles(projectDirPath);
     for (const filePath of jsonlFiles) {
-      const stateKey = filePath.replace(projectsDir, "");
+      const stateKey = filePath.replace(PROJECTS_DIR, "");
       let fileMtime = "0";
       try {
         fileMtime = statSync2(filePath).mtimeMs.toString();
       } catch {
         continue;
       }
-      const processed = getIngestState(db, agentName, stateKey);
+      const processed = getIngestState(db, "claude", stateKey);
       if (processed === fileMtime)
         continue;
       let lines;
@@ -813,10 +632,10 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
         if (inputTokens + outputTokens + cacheWriteTokens === 0)
           continue;
         const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
-        const reqId = `${agentName}-${sessionId}-${timestamp}`;
+        const reqId = `claude-${sessionId}-${timestamp}`;
         upsertRequest(db, {
           id: reqId,
-          agent: agentName,
+          agent: "claude",
           session_id: sessionId,
           model,
           input_tokens: inputTokens,
@@ -826,8 +645,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
           cost_usd: costUsd,
           duration_ms: 0,
           timestamp,
-          source_request_id: reqId,
-          machine_id: machineId
+          source_request_id: reqId
         });
         if (!touchedSessions.has(sessionId)) {
           const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
@@ -836,15 +654,14 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
             const detectedProject = autoDetectProject(effectiveCwd, registeredProjects);
             const session = {
               id: sessionId,
-              agent: agentName,
+              agent: "claude",
               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,
-              machine_id: machineId
+              request_count: 0
             };
             upsertSession(db, session);
           }
@@ -852,7 +669,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
         }
         totalRequests++;
       }
-      setIngestState(db, agentName, stateKey, fileMtime);
+      setIngestState(db, "claude", stateKey, fileMtime);
       totalFiles++;
     }
   }
@@ -861,30 +678,28 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
   }
   return { files: totalFiles, requests: totalRequests, sessions: touchedSessions.size };
 }
-var CLAUDE_PROJECTS_DIR, TAKUMI_PROJECTS_DIR;
+var PROJECTS_DIR;
 var init_claude = __esm(() => {
   init_database();
   init_pricing();
-  CLAUDE_PROJECTS_DIR = join4(homedir2(), ".claude", "projects");
-  TAKUMI_PROJECTS_DIR = join4(homedir2(), ".takumi", "projects");
+  PROJECTS_DIR = join4(homedir2(), ".claude", "projects");
 });
 
 // src/ingest/codex.ts
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join5, basename as basename2 } from "path";
-import { Database as BunDatabase } from "bun:sqlite";
+import { Database as Database2 } from "bun:sqlite";
 async function ingestCodex(db, verbose = false) {
   if (!existsSync4(CODEX_DB_PATH)) {
     if (verbose)
       console.log("Codex DB not found:", CODEX_DB_PATH);
     return { sessions: 0 };
   }
-  const machineId = getMachineId();
   let codexDb = null;
   let ingested = 0;
   try {
-    codexDb = new BunDatabase(CODEX_DB_PATH, { readonly: true });
+    codexDb = new Database2(CODEX_DB_PATH, { readonly: true });
     const threads = codexDb.prepare(`SELECT id, cwd, created_at, updated_at, tokens_used, title FROM threads WHERE tokens_used > 0`).all();
     for (const thread of threads) {
       const stateKey = thread.id;
@@ -905,8 +720,7 @@ async function ingestCodex(db, verbose = false) {
         ended_at: endedAt,
         total_cost_usd: costUsd,
         total_tokens: thread.tokens_used,
-        request_count: 1,
-        machine_id: machineId
+        request_count: 1
       });
       setIngestState(db, "codex", stateKey, "done");
       ingested++;
@@ -925,88 +739,6 @@ var init_codex = __esm(() => {
   CODEX_CONFIG_PATH = join5(homedir3(), ".codex", "config.toml");
 });
 
-// src/ingest/gemini.ts
-import { readdirSync as readdirSync3, readFileSync as readFileSync4, existsSync as existsSync5, statSync as statSync3 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join6 } from "path";
-async function ingestGemini(db, verbose) {
-  if (!existsSync5(GEMINI_TMP_DIR)) {
-    if (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 = [];
-  try {
-    projectHashDirs = readdirSync3(GEMINI_TMP_DIR, { withFileTypes: true }).filter((d) => d.isDirectory() && /^[0-9a-f]{64}$/.test(d.name)).map((d) => join6(GEMINI_TMP_DIR, d.name));
-  } catch {
-    return { sessions: 0 };
-  }
-  for (const projectDir of projectHashDirs) {
-    const chatsDir = join6(projectDir, "chats");
-    if (!existsSync5(chatsDir))
-      continue;
-    let chatFiles = [];
-    try {
-      chatFiles = readdirSync3(chatsDir).filter((f) => f.endsWith(".json")).map((f) => join6(chatsDir, f));
-    } catch {
-      continue;
-    }
-    for (const filePath of chatFiles) {
-      const stateKey = filePath.replace(homedir4(), "~");
-      let fileMtime = "0";
-      try {
-        fileMtime = statSync3(filePath).mtimeMs.toString();
-      } catch {
-        continue;
-      }
-      const processed = getIngestState(db, "gemini", stateKey);
-      if (processed === fileMtime)
-        continue;
-      let chatData;
-      try {
-        chatData = JSON.parse(readFileSync4(filePath, "utf-8"));
-      } catch {
-        continue;
-      }
-      const sessionId = chatData.sessionId;
-      if (!sessionId)
-        continue;
-      const startTime = chatData.startTime ?? new Date().toISOString();
-      const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
-      if (!existing) {
-        const session = {
-          id: sessionId,
-          agent: "gemini",
-          project_path: "",
-          project_name: "",
-          started_at: startTime,
-          ended_at: chatData.lastUpdated ?? null,
-          total_cost_usd: 0,
-          total_tokens: 0,
-          request_count: 0,
-          machine_id: machineId
-        };
-        upsertSession(db, session);
-        touchedSessions.add(sessionId);
-        totalSessions++;
-      }
-      setIngestState(db, "gemini", stateKey, fileMtime);
-    }
-  }
-  for (const sessionId of touchedSessions) {
-    rollupSession(db, sessionId);
-  }
-  return { sessions: totalSessions };
-}
-var GEMINI_TMP_DIR;
-var init_gemini = __esm(() => {
-  init_database();
-  GEMINI_TMP_DIR = join6(homedir4(), ".gemini", "tmp");
-});
-
 // src/lib/config.ts
 var exports_config = {};
 __export(exports_config, {
@@ -1015,12 +747,12 @@ __export(exports_config, {
   loadConfig: () => loadConfig2,
   getConfigValue: () => getConfigValue
 });
-import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
 import { join as join7 } from "path";
 function loadConfig2() {
   try {
     if (existsSync6(CONFIG_PATH2)) {
-      const raw = readFileSync6(CONFIG_PATH2, "utf-8");
+      const raw = readFileSync5(CONFIG_PATH2, "utf-8");
       return { ...DEFAULTS, ...JSON.parse(raw) };
     }
   } catch {}
@@ -1230,20 +962,6 @@ function ok(data, meta) {
 function err(message, status = 400) {
   return json({ error: message }, status);
 }
-function normalizeBudgetPeriod(value) {
-  switch (value) {
-    case "day":
-    case "daily":
-      return "daily";
-    case "week":
-    case "weekly":
-      return "weekly";
-    case "month":
-    case "monthly":
-    default:
-      return "monthly";
-  }
-}
 function applyFields(obj, fields) {
   if (!fields || fields.length === 0)
     return obj;
@@ -1260,11 +978,7 @@ function createHandler(db) {
       return ok({ status: "ok", ts: new Date().toISOString() });
     if (path === "/api/summary" && method === "GET") {
       const period = url.searchParams.get("period") ?? "today";
-      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() });
+      return ok(querySummary(db, period));
     }
     if (path === "/api/daily" && method === "GET") {
       const days = Number(url.searchParams.get("days") ?? 30);
@@ -1273,22 +987,12 @@ function createHandler(db) {
     if (path === "/api/sessions" && method === "GET") {
       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;
       const fieldsParam = url.searchParams.get("fields");
       const fields = fieldsParam ? fieldsParam.split(",").map((f) => f.trim()).filter(Boolean) : undefined;
-      const sessions = querySessions(db, {
-        agent: agent ?? undefined,
-        project,
-        search,
-        machine,
-        limit,
-        offset,
-        since
-      });
+      const sessions = querySessions(db, { agent: agent ?? undefined, project, limit, offset, since });
       return ok(fields ? sessions.map((s) => applyFields(s, fields)) : sessions, { limit, offset });
     }
     if (path === "/api/top" && method === "GET") {
@@ -1316,7 +1020,7 @@ function createHandler(db) {
         id: randomUUID(),
         project_path: body["project_path"] ?? null,
         agent: body["agent"] ?? null,
-        period: normalizeBudgetPeriod(body["period"]),
+        period: body["period"] ?? "monthly",
         limit_usd: Number(body["limit_usd"]),
         alert_at_percent: Number(body["alert_at_percent"] ?? 80),
         created_at: now,
@@ -1377,12 +1081,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")
-        results["gemini"] = await ingestGemini(db);
       return ok(results);
     }
     const sessionRequestsMatch = path.match(/^\/api\/sessions\/([^/]+)\/requests$/);
@@ -1455,7 +1155,6 @@ var init_serve = __esm(() => {
   init_database();
   init_claude();
   init_codex();
-  init_gemini();
   init_pricing();
   CORS = {
     "Access-Control-Allow-Origin": "*",
@@ -1593,102 +1292,6 @@ 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";
@@ -2047,148 +1650,94 @@ ${chalk.dim("Set it active:")} economy brains model set ${String(status["fine_tu
 init_database();
 init_claude();
 init_codex();
-init_gemini();
 
-// src/ingest/billing.ts
+// src/ingest/gemini.ts
 init_database();
-function getAnthropicAdminKey() {
-  return process.env["HASNAXYZ_ANTHROPIC_LIVE_ADMIN_API_KEY"] ?? process.env["ANTHROPIC_ADMIN_API_KEY"] ?? null;
-}
-function getOpenAIAdminKey() {
-  return process.env["HASNAXYZ_OPENAI_LIVE_ADMIN_API_KEY"] ?? process.env["OPENAI_ADMIN_API_KEY"] ?? null;
-}
-function toISODate(d) {
-  return d.toISOString().substring(0, 10);
-}
-async function syncAnthropicBilling(db, opts = {}) {
-  const key = getAnthropicAdminKey();
-  if (!key)
-    throw new Error("Missing Anthropic admin key (HASNAXYZ_ANTHROPIC_LIVE_ADMIN_API_KEY)");
-  const now = new Date;
-  const end = opts.toDate ? new Date(opts.toDate) : new Date(now.getTime() + 24 * 3600000);
-  const days = opts.days ?? 31;
-  const start = opts.fromDate ? new Date(opts.fromDate) : new Date(end.getTime() - days * 24 * 3600000);
-  const startIso = start.toISOString().replace(/\.\d+/, "").replace(/:\d{2}Z$/, ":00Z");
-  const endIso = end.toISOString().replace(/\.\d+/, "").replace(/:\d{2}Z$/, ":00Z");
-  let totalUsd = 0;
-  const buckets = [];
-  let nextPage;
-  do {
-    const url = new URL("https://api.anthropic.com/v1/organizations/cost_report");
-    url.searchParams.set("starting_at", startIso);
-    url.searchParams.set("ending_at", endIso);
-    url.searchParams.set("bucket_width", "1d");
-    url.searchParams.set("limit", "31");
-    url.searchParams.append("group_by[]", "description");
-    if (nextPage)
-      url.searchParams.set("page", nextPage);
-    const res = await fetch(url.toString(), {
-      headers: { "anthropic-version": "2023-06-01", "x-api-key": key }
-    });
-    const data = await res.json();
-    if (data.error)
-      throw new Error(`Anthropic API: ${data.error.message}`);
-    if (data.data)
-      buckets.push(...data.data);
-    nextPage = data.has_more ? data.next_page : undefined;
-  } while (nextPage);
-  const fromDateStr = toISODate(start);
-  const toDateStr = toISODate(new Date(end.getTime() - 1000));
-  clearBillingRange(db, "anthropic", fromDateStr, toDateStr);
-  const updatedAt = new Date().toISOString();
-  for (const bucket of buckets) {
-    const date = bucket.starting_at.substring(0, 10);
-    for (const r of bucket.results) {
-      const usd = Number(r.amount) / 100;
-      if (usd === 0)
-        continue;
-      const desc = (r.description ?? "unknown").substring(0, 200);
-      upsertBillingDaily(db, { date, provider: "anthropic", description: desc, cost_usd: usd, updated_at: updatedAt });
-      totalUsd += usd;
-    }
+import { readdirSync as readdirSync3, readFileSync as readFileSync4, existsSync as existsSync5, statSync as statSync3 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join6 } from "path";
+var GEMINI_TMP_DIR = join6(homedir4(), ".gemini", "tmp");
+async function ingestGemini(db, verbose) {
+  if (!existsSync5(GEMINI_TMP_DIR)) {
+    if (verbose)
+      console.log("Gemini tmp dir not found:", GEMINI_TMP_DIR);
+    return { sessions: 0 };
   }
-  return { days: buckets.length, totalUsd };
-}
-async function syncOpenAIBilling(db, opts = {}) {
-  const key = getOpenAIAdminKey();
-  if (!key)
-    throw new Error("Missing OpenAI admin key (HASNAXYZ_OPENAI_LIVE_ADMIN_API_KEY)");
-  const now = new Date;
-  const end = opts.toDate ? new Date(opts.toDate) : now;
-  const days = opts.days ?? 31;
-  const start = opts.fromDate ? new Date(opts.fromDate) : new Date(end.getTime() - days * 24 * 3600000);
-  const startSec = Math.floor(start.getTime() / 1000);
-  const endSec = Math.floor(end.getTime() / 1000);
-  let totalUsd = 0;
-  const buckets = [];
-  let nextPage;
-  do {
-    const url = new URL("https://api.openai.com/v1/organization/costs");
-    url.searchParams.set("start_time", String(startSec));
-    url.searchParams.set("end_time", String(endSec));
-    url.searchParams.set("bucket_width", "1d");
-    url.searchParams.set("limit", "31");
-    url.searchParams.append("group_by[]", "line_item");
-    if (nextPage)
-      url.searchParams.set("page", nextPage);
-    const res = await fetch(url.toString(), {
-      headers: { Authorization: `Bearer ${key}` }
-    });
-    const data = await res.json();
-    if (data.error)
-      throw new Error(`OpenAI API: ${data.error.message}`);
-    if (data.data)
-      buckets.push(...data.data);
-    nextPage = data.has_more ? data.next_page : undefined;
-  } while (nextPage);
-  const fromDateStr = toISODate(start);
-  const toDateStr = toISODate(new Date(end.getTime() - 1000));
-  clearBillingRange(db, "openai", fromDateStr, toDateStr);
-  const updatedAt = new Date().toISOString();
-  for (const bucket of buckets) {
-    const date = new Date(bucket.start_time * 1000).toISOString().substring(0, 10);
-    for (const r of bucket.results) {
-      const usd = Number(r.amount?.value ?? 0);
-      if (usd === 0)
+  let totalSessions = 0;
+  const touchedSessions = new Set;
+  let projectHashDirs = [];
+  try {
+    projectHashDirs = readdirSync3(GEMINI_TMP_DIR, { withFileTypes: true }).filter((d) => d.isDirectory() && /^[0-9a-f]{64}$/.test(d.name)).map((d) => join6(GEMINI_TMP_DIR, d.name));
+  } catch {
+    return { sessions: 0 };
+  }
+  for (const projectDir of projectHashDirs) {
+    const chatsDir = join6(projectDir, "chats");
+    if (!existsSync5(chatsDir))
+      continue;
+    let chatFiles = [];
+    try {
+      chatFiles = readdirSync3(chatsDir).filter((f) => f.endsWith(".json")).map((f) => join6(chatsDir, f));
+    } catch {
+      continue;
+    }
+    for (const filePath of chatFiles) {
+      const stateKey = filePath.replace(homedir4(), "~");
+      let fileMtime = "0";
+      try {
+        fileMtime = statSync3(filePath).mtimeMs.toString();
+      } catch {
+        continue;
+      }
+      const processed = getIngestState(db, "gemini", stateKey);
+      if (processed === fileMtime)
+        continue;
+      let chatData;
+      try {
+        chatData = JSON.parse(readFileSync4(filePath, "utf-8"));
+      } catch {
+        continue;
+      }
+      const sessionId = chatData.sessionId;
+      if (!sessionId)
         continue;
-      const desc = (r.line_item ?? "unknown").substring(0, 200);
-      upsertBillingDaily(db, { date, provider: "openai", description: desc, cost_usd: usd, updated_at: updatedAt });
-      totalUsd += usd;
+      const startTime = chatData.startTime ?? new Date().toISOString();
+      const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
+      if (!existing) {
+        const session = {
+          id: sessionId,
+          agent: "gemini",
+          project_path: "",
+          project_name: "",
+          started_at: startTime,
+          ended_at: chatData.lastUpdated ?? null,
+          total_cost_usd: 0,
+          total_tokens: 0,
+          request_count: 0
+        };
+        upsertSession(db, session);
+        touchedSessions.add(sessionId);
+        totalSessions++;
+      }
+      setIngestState(db, "gemini", stateKey, fileMtime);
     }
   }
-  return { days: buckets.length, totalUsd };
-}
-
-// src/cli/index.ts
-init_database();
-
-// src/lib/package-metadata.ts
-import { readFileSync as readFileSync5 } from "fs";
-var cachedMetadata = null;
-function getPackageMetadata() {
-  if (cachedMetadata)
-    return cachedMetadata;
-  const raw = readFileSync5(new URL("../../package.json", import.meta.url), "utf8");
-  const parsed = JSON.parse(raw);
-  cachedMetadata = {
-    name: parsed.name ?? "@hasna/economy",
-    version: parsed.version ?? "0.0.0"
-  };
-  return cachedMetadata;
+  for (const sessionId of touchedSessions) {
+    rollupSession(db, sessionId);
+  }
+  return { sessions: totalSessions };
 }
-var packageMetadata = getPackageMetadata();
 
 // src/cli/index.ts
 init_pricing();
 import { randomUUID as randomUUID2 } from "crypto";
 import { execSync as execSync2 } from "child_process";
 var program = new Command;
-program.name("economy").description("AI coding cost tracker \u2014 Claude Code, Codex, and Gemini").version(packageMetadata.version);
+program.name("economy").description("AI coding cost tracker \u2014 Claude Code, Codex, and Gemini").version("0.2.2");
 async function autoSync() {
   const db = openDatabase();
   ensurePricingSeeded(db);
   await ingestClaude(db);
-  await ingestTakumi(db);
   await ingestCodex(db);
   await ingestGemini(db);
 }
@@ -2301,7 +1850,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("--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").option("--recalculate", "Recalculate costs for all requests with cost_usd = 0").action(async (opts) => {
+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) => {
   const db = openDatabase();
   ensurePricingSeeded(db);
   if (opts.force) {
@@ -2309,9 +1858,8 @@ 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.takumi || opts.codex || opts.gemini;
+  const anySpecific = opts.claude || 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) {
@@ -2319,11 +1867,6 @@ 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);
@@ -2334,35 +1877,6 @@ 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`));
-  }
-  if (opts.recalculate) {
-    const { computeCostFromDb: computeCostFromDb2 } = 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 FROM requests WHERE cost_usd = 0 AND (input_tokens > 0 OR output_tokens > 0)`).all();
-    let fixed = 0;
-    for (const r of zeroRows) {
-      const cost = computeCostFromDb2(db, r.model, r.input_tokens, r.output_tokens, r.cache_read_tokens, r.cache_create_tokens);
-      if (cost > 0) {
-        db.prepare(`UPDATE requests SET cost_usd = ? WHERE id = ?`).run(cost, r.id);
-        fixed++;
-      }
-    }
-    if (fixed > 0) {
-      const touchedSessions = new Set(zeroRows.map((r) => {
-        const row = db.prepare(`SELECT session_id FROM requests WHERE id = ?`).get(r.id);
-        return row?.session_id;
-      }).filter(Boolean));
-      const { rollupSession: rollupSession2 } = await Promise.resolve().then(() => (init_database(), exports_database));
-      for (const sid of touchedSessions) {
-        rollupSession2(db, sid);
-      }
-    }
-    console.log(chalk4.cyan(`\u2192 Recalculated: ${fixed}/${zeroRows.length} zero-cost requests now have pricing`));
-  }
   try {
     const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
     await checkAndFireWebhooks2(db);
@@ -2382,14 +1896,13 @@ 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("--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 (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) => {
   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
@@ -2838,29 +2351,6 @@ 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();
@@ -3128,144 +2618,5 @@ program.command("remove <type> <id>").alias("rm").description("Remove a record.
     process.exit(1);
   }
 });
-var CLOUD_RDS_HOST = "hasnaxyz-prod-opensource.c4limg0qgqvk.us-east-1.rds.amazonaws.com";
-var CLOUD_RDS_USER = "hasna_admin";
-var CLOUD_RDS_DB = "economy";
-var CLOUD_TABLES = ["requests", "sessions", "projects", "budgets", "goals", "model_pricing"];
-async function getCloudPassword() {
-  if (process.env["ECONOMY_PG_PASSWORD"])
-    return process.env["ECONOMY_PG_PASSWORD"];
-  const { execSync: exec } = await import("child_process");
-  const secretJson = exec(`aws --profile hasna-xyz-hq secretsmanager get-secret-value --secret-id 'rds!db-7a451ce6-83a9-40fa-b24a-81e5d5943511' --query SecretString --output text`, { timeout: 1e4, encoding: "utf-8" });
-  return JSON.parse(secretJson).password;
-}
-async function getCloudPg() {
-  const { PgAdapterAsync } = await import("@hasna/cloud");
-  const pw = encodeURIComponent(await getCloudPassword());
-  return new PgAdapterAsync(`postgresql://${CLOUD_RDS_USER}:${pw}@${CLOUD_RDS_HOST}:5432/${CLOUD_RDS_DB}?sslmode=require`);
-}
-var cloudCmd = program.command("cloud").description("Cross-machine sync via cloud PostgreSQL");
-cloudCmd.command("push").description("Push local economy data to cloud PostgreSQL").option("--tables <tables>", "Comma-separated table names (default: all)").action(async (opts) => {
-  const { syncPush, SqliteAdapter } = await import("@hasna/cloud");
-  const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
-  const cloud = await getCloudPg();
-  const local = new SqliteAdapter(getDbPath());
-  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()) : CLOUD_TABLES;
-  process.stdout.write(chalk4.cyan(`\u2192 Pushing ${tableList.join(", ")}... `));
-  const results = await syncPush(local, cloud, { tables: tableList });
-  const totalRows = results.reduce((s, r) => s + r.rowsWritten, 0);
-  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, SqliteAdapter } = await import("@hasna/cloud");
-  const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
-  const cloud = await getCloudPg();
-  const local = new SqliteAdapter(getDbPath());
-  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()) : CLOUD_TABLES;
-  process.stdout.write(chalk4.cyan(`\u2192 Pulling ${tableList.join(", ")}... `));
-  const results = await syncPull(cloud, local, { tables: tableList });
-  const totalRows = results.reduce((s, r) => s + r.rowsWritten, 0);
-  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 \u2192 push to cloud \u2192 pull from cloud").action(async () => {
-  console.log(chalk4.bold.cyan(`  Cloud Sync \u2014 ${getMachineId()}
-`));
-  process.stdout.write(chalk4.cyan("\u2192 Ingesting local data... "));
-  await autoSync();
-  console.log(chalk4.green("\u2713"));
-  const { syncPush, syncPull, SqliteAdapter } = await import("@hasna/cloud");
-  const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
-  const cloud = await getCloudPg();
-  const local = new SqliteAdapter(getDbPath());
-  for (const sql of PG_MIGRATIONS2) {
-    await cloud.run(sql);
-  }
-  process.stdout.write(chalk4.cyan("\u2192 Pushing local \u2192 cloud... "));
-  const pushResults = await syncPush(local, cloud, { tables: CLOUD_TABLES });
-  console.log(chalk4.green(`\u2713 ${pushResults.reduce((s, r) => s + r.rowsWritten, 0)} rows`));
-  process.stdout.write(chalk4.cyan("\u2192 Pulling cloud \u2192 local... "));
-  const pullResults = await syncPull(cloud, local, { tables: CLOUD_TABLES });
-  console.log(chalk4.green(`\u2713 ${pullResults.reduce((s, r) => s + r.rowsWritten, 0)} rows`));
-  local.close();
-  await cloud.close();
-  console.log(chalk4.bold.green(`
-\u2713 Cloud sync complete`));
-});
-cloudCmd.command("status").description("Check cloud connection status").action(async () => {
-  console.log();
-  console.log(`  Machine: ${chalk4.white(getMachineId())}`);
-  console.log(`  RDS Host: ${chalk4.white(CLOUD_RDS_HOST)}`);
-  console.log(`  Database: ${chalk4.white(CLOUD_RDS_DB)}`);
-  try {
-    const cloud = await getCloudPg();
-    await cloud.get("SELECT 1 as ok");
-    const tables = await cloud.all("SELECT tablename FROM pg_tables WHERE schemaname = 'public'");
-    console.log(`  PostgreSQL: ${chalk4.green("connected")}`);
-    console.log(`  Tables: ${chalk4.white(tables.map((t) => t.tablename).join(", ") || "(none)")}`);
-    await cloud.close();
-  } catch (err2) {
-    console.log(`  PostgreSQL: ${chalk4.red(`failed \u2014 ${err2 instanceof Error ? err2.message : String(err2)}`)}`);
-  }
-  console.log();
-});
-var billingCmd = program.command("billing").description("Pull actual billing from provider admin APIs (ground truth)");
-billingCmd.command("sync").description("Sync actual billing from Anthropic and OpenAI admin APIs").option("--days <n>", "Days of history to fetch", "31").option("--anthropic", "Only sync Anthropic").option("--openai", "Only sync OpenAI").action(async (opts) => {
-  const db = openDatabase();
-  const days = Number(opts.days ?? 31);
-  const doBoth = !opts.anthropic && !opts.openai;
-  if (opts.anthropic || doBoth) {
-    process.stdout.write(chalk4.cyan("\u2192 Syncing Anthropic billing... "));
-    try {
-      const r = await syncAnthropicBilling(db, { days });
-      console.log(chalk4.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
-    } catch (e) {
-      console.log(chalk4.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
-    }
-  }
-  if (opts.openai || doBoth) {
-    process.stdout.write(chalk4.cyan("\u2192 Syncing OpenAI billing... "));
-    try {
-      const r = await syncOpenAIBilling(db, { days });
-      console.log(chalk4.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
-    } catch (e) {
-      console.log(chalk4.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
-    }
-  }
-});
-billingCmd.command("show").description("Show actual billing totals vs our estimated costs").option("--period <p>", "Period: today|yesterday|week|month|year|all", "month").action((opts) => {
-  const db = openDatabase();
-  const period = opts.period ?? "month";
-  const actual = queryBillingSummary(db, period);
-  const estimated = querySummary(db, period);
-  console.log();
-  console.log(chalk4.bold.cyan(`  Billing ${period} (actual from admin APIs)
-`));
-  printTable(["Provider", "Actual (billed)"], Object.entries(actual.by_provider).map(([p, c]) => [chalk4.white(p), fmt2(c)]));
-  console.log();
-  console.log(`  ${chalk4.bold("Actual total:")}    ${fmt2(actual.total_usd)}`);
-  console.log(`  ${chalk4.dim("Our estimate:")}    ${fmt2(estimated.total_usd)}`);
-  const diff = estimated.total_usd - actual.total_usd;
-  const pct = actual.total_usd > 0 ? diff / actual.total_usd * 100 : 0;
-  console.log(`  ${chalk4.dim("Difference:")}      ${fmt2(Math.abs(diff))} (${diff >= 0 ? "+" : ""}${pct.toFixed(1)}%)`);
-  console.log();
-});
 registerBrainsCommand(program);
 program.parse();