@hasna/economy 0.2.16 → 0.2.18

package/dist/mcp/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 var __defProp = Object.defineProperty;
+var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
   this[name] = __returnValue.bind(null, newValue);
@@ -15,6 +16,7 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
+var __require = import.meta.require;
 
 // src/lib/pricing.ts
 var exports_pricing = {};
@@ -78,7 +80,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 },
@@ -89,55 +90,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");
@@ -170,7 +144,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) {
@@ -192,8 +165,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 (
@@ -205,8 +177,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 (
@@ -271,27 +242,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) {
@@ -301,11 +251,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";
   }
@@ -317,11 +267,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";
   }
@@ -331,17 +281,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(`
@@ -371,10 +321,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 ?)");
@@ -393,25 +339,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,
@@ -433,39 +378,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();
 }
@@ -554,20 +479,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
@@ -579,11 +490,11 @@ function getModelPricing(db, model) {
   return db.prepare(`SELECT * FROM model_pricing WHERE model = ?`).get(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,
@@ -596,102 +507,81 @@ function seedModelPricing(db, defaults) {
 }
 var init_database = () => {};
 
+// package.json
+var require_package = __commonJS((exports, module) => {
+  module.exports = {
+    name: "@hasna/economy",
+    version: "0.2.10",
+    description: "AI coding cost tracker \u2014 CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini",
+    type: "module",
+    main: "dist/index.js",
+    types: "dist/index.d.ts",
+    bin: {
+      economy: "dist/cli/index.js",
+      "economy-mcp": "dist/mcp/index.js",
+      "economy-serve": "dist/server/index.js"
+    },
+    exports: {
+      ".": {
+        types: "./dist/index.d.ts",
+        import: "./dist/index.js"
+      }
+    },
+    files: [
+      "dist",
+      "LICENSE"
+    ],
+    scripts: {
+      build: "cd dashboard && bun run build && cd .. && bun build src/cli/index.ts --outdir dist/cli --target bun --packages external && bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external && bun build src/server/index.ts --outdir dist/server --target bun --packages external && bun build src/index.ts --outdir dist --target bun --packages external && tsc --emitDeclarationOnly --outDir dist",
+      "build:cli": "bun build src/cli/index.ts --outdir dist/cli --target bun --packages external",
+      "build:mcp": "bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external",
+      "build:server": "bun build src/server/index.ts --outdir dist/server --target bun --packages external",
+      "build:lib": "bun build src/index.ts --outdir dist --target bun --packages external",
+      "build:dashboard": "cd dashboard && bun run build",
+      typecheck: "tsc --noEmit",
+      test: "bun test",
+      "dev:cli": "bun run src/cli/index.ts",
+      "dev:mcp": "bun run src/mcp/index.ts",
+      "dev:serve": "bun run src/server/index.ts",
+      postinstall: "mkdir -p $HOME/.hasna/economy/training 2>/dev/null || true"
+    },
+    keywords: [
+      "economy",
+      "cost",
+      "ai",
+      "claude",
+      "codex",
+      "gemini",
+      "mcp",
+      "cli",
+      "budget",
+      "tracking"
+    ],
+    author: "hasna",
+    license: "Apache-2.0",
+    publishConfig: {
+      registry: "https://registry.npmjs.org",
+      access: "public"
+    },
+    dependencies: {
+      "@hasna/cloud": "^0.1.0",
+      "@modelcontextprotocol/sdk": "^1.12.1",
+      chalk: "^5.4.1",
+      commander: "^13.1.0"
+    },
+    devDependencies: {
+      "@types/bun": "latest",
+      "bun-types": "latest",
+      typescript: "^5.7.2"
+    }
+  };
+});
+
 // src/mcp/index.ts
 init_database();
-import { randomUUID } from "crypto";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { registerCloudTools } from "@hasna/cloud";
-import { z } from "zod";
-
-// src/db/pg-migrations.ts
-var 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
-  )`
-];
+import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 
 // src/ingest/claude.ts
 init_database();
@@ -702,8 +592,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, "/-");
 }
@@ -723,36 +612,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;
@@ -793,10 +675,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,
@@ -806,8 +688,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);
@@ -816,15 +697,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);
           }
@@ -832,7 +712,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
         }
         totalRequests++;
       }
-      setIngestState(db, agentName, stateKey, fileMtime);
+      setIngestState(db, "claude", stateKey, fileMtime);
       totalFiles++;
     }
   }
