@hasna/economy 0.2.10 → 0.2.12

package/README.md

@@ -1,69 +1,61 @@
 # @hasna/economy
 
-AI coding cost tracker for Claude Code, Codex, and Gemini.
+AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini
 
-Track every dollar spent across all your AI coding sessions — per request, per session, per project, per day.
-
-## Features
-
-- **Claude Code** — exact costs from telemetry JSONL (`costUSD` per request)
-- **Codex** — estimated costs from token count × model pricing
-- **SQLite backend** — all data stored locally at `~/.economy/economy.db`
-- **DB-backed pricing** — model rates editable via CLI, seeded from defaults
-- **CLI** — `economy sync`, `economy today`, `economy sessions`, `economy watch`, etc.
-- **Live watch** — `economy watch` streams costs as they arrive
-- **Budgets** — set per-project or global budgets with alert thresholds
-- **MCP server** — agents can query their own costs
-- **REST API** — `economy serve` on port 3456
-- **Web dashboard** — charts, sessions table, model/project breakdown
-- **macOS menubar** — live cost display in your menu bar
-- **SDK** — `@hasna/economy-sdk` for programmatic access
+[![npm](https://img.shields.io/npm/v/@hasna/economy)](https://www.npmjs.com/package/@hasna/economy)
+[![License](https://img.shields.io/badge/license-Apache--2.0-blue)](LICENSE)
 
 ## Install
 
 ```bash
-bun add -g @hasna/economy
-economy sync
-economy today
+bun install -g @hasna/economy
 ```
 
-## Usage
+## CLI Usage
 
 ```bash
-economy sync              # ingest Claude Code + Codex data
-economy today             # today's cost summary
-economy week              # this week
-economy month             # this month
-economy sessions          # list sessions with costs
-economy top               # most expensive sessions
-economy watch             # live cost stream
-economy breakdown         # by model/agent/project
-economy budget set --period monthly --limit 100
-economy budget list
-economy project add /path/to/project --name "My Project"
-economy pricing list
-economy pricing set gpt-4o --input 2.50 --output 10.00
-economy serve             # start REST API on port 3456
-economy dashboard         # open web dashboard
-economy mcp --all         # show MCP install commands
+economy --help
 ```
 
 ## MCP Server
 
 ```bash
-claude mcp add --transport stdio --scope user economy -- economy-mcp
+economy-mcp --help
+```
+
+## REST API
+
+```bash
+economy-serve --help
+```
+
+## Native macOS Menubar
+
+The `menubar/` app is a native SwiftUI menu bar app built with `MenuBarExtra`, not Electron. It targets macOS 26 and talks to the REST API exposed by `economy-serve`. The server URL is configurable inside the app and defaults to `http://127.0.0.1:3456`.
+
+Build it on macOS with Xcode / Swift 6.2:
+
+```bash
+cd menubar
+swift build -c release
 ```
 
-## SDK
+## Cloud Sync
 
-```ts
-import { EconomyClient } from '@hasna/economy-sdk'
+This package supports cloud sync via `@hasna/cloud`:
 
-const client = new EconomyClient()
-const today = await client.getSummary('today')
-console.log(`Today's cost: $${today.total_usd.toFixed(4)}`)
+```bash
+cloud setup
+cloud sync push --service economy
+cloud sync pull --service economy
 ```
 
+## Data Directory
+
+Data is stored in `~/.hasna/economy/`.
+
+The main SQLite database lives at `~/.hasna/economy/economy.db`. Older `~/.economy/` data is auto-migrated on first open.
+
 ## License
 
-Apache-2.0
+Apache-2.0 -- see [LICENSE](LICENSE)

package/dist/cli/index.js

@@ -109,8 +109,17 @@ var init_pricing = __esm(() => {
 // src/db/database.ts
 import { SqliteAdapter as Database } from "@hasna/cloud";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
+import { hostname } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function getMachineId() {
+  if (process.env["ECONOMY_MACHINE_ID"])
+    return process.env["ECONOMY_MACHINE_ID"];
+  const h = hostname().toLowerCase();
+  if (h.startsWith("spark") || h.startsWith("apple"))
+    return h.split(".")[0];
+  return h.split(".")[0];
+}
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
   const newDir = join(home, ".hasna", "economy");
@@ -143,6 +152,7 @@ function openDatabase(dbPath, skipSeed = false) {
   }
   const db = new Database(path);
   db.exec("PRAGMA journal_mode = WAL");
+  db.exec("PRAGMA busy_timeout = 5000");
   db.exec("PRAGMA foreign_keys = ON");
   initSchema(db);
   if (!skipSeed) {
@@ -164,7 +174,8 @@ function initSchema(db) {
       cost_usd REAL NOT NULL DEFAULT 0,
       duration_ms INTEGER DEFAULT 0,
       timestamp TEXT NOT NULL,
-      source_request_id TEXT
+      source_request_id TEXT,
+      machine_id TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS sessions (
@@ -176,7 +187,8 @@ function initSchema(db) {
       ended_at TEXT,
       total_cost_usd REAL DEFAULT 0,
       total_tokens INTEGER DEFAULT 0,
-      request_count INTEGER DEFAULT 0
+      request_count INTEGER DEFAULT 0,
+      machine_id TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS projects (
@@ -242,6 +254,15 @@ function initSchema(db) {
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
   `);
+  const cols = db.prepare(`PRAGMA table_info(requests)`).all();
+  if (!cols.some((c) => c.name === "machine_id")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN machine_id TEXT DEFAULT ''`);
+    db.exec(`ALTER TABLE sessions ADD COLUMN machine_id TEXT DEFAULT ''`);
+  }
+  db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id);
+    CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
+  `);
 }
 function periodWhere(period) {
   switch (period) {
@@ -280,17 +301,17 @@ function upsertRequest(db, req) {
     INSERT OR REPLACE INTO requests
       (id, agent, session_id, model, input_tokens, output_tokens,
        cache_read_tokens, cache_create_tokens, cost_usd, duration_ms,
-       timestamp, source_request_id)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cost_usd, req.duration_ms, req.timestamp, req.source_request_id);
+       timestamp, source_request_id, machine_id)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cost_usd, req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "");
 }
 function upsertSession(db, session) {
   db.prepare(`
     INSERT OR REPLACE INTO sessions
       (id, agent, project_path, project_name, started_at, ended_at,
-       total_cost_usd, total_tokens, request_count)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count);
+       total_cost_usd, total_tokens, request_count, machine_id)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -320,6 +341,10 @@ function querySessions(db, filter = {}) {
     conditions.push("started_at >= ?");
     params.push(filter.since);
   }
+  if (filter.machine) {
+    conditions.push("machine_id = ?");
+    params.push(filter.machine);
+  }
   if (filter.search) {
     const q = `%${filter.search}%`;
     conditions.push("(project_name LIKE ? OR agent LIKE ? OR id LIKE ?)");
@@ -338,24 +363,25 @@ function queryTopSessions(db, n = 10, agent) {
   }
   return db.prepare(`SELECT * FROM sessions ORDER BY total_cost_usd DESC LIMIT ?`).all(n);
 }
-function querySummary(db, period) {
+function querySummary(db, period, machine) {
   const rWhere = periodWhere(period);
   const sWhere = sessionPeriodWhere(period);
+  const machineClause = machine ? ` AND machine_id = '${machine.replace(/'/g, "''")}'` : "";
   const r = db.prepare(`
     SELECT COALESCE(SUM(cost_usd), 0) as total_usd,
            COUNT(*) as requests,
            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as tokens
-    FROM requests WHERE ${rWhere}
+    FROM requests WHERE ${rWhere}${machineClause}
   `).get();
   const codexTotals = db.prepare(`
     SELECT COALESCE(SUM(total_cost_usd), 0) as cost_usd,
            COALESCE(SUM(total_tokens), 0) as tokens,
            COUNT(*) as sessions
     FROM sessions
-    WHERE ${sWhere}
+    WHERE ${sWhere}${machineClause}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
   `).get();
-  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}`).get();
+  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}${machineClause}`).get();
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
     requests: r.requests,
@@ -509,6 +535,20 @@ function setIngestState(db, source, key, value) {
 function queryRequestsSince(db, since) {
   return db.prepare(`SELECT * FROM requests WHERE timestamp > ? ORDER BY timestamp ASC`).all(since);
 }
+function listMachines(db) {
+  return db.prepare(`
+    SELECT
+      s.machine_id,
+      COUNT(DISTINCT s.id) as sessions,
+      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.machine_id = s.machine_id), 0) as requests,
+      COALESCE(SUM(s.total_cost_usd), 0) as total_cost_usd,
+      MAX(s.started_at) as last_active
+    FROM sessions s
+    WHERE s.machine_id != ''
+    GROUP BY s.machine_id
+    ORDER BY total_cost_usd DESC
+  `).all();
+}
 function upsertModelPricing(db, p) {
   db.prepare(`
     INSERT OR REPLACE INTO model_pricing
@@ -574,6 +614,7 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
       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;
@@ -645,7 +686,8 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
           cost_usd: costUsd,
           duration_ms: 0,
           timestamp,
-          source_request_id: reqId
+          source_request_id: reqId,
+          machine_id: machineId
         });
         if (!touchedSessions.has(sessionId)) {
           const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
@@ -661,7 +703,8 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
               ended_at: null,
               total_cost_usd: 0,
               total_tokens: 0,
-              request_count: 0
+              request_count: 0,
+              machine_id: machineId
             };
             upsertSession(db, session);
           }
@@ -689,17 +732,18 @@ var init_claude = __esm(() => {
 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 Database2 } from "bun:sqlite";
+import { Database as BunDatabase } 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 Database2(CODEX_DB_PATH, { readonly: true });
+    codexDb = new BunDatabase(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;
@@ -720,7 +764,8 @@ async function ingestCodex(db, verbose = false) {
         ended_at: endedAt,
         total_cost_usd: costUsd,
         total_tokens: thread.tokens_used,
-        request_count: 1
+        request_count: 1,
+        machine_id: machineId
       });
       setIngestState(db, "codex", stateKey, "done");
       ingested++;
@@ -739,6 +784,88 @@ 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, {
@@ -747,12 +874,12 @@ __export(exports_config, {
   loadConfig: () => loadConfig2,
   getConfigValue: () => getConfigValue
 });
-import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
 import { join as join7 } from "path";
 function loadConfig2() {
   try {
     if (existsSync6(CONFIG_PATH2)) {
-      const raw = readFileSync5(CONFIG_PATH2, "utf-8");
+      const raw = readFileSync6(CONFIG_PATH2, "utf-8");
       return { ...DEFAULTS, ...JSON.parse(raw) };
     }
   } catch {}
@@ -962,6 +1089,20 @@ 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;
@@ -978,7 +1119,11 @@ function createHandler(db) {
       return ok({ status: "ok", ts: new Date().toISOString() });
     if (path === "/api/summary" && method === "GET") {
       const period = url.searchParams.get("period") ?? "today";
-      return ok(querySummary(db, period));
+      const machine = url.searchParams.get("machine") ?? undefined;
+      return ok(querySummary(db, period, machine));
+    }
+    if (path === "/api/machines" && method === "GET") {
+      return ok(listMachines(db), { current_machine: getMachineId() });
     }
     if (path === "/api/daily" && method === "GET") {
       const days = Number(url.searchParams.get("days") ?? 30);
@@ -987,12 +1132,22 @@ 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, limit, offset, since });
+      const sessions = querySessions(db, {
+        agent: agent ?? undefined,
+        project,
+        search,
+        machine,
+        limit,
+        offset,
+        since
+      });
       return ok(fields ? sessions.map((s) => applyFields(s, fields)) : sessions, { limit, offset });
     }
     if (path === "/api/top" && method === "GET") {
@@ -1020,7 +1175,7 @@ function createHandler(db) {
         id: randomUUID(),
         project_path: body["project_path"] ?? null,
         agent: body["agent"] ?? null,
-        period: body["period"] ?? "monthly",
+        period: normalizeBudgetPeriod(body["period"]),
         limit_usd: Number(body["limit_usd"]),
         alert_at_percent: Number(body["alert_at_percent"] ?? 80),
         created_at: now,
@@ -1083,6 +1238,8 @@ function createHandler(db) {
         results["claude"] = await ingestClaude(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$/);
@@ -1155,6 +1312,7 @@ var init_serve = __esm(() => {
   init_database();
   init_claude();
   init_codex();
+  init_gemini();
   init_pricing();
   CORS = {
     "Access-Control-Allow-Origin": "*",
@@ -1650,90 +1808,30 @@ ${chalk.dim("Set it active:")} economy brains model set ${String(status["fine_tu
 init_database();
 init_claude();
 init_codex();
+init_gemini();
 
-// src/ingest/gemini.ts
-init_database();
-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 };
-  }
-  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
-        };
-        upsertSession(db, session);
-        touchedSessions.add(sessionId);
-        totalSessions++;
-      }
-      setIngestState(db, "gemini", stateKey, fileMtime);
-    }
-  }
-  for (const sessionId of touchedSessions) {
-    rollupSession(db, sessionId);
-  }
-  return { sessions: totalSessions };
+// 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;
 }
+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("0.2.2");
+program.name("economy").description("AI coding cost tracker \u2014 Claude Code, Codex, and Gemini").version(packageMetadata.version);
 async function autoSync() {
   const db = openDatabase();
   ensurePricingSeeded(db);
@@ -1850,7 +1948,7 @@ program.action(async () => {
   }
   console.log();
 });
-program.command("sync").description("Ingest cost data from Claude Code, Codex, and Gemini").option("--claude", "Only ingest Claude Code telemetry").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").action(async (opts) => {
+program.command("sync").description("Ingest cost data from Claude Code, Codex, and Gemini").option("--claude", "Only ingest Claude Code telemetry").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").option("--backfill-machine", "Tag existing records that have no machine_id with current hostname").action(async (opts) => {
   const db = openDatabase();
   ensurePricingSeeded(db);
   if (opts.force) {
@@ -1877,6 +1975,12 @@ program.command("sync").description("Ingest cost data from Claude Code, Codex, a
     const r = await ingestGemini(db, opts.verbose);
     console.log(chalk4.green(`\u2713 ${r.sessions} sessions`));
   }
+  if (opts.backfillMachine) {
+    const machine = getMachineId();
+    const reqCount = db.prepare(`UPDATE requests SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+    const sessCount = db.prepare(`UPDATE sessions SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+    console.log(chalk4.cyan(`\u2192 Backfilled machine_id='${machine}': ${reqCount.changes} requests, ${sessCount.changes} sessions`));
+  }
   try {
     const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
     await checkAndFireWebhooks2(db);
@@ -1896,13 +2000,14 @@ program.command("month").description("Cost summary for this month").action(async
   await autoSync();
   printSummary("This Month", "month");
 });
-program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|codex)").option("--project <path>", "Filter by project path").option("--limit <n>", "Number of sessions", "20").option("--format <fmt>", "Output format: table|compact|csv|json", "table").option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").option("--search <query>", "Search by project name, session id prefix, or agent").action(async (opts) => {
+program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|codex)").option("--project <path>", "Filter by project path").option("--machine <id>", "Filter by machine hostname (e.g. spark01, apple01)").option("--limit <n>", "Number of sessions", "20").option("--format <fmt>", "Output format: table|compact|csv|json", "table").option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").option("--search <query>", "Search by project name, session id prefix, or agent").action(async (opts) => {
   await autoSync();
   const db = openDatabase();
   const sinceDate = opts.since ? parseSinceDate(opts.since) : undefined;
   let sessions = querySessions(db, {
     agent: opts.agent,
     project: opts.project,
+    machine: opts.machine,
     limit: Number(opts.limit ?? 20),
     since: sinceDate,
     search: opts.search
@@ -2351,6 +2456,29 @@ program.command("session <id>").description("Show detailed breakdown of a single
   }
   console.log();
 });
+program.command("machines").description("List all machines that have synced data").action(async () => {
+  await autoSync();
+  const db = openDatabase();
+  const machines = listMachines(db);
+  const current = getMachineId();
+  if (machines.length === 0) {
+    console.log(chalk4.yellow(`No machine data yet. Current machine: ${current}`));
+    return;
+  }
+  console.log();
+  console.log(chalk4.bold.cyan("  Machines"));
+  console.log();
+  printTable(["Machine", "Sessions", "Requests", "Cost", "Last Active"], machines.map((m) => [
+    m.machine_id === current ? chalk4.green(`${m.machine_id} (this)`) : chalk4.white(m.machine_id),
+    fmtCount(m.sessions),
+    fmtCount(m.requests),
+    fmt2(m.total_cost_usd),
+    chalk4.dim(m.last_active?.substring(0, 16) ?? "\u2014")
+  ]));
+  console.log(`
+  ${chalk4.dim("Current machine:")} ${chalk4.bold(current)}`);
+  console.log();
+});
 program.command("export").description("Export data as CSV").option("--type <type>", "Data type: sessions or requests", "sessions").option("--period <period>", "Period: today|week|month|all", "month").option("--output <file>", "Output file path (default: stdout)").action(async (opts) => {
   await autoSync();
   const db = openDatabase();