@hasna/economy 0.2.16 → 0.2.18

package/dist/server/index.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env bun
 // @bun
 var __defProp = Object.defineProperty;
 var __returnValue = (v) => v;
@@ -79,7 +78,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,55 +88,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
 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");
@@ -171,7 +142,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) {
@@ -193,8 +163,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 (
@@ -206,8 +175,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 (
@@ -272,27 +240,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) {
@@ -302,11 +249,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";
   }
@@ -318,11 +265,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";
   }
@@ -332,17 +279,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(`
@@ -372,10 +319,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 ?)");
@@ -394,25 +337,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,
@@ -434,39 +376,19 @@ function queryModelBreakdown(db) {
 }
 function queryProjectBreakdown(db) {
   return db.prepare(`
-    WITH labeled AS (
-      SELECT
-        s.id,
-        s.project_path,
-        s.total_cost_usd,
-        s.started_at,
-        COALESCE(
-          NULLIF(s.project_name, ''),
-          CASE
-            WHEN s.project_path LIKE '%/%'
-              THEN substr(s.project_path, length(rtrim(s.project_path, replace(s.project_path, '/', ''))) + 1)
-            ELSE s.project_path
-          END
-        ) as label
-      FROM sessions s
-      WHERE s.project_path != '' OR s.project_name != ''
-    )
     SELECT
-      MIN(l.project_path) as project_path,
-      l.label as project_name,
-      COUNT(DISTINCT l.id) as sessions,
-      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)), 0) as requests,
-      COALESCE(
-        (SELECT SUM(r.cost_usd) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
-        SUM(l.total_cost_usd)
-      ) as cost_usd,
-      COALESCE(
-        (SELECT SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
-        0
-      ) as total_tokens,
-      MAX(l.started_at) as last_active
-    FROM labeled l
-    GROUP BY l.label
+      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();
 }
@@ -577,20 +499,6 @@ function getIngestState(db, source, key) {
 function setIngestState(db, source, key, value) {
   db.prepare(`INSERT OR REPLACE INTO ingest_state (source, key, value) VALUES (?, ?, ?)`).run(source, key, value);
 }
-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
@@ -608,11 +516,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,
@@ -637,8 +545,7 @@ import { join as join2, basename } from "path";
 function autoDetectProject(cwd, projects) {
   return projects.find((p) => cwd === p.path || cwd.startsWith(p.path + "/"));
 }
-var CLAUDE_PROJECTS_DIR = join2(homedir2(), ".claude", "projects");
-var TAKUMI_PROJECTS_DIR = join2(homedir2(), ".takumi", "projects");
+var PROJECTS_DIR = join2(homedir2(), ".claude", "projects");
 function dirNameToPath(dirName) {
   return dirName.replace(/^-/, "/").replace(/-/g, "/").replace(/\/\//g, "/-");
 }
@@ -658,36 +565,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 (!existsSync2(projectsDir)) {
+  if (!existsSync2(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 = join2(projectsDir, projectDirEntry.name);
+    const projectDirPath = join2(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;
@@ -728,10 +628,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,
@@ -741,8 +641,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);
@@ -751,15 +650,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);
           }
@@ -767,7 +665,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
         }
         totalRequests++;
       }
-      setIngestState(db, agentName, stateKey, fileMtime);
+      setIngestState(db, "claude", stateKey, fileMtime);
       totalFiles++;
     }
   }