@@ -847,7 +727,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) {
@@ -856,11 +736,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;
@@ -881,8 +760,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++;
@@ -907,7 +785,6 @@ async function ingestGemini(db, 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 = [];
@@ -958,8 +835,7 @@ async function ingestGemini(db, verbose) {
           ended_at: chatData.lastUpdated ?? null,
           total_cost_usd: 0,
           total_tokens: 0,
-          request_count: 0,
-          machine_id: machineId
+          request_count: 0
         };
         upsertSession(db, session);
         touchedSessions.add(sessionId);
@@ -974,93 +850,11 @@ async function ingestGemini(db, verbose) {
   return { sessions: totalSessions };
 }
 
-// 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/mcp/index.ts
 init_pricing();
-function printHelp() {
-  console.log(`Usage: economy-mcp [options]
-
-Runs the ${packageMetadata.name} MCP stdio server.
-
-Options:
-  -V, --version  output the version number
-  -h, --help     display help for command`);
-}
-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);
-}
 var db = openDatabase();
 ensurePricingSeeded(db);
-var server = new McpServer({
-  name: "economy",
-  version: packageMetadata.version
-});
-var _econAgents = new Map;
-var TOOL_NAMES = [
-  "get_cost_summary",
-  "get_sessions",
-  "get_top_sessions",
-  "get_model_breakdown",
-  "get_project_breakdown",
-  "get_budget_status",
-  "get_daily",
-  "get_session_detail",
-  "sync",
-  "search_tools",
-  "describe_tools",
-  "get_goals",
-  "set_goal",
-  "remove_goal",
-  "list_machines",
-  "register_agent",
-  "heartbeat",
-  "set_focus",
-  "list_agents",
-  "send_feedback"
-];
-var TOOL_DESCRIPTIONS = {
-  get_cost_summary: "period(today|week|month|year|all), machine?(hostname) -> {total_usd, sessions, requests, tokens, summary}",
-  get_sessions: "agent(claude|codex|gemini), project(partial), machine?(hostname), limit(20) -> compact session table",
-  get_top_sessions: "n(10), agent(claude|codex|gemini) -> top sessions by cost",
-  list_machines: "no params -> machine_id, sessions, requests, cost, last_active",
-  get_model_breakdown: "no params -> model, requests, tokens, cost",
-  get_project_breakdown: "no params -> project_name, sessions, cost",
-  get_budget_status: "no params -> budget limits, current spend, percent_used, is_over_alert",
-  get_daily: "days(30) -> daily cost table grouped by date and agent",
-  get_session_detail: "session_id(prefix ok) -> per-request breakdown with model, tokens, cost",
-  sync: "sources(all|claude|codex|gemini) -> ingest latest cost data",
-  search_tools: "query substring -> tool name list",
-  describe_tools: "names[] -> one-line parameter hints",
-  get_goals: "no params -> goal progress summary",
-  set_goal: "period(day|week|month|year), limit_usd, project_path?, agent? -> create goal",
-  remove_goal: "id -> delete goal",
-  register_agent: "name, session_id? -> register agent session",
-  heartbeat: "agent_id -> update last_seen_at",
-  set_focus: "agent_id, project_id? -> set active project context",
-  list_agents: "no params -> registered agent list",
-  send_feedback: "message, email?, category? -> save feedback locally"
-};
+var server = new Server({ name: "economy", version: "0.2.2" }, { capabilities: { tools: {} } });
 var fmtUsd = (n) => "$" + n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 var fmtTok = (n) => n >= 1e9 ? `${(n / 1e9).toFixed(1)}B` : n >= 1e6 ? `${(n / 1e6).toFixed(1)}M` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n);
 function fmtSession(s) {
@@ -1071,249 +865,262 @@ function fmtSession(s) {
   const tok = fmtTok(Number(s["total_tokens"] ?? 0));
   return `${id} ${agent.padEnd(6)} ${cost.padEnd(10)} ${tok.padEnd(8)} ${proj}`;
 }
-function text(text2) {
-  return { content: [{ type: "text", text: text2 }] };
-}
-function textError(message) {
-  return { content: [{ type: "text", text: message }], isError: true };
-}
-server.tool("search_tools", "List tool names matching query. Use first to find relevant tools.", { query: z.string().optional() }, async ({ query }) => {
-  const q = query?.toLowerCase();
-  const matches = q ? TOOL_NAMES.filter((name) => name.includes(q)) : [...TOOL_NAMES];
-  return text(matches.join(", "));
-});
-server.tool("describe_tools", "Get param hints for specific tools by name.", { names: z.array(z.string()) }, async ({ names }) => {
-  const result = names.map((name) => `${name}: ${TOOL_DESCRIPTIONS[name] ?? "see tool schema"}`).join(`
-`);
-  return text(result);
-});
-server.tool("get_cost_summary", "Cost summary (total_usd, sessions, requests, tokens, human summary). period: today|week|month|year|all. machine: filter by hostname.", { period: z.enum(["today", "week", "month", "year", "all"]).optional(), machine: z.string().optional() }, async ({ period, machine }) => {
-  const resolved = period ?? "today";
-  const s = querySummary(db, resolved, machine);
-  const machineLabel = machine ? ` on ${machine}` : "";
-  return text([
-    `period: ${resolved}${machineLabel}`,
-    `cost: ${fmtUsd(s.total_usd)}`,
-    `sessions: ${s.sessions}`,
-    `requests: ${s.requests.toLocaleString()}`,
-    `tokens: ${fmtTok(s.tokens)}`,
-    `summary: You've spent ${fmtUsd(s.total_usd)} ${resolved === "all" ? "total" : resolved}${machineLabel} across ${s.sessions} sessions (${s.requests.toLocaleString()} requests, ${fmtTok(s.tokens)} tokens)`
-  ].join(`
-`));
-});
-server.tool("get_sessions", "List sessions. Returns compact table. Params: agent, project, machine, limit(20)", {
-  agent: z.enum(["claude", "takumi", "codex", "gemini"]).optional(),
-  project: z.string().optional(),
-  machine: z.string().optional(),
-  limit: z.number().int().positive().max(100).optional()
-}, async ({ agent, project, machine, limit }) => {
-  const sessions = querySessions(db, {
-    agent,
-    project,
-    machine,
-    limit: limit ?? 20
-  });
-  const lines = ["id       agent  cost       tokens   project"];
-  for (const session of sessions)
-    lines.push(fmtSession(session));
-  return text(lines.join(`
-`));
-});
-server.tool("get_top_sessions", "Top sessions by cost. Params: n(10), agent", {
-  n: z.number().int().positive().max(100).optional(),
-  agent: z.enum(["claude", "takumi", "codex", "gemini"]).optional()
-}, async ({ n, agent }) => {
-  const sessions = queryTopSessions(db, n ?? 10, agent);
-  const lines = ["rank  id       agent  cost       tokens   project"];
-  sessions.forEach((session, i) => lines.push(`${String(i + 1).padEnd(5)} ${fmtSession(session)}`));
-  return text(lines.join(`
-`));
-});
-server.tool("get_model_breakdown", "Cost per model. No params.", {}, async () => {
-  const rows = queryModelBreakdown(db);
-  const lines = ["model                          reqs    tokens   cost"];
-  for (const row of rows) {
-    lines.push(`${String(row["model"]).slice(0, 30).padEnd(31)}${String(row["requests"]).padEnd(8)}${fmtTok(Number(row["total_tokens"])).padEnd(9)}${fmtUsd(Number(row["cost_usd"]))}`);
-  }
-  return text(lines.join(`
-`));
-});
-server.tool("get_project_breakdown", "Cost per project. No params.", {}, async () => {
-  const rows = queryProjectBreakdown(db);
-  const lines = ["project              sessions tokens   cost"];
-  for (const row of rows) {
-    const name = String(row["project_name"] || row["project_path"] || "\u2014").slice(0, 20);
-    lines.push(`${name.padEnd(21)}${String(row["sessions"]).padEnd(9)}${fmtTok(Number(row["total_tokens"])).padEnd(9)}${fmtUsd(Number(row["cost_usd"]))}`);
-  }
-  return text(lines.join(`
-`));
-});
-server.tool("get_budget_status", "Budget limits vs spend, percent used, alert flags. No params.", {}, async () => {
-  const budgets = getBudgetStatuses(db);
-  if (budgets.length === 0)
-    return text("No budgets set.");
-  const lines = ["scope                period   spent      limit      used%  status"];
-  for (const budget of budgets) {
-    const scope = String(budget["project_path"] ?? "global").slice(0, 20);
-    const pct = Number(budget["percent_used"]).toFixed(1);
-    const status = budget["is_over_limit"] ? "OVER" : budget["is_over_alert"] ? "ALERT" : "OK";
-    lines.push(`${scope.padEnd(21)}${String(budget["period"]).padEnd(9)}${fmtUsd(Number(budget["current_spend_usd"])).padEnd(11)}${fmtUsd(Number(budget["limit_usd"])).padEnd(11)}${pct}%`.padEnd(49) + `  ${status}`);
-  }
-  return text(lines.join(`
-`));
-});
-server.tool("get_daily", "Daily cost table by agent. Params: days(30)", { days: z.number().int().positive().max(365).optional() }, async ({ days }) => {
-  const rows = queryDailyBreakdown(db, days ?? 30);
-  const byDate = new Map;
-  for (const row of rows) {
-    const date = String(row["date"]);
-    const entry = byDate.get(date) ?? { claude: 0, codex: 0, gemini: 0 };
-    if (row["agent"] === "claude")
-      entry.claude += Number(row["cost_usd"]);
-    else if (row["agent"] === "codex")
-      entry.codex += Number(row["cost_usd"]);
-    else if (row["agent"] === "gemini")
-      entry.gemini += Number(row["cost_usd"]);
-    byDate.set(date, entry);
-  }
-  const lines = ["date        claude     codex      gemini     total"];
-  for (const [date, costs] of [...byDate.entries()].sort()) {
-    const total = costs.claude + costs.codex + costs.gemini;
-    lines.push(`${date}  ${fmtUsd(costs.claude).padEnd(11)}${fmtUsd(costs.codex).padEnd(11)}${fmtUsd(costs.gemini).padEnd(11)}${fmtUsd(total)}`);
-  }
-  return text(lines.join(`
-`));
-});
-server.tool("get_session_detail", "Per-request breakdown of a single session. Params: session_id (prefix ok)", { session_id: z.string() }, async ({ session_id }) => {
-  const session = db.prepare(`SELECT * FROM sessions WHERE id = ? OR id LIKE ?`).get(session_id, `${session_id}%`);
-  if (!session)
-    return textError(`Session not found: ${session_id}`);
-  const requests = db.prepare(`SELECT * FROM requests WHERE session_id = ? ORDER BY timestamp ASC LIMIT 50`).all(session["id"]);
-  const lines = [
-    `session: ${String(session["id"]).slice(0, 16)}`,
-    `agent: ${session["agent"]}  project: ${session["project_name"] || "\u2014"}`,
-    `cost: ${fmtUsd(Number(session["total_cost_usd"]))}  tokens: ${fmtTok(Number(session["total_tokens"]))}  requests: ${session["request_count"]}`,
-    "",
-    "time      model                  input    output   cost"
-  ];
-  for (const request of requests) {
-    lines.push(`${String(request["timestamp"]).slice(11, 19)}  ${String(request["model"]).slice(0, 22).padEnd(23)}${fmtTok(Number(request["input_tokens"])).padEnd(9)}${fmtTok(Number(request["output_tokens"])).padEnd(9)}${fmtUsd(Number(request["cost_usd"]))}`);
-  }
-  return text(lines.join(`
-`));
-});
-server.tool("sync", "Ingest new cost data. sources: all|claude|takumi|codex|gemini", { sources: z.enum(["all", "claude", "takumi", "codex", "gemini"]).optional() }, async ({ sources }) => {
-  const selected = sources ?? "all";
-  const parts = [];
-  if (selected === "all" || selected === "claude") {
-    const result = await ingestClaude(db);
-    parts.push(`claude: ${result["files"]} files, ${result["requests"]} requests, ${result["sessions"]} sessions`);
-  }
-  if (selected === "all" || selected === "takumi") {
-    const result = await ingestTakumi(db);
-    parts.push(`takumi: ${result["files"]} files, ${result["requests"]} requests, ${result["sessions"]} sessions`);
-  }
-  if (selected === "all" || selected === "codex") {
-    const result = await ingestCodex(db);
-    parts.push(`codex: ${result["sessions"]} sessions`);
-  }
-  if (selected === "all" || selected === "gemini") {
-    const result = await ingestGemini(db);
-    parts.push(`gemini: ${result["sessions"]} sessions`);
-  }
-  return text(parts.join(`
-`) || "done");
-});
-server.tool("get_goals", "All spending goals with current progress. No params.", {}, async () => {
-  const goals = getGoalStatuses(db);
-  if (goals.length === 0)
-    return text("No goals set.");
-  const lines = ["period   scope                limit      spent      used%  status"];
-  for (const goal of goals) {
-    const scope = String(goal["project_path"] ?? goal["agent"] ?? "global").slice(0, 20);
-    const pct = Number(goal["percent_used"]).toFixed(1);
-    const status = goal["is_over"] ? "OVER" : goal["is_at_risk"] ? "AT RISK" : "ON TRACK";
-    lines.push(`${String(goal["period"]).padEnd(9)}${scope.padEnd(21)}${fmtUsd(Number(goal["limit_usd"])).padEnd(11)}${fmtUsd(Number(goal["current_spend_usd"])).padEnd(11)}${pct}%  ${status}`);
-  }
-  return text(lines.join(`
-`));
-});
-server.tool("set_goal", "Create/update a spending goal. period(day|week|month|year), limit_usd, project_path?, agent?", {
-  period: z.enum(["day", "week", "month", "year"]),
-  limit_usd: z.number().nonnegative(),
-  project_path: z.string().optional(),
-  agent: z.string().optional()
-}, async ({ period, limit_usd, project_path, agent }) => {
-  const now = new Date().toISOString();
-  upsertGoal(db, {
-    id: randomUUID(),
-    period,
-    project_path: project_path ?? null,
-    agent: agent ?? null,
-    limit_usd,
-    created_at: now,
-    updated_at: now
-  });
-  return text(`Goal set: ${period} $${limit_usd}`);
-});
-server.tool("remove_goal", "Delete a goal by id.", { id: z.string() }, async ({ id }) => {
-  deleteGoal(db, id);
-  return text("Goal removed.");
-});
-server.tool("list_machines", "List all machines that have synced data. No params.", {}, async () => {
-  const machines = listMachines(db);
-  if (machines.length === 0)
-    return text(`No machine data yet. Current machine: ${getMachineId()}`);
-  const lines = ["machine          sessions  requests  cost        last_active"];
-  for (const m of machines) {
-    lines.push(`${m.machine_id.padEnd(17)}${String(m.sessions).padEnd(10)}${String(m.requests).padEnd(10)}${fmtUsd(m.total_cost_usd).padEnd(12)}${m.last_active?.substring(0, 16) ?? "\u2014"}`);
-  }
-  lines.push(`
-current machine: ${getMachineId()}`);
-  return text(lines.join(`
-`));
-});
-server.tool("register_agent", "Register agent session.", { name: z.string(), session_id: z.string().optional() }, async ({ name }) => {
-  const existing = [..._econAgents.values()].find((agent2) => agent2.name === name);
-  if (existing) {
-    existing.last_seen_at = new Date().toISOString();
-    return text(JSON.stringify(existing));
-  }
-  const id = Math.random().toString(36).slice(2, 10);
-  const agent = { id, name, last_seen_at: new Date().toISOString() };
-  _econAgents.set(id, agent);
-  return text(JSON.stringify(agent));
-});
-server.tool("heartbeat", "Update last_seen_at.", { agent_id: z.string() }, async ({ agent_id }) => {
-  const agent = _econAgents.get(agent_id);
-  if (!agent)
-    return textError("Agent not found");
-  agent.last_seen_at = new Date().toISOString();
-  return text(`\u2665 ${agent.name}`);
-});
-server.tool("set_focus", "Set active project context.", { agent_id: z.string(), project_id: z.string().optional().nullable() }, async ({ agent_id, project_id }) => {
-  const agent = _econAgents.get(agent_id);
-  if (!agent)
-    return textError("Agent not found");
-  agent.project_id = project_id ?? undefined;
-  return text(project_id ? `Focus: ${project_id}` : "Focus cleared");
-});
-server.tool("list_agents", "List all registered agents.", {}, async () => text(JSON.stringify([..._econAgents.values()])));
-server.tool("send_feedback", "Send feedback about this service.", {
-  message: z.string(),
-  email: z.string().optional(),
-  category: z.enum(["bug", "feature", "general"]).optional()
-}, async ({ message, email, category }) => {
+var TOOLS = [
+  { name: "get_cost_summary", description: "Cost summary (total_usd, sessions, requests, tokens, human summary). period: today|week|month|year|all", inputSchema: { type: "object", properties: { period: { type: "string", enum: ["today", "week", "month", "year", "all"] } } } },
+  { name: "get_sessions", description: "List sessions. Returns compact table. Params: agent, project, limit(20)", inputSchema: { type: "object", properties: { agent: { type: "string" }, project: { type: "string" }, limit: { type: "number" } } } },
+  { name: "get_top_sessions", description: "Top sessions by cost. Params: n(10), agent", inputSchema: { type: "object", properties: { n: { type: "number" }, agent: { type: "string" } } } },
+  { name: "get_model_breakdown", description: "Cost per model. No params.", inputSchema: { type: "object", properties: {} } },
+  { name: "get_project_breakdown", description: "Cost per project. No params.", inputSchema: { type: "object", properties: {} } },
+  { name: "get_budget_status", description: "Budget limits vs spend, percent used, alert flags. No params.", inputSchema: { type: "object", properties: {} } },
+  { name: "get_daily", description: "Daily cost table by agent. Params: days(30)", inputSchema: { type: "object", properties: { days: { type: "number" } } } },
+  { name: "get_session_detail", description: "Per-request breakdown of a single session. Params: session_id (prefix ok)", inputSchema: { type: "object", properties: { session_id: { type: "string" } }, required: ["session_id"] } },
+  { name: "sync", description: "Ingest new cost data. sources: all|claude|codex|gemini", inputSchema: { type: "object", properties: { sources: { type: "string", enum: ["all", "claude", "codex", "gemini"] } } } },
+  { name: "search_tools", description: "List tool names matching query. Use first to find relevant tools.", inputSchema: { type: "object", properties: { query: { type: "string" } } } },
+  { name: "describe_tools", description: "Get param hints for specific tools by name.", inputSchema: { type: "object", properties: { names: { type: "array", items: { type: "string" } } }, required: ["names"] } },
+  { name: "get_goals", description: "All spending goals with current progress. No params.", inputSchema: { type: "object", properties: {} } },
+  { name: "set_goal", description: "Create/update a spending goal. period(day|week|month|year), limit_usd, project_path?, agent?", inputSchema: { type: "object", properties: { period: { type: "string" }, limit_usd: { type: "number" }, project_path: { type: "string" }, agent: { type: "string" } }, required: ["period", "limit_usd"] } },
+  { name: "remove_goal", description: "Delete a goal by id.", inputSchema: { type: "object", properties: { id: { type: "string" } }, required: ["id"] } },
+  { name: "register_agent", description: "Register agent session.", inputSchema: { type: "object", properties: { name: { type: "string" }, session_id: { type: "string" } }, required: ["name"] } },
+  { name: "heartbeat", description: "Update last_seen_at.", inputSchema: { type: "object", properties: { agent_id: { type: "string" } }, required: ["agent_id"] } },
+  { name: "set_focus", description: "Set active project context.", inputSchema: { type: "object", properties: { agent_id: { type: "string" }, project_id: { type: "string" } }, required: ["agent_id"] } },
+  { name: "list_agents", description: "List all registered agents.", inputSchema: { type: "object", properties: {} } },
+  { name: "send_feedback", description: "Send feedback about this service.", inputSchema: { type: "object", properties: { message: { type: "string" }, email: { type: "string" }, category: { type: "string", enum: ["bug", "feature", "general"] } }, required: ["message"] } }
+];
+var TOOL_DESCRIPTIONS = {
+  get_cost_summary: "period(today|week|month|year|all) \u2192 {total_usd, sessions, requests, tokens, summary}",
+  get_sessions: "agent(claude|codex), project(partial), limit(20) \u2192 compact session table",
+  get_top_sessions: "n(10), agent(claude|codex) \u2192 top sessions by cost",
+  get_model_breakdown: "no params \u2192 model, requests, tokens, cost",
+  get_project_breakdown: "no params \u2192 project_name, sessions, cost",
+  get_budget_status: "no params \u2192 budget limits, current spend, percent_used, is_over_alert",
+  get_daily: "days(30) \u2192 daily cost table grouped by date and agent",
+  get_session_detail: "session_id(prefix ok) \u2192 per-request breakdown with model, tokens, cost",
+  sync: "sources(all|claude|codex|gemini) \u2192 {files, requests, sessions} ingested",
+  get_goals: "no params \u2192 period, scope, limit, spent, percent, status(ON TRACK/AT RISK/OVER)",
+  set_goal: "period(day|week|month|year), limit_usd, project_path?, agent? \u2192 creates/updates goal",
+  remove_goal: "id \u2192 deletes goal"
+};
+server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: TOOLS }));
+server.setRequestHandler(CallToolRequestSchema, async (req) => {
+  const { name, arguments: args } = req.params;
+  const a = args ?? {};
   try {
-    db.prepare("INSERT INTO feedback (message, email, category, version) VALUES (?, ?, ?, ?)").run(message, email ?? null, category ?? "general", packageMetadata.version);
-    return text("Feedback saved. Thank you!");
-  } catch (error) {
-    return textError(String(error));
+    switch (name) {
+      case "search_tools": {
+        const q = a["query"]?.toLowerCase();
+        const names = TOOLS.map((t) => t.name);
+        const matches = q ? names.filter((n) => n.includes(q)) : names;
+        return { content: [{ type: "text", text: matches.join(", ") }] };
+      }
+      case "describe_tools": {
+        const names = a["names"] ?? [];
+        const result = names.map((n) => `${n}: ${TOOL_DESCRIPTIONS[n] ?? "see tool schema"}`).join(`
+`);
+        return { content: [{ type: "text", text: result }] };
+      }
+      case "get_cost_summary": {
+        const period = a["period"] ?? "today";
+        const s = querySummary(db, period);
+        const text = [
+          `period: ${period}`,
+          `cost: ${fmtUsd(s.total_usd)}`,
+          `sessions: ${s.sessions}`,
+          `requests: ${s.requests.toLocaleString()}`,
+          `tokens: ${fmtTok(s.tokens)}`,
+          `summary: You've spent ${fmtUsd(s.total_usd)} ${period === "all" ? "total" : period} across ${s.sessions} sessions (${s.requests.toLocaleString()} requests, ${fmtTok(s.tokens)} tokens)`
+        ].join(`
+`);
+        return { content: [{ type: "text", text }] };
+      }
+      case "get_sessions": {
+        const sessions = querySessions(db, {
+          agent: a["agent"],
+          project: a["project"],
+          limit: Number(a["limit"] ?? 20)
+        });
+        const lines = ["id       agent  cost       tokens   project"];
+        for (const s of sessions)
+          lines.push(fmtSession(s));
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "get_top_sessions": {
+        const sessions = queryTopSessions(db, Number(a["n"] ?? 10), a["agent"]);
+        const lines = ["rank  id       agent  cost       tokens   project"];
+        sessions.forEach((s, i) => lines.push(`${String(i + 1).padEnd(5)} ${fmtSession(s)}`));
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "get_model_breakdown": {
+        const rows = queryModelBreakdown(db);
+        const lines = ["model                          reqs    tokens   cost"];
+        for (const r of rows) {
+          lines.push(`${String(r["model"]).slice(0, 30).padEnd(31)}${String(r["requests"]).padEnd(8)}${fmtTok(Number(r["total_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "get_project_breakdown": {
+        const rows = queryProjectBreakdown(db);
+        const lines = ["project              sessions tokens   cost"];
+        for (const r of rows) {
+          const name2 = String(r["project_name"] || r["project_path"] || "\u2014").slice(0, 20);
+          lines.push(`${name2.padEnd(21)}${String(r["sessions"]).padEnd(9)}${fmtTok(Number(r["total_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "get_budget_status": {
+        const budgets = getBudgetStatuses(db);
+        if (budgets.length === 0)
+          return { content: [{ type: "text", text: "No budgets set." }] };
+        const lines = ["scope                period   spent      limit      used%  status"];
+        for (const b of budgets) {
+          const scope = String(b["project_path"] ?? "global").slice(0, 20);
+          const pct = Number(b["percent_used"]).toFixed(1);
+          const status = b["is_over_limit"] ? "OVER" : b["is_over_alert"] ? "ALERT" : "OK";
+          lines.push(`${scope.padEnd(21)}${String(b["period"]).padEnd(9)}${fmtUsd(Number(b["current_spend_usd"])).padEnd(11)}${fmtUsd(Number(b["limit_usd"])).padEnd(11)}${pct}%`.padEnd(49) + `  ${status}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "get_daily": {
+        const days = Number(a["days"] ?? 30);
+        const rows = queryDailyBreakdown(db, days);
+        const lines = ["date        claude     codex      gemini     total"];
+        const byDate = new Map;
+        for (const r of rows) {
+          const d = String(r["date"]);
+          const entry = byDate.get(d) ?? { claude: 0, codex: 0, gemini: 0 };
+          if (r["agent"] === "claude")
+            entry.claude += Number(r["cost_usd"]);
+          else if (r["agent"] === "codex")
+            entry.codex += Number(r["cost_usd"]);
+          else if (r["agent"] === "gemini")
+            entry.gemini += Number(r["cost_usd"]);
+          byDate.set(d, entry);
+        }
+        for (const [date, costs] of [...byDate.entries()].sort()) {
+          const total = costs.claude + costs.codex + costs.gemini;
+          lines.push(`${date}  ${fmtUsd(costs.claude).padEnd(11)}${fmtUsd(costs.codex).padEnd(11)}${fmtUsd(costs.gemini).padEnd(11)}${fmtUsd(total)}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "get_session_detail": {
+        const sid = String(a["session_id"] ?? "");
+        const session = db.prepare(`SELECT * FROM sessions WHERE id = ? OR id LIKE ?`).get(sid, `${sid}%`);
+        if (!session)
+          return { content: [{ type: "text", text: `Session not found: ${sid}` }], isError: true };
+        const requests = db.prepare(`SELECT * FROM requests WHERE session_id = ? ORDER BY timestamp ASC LIMIT 50`).all(session["id"]);
+        const lines = [
+          `session: ${String(session["id"]).slice(0, 16)}`,
+          `agent: ${session["agent"]}  project: ${session["project_name"] || "\u2014"}`,
+          `cost: ${fmtUsd(Number(session["total_cost_usd"]))}  tokens: ${fmtTok(Number(session["total_tokens"]))}  requests: ${session["request_count"]}`,
+          "",
+          "time      model                  input    output   cost"
+        ];
+        for (const r of requests) {
+          lines.push(`${String(r["timestamp"]).slice(11, 19)}  ${String(r["model"]).slice(0, 22).padEnd(23)}${fmtTok(Number(r["input_tokens"])).padEnd(9)}${fmtTok(Number(r["output_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "sync": {
+        const sources = a["sources"] ?? "all";
+        const parts = [];
+        if (sources === "all" || sources === "claude") {
+          const r = await ingestClaude(db);
+          parts.push(`claude: ${r["files"]} files, ${r["requests"]} requests, ${r["sessions"]} sessions`);
+        }
+        if (sources === "all" || sources === "codex") {
+          const r = await ingestCodex(db);
+          parts.push(`codex: ${r["sessions"]} sessions`);
+        }
+        if (sources === "all" || sources === "gemini") {
+          const r = await ingestGemini(db);
+          parts.push(`gemini: ${r["sessions"]} sessions`);
+        }
+        return { content: [{ type: "text", text: parts.join(`
+`) || "done" }] };
+      }
+      case "get_goals": {
+        const goals = getGoalStatuses(db);
+        if (goals.length === 0)
+          return { content: [{ type: "text", text: "No goals set." }] };
+        const lines = ["period   scope                limit      spent      used%  status"];
+        for (const g of goals) {
+          const scope = String(g["project_path"] ?? g["agent"] ?? "global").slice(0, 20);
+          const pct = Number(g["percent_used"]).toFixed(1);
+          const status = g["is_over"] ? "OVER" : g["is_at_risk"] ? "AT RISK" : "ON TRACK";
+          lines.push(`${String(g["period"]).padEnd(9)}${scope.padEnd(21)}${fmtUsd(Number(g["limit_usd"])).padEnd(11)}${fmtUsd(Number(g["current_spend_usd"])).padEnd(11)}${pct}%  ${status}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      }
+      case "set_goal": {
+        const { randomUUID } = await import("crypto");
+        const now = new Date().toISOString();
+        upsertGoal(db, {
+          id: randomUUID(),
+          period: String(a["period"] ?? "month"),
+          project_path: a["project_path"] ?? null,
+          agent: a["agent"] ?? null,
+          limit_usd: Number(a["limit_usd"]),
+          created_at: now,
+          updated_at: now
+        });
+        return { content: [{ type: "text", text: `Goal set: ${a["period"]} $${a["limit_usd"]}` }] };
+      }
+      case "remove_goal": {
+        deleteGoal(db, String(a["id"] ?? ""));
+        return { content: [{ type: "text", text: "Goal removed." }] };
+      }
+      case "register_agent": {
+        const n = String(args["name"] ?? "");
+        const ex = [..._econAgents.values()].find((x) => x.name === n);
+        if (ex) {
+          ex.last_seen_at = new Date().toISOString();
+          return { content: [{ type: "text", text: JSON.stringify(ex) }] };
+        }
+        const id = Math.random().toString(36).slice(2, 10);
+        const ag = { id, name: n, last_seen_at: new Date().toISOString() };
+        _econAgents.set(id, ag);
+        return { content: [{ type: "text", text: JSON.stringify(ag) }] };
+      }
+      case "heartbeat": {
+        const ag = _econAgents.get(String(args["agent_id"] ?? ""));
+        if (!ag)
+          return { content: [{ type: "text", text: `Agent not found` }], isError: true };
+        ag.last_seen_at = new Date().toISOString();
+        return { content: [{ type: "text", text: `\u2665 ${ag.name}` }] };
+      }
+      case "set_focus": {
+        const ag = _econAgents.get(String(args["agent_id"] ?? ""));
+        if (!ag)
+          return { content: [{ type: "text", text: `Agent not found` }], isError: true };
+        ag["project_id"] = args["project_id"];
+        return { content: [{ type: "text", text: String(args["project_id"] ? `Focus: ${args["project_id"]}` : "Focus cleared") }] };
+      }
+      case "list_agents": {
+        return { content: [{ type: "text", text: JSON.stringify([..._econAgents.values()]) }] };
+      }
+      case "send_feedback": {
+        try {
+          const pkg = require_package();
+          db.prepare("INSERT INTO feedback (message, email, category, version) VALUES (?, ?, ?, ?)").run(String(a["message"]), a["email"] || null, a["category"] || "general", pkg.version);
+          return { content: [{ type: "text", text: "Feedback saved. Thank you!" }] };
+        } catch (e) {
+          return { content: [{ type: "text", text: String(e) }], isError: true };
+        }
+      }
+      default:
+        return { content: [{ type: "text", text: `Unknown tool: ${name}` }], isError: true };
+    }
+  } catch (e) {
+    return { content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : String(e)}` }], isError: true };
   }
 });
+var _econAgents = new Map;
 var transport = new StdioServerTransport;
-registerCloudTools(server, "economy", {
-  dbPath: getDbPath(),
-  migrations: PG_MIGRATIONS
-});
 await server.connect(transport);