@hasna/economy 0.2.27 → 0.2.29

package/dist/mcp/index.js

@@ -566,6 +566,26 @@ function openDatabase(dbPath, skipSeed = false) {
   }
   return db;
 }
+function quoteSqlIdent(identifier) {
+  return `"${identifier.replace(/"/g, '""')}"`;
+}
+function hasColumn(db, table, column) {
+  const columns = db.prepare(`PRAGMA table_info(${quoteSqlIdent(table)})`).all();
+  return columns.some((c) => c.name === column);
+}
+function addColumnIfMissing(db, table, column, definition) {
+  if (hasColumn(db, table, column))
+    return false;
+  try {
+    db.exec(`ALTER TABLE ${quoteSqlIdent(table)} ADD COLUMN ${quoteSqlIdent(column)} ${definition}`);
+    return true;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (/duplicate column name/i.test(message))
+      return true;
+    throw error;
+  }
+}
 function initSchema(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS requests (
@@ -736,59 +756,31 @@ function initSchema(db) {
     CREATE INDEX IF NOT EXISTS idx_usage_agent_date ON usage_snapshots(agent, date);
     CREATE INDEX IF NOT EXISTS idx_savings_date ON savings_daily(date);
   `);
-  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 ''`);
-  }
-  if (!cols.some((c) => c.name === "cache_create_5m_tokens")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_5m_tokens INTEGER DEFAULT 0`);
+  addColumnIfMissing(db, "requests", "machine_id", `TEXT DEFAULT ''`);
+  addColumnIfMissing(db, "sessions", "machine_id", `TEXT DEFAULT ''`);
+  if (addColumnIfMissing(db, "requests", "cache_create_5m_tokens", "INTEGER DEFAULT 0")) {
     db.exec(`UPDATE requests SET cache_create_5m_tokens = cache_create_tokens WHERE cache_create_5m_tokens = 0`);
   }
-  if (!cols.some((c) => c.name === "cache_create_1h_tokens")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_1h_tokens INTEGER DEFAULT 0`);
-  }
-  if (!cols.some((c) => c.name === "cost_basis")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN cost_basis TEXT DEFAULT 'estimated'`);
-  }
-  if (!cols.some((c) => c.name === "attribution_tag")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN attribution_tag TEXT DEFAULT ''`);
-  }
-  if (!cols.some((c) => c.name === "updated_at")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN updated_at TEXT DEFAULT ''`);
+  addColumnIfMissing(db, "requests", "cache_create_1h_tokens", "INTEGER DEFAULT 0");
+  addColumnIfMissing(db, "requests", "cost_basis", `TEXT DEFAULT 'estimated'`);
+  addColumnIfMissing(db, "requests", "attribution_tag", `TEXT DEFAULT ''`);
+  if (addColumnIfMissing(db, "requests", "updated_at", `TEXT DEFAULT ''`)) {
     db.exec(`UPDATE requests SET updated_at = timestamp WHERE updated_at = '' OR updated_at IS NULL`);
   }
-  if (!cols.some((c) => c.name === "synced_at")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN synced_at TEXT DEFAULT ''`);
-  }
+  addColumnIfMissing(db, "requests", "synced_at", `TEXT DEFAULT ''`);
   for (const column of ["account_key", "account_tool", "account_name", "account_email", "account_source"]) {
-    if (!cols.some((c) => c.name === column)) {
-      db.exec(`ALTER TABLE requests ADD COLUMN ${column} TEXT DEFAULT ''`);
-    }
-  }
-  const sessionCols = db.prepare(`PRAGMA table_info(sessions)`).all();
-  if (!sessionCols.some((c) => c.name === "attribution_tag")) {
-    db.exec(`ALTER TABLE sessions ADD COLUMN attribution_tag TEXT DEFAULT ''`);
+    addColumnIfMissing(db, "requests", column, `TEXT DEFAULT ''`);
   }
-  if (!sessionCols.some((c) => c.name === "updated_at")) {
-    db.exec(`ALTER TABLE sessions ADD COLUMN updated_at TEXT DEFAULT ''`);
+  addColumnIfMissing(db, "sessions", "attribution_tag", `TEXT DEFAULT ''`);
+  if (addColumnIfMissing(db, "sessions", "updated_at", `TEXT DEFAULT ''`)) {
     db.exec(`UPDATE sessions SET updated_at = started_at WHERE updated_at = '' OR updated_at IS NULL`);
   }
-  if (!sessionCols.some((c) => c.name === "synced_at")) {
-    db.exec(`ALTER TABLE sessions ADD COLUMN synced_at TEXT DEFAULT ''`);
-  }
+  addColumnIfMissing(db, "sessions", "synced_at", `TEXT DEFAULT ''`);
   for (const column of ["account_key", "account_tool", "account_name", "account_email", "account_source"]) {
-    if (!sessionCols.some((c) => c.name === column)) {
-      db.exec(`ALTER TABLE sessions ADD COLUMN ${column} TEXT DEFAULT ''`);
-    }
-  }
-  const pricingCols = db.prepare(`PRAGMA table_info(model_pricing)`).all();
-  if (!pricingCols.some((c) => c.name === "cache_write_1h_per_1m")) {
-    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`);
-  }
-  if (!pricingCols.some((c) => c.name === "cache_storage_per_1m_hour")) {
-    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`);
+    addColumnIfMissing(db, "sessions", column, `TEXT DEFAULT ''`);
   }
+  addColumnIfMissing(db, "model_pricing", "cache_write_1h_per_1m", "REAL NOT NULL DEFAULT 0");
+  addColumnIfMissing(db, "model_pricing", "cache_storage_per_1m_hour", "REAL NOT NULL DEFAULT 0");
   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);
@@ -949,17 +941,22 @@ function querySummary(db, period, machine, allMachines = false) {
   const codexTotals = db.prepare(`
     SELECT COALESCE(SUM(total_cost_usd), 0) as cost_usd,
            COALESCE(SUM(total_tokens), 0) as tokens,
+           COALESCE(SUM(request_count), 0) as requests,
            COUNT(*) as sessions
     FROM sessions
     WHERE ${sWhere}${machineClause}
     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 requestSessionCount = db.prepare(`
+    SELECT COUNT(DISTINCT session_id) as sessions
+    FROM requests
+    WHERE ${rWhere}${machineClause}
+  `).get();
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
-    requests: r.requests,
+    requests: r.requests + codexTotals.requests,
     tokens: r.tokens + codexTotals.tokens,
-    sessions: sessionCount.sessions,
+    sessions: requestSessionCount.sessions + codexTotals.sessions,
     period
   };
 }
@@ -974,8 +971,10 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
-function queryAgentBreakdown(db, period = "all") {
+function queryAgentBreakdown(db, period = "all", machine) {
   const requestWhere = requestPeriodWhere(period);
+  const machineClause = machine ? " AND machine_id = ?" : "";
+  const machineParams = machine ? [machine] : [];
   const groups = new Map;
   const requestRows = db.prepare(`
     SELECT agent,
@@ -991,10 +990,10 @@ function queryAgentBreakdown(db, period = "all") {
            COALESCE(SUM(cost_usd), 0) as cost_usd,
            MAX(timestamp) as last_active
     FROM requests
-    WHERE ${requestWhere}
+    WHERE ${requestWhere}${machineClause}
     GROUP BY agent
     ORDER BY api_equivalent_usd DESC
-  `).all();
+  `).all(...machineParams);
   for (const row of requestRows) {
     groups.set(row.agent, row);
   }
@@ -1007,10 +1006,10 @@ function queryAgentBreakdown(db, period = "all") {
            COALESCE(SUM(total_cost_usd), 0) as cost_usd,
            MAX(started_at) as last_active
     FROM sessions
-    WHERE ${sessionWhere}
+    WHERE ${sessionWhere}${machineClause}
       AND id NOT IN (SELECT DISTINCT session_id FROM requests)
     GROUP BY agent
-  `).all();
+  `).all(...machineParams);
   for (const row of sessionOnlyRows) {
     const existing = groups.get(row.agent) ?? {
       agent: row.agent,
@@ -1087,14 +1086,20 @@ function labelForPath(projectPath, projectName) {
 function groupKeyForPath(projectPath, projectName) {
   return labelForPath(projectPath, projectName).trim().toLowerCase();
 }
-function queryProjectBreakdown(db, period = "all") {
+function queryProjectBreakdown(db, period = "all", machine) {
   const requestWhere = requestPeriodWhere(period);
   const sessionWhere = sessionPeriodWhere(period);
+  const sessionMachineClause = machine ? " AND (machine_id = ? OR id IN (SELECT DISTINCT session_id FROM requests WHERE machine_id = ?))" : "";
+  const requestMachineClause = machine ? " AND machine_id = ?" : "";
+  const sessionMachineParams = machine ? [machine, machine] : [];
+  const requestMachineParams = machine ? [machine] : [];
+  const sessionOnlyMachineClause = machine ? " AND machine_id = ?" : "";
+  const sessionOnlyMachineParams = machine ? [machine] : [];
   const sessions = db.prepare(`
     SELECT id, project_path, project_name, total_cost_usd, started_at
     FROM sessions
-    WHERE project_path != '' OR project_name != ''
-  `).all();
+    WHERE (project_path != '' OR project_name != '')${sessionMachineClause}
+  `).all(...sessionMachineParams);
   const groups = new Map;
   for (const s of sessions) {
     const label = labelForPath(s.project_path, s.project_name);
@@ -1120,7 +1125,8 @@ function queryProjectBreakdown(db, period = "all") {
           FROM requests
           WHERE session_id IN (${placeholders})
             AND ${requestWhere}
-        `).get(...g.sessionIds) : { sessions: 0, requests: 0, cost_usd: 0, total_tokens: 0, last_active: null };
+            ${requestMachineClause}
+        `).get(...g.sessionIds, ...requestMachineParams) : { sessions: 0, requests: 0, cost_usd: 0, total_tokens: 0, last_active: null };
     const sessionOnlyStats = placeholders.length ? db.prepare(`
           SELECT
             COUNT(*) as sessions,
@@ -1131,8 +1137,9 @@ function queryProjectBreakdown(db, period = "all") {
           FROM sessions
           WHERE id IN (${placeholders})
             AND ${sessionWhere}
+            ${sessionOnlyMachineClause}
             AND id NOT IN (SELECT DISTINCT session_id FROM requests)
-        `).get(...g.sessionIds) : { sessions: 0, requests: 0, total_tokens: 0, cost_usd: 0, last_active: null };
+        `).get(...g.sessionIds, ...sessionOnlyMachineParams) : { sessions: 0, requests: 0, total_tokens: 0, cost_usd: 0, last_active: null };
     const totalSessions = reqStats.sessions + sessionOnlyStats.sessions;
     if (totalSessions === 0)
       continue;
@@ -1150,107 +1157,156 @@ function queryProjectBreakdown(db, period = "all") {
   result.sort((a, b) => b.cost_usd - a.cost_usd);
   return result;
 }
-function queryAccountBreakdown(db, period = "all") {
+function normalizeAccountEmail(email) {
+  return (email ?? "").trim().toLowerCase();
+}
+function accountIdentityKey(agent, accountKey, accountName, accountEmail) {
+  const identityAgent = (agent || "").trim();
+  const normalizedEmail = normalizeAccountEmail(accountEmail);
+  if (identityAgent && normalizedEmail)
+    return `${identityAgent}:${normalizedEmail}`;
+  if (identityAgent && accountName)
+    return `${identityAgent}:${accountName}`;
+  if (accountKey)
+    return accountKey;
+  return identityAgent ? `${identityAgent}:unknown` : "";
+}
+function addAccountBreakdownRow(groups, row, sessionOnly) {
+  const agent = row.agent || row.account_tool;
+  const email = normalizeAccountEmail(row.account_email);
+  const accountName = row.account_name || email || row.account_key;
+  const key = accountIdentityKey(agent, row.account_key, accountName, email);
+  if (!key)
+    return;
+  const group = groups.get(key) ?? {
+    account_key: key,
+    account_tool: agent,
+    account_name: accountName,
+    account_email: email || null,
+    account_source: row.account_source || "unknown",
+    sessionIds: new Set,
+    requests: 0,
+    total_tokens: 0,
+    api_equivalent_usd: 0,
+    metered_api_usd: 0,
+    subscription_included_usd: 0,
+    estimated_usd: 0,
+    unknown_usd: 0,
+    last_active: ""
+  };
+  if (!group.account_email && email)
+    group.account_email = email;
+  if (!group.account_name && accountName)
+    group.account_name = accountName;
+  if ((!group.account_source || group.account_source === "unknown") && row.account_source && row.account_source !== "unknown") {
+    group.account_source = row.account_source;
+  }
+  if (row.session_id)
+    group.sessionIds.add(row.session_id);
+  group.requests += row.requests;
+  group.total_tokens += row.total_tokens;
+  group.api_equivalent_usd += row.cost_usd;
+  if (sessionOnly) {
+    group.estimated_usd += row.cost_usd;
+  } else if (row.cost_basis === "metered_api") {
+    group.metered_api_usd += row.cost_usd;
+  } else if (row.cost_basis === "subscription_included") {
+    group.subscription_included_usd += row.cost_usd;
+  } else if (row.cost_basis === "unknown") {
+    group.unknown_usd += row.cost_usd;
+  } else {
+    group.estimated_usd += row.cost_usd;
+  }
+  if (!group.last_active || row.last_active > group.last_active)
+    group.last_active = row.last_active;
+  groups.set(key, group);
+}
+function queryAccountBreakdown(db, period = "all", machine) {
   const requestWhere = requestPeriodWhere(period);
   const sessionWhere = sessionPeriodWhere(period);
-  const sessions = db.prepare(`
-    SELECT id, account_key, account_tool, account_name, account_email, account_source,
-           total_cost_usd, total_tokens, request_count, started_at
-    FROM sessions
-    WHERE account_key != '' OR account_tool != '' OR account_name != '' OR account_email != ''
-  `).all();
+  const requestMachineClause = machine ? " AND r.machine_id = ?" : "";
+  const sessionMachineClause = machine ? " AND s.machine_id = ?" : "";
+  const requestMachineParams = machine ? [machine] : [];
+  const sessionMachineParams = machine ? [machine] : [];
   const groups = new Map;
-  for (const session of sessions) {
-    const key = session.account_key || `${session.account_tool}:${session.account_name}`;
-    if (!key || key === ":")
-      continue;
-    const group = groups.get(key) ?? {
-      sessionIds: [],
-      account_tool: session.account_tool,
-      account_name: session.account_name,
-      account_email: session.account_email || null,
-      account_source: session.account_source || "unknown"
-    };
-    group.sessionIds.push(session.id);
-    groups.set(key, group);
-  }
-  const result = [];
-  for (const [key, group] of groups.entries()) {
-    const placeholders = group.sessionIds.map(() => "?").join(",");
-    const reqStats = placeholders ? db.prepare(`
-          SELECT
-            COUNT(DISTINCT session_id) as sessions,
-            COUNT(*) as requests,
-            COALESCE(SUM(cost_usd), 0) as cost_usd,
-            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
-            COALESCE(SUM(CASE WHEN cost_basis = 'metered_api' THEN cost_usd ELSE 0 END), 0) as metered_api_usd,
-            COALESCE(SUM(CASE WHEN cost_basis = 'subscription_included' THEN cost_usd ELSE 0 END), 0) as subscription_included_usd,
-            COALESCE(SUM(CASE WHEN COALESCE(cost_basis, 'estimated') = 'estimated' THEN cost_usd ELSE 0 END), 0) as estimated_usd,
-            COALESCE(SUM(CASE WHEN cost_basis = 'unknown' THEN cost_usd ELSE 0 END), 0) as unknown_usd,
-            MAX(timestamp) as last_active
-          FROM requests
-          WHERE session_id IN (${placeholders})
-            AND ${requestWhere}
-        `).get(...group.sessionIds) : {
-      sessions: 0,
-      requests: 0,
-      cost_usd: 0,
-      total_tokens: 0,
-      metered_api_usd: 0,
-      subscription_included_usd: 0,
-      estimated_usd: 0,
-      unknown_usd: 0,
-      last_active: null
-    };
-    const sessionOnlyStats = placeholders ? db.prepare(`
-          SELECT
-            COUNT(*) as sessions,
-            COALESCE(SUM(request_count), 0) as requests,
-            COALESCE(SUM(total_tokens), 0) as total_tokens,
-            COALESCE(SUM(total_cost_usd), 0) as cost_usd,
-            MAX(started_at) as last_active
-          FROM sessions
-          WHERE id IN (${placeholders})
-            AND ${sessionWhere}
-            AND id NOT IN (SELECT DISTINCT session_id FROM requests)
-        `).get(...group.sessionIds) : { sessions: 0, requests: 0, total_tokens: 0, cost_usd: 0, last_active: null };
-    const sessionsTotal = reqStats.sessions + sessionOnlyStats.sessions;
-    if (sessionsTotal === 0)
-      continue;
-    const apiEquivalentUsd = reqStats.cost_usd + sessionOnlyStats.cost_usd;
-    const estimatedUsd = reqStats.estimated_usd + sessionOnlyStats.cost_usd;
-    const billableUsd = reqStats.metered_api_usd;
-    const lastActive = [reqStats.last_active, sessionOnlyStats.last_active].filter(Boolean).sort().at(-1) ?? "";
-    result.push({
-      account_key: key,
-      account_tool: group.account_tool,
-      account_name: group.account_name,
-      account_email: group.account_email,
-      account_source: group.account_source,
-      sessions: sessionsTotal,
-      requests: reqStats.requests + sessionOnlyStats.requests,
-      total_tokens: reqStats.total_tokens + sessionOnlyStats.total_tokens,
-      api_equivalent_usd: apiEquivalentUsd,
-      billable_usd: billableUsd,
-      metered_api_usd: reqStats.metered_api_usd,
-      subscription_included_usd: reqStats.subscription_included_usd,
-      estimated_usd: estimatedUsd,
-      unknown_usd: reqStats.unknown_usd,
-      cost_usd: apiEquivalentUsd,
-      last_active: lastActive
-    });
-  }
+  const requestRows = db.prepare(`
+    SELECT
+      r.session_id as session_id,
+      COALESCE(NULLIF(r.agent, ''), NULLIF(s.agent, ''), '') as agent,
+      COALESCE(NULLIF(r.account_key, ''), NULLIF(s.account_key, ''), '') as account_key,
+      COALESCE(NULLIF(r.account_tool, ''), NULLIF(s.account_tool, ''), '') as account_tool,
+      COALESCE(NULLIF(r.account_name, ''), NULLIF(s.account_name, ''), '') as account_name,
+      COALESCE(NULLIF(r.account_email, ''), NULLIF(s.account_email, ''), '') as account_email,
+      COALESCE(NULLIF(r.account_source, ''), NULLIF(s.account_source, ''), 'unknown') as account_source,
+      1 as requests,
+      COALESCE(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens, 0) as total_tokens,
+      COALESCE(r.cost_usd, 0) as cost_usd,
+      COALESCE(NULLIF(r.cost_basis, ''), 'estimated') as cost_basis,
+      r.timestamp as last_active
+    FROM requests r
+    LEFT JOIN sessions s ON s.id = r.session_id
+    WHERE ${requestWhere}${requestMachineClause}
+      AND (
+        COALESCE(NULLIF(r.account_key, ''), NULLIF(s.account_key, ''), '') != ''
+        OR COALESCE(NULLIF(r.account_tool, ''), NULLIF(s.account_tool, ''), '') != ''
+        OR COALESCE(NULLIF(r.account_name, ''), NULLIF(s.account_name, ''), '') != ''
+        OR COALESCE(NULLIF(r.account_email, ''), NULLIF(s.account_email, ''), '') != ''
+      )
+  `).all(...requestMachineParams);
+  for (const row of requestRows)
+    addAccountBreakdownRow(groups, row, false);
+  const sessionOnlyRows = db.prepare(`
+    SELECT
+      s.id as session_id,
+      s.agent as agent,
+      s.account_key as account_key,
+      s.account_tool as account_tool,
+      s.account_name as account_name,
+      s.account_email as account_email,
+      COALESCE(NULLIF(s.account_source, ''), 'unknown') as account_source,
+      COALESCE(s.request_count, 0) as requests,
+      COALESCE(s.total_tokens, 0) as total_tokens,
+      COALESCE(s.total_cost_usd, 0) as cost_usd,
+      'estimated' as cost_basis,
+      s.started_at as last_active
+    FROM sessions s
+    WHERE ${sessionWhere}${sessionMachineClause}
+      AND s.id NOT IN (SELECT DISTINCT session_id FROM requests)
+      AND (s.account_key != '' OR s.account_tool != '' OR s.account_name != '' OR s.account_email != '')
+  `).all(...sessionMachineParams);
+  for (const row of sessionOnlyRows)
+    addAccountBreakdownRow(groups, row, true);
+  const result = [...groups.values()].map((group) => ({
+    account_key: group.account_key,
+    account_tool: group.account_tool,
+    account_name: group.account_name,
+    account_email: group.account_email,
+    account_source: group.account_source,
+    sessions: group.sessionIds.size,
+    requests: group.requests,
+    total_tokens: group.total_tokens,
+    api_equivalent_usd: group.api_equivalent_usd,
+    billable_usd: group.metered_api_usd,
+    metered_api_usd: group.metered_api_usd,
+    subscription_included_usd: group.subscription_included_usd,
+    estimated_usd: group.estimated_usd,
+    unknown_usd: group.unknown_usd,
+    cost_usd: group.api_equivalent_usd,
+    last_active: group.last_active
+  }));
   result.sort((a, b) => b.cost_usd - a.cost_usd);
   return result;
 }
-function queryDailyBreakdown(db, days = 30) {
+function queryDailyBreakdown(db, days = 30, machine) {
+  const machineClause = machine ? " AND machine_id = ?" : "";
+  const params = machine ? [`-${days}`, machine] : [`-${days}`];
   return db.prepare(`
     SELECT DATE(timestamp) as date, agent, COALESCE(SUM(cost_usd), 0) as cost_usd
     FROM requests
-    WHERE timestamp >= DATE('now', ? || ' days')
+    WHERE timestamp >= DATE('now', ? || ' days')${machineClause}
     GROUP BY DATE(timestamp), agent
     ORDER BY date ASC
-  `).all(`-${days}`);
+  `).all(...params);
 }
 function upsertBudget(db, budget) {
   db.prepare(`
@@ -1349,17 +1405,48 @@ function queryBillingSummary(db, period) {
   }
   return { total_usd: total, by_provider };
 }
-function listMachines(db) {
+function listMachines(db, period = "all") {
+  const rWhere = requestPeriodWhere(period);
+  const sWhere = sessionPeriodWhere(period);
   return db.prepare(`
+    WITH request_stats AS (
+      SELECT
+        machine_id,
+        COUNT(DISTINCT session_id) as sessions,
+        COUNT(*) as requests,
+        COALESCE(SUM(cost_usd), 0) as total_cost_usd,
+        MAX(timestamp) as last_active
+      FROM requests
+      WHERE machine_id != ''
+        AND ${rWhere}
+      GROUP BY machine_id
+    ),
+    session_only_stats AS (
+      SELECT
+        machine_id,
+        COUNT(*) as sessions,
+        COALESCE(SUM(request_count), 0) as requests,
+        COALESCE(SUM(total_cost_usd), 0) as total_cost_usd,
+        MAX(started_at) as last_active
+      FROM sessions
+      WHERE machine_id != ''
+        AND ${sWhere}
+        AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+      GROUP BY machine_id
+    ),
+    combined AS (
+      SELECT * FROM request_stats
+      UNION ALL
+      SELECT * FROM session_only_stats
+    )
     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
+      machine_id,
+      COALESCE(SUM(sessions), 0) as sessions,
+      COALESCE(SUM(requests), 0) as requests,
+      COALESCE(SUM(total_cost_usd), 0) as total_cost_usd,
+      MAX(last_active) as last_active
+    FROM combined
+    GROUP BY machine_id
     ORDER BY total_cost_usd DESC
   `).all();
 }
@@ -1648,18 +1735,36 @@ var init_pg_migrations = __esm(() => {
 });
 
 // src/mcp/index.ts
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+
+// src/lib/package-metadata.ts
+import { readFileSync } from "fs";
+var cachedMetadata = null;
+function getPackageMetadata() {
+  if (cachedMetadata)
+    return cachedMetadata;
+  const raw = readFileSync(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/server.ts
 init_database();
 init_pg_migrations();
 import { randomUUID } from "crypto";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { registerCloudTools } from "@hasna/cloud";
 import { z } from "zod";
 
 // src/ingest/claude.ts
 init_database();
 init_pricing();
-import { readdirSync as readdirSync2, readFileSync, existsSync as existsSync2, statSync as statSync2 } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync2, statSync as statSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2, basename } from "path";
 
@@ -1828,18 +1933,22 @@ var AGENT_ACCOUNT_TOOLS = {
   pi: ["pi"],
   hermes: ["hermes"]
 };
-function accountKey(tool, name) {
-  return `${tool}:${name}`;
+function normalizeEmail(email) {
+  return (email ?? "").trim().toLowerCase();
+}
+function accountKey(tool, name, email) {
+  const normalizedEmail = normalizeEmail(email);
+  return `${tool}:${normalizedEmail || name}`;
 }
 function normalizeDir(value) {
   return value.replace(/\/+$/, "");
 }
 function fromProfile(profile, source) {
   return {
-    account_key: accountKey(profile.tool, profile.name),
+    account_key: accountKey(profile.tool, profile.name, profile.email),
     account_tool: profile.tool,
     account_name: profile.name,
-    ...profile.email ? { account_email: profile.email } : {},
+    ...profile.email ? { account_email: normalizeEmail(profile.email) } : {},
     account_source: source
   };
 }
@@ -1851,10 +1960,12 @@ function fromOverride(raw, agent) {
   const [tool, name] = value.includes(":") ? value.split(":", 2) : [candidateTool, value];
   if (!tool || !name)
     return null;
+  const email = name.includes("@") ? normalizeEmail(name) : undefined;
   return {
-    account_key: accountKey(tool, name),
+    account_key: accountKey(tool, name, email),
     account_tool: tool,
     account_name: name,
+    ...email ? { account_email: email } : {},
     account_source: "override"
   };
 }
@@ -1867,11 +1978,12 @@ function envOverride(agent, env) {
   const name = env[`ECONOMY_${agentPrefix}_ACCOUNT_NAME`] ?? env["ECONOMY_ACCOUNT_NAME"];
   if (!tool || !name)
     return null;
+  const email = normalizeEmail(env[`ECONOMY_${agentPrefix}_ACCOUNT_EMAIL`] ?? env["ECONOMY_ACCOUNT_EMAIL"]);
   return {
-    account_key: accountKey(tool, name),
+    account_key: accountKey(tool, name, email),
     account_tool: tool,
     account_name: name,
-    account_email: env[`ECONOMY_${agentPrefix}_ACCOUNT_EMAIL`] ?? env["ECONOMY_ACCOUNT_EMAIL"],
+    ...email ? { account_email: email } : {},
     account_source: "override"
   };
 }
@@ -2002,7 +2114,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
         continue;
       let lines;
       try {
-        lines = readFileSync(filePath, "utf-8").split(`
+        lines = readFileSync2(filePath, "utf-8").split(`
 `).filter((l) => l.trim());
       } catch {
         continue;
@@ -2122,7 +2234,7 @@ function supportsClaudeDataResidencyPricing(model) {
 // src/ingest/codex.ts
 init_database();
 init_pricing();
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join3, basename as basename2 } from "path";
 import { Database as BunDatabase } from "bun:sqlite";
@@ -2140,7 +2252,7 @@ function readCodexModel() {
   if (!existsSync3(configPath))
     return "gpt-5-codex";
   try {
-    const content = readFileSync2(configPath, "utf-8");
+    const content = readFileSync3(configPath, "utf-8");
     const match = content.match(/^model\s*=\s*"([^"]+)"/m);
     return match?.[1] ?? "gpt-5-codex";
   } catch {
@@ -2183,7 +2295,7 @@ function readTokenEvents(rolloutPath) {
   const fallbackUsages = new Map;
   let fallbackTimestamp;
   let aggregate = null;
-  for (const line of readFileSync2(rolloutPath, "utf-8").split(`
+  for (const line of readFileSync3(rolloutPath, "utf-8").split(`
 `)) {
     if (!line.trim())
       continue;
@@ -2339,7 +2451,7 @@ async function ingestCodex(db, verbose = false) {
 // src/ingest/gemini.ts
 init_database();
 init_pricing();
-import { readdirSync as readdirSync3, readFileSync as readFileSync3, existsSync as existsSync4, statSync as statSync3 } from "fs";
+import { readdirSync as readdirSync3, readFileSync as readFileSync4, existsSync as existsSync4, statSync as statSync3 } from "fs";
 import { homedir as homedir4 } from "os";
 import { join as join4, basename as basename3 } from "path";
 var DEFAULT_GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
@@ -2379,7 +2491,7 @@ function projectRoot(projectDir, chatData) {
   const rootFile = join4(projectDir, ".project_root");
   try {
     if (existsSync4(rootFile))
-      return readFileSync3(rootFile, "utf-8").trim();
+      return readFileSync4(rootFile, "utf-8").trim();
   } catch {}
   return "";
 }
@@ -2420,7 +2532,7 @@ async function ingestGemini(db, verbose) {
         continue;
       let chatData;
       try {
-        chatData = JSON.parse(readFileSync3(filePath, "utf-8"));
+        chatData = JSON.parse(readFileSync4(filePath, "utf-8"));
       } catch {
         continue;
       }
@@ -2498,7 +2610,7 @@ async function ingestGemini(db, verbose) {
 // src/ingest/opencode.ts
 init_database();
 init_pricing();
-import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
 import { homedir as homedir5 } from "os";
 import { join as join5 } from "path";
 var OPENCODE_STORAGE = join5(homedir5(), ".local", "share", "opencode", "storage");
@@ -2541,7 +2653,7 @@ async function ingestOpenCode(db, verbose = false) {
       continue;
     let parsed;
     try {
-      parsed = JSON.parse(readFileSync4(file, "utf-8"));
+      parsed = JSON.parse(readFileSync5(file, "utf-8"));
     } catch {
       continue;
     }
@@ -2728,7 +2840,7 @@ async function ingestCursor(db, verbose = false) {
 
 // src/ingest/pi.ts
 init_database();
-import { existsSync as existsSync6, readFileSync as readFileSync5, readdirSync as readdirSync5, statSync as statSync5 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync5, statSync as statSync5 } from "fs";
 import { homedir as homedir6 } from "os";
 import { join as join6 } from "path";
 var PI_SESSION_DIR = process.env["PI_CODING_AGENT_SESSION_DIR"] ?? join6(homedir6(), ".pi", "agent", "sessions");
@@ -2758,7 +2870,7 @@ async function ingestPi(db, verbose = false) {
       continue;
     let data;
     try {
-      data = JSON.parse(readFileSync5(file, "utf-8"));
+      data = JSON.parse(readFileSync6(file, "utf-8"));
     } catch {
       continue;
     }
@@ -2913,7 +3025,7 @@ function statSyncSafe(path) {
 
 // src/ingest/claude-quota.ts
 init_database();
-import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
 
 // src/lib/paths.ts
 import { homedir as homedir8 } from "os";
@@ -2951,7 +3063,7 @@ function readClaudeToken() {
   if (!existsSync8(CREDENTIALS_PATH))
     return null;
   try {
-    const creds = JSON.parse(readFileSync6(CREDENTIALS_PATH, "utf-8"));
+    const creds = JSON.parse(readFileSync7(CREDENTIALS_PATH, "utf-8"));
     const oauth = creds.claudeAiOauth;
     if (!oauth?.accessToken)
       return null;
@@ -3087,7 +3199,7 @@ async function ingestClaudeQuota(db, verbose = false) {
 
 // src/ingest/codex-quota.ts
 init_database();
-import { existsSync as existsSync9, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync8 } from "fs";
 var WHAM_USAGE_URL = process.env["CODEX_USAGE_URL"] ?? "https://chatgpt.com/backend-api/wham/usage";
 function readCodexAuth() {
   const fromEnv = process.env["CODEX_OAUTH_TOKEN"];
@@ -3097,7 +3209,7 @@ function readCodexAuth() {
   if (!existsSync9(authPath))
     return null;
   try {
-    const auth = JSON.parse(readFileSync7(authPath, "utf-8"));
+    const auth = JSON.parse(readFileSync8(authPath, "utf-8"));
     const token = auth.tokens?.access_token;
     if (!token)
       return null;
@@ -3229,24 +3341,6 @@ init_database();
 
 // src/lib/cloud-sync.ts
 init_database();
-
-// src/lib/package-metadata.ts
-import { readFileSync as readFileSync8 } from "fs";
-var cachedMetadata = null;
-function getPackageMetadata() {
-  if (cachedMetadata)
-    return cachedMetadata;
-  const raw = readFileSync8(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/lib/cloud-sync.ts
 var CLOUD_TABLES = [
   "requests",
   "sessions",
@@ -3412,6 +3506,9 @@ var AGENTS = [
   "hermes"
 ];
 
+// src/mcp/server.ts
+init_database();
+
 // src/lib/periods.ts
 function ymd(date) {
   return date.toISOString().substring(0, 10);
@@ -3440,501 +3537,580 @@ function usageSnapshotFilterForPeriod(period) {
   }
 }
 
-// src/mcp/index.ts
-init_database();
+// src/mcp/server.ts
 init_pricing();
 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_agent_breakdown",
-  "get_account_breakdown",
-  "get_budget_status",
-  "set_budget",
-  "remove_budget",
-  "get_pricing",
-  "set_pricing",
-  "remove_pricing",
-  "get_daily",
-  "get_billing_summary",
-  "get_session_detail",
-  "get_usage",
-  "get_savings",
-  "list_subscriptions",
-  "set_subscription",
-  "remove_subscription",
-  "estimate_cost",
-  "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(${AGENTS.join("|")}), project(partial), account?(key/name/email), machine?(hostname), limit(20) -> compact session table`,
-  get_top_sessions: `n(10), agent(${AGENTS.join("|")}) -> 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: "period?(today|week|month|year|all) -> project_name, sessions, tokens, cost",
-  get_agent_breakdown: "period?(today|week|month|year|all) -> agent, sessions, requests, tokens, api-equivalent, billable, included",
-  get_account_breakdown: "period?(today|week|month|year|all) -> account profile, sessions, requests, tokens, api-equivalent, billable, included",
-  get_budget_status: "no params -> budget limits, current spend, percent_used, is_over_alert",
-  set_budget: "period(daily|weekly|monthly), limit_usd, project_path?, agent?, alert_at_percent? -> create budget",
-  remove_budget: "id -> delete budget",
-  get_pricing: "no params -> model pricing rows with input, output, cache read/write, and cache storage rates",
-  set_pricing: "model, input_per_1m, output_per_1m, cache_read_per_1m?, cache_write_per_1m?, cache_write_1h_per_1m?, cache_storage_per_1m_hour? -> create/update pricing",
-  remove_pricing: "model -> delete pricing row",
-  get_daily: "days(30) -> daily cost table grouped by date and agent",
-  get_billing_summary: "period(today|yesterday|week|month|year|all) -> actual provider billing totals",
-  get_session_detail: "session_id(prefix ok) -> per-request breakdown with model, tokens, cost",
-  get_usage: `period(today|week|month|year|all), agent?(${AGENTS.join("|")}) -> usage snapshots and all-machine summary`,
-  get_savings: `period(today|week|month|year|all), agent?(${AGENTS.join("|")}) -> subscription/API-equivalent savings`,
-  list_subscriptions: "no params -> configured subscription plans and included usage",
-  set_subscription: `provider, plan, monthly_fee_usd?, included_usage_usd?, agent?(${AGENTS.join("|")}) -> create/update subscription plan`,
-  remove_subscription: "id -> delete subscription plan",
-  estimate_cost: "model, input_tokens?, output_tokens? -> pre-flight token cost estimate",
-  sync: `sources(all|${AGENTS.join("|")}) -> 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 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) {
-  const id = String(s["id"] ?? "").slice(0, 8);
-  const agent = String(s["agent"] ?? "");
-  const proj = String(s["project_name"] || s["project_path"] || "\u2014").slice(0, 20);
-  const cost = fmtUsd(Number(s["total_cost_usd"] ?? 0));
-  const tok = fmtTok(Number(s["total_tokens"] ?? 0));
-  return `${id} ${agent.padEnd(9)} ${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(`
+var MCP_NAME = "economy";
+var DEFAULT_MCP_HTTP_PORT = 8860;
+function buildServer() {
+  const db = openDatabase();
+  ensurePricingSeeded(db);
+  const server = new McpServer({
+    name: MCP_NAME,
+    version: packageMetadata.version
+  });
+  const _econAgents = new Map;
+  const TOOL_NAMES = [
+    "get_cost_summary",
+    "get_sessions",
+    "get_top_sessions",
+    "get_model_breakdown",
+    "get_project_breakdown",
+    "get_agent_breakdown",
+    "get_account_breakdown",
+    "get_budget_status",
+    "set_budget",
+    "remove_budget",
+    "get_pricing",
+    "set_pricing",
+    "remove_pricing",
+    "get_daily",
+    "get_billing_summary",
+    "get_session_detail",
+    "get_usage",
+    "get_savings",
+    "list_subscriptions",
+    "set_subscription",
+    "remove_subscription",
+    "sync",
+    "search_tools",
+    "describe_tools",
+    "get_goals",
+    "set_goal",
+    "remove_goal",
+    "list_machines",
+    "register_agent",
+    "heartbeat",
+    "set_focus",
+    "list_agents",
+    "send_feedback"
+  ];
+  const TOOL_DESCRIPTIONS = {
+    get_cost_summary: "period(today|week|month|year|all), machine?(hostname) -> {total_usd, sessions, requests, tokens, summary}",
+    get_sessions: `agent(${AGENTS.join("|")}), project(partial), account?(key/name/email), machine?(hostname), limit(20) -> compact session table`,
+    get_top_sessions: `n(10), agent(${AGENTS.join("|")}) -> 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: "period?(today|week|month|year|all) -> project_name, sessions, tokens, cost",
+    get_agent_breakdown: "period?(today|week|month|year|all) -> agent, sessions, requests, tokens, api-equivalent, billable, included",
+    get_account_breakdown: "period?(today|week|month|year|all) -> account profile, sessions, requests, tokens, api-equivalent, billable, included",
+    get_budget_status: "no params -> budget limits, current spend, percent_used, is_over_alert",
+    set_budget: "period(daily|weekly|monthly), limit_usd, project_path?, agent?, alert_at_percent? -> create budget",
+    remove_budget: "id -> delete budget",
+    get_pricing: "no params -> model pricing rows with input, output, cache read/write, and cache storage rates",
+    set_pricing: "model, input_per_1m, output_per_1m, cache_read_per_1m?, cache_write_per_1m?, cache_write_1h_per_1m?, cache_storage_per_1m_hour? -> create/update pricing",
+    remove_pricing: "model -> delete pricing row",
+    get_daily: "days(30) -> daily cost table grouped by date and agent",
+    get_billing_summary: "period(today|yesterday|week|month|year|all) -> actual provider billing totals",
+    get_session_detail: "session_id(prefix ok) -> per-request breakdown with model, tokens, cost",
+    get_usage: `period(today|week|month|year|all), agent?(${AGENTS.join("|")}) -> usage snapshots and all-machine summary`,
+    get_savings: `period(today|week|month|year|all), agent?(${AGENTS.join("|")}) -> subscription/API-equivalent savings`,
+    list_subscriptions: "no params -> configured subscription plans and included usage",
+    set_subscription: `provider, plan, monthly_fee_usd?, included_usage_usd?, agent?(${AGENTS.join("|")}) -> create/update subscription plan`,
+    remove_subscription: "id -> delete subscription plan",
+    sync: `sources(all|${AGENTS.join("|")}) -> 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"
+  };
+  const fmtUsd = (n) => "$" + n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+  const 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) {
+    const id = String(s["id"] ?? "").slice(0, 8);
+    const agent = String(s["agent"] ?? "");
+    const proj = String(s["project_name"] || s["project_path"] || "\u2014").slice(0, 20);
+    const cost = fmtUsd(Number(s["total_cost_usd"] ?? 0));
+    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(`
+    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, account, machine, limit(20)", {
-  agent: z.enum(AGENTS).optional(),
-  project: z.string().optional(),
-  account: z.string().optional(),
-  machine: z.string().optional(),
-  limit: z.number().int().positive().max(100).optional()
-}, async ({ agent, project, account, machine, limit }) => {
-  const sessions = querySessions(db, {
-    agent,
-    project,
-    account,
-    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_sessions", "List sessions. Returns compact table. Params: agent, project, account, machine, limit(20)", {
+    agent: z.enum(AGENTS).optional(),
+    project: z.string().optional(),
+    account: z.string().optional(),
+    machine: z.string().optional(),
+    limit: z.number().int().positive().max(100).optional()
+  }, async ({ agent, project, account, machine, limit }) => {
+    const sessions = querySessions(db, {
+      agent,
+      project,
+      account,
+      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(AGENTS).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_top_sessions", "Top sessions by cost. Params: n(10), agent", {
+    n: z.number().int().positive().max(100).optional(),
+    agent: z.enum(AGENTS).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                          agent     reqs    tokens   cost"];
-  for (const row of rows) {
-    lines.push(`${String(row["model"]).slice(0, 30).padEnd(31)}${String(row["agent"]).padEnd(10)}${String(row["requests"]).padEnd(8)}${fmtTok(Number(row["total_tokens"])).padEnd(9)}${fmtUsd(Number(row["cost_usd"]))}`);
-  }
-  return text(lines.join(`
+  });
+  server.tool("get_model_breakdown", "Cost per model. No params.", {}, async () => {
+    const rows = queryModelBreakdown(db);
+    const lines = ["model                          agent     reqs    tokens   cost"];
+    for (const row of rows) {
+      lines.push(`${String(row["model"]).slice(0, 30).padEnd(31)}${String(row["agent"]).padEnd(10)}${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. Params: period(today|week|month|year|all).", { period: z.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
-  const rows = queryProjectBreakdown(db, period ?? "all");
-  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_project_breakdown", "Cost per project. Params: period(today|week|month|year|all).", { period: z.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
+    const rows = queryProjectBreakdown(db, period ?? "all");
+    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_agent_breakdown", "Cost per coding agent. Params: period(today|week|month|year|all). Shows API-equivalent, billable API, and subscription-included usage.", { period: z.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
-  const rows = queryAgentBreakdown(db, period ?? "all");
-  if (rows.length === 0)
-    return text("No agent usage yet.");
-  const lines = ["agent      sessions requests tokens   api_eq    billable  included"];
-  for (const row of rows) {
-    lines.push(`${String(row["agent"]).slice(0, 10).padEnd(11)}` + `${String(row["sessions"]).padEnd(9)}` + `${String(row["requests"]).padEnd(9)}` + `${fmtTok(Number(row["total_tokens"])).padEnd(9)}` + `${fmtUsd(Number(row["api_equivalent_usd"] ?? row["cost_usd"])).padEnd(10)}` + `${fmtUsd(Number(row["billable_usd"] ?? 0)).padEnd(10)}` + `${fmtUsd(Number(row["subscription_included_usd"] ?? 0))}`);
-  }
-  return text(lines.join(`
+  });
+  server.tool("get_agent_breakdown", "Cost per coding agent. Params: period(today|week|month|year|all). Shows API-equivalent, billable API, and subscription-included usage.", { period: z.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
+    const rows = queryAgentBreakdown(db, period ?? "all");
+    if (rows.length === 0)
+      return text("No agent usage yet.");
+    const lines = ["agent      sessions requests tokens   api_eq    billable  included"];
+    for (const row of rows) {
+      lines.push(`${String(row["agent"]).slice(0, 10).padEnd(11)}` + `${String(row["sessions"]).padEnd(9)}` + `${String(row["requests"]).padEnd(9)}` + `${fmtTok(Number(row["total_tokens"])).padEnd(9)}` + `${fmtUsd(Number(row["api_equivalent_usd"] ?? row["cost_usd"])).padEnd(10)}` + `${fmtUsd(Number(row["billable_usd"] ?? 0)).padEnd(10)}` + `${fmtUsd(Number(row["subscription_included_usd"] ?? 0))}`);
+    }
+    return text(lines.join(`
 `));
-});
-server.tool("get_account_breakdown", "Cost per account/profile. Params: period(today|week|month|year|all). Shows API-equivalent, billable API, and subscription-included usage.", { period: z.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
-  const rows = queryAccountBreakdown(db, period ?? "all");
-  if (rows.length === 0)
-    return text("No account-attributed sessions yet.");
-  const lines = ["account              sessions requests tokens   api_eq    billable  included"];
-  for (const row of rows) {
-    const label = String(row["account_key"] || row["account_name"] || "\u2014").slice(0, 20);
-    lines.push(`${label.padEnd(21)}` + `${String(row["sessions"]).padEnd(9)}` + `${String(row["requests"]).padEnd(9)}` + `${fmtTok(Number(row["total_tokens"])).padEnd(9)}` + `${fmtUsd(Number(row["api_equivalent_usd"] ?? row["cost_usd"])).padEnd(10)}` + `${fmtUsd(Number(row["billable_usd"] ?? 0)).padEnd(10)}` + `${fmtUsd(Number(row["subscription_included_usd"] ?? 0))}`);
-  }
-  return text(lines.join(`
+  });
+  server.tool("get_account_breakdown", "Cost per account/profile. Params: period(today|week|month|year|all). Shows API-equivalent, billable API, and subscription-included usage.", { period: z.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
+    const rows = queryAccountBreakdown(db, period ?? "all");
+    if (rows.length === 0)
+      return text("No account-attributed sessions yet.");
+    const lines = ["account              agent      sessions requests tokens   api_eq    billable  included"];
+    for (const row of rows) {
+      const label = String(row["account_email"] || row["account_name"] || row["account_key"] || "\u2014").slice(0, 20);
+      lines.push(`${label.padEnd(21)}` + `${String(row["account_tool"] ?? "").slice(0, 10).padEnd(11)}` + `${String(row["sessions"]).padEnd(9)}` + `${String(row["requests"]).padEnd(9)}` + `${fmtTok(Number(row["total_tokens"])).padEnd(9)}` + `${fmtUsd(Number(row["api_equivalent_usd"] ?? row["cost_usd"])).padEnd(10)}` + `${fmtUsd(Number(row["billable_usd"] ?? 0)).padEnd(10)}` + `${fmtUsd(Number(row["subscription_included_usd"] ?? 0))}`);
+    }
+    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_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("set_budget", "Create a spending budget. period: daily|weekly|monthly. limit_usd must be positive. alert_at_percent defaults to 80.", {
-  period: z.enum(["daily", "weekly", "monthly"]),
-  limit_usd: z.number().positive(),
-  project_path: z.string().optional(),
-  agent: z.enum(AGENTS).optional(),
-  alert_at_percent: z.number().positive().max(100).optional()
-}, async ({ period, limit_usd, project_path, agent, alert_at_percent }) => {
-  const now = new Date().toISOString();
-  const id = randomUUID();
-  upsertBudget(db, {
-    id,
-    project_path: project_path ?? null,
-    agent: agent ?? null,
-    period,
-    limit_usd,
-    alert_at_percent: alert_at_percent ?? 80,
-    created_at: now,
-    updated_at: now
   });
-  return text(`Budget set: ${id}`);
-});
-server.tool("remove_budget", "Delete a budget by id.", { id: z.string() }, async ({ id }) => {
-  deleteBudget(db, id);
-  return text("Budget removed.");
-});
-server.tool("get_pricing", "Editable model pricing rows. Includes input/output/cache rates and context-cache storage.", {}, async () => {
-  const rows = listModelPricing(db);
-  const lines = ["model                          input    output   cache-r  cache-w  cache-1h storage-h"];
-  for (const row of rows) {
-    lines.push(`${row.model.slice(0, 30).padEnd(31)}` + `${fmtUsd(row.input_per_1m).padEnd(9)}` + `${fmtUsd(row.output_per_1m).padEnd(9)}` + `${fmtUsd(row.cache_read_per_1m).padEnd(9)}` + `${fmtUsd(row.cache_write_per_1m).padEnd(9)}` + `${fmtUsd(row.cache_write_1h_per_1m ?? 0).padEnd(9)}` + `${fmtUsd(row.cache_storage_per_1m_hour ?? 0)}`);
-  }
-  return text(lines.join(`
+  server.tool("set_budget", "Create a spending budget. period: daily|weekly|monthly. limit_usd must be positive. alert_at_percent defaults to 80.", {
+    period: z.enum(["daily", "weekly", "monthly"]),
+    limit_usd: z.number().positive(),
+    project_path: z.string().optional(),
+    agent: z.enum(AGENTS).optional(),
+    alert_at_percent: z.number().positive().max(100).optional()
+  }, async ({ period, limit_usd, project_path, agent, alert_at_percent }) => {
+    const now = new Date().toISOString();
+    const id = randomUUID();
+    upsertBudget(db, {
+      id,
+      project_path: project_path ?? null,
+      agent: agent ?? null,
+      period,
+      limit_usd,
+      alert_at_percent: alert_at_percent ?? 80,
+      created_at: now,
+      updated_at: now
+    });
+    return text(`Budget set: ${id}`);
+  });
+  server.tool("remove_budget", "Delete a budget by id.", { id: z.string() }, async ({ id }) => {
+    deleteBudget(db, id);
+    return text("Budget removed.");
+  });
+  server.tool("get_pricing", "Editable model pricing rows. Includes input/output/cache rates and context-cache storage.", {}, async () => {
+    const rows = listModelPricing(db);
+    const lines = ["model                          input    output   cache-r  cache-w  cache-1h storage-h"];
+    for (const row of rows) {
+      lines.push(`${row.model.slice(0, 30).padEnd(31)}` + `${fmtUsd(row.input_per_1m).padEnd(9)}` + `${fmtUsd(row.output_per_1m).padEnd(9)}` + `${fmtUsd(row.cache_read_per_1m).padEnd(9)}` + `${fmtUsd(row.cache_write_per_1m).padEnd(9)}` + `${fmtUsd(row.cache_write_1h_per_1m ?? 0).padEnd(9)}` + `${fmtUsd(row.cache_storage_per_1m_hour ?? 0)}`);
+    }
+    return text(lines.join(`
 `));
-});
-server.tool("set_pricing", "Create or update a model pricing row. Values are USD per 1M tokens except cache_storage_per_1m_hour.", {
-  model: z.string().min(1),
-  input_per_1m: z.number().nonnegative(),
-  output_per_1m: z.number().nonnegative(),
-  cache_read_per_1m: z.number().nonnegative().optional(),
-  cache_write_per_1m: z.number().nonnegative().optional(),
-  cache_write_1h_per_1m: z.number().nonnegative().optional(),
-  cache_storage_per_1m_hour: z.number().nonnegative().optional()
-}, async (input) => {
-  const model = input.model.trim();
-  if (!model)
-    return textError("model is required");
-  upsertModelPricing(db, {
-    model,
-    input_per_1m: input.input_per_1m,
-    output_per_1m: input.output_per_1m,
-    cache_read_per_1m: input.cache_read_per_1m ?? 0,
-    cache_write_per_1m: input.cache_write_per_1m ?? 0,
-    cache_write_1h_per_1m: input.cache_write_1h_per_1m ?? 0,
-    cache_storage_per_1m_hour: input.cache_storage_per_1m_hour ?? 0,
-    updated_at: new Date().toISOString()
   });
-  return text(`Pricing set: ${model}`);
-});
-server.tool("remove_pricing", "Delete a model pricing row by model id.", { model: z.string() }, async ({ model }) => {
-  deleteModelPricing(db, model);
-  return text("Pricing removed.");
-});
-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 agent = String(row["agent"]);
-    const entry = byDate.get(date) ?? Object.fromEntries(AGENTS.map((name) => [name, 0]));
-    entry[agent] = (entry[agent] ?? 0) + Number(row["cost_usd"]);
-    byDate.set(date, entry);
-  }
-  const lines = [`date        ${AGENTS.map((agent) => agent.slice(0, 8).padEnd(10)).join("")}total`];
-  for (const [date, costs] of [...byDate.entries()].sort()) {
-    const total = Object.values(costs).reduce((sum, value) => sum + value, 0);
-    lines.push(`${date}  ${AGENTS.map((agent) => fmtUsd(costs[agent] ?? 0).padEnd(10)).join("")}${fmtUsd(total)}`);
-  }
-  return text(lines.join(`
+  server.tool("set_pricing", "Create or update a model pricing row. Values are USD per 1M tokens except cache_storage_per_1m_hour.", {
+    model: z.string().min(1),
+    input_per_1m: z.number().nonnegative(),
+    output_per_1m: z.number().nonnegative(),
+    cache_read_per_1m: z.number().nonnegative().optional(),
+    cache_write_per_1m: z.number().nonnegative().optional(),
+    cache_write_1h_per_1m: z.number().nonnegative().optional(),
+    cache_storage_per_1m_hour: z.number().nonnegative().optional()
+  }, async (input) => {
+    const model = input.model.trim();
+    if (!model)
+      return textError("model is required");
+    upsertModelPricing(db, {
+      model,
+      input_per_1m: input.input_per_1m,
+      output_per_1m: input.output_per_1m,
+      cache_read_per_1m: input.cache_read_per_1m ?? 0,
+      cache_write_per_1m: input.cache_write_per_1m ?? 0,
+      cache_write_1h_per_1m: input.cache_write_1h_per_1m ?? 0,
+      cache_storage_per_1m_hour: input.cache_storage_per_1m_hour ?? 0,
+      updated_at: new Date().toISOString()
+    });
+    return text(`Pricing set: ${model}`);
+  });
+  server.tool("remove_pricing", "Delete a model pricing row by model id.", { model: z.string() }, async ({ model }) => {
+    deleteModelPricing(db, model);
+    return text("Pricing removed.");
+  });
+  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, takumi: 0, codex: 0, gemini: 0 };
+      if (row["agent"] === "claude")
+        entry.claude += Number(row["cost_usd"]);
+      else if (row["agent"] === "takumi")
+        entry.takumi += 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     takumi     codex      gemini     total"];
+    for (const [date, costs] of [...byDate.entries()].sort()) {
+      const total = costs.claude + costs.takumi + costs.codex + costs.gemini;
+      lines.push(`${date}  ${fmtUsd(costs.claude).padEnd(11)}${fmtUsd(costs.takumi).padEnd(11)}${fmtUsd(costs.codex).padEnd(11)}${fmtUsd(costs.gemini).padEnd(11)}${fmtUsd(total)}`);
+    }
+    return text(lines.join(`
 `));
-});
-server.tool("get_billing_summary", "Actual provider billing totals from admin API sync. Params: period(today|yesterday|week|month|year|all)", { period: z.enum(["today", "yesterday", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
-  const summary = queryBillingSummary(db, period ?? "month");
-  const lines = ["provider    billed"];
-  for (const [provider, cost] of Object.entries(summary.by_provider)) {
-    lines.push(`${provider.padEnd(11)}${fmtUsd(cost)}`);
-  }
-  lines.push(`total       ${fmtUsd(summary.total_usd)}`);
-  return text(lines.join(`
+  });
+  server.tool("get_billing_summary", "Actual provider billing totals from admin API sync. Params: period(today|yesterday|week|month|year|all)", { period: z.enum(["today", "yesterday", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
+    const summary = queryBillingSummary(db, period ?? "month");
+    const lines = ["provider    billed"];
+    for (const [provider, cost] of Object.entries(summary.by_provider)) {
+      lines.push(`${provider.padEnd(11)}${fmtUsd(cost)}`);
+    }
+    lines.push(`total       ${fmtUsd(summary.total_usd)}`);
+    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   cache-r  cache-5m cache-1h 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)}` + `${fmtTok(Number(request["cache_read_tokens"])).padEnd(9)}` + `${fmtTok(Number(request["cache_create_5m_tokens"] ?? request["cache_create_tokens"] ?? 0)).padEnd(9)}` + `${fmtTok(Number(request["cache_create_1h_tokens"] ?? 0)).padEnd(9)}` + `${fmtUsd(Number(request["cost_usd"]))}`);
-  }
-  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   cache-r  cache-5m cache-1h 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)}` + `${fmtTok(Number(request["cache_read_tokens"])).padEnd(9)}` + `${fmtTok(Number(request["cache_create_5m_tokens"] ?? request["cache_create_tokens"] ?? 0)).padEnd(9)}` + `${fmtTok(Number(request["cache_create_1h_tokens"] ?? 0)).padEnd(9)}` + `${fmtUsd(Number(request["cost_usd"]))}`);
+    }
+    return text(lines.join(`
 `));
-});
-server.tool("sync", `Ingest new cost data. sources: all|${AGENTS.join("|")}`, { sources: z.enum(["all", ...AGENTS]).optional() }, async ({ sources }) => {
-  const selected = sources ?? "all";
-  const opts = selected === "all" ? {} : { [selected]: true };
-  const result = await syncAll(db, opts);
-  return text(JSON.stringify(result, null, 2));
-});
-server.tool("get_usage", "Usage snapshots and fleet summary. period: today|week|month|year|all", { period: z.enum(["today", "week", "month", "year", "all"]).optional(), agent: z.enum(AGENTS).optional() }, async ({ period, agent }) => {
-  const p = period ?? "month";
-  const snaps = queryUsageSnapshots(db, { agent, ...usageSnapshotFilterForPeriod(p) });
-  const summary = querySummary(db, p, undefined, true);
-  return text(JSON.stringify({ snapshots: snaps, summary }, null, 2));
-});
-server.tool("get_savings", "Subscription vs API savings summary", { period: z.enum(["today", "week", "month", "year", "all"]).optional(), agent: z.enum(AGENTS).optional() }, async ({ period, agent }) => {
-  return text(JSON.stringify(querySavingsSummary(db, period ?? "month", agent), null, 2));
-});
-server.tool("list_subscriptions", "List configured subscription plans and included usage caps. No params.", {}, async () => {
-  const rows = listSubscriptions(db);
-  if (rows.length === 0)
-    return text("No subscriptions configured.");
-  const lines = ["id       provider     plan        agent      fee       included  active"];
-  for (const row of rows) {
-    lines.push(`${String(row["id"]).slice(0, 8).padEnd(9)}` + `${String(row["provider"]).slice(0, 12).padEnd(13)}` + `${String(row["plan"]).slice(0, 10).padEnd(11)}` + `${String(row["agent"] ?? "all").slice(0, 10).padEnd(11)}` + `${fmtUsd(Number(row["monthly_fee_usd"] ?? 0)).padEnd(10)}` + `${fmtUsd(Number(row["included_usage_usd"] ?? 0)).padEnd(10)}` + `${Number(row["active"] ?? 0) ? "yes" : "no"}`);
-  }
-  return text(lines.join(`
+  });
+  server.tool("sync", `Ingest new cost data. sources: all|${AGENTS.join("|")}`, { sources: z.enum(["all", ...AGENTS]).optional() }, async ({ sources }) => {
+    const selected = sources ?? "all";
+    const opts = selected === "all" ? {} : { [selected]: true };
+    const result = await syncAll(db, opts);
+    return text(JSON.stringify(result, null, 2));
+  });
+  server.tool("get_usage", "Usage snapshots and fleet summary. period: today|week|month|year|all", { period: z.enum(["today", "week", "month", "year", "all"]).optional(), agent: z.enum(AGENTS).optional() }, async ({ period, agent }) => {
+    const p = period ?? "month";
+    const snaps = queryUsageSnapshots(db, { agent, ...usageSnapshotFilterForPeriod(p) });
+    const summary = querySummary(db, p, undefined, true);
+    return text(JSON.stringify({ snapshots: snaps, summary }, null, 2));
+  });
+  server.tool("get_savings", "Subscription vs API savings summary", { period: z.enum(["today", "week", "month", "year", "all"]).optional(), agent: z.enum(AGENTS).optional() }, async ({ period, agent }) => {
+    return text(JSON.stringify(querySavingsSummary(db, period ?? "month", agent), null, 2));
+  });
+  server.tool("list_subscriptions", "List configured subscription plans used by savings calculations.", {}, async () => {
+    const rows = listSubscriptions(db);
+    if (rows.length === 0)
+      return text("No subscriptions configured.");
+    const lines = ["id                 provider   plan       agent      fee       included  active"];
+    for (const row of rows) {
+      lines.push(`${row.id.slice(0, 18).padEnd(19)}` + `${row.provider.slice(0, 10).padEnd(11)}` + `${row.plan.slice(0, 10).padEnd(11)}` + `${(row.agent ?? "all").slice(0, 10).padEnd(11)}` + `${fmtUsd(row.monthly_fee_usd).padEnd(10)}` + `${fmtUsd(row.included_usage_usd).padEnd(10)}` + `${row.active ? "yes" : "no"}`);
+    }
+    return text(lines.join(`
 `));
-});
-server.tool("set_subscription", `Create or update a subscription plan. agent may be ${AGENTS.join("|")}.`, {
-  id: z.string().optional(),
-  provider: z.string(),
-  plan: z.string(),
-  agent: z.enum(AGENTS).optional(),
-  monthly_fee_usd: z.number().optional(),
-  included_usage_usd: z.number().optional(),
-  billing_cycle_start: z.string().optional(),
-  reset_policy: z.string().optional(),
-  active: z.boolean().optional()
-}, async (input) => {
-  if (input.monthly_fee_usd != null && input.monthly_fee_usd < 0)
-    return text("monthly_fee_usd must be non-negative");
-  if (input.included_usage_usd != null && input.included_usage_usd < 0)
-    return text("included_usage_usd must be non-negative");
-  const now = new Date().toISOString();
-  const subscription = {
-    id: input.id?.trim() || randomUUID(),
-    agent: input.agent ?? null,
-    provider: input.provider.trim(),
-    plan: input.plan.trim(),
-    monthly_fee_usd: input.monthly_fee_usd ?? 0,
-    included_usage_usd: input.included_usage_usd ?? 0,
-    billing_cycle_start: input.billing_cycle_start ?? null,
-    reset_policy: input.reset_policy ?? "monthly",
-    active: input.active === false ? 0 : 1,
-    created_at: now,
-    updated_at: now
-  };
-  if (!subscription.provider)
-    return text("provider is required");
-  if (!subscription.plan)
-    return text("plan is required");
-  upsertSubscription(db, subscription);
-  return text(JSON.stringify(subscription, null, 2));
-});
-server.tool("remove_subscription", "Remove a subscription plan by id.", { id: z.string() }, async ({ id }) => {
-  deleteSubscription(db, id);
-  return text(`Removed subscription ${id}`);
-});
-server.tool("estimate_cost", "Pre-flight cost estimate for token counts", { model: z.string(), input_tokens: z.number().optional(), output_tokens: z.number().optional() }, async ({ model, input_tokens, output_tokens }) => {
-  const cost = computeCostFromDb(db, model, input_tokens ?? 0, output_tokens ?? 0, 0, 0, 0);
-  return text(`${model}: ${fmtUsd(cost)} (${input_tokens ?? 0} in / ${output_tokens ?? 0} out)`);
-});
-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_subscription", "Create or update a subscription plan used by subscription-vs-API savings calculations.", {
+    id: z.string().optional(),
+    provider: z.string().min(1),
+    plan: z.string().min(1),
+    agent: z.enum(AGENTS).optional(),
+    monthly_fee_usd: z.number().nonnegative().optional(),
+    included_usage_usd: z.number().nonnegative().optional(),
+    billing_cycle_start: z.string().optional(),
+    reset_policy: z.string().optional(),
+    active: z.boolean().optional()
+  }, async (input) => {
+    const now = new Date().toISOString();
+    const row = {
+      id: input.id ?? randomUUID(),
+      provider: input.provider,
+      plan: input.plan,
+      agent: input.agent ?? null,
+      monthly_fee_usd: input.monthly_fee_usd ?? 0,
+      included_usage_usd: input.included_usage_usd ?? 0,
+      billing_cycle_start: input.billing_cycle_start ?? null,
+      reset_policy: input.reset_policy ?? "monthly",
+      active: input.active === false ? 0 : 1,
+      created_at: now,
+      updated_at: now
+    };
+    upsertSubscription(db, row);
+    return text(JSON.stringify(row, null, 2));
+  });
+  server.tool("remove_subscription", "Delete a subscription plan by id.", { id: z.string() }, async ({ id }) => {
+    deleteSubscription(db, id);
+    return text("Subscription removed.");
+  });
+  server.tool("estimate_cost", "Pre-flight cost estimate for token counts", { model: z.string(), input_tokens: z.number().optional(), output_tokens: z.number().optional() }, async ({ model, input_tokens, output_tokens }) => {
+    const cost = computeCostFromDb(db, model, input_tokens ?? 0, output_tokens ?? 0, 0, 0, 0);
+    return text(`${model}: ${fmtUsd(cost)} (${input_tokens ?? 0} in / ${output_tokens ?? 0} out)`);
+  });
+  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().positive(),
-  project_path: z.string().optional(),
-  agent: z.enum(AGENTS).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(`
+  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().positive(),
+    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(`
+    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 }) => {
-  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));
+  });
+  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 }) => {
+    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));
+    }
+  });
+  registerCloudTools(server, MCP_NAME, {
+    dbPath: getDbPath(),
+    migrations: PG_MIGRATIONS
+  });
+  return server;
+}
+
+// src/mcp/http.ts
+import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
+function isHttpMode(argv = process.argv.slice(2)) {
+  return argv.includes("--http") || process.env["MCP_HTTP"] === "1";
+}
+function isStdioMode(argv = process.argv.slice(2)) {
+  return argv.includes("--stdio") || process.env["MCP_STDIO"] === "1";
+}
+function resolveHttpPort(argv = process.argv.slice(2)) {
+  for (let i = 0;i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === "--port" || arg === "-p") {
+      const raw = argv[i + 1];
+      if (!raw)
+        throw new Error(`Invalid port: ${raw ?? ""}`);
+      return parsePort(raw, "port");
+    }
   }
+  const fromEnv = process.env["MCP_HTTP_PORT"];
+  if (fromEnv)
+    return parsePort(fromEnv, "MCP_HTTP_PORT");
+  return DEFAULT_MCP_HTTP_PORT;
+}
+function parsePort(raw, label) {
+  const value = Number(raw);
+  if (!Number.isInteger(value) || value < 1 || value > 65535) {
+    throw new Error(`Invalid ${label}: ${raw}`);
+  }
+  return value;
+}
+async function handleMcpHttpRequest(req) {
+  const url = new URL(req.url);
+  if (url.pathname === "/health" && req.method === "GET") {
+    return Response.json({ status: "ok", name: MCP_NAME });
+  }
+  if (url.pathname === "/mcp") {
+    const transport = new WebStandardStreamableHTTPServerTransport({
+      sessionIdGenerator: undefined
+    });
+    const server = buildServer();
+    await server.connect(transport);
+    return transport.handleRequest(req);
+  }
+  return new Response("Not Found", { status: 404 });
+}
+function startHttpServer(options = {}) {
+  const port = options.port ?? DEFAULT_MCP_HTTP_PORT;
+  const hostname2 = options.hostname ?? "127.0.0.1";
+  const log = options.log ?? console.error;
+  const server = Bun.serve({
+    port,
+    hostname: hostname2,
+    fetch: handleMcpHttpRequest
+  });
+  const address = `http://${hostname2}:${server.port}`;
+  log(`${MCP_NAME}-mcp HTTP listening on ${address}/mcp (health: ${address}/health)`);
+  return server;
+}
+
+// src/mcp/index.ts
+function printHelp() {
+  console.log(`Usage: economy-mcp [options]
+
+Runs the ${packageMetadata.name} MCP server (stdio by default).
+
+Options:
+      --http         Serve MCP over Streamable HTTP on 127.0.0.1
+  -p, --port <port>  HTTP port (default: MCP_HTTP_PORT or 8815)
+  -V, --version      output the version number
+  -h, --help         display help for command
+
+Environment:
+  MCP_HTTP=1         Enable HTTP mode
+  MCP_HTTP_PORT      Override default HTTP port (8815)`);
+}
+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);
+}
+async function main() {
+  if (isStdioMode(args) || !isHttpMode(args)) {
+    const server = buildServer();
+    const transport = new StdioServerTransport;
+    await server.connect(transport);
+    return;
+  }
+  startHttpServer({ port: resolveHttpPort(args) });
+  await new Promise(() => {});
+}
+main().catch((error) => {
+  console.error("MCP server error:", error);
+  process.exit(1);
 });
-var transport = new StdioServerTransport;
-registerCloudTools(server, "economy", {
-  dbPath: getDbPath(),
-  migrations: PG_MIGRATIONS
-});
-await server.connect(transport);