@@ -782,7 +680,7 @@ init_database();
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join3, basename as basename2 } from "path";
-import { Database as BunDatabase } from "bun:sqlite";
+import { Database as Database2 } from "bun:sqlite";
 var CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
 var CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
 async function ingestCodex(db, verbose = false) {
@@ -791,11 +689,10 @@ async function ingestCodex(db, verbose = false) {
       console.log("Codex DB not found:", CODEX_DB_PATH);
     return { sessions: 0 };
   }
-  const machineId = getMachineId();
   let codexDb = null;
   let ingested = 0;
   try {
-    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;
@@ -816,8 +713,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++;
@@ -830,85 +726,6 @@ async function ingestCodex(db, verbose = false) {
   return { sessions: ingested };
 }
 
-// src/ingest/gemini.ts
-init_database();
-import { readdirSync as readdirSync3, readFileSync as readFileSync3, existsSync as existsSync4, statSync as statSync3 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
-var GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
-async function ingestGemini(db, verbose) {
-  if (!existsSync4(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) => join4(GEMINI_TMP_DIR, d.name));
-  } catch {
-    return { sessions: 0 };
-  }
-  for (const projectDir of projectHashDirs) {
-    const chatsDir = join4(projectDir, "chats");
-    if (!existsSync4(chatsDir))
-      continue;
-    let chatFiles = [];
-    try {
-      chatFiles = readdirSync3(chatsDir).filter((f) => f.endsWith(".json")).map((f) => join4(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(readFileSync3(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 };
-}
-
 // src/server/serve.ts
 init_pricing();
 import { randomUUID } from "crypto";
@@ -929,20 +746,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;
@@ -959,11 +762,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);
@@ -972,22 +771,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") {
@@ -1015,7 +804,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,
@@ -1076,12 +865,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$/);
@@ -1131,15 +916,15 @@ function startServer(port = 3456) {
         return apiHandler(req);
       }
       try {
-        const { existsSync: existsSync5 } = await import("fs");
-        if (existsSync5(dashboardDir)) {
+        const { existsSync: existsSync4 } = await import("fs");
+        if (existsSync4(dashboardDir)) {
           let filePath = url.pathname === "/" ? "/index.html" : url.pathname;
           const fullPath = dashboardDir + filePath;
-          if (existsSync5(fullPath)) {
+          if (existsSync4(fullPath)) {
             return new Response(Bun.file(fullPath));
           }
           const indexPath = dashboardDir + "/index.html";
-          if (existsSync5(indexPath)) {
+          if (existsSync4(indexPath)) {
             return new Response(Bun.file(indexPath));
           }
         }
@@ -1150,62 +935,6 @@ function startServer(port = 3456) {
   console.log(`economy-serve listening on http://localhost:${port}`);
 }
 
-// src/lib/package-metadata.ts
-import { readFileSync as readFileSync4 } from "fs";
-var cachedMetadata = null;
-function getPackageMetadata() {
-  if (cachedMetadata)
-    return cachedMetadata;
-  const raw = readFileSync4(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;
-}
-var packageMetadata = getPackageMetadata();
-
 // src/server/index.ts
-function printHelp() {
-  console.log(`Usage: economy-serve [options]
-
-REST API server for ${packageMetadata.name}
-
-Options:
-  -p, --port <port>  Port to bind (default: ECONOMY_PORT or 3456)
-  -V, --version      output the version number
-  -h, --help         display help for command`);
-}
-function resolvePort(argv) {
-  for (let i = 0;i < argv.length; i++) {
-    const arg = argv[i];
-    if ((arg === "--port" || arg === "-p") && argv[i + 1]) {
-      const value2 = Number(argv[i + 1]);
-      if (!Number.isFinite(value2) || value2 <= 0) {
-        throw new Error(`Invalid port: ${argv[i + 1]}`);
-      }
-      return value2;
-    }
-  }
-  const value = Number(process.env["ECONOMY_PORT"] ?? 3456);
-  if (!Number.isFinite(value) || value <= 0) {
-    throw new Error(`Invalid ECONOMY_PORT: ${process.env["ECONOMY_PORT"]}`);
-  }
-  return value;
-}
-var args = process.argv.slice(2);
-if (args.includes("--help") || args.includes("-h")) {
-  printHelp();
-  process.exit(0);
-}
-if (args.includes("--version") || args.includes("-V")) {
-  console.log(packageMetadata.version);
-  process.exit(0);
-}
-try {
-  startServer(resolvePort(args));
-} catch (error) {
-  console.error(error instanceof Error ? error.message : String(error));
-  process.exit(1);
-}
+var port = Number(process.env["ECONOMY_PORT"] ?? 3456);
+startServer(port);