@hasna/economy 0.2.21 → 0.2.22

package/dist/mcp/index.js

@@ -583,7 +583,12 @@ function initSchema(db) {
       duration_ms INTEGER DEFAULT 0,
       timestamp TEXT NOT NULL,
       source_request_id TEXT,
-      machine_id TEXT DEFAULT ''
+      machine_id TEXT DEFAULT '',
+      account_key TEXT DEFAULT '',
+      account_tool TEXT DEFAULT '',
+      account_name TEXT DEFAULT '',
+      account_email TEXT DEFAULT '',
+      account_source TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS sessions (
@@ -596,7 +601,12 @@ function initSchema(db) {
       total_cost_usd REAL DEFAULT 0,
       total_tokens INTEGER DEFAULT 0,
       request_count INTEGER DEFAULT 0,
-      machine_id TEXT DEFAULT ''
+      machine_id TEXT DEFAULT '',
+      account_key TEXT DEFAULT '',
+      account_tool TEXT DEFAULT '',
+      account_name TEXT DEFAULT '',
+      account_email TEXT DEFAULT '',
+      account_source TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS projects (
@@ -751,6 +761,11 @@ function initSchema(db) {
   if (!cols.some((c) => c.name === "synced_at")) {
     db.exec(`ALTER TABLE requests ADD COLUMN 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 ''`);
@@ -762,6 +777,11 @@ function initSchema(db) {
   if (!sessionCols.some((c) => c.name === "synced_at")) {
     db.exec(`ALTER TABLE sessions ADD COLUMN 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`);
@@ -772,6 +792,8 @@ function initSchema(db) {
   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);
+    CREATE INDEX IF NOT EXISTS idx_requests_account ON requests(account_key);
+    CREATE INDEX IF NOT EXISTS idx_sessions_account ON sessions(account_key);
   `);
 }
 function periodWhere(period) {
@@ -806,6 +828,22 @@ function sessionPeriodWhere(period) {
       return "1=1";
   }
 }
+function requestPeriodWhere(period) {
+  switch (period) {
+    case "today":
+      return `DATE(timestamp) = DATE('now')`;
+    case "yesterday":
+      return `DATE(timestamp) = DATE('now', '-1 day')`;
+    case "week":
+      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
+    case "month":
+      return `timestamp >= DATE('now', 'start of month')`;
+    case "year":
+      return `timestamp >= DATE('now', 'start of year')`;
+    case "all":
+      return "1=1";
+  }
+}
 function upsertRequest(db, req) {
   const now = req.updated_at ?? new Date().toISOString();
   db.prepare(`
@@ -813,18 +851,20 @@ function upsertRequest(db, req) {
       (id, agent, session_id, model, input_tokens, output_tokens,
        cache_read_tokens, cache_create_tokens, cache_create_5m_tokens,
        cache_create_1h_tokens, cost_usd, cost_basis, duration_ms, timestamp,
-       source_request_id, machine_id, attribution_tag, updated_at, synced_at)
-    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.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", now, req.synced_at ?? "");
+       source_request_id, machine_id, attribution_tag, account_key, account_tool,
+       account_name, account_email, account_source, updated_at, synced_at)
+    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.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", req.account_key ?? "", req.account_tool ?? "", req.account_name ?? "", req.account_email ?? "", req.account_source ?? "", now, req.synced_at ?? "");
 }
 function upsertSession(db, session) {
   const now = session.updated_at ?? new Date().toISOString();
   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, attribution_tag, updated_at, synced_at)
-    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 ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", now, session.synced_at ?? "");
+       total_cost_usd, total_tokens, request_count, machine_id, attribution_tag,
+       account_key, account_tool, account_name, account_email, account_source, updated_at, synced_at)
+    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 ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", session.account_key ?? "", session.account_tool ?? "", session.account_name ?? "", session.account_email ?? "", session.account_source ?? "", now, session.synced_at ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -835,9 +875,24 @@ function rollupSession(db, sessionId) {
       ended_at       = (SELECT MAX(timestamp) FROM requests WHERE session_id = ?),
       started_at     = CASE WHEN started_at = '' OR started_at IS NULL
                             THEN (SELECT MIN(timestamp) FROM requests WHERE session_id = ?)
-                            ELSE started_at END
+                            ELSE started_at END,
+      account_key    = CASE WHEN account_key = '' OR account_key IS NULL
+                            THEN COALESCE((SELECT account_key FROM requests WHERE session_id = ? AND account_key != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_key END,
+      account_tool   = CASE WHEN account_tool = '' OR account_tool IS NULL
+                            THEN COALESCE((SELECT account_tool FROM requests WHERE session_id = ? AND account_tool != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_tool END,
+      account_name   = CASE WHEN account_name = '' OR account_name IS NULL
+                            THEN COALESCE((SELECT account_name FROM requests WHERE session_id = ? AND account_name != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_name END,
+      account_email  = CASE WHEN account_email = '' OR account_email IS NULL
+                            THEN COALESCE((SELECT account_email FROM requests WHERE session_id = ? AND account_email != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_email END,
+      account_source = CASE WHEN account_source = '' OR account_source IS NULL
+                            THEN COALESCE((SELECT account_source FROM requests WHERE session_id = ? AND account_source != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_source END
     WHERE id = ?
-  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
+  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
 }
 function querySessions(db, filter = {}) {
   const conditions = [];
@@ -850,6 +905,11 @@ function querySessions(db, filter = {}) {
     conditions.push("project_path LIKE ?");
     params.push(`%${filter.project}%`);
   }
+  if (filter.account) {
+    const q = `%${filter.account}%`;
+    conditions.push("(account_key LIKE ? OR account_name LIKE ? OR account_email LIKE ?)");
+    params.push(q, q, q);
+  }
   if (filter.since) {
     conditions.push("started_at >= ?");
     params.push(filter.since);
@@ -914,6 +974,70 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
+function queryAgentBreakdown(db, period = "all") {
+  const requestWhere = requestPeriodWhere(period);
+  const groups = new Map;
+  const requestRows = db.prepare(`
+    SELECT agent,
+           COUNT(DISTINCT session_id) as sessions,
+           COUNT(*) as requests,
+           COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+           COALESCE(SUM(cost_usd), 0) as api_equivalent_usd,
+           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,
+           COALESCE(SUM(CASE WHEN cost_basis = 'metered_api' THEN cost_usd ELSE 0 END), 0) as billable_usd,
+           COALESCE(SUM(cost_usd), 0) as cost_usd,
+           MAX(timestamp) as last_active
+    FROM requests
+    WHERE ${requestWhere}
+    GROUP BY agent
+    ORDER BY api_equivalent_usd DESC
+  `).all();
+  for (const row of requestRows) {
+    groups.set(row.agent, row);
+  }
+  const sessionWhere = sessionPeriodWhere(period);
+  const sessionOnlyRows = db.prepare(`
+    SELECT agent,
+           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 ${sessionWhere}
+      AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+    GROUP BY agent
+  `).all();
+  for (const row of sessionOnlyRows) {
+    const existing = groups.get(row.agent) ?? {
+      agent: row.agent,
+      sessions: 0,
+      requests: 0,
+      total_tokens: 0,
+      api_equivalent_usd: 0,
+      billable_usd: 0,
+      metered_api_usd: 0,
+      subscription_included_usd: 0,
+      estimated_usd: 0,
+      unknown_usd: 0,
+      cost_usd: 0,
+      last_active: ""
+    };
+    existing.sessions += row.sessions;
+    existing.requests += row.requests;
+    existing.total_tokens += row.total_tokens;
+    existing.api_equivalent_usd += row.cost_usd;
+    existing.estimated_usd += row.cost_usd;
+    existing.cost_usd += row.cost_usd;
+    if (!existing.last_active || row.last_active > existing.last_active)
+      existing.last_active = row.last_active;
+    groups.set(row.agent, existing);
+  }
+  return [...groups.values()].sort((a, b) => b.api_equivalent_usd - a.api_equivalent_usd);
+}
 function labelForPath(projectPath, projectName) {
   if (projectName && projectName.trim() !== "")
     return projectName;
@@ -932,11 +1056,13 @@ function labelForPath(projectPath, projectName) {
   }
   return segments[segments.length - 1] ?? projectPath;
 }
-function queryProjectBreakdown(db) {
+function queryProjectBreakdown(db, period = "all") {
+  const where = sessionPeriodWhere(period);
   const sessions = db.prepare(`
     SELECT id, project_path, project_name, total_cost_usd, started_at
     FROM sessions
-    WHERE project_path != '' OR project_name != ''
+    WHERE ${where}
+      AND (project_path != '' OR project_name != '')
   `).all();
   const groups = new Map;
   for (const s of sessions) {
@@ -975,6 +1101,87 @@ function queryProjectBreakdown(db) {
   result.sort((a, b) => b.cost_usd - a.cost_usd);
   return result;
 }
+function queryAccountBreakdown(db, period = "all") {
+  const sWhere = 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 ${sWhere}
+      AND (account_key != '' OR account_tool != '' OR account_name != '' OR account_email != '')
+  `).all();
+  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",
+      totalCost: 0,
+      totalTokens: 0,
+      requests: 0,
+      lastActive: ""
+    };
+    group.sessionIds.push(session.id);
+    group.totalCost += session.total_cost_usd || 0;
+    group.totalTokens += session.total_tokens || 0;
+    group.requests += session.request_count || 0;
+    if (!group.lastActive || session.started_at > group.lastActive)
+      group.lastActive = session.started_at;
+    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(*) 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
+          FROM requests WHERE session_id IN (${placeholders})
+        `).get(...group.sessionIds) : {
+      requests: 0,
+      cost_usd: 0,
+      total_tokens: 0,
+      metered_api_usd: 0,
+      subscription_included_usd: 0,
+      estimated_usd: 0,
+      unknown_usd: 0
+    };
+    const hasRequestCosts = reqStats.requests > 0;
+    const apiEquivalentUsd = hasRequestCosts ? reqStats.cost_usd : group.totalCost;
+    const estimatedUsd = hasRequestCosts ? reqStats.estimated_usd : group.totalCost;
+    const billableUsd = reqStats.metered_api_usd;
+    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: group.sessionIds.length,
+      requests: reqStats.requests || group.requests,
+      total_tokens: reqStats.total_tokens || group.totalTokens,
+      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: group.lastActive
+    });
+  }
+  result.sort((a, b) => b.cost_usd - a.cost_usd);
+  return result;
+}
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`
     SELECT DATE(timestamp) as date, agent, COALESCE(SUM(cost_usd), 0) as cost_usd
@@ -1204,7 +1411,12 @@ var init_pg_migrations = __esm(() => {
     duration_ms INTEGER DEFAULT 0,
     timestamp TEXT NOT NULL,
     source_request_id TEXT,
-    machine_id TEXT DEFAULT ''
+    machine_id TEXT DEFAULT '',
+    account_key TEXT DEFAULT '',
+    account_tool TEXT DEFAULT '',
+    account_name TEXT DEFAULT '',
+    account_email TEXT DEFAULT '',
+    account_source TEXT DEFAULT ''
   )`,
     `CREATE TABLE IF NOT EXISTS sessions (
     id TEXT PRIMARY KEY,
@@ -1216,7 +1428,12 @@ var init_pg_migrations = __esm(() => {
     total_cost_usd REAL DEFAULT 0,
     total_tokens INTEGER DEFAULT 0,
     request_count INTEGER DEFAULT 0,
-    machine_id TEXT DEFAULT ''
+    machine_id TEXT DEFAULT '',
+    account_key TEXT DEFAULT '',
+    account_tool TEXT DEFAULT '',
+    account_name TEXT DEFAULT '',
+    account_email TEXT DEFAULT '',
+    account_source TEXT DEFAULT ''
   )`,
     `CREATE TABLE IF NOT EXISTS projects (
     id TEXT PRIMARY KEY,
@@ -1337,47 +1554,41 @@ var init_pg_migrations = __esm(() => {
   )`,
     `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cost_basis TEXT DEFAULT 'estimated'`,
     `ALTER TABLE requests ADD COLUMN IF NOT EXISTS attribution_tag TEXT DEFAULT ''`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_key TEXT DEFAULT ''`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_tool TEXT DEFAULT ''`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_name TEXT DEFAULT ''`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_email TEXT DEFAULT ''`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_source TEXT DEFAULT ''`,
     `ALTER TABLE requests ADD COLUMN IF NOT EXISTS updated_at TEXT DEFAULT ''`,
     `ALTER TABLE requests ADD COLUMN IF NOT EXISTS synced_at TEXT DEFAULT ''`,
     `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS attribution_tag TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_key TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_tool TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_name TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_email TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_source TEXT DEFAULT ''`,
     `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS updated_at TEXT DEFAULT ''`,
     `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS synced_at TEXT DEFAULT ''`,
     `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)`
+    `CREATE INDEX IF NOT EXISTS idx_savings_date ON savings_daily(date)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_account ON requests(account_key)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_account ON sessions(account_key)`
   ];
 });
 
 // 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 as readFileSync2, existsSync as existsSync2, statSync as statSync2 } from "fs";
+import { readdirSync as readdirSync2, readFileSync, existsSync as existsSync2, statSync as statSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2, basename } from "path";
 
@@ -1400,7 +1611,6 @@ function periodWhere2(period, column) {
 }
 function prorateMonthlyFee(monthlyFee, period) {
   const now = new Date;
-  const dayOfMonth = now.getDate();
   const daysInMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate();
   switch (period) {
     case "today":
@@ -1482,6 +1692,131 @@ function defaultCostBasisForAgent(agent) {
   return "estimated";
 }
 
+// src/lib/accounts.ts
+var AGENT_ACCOUNT_TOOLS = {
+  claude: ["claude"],
+  takumi: ["takumi", "claude"],
+  codex: ["codex"],
+  gemini: ["gemini"],
+  opencode: ["opencode"],
+  cursor: ["cursor"],
+  pi: ["pi"],
+  hermes: ["hermes"]
+};
+function accountKey(tool, name) {
+  return `${tool}:${name}`;
+}
+function normalizeDir(value) {
+  return value.replace(/\/+$/, "");
+}
+function fromProfile(profile, source) {
+  return {
+    account_key: accountKey(profile.tool, profile.name),
+    account_tool: profile.tool,
+    account_name: profile.name,
+    ...profile.email ? { account_email: profile.email } : {},
+    account_source: source
+  };
+}
+function fromOverride(raw, agent) {
+  const value = raw.trim();
+  if (!value)
+    return null;
+  const candidateTool = AGENT_ACCOUNT_TOOLS[agent][0] ?? agent;
+  const [tool, name] = value.includes(":") ? value.split(":", 2) : [candidateTool, value];
+  if (!tool || !name)
+    return null;
+  return {
+    account_key: accountKey(tool, name),
+    account_tool: tool,
+    account_name: name,
+    account_source: "override"
+  };
+}
+function envOverride(agent, env) {
+  const agentPrefix = agent.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+  const raw = env[`ECONOMY_${agentPrefix}_ACCOUNT_KEY`] ?? env[`ECONOMY_${agentPrefix}_ACCOUNT`] ?? env["ECONOMY_ACCOUNT_KEY"] ?? env["ECONOMY_ACCOUNT"];
+  if (raw)
+    return fromOverride(raw, agent);
+  const tool = env[`ECONOMY_${agentPrefix}_ACCOUNT_TOOL`] ?? env["ECONOMY_ACCOUNT_TOOL"];
+  const name = env[`ECONOMY_${agentPrefix}_ACCOUNT_NAME`] ?? env["ECONOMY_ACCOUNT_NAME"];
+  if (!tool || !name)
+    return null;
+  return {
+    account_key: accountKey(tool, name),
+    account_tool: tool,
+    account_name: name,
+    account_email: env[`ECONOMY_${agentPrefix}_ACCOUNT_EMAIL`] ?? env["ECONOMY_ACCOUNT_EMAIL"],
+    account_source: "override"
+  };
+}
+function knownToolIds(api) {
+  try {
+    return new Set(api.listTools().map((tool) => tool.id));
+  } catch {
+    return new Set;
+  }
+}
+function profileForEnvDir(api, tool, env) {
+  const configuredDir = env[tool.envVar];
+  if (!configuredDir)
+    return null;
+  const normalized = normalizeDir(configuredDir);
+  try {
+    return api.listProfiles(tool.id).find((profile) => normalizeDir(profile.dir) === normalized) ?? null;
+  } catch {
+    return null;
+  }
+}
+async function resolveAccountForAgent(agent, env = process.env) {
+  const override = envOverride(agent, env);
+  if (override)
+    return override;
+  let api;
+  try {
+    api = await import("@hasna/accounts");
+  } catch {
+    return null;
+  }
+  const toolIds = knownToolIds(api);
+  for (const toolId of AGENT_ACCOUNT_TOOLS[agent]) {
+    if (!toolIds.has(toolId))
+      continue;
+    let tool;
+    try {
+      tool = api.getTool(toolId);
+    } catch {
+      continue;
+    }
+    const envProfile = profileForEnvDir(api, tool, env);
+    if (envProfile)
+      return fromProfile(envProfile, "env");
+    try {
+      const applied = api.appliedProfile(toolId);
+      if (applied)
+        return fromProfile(applied, "applied");
+    } catch {}
+    try {
+      const current = api.currentProfile(toolId);
+      if (current)
+        return fromProfile(current, "current");
+    } catch {}
+  }
+  return null;
+}
+function withAccount(record, account) {
+  if (!account)
+    return record;
+  return {
+    ...record,
+    account_key: account.account_key,
+    account_tool: account.account_tool,
+    account_name: account.account_name,
+    account_email: account.account_email ?? "",
+    account_source: account.account_source
+  };
+}
+
 // src/ingest/claude.ts
 function autoDetectProject(cwd, projects) {
   return projects.find((p) => cwd === p.path || cwd.startsWith(p.path + "/"));
@@ -1523,6 +1858,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
   let totalRequests = 0;
   const touchedSessions = new Set;
   const registeredProjects = db.prepare(`SELECT path, name FROM projects ORDER BY LENGTH(path) DESC`).all();
+  const account = await resolveAccountForAgent(agentName);
   const projectDirs = readdirSync2(projectsDir, { withFileTypes: true }).filter((d) => d.isDirectory());
   for (const projectDirEntry of projectDirs) {
     const projectDirPath = join2(projectsDir, projectDirEntry.name);
@@ -1541,7 +1877,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
         continue;
       let lines;
       try {
-        lines = readFileSync2(filePath, "utf-8").split(`
+        lines = readFileSync(filePath, "utf-8").split(`
 `).filter((l) => l.trim());
       } catch {
         continue;
@@ -1586,7 +1922,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
         }
         const sourceRequestId = entry.requestId ?? entry.request_id ?? entry.message.id ?? entry.uuid ?? `${sessionId}-${timestamp}`;
         const reqId = `${agentName}-${sourceRequestId}`;
-        upsertRequest(db, {
+        upsertRequest(db, withAccount({
           id: reqId,
           agent: agentName,
           session_id: sessionId,
@@ -1603,7 +1939,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
           timestamp,
           source_request_id: sourceRequestId,
           machine_id: machineId
-        });
+        }, account));
         if (!touchedSessions.has(sessionId)) {
           const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
           if (!existing) {
@@ -1621,7 +1957,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
               request_count: 0,
               machine_id: machineId
             };
-            upsertSession(db, session);
+            upsertSession(db, withAccount(session, account));
           }
           touchedSessions.add(sessionId);
         }
@@ -1661,13 +1997,13 @@ function supportsClaudeDataResidencyPricing(model) {
 // src/ingest/codex.ts
 init_database();
 init_pricing();
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+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";
 var DEFAULT_CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
 var DEFAULT_CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
-var CODEX_INGEST_VERSION = "rollout-token-dedupe-v2";
+var CODEX_INGEST_VERSION = "rollout-aggregate-v3";
 function codexDbPath() {
   return process.env["HASNA_ECONOMY_CODEX_DB_PATH"] ?? DEFAULT_CODEX_DB_PATH;
 }
@@ -1679,7 +2015,7 @@ function readCodexModel() {
   if (!existsSync3(configPath))
     return "gpt-5-codex";
   try {
-    const content = readFileSync3(configPath, "utf-8");
+    const content = readFileSync2(configPath, "utf-8");
     const match = content.match(/^model\s*=\s*"([^"]+)"/m);
     return match?.[1] ?? "gpt-5-codex";
   } catch {
@@ -1700,9 +2036,10 @@ function buildThreadQuery(codexDb) {
 function readTokenEvents(rolloutPath) {
   if (!rolloutPath || !existsSync3(rolloutPath))
     return [];
-  const events = [];
-  const seen = new Set;
-  for (const line of readFileSync3(rolloutPath, "utf-8").split(`
+  const fallbackUsages = new Map;
+  let fallbackTimestamp;
+  let aggregate = null;
+  for (const line of readFileSync2(rolloutPath, "utf-8").split(`
 `)) {
     if (!line.trim())
       continue;
@@ -1718,20 +2055,48 @@ function readTokenEvents(rolloutPath) {
     if (!payload || payload["type"] !== "token_count")
       continue;
     const info = payload["info"];
+    const timestamp = entry["timestamp"];
+    const entryTimestamp = typeof timestamp === "string" ? timestamp : undefined;
+    const totalUsage = info?.["total_token_usage"];
+    if (totalUsage && tokenTotal(totalUsage) > 0) {
+      aggregate = { usage: totalUsage, timestamp: entryTimestamp };
+      continue;
+    }
     const usage = info?.["last_token_usage"];
     if (!usage)
       continue;
-    const total = usage.total_tokens ?? (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0);
-    if (total <= 0)
+    if (tokenTotal(usage) <= 0)
       continue;
     const key = JSON.stringify(usage);
-    if (seen.has(key))
-      continue;
-    seen.add(key);
-    const timestamp = entry["timestamp"];
-    events.push({ usage, timestamp: typeof timestamp === "string" ? timestamp : undefined });
+    if (!fallbackUsages.has(key))
+      fallbackUsages.set(key, usage);
+    fallbackTimestamp = entryTimestamp ?? fallbackTimestamp;
   }
-  return events;
+  if (aggregate)
+    return [aggregate];
+  if (fallbackUsages.size === 0)
+    return [];
+  return [{ usage: sumTokenUsages([...fallbackUsages.values()]), timestamp: fallbackTimestamp }];
+}
+function tokenTotal(usage) {
+  return usage.total_tokens ?? (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0);
+}
+function sumTokenUsages(usages) {
+  const result = {
+    input_tokens: 0,
+    cached_input_tokens: 0,
+    output_tokens: 0,
+    reasoning_output_tokens: 0,
+    total_tokens: 0
+  };
+  for (const usage of usages) {
+    result.input_tokens = (result.input_tokens ?? 0) + (usage.input_tokens ?? 0);
+    result.cached_input_tokens = (result.cached_input_tokens ?? 0) + (usage.cached_input_tokens ?? 0);
+    result.output_tokens = (result.output_tokens ?? 0) + (usage.output_tokens ?? 0);
+    result.reasoning_output_tokens = (result.reasoning_output_tokens ?? 0) + (usage.reasoning_output_tokens ?? 0);
+    result.total_tokens = (result.total_tokens ?? 0) + tokenTotal(usage);
+  }
+  return result;
 }
 function fallbackEvents(totalTokens) {
   const inputTokens = Math.floor(totalTokens * 0.6);
@@ -1755,6 +2120,7 @@ async function ingestCodex(db, verbose = false) {
   let codexDb = null;
   let ingested = 0;
   let requests = 0;
+  const account = await resolveAccountForAgent("codex");
   try {
     codexDb = new BunDatabase(dbPath, { readonly: true });
     const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
@@ -1769,7 +2135,7 @@ async function ingestCodex(db, verbose = false) {
       const sessionId = `codex-${thread.id}`;
       const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
       const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
-      upsertSession(db, {
+      upsertSession(db, withAccount({
         id: sessionId,
         agent: "codex",
         project_path: projectPath,
@@ -1780,9 +2146,10 @@ async function ingestCodex(db, verbose = false) {
         total_tokens: 0,
         request_count: 0,
         machine_id: machineId
-      });
+      }, account));
       const events = readTokenEvents(thread.rollout_path);
       const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+      const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
       db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
       tokenEvents.forEach((event, index) => {
         const usage = event.usage;
@@ -1793,7 +2160,7 @@ async function ingestCodex(db, verbose = false) {
         const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
         const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
         const requestId = `${sessionId}-${index}`;
-        upsertRequest(db, {
+        upsertRequest(db, withAccount({
           id: requestId,
           agent: "codex",
           session_id: sessionId,
@@ -1808,14 +2175,14 @@ async function ingestCodex(db, verbose = false) {
           timestamp,
           source_request_id: requestId,
           machine_id: machineId
-        });
+        }, account));
         requests++;
       });
       rollupSession(db, sessionId);
       setIngestState(db, "codex", thread.id, stateValue);
       ingested++;
       if (verbose)
-        console.log(`Codex session ${thread.id}: ${thread.tokens_used} tokens on ${model}`);
+        console.log(`Codex session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
     }
   } finally {
     codexDb?.close();
@@ -1826,7 +2193,7 @@ async function ingestCodex(db, verbose = false) {
 // src/ingest/gemini.ts
 init_database();
 init_pricing();
-import { readdirSync as readdirSync3, readFileSync as readFileSync4, existsSync as existsSync4, statSync as statSync3 } from "fs";
+import { readdirSync as readdirSync3, readFileSync as readFileSync3, existsSync as existsSync4, statSync as statSync3 } from "fs";
 import { homedir as homedir4 } from "os";
 import { join as join4, basename as basename3 } from "path";
 var DEFAULT_GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
@@ -1866,7 +2233,7 @@ function projectRoot(projectDir, chatData) {
   const rootFile = join4(projectDir, ".project_root");
   try {
     if (existsSync4(rootFile))
-      return readFileSync4(rootFile, "utf-8").trim();
+      return readFileSync3(rootFile, "utf-8").trim();
   } catch {}
   return "";
 }
@@ -1882,6 +2249,7 @@ async function ingestGemini(db, verbose) {
   let totalSessions = 0;
   let totalRequests = 0;
   const touchedSessions = new Set;
+  const account = await resolveAccountForAgent("gemini");
   const projectDirs = listProjectDirs(tmpDir, historyDir);
   for (const projectDir of projectDirs) {
     const chatsDir = join4(projectDir, "chats");
@@ -1906,7 +2274,7 @@ async function ingestGemini(db, verbose) {
         continue;
       let chatData;
       try {
-        chatData = JSON.parse(readFileSync4(filePath, "utf-8"));
+        chatData = JSON.parse(readFileSync3(filePath, "utf-8"));
       } catch {
         continue;
       }
@@ -1930,7 +2298,7 @@ async function ingestGemini(db, verbose) {
           request_count: 0,
           machine_id: machineId
         };
-        upsertSession(db, session);
+        upsertSession(db, withAccount(session, account));
         totalSessions++;
       }
       touchedSessions.add(sessionId);
@@ -1954,7 +2322,7 @@ async function ingestGemini(db, verbose) {
         const costUsd = numberField(message.costUsd, message.cost_usd) || computedCost;
         const timestamp = message.timestamp ?? chatData.lastUpdated ?? startTime;
         const requestId = `gemini-${sessionId}-${message.id ?? index}`;
-        upsertRequest(db, {
+        upsertRequest(db, withAccount({
           id: requestId,
           agent: "gemini",
           session_id: sessionId,
@@ -1969,7 +2337,7 @@ async function ingestGemini(db, verbose) {
           timestamp,
           source_request_id: message.id ?? requestId,
           machine_id: machineId
-        });
+        }, account));
         totalRequests++;
       }
       setIngestState(db, "gemini", stateKey, fileMtime);
@@ -1984,7 +2352,7 @@ async function ingestGemini(db, verbose) {
 // src/ingest/opencode.ts
 init_database();
 init_pricing();
-import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, 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");
@@ -2018,6 +2386,7 @@ async function ingestOpenCode(db, verbose = false) {
   const touched = new Set;
   const machineId = getMachineId();
   const now = new Date().toISOString();
+  const account = await resolveAccountForAgent("opencode");
   for (const file of files) {
     const mtime = statSync4(file).mtimeMs;
     const stateKey = file;
@@ -2026,7 +2395,7 @@ async function ingestOpenCode(db, verbose = false) {
       continue;
     let parsed;
     try {
-      parsed = JSON.parse(readFileSync5(file, "utf-8"));
+      parsed = JSON.parse(readFileSync4(file, "utf-8"));
     } catch {
       continue;
     }
@@ -2047,7 +2416,7 @@ async function ingestOpenCode(db, verbose = false) {
     const sourceId = file.replace(OPENCODE_STORAGE, "");
     const reqId = `opencode-${sourceId}`;
     const costUsd = usage.cost ?? computeCostFromDb(db, model, input, output, cacheRead, cacheWrite, 0);
-    upsertRequest(db, {
+    upsertRequest(db, withAccount({
       id: reqId,
       agent: "opencode",
       session_id: sessionId,
@@ -2063,10 +2432,10 @@ async function ingestOpenCode(db, verbose = false) {
       source_request_id: sourceId,
       machine_id: machineId,
       updated_at: now
-    });
+    }, account));
     requests++;
     if (!touched.has(sessionId)) {
-      upsertSession(db, {
+      upsertSession(db, withAccount({
         id: sessionId,
         agent: "opencode",
         project_path: "",
@@ -2078,7 +2447,7 @@ async function ingestOpenCode(db, verbose = false) {
         request_count: 0,
         machine_id: machineId,
         updated_at: now
-      });
+      }, account));
       touched.add(sessionId);
     }
     setIngestState(db, "opencode", stateKey, String(mtime));
@@ -2125,6 +2494,7 @@ async function ingestCursor(db, verbose = false) {
   const machineId = getMachineId();
   const now = new Date().toISOString();
   let snapshots = 0;
+  const account = await resolveAccountForAgent("cursor");
   const usage = await cursorFetch("/api/usage", token);
   if (usage?.premiumRequests != null && usage.maxPremiumRequests) {
     upsertUsageSnapshot(db, {
@@ -2172,7 +2542,7 @@ async function ingestCursor(db, verbose = false) {
   }
   const sessionId = `cursor-${today}-${machineId}`;
   if (onDemand + included > 0) {
-    upsertSession(db, {
+    upsertSession(db, withAccount({
       id: sessionId,
       agent: "cursor",
       project_path: "",
@@ -2184,8 +2554,8 @@ async function ingestCursor(db, verbose = false) {
       request_count: 1,
       machine_id: machineId,
       updated_at: now
-    });
-    upsertRequest(db, {
+    }, account));
+    upsertRequest(db, withAccount({
       id: `cursor-${today}-${machineId}-usage`,
       agent: "cursor",
       session_id: sessionId,
@@ -2201,7 +2571,7 @@ async function ingestCursor(db, verbose = false) {
       source_request_id: today,
       machine_id: machineId,
       updated_at: now
-    });
+    }, account));
     rollupSession(db, sessionId);
   }
   setIngestState(db, "cursor", `sync-${today}`, now);
@@ -2212,7 +2582,7 @@ async function ingestCursor(db, verbose = false) {
 
 // src/ingest/pi.ts
 init_database();
-import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync5, statSync as statSync5 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5, 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");
@@ -2234,6 +2604,7 @@ async function ingestPi(db, verbose = false) {
   const touched = new Set;
   const machineId = getMachineId();
   const now = new Date().toISOString();
+  const account = await resolveAccountForAgent("pi");
   for (const file of files) {
     const mtime = statSync5(file).mtimeMs;
     const prev = getIngestState(db, "pi", file);
@@ -2241,7 +2612,7 @@ async function ingestPi(db, verbose = false) {
       continue;
     let data;
     try {
-      data = JSON.parse(readFileSync6(file, "utf-8"));
+      data = JSON.parse(readFileSync5(file, "utf-8"));
     } catch {
       continue;
     }
@@ -2259,7 +2630,7 @@ async function ingestPi(db, verbose = false) {
       const model = turn.model ?? turn.provider ?? "unknown";
       const timestamp = turn.timestamp ?? new Date(statSync5(file).mtime).toISOString();
       const reqId = `pi-${sessionId}-${i}`;
-      upsertRequest(db, {
+      upsertRequest(db, withAccount({
         id: reqId,
         agent: "pi",
         session_id: sessionId,
@@ -2275,11 +2646,11 @@ async function ingestPi(db, verbose = false) {
         source_request_id: `${sessionId}-${i}`,
         machine_id: machineId,
         updated_at: now
-      });
+      }, account));
       requests++;
     }
     if (turns.length > 0) {
-      upsertSession(db, {
+      upsertSession(db, withAccount({
         id: sessionId,
         agent: "pi",
         project_path: "",
@@ -2291,7 +2662,7 @@ async function ingestPi(db, verbose = false) {
         request_count: 0,
         machine_id: machineId,
         updated_at: now
-      });
+      }, account));
       touched.add(sessionId);
     }
     setIngestState(db, "pi", file, String(mtime));
@@ -2339,13 +2710,14 @@ async function ingestHermes(db, verbose = false) {
   const machineId = getMachineId();
   const now = new Date().toISOString();
   let requests = 0;
+  const account = await resolveAccountForAgent("hermes");
   for (const row of rows) {
     const sessionId = `hermes-${row.id}`;
     const startedAt = new Date(row.started_at * 1000).toISOString();
     const endedAt = row.ended_at ? new Date(row.ended_at * 1000).toISOString() : null;
     const cost = row.actual_cost_usd ?? row.estimated_cost_usd ?? 0;
     const tokens = row.input_tokens + row.output_tokens + row.cache_read_tokens + row.cache_write_tokens + row.reasoning_tokens;
-    upsertSession(db, {
+    upsertSession(db, withAccount({
       id: sessionId,
       agent: "hermes",
       project_path: row.source ?? "",
@@ -2357,9 +2729,9 @@ async function ingestHermes(db, verbose = false) {
       request_count: 1,
       machine_id: machineId,
       updated_at: now
-    });
+    }, account));
     const reqId = `hermes-${row.id}-rollup`;
-    upsertRequest(db, {
+    upsertRequest(db, withAccount({
       id: reqId,
       agent: "hermes",
       session_id: sessionId,
@@ -2375,7 +2747,7 @@ async function ingestHermes(db, verbose = false) {
       source_request_id: row.id,
       machine_id: machineId,
       updated_at: now
-    });
+    }, account));
     requests++;
     rollupSession(db, sessionId);
     if (verbose)
@@ -2395,7 +2767,7 @@ function statSyncSafe(path) {
 
 // src/ingest/claude-quota.ts
 init_database();
-import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
 
 // src/lib/paths.ts
 import { homedir as homedir8 } from "os";
@@ -2433,7 +2805,7 @@ function readClaudeToken() {
   if (!existsSync8(CREDENTIALS_PATH))
     return null;
   try {
-    const creds = JSON.parse(readFileSync8(CREDENTIALS_PATH, "utf-8"));
+    const creds = JSON.parse(readFileSync6(CREDENTIALS_PATH, "utf-8"));
     const oauth = creds.claudeAiOauth;
     if (!oauth?.accessToken)
       return null;
@@ -2569,7 +2941,7 @@ async function ingestClaudeQuota(db, verbose = false) {
 
 // src/ingest/codex-quota.ts
 init_database();
-import { existsSync as existsSync9, readFileSync as readFileSync9 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } 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"];
@@ -2579,7 +2951,7 @@ function readCodexAuth() {
   if (!existsSync9(authPath))
     return null;
   try {
-    const auth = JSON.parse(readFileSync9(authPath, "utf-8"));
+    const auth = JSON.parse(readFileSync7(authPath, "utf-8"));
     const token = auth.tokens?.access_token;
     if (!token)
       return null;
@@ -2711,6 +3083,24 @@ 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",
@@ -2752,44 +3142,27 @@ async function runCloudMigrations(cloud) {
     await cloud.run(sql);
   }
 }
-function isCloudIncrementalEnabled() {
-  return process.env["ECONOMY_CLOUD_INCREMENTAL"] === "1" || process.env["ECONOMY_CLOUD_INCREMENTAL"] === "true";
-}
 async function cloudPush(opts) {
-  const { syncPush, incrementalSyncPush, ensureSyncMetaTable, SqliteAdapter } = await import("@hasna/cloud");
+  const { syncPush, SqliteAdapter } = await import("@hasna/cloud");
   const cloud = await getCloudPg();
   const local = new SqliteAdapter(getDbPath());
   await runCloudMigrations(cloud);
   const tables = opts?.tables ?? [...CLOUD_TABLES];
-  let rows = 0;
-  if (isCloudIncrementalEnabled()) {
-    ensureSyncMetaTable(local);
-    const results = incrementalSyncPush(local, cloud, tables, { conflictColumn: "updated_at" });
-    rows = results.reduce((s, r) => s + r.synced_rows, 0);
-  } else {
-    const results = await syncPush(local, cloud, { tables, conflictColumn: "updated_at" });
-    rows = results.reduce((s, r) => s + r.rowsWritten, 0);
-  }
+  const results = await syncPush(local, cloud, { tables, conflictColumn: "updated_at" });
+  const rows = results.reduce((s, r) => s + r.rowsWritten, 0);
   touchMachineRegistry(local, "push");
   local.close();
   await cloud.close();
   return { rows, machine: getMachineId() };
 }
 async function cloudPull(opts) {
-  const { syncPull, incrementalSyncPull, ensureSyncMetaTable, SqliteAdapter } = await import("@hasna/cloud");
+  const { syncPull, SqliteAdapter } = await import("@hasna/cloud");
   const cloud = await getCloudPg();
   const local = new SqliteAdapter(getDbPath());
   await runCloudMigrations(cloud);
   const tables = opts?.tables ?? [...CLOUD_TABLES];
-  let rows = 0;
-  if (isCloudIncrementalEnabled()) {
-    ensureSyncMetaTable(local);
-    const results = incrementalSyncPull(cloud, local, tables, { conflictColumn: "updated_at" });
-    rows = results.reduce((s, r) => s + r.synced_rows, 0);
-  } else {
-    const results = await syncPull(cloud, local, { tables, conflictColumn: "updated_at" });
-    rows = results.reduce((s, r) => s + r.rowsWritten, 0);
-  }
+  const results = await syncPull(cloud, local, { tables, conflictColumn: "updated_at" });
+  const rows = results.reduce((s, r) => s + r.rowsWritten, 0);
   touchMachineRegistry(local, "pull");
   local.close();
   await cloud.close();
@@ -2893,496 +3266,442 @@ var AGENTS = [
   "hermes"
 ];
 
-// src/mcp/server.ts
+// src/mcp/index.ts
 init_database();
 init_pricing();
 init_pricing();
-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_budget_status",
-    "set_budget",
-    "remove_budget",
-    "get_pricing",
-    "set_pricing",
-    "remove_pricing",
-    "get_daily",
-    "get_billing_summary",
-    "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"
-  ];
-  const TOOL_DESCRIPTIONS = {
-    get_cost_summary: "period(today|week|month|year|all), machine?(hostname) -> {total_usd, sessions, requests, tokens, summary}",
-    get_sessions: "agent(claude|takumi|codex|gemini), project(partial), machine?(hostname), limit(20) -> compact session table",
-    get_top_sessions: "n(10), agent(claude|takumi|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",
-    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",
-    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(`
+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",
+  "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), 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), agent?(${AGENTS.join("|")}) -> usage snapshots and all-machine summary`,
+  get_savings: `period(today|week|month|year|all), agent?(${AGENTS.join("|")}) -> subscription/API-equivalent savings`,
+  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(`
 `);
-    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, machine, limit(20)", {
+  agent: z.enum(AGENTS).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
   });
-  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(`
+  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_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                          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_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. 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_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_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_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("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(["claude", "takumi", "codex", "gemini"]).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("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("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_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
   });
-  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(`
+  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()
   });
-  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(`
+  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("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", { period: z.enum(["today", "week", "month"]).optional(), agent: z.enum(AGENTS).optional() }, async ({ period, agent }) => {
-    const p = period ?? "month";
-    const snaps = queryUsageSnapshots(db, { agent });
-    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("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("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("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", { period: z.enum(["today", "week", "month"]).optional(), agent: z.enum(AGENTS).optional() }, async ({ period, agent }) => {
+  const p = period ?? "month";
+  const snaps = queryUsageSnapshots(db, { agent });
+  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("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
   });
-  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(`
+  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));
-    }
-  });
-  registerCloudTools(server, MCP_NAME, {
-    dbPath: getDbPath(),
-    migrations: PG_MIGRATIONS
-  });
-  return server;
-}
-
-// src/mcp/http.ts
-import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
-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)) {
-    const server = buildServer();
-    const transport = new StdioServerTransport;
-    await server.connect(transport);
-    return;
+});
+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));
   }
-  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);