@hasna/economy 0.2.20 → 0.2.21

package/dist/mcp/index.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env bun
 // @bun
 var __defProp = Object.defineProperty;
-var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
   this[name] = __returnValue.bind(null, newValue);
@@ -30,88 +29,503 @@ __export(exports_pricing, {
   DEFAULT_PRICING: () => DEFAULT_PRICING
 });
 function normalizeModelName(raw) {
-  return raw.replace(/-\d{8}$/, "").replace(/-\d{4}-\d{2}-\d{2}$/, "").toLowerCase();
+  return raw.trim().toLowerCase().replace(/^models\//, "").replace(/^[a-z0-9_.-]+\//, "").replace(/:.+$/, "").replace(/-\d{8}$/, "").replace(/-\d{4}-\d{2}-\d{2}$/, "");
+}
+function normalizeModelNamePreservingProvider(raw) {
+  return raw.trim().toLowerCase().replace(/^models\//, "").replace(/:.+$/, "").replace(/-\d{8}$/, "").replace(/-\d{4}-\d{2}-\d{2}$/, "");
+}
+function modelLookupKeys(raw) {
+  const withProvider = normalizeModelNamePreservingProvider(raw);
+  const withoutProvider = normalizeModelName(raw);
+  return withProvider === withoutProvider ? [withoutProvider] : [withProvider, withoutProvider];
+}
+function bestPrefixMatch(normalized, entries) {
+  let best = null;
+  for (const entry of entries) {
+    const [key] = entry;
+    if (normalized !== key && !normalized.startsWith(`${key}-`))
+      continue;
+    if (!best || key.length > best[0].length)
+      best = entry;
+  }
+  return best?.[1] ?? null;
+}
+function bestModelMatch(model, entries) {
+  for (const key of modelLookupKeys(model)) {
+    const match = bestPrefixMatch(key, entries);
+    if (match)
+      return match;
+  }
+  return null;
+}
+function exactModelMatch(model, entries) {
+  for (const key of modelLookupKeys(model)) {
+    const match = entries.find(([entryKey]) => entryKey === key);
+    if (match)
+      return match[1];
+  }
+  return null;
 }
 function ensurePricingSeeded(db) {
   seedModelPricing(db, DEFAULT_PRICING);
+  repairLegacySeededPricing(db);
+  repairMissingDefaultCacheWrite1h(db);
+  repairMissingDefaultCacheStorage(db);
+  removeDeprecatedDefaultPricing(db);
+}
+function repairLegacySeededPricing(db) {
+  const now = new Date().toISOString();
+  const legacyModels = new Set([
+    ...Object.keys(LEGACY_DEFAULT_PRICING),
+    ...Object.keys(ADDITIONAL_LEGACY_DEFAULT_PRICING)
+  ]);
+  for (const model of legacyModels) {
+    const current = getModelPricing(db, model);
+    const next = DEFAULT_PRICING[model];
+    if (!current || !next)
+      continue;
+    const legacy = LEGACY_DEFAULT_PRICING[model];
+    const legacyRows = [
+      ...legacy ? [legacy] : [],
+      ...ADDITIONAL_LEGACY_DEFAULT_PRICING[model] ?? []
+    ];
+    if (!legacyRows.some((row) => samePricing(current, row)))
+      continue;
+    upsertModelPricing(db, {
+      model,
+      input_per_1m: next.inputPer1M,
+      output_per_1m: next.outputPer1M,
+      cache_read_per_1m: next.cacheReadPer1M,
+      cache_write_per_1m: next.cacheWritePer1M,
+      cache_write_1h_per_1m: next.cacheWrite1hPer1M ?? 0,
+      cache_storage_per_1m_hour: next.cacheStoragePer1MHour ?? 0,
+      updated_at: now
+    });
+  }
+}
+function repairMissingDefaultCacheWrite1h(db) {
+  const now = new Date().toISOString();
+  for (const [model, next] of Object.entries(DEFAULT_PRICING)) {
+    if (!next.cacheWrite1hPer1M)
+      continue;
+    const current = getModelPricing(db, model);
+    if (!current)
+      continue;
+    if ((current.cache_write_1h_per_1m ?? 0) !== 0)
+      continue;
+    if (!sameBasePricing(current, next))
+      continue;
+    upsertModelPricing(db, {
+      model,
+      input_per_1m: current.input_per_1m,
+      output_per_1m: current.output_per_1m,
+      cache_read_per_1m: current.cache_read_per_1m,
+      cache_write_per_1m: current.cache_write_per_1m,
+      cache_write_1h_per_1m: next.cacheWrite1hPer1M,
+      cache_storage_per_1m_hour: current.cache_storage_per_1m_hour ?? next.cacheStoragePer1MHour ?? 0,
+      updated_at: now
+    });
+  }
+}
+function repairMissingDefaultCacheStorage(db) {
+  const now = new Date().toISOString();
+  for (const [model, next] of Object.entries(DEFAULT_PRICING)) {
+    if (!next.cacheStoragePer1MHour)
+      continue;
+    const current = getModelPricing(db, model);
+    if (!current)
+      continue;
+    if ((current.cache_storage_per_1m_hour ?? 0) !== 0)
+      continue;
+    if (!sameBasePricing(current, next))
+      continue;
+    upsertModelPricing(db, {
+      model,
+      input_per_1m: current.input_per_1m,
+      output_per_1m: current.output_per_1m,
+      cache_read_per_1m: current.cache_read_per_1m,
+      cache_write_per_1m: current.cache_write_per_1m,
+      cache_write_1h_per_1m: current.cache_write_1h_per_1m ?? next.cacheWrite1hPer1M ?? 0,
+      cache_storage_per_1m_hour: next.cacheStoragePer1MHour,
+      updated_at: now
+    });
+  }
+}
+function removeDeprecatedDefaultPricing(db) {
+  for (const [model, removedRows] of Object.entries(REMOVED_DEFAULT_PRICING)) {
+    const current = getModelPricing(db, model);
+    if (!current)
+      continue;
+    if (!removedRows.some((row) => samePricing(current, row)))
+      continue;
+    deleteModelPricing(db, model);
+  }
+}
+function sameBasePricing(row, pricing) {
+  return row.input_per_1m === pricing.inputPer1M && row.output_per_1m === pricing.outputPer1M && row.cache_read_per_1m === pricing.cacheReadPer1M && row.cache_write_per_1m === pricing.cacheWritePer1M;
+}
+function samePricing(row, pricing) {
+  return row.input_per_1m === pricing.inputPer1M && row.output_per_1m === pricing.outputPer1M && row.cache_read_per_1m === pricing.cacheReadPer1M && row.cache_write_per_1m === pricing.cacheWritePer1M && (row.cache_write_1h_per_1m ?? 0) === (pricing.cacheWrite1hPer1M ?? 0) && (row.cache_storage_per_1m_hour ?? 0) === (pricing.cacheStoragePer1MHour ?? 0);
 }
 function getPricingFromDb(db, model) {
-  const normalized = normalizeModelName(model);
-  const row = getModelPricing(db, normalized);
-  if (row) {
-    return {
-      inputPer1M: row.input_per_1m,
-      outputPer1M: row.output_per_1m,
-      cacheReadPer1M: row.cache_read_per_1m,
-      cacheWritePer1M: row.cache_write_per_1m
-    };
+  if (isFreeModel(model))
+    return FREE_PRICING;
+  for (const key of modelLookupKeys(model)) {
+    const row = getModelPricing(db, key);
+    if (row)
+      return modelPricingFromDbRow(row);
   }
   const allRows = db.prepare(`SELECT * FROM model_pricing`).all();
-  for (const r of allRows) {
-    if (normalized.startsWith(r.model)) {
-      return { inputPer1M: r.input_per_1m, outputPer1M: r.output_per_1m, cacheReadPer1M: r.cache_read_per_1m, cacheWritePer1M: r.cache_write_per_1m };
-    }
-  }
-  return null;
+  const match = bestModelMatch(model, allRows.map((r) => [r.model, r]));
+  if (!match)
+    return null;
+  return modelPricingFromDbRow(match);
+}
+function modelPricingFromDbRow(row) {
+  const seeded = DEFAULT_PRICING[row.model];
+  const cacheWrite1hPer1M = seeded?.cacheWrite1hPer1M && (row.cache_write_1h_per_1m ?? 0) === 0 && sameBasePricing(row, seeded) ? seeded.cacheWrite1hPer1M : row.cache_write_1h_per_1m ?? 0;
+  return {
+    inputPer1M: row.input_per_1m,
+    outputPer1M: row.output_per_1m,
+    cacheReadPer1M: row.cache_read_per_1m,
+    cacheWritePer1M: row.cache_write_per_1m,
+    cacheWrite1hPer1M,
+    cacheStoragePer1MHour: row.cache_storage_per_1m_hour ?? seeded?.cacheStoragePer1MHour ?? 0
+  };
 }
 function getPricing(model) {
-  const normalized = normalizeModelName(model);
-  if (DEFAULT_PRICING[normalized])
-    return DEFAULT_PRICING[normalized] ?? null;
-  for (const key of Object.keys(DEFAULT_PRICING)) {
-    if (normalized.startsWith(key))
-      return DEFAULT_PRICING[key] ?? null;
-  }
-  return null;
+  if (isFreeModel(model))
+    return FREE_PRICING;
+  return bestModelMatch(model, Object.entries(DEFAULT_PRICING));
 }
-function computeCost(model, inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0) {
+function isFreeModel(model) {
+  return model.trim().toLowerCase().endsWith(":free");
+}
+function computeCost(model, inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0, cacheWrite1hTokens = 0, cacheStorageTokenHours = 0) {
   const pricing = getPricing(model);
   if (!pricing)
     return 0;
-  return (inputTokens * pricing.inputPer1M + outputTokens * pricing.outputPer1M + cacheReadTokens * pricing.cacheReadPer1M + cacheWriteTokens * pricing.cacheWritePer1M) / 1e6;
+  return computeCostWithPricing(model, pricing, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, cacheWrite1hTokens, cacheStorageTokenHours);
 }
-function computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0) {
+function computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0, cacheWrite1hTokens = 0, cacheStorageTokenHours = 0) {
   const pricing = getPricingFromDb(db, model) ?? getPricing(model);
   if (!pricing)
     return 0;
-  return (inputTokens * pricing.inputPer1M + outputTokens * pricing.outputPer1M + cacheReadTokens * pricing.cacheReadPer1M + cacheWriteTokens * pricing.cacheWritePer1M) / 1e6;
+  return computeCostWithPricing(model, pricing, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, cacheWrite1hTokens, cacheStorageTokenHours);
+}
+function computeCostWithPricing(model, pricing, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, cacheWrite1hTokens, cacheStorageTokenHours) {
+  if (isFreeModel(model))
+    return 0;
+  let effective = pricing;
+  const promptTier = bestModelMatch(model, Object.entries(GEMINI_PROMPT_TIERS)) ?? bestModelMatch(model, Object.entries(QWEN_PROMPT_TIERS)) ?? bestModelMatch(model, Object.entries(MINIMAX_PROMPT_TIERS)) ?? bestModelMatch(model, Object.entries(XAI_PROMPT_TIERS)) ?? exactModelMatch(model, Object.entries(OPENAI_PROMPT_TIERS));
+  if (promptTier) {
+    const billablePromptTokens = inputTokens + cacheReadTokens + cacheWriteTokens + cacheWrite1hTokens;
+    if (billablePromptTokens > promptTier.threshold) {
+      effective = {
+        ...pricing,
+        inputPer1M: promptTier.inputPer1M ?? pricing.inputPer1M * (promptTier.inputMultiplier ?? 1),
+        outputPer1M: promptTier.outputPer1M ?? pricing.outputPer1M * (promptTier.outputMultiplier ?? 1),
+        cacheReadPer1M: promptTier.cacheReadPer1M ?? pricing.cacheReadPer1M * (promptTier.cacheReadMultiplier ?? 1),
+        cacheWritePer1M: promptTier.cacheWritePer1M ?? pricing.cacheWritePer1M * (promptTier.cacheWriteMultiplier ?? 1)
+      };
+    }
+  }
+  return (inputTokens * effective.inputPer1M + outputTokens * effective.outputPer1M + cacheReadTokens * effective.cacheReadPer1M + cacheWriteTokens * effective.cacheWritePer1M + cacheWrite1hTokens * (effective.cacheWrite1hPer1M ?? effective.cacheWritePer1M) + cacheStorageTokenHours * (effective.cacheStoragePer1MHour ?? 0)) / 1e6;
 }
-var DEFAULT_PRICING;
+var DEFAULT_PRICING, LEGACY_DEFAULT_PRICING, ADDITIONAL_LEGACY_DEFAULT_PRICING, REMOVED_DEFAULT_PRICING, FREE_PRICING, GEMINI_PROMPT_TIERS, OPENAI_PROMPT_TIERS, QWEN_PROMPT_TIERS, MINIMAX_PROMPT_TIERS, XAI_PROMPT_TIERS;
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
-    "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
-    "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
-    "claude-sonnet-4-6": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
-    "claude-sonnet-4-5": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
-    "claude-haiku-4-5": { inputPer1M: 1, outputPer1M: 5, cacheReadPer1M: 0.1, cacheWritePer1M: 1.25 },
-    "claude-3-5-sonnet": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
+    "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
+    "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
+    "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
+    "claude-opus-4-1": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75, cacheWrite1hPer1M: 30 },
+    "claude-opus-4": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75, cacheWrite1hPer1M: 30 },
+    "claude-sonnet-4-6": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 6 },
+    "claude-sonnet-4-5": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 6 },
+    "claude-sonnet-4": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 6 },
+    "claude-3-7-sonnet": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 6 },
+    "claude-haiku-4-5": { inputPer1M: 1, outputPer1M: 5, cacheReadPer1M: 0.1, cacheWritePer1M: 1.25, cacheWrite1hPer1M: 2 },
+    "claude-3-5-haiku": { inputPer1M: 0.8, outputPer1M: 4, cacheReadPer1M: 0.08, cacheWritePer1M: 1, cacheWrite1hPer1M: 1.6 },
+    "claude-3-opus": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75, cacheWrite1hPer1M: 30 },
+    "claude-3-haiku": { inputPer1M: 0.25, outputPer1M: 1.25, cacheReadPer1M: 0.03, cacheWritePer1M: 0.3, cacheWrite1hPer1M: 0.5 },
+    "gemini-3.1-pro-preview": { inputPer1M: 2, outputPer1M: 12, cacheReadPer1M: 0.2, cacheWritePer1M: 0, cacheStoragePer1MHour: 4.5 },
+    "gemini-3.1-flash-lite-preview": { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0.025, cacheWritePer1M: 0, cacheStoragePer1MHour: 1 },
+    "gemini-3.1-flash-lite": { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0.025, cacheWritePer1M: 0, cacheStoragePer1MHour: 1 },
+    "gemini-3-flash-preview": { inputPer1M: 0.5, outputPer1M: 3, cacheReadPer1M: 0.05, cacheWritePer1M: 0, cacheStoragePer1MHour: 1 },
+    "gemini-2.5-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.125, cacheWritePer1M: 0, cacheStoragePer1MHour: 4.5 },
+    "gemini-2.5-flash": { inputPer1M: 0.3, outputPer1M: 2.5, cacheReadPer1M: 0.03, cacheWritePer1M: 0, cacheStoragePer1MHour: 1 },
+    "gemini-2.5-flash-lite": { inputPer1M: 0.1, outputPer1M: 0.4, cacheReadPer1M: 0.01, cacheWritePer1M: 0, cacheStoragePer1MHour: 1 },
+    "gemini-2.0-flash": { inputPer1M: 0.1, outputPer1M: 0.4, cacheReadPer1M: 0.025, cacheWritePer1M: 0, cacheStoragePer1MHour: 1 },
+    "gemini-2.0-flash-lite": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "google/gemini-3.1-pro-preview": { inputPer1M: 2, outputPer1M: 12, cacheReadPer1M: 0.2, cacheWritePer1M: 0.375 },
+    "google/gemini-3.1-flash-lite-preview": { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0.025, cacheWritePer1M: 0.08333333333333334 },
+    "google/gemini-3.1-flash-lite": { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0.025, cacheWritePer1M: 0.08333333333333334 },
+    "google/gemini-3-flash-preview": { inputPer1M: 0.5, outputPer1M: 3, cacheReadPer1M: 0.05, cacheWritePer1M: 0.08333333333333334 },
+    "google/gemini-2.5-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.125, cacheWritePer1M: 0.375 },
+    "google/gemini-2.5-flash": { inputPer1M: 0.3, outputPer1M: 2.5, cacheReadPer1M: 0.03, cacheWritePer1M: 0.08333333333333334 },
+    "google/gemini-2.5-flash-lite": { inputPer1M: 0.1, outputPer1M: 0.4, cacheReadPer1M: 0.01, cacheWritePer1M: 0.08333333333333334 },
+    "gpt-5.5": { inputPer1M: 5, outputPer1M: 30, cacheReadPer1M: 0.5, cacheWritePer1M: 0 },
+    "gpt-5.5-pro": { inputPer1M: 30, outputPer1M: 180, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "gpt-5.4": { inputPer1M: 2.5, outputPer1M: 15, cacheReadPer1M: 0.25, cacheWritePer1M: 0 },
+    "gpt-5.4-pro": { inputPer1M: 30, outputPer1M: 180, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "gpt-5.4-mini": { inputPer1M: 0.75, outputPer1M: 4.5, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
+    "gpt-5.4-nano": { inputPer1M: 0.2, outputPer1M: 1.25, cacheReadPer1M: 0.02, cacheWritePer1M: 0 },
+    "gpt-5.3-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.175, cacheWritePer1M: 0 },
+    "gpt-5.2-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.175, cacheWritePer1M: 0 },
+    "gpt-5.2-chat-latest": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.175, cacheWritePer1M: 0 },
+    "gpt-5.2": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.175, cacheWritePer1M: 0 },
+    "gpt-5-codex": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.125, cacheWritePer1M: 0 },
+    "gpt-5-mini": { inputPer1M: 0.25, outputPer1M: 2, cacheReadPer1M: 0.025, cacheWritePer1M: 0 },
+    "gpt-5": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.125, cacheWritePer1M: 0 },
+    "gpt-4o": { inputPer1M: 2.5, outputPer1M: 10, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
+    "gpt-4o-mini": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
+    o1: { inputPer1M: 15, outputPer1M: 60, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
+    "o1-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.55, cacheWritePer1M: 0 },
+    o3: { inputPer1M: 2, outputPer1M: 8, cacheReadPer1M: 0.5, cacheWritePer1M: 0 },
+    "o3-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.55, cacheWritePer1M: 0 },
+    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, cacheWritePer1M: 0 },
+    "qwen3.6-plus": { inputPer1M: 0.325, outputPer1M: 1.95, cacheReadPer1M: 0.0325, cacheWritePer1M: 0.40625 },
+    "qwen3.6-flash": { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0.025, cacheWritePer1M: 0.3125 },
+    "qwen3.6-35b-a3b": { inputPer1M: 0.15, outputPer1M: 1, cacheReadPer1M: 0.05, cacheWritePer1M: 0 },
+    "qwen3.6-max-preview": { inputPer1M: 1.04, outputPer1M: 6.24, cacheReadPer1M: 0.104, cacheWritePer1M: 1.3 },
+    "qwen3.6-27b": { inputPer1M: 0.32, outputPer1M: 3.2, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "qwen/qwen3.6-plus": { inputPer1M: 0.325, outputPer1M: 1.95, cacheReadPer1M: 0.0325, cacheWritePer1M: 0.40625 },
+    "qwen/qwen3.6-flash": { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0.025, cacheWritePer1M: 0.3125 },
+    "qwen/qwen3.6-35b-a3b": { inputPer1M: 0.15, outputPer1M: 1, cacheReadPer1M: 0.05, cacheWritePer1M: 0 },
+    "qwen/qwen3.6-max-preview": { inputPer1M: 1.04, outputPer1M: 6.24, cacheReadPer1M: 0.104, cacheWritePer1M: 1.3 },
+    "qwen/qwen3.6-27b": { inputPer1M: 0.32, outputPer1M: 3.2, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "minimax-m2.7": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.06, cacheWritePer1M: 0.375 },
+    "minimax-m2.7-highspeed": { inputPer1M: 0.6, outputPer1M: 2.4, cacheReadPer1M: 0.06, cacheWritePer1M: 0.375 },
+    "minimax/minimax-m2.7": { inputPer1M: 0.299, outputPer1M: 1.2, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "minimax-m1": { inputPer1M: 0.4, outputPer1M: 2.2, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "minimax/minimax-m1": { inputPer1M: 0.4, outputPer1M: 2.2, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "grok-4.3": { inputPer1M: 1.25, outputPer1M: 2.5, cacheReadPer1M: 0.2, cacheWritePer1M: 0 },
+    "grok-latest": { inputPer1M: 1.25, outputPer1M: 2.5, cacheReadPer1M: 0.2, cacheWritePer1M: 0 },
+    "grok-4.20": { inputPer1M: 1.25, outputPer1M: 2.5, cacheReadPer1M: 0.2, cacheWritePer1M: 0 },
+    "grok-4-1-fast": { inputPer1M: 0.2, outputPer1M: 0.5, cacheReadPer1M: 0.05, cacheWritePer1M: 0 },
+    "grok-4-fast": { inputPer1M: 0.2, outputPer1M: 0.5, cacheReadPer1M: 0.05, cacheWritePer1M: 0 },
+    "grok-4": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.75, cacheWritePer1M: 0 },
+    "grok-code-fast-1": { inputPer1M: 0.2, outputPer1M: 1.5, cacheReadPer1M: 0.02, cacheWritePer1M: 0 },
+    "grok-code-fast": { inputPer1M: 0.2, outputPer1M: 1.5, cacheReadPer1M: 0.02, cacheWritePer1M: 0 },
+    "grok-3": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.75, cacheWritePer1M: 0 },
+    "grok-3-mini": { inputPer1M: 0.3, outputPer1M: 0.5, cacheReadPer1M: 0.07, cacheWritePer1M: 0 },
+    "glm-5.1": { inputPer1M: 1.4, outputPer1M: 4.4, cacheReadPer1M: 0.26, cacheWritePer1M: 0 },
+    "glm-5": { inputPer1M: 1, outputPer1M: 3.2, cacheReadPer1M: 0.2, cacheWritePer1M: 0 },
+    "z-ai/glm-5.1": { inputPer1M: 1.05, outputPer1M: 3.5, cacheReadPer1M: 0.525, cacheWritePer1M: 0 },
+    "z-ai/glm-5": { inputPer1M: 0.6, outputPer1M: 1.92, cacheReadPer1M: 0.12, cacheWritePer1M: 0 },
+    "kimi-k2.6": { inputPer1M: 0.95, outputPer1M: 4, cacheReadPer1M: 0.16, cacheWritePer1M: 0 },
+    "kimi-k2.5": { inputPer1M: 0.6, outputPer1M: 3, cacheReadPer1M: 0.1, cacheWritePer1M: 0 },
+    "kimi-k2": { inputPer1M: 0.6, outputPer1M: 2.5, cacheReadPer1M: 0.15, cacheWritePer1M: 0 },
+    "moonshotai/kimi-k2.6": { inputPer1M: 0.75, outputPer1M: 3.5, cacheReadPer1M: 0.15, cacheWritePer1M: 0 },
+    "moonshotai/kimi-k2.5": { inputPer1M: 0.44, outputPer1M: 2, cacheReadPer1M: 0.22, cacheWritePer1M: 0 },
+    "moonshotai/kimi-k2": { inputPer1M: 0.57, outputPer1M: 2.3, cacheReadPer1M: 0, cacheWritePer1M: 0 }
+  };
+  LEGACY_DEFAULT_PRICING = {
     "claude-3-5-haiku": { inputPer1M: 1, outputPer1M: 5, cacheReadPer1M: 0.1, cacheWritePer1M: 1.25 },
-    "claude-3-opus": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75 },
-    "claude-3-sonnet": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
-    "claude-3-haiku": { inputPer1M: 0.25, outputPer1M: 1.25, cacheReadPer1M: 0.03, cacheWritePer1M: 0.3 },
+    "claude-opus-4": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
+    "gemini-2.5-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.31, cacheWritePer1M: 0 },
+    "gemini-2.5-flash": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "gemini-2.0-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gemini-2.5-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gemini-1.5-pro": { inputPer1M: 1.25, outputPer1M: 5, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gemini-1.5-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "gpt-5.3-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
     "gpt-5.2-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
     "gpt-5-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
-    "gpt-4o": { inputPer1M: 2.5, outputPer1M: 10, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
-    "gpt-4o-mini": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
-    o1: { inputPer1M: 15, outputPer1M: 60, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
+    "gpt-5-mini": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
+    "gpt-5.2": { inputPer1M: 2, outputPer1M: 8, cacheReadPer1M: 0.5, cacheWritePer1M: 0 },
     "o1-mini": { inputPer1M: 3, outputPer1M: 12, cacheReadPer1M: 1.5, cacheWritePer1M: 0 },
-    o3: { inputPer1M: 10, outputPer1M: 40, cacheReadPer1M: 2.5, cacheWritePer1M: 0 },
-    "o3-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.55, cacheWritePer1M: 0 },
-    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, cacheWritePer1M: 0 }
+    "grok-3": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "grok-3-mini": { inputPer1M: 0.3, outputPer1M: 0.5, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "qwen3.6-plus": { inputPer1M: 0.8, outputPer1M: 2, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "minimax-m2.7": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "minimax-m2.7-highspeed": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "minimax-m1": { inputPer1M: 0.2, outputPer1M: 1.1, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "glm-5.1": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "glm-5": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "kimi-k2": { inputPer1M: 0.6, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    o3: { inputPer1M: 10, outputPer1M: 40, cacheReadPer1M: 2.5, cacheWritePer1M: 0 }
+  };
+  ADDITIONAL_LEGACY_DEFAULT_PRICING = {
+    "gemini-2.5-pro": [
+      { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0, cacheWritePer1M: 0 }
+    ],
+    "qwen3.6-plus": [
+      { inputPer1M: 0.325, outputPer1M: 1.95, cacheReadPer1M: 0, cacheWritePer1M: 0.40625 },
+      { inputPer1M: 0.325, outputPer1M: 1.95, cacheReadPer1M: 0.05, cacheWritePer1M: 0.40625 }
+    ],
+    "qwen3.6-flash": [
+      { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0, cacheWritePer1M: 0.3125 }
+    ],
+    "qwen3.6-max-preview": [
+      { inputPer1M: 1.04, outputPer1M: 6.24, cacheReadPer1M: 0, cacheWritePer1M: 1.3 },
+      { inputPer1M: 1.04, outputPer1M: 6.24, cacheReadPer1M: 0.13, cacheWritePer1M: 1.3 }
+    ],
+    "qwen/qwen3.6-plus": [
+      { inputPer1M: 0.325, outputPer1M: 1.95, cacheReadPer1M: 0, cacheWritePer1M: 0.40625 },
+      { inputPer1M: 0.325, outputPer1M: 1.95, cacheReadPer1M: 0.05, cacheWritePer1M: 0.40625 }
+    ],
+    "qwen/qwen3.6-flash": [
+      { inputPer1M: 0.25, outputPer1M: 1.5, cacheReadPer1M: 0, cacheWritePer1M: 0.3125 }
+    ],
+    "qwen/qwen3.6-max-preview": [
+      { inputPer1M: 1.04, outputPer1M: 6.24, cacheReadPer1M: 0, cacheWritePer1M: 1.3 },
+      { inputPer1M: 1.04, outputPer1M: 6.24, cacheReadPer1M: 0.13, cacheWritePer1M: 1.3 }
+    ]
+  };
+  REMOVED_DEFAULT_PRICING = {
+    "claude-3-5-sonnet": [
+      { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 6 },
+      { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 0 }
+    ],
+    "claude-3-sonnet": [
+      { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 6 },
+      { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75, cacheWrite1hPer1M: 0 }
+    ],
+    "gemini-3.1-pro": [
+      { inputPer1M: 2, outputPer1M: 12, cacheReadPer1M: 0.2, cacheWritePer1M: 0 },
+      { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.31, cacheWritePer1M: 0 }
+    ],
+    "gemini-1.5-pro": [
+      { inputPer1M: 1.25, outputPer1M: 5, cacheReadPer1M: 0, cacheWritePer1M: 0 }
+    ],
+    "gemini-1.5-flash": [
+      { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 }
+    ],
+    "gpt-5.3-chat": [
+      { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.175, cacheWritePer1M: 0 },
+      { inputPer1M: 2, outputPer1M: 8, cacheReadPer1M: 0.5, cacheWritePer1M: 0 }
+    ],
+    "qwen3.6": [
+      { inputPer1M: 0.3, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 }
+    ]
+  };
+  FREE_PRICING = {
+    inputPer1M: 0,
+    outputPer1M: 0,
+    cacheReadPer1M: 0,
+    cacheWritePer1M: 0,
+    cacheWrite1hPer1M: 0,
+    cacheStoragePer1MHour: 0
+  };
+  GEMINI_PROMPT_TIERS = {
+    "gemini-3.1-pro-preview": {
+      threshold: 200000,
+      inputPer1M: 4,
+      outputPer1M: 18,
+      cacheReadPer1M: 0.4
+    },
+    "gemini-2.5-pro": {
+      threshold: 200000,
+      inputPer1M: 2.5,
+      outputPer1M: 15,
+      cacheReadPer1M: 0.25
+    }
+  };
+  OPENAI_PROMPT_TIERS = {
+    "gpt-5.5": {
+      threshold: 272000,
+      inputMultiplier: 2,
+      outputMultiplier: 1.5,
+      cacheReadMultiplier: 2
+    },
+    "gpt-5.4-pro": {
+      threshold: 272000,
+      inputMultiplier: 2,
+      outputMultiplier: 1.5,
+      cacheReadMultiplier: 2
+    },
+    "gpt-5.4": {
+      threshold: 272000,
+      inputMultiplier: 2,
+      outputMultiplier: 1.5,
+      cacheReadMultiplier: 2
+    }
+  };
+  QWEN_PROMPT_TIERS = {
+    "qwen3.6-plus": {
+      threshold: 256000,
+      inputPer1M: 1.3,
+      outputPer1M: 3.9,
+      cacheReadPer1M: 0.13,
+      cacheWritePer1M: 1.625
+    },
+    "qwen3.6-flash": {
+      threshold: 256000,
+      inputPer1M: 1,
+      outputPer1M: 4,
+      cacheReadPer1M: 0.1,
+      cacheWritePer1M: 1.25
+    },
+    "qwen3.6-max-preview": {
+      threshold: 128000,
+      inputPer1M: 1.6,
+      outputPer1M: 9.6,
+      cacheReadPer1M: 0.16,
+      cacheWritePer1M: 2
+    }
+  };
+  MINIMAX_PROMPT_TIERS = {
+    "minimax/minimax-m1": {
+      threshold: Number.POSITIVE_INFINITY
+    },
+    "minimax-m1": {
+      threshold: 200000,
+      inputPer1M: 1.3
+    }
+  };
+  XAI_PROMPT_TIERS = {
+    "grok-4.3": {
+      threshold: 200000,
+      inputPer1M: 2.5,
+      outputPer1M: 5,
+      cacheReadPer1M: 0.4
+    },
+    "grok-latest": {
+      threshold: 200000,
+      inputPer1M: 2.5,
+      outputPer1M: 5,
+      cacheReadPer1M: 0.4
+    },
+    "grok-4.20": {
+      threshold: 200000,
+      inputPer1M: 2.5,
+      outputPer1M: 5,
+      cacheReadPer1M: 0.4
+    },
+    "grok-4-1-fast": {
+      threshold: 128000,
+      inputPer1M: 0.4,
+      outputPer1M: 1,
+      cacheReadPer1M: 0
+    },
+    "grok-4-fast": {
+      threshold: 128000,
+      inputPer1M: 0.4,
+      outputPer1M: 1,
+      cacheReadPer1M: 0
+    },
+    "grok-4": {
+      threshold: 128000,
+      inputPer1M: 6,
+      outputPer1M: 30,
+      cacheReadPer1M: 0
+    }
   };
 });
 
 // src/db/database.ts
 import { SqliteAdapter as Database } from "@hasna/cloud";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
+import { hostname } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function getMachineId() {
+  if (process.env["ECONOMY_MACHINE_ID"])
+    return process.env["ECONOMY_MACHINE_ID"];
+  const h = hostname().toLowerCase();
+  if (h.startsWith("spark") || h.startsWith("apple"))
+    return h.split(".")[0];
+  return h.split(".")[0];
+}
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
   const newDir = join(home, ".hasna", "economy");
@@ -144,6 +558,7 @@ function openDatabase(dbPath, skipSeed = false) {
   }
   const db = new Database(path);
   db.exec("PRAGMA journal_mode = WAL");
+  db.exec("PRAGMA busy_timeout = 5000");
   db.exec("PRAGMA foreign_keys = ON");
   initSchema(db);
   if (!skipSeed) {
@@ -162,10 +577,13 @@ function initSchema(db) {
       output_tokens INTEGER DEFAULT 0,
       cache_read_tokens INTEGER DEFAULT 0,
       cache_create_tokens INTEGER DEFAULT 0,
+      cache_create_5m_tokens INTEGER DEFAULT 0,
+      cache_create_1h_tokens INTEGER DEFAULT 0,
       cost_usd REAL NOT NULL DEFAULT 0,
       duration_ms INTEGER DEFAULT 0,
       timestamp TEXT NOT NULL,
-      source_request_id TEXT
+      source_request_id TEXT,
+      machine_id TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS sessions (
@@ -177,7 +595,8 @@ function initSchema(db) {
       ended_at TEXT,
       total_cost_usd REAL DEFAULT 0,
       total_tokens INTEGER DEFAULT 0,
-      request_count INTEGER DEFAULT 0
+      request_count INTEGER DEFAULT 0,
+      machine_id TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS projects (
@@ -230,6 +649,8 @@ function initSchema(db) {
       output_per_1m REAL NOT NULL DEFAULT 0,
       cache_read_per_1m REAL NOT NULL DEFAULT 0,
       cache_write_per_1m REAL NOT NULL DEFAULT 0,
+      cache_write_1h_per_1m REAL NOT NULL DEFAULT 0,
+      cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0,
       updated_at TEXT NOT NULL
     );
 
@@ -242,6 +663,115 @@ function initSchema(db) {
       machine_id TEXT,
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
+
+    CREATE TABLE IF NOT EXISTS billing_daily (
+      date TEXT NOT NULL,
+      provider TEXT NOT NULL,
+      description TEXT DEFAULT '',
+      cost_usd REAL NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (date, provider, description)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date);
+    CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider);
+
+    CREATE TABLE IF NOT EXISTS subscriptions (
+      id TEXT PRIMARY KEY,
+      agent TEXT,
+      provider TEXT NOT NULL,
+      plan TEXT NOT NULL,
+      monthly_fee_usd REAL NOT NULL DEFAULT 0,
+      included_usage_usd REAL NOT NULL DEFAULT 0,
+      billing_cycle_start TEXT,
+      reset_policy TEXT DEFAULT 'monthly',
+      active INTEGER NOT NULL DEFAULT 1,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS usage_snapshots (
+      id TEXT PRIMARY KEY,
+      agent TEXT NOT NULL,
+      date TEXT NOT NULL,
+      metric TEXT NOT NULL,
+      value REAL NOT NULL DEFAULT 0,
+      unit TEXT DEFAULT '',
+      machine_id TEXT DEFAULT '',
+      updated_at TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS savings_daily (
+      date TEXT NOT NULL,
+      agent TEXT DEFAULT '',
+      api_equivalent_usd REAL NOT NULL DEFAULT 0,
+      subscription_fee_usd REAL NOT NULL DEFAULT 0,
+      included_consumed_usd REAL NOT NULL DEFAULT 0,
+      on_demand_usd REAL NOT NULL DEFAULT 0,
+      saved_usd REAL NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (date, agent)
+    );
+
+    CREATE TABLE IF NOT EXISTS machines (
+      machine_id TEXT PRIMARY KEY,
+      hostname TEXT NOT NULL,
+      last_seen_at TEXT,
+      last_push_at TEXT,
+      last_pull_at TEXT,
+      economy_version TEXT,
+      updated_at TEXT NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_usage_agent_date ON usage_snapshots(agent, date);
+    CREATE INDEX IF NOT EXISTS idx_savings_date ON savings_daily(date);
+  `);
+  const cols = db.prepare(`PRAGMA table_info(requests)`).all();
+  if (!cols.some((c) => c.name === "machine_id")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN machine_id TEXT DEFAULT ''`);
+    db.exec(`ALTER TABLE sessions ADD COLUMN machine_id TEXT DEFAULT ''`);
+  }
+  if (!cols.some((c) => c.name === "cache_create_5m_tokens")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_5m_tokens INTEGER DEFAULT 0`);
+    db.exec(`UPDATE requests SET cache_create_5m_tokens = cache_create_tokens WHERE cache_create_5m_tokens = 0`);
+  }
+  if (!cols.some((c) => c.name === "cache_create_1h_tokens")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_1h_tokens INTEGER DEFAULT 0`);
+  }
+  if (!cols.some((c) => c.name === "cost_basis")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN cost_basis TEXT DEFAULT 'estimated'`);
+  }
+  if (!cols.some((c) => c.name === "attribution_tag")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN attribution_tag TEXT DEFAULT ''`);
+  }
+  if (!cols.some((c) => c.name === "updated_at")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN updated_at TEXT DEFAULT ''`);
+    db.exec(`UPDATE requests SET updated_at = timestamp WHERE updated_at = '' OR updated_at IS NULL`);
+  }
+  if (!cols.some((c) => c.name === "synced_at")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN synced_at TEXT DEFAULT ''`);
+  }
+  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 ''`);
+  }
+  if (!sessionCols.some((c) => c.name === "updated_at")) {
+    db.exec(`ALTER TABLE sessions ADD COLUMN updated_at TEXT DEFAULT ''`);
+    db.exec(`UPDATE sessions SET updated_at = started_at WHERE updated_at = '' OR updated_at IS NULL`);
+  }
+  if (!sessionCols.some((c) => c.name === "synced_at")) {
+    db.exec(`ALTER TABLE sessions ADD COLUMN synced_at TEXT DEFAULT ''`);
+  }
+  const pricingCols = db.prepare(`PRAGMA table_info(model_pricing)`).all();
+  if (!pricingCols.some((c) => c.name === "cache_write_1h_per_1m")) {
+    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`);
+  }
+  if (!pricingCols.some((c) => c.name === "cache_storage_per_1m_hour")) {
+    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`);
+  }
+  db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id);
+    CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
   `);
 }
 function periodWhere(period) {
@@ -251,11 +781,11 @@ function periodWhere(period) {
     case "yesterday":
       return `DATE(timestamp) = DATE('now', '-1 day')`;
     case "week":
-      return `timestamp >= DATE('now', '-7 days')`;
+      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `timestamp >= DATE('now', '-30 days')`;
+      return `timestamp >= DATE('now', 'start of month')`;
     case "year":
-      return `timestamp >= DATE('now', '-365 days')`;
+      return `timestamp >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -267,31 +797,34 @@ function sessionPeriodWhere(period) {
     case "yesterday":
       return `DATE(started_at) = DATE('now', '-1 day')`;
     case "week":
-      return `started_at >= DATE('now', '-7 days')`;
+      return `started_at >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `started_at >= DATE('now', '-30 days')`;
+      return `started_at >= DATE('now', 'start of month')`;
     case "year":
-      return `started_at >= DATE('now', '-365 days')`;
+      return `started_at >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
 }
 function upsertRequest(db, req) {
+  const now = req.updated_at ?? new Date().toISOString();
   db.prepare(`
     INSERT OR REPLACE INTO requests
       (id, agent, session_id, model, input_tokens, output_tokens,
-       cache_read_tokens, cache_create_tokens, cost_usd, duration_ms,
-       timestamp, source_request_id)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cost_usd, req.duration_ms, req.timestamp, req.source_request_id);
+       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 ?? "");
 }
 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)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count);
+       total_cost_usd, total_tokens, request_count, machine_id, 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 ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -321,6 +854,10 @@ function querySessions(db, filter = {}) {
     conditions.push("started_at >= ?");
     params.push(filter.since);
   }
+  if (filter.machine) {
+    conditions.push("machine_id = ?");
+    params.push(filter.machine);
+  }
   if (filter.search) {
     const q = `%${filter.search}%`;
     conditions.push("(project_name LIKE ? OR agent LIKE ? OR id LIKE ?)");
@@ -339,24 +876,25 @@ function queryTopSessions(db, n = 10, agent) {
   }
   return db.prepare(`SELECT * FROM sessions ORDER BY total_cost_usd DESC LIMIT ?`).all(n);
 }
-function querySummary(db, period) {
+function querySummary(db, period, machine, allMachines = false) {
   const rWhere = periodWhere(period);
   const sWhere = sessionPeriodWhere(period);
+  const machineClause = !allMachines && machine ? ` AND machine_id = '${machine.replace(/'/g, "''")}'` : "";
   const r = db.prepare(`
     SELECT COALESCE(SUM(cost_usd), 0) as total_usd,
            COUNT(*) as requests,
            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as tokens
-    FROM requests WHERE ${rWhere}
+    FROM requests WHERE ${rWhere}${machineClause}
   `).get();
   const codexTotals = db.prepare(`
     SELECT COALESCE(SUM(total_cost_usd), 0) as cost_usd,
            COALESCE(SUM(total_tokens), 0) as tokens,
            COUNT(*) as sessions
     FROM sessions
-    WHERE ${sWhere}
+    WHERE ${sWhere}${machineClause}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
   `).get();
-  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}`).get();
+  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}${machineClause}`).get();
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
     requests: r.requests,
@@ -376,23 +914,66 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
+function labelForPath(projectPath, projectName) {
+  if (projectName && projectName.trim() !== "")
+    return projectName;
+  if (!projectPath)
+    return "";
+  const segments = projectPath.split("/").filter(Boolean);
+  const projectPrefix = /^(open|skill|hook|service|connect|platform|agent|tool|iapp|project|scaffold|capp)-/;
+  for (const seg of segments) {
+    if (projectPrefix.test(seg))
+      return seg;
+  }
+  const generic = new Set(["web", "app", "apps", "packages", "src", "lib", "server", "client", "api", "frontend", "backend"]);
+  for (let i = segments.length - 1;i >= 0; i--) {
+    if (!generic.has(segments[i].toLowerCase()))
+      return segments[i];
+  }
+  return segments[segments.length - 1] ?? projectPath;
+}
 function queryProjectBreakdown(db) {
-  return db.prepare(`
-    SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
-    ORDER BY cost_usd DESC
+  const sessions = db.prepare(`
+    SELECT id, project_path, project_name, total_cost_usd, started_at
+    FROM sessions
+    WHERE project_path != '' OR project_name != ''
   `).all();
+  const groups = new Map;
+  for (const s of sessions) {
+    const label = labelForPath(s.project_path, s.project_name);
+    if (!label)
+      continue;
+    const g = groups.get(label) ?? { sessionIds: [], samplePath: s.project_path, totalCost: 0, lastActive: "" };
+    g.sessionIds.push(s.id);
+    g.totalCost += s.total_cost_usd || 0;
+    if (!g.lastActive || s.started_at > g.lastActive)
+      g.lastActive = s.started_at;
+    if (!g.samplePath)
+      g.samplePath = s.project_path;
+    groups.set(label, g);
+  }
+  const result = [];
+  for (const [label, g] of groups.entries()) {
+    const placeholders = g.sessionIds.map(() => "?").join(",");
+    const reqStats = placeholders.length ? 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
+          FROM requests WHERE session_id IN (${placeholders})
+        `).get(...g.sessionIds) : { requests: 0, cost_usd: 0, total_tokens: 0 };
+    result.push({
+      project_path: g.samplePath,
+      project_name: label,
+      sessions: g.sessionIds.length,
+      requests: reqStats.requests,
+      total_tokens: reqStats.total_tokens,
+      cost_usd: reqStats.cost_usd > 0 ? reqStats.cost_usd : g.totalCost,
+      last_active: g.lastActive
+    });
+  }
+  result.sort((a, b) => b.cost_usd - a.cost_usd);
+  return result;
 }
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`
@@ -403,9 +984,19 @@ function queryDailyBreakdown(db, days = 30) {
     ORDER BY date ASC
   `).all(`-${days}`);
 }
+function upsertBudget(db, budget) {
+  db.prepare(`
+    INSERT OR REPLACE INTO budgets
+      (id, project_path, agent, period, limit_usd, alert_at_percent, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(budget.id, budget.project_path ?? null, budget.agent ?? null, budget.period, budget.limit_usd, budget.alert_at_percent, budget.created_at, budget.updated_at);
+}
 function listBudgets(db) {
   return db.prepare(`SELECT * FROM budgets ORDER BY created_at DESC`).all();
 }
+function deleteBudget(db, id) {
+  db.prepare(`DELETE FROM budgets WHERE id = ?`).run(id);
+}
 function getBudgetStatuses(db) {
   const budgets = listBudgets(db);
   return budgets.map((b) => {
@@ -479,120 +1070,424 @@ function getIngestState(db, source, key) {
 function setIngestState(db, source, key, value) {
   db.prepare(`INSERT OR REPLACE INTO ingest_state (source, key, value) VALUES (?, ?, ?)`).run(source, key, value);
 }
+function queryBillingSummary(db, period) {
+  const where = period === "today" ? `date = DATE('now')` : period === "yesterday" ? `date = DATE('now', '-1 day')` : period === "week" ? `date >= DATE('now', 'weekday 0', '-7 days')` : period === "month" ? `date >= DATE('now', 'start of month')` : period === "year" ? `date >= DATE('now', 'start of year')` : "1=1";
+  const rows = db.prepare(`SELECT provider, SUM(cost_usd) as cost FROM billing_daily WHERE ${where} GROUP BY provider`).all();
+  const by_provider = {};
+  let total = 0;
+  for (const r of rows) {
+    by_provider[r.provider] = r.cost;
+    total += r.cost;
+  }
+  return { total_usd: total, by_provider };
+}
+function listMachines(db) {
+  return db.prepare(`
+    SELECT
+      s.machine_id,
+      COUNT(DISTINCT s.id) as sessions,
+      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.machine_id = s.machine_id), 0) as requests,
+      COALESCE(SUM(s.total_cost_usd), 0) as total_cost_usd,
+      MAX(s.started_at) as last_active
+    FROM sessions s
+    WHERE s.machine_id != ''
+    GROUP BY s.machine_id
+    ORDER BY total_cost_usd DESC
+  `).all();
+}
 function upsertModelPricing(db, p) {
   db.prepare(`
     INSERT OR REPLACE INTO model_pricing
-      (model, input_per_1m, output_per_1m, cache_read_per_1m, cache_write_per_1m, updated_at)
-    VALUES (?, ?, ?, ?, ?, ?)
-  `).run(p.model, p.input_per_1m, p.output_per_1m, p.cache_read_per_1m, p.cache_write_per_1m, p.updated_at);
+      (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, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(p.model, p.input_per_1m, p.output_per_1m, p.cache_read_per_1m, p.cache_write_per_1m, p.cache_write_1h_per_1m ?? 0, p.cache_storage_per_1m_hour ?? 0, p.updated_at);
 }
 function getModelPricing(db, model) {
   return db.prepare(`SELECT * FROM model_pricing WHERE model = ?`).get(model);
 }
+function listModelPricing(db) {
+  return db.prepare(`SELECT * FROM model_pricing ORDER BY model ASC`).all();
+}
+function deleteModelPricing(db, model) {
+  db.prepare(`DELETE FROM model_pricing WHERE model = ?`).run(model);
+}
 function seedModelPricing(db, defaults) {
-  const existing = db.prepare(`SELECT COUNT(*) as count FROM model_pricing`).get();
-  if (existing.count > 0)
-    return;
+  const existing = new Set(db.prepare(`SELECT model FROM model_pricing`).all().map((r) => r.model));
   const now = new Date().toISOString();
   for (const [model, p] of Object.entries(defaults)) {
+    if (existing.has(model))
+      continue;
     upsertModelPricing(db, {
       model,
       input_per_1m: p.inputPer1M,
       output_per_1m: p.outputPer1M,
       cache_read_per_1m: p.cacheReadPer1M,
       cache_write_per_1m: p.cacheWritePer1M,
+      cache_write_1h_per_1m: p.cacheWrite1hPer1M ?? 0,
+      cache_storage_per_1m_hour: p.cacheStoragePer1MHour ?? 0,
       updated_at: now
     });
   }
 }
+function upsertSubscription(db, sub) {
+  db.prepare(`
+    INSERT OR REPLACE INTO subscriptions
+      (id, agent, provider, plan, monthly_fee_usd, included_usage_usd, billing_cycle_start, reset_policy, active, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(sub.id, sub.agent, sub.provider, sub.plan, sub.monthly_fee_usd, sub.included_usage_usd, sub.billing_cycle_start, sub.reset_policy, sub.active, sub.created_at, sub.updated_at);
+}
+function upsertUsageSnapshot(db, snap) {
+  const now = snap.updated_at ?? new Date().toISOString();
+  const id = snap.id ?? `${snap.agent}-${snap.date}-${snap.metric}-${snap.machine_id}`;
+  db.prepare(`
+    INSERT OR REPLACE INTO usage_snapshots (id, agent, date, metric, value, unit, machine_id, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, snap.agent, snap.date, snap.metric, snap.value, snap.unit, snap.machine_id, now);
+}
+function queryUsageSnapshots(db, opts = {}) {
+  const conditions = [];
+  const params = [];
+  if (opts.agent) {
+    conditions.push("agent = ?");
+    params.push(opts.agent);
+  }
+  if (opts.date) {
+    conditions.push("date = ?");
+    params.push(opts.date);
+  }
+  if (opts.since) {
+    conditions.push("date >= ?");
+    params.push(opts.since);
+  }
+  const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
+  return db.prepare(`SELECT * FROM usage_snapshots ${where} ORDER BY date DESC, agent, metric`).all(...params);
+}
+function dedupeRequests(db) {
+  const dupes = db.prepare(`
+    SELECT source_request_id, agent, MIN(id) as keep_id, COUNT(*) as cnt
+    FROM requests
+    WHERE source_request_id != '' AND source_request_id IS NOT NULL
+    GROUP BY source_request_id, agent
+    HAVING cnt > 1
+  `).all();
+  let removed = 0;
+  for (const row of dupes) {
+    const result = db.prepare(`
+      DELETE FROM requests WHERE source_request_id = ? AND agent = ? AND id != ?
+    `).run(row.source_request_id, row.agent, row.keep_id);
+    removed += result.changes;
+  }
+  return removed;
+}
 var init_database = () => {};
 
-// package.json
-var require_package = __commonJS((exports, module) => {
-  module.exports = {
-    name: "@hasna/economy",
-    version: "0.2.10",
-    description: "AI coding cost tracker \u2014 CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini",
-    type: "module",
-    main: "dist/index.js",
-    types: "dist/index.d.ts",
-    bin: {
-      economy: "dist/cli/index.js",
-      "economy-mcp": "dist/mcp/index.js",
-      "economy-serve": "dist/server/index.js"
-    },
-    exports: {
-      ".": {
-        types: "./dist/index.d.ts",
-        import: "./dist/index.js"
-      }
-    },
-    files: [
-      "dist",
-      "LICENSE"
-    ],
-    scripts: {
-      build: "cd dashboard && bun run build && cd .. && bun build src/cli/index.ts --outdir dist/cli --target bun --packages external && bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external && bun build src/server/index.ts --outdir dist/server --target bun --packages external && bun build src/index.ts --outdir dist --target bun --packages external && tsc --emitDeclarationOnly --outDir dist",
-      "build:cli": "bun build src/cli/index.ts --outdir dist/cli --target bun --packages external",
-      "build:mcp": "bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external",
-      "build:server": "bun build src/server/index.ts --outdir dist/server --target bun --packages external",
-      "build:lib": "bun build src/index.ts --outdir dist --target bun --packages external",
-      "build:dashboard": "cd dashboard && bun run build",
-      typecheck: "tsc --noEmit",
-      test: "bun test",
-      "dev:cli": "bun run src/cli/index.ts",
-      "dev:mcp": "bun run src/mcp/index.ts",
-      "dev:serve": "bun run src/server/index.ts",
-      postinstall: "mkdir -p $HOME/.hasna/economy/training 2>/dev/null || true"
-    },
-    keywords: [
-      "economy",
-      "cost",
-      "ai",
-      "claude",
-      "codex",
-      "gemini",
-      "mcp",
-      "cli",
-      "budget",
-      "tracking"
-    ],
-    author: "hasna",
-    license: "Apache-2.0",
-    publishConfig: {
-      registry: "https://registry.npmjs.org",
-      access: "public"
-    },
-    dependencies: {
-      "@hasna/cloud": "^0.1.0",
-      "@modelcontextprotocol/sdk": "^1.12.1",
-      chalk: "^5.4.1",
-      commander: "^13.1.0"
-    },
-    devDependencies: {
-      "@types/bun": "latest",
-      "bun-types": "latest",
-      typescript: "^5.7.2"
-    }
-  };
+// src/db/pg-migrations.ts
+var exports_pg_migrations = {};
+__export(exports_pg_migrations, {
+  PG_MIGRATIONS: () => PG_MIGRATIONS
+});
+var PG_MIGRATIONS;
+var init_pg_migrations = __esm(() => {
+  PG_MIGRATIONS = [
+    `CREATE TABLE IF NOT EXISTS requests (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    session_id TEXT NOT NULL,
+    model TEXT NOT NULL,
+    input_tokens INTEGER DEFAULT 0,
+    output_tokens INTEGER DEFAULT 0,
+    cache_read_tokens INTEGER DEFAULT 0,
+    cache_create_tokens INTEGER DEFAULT 0,
+    cache_create_5m_tokens INTEGER DEFAULT 0,
+    cache_create_1h_tokens INTEGER DEFAULT 0,
+    cost_usd REAL NOT NULL DEFAULT 0,
+    duration_ms INTEGER DEFAULT 0,
+    timestamp TEXT NOT NULL,
+    source_request_id TEXT,
+    machine_id TEXT DEFAULT ''
+  )`,
+    `CREATE TABLE IF NOT EXISTS sessions (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    project_path TEXT DEFAULT '',
+    project_name TEXT DEFAULT '',
+    started_at TEXT NOT NULL,
+    ended_at TEXT,
+    total_cost_usd REAL DEFAULT 0,
+    total_tokens INTEGER DEFAULT 0,
+    request_count INTEGER DEFAULT 0,
+    machine_id TEXT DEFAULT ''
+  )`,
+    `CREATE TABLE IF NOT EXISTS projects (
+    id TEXT PRIMARY KEY,
+    path TEXT UNIQUE NOT NULL,
+    name TEXT NOT NULL,
+    description TEXT,
+    tags TEXT DEFAULT '[]',
+    created_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS budgets (
+    id TEXT PRIMARY KEY,
+    project_path TEXT,
+    agent TEXT,
+    period TEXT NOT NULL,
+    limit_usd REAL NOT NULL,
+    alert_at_percent INTEGER DEFAULT 80,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS goals (
+    id TEXT PRIMARY KEY,
+    period TEXT NOT NULL,
+    project_path TEXT,
+    agent TEXT,
+    limit_usd REAL NOT NULL,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS ingest_state (
+    source TEXT NOT NULL,
+    key TEXT NOT NULL,
+    value TEXT NOT NULL,
+    PRIMARY KEY (source, key)
+  )`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_session ON requests(session_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_timestamp ON requests(timestamp)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_agent ON requests(agent)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_path)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_started ON sessions(started_at)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id)`,
+    `CREATE TABLE IF NOT EXISTS model_pricing (
+    model TEXT PRIMARY KEY,
+    input_per_1m REAL NOT NULL DEFAULT 0,
+    output_per_1m REAL NOT NULL DEFAULT 0,
+    cache_read_per_1m REAL NOT NULL DEFAULT 0,
+    cache_write_per_1m REAL NOT NULL DEFAULT 0,
+    cache_write_1h_per_1m REAL NOT NULL DEFAULT 0,
+    cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0,
+    updated_at TEXT NOT NULL
+  )`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cache_create_5m_tokens INTEGER DEFAULT 0`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cache_create_1h_tokens INTEGER DEFAULT 0`,
+    `ALTER TABLE model_pricing ADD COLUMN IF NOT EXISTS cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`,
+    `ALTER TABLE model_pricing ADD COLUMN IF NOT EXISTS cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`,
+    `CREATE TABLE IF NOT EXISTS feedback (
+    id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
+    message TEXT NOT NULL,
+    email TEXT,
+    category TEXT DEFAULT 'general',
+    version TEXT,
+    machine_id TEXT,
+    created_at TEXT NOT NULL DEFAULT NOW()::text
+  )`,
+    `CREATE TABLE IF NOT EXISTS billing_daily (
+    date TEXT NOT NULL,
+    provider TEXT NOT NULL,
+    description TEXT DEFAULT '',
+    cost_usd REAL NOT NULL DEFAULT 0,
+    updated_at TEXT NOT NULL,
+    PRIMARY KEY (date, provider, description)
+  )`,
+    `CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date)`,
+    `CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider)`,
+    `CREATE TABLE IF NOT EXISTS subscriptions (
+    id TEXT PRIMARY KEY,
+    agent TEXT,
+    provider TEXT NOT NULL,
+    plan TEXT NOT NULL,
+    monthly_fee_usd REAL NOT NULL DEFAULT 0,
+    included_usage_usd REAL NOT NULL DEFAULT 0,
+    billing_cycle_start TEXT,
+    reset_policy TEXT DEFAULT 'monthly',
+    active INTEGER NOT NULL DEFAULT 1,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS usage_snapshots (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    date TEXT NOT NULL,
+    metric TEXT NOT NULL,
+    value REAL NOT NULL DEFAULT 0,
+    unit TEXT DEFAULT '',
+    machine_id TEXT DEFAULT '',
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS savings_daily (
+    date TEXT NOT NULL,
+    agent TEXT DEFAULT '',
+    api_equivalent_usd REAL NOT NULL DEFAULT 0,
+    subscription_fee_usd REAL NOT NULL DEFAULT 0,
+    included_consumed_usd REAL NOT NULL DEFAULT 0,
+    on_demand_usd REAL NOT NULL DEFAULT 0,
+    saved_usd REAL NOT NULL DEFAULT 0,
+    updated_at TEXT NOT NULL,
+    PRIMARY KEY (date, agent)
+  )`,
+    `CREATE TABLE IF NOT EXISTS machines (
+    machine_id TEXT PRIMARY KEY,
+    hostname TEXT NOT NULL,
+    last_seen_at TEXT,
+    last_push_at TEXT,
+    last_pull_at TEXT,
+    economy_version TEXT,
+    updated_at TEXT NOT NULL
+  )`,
+    `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 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 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)`
+  ];
 });
 
 // src/mcp/index.ts
-init_database();
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.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 { registerCloudTools } from "@hasna/cloud";
+import { z } from "zod";
 
 // src/ingest/claude.ts
 init_database();
 init_pricing();
-import { readdirSync as readdirSync2, readFileSync, existsSync as existsSync2, statSync as statSync2 } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync2, statSync as statSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2, basename } from "path";
+
+// src/lib/savings.ts
+function periodWhere2(period, column) {
+  switch (period) {
+    case "today":
+      return `DATE(${column}) = DATE('now')`;
+    case "yesterday":
+      return `DATE(${column}) = DATE('now', '-1 day')`;
+    case "week":
+      return `${column} >= DATE('now', 'weekday 0', '-7 days')`;
+    case "month":
+      return `${column} >= DATE('now', 'start of month')`;
+    case "year":
+      return `${column} >= DATE('now', 'start of year')`;
+    case "all":
+      return "1=1";
+  }
+}
+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":
+    case "yesterday":
+      return monthlyFee / daysInMonth;
+    case "week":
+      return monthlyFee / daysInMonth * 7;
+    case "month":
+      return monthlyFee;
+    case "year":
+      return monthlyFee * 12;
+    case "all":
+      return monthlyFee;
+  }
+}
+function computeSavedUsd(apiEquivalent, onDemand, subscriptionFee) {
+  return Math.max(0, apiEquivalent - onDemand - subscriptionFee);
+}
+function querySavingsSummary(db, period, agent) {
+  const where = periodWhere2(period, "timestamp");
+  const agentClause = agent ? " AND agent = ?" : "";
+  const params = agent ? [agent] : [];
+  const apiRow = db.prepare(`
+    SELECT COALESCE(SUM(cost_usd), 0) as total
+    FROM requests
+    WHERE ${where}${agentClause}
+      AND COALESCE(cost_basis, 'estimated') IN ('metered_api', 'estimated', 'unknown')
+  `).get(...params);
+  const includedRow = db.prepare(`
+    SELECT COALESCE(SUM(cost_usd), 0) as total
+    FROM requests
+    WHERE ${where}${agentClause}
+      AND cost_basis = 'subscription_included'
+  `).get(...params);
+  const subWhere = periodWhere2(period, "date");
+  const onDemandRow = db.prepare(`
+    SELECT COALESCE(SUM(value), 0) as total
+    FROM usage_snapshots
+    WHERE ${subWhere}${agent ? " AND agent = ?" : ""}
+      AND metric = 'on_demand_usd'
+  `).get(...params);
+  const subs = db.prepare(`
+    SELECT COALESCE(SUM(monthly_fee_usd), 0) as total
+    FROM subscriptions
+    WHERE active = 1${agent ? " AND agent = ?" : ""}
+  `).get(...agent ? [agent] : []);
+  const subscriptionFee = prorateMonthlyFee(subs.total, period);
+  const apiEquivalent = apiRow.total + includedRow.total;
+  const onDemand = onDemandRow.total;
+  const saved = computeSavedUsd(apiEquivalent, onDemand, subscriptionFee);
+  const byAgent = {};
+  if (!agent) {
+    for (const row of db.prepare(`
+      SELECT agent, COALESCE(SUM(cost_usd), 0) as api_eq
+      FROM requests WHERE ${where}
+      GROUP BY agent
+    `).all()) {
+      byAgent[row.agent] = {
+        api_equivalent_usd: row.api_eq,
+        saved_usd: row.api_eq
+      };
+    }
+  }
+  return {
+    period,
+    api_equivalent_usd: apiEquivalent,
+    subscription_fee_usd: subscriptionFee,
+    included_consumed_usd: includedRow.total,
+    on_demand_usd: onDemand,
+    saved_usd: saved,
+    by_agent: byAgent
+  };
+}
+function defaultCostBasisForAgent(agent) {
+  if (agent === "claude")
+    return "metered_api";
+  if (agent === "cursor")
+    return "subscription_included";
+  return "estimated";
+}
+
+// src/ingest/claude.ts
 function autoDetectProject(cwd, projects) {
   return projects.find((p) => cwd === p.path || cwd.startsWith(p.path + "/"));
 }
-var PROJECTS_DIR = join2(homedir2(), ".claude", "projects");
+var CLAUDE_PROJECTS_DIR = join2(homedir2(), ".claude", "projects");
+var TAKUMI_PROJECTS_DIR = join2(homedir2(), ".takumi", "projects");
 function dirNameToPath(dirName) {
   return dirName.replace(/^-/, "/").replace(/-/g, "/").replace(/\/\//g, "/-");
 }
@@ -611,35 +1506,42 @@ function collectJsonlFiles(projectDir) {
   walk(projectDir);
   return files;
 }
-async function ingestClaude(db, verbose = false, _telemetryDir) {
-  if (!existsSync2(PROJECTS_DIR)) {
+async function ingestClaude(db, verbose = false, projectsDir = CLAUDE_PROJECTS_DIR) {
+  return ingestJsonlProjects(db, projectsDir, "claude", verbose);
+}
+async function ingestTakumi(db, verbose = false, projectsDir = TAKUMI_PROJECTS_DIR) {
+  return ingestJsonlProjects(db, projectsDir, "takumi", verbose);
+}
+async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false) {
+  if (!existsSync2(projectsDir)) {
     if (verbose)
-      console.log("Claude projects dir not found:", PROJECTS_DIR);
+      console.log(`${agentName} projects dir not found:`, projectsDir);
     return { files: 0, requests: 0, sessions: 0 };
   }
+  const machineId = getMachineId();
   let totalFiles = 0;
   let totalRequests = 0;
   const touchedSessions = new Set;
   const registeredProjects = db.prepare(`SELECT path, name FROM projects ORDER BY LENGTH(path) DESC`).all();
-  const projectDirs = readdirSync2(PROJECTS_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
+  const projectDirs = readdirSync2(projectsDir, { withFileTypes: true }).filter((d) => d.isDirectory());
   for (const projectDirEntry of projectDirs) {
-    const projectDirPath = join2(PROJECTS_DIR, projectDirEntry.name);
+    const projectDirPath = join2(projectsDir, projectDirEntry.name);
     const projectPath = dirNameToPath(projectDirEntry.name);
     const jsonlFiles = collectJsonlFiles(projectDirPath);
     for (const filePath of jsonlFiles) {
-      const stateKey = filePath.replace(PROJECTS_DIR, "");
+      const stateKey = filePath.replace(projectsDir, "");
       let fileMtime = "0";
       try {
         fileMtime = statSync2(filePath).mtimeMs.toString();
       } catch {
         continue;
       }
-      const processed = getIngestState(db, "claude", stateKey);
+      const processed = getIngestState(db, agentName, stateKey);
       if (processed === fileMtime)
         continue;
       let lines;
       try {
-        lines = readFileSync(filePath, "utf-8").split(`
+        lines = readFileSync2(filePath, "utf-8").split(`
 `).filter((l) => l.trim());
       } catch {
         continue;
@@ -669,26 +1571,38 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
           continue;
         const inputTokens = usage.input_tokens ?? 0;
         const outputTokens = usage.output_tokens ?? 0;
-        const cacheWriteTokens = usage.cache_creation_input_tokens ?? 0;
+        const cacheWrite5mTokens = usage.cache_creation?.ephemeral_5m_input_tokens ?? usage.cache_creation_input_tokens ?? 0;
+        const cacheWrite1hTokens = usage.cache_creation?.ephemeral_1h_input_tokens ?? 0;
+        const cacheWriteTokens = cacheWrite5mTokens + cacheWrite1hTokens;
         const cacheReadTokens = usage.cache_read_input_tokens ?? 0;
         const timestamp = entry.timestamp ?? new Date().toISOString();
-        if (inputTokens + outputTokens + cacheWriteTokens === 0)
+        if (inputTokens + outputTokens + cacheWriteTokens + cacheReadTokens === 0)
           continue;
-        const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
-        const reqId = `claude-${sessionId}-${timestamp}`;
+        let costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, cacheWrite5mTokens, cacheWrite1hTokens);
+        costUsd = applyClaudeModifiers(costUsd, model, usage, entry);
+        const serverToolUse = usage.server_tool_use;
+        if (serverToolUse?.web_search_requests) {
+          costUsd += serverToolUse.web_search_requests * 0.01;
+        }
+        const sourceRequestId = entry.requestId ?? entry.request_id ?? entry.message.id ?? entry.uuid ?? `${sessionId}-${timestamp}`;
+        const reqId = `${agentName}-${sourceRequestId}`;
         upsertRequest(db, {
           id: reqId,
-          agent: "claude",
+          agent: agentName,
           session_id: sessionId,
           model,
           input_tokens: inputTokens,
           output_tokens: outputTokens,
           cache_read_tokens: cacheReadTokens,
           cache_create_tokens: cacheWriteTokens,
+          cache_create_5m_tokens: cacheWrite5mTokens,
+          cache_create_1h_tokens: cacheWrite1hTokens,
           cost_usd: costUsd,
+          cost_basis: defaultCostBasisForAgent(agentName),
           duration_ms: 0,
           timestamp,
-          source_request_id: reqId
+          source_request_id: sourceRequestId,
+          machine_id: machineId
         });
         if (!touchedSessions.has(sessionId)) {
           const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
@@ -697,14 +1611,15 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
             const detectedProject = autoDetectProject(effectiveCwd, registeredProjects);
             const session = {
               id: sessionId,
-              agent: "claude",
+              agent: agentName,
               project_path: detectedProject ? detectedProject.path : effectiveCwd,
               project_name: detectedProject ? detectedProject.name : "",
               started_at: timestamp,
               ended_at: null,
               total_cost_usd: 0,
               total_tokens: 0,
-              request_count: 0
+              request_count: 0,
+              machine_id: machineId
             };
             upsertSession(db, session);
           }
@@ -712,7 +1627,7 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
         }
         totalRequests++;
       }
-      setIngestState(db, "claude", stateKey, fileMtime);
+      setIngestState(db, agentName, stateKey, fileMtime);
       totalFiles++;
     }
   }
@@ -721,79 +1636,254 @@ async function ingestClaude(db, verbose = false, _telemetryDir) {
   }
   return { files: totalFiles, requests: totalRequests, sessions: touchedSessions.size };
 }
+function applyClaudeModifiers(costUsd, model, usage, entry) {
+  let multiplier = 1;
+  const speed = usage.speed ?? entry.message?.speed ?? entry.speed;
+  if (speed === "fast" && model.includes("opus-4-6")) {
+    multiplier *= 6;
+  }
+  const inferenceGeo = usage.inference_geo ?? entry.message?.inference_geo ?? entry.inference_geo;
+  if (inferenceGeo && ["us", "us-only", "us_only"].includes(inferenceGeo) && supportsClaudeDataResidencyPricing(model)) {
+    multiplier *= 1.1;
+  }
+  return costUsd * multiplier;
+}
+function supportsClaudeDataResidencyPricing(model) {
+  const normalized = normalizeModelName(model);
+  const match = normalized.match(/^claude-(opus|sonnet|haiku)-(\d+)(?:-(\d+))?(?:-|$)/);
+  if (!match)
+    return false;
+  const major = Number(match[2]);
+  const minor = match[3] ? Number(match[3]) : 0;
+  return major > 4 || major === 4 && minor >= 6;
+}
 
 // src/ingest/codex.ts
 init_database();
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+init_pricing();
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join3, basename as basename2 } from "path";
-import { Database as Database2 } from "bun:sqlite";
-var CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
-var CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
-async function ingestCodex(db, verbose = false) {
-  if (!existsSync3(CODEX_DB_PATH)) {
-    if (verbose)
-      console.log("Codex DB not found:", CODEX_DB_PATH);
-    return { sessions: 0 };
-  }
-  let codexDb = null;
-  let ingested = 0;
+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";
+function codexDbPath() {
+  return process.env["HASNA_ECONOMY_CODEX_DB_PATH"] ?? DEFAULT_CODEX_DB_PATH;
+}
+function codexConfigPath() {
+  return process.env["HASNA_ECONOMY_CODEX_CONFIG_PATH"] ?? DEFAULT_CODEX_CONFIG_PATH;
+}
+function readCodexModel() {
+  const configPath = codexConfigPath();
+  if (!existsSync3(configPath))
+    return "gpt-5-codex";
   try {
-    codexDb = new Database2(CODEX_DB_PATH, { readonly: true });
-    const threads = codexDb.prepare(`SELECT id, cwd, created_at, updated_at, tokens_used, title FROM threads WHERE tokens_used > 0`).all();
+    const content = readFileSync3(configPath, "utf-8");
+    const match = content.match(/^model\s*=\s*"([^"]+)"/m);
+    return match?.[1] ?? "gpt-5-codex";
+  } catch {
+    return "gpt-5-codex";
+  }
+}
+function buildThreadQuery(codexDb) {
+  const cols = new Set(codexDb.prepare(`PRAGMA table_info(threads)`).all().map((c) => c.name));
+  const modelSelect = cols.has("model") ? "model" : "NULL AS model";
+  const rolloutSelect = cols.has("rollout_path") ? "rollout_path" : "NULL AS rollout_path";
+  const providerSelect = cols.has("model_provider") ? "model_provider" : "NULL AS model_provider";
+  return `
+    SELECT id, ${rolloutSelect}, cwd, created_at, updated_at, tokens_used, title,
+           ${providerSelect}, ${modelSelect}
+    FROM threads WHERE tokens_used > 0
+  `;
+}
+function readTokenEvents(rolloutPath) {
+  if (!rolloutPath || !existsSync3(rolloutPath))
+    return [];
+  const events = [];
+  const seen = new Set;
+  for (const line of readFileSync3(rolloutPath, "utf-8").split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (!entry || typeof entry !== "object")
+      continue;
+    const payload = entry["payload"];
+    if (!payload || payload["type"] !== "token_count")
+      continue;
+    const info = payload["info"];
+    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)
+      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 });
+  }
+  return events;
+}
+function fallbackEvents(totalTokens) {
+  const inputTokens = Math.floor(totalTokens * 0.6);
+  return [{
+    usage: {
+      input_tokens: inputTokens,
+      cached_input_tokens: 0,
+      output_tokens: totalTokens - inputTokens,
+      total_tokens: totalTokens
+    }
+  }];
+}
+async function ingestCodex(db, verbose = false) {
+  const dbPath = codexDbPath();
+  if (!existsSync3(dbPath)) {
+    if (verbose)
+      console.log("Codex DB not found:", dbPath);
+    return { sessions: 0, requests: 0 };
+  }
+  const machineId = getMachineId();
+  let codexDb = null;
+  let ingested = 0;
+  let requests = 0;
+  try {
+    codexDb = new BunDatabase(dbPath, { readonly: true });
+    const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
     for (const thread of threads) {
-      const stateKey = thread.id;
-      const processed = getIngestState(db, "codex", stateKey);
-      if (processed === "done")
+      const model = thread.model ?? readCodexModel();
+      const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
+      const processed = getIngestState(db, "codex", thread.id);
+      if (processed === stateValue)
         continue;
-      const costUsd = 0;
       const projectPath = thread.cwd ?? "";
       const projectName = projectPath ? basename2(projectPath) : "unknown";
+      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, {
-        id: `codex-${thread.id}`,
+        id: sessionId,
         agent: "codex",
         project_path: projectPath,
         project_name: projectName,
         started_at: startedAt,
         ended_at: endedAt,
-        total_cost_usd: costUsd,
-        total_tokens: thread.tokens_used,
-        request_count: 1
+        total_cost_usd: 0,
+        total_tokens: 0,
+        request_count: 0,
+        machine_id: machineId
       });
-      setIngestState(db, "codex", stateKey, "done");
+      const events = readTokenEvents(thread.rollout_path);
+      const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+      db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
+      tokenEvents.forEach((event, index) => {
+        const usage = event.usage;
+        const inputTotal = usage.input_tokens ?? 0;
+        const cacheReadTokens = usage.cached_input_tokens ?? 0;
+        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+        const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
+        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, {
+          id: requestId,
+          agent: "codex",
+          session_id: sessionId,
+          model,
+          input_tokens: inputTokens,
+          output_tokens: outputTokens,
+          cache_read_tokens: cacheReadTokens,
+          cache_create_tokens: 0,
+          cost_usd: costUsd,
+          cost_basis: defaultCostBasisForAgent("codex"),
+          duration_ms: 0,
+          timestamp,
+          source_request_id: requestId,
+          machine_id: machineId
+        });
+        requests++;
+      });
+      rollupSession(db, sessionId);
+      setIngestState(db, "codex", thread.id, stateValue);
       ingested++;
       if (verbose)
-        console.log(`Codex session ${thread.id}: ${thread.tokens_used} tokens \u2192 $${costUsd.toFixed(4)}`);
+        console.log(`Codex session ${thread.id}: ${thread.tokens_used} tokens on ${model}`);
     }
   } finally {
     codexDb?.close();
   }
-  return { sessions: ingested };
+  return { sessions: ingested, requests };
 }
 
 // src/ingest/gemini.ts
 init_database();
-import { readdirSync as readdirSync3, readFileSync as readFileSync3, existsSync as existsSync4, statSync as statSync3 } from "fs";
+init_pricing();
+import { readdirSync as readdirSync3, readFileSync as readFileSync4, existsSync as existsSync4, statSync as statSync3 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
-var GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
+import { join as join4, basename as basename3 } from "path";
+var DEFAULT_GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
+var DEFAULT_GEMINI_HISTORY_DIR = join4(homedir4(), ".gemini", "history");
+function geminiTmpDir() {
+  return process.env["HASNA_ECONOMY_GEMINI_TMP_DIR"] ?? DEFAULT_GEMINI_TMP_DIR;
+}
+function geminiHistoryDir() {
+  return process.env["HASNA_ECONOMY_GEMINI_HISTORY_DIR"] ?? DEFAULT_GEMINI_HISTORY_DIR;
+}
+function numberField(...values) {
+  for (const value of values) {
+    if (typeof value === "number" && Number.isFinite(value))
+      return value;
+  }
+  return 0;
+}
+function listProjectDirs(...roots) {
+  const dirs = new Set;
+  for (const root of roots) {
+    if (!existsSync4(root))
+      continue;
+    try {
+      for (const entry of readdirSync3(root, { withFileTypes: true })) {
+        if (entry.isDirectory())
+          dirs.add(join4(root, entry.name));
+      }
+    } catch {}
+  }
+  return [...dirs];
+}
+function projectRoot(projectDir, chatData) {
+  if (chatData.projectPath)
+    return chatData.projectPath;
+  if (chatData.project_path)
+    return chatData.project_path;
+  const rootFile = join4(projectDir, ".project_root");
+  try {
+    if (existsSync4(rootFile))
+      return readFileSync4(rootFile, "utf-8").trim();
+  } catch {}
+  return "";
+}
 async function ingestGemini(db, verbose) {
-  if (!existsSync4(GEMINI_TMP_DIR)) {
+  const tmpDir = geminiTmpDir();
+  const historyDir = geminiHistoryDir();
+  if (!existsSync4(tmpDir) && !existsSync4(historyDir)) {
     if (verbose)
-      console.log("Gemini tmp dir not found:", GEMINI_TMP_DIR);
-    return { sessions: 0 };
+      console.log("Gemini tmp/history dirs not found:", tmpDir, historyDir);
+    return { sessions: 0, requests: 0 };
   }
+  const machineId = getMachineId();
   let totalSessions = 0;
+  let totalRequests = 0;
   const touchedSessions = new Set;
-  let projectHashDirs = [];
-  try {
-    projectHashDirs = readdirSync3(GEMINI_TMP_DIR, { withFileTypes: true }).filter((d) => d.isDirectory() && /^[0-9a-f]{64}$/.test(d.name)).map((d) => join4(GEMINI_TMP_DIR, d.name));
-  } catch {
-    return { sessions: 0 };
-  }
-  for (const projectDir of projectHashDirs) {
+  const projectDirs = listProjectDirs(tmpDir, historyDir);
+  for (const projectDir of projectDirs) {
     const chatsDir = join4(projectDir, "chats");
     if (!existsSync4(chatsDir))
       continue;
@@ -816,311 +1906,1483 @@ async function ingestGemini(db, verbose) {
         continue;
       let chatData;
       try {
-        chatData = JSON.parse(readFileSync3(filePath, "utf-8"));
+        chatData = JSON.parse(readFileSync4(filePath, "utf-8"));
       } catch {
         continue;
       }
-      const sessionId = chatData.sessionId;
+      const sessionId = chatData.sessionId ?? chatData.id ?? basename3(filePath, ".json");
       if (!sessionId)
         continue;
       const startTime = chatData.startTime ?? new Date().toISOString();
+      const projectPath = projectRoot(projectDir, chatData);
+      const projectName = projectPath ? basename3(projectPath) : "";
       const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
       if (!existing) {
         const session = {
           id: sessionId,
           agent: "gemini",
-          project_path: "",
-          project_name: "",
+          project_path: projectPath,
+          project_name: projectName,
           started_at: startTime,
           ended_at: chatData.lastUpdated ?? null,
           total_cost_usd: 0,
           total_tokens: 0,
-          request_count: 0
+          request_count: 0,
+          machine_id: machineId
         };
         upsertSession(db, session);
-        touchedSessions.add(sessionId);
         totalSessions++;
       }
+      touchedSessions.add(sessionId);
+      for (const [index, message] of (chatData.messages ?? []).entries()) {
+        const usage = message.usage ?? message.usageMetadata ?? message.response?.usageMetadata;
+        if (!usage)
+          continue;
+        const model = message.model ?? message.response?.modelVersion ?? message.response?.model ?? chatData.model;
+        if (!model)
+          continue;
+        const toolUsePromptTokens = numberField(usage.toolUsePromptTokenCount, usage.tool_use_prompt_token_count);
+        const inputTotal = numberField(usage.inputTokens, usage.input_tokens, usage.promptTokenCount, usage.prompt_token_count) + toolUsePromptTokens;
+        const cacheReadTokens = numberField(usage.cachedInputTokens, usage.cache_read_tokens, usage.cachedContentTokenCount, usage.cached_content_token_count);
+        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+        const thoughtsTokens = numberField(usage.thoughtsTokenCount, usage.thoughts_token_count);
+        const outputTokens = numberField(usage.outputTokens, usage.output_tokens, usage.candidatesTokenCount, usage.candidates_token_count) + thoughtsTokens;
+        const totalTokens = numberField(usage.totalTokens, usage.total_tokens, usage.totalTokenCount, usage.total_token_count);
+        if (inputTokens + outputTokens + cacheReadTokens + totalTokens === 0)
+          continue;
+        const computedCost = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
+        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, {
+          id: requestId,
+          agent: "gemini",
+          session_id: sessionId,
+          model,
+          input_tokens: inputTokens,
+          output_tokens: outputTokens,
+          cache_read_tokens: cacheReadTokens,
+          cache_create_tokens: 0,
+          cost_usd: costUsd,
+          cost_basis: defaultCostBasisForAgent("gemini"),
+          duration_ms: 0,
+          timestamp,
+          source_request_id: message.id ?? requestId,
+          machine_id: machineId
+        });
+        totalRequests++;
+      }
       setIngestState(db, "gemini", stateKey, fileMtime);
     }
   }
   for (const sessionId of touchedSessions) {
     rollupSession(db, sessionId);
   }
-  return { sessions: totalSessions };
+  return { sessions: totalSessions, requests: totalRequests };
 }
 
-// src/mcp/index.ts
+// src/ingest/opencode.ts
+init_database();
 init_pricing();
-var db = openDatabase();
-ensurePricingSeeded(db);
-var server = new Server({ name: "economy", version: "0.2.2" }, { capabilities: { tools: {} } });
-var fmtUsd = (n) => "$" + n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-var fmtTok = (n) => n >= 1e9 ? `${(n / 1e9).toFixed(1)}B` : n >= 1e6 ? `${(n / 1e6).toFixed(1)}M` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n);
-function fmtSession(s) {
-  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}`;
-}
-var TOOLS = [
-  { name: "get_cost_summary", description: "Cost summary (total_usd, sessions, requests, tokens, human summary). period: today|week|month|year|all", inputSchema: { type: "object", properties: { period: { type: "string", enum: ["today", "week", "month", "year", "all"] } } } },
-  { name: "get_sessions", description: "List sessions. Returns compact table. Params: agent, project, limit(20)", inputSchema: { type: "object", properties: { agent: { type: "string" }, project: { type: "string" }, limit: { type: "number" } } } },
-  { name: "get_top_sessions", description: "Top sessions by cost. Params: n(10), agent", inputSchema: { type: "object", properties: { n: { type: "number" }, agent: { type: "string" } } } },
-  { name: "get_model_breakdown", description: "Cost per model. No params.", inputSchema: { type: "object", properties: {} } },
-  { name: "get_project_breakdown", description: "Cost per project. No params.", inputSchema: { type: "object", properties: {} } },
-  { name: "get_budget_status", description: "Budget limits vs spend, percent used, alert flags. No params.", inputSchema: { type: "object", properties: {} } },
-  { name: "get_daily", description: "Daily cost table by agent. Params: days(30)", inputSchema: { type: "object", properties: { days: { type: "number" } } } },
-  { name: "get_session_detail", description: "Per-request breakdown of a single session. Params: session_id (prefix ok)", inputSchema: { type: "object", properties: { session_id: { type: "string" } }, required: ["session_id"] } },
-  { name: "sync", description: "Ingest new cost data. sources: all|claude|codex|gemini", inputSchema: { type: "object", properties: { sources: { type: "string", enum: ["all", "claude", "codex", "gemini"] } } } },
-  { name: "search_tools", description: "List tool names matching query. Use first to find relevant tools.", inputSchema: { type: "object", properties: { query: { type: "string" } } } },
-  { name: "describe_tools", description: "Get param hints for specific tools by name.", inputSchema: { type: "object", properties: { names: { type: "array", items: { type: "string" } } }, required: ["names"] } },
-  { name: "get_goals", description: "All spending goals with current progress. No params.", inputSchema: { type: "object", properties: {} } },
-  { name: "set_goal", description: "Create/update a spending goal. period(day|week|month|year), limit_usd, project_path?, agent?", inputSchema: { type: "object", properties: { period: { type: "string" }, limit_usd: { type: "number" }, project_path: { type: "string" }, agent: { type: "string" } }, required: ["period", "limit_usd"] } },
-  { name: "remove_goal", description: "Delete a goal by id.", inputSchema: { type: "object", properties: { id: { type: "string" } }, required: ["id"] } },
-  { name: "register_agent", description: "Register agent session.", inputSchema: { type: "object", properties: { name: { type: "string" }, session_id: { type: "string" } }, required: ["name"] } },
-  { name: "heartbeat", description: "Update last_seen_at.", inputSchema: { type: "object", properties: { agent_id: { type: "string" } }, required: ["agent_id"] } },
-  { name: "set_focus", description: "Set active project context.", inputSchema: { type: "object", properties: { agent_id: { type: "string" }, project_id: { type: "string" } }, required: ["agent_id"] } },
-  { name: "list_agents", description: "List all registered agents.", inputSchema: { type: "object", properties: {} } },
-  { name: "send_feedback", description: "Send feedback about this service.", inputSchema: { type: "object", properties: { message: { type: "string" }, email: { type: "string" }, category: { type: "string", enum: ["bug", "feature", "general"] } }, required: ["message"] } }
+import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join5 } from "path";
+var OPENCODE_STORAGE = join5(homedir5(), ".local", "share", "opencode", "storage");
+function walkJsonFiles(dir, acc = []) {
+  if (!existsSync5(dir))
+    return acc;
+  for (const entry of readdirSync4(dir, { withFileTypes: true })) {
+    const p = join5(dir, entry.name);
+    if (entry.isDirectory())
+      walkJsonFiles(p, acc);
+    else if (entry.name.endsWith(".json"))
+      acc.push(p);
+  }
+  return acc;
+}
+function parseSessionIdFromPath(filePath) {
+  const parts = filePath.split("/");
+  const msgIdx = parts.indexOf("message");
+  if (msgIdx >= 0 && parts[msgIdx + 1])
+    return parts[msgIdx + 1];
+  const sessionIdx = parts.indexOf("session");
+  if (sessionIdx >= 0 && parts[parts.length - 1]?.endsWith(".json")) {
+    return parts[parts.length - 1].replace(/\.json$/, "");
+  }
+  return null;
+}
+async function ingestOpenCode(db, verbose = false) {
+  const messageDir = join5(OPENCODE_STORAGE, "message");
+  const files = walkJsonFiles(messageDir);
+  let requests = 0;
+  const touched = new Set;
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  for (const file of files) {
+    const mtime = statSync4(file).mtimeMs;
+    const stateKey = file;
+    const prev = getIngestState(db, "opencode", stateKey);
+    if (prev && Number(prev) >= mtime)
+      continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(readFileSync5(file, "utf-8"));
+    } catch {
+      continue;
+    }
+    if (parsed.role !== "assistant")
+      continue;
+    const usage = parsed.usage;
+    if (!usage)
+      continue;
+    const sessionId = parseSessionIdFromPath(file) ?? `opencode-${statSync4(file).ino}`;
+    const model = normalizeModelName(parsed.model ?? "unknown");
+    const input = usage.inputTokens ?? 0;
+    const output = usage.outputTokens ?? 0;
+    const cacheRead = usage.cacheReadTokens ?? 0;
+    const cacheWrite = usage.cacheWriteTokens ?? 0;
+    if (input + output + cacheRead + cacheWrite === 0 && !usage.cost)
+      continue;
+    const timestamp = usage && parsed.time?.created ? new Date(parsed.time.created).toISOString() : new Date(statSync4(file).mtime).toISOString();
+    const sourceId = file.replace(OPENCODE_STORAGE, "");
+    const reqId = `opencode-${sourceId}`;
+    const costUsd = usage.cost ?? computeCostFromDb(db, model, input, output, cacheRead, cacheWrite, 0);
+    upsertRequest(db, {
+      id: reqId,
+      agent: "opencode",
+      session_id: sessionId,
+      model,
+      input_tokens: input,
+      output_tokens: output,
+      cache_read_tokens: cacheRead,
+      cache_create_tokens: cacheWrite,
+      cost_usd: costUsd,
+      cost_basis: defaultCostBasisForAgent("opencode"),
+      duration_ms: 0,
+      timestamp,
+      source_request_id: sourceId,
+      machine_id: machineId,
+      updated_at: now
+    });
+    requests++;
+    if (!touched.has(sessionId)) {
+      upsertSession(db, {
+        id: sessionId,
+        agent: "opencode",
+        project_path: "",
+        project_name: "",
+        started_at: timestamp,
+        ended_at: null,
+        total_cost_usd: 0,
+        total_tokens: 0,
+        request_count: 0,
+        machine_id: machineId,
+        updated_at: now
+      });
+      touched.add(sessionId);
+    }
+    setIngestState(db, "opencode", stateKey, String(mtime));
+    if (verbose)
+      console.log(`  opencode: ${reqId} ${model} $${costUsd.toFixed(4)}`);
+  }
+  for (const sid of touched)
+    rollupSession(db, sid);
+  return { files: files.length, requests, sessions: touched.size };
+}
+
+// src/ingest/cursor.ts
+init_database();
+function getCursorSessionToken() {
+  return process.env["CURSOR_SESSION_TOKEN"] ?? process.env["CURSOR_API_TOKEN"] ?? null;
+}
+async function cursorFetch(path, token) {
+  try {
+    const res = await fetch(`https://cursor.com${path}`, {
+      headers: {
+        Cookie: `WorkosCursorSessionToken=${token}`,
+        Accept: "application/json"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok)
+      return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+async function ingestCursor(db, verbose = false) {
+  const token = getCursorSessionToken();
+  if (!token) {
+    if (verbose)
+      console.log("  cursor: skipped \u2014 set CURSOR_SESSION_TOKEN");
+    return { requests: 0, snapshots: 0 };
+  }
+  const today = new Date().toISOString().substring(0, 10);
+  const prev = getIngestState(db, "cursor", `sync-${today}`);
+  if (prev)
+    return { requests: 0, snapshots: 0 };
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  let snapshots = 0;
+  const usage = await cursorFetch("/api/usage", token);
+  if (usage?.premiumRequests != null && usage.maxPremiumRequests) {
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "premium_requests_used",
+      value: usage.premiumRequests,
+      unit: "count",
+      machine_id: machineId
+    });
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "premium_requests_limit",
+      value: usage.maxPremiumRequests,
+      unit: "count",
+      machine_id: machineId
+    });
+    snapshots += 2;
+  }
+  const summary = await cursorFetch("/api/usage-summary", token);
+  const onDemand = summary?.individualUsage?.spend ?? summary?.teamUsage?.spend ?? 0;
+  const included = summary?.individualUsage?.includedSpend ?? 0;
+  if (onDemand > 0) {
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "on_demand_usd",
+      value: onDemand,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  if (included > 0) {
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "included_consumed_usd",
+      value: included,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  const sessionId = `cursor-${today}-${machineId}`;
+  if (onDemand + included > 0) {
+    upsertSession(db, {
+      id: sessionId,
+      agent: "cursor",
+      project_path: "",
+      project_name: "Cursor subscription",
+      started_at: `${today}T00:00:00.000Z`,
+      ended_at: now,
+      total_cost_usd: onDemand + included,
+      total_tokens: 0,
+      request_count: 1,
+      machine_id: machineId,
+      updated_at: now
+    });
+    upsertRequest(db, {
+      id: `cursor-${today}-${machineId}-usage`,
+      agent: "cursor",
+      session_id: sessionId,
+      model: "cursor-subscription",
+      input_tokens: 0,
+      output_tokens: 0,
+      cache_read_tokens: 0,
+      cache_create_tokens: 0,
+      cost_usd: onDemand + included,
+      cost_basis: "subscription_included",
+      duration_ms: 0,
+      timestamp: now,
+      source_request_id: today,
+      machine_id: machineId,
+      updated_at: now
+    });
+    rollupSession(db, sessionId);
+  }
+  setIngestState(db, "cursor", `sync-${today}`, now);
+  if (verbose)
+    console.log(`  cursor: on-demand $${onDemand.toFixed(2)}, included $${included.toFixed(2)}`);
+  return { requests: onDemand + included > 0 ? 1 : 0, snapshots };
+}
+
+// src/ingest/pi.ts
+init_database();
+import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync5, statSync as statSync5 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join6 } from "path";
+var PI_SESSION_DIR = process.env["PI_CODING_AGENT_SESSION_DIR"] ?? join6(homedir6(), ".pi", "agent", "sessions");
+function walkSessions(dir, acc = []) {
+  if (!existsSync6(dir))
+    return acc;
+  for (const entry of readdirSync5(dir, { withFileTypes: true })) {
+    const p = join6(dir, entry.name);
+    if (entry.isDirectory())
+      walkSessions(p, acc);
+    else if (entry.name.endsWith(".json"))
+      acc.push(p);
+  }
+  return acc;
+}
+async function ingestPi(db, verbose = false) {
+  const files = walkSessions(PI_SESSION_DIR);
+  let requests = 0;
+  const touched = new Set;
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  for (const file of files) {
+    const mtime = statSync5(file).mtimeMs;
+    const prev = getIngestState(db, "pi", file);
+    if (prev && Number(prev) >= mtime)
+      continue;
+    let data;
+    try {
+      data = JSON.parse(readFileSync6(file, "utf-8"));
+    } catch {
+      continue;
+    }
+    const sessionId = data.id ?? file.replace(/\.json$/, "").split("/").pop() ?? `pi-${statSync5(file).ino}`;
+    const turns = data.turns ?? data.messages?.filter((m) => m.role === "assistant") ?? [];
+    for (let i = 0;i < turns.length; i++) {
+      const turn = turns[i];
+      const usage = turn.usage;
+      if (!usage)
+        continue;
+      const input = usage.input ?? 0;
+      const output = usage.output ?? 0;
+      if (input + output === 0 && !usage.cost)
+        continue;
+      const model = turn.model ?? turn.provider ?? "unknown";
+      const timestamp = turn.timestamp ?? new Date(statSync5(file).mtime).toISOString();
+      const reqId = `pi-${sessionId}-${i}`;
+      upsertRequest(db, {
+        id: reqId,
+        agent: "pi",
+        session_id: sessionId,
+        model,
+        input_tokens: input,
+        output_tokens: output,
+        cache_read_tokens: usage.cacheRead ?? 0,
+        cache_create_tokens: usage.cacheWrite ?? 0,
+        cost_usd: usage.cost ?? 0,
+        cost_basis: defaultCostBasisForAgent("pi"),
+        duration_ms: 0,
+        timestamp,
+        source_request_id: `${sessionId}-${i}`,
+        machine_id: machineId,
+        updated_at: now
+      });
+      requests++;
+    }
+    if (turns.length > 0) {
+      upsertSession(db, {
+        id: sessionId,
+        agent: "pi",
+        project_path: "",
+        project_name: "",
+        started_at: turns[0]?.timestamp ?? now,
+        ended_at: null,
+        total_cost_usd: 0,
+        total_tokens: 0,
+        request_count: 0,
+        machine_id: machineId,
+        updated_at: now
+      });
+      touched.add(sessionId);
+    }
+    setIngestState(db, "pi", file, String(mtime));
+    if (verbose)
+      console.log(`  pi: ${sessionId} (${turns.length} turns)`);
+  }
+  for (const sid of touched)
+    rollupSession(db, sid);
+  return { files: files.length, requests, sessions: touched.size };
+}
+
+// src/ingest/hermes.ts
+init_database();
+import { existsSync as existsSync7, statSync as statSync6 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join7 } from "path";
+var HERMES_DB = join7(homedir7(), ".hermes", "state.db");
+function mapCostBasis(billingMode) {
+  if (billingMode === "subscription")
+    return "subscription_included";
+  if (billingMode === "api")
+    return "metered_api";
+  return defaultCostBasisForAgent("hermes");
+}
+async function ingestHermes(db, verbose = false) {
+  if (!existsSync7(HERMES_DB)) {
+    return { sessions: 0, requests: 0 };
+  }
+  const { Database: Sqlite } = await import("bun:sqlite");
+  const hermes = new Sqlite(HERMES_DB, { readonly: true });
+  const rows = hermes.prepare(`
+    SELECT id, source, model, started_at, ended_at,
+           input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
+           reasoning_tokens, estimated_cost_usd, actual_cost_usd, billing_mode, parent_session_id
+    FROM sessions
+    ORDER BY started_at DESC
+  `).all();
+  const stateKey = "state.db";
+  const mtime = statSyncSafe(HERMES_DB);
+  const prev = getIngestState(db, "hermes", stateKey);
+  if (prev && Number(prev) >= mtime && rows.length === 0) {
+    hermes.close();
+    return { sessions: 0, requests: 0 };
+  }
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  let requests = 0;
+  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, {
+      id: sessionId,
+      agent: "hermes",
+      project_path: row.source ?? "",
+      project_name: row.source ?? "",
+      started_at: startedAt,
+      ended_at: endedAt,
+      total_cost_usd: cost,
+      total_tokens: tokens,
+      request_count: 1,
+      machine_id: machineId,
+      updated_at: now
+    });
+    const reqId = `hermes-${row.id}-rollup`;
+    upsertRequest(db, {
+      id: reqId,
+      agent: "hermes",
+      session_id: sessionId,
+      model: row.model ?? "unknown",
+      input_tokens: row.input_tokens,
+      output_tokens: row.output_tokens + row.reasoning_tokens,
+      cache_read_tokens: row.cache_read_tokens,
+      cache_create_tokens: row.cache_write_tokens,
+      cost_usd: cost,
+      cost_basis: mapCostBasis(row.billing_mode),
+      duration_ms: 0,
+      timestamp: endedAt ?? startedAt,
+      source_request_id: row.id,
+      machine_id: machineId,
+      updated_at: now
+    });
+    requests++;
+    rollupSession(db, sessionId);
+    if (verbose)
+      console.log(`  hermes: ${sessionId} $${cost.toFixed(4)}`);
+  }
+  setIngestState(db, "hermes", stateKey, String(mtime));
+  hermes.close();
+  return { sessions: rows.length, requests };
+}
+function statSyncSafe(path) {
+  try {
+    return statSync6(path).mtimeMs;
+  } catch {
+    return 0;
+  }
+}
+
+// src/ingest/claude-quota.ts
+init_database();
+import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
+
+// src/lib/paths.ts
+import { homedir as homedir8 } from "os";
+import { join as join8 } from "path";
+function getHomeDir() {
+  return process.env["USERPROFILE"] ?? process.env["HOME"] ?? homedir8();
+}
+function agentPaths() {
+  const home = getHomeDir();
+  return {
+    claudeProjects: join8(home, ".claude", "projects"),
+    claudeCredentials: join8(home, ".claude", ".credentials.json"),
+    takumiProjects: join8(home, ".takumi", "projects"),
+    codexDir: join8(home, ".codex"),
+    codexDb: join8(home, ".codex", "state_5.sqlite"),
+    codexAuth: join8(home, ".codex", "auth.json"),
+    codexConfig: join8(home, ".codex", "config.toml"),
+    geminiTmp: join8(home, ".gemini", "tmp"),
+    geminiHistory: join8(home, ".gemini", "history"),
+    opencodeMessages: join8(home, ".local", "share", "opencode", "storage", "message"),
+    piSessions: join8(home, ".pi", "agent", "sessions"),
+    hermesDir: join8(home, ".hermes"),
+    hermesDb: join8(home, ".hermes", "state.db")
+  };
+}
+
+// src/ingest/claude-quota.ts
+var CREDENTIALS_PATH = agentPaths().claudeCredentials;
+var USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
+var OAUTH_BETA = "oauth-2025-04-20";
+function readClaudeToken() {
+  const fromEnv = process.env["CLAUDE_OAUTH_TOKEN"] ?? process.env["ANTHROPIC_OAUTH_TOKEN"];
+  if (fromEnv)
+    return { token: fromEnv };
+  if (!existsSync8(CREDENTIALS_PATH))
+    return null;
+  try {
+    const creds = JSON.parse(readFileSync8(CREDENTIALS_PATH, "utf-8"));
+    const oauth = creds.claudeAiOauth;
+    if (!oauth?.accessToken)
+      return null;
+    return {
+      token: oauth.accessToken,
+      subscriptionType: oauth.subscriptionType,
+      rateLimitTier: oauth.rateLimitTier
+    };
+  } catch {
+    return null;
+  }
+}
+function inferMonthlyFee(subscriptionType, rateLimitTier) {
+  const tier = `${subscriptionType ?? ""} ${rateLimitTier ?? ""}`.toLowerCase();
+  if (tier.includes("max") && tier.includes("20"))
+    return 200;
+  if (tier.includes("max"))
+    return 100;
+  if (tier.includes("pro"))
+    return 20;
+  if (tier.includes("team"))
+    return 30;
+  return 20;
+}
+async function fetchClaudeOAuthUsage(token) {
+  try {
+    const res = await fetch(USAGE_URL, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "anthropic-beta": OAUTH_BETA,
+        Accept: "application/json"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok)
+      return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+async function ingestClaudeQuota(db, verbose = false) {
+  const auth = readClaudeToken();
+  if (!auth) {
+    if (verbose)
+      console.log("  claude quota: skipped \u2014 no OAuth token (~/.claude/.credentials.json or CLAUDE_OAUTH_TOKEN)");
+    return { snapshots: 0 };
+  }
+  const today = new Date().toISOString().substring(0, 10);
+  const prev = getIngestState(db, "claude", `quota-${today}`);
+  if (prev)
+    return { snapshots: 0 };
+  const usage = await fetchClaudeOAuthUsage(auth.token);
+  if (!usage) {
+    if (verbose)
+      console.log("  claude quota: OAuth usage endpoint unavailable");
+    return { snapshots: 0 };
+  }
+  const machineId = getMachineId();
+  let snapshots = 0;
+  const windows = [
+    ["five_hour_utilization", usage.five_hour],
+    ["seven_day_utilization", usage.seven_day],
+    ["seven_day_sonnet_utilization", usage.seven_day_sonnet],
+    ["seven_day_opus_utilization", usage.seven_day_opus]
+  ];
+  for (const [metric, window] of windows) {
+    if (window?.utilization == null)
+      continue;
+    upsertUsageSnapshot(db, {
+      agent: "claude",
+      date: today,
+      metric,
+      value: Math.round(window.utilization * 1000) / 10,
+      unit: "percent",
+      machine_id: machineId
+    });
+    snapshots++;
+    if (window.resets_at) {
+      upsertUsageSnapshot(db, {
+        agent: "claude",
+        date: today,
+        metric: `${metric}_resets_at`,
+        value: Date.parse(window.resets_at),
+        unit: "epoch_ms",
+        machine_id: machineId
+      });
+      snapshots++;
+    }
+  }
+  if (usage.extra_usage?.spend != null) {
+    upsertUsageSnapshot(db, {
+      agent: "claude",
+      date: today,
+      metric: "on_demand_usd",
+      value: usage.extra_usage.spend,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  if (usage.extra_usage?.limit != null) {
+    upsertUsageSnapshot(db, {
+      agent: "claude",
+      date: today,
+      metric: "on_demand_limit_usd",
+      value: usage.extra_usage.limit,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  const monthlyFee = inferMonthlyFee(auth.subscriptionType, auth.rateLimitTier);
+  const now = new Date().toISOString();
+  upsertSubscription(db, {
+    id: "anthropic-claude-oauth",
+    provider: "anthropic",
+    agent: "claude",
+    plan: auth.rateLimitTier ?? auth.subscriptionType ?? "claude_pro",
+    monthly_fee_usd: monthlyFee,
+    included_usage_usd: monthlyFee,
+    billing_cycle_start: null,
+    reset_policy: "monthly",
+    active: 1,
+    created_at: now,
+    updated_at: now
+  });
+  setIngestState(db, "claude", `quota-${today}`, new Date().toISOString());
+  if (verbose)
+    console.log(`  claude quota: ${snapshots} snapshots`);
+  return { snapshots };
+}
+
+// src/ingest/codex-quota.ts
+init_database();
+import { existsSync as existsSync9, readFileSync as readFileSync9 } 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"];
+  if (fromEnv)
+    return { token: fromEnv, authMode: "chatgpt" };
+  const authPath = agentPaths().codexAuth;
+  if (!existsSync9(authPath))
+    return null;
+  try {
+    const auth = JSON.parse(readFileSync9(authPath, "utf-8"));
+    const token = auth.tokens?.access_token;
+    if (!token)
+      return null;
+    return {
+      token,
+      accountId: auth.tokens?.account_id,
+      authMode: auth.auth_mode ?? "chatgpt"
+    };
+  } catch {
+    return null;
+  }
+}
+function planMonthlyFee(planType) {
+  const plan = (planType ?? "").toLowerCase();
+  if (plan.includes("pro"))
+    return 200;
+  if (plan.includes("plus"))
+    return 20;
+  if (plan.includes("team"))
+    return 30;
+  return 20;
+}
+async function fetchCodexUsage(token, accountId) {
+  try {
+    const headers = {
+      Authorization: `Bearer ${token}`,
+      Accept: "application/json",
+      "User-Agent": "economy-cli"
+    };
+    if (accountId)
+      headers["ChatGPT-Account-Id"] = accountId;
+    const res = await fetch(WHAM_USAGE_URL, {
+      headers,
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok)
+      return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+async function ingestCodexQuota(db, verbose = false) {
+  const auth = readCodexAuth();
+  if (!auth) {
+    if (verbose)
+      console.log("  codex quota: skipped \u2014 no ~/.codex/auth.json or CODEX_OAUTH_TOKEN");
+    return { snapshots: 0 };
+  }
+  if (auth.authMode === "api_key" || auth.authMode === "api") {
+    if (verbose)
+      console.log("  codex quota: skipped \u2014 API key mode (no subscription quota)");
+    return { snapshots: 0 };
+  }
+  const today = new Date().toISOString().substring(0, 10);
+  const prev = getIngestState(db, "codex", `quota-${today}`);
+  if (prev)
+    return { snapshots: 0 };
+  const usage = await fetchCodexUsage(auth.token, auth.accountId);
+  if (!usage) {
+    if (verbose)
+      console.log("  codex quota: wham/usage endpoint unavailable");
+    return { snapshots: 0 };
+  }
+  const machineId = getMachineId();
+  let snapshots = 0;
+  const now = new Date().toISOString();
+  const windows = [
+    ["five_hour_utilization", usage.rate_limit?.primary_window],
+    ["seven_day_utilization", usage.rate_limit?.secondary_window]
+  ];
+  for (const [metric, window] of windows) {
+    if (window?.used_percent == null)
+      continue;
+    upsertUsageSnapshot(db, {
+      agent: "codex",
+      date: today,
+      metric,
+      value: window.used_percent,
+      unit: "percent",
+      machine_id: machineId
+    });
+    snapshots++;
+    if (window.reset_at) {
+      upsertUsageSnapshot(db, {
+        agent: "codex",
+        date: today,
+        metric: `${metric}_resets_at`,
+        value: window.reset_at * 1000,
+        unit: "epoch_ms",
+        machine_id: machineId
+      });
+      snapshots++;
+    }
+  }
+  if (usage.credits?.balance != null) {
+    upsertUsageSnapshot(db, {
+      agent: "codex",
+      date: today,
+      metric: "credits_balance_usd",
+      value: usage.credits.balance,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  const monthlyFee = planMonthlyFee(usage.plan_type);
+  upsertSubscription(db, {
+    id: "openai-codex-oauth",
+    provider: "openai",
+    agent: "codex",
+    plan: usage.plan_type ?? "chatgpt_plus",
+    monthly_fee_usd: monthlyFee,
+    included_usage_usd: monthlyFee,
+    billing_cycle_start: null,
+    reset_policy: "monthly",
+    active: 1,
+    created_at: now,
+    updated_at: now
+  });
+  setIngestState(db, "codex", `quota-${today}`, now);
+  if (verbose)
+    console.log(`  codex quota: ${snapshots} snapshots (${usage.plan_type ?? "unknown plan"})`);
+  return { snapshots };
+}
+
+// src/lib/sync-all.ts
+init_database();
+
+// src/lib/cloud-sync.ts
+init_database();
+var CLOUD_TABLES = [
+  "requests",
+  "sessions",
+  "projects",
+  "budgets",
+  "goals",
+  "model_pricing",
+  "billing_daily",
+  "subscriptions",
+  "usage_snapshots",
+  "savings_daily",
+  "machines",
+  "ingest_state"
 ];
-var TOOL_DESCRIPTIONS = {
-  get_cost_summary: "period(today|week|month|year|all) \u2192 {total_usd, sessions, requests, tokens, summary}",
-  get_sessions: "agent(claude|codex), project(partial), limit(20) \u2192 compact session table",
-  get_top_sessions: "n(10), agent(claude|codex) \u2192 top sessions by cost",
-  get_model_breakdown: "no params \u2192 model, requests, tokens, cost",
-  get_project_breakdown: "no params \u2192 project_name, sessions, cost",
-  get_budget_status: "no params \u2192 budget limits, current spend, percent_used, is_over_alert",
-  get_daily: "days(30) \u2192 daily cost table grouped by date and agent",
-  get_session_detail: "session_id(prefix ok) \u2192 per-request breakdown with model, tokens, cost",
-  sync: "sources(all|claude|codex|gemini) \u2192 {files, requests, sessions} ingested",
-  get_goals: "no params \u2192 period, scope, limit, spent, percent, status(ON TRACK/AT RISK/OVER)",
-  set_goal: "period(day|week|month|year), limit_usd, project_path?, agent? \u2192 creates/updates goal",
-  remove_goal: "id \u2192 deletes goal"
-};
-server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: TOOLS }));
-server.setRequestHandler(CallToolRequestSchema, async (req) => {
-  const { name, arguments: args } = req.params;
-  const a = args ?? {};
+function getCloudDatabaseUrl() {
+  return process.env["ECONOMY_CLOUD_DATABASE_URL"] ?? process.env["HASNA_ECONOMY_CLOUD_DATABASE_URL"] ?? null;
+}
+function isCloudAutoEnabled() {
+  return process.env["ECONOMY_CLOUD_AUTO"] === "1" || process.env["ECONOMY_CLOUD_AUTO"] === "true";
+}
+function getCloudPullIntervalMinutes() {
+  const raw = process.env["ECONOMY_CLOUD_PULL_INTERVAL"];
+  if (!raw)
+    return 15;
+  const n = Number(raw);
+  return Number.isFinite(n) && n > 0 ? n : 15;
+}
+async function getCloudPg() {
+  const url = getCloudDatabaseUrl();
+  if (!url) {
+    throw new Error("Missing ECONOMY_CLOUD_DATABASE_URL (or HASNA_ECONOMY_CLOUD_DATABASE_URL)");
+  }
+  const { PgAdapterAsync } = await import("@hasna/cloud");
+  return new PgAdapterAsync(url);
+}
+async function runCloudMigrations(cloud) {
+  const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
+  for (const sql of PG_MIGRATIONS2) {
+    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 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);
+  }
+  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 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);
+  }
+  touchMachineRegistry(local, "pull");
+  local.close();
+  await cloud.close();
+  setLastCloudPull();
+  return { rows, machine: getMachineId() };
+}
+function setLastCloudPull(at = new Date().toISOString()) {
+  const db = openDatabase();
+  db.prepare(`INSERT OR REPLACE INTO ingest_state (source, key, value) VALUES ('cloud', 'last_pull_at', ?)`).run(at);
+}
+function getLastCloudPull() {
+  const db = openDatabase();
+  const row = db.prepare(`SELECT value FROM ingest_state WHERE source = 'cloud' AND key = 'last_pull_at'`).get();
+  return row?.value ?? null;
+}
+function shouldPullFromCloud() {
+  if (!getCloudDatabaseUrl())
+    return false;
+  const last = getLastCloudPull();
+  if (!last)
+    return true;
+  const ageMs = Date.now() - new Date(last).getTime();
+  return ageMs > getCloudPullIntervalMinutes() * 60000;
+}
+async function maybePullFromCloud() {
+  if (!shouldPullFromCloud())
+    return false;
   try {
-    switch (name) {
-      case "search_tools": {
-        const q = a["query"]?.toLowerCase();
-        const names = TOOLS.map((t) => t.name);
-        const matches = q ? names.filter((n) => n.includes(q)) : names;
-        return { content: [{ type: "text", text: matches.join(", ") }] };
-      }
-      case "describe_tools": {
-        const names = a["names"] ?? [];
-        const result = names.map((n) => `${n}: ${TOOL_DESCRIPTIONS[n] ?? "see tool schema"}`).join(`
-`);
-        return { content: [{ type: "text", text: result }] };
-      }
-      case "get_cost_summary": {
-        const period = a["period"] ?? "today";
-        const s = querySummary(db, period);
-        const text = [
-          `period: ${period}`,
-          `cost: ${fmtUsd(s.total_usd)}`,
-          `sessions: ${s.sessions}`,
-          `requests: ${s.requests.toLocaleString()}`,
-          `tokens: ${fmtTok(s.tokens)}`,
-          `summary: You've spent ${fmtUsd(s.total_usd)} ${period === "all" ? "total" : period} across ${s.sessions} sessions (${s.requests.toLocaleString()} requests, ${fmtTok(s.tokens)} tokens)`
-        ].join(`
+    await cloudPull();
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function maybePushAfterIngest() {
+  if (!isCloudAutoEnabled() || !getCloudDatabaseUrl())
+    return false;
+  try {
+    await cloudPush();
+    return true;
+  } catch {
+    return false;
+  }
+}
+function touchMachineRegistry(db, direction) {
+  const now = new Date().toISOString();
+  const machine = getMachineId();
+  db.prepare(`
+    INSERT INTO machines (machine_id, hostname, last_seen_at, last_push_at, last_pull_at, economy_version, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(machine_id) DO UPDATE SET
+      hostname = excluded.hostname,
+      last_seen_at = excluded.last_seen_at,
+      last_push_at = CASE WHEN ? = 'push' THEN excluded.last_push_at ELSE machines.last_push_at END,
+      last_pull_at = CASE WHEN ? = 'pull' THEN excluded.last_pull_at ELSE machines.last_pull_at END,
+      economy_version = excluded.economy_version,
+      updated_at = excluded.updated_at
+  `).run(machine, machine, now, direction === "push" ? now : null, direction === "pull" ? now : null, packageMetadata.version, now, direction, direction);
+}
+
+// src/lib/sync-all.ts
+async function syncAll(db, opts = {}) {
+  const anySpecific = Boolean(opts.claude || opts.takumi || opts.codex || opts.gemini || opts.opencode || opts.cursor || opts.pi || opts.hermes);
+  const all = !anySpecific;
+  await maybePullFromCloud();
+  const result = { deduped: 0, cloudPulled: false, cloudPushed: false };
+  if (all || opts.claude) {
+    result.claude = await ingestClaude(db, opts.verbose);
+    result.claudeQuota = await ingestClaudeQuota(db, opts.verbose);
+  }
+  if (all || opts.takumi)
+    result.takumi = await ingestTakumi(db, opts.verbose);
+  if (all || opts.codex) {
+    result.codex = await ingestCodex(db, opts.verbose);
+    result.codexQuota = await ingestCodexQuota(db, opts.verbose);
+  }
+  if (all || opts.gemini)
+    result.gemini = await ingestGemini(db, opts.verbose);
+  if (all || opts.opencode)
+    result.opencode = await ingestOpenCode(db, opts.verbose);
+  if (all || opts.cursor)
+    result.cursor = await ingestCursor(db, opts.verbose);
+  if (all || opts.pi)
+    result.pi = await ingestPi(db, opts.verbose);
+  if (all || opts.hermes)
+    result.hermes = await ingestHermes(db, opts.verbose);
+  result.deduped = dedupeRequests(db);
+  result.cloudPushed = await maybePushAfterIngest();
+  return result;
+}
+
+// src/lib/agents.ts
+var AGENTS = [
+  "claude",
+  "takumi",
+  "codex",
+  "gemini",
+  "opencode",
+  "cursor",
+  "pi",
+  "hermes"
+];
+
+// src/mcp/server.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(`
 `);
-        return { content: [{ type: "text", text }] };
-      }
-      case "get_sessions": {
-        const sessions = querySessions(db, {
-          agent: a["agent"],
-          project: a["project"],
-          limit: Number(a["limit"] ?? 20)
-        });
-        const lines = ["id       agent  cost       tokens   project"];
-        for (const s of sessions)
-          lines.push(fmtSession(s));
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "get_top_sessions": {
-        const sessions = queryTopSessions(db, Number(a["n"] ?? 10), a["agent"]);
-        const lines = ["rank  id       agent  cost       tokens   project"];
-        sessions.forEach((s, i) => lines.push(`${String(i + 1).padEnd(5)} ${fmtSession(s)}`));
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "get_model_breakdown": {
-        const rows = queryModelBreakdown(db);
-        const lines = ["model                          reqs    tokens   cost"];
-        for (const r of rows) {
-          lines.push(`${String(r["model"]).slice(0, 30).padEnd(31)}${String(r["requests"]).padEnd(8)}${fmtTok(Number(r["total_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
-        }
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "get_project_breakdown": {
-        const rows = queryProjectBreakdown(db);
-        const lines = ["project              sessions tokens   cost"];
-        for (const r of rows) {
-          const name2 = String(r["project_name"] || r["project_path"] || "\u2014").slice(0, 20);
-          lines.push(`${name2.padEnd(21)}${String(r["sessions"]).padEnd(9)}${fmtTok(Number(r["total_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
-        }
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "get_budget_status": {
-        const budgets = getBudgetStatuses(db);
-        if (budgets.length === 0)
-          return { content: [{ type: "text", text: "No budgets set." }] };
-        const lines = ["scope                period   spent      limit      used%  status"];
-        for (const b of budgets) {
-          const scope = String(b["project_path"] ?? "global").slice(0, 20);
-          const pct = Number(b["percent_used"]).toFixed(1);
-          const status = b["is_over_limit"] ? "OVER" : b["is_over_alert"] ? "ALERT" : "OK";
-          lines.push(`${scope.padEnd(21)}${String(b["period"]).padEnd(9)}${fmtUsd(Number(b["current_spend_usd"])).padEnd(11)}${fmtUsd(Number(b["limit_usd"])).padEnd(11)}${pct}%`.padEnd(49) + `  ${status}`);
-        }
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "get_daily": {
-        const days = Number(a["days"] ?? 30);
-        const rows = queryDailyBreakdown(db, days);
-        const lines = ["date        claude     codex      gemini     total"];
-        const byDate = new Map;
-        for (const r of rows) {
-          const d = String(r["date"]);
-          const entry = byDate.get(d) ?? { claude: 0, codex: 0, gemini: 0 };
-          if (r["agent"] === "claude")
-            entry.claude += Number(r["cost_usd"]);
-          else if (r["agent"] === "codex")
-            entry.codex += Number(r["cost_usd"]);
-          else if (r["agent"] === "gemini")
-            entry.gemini += Number(r["cost_usd"]);
-          byDate.set(d, entry);
-        }
-        for (const [date, costs] of [...byDate.entries()].sort()) {
-          const total = costs.claude + costs.codex + costs.gemini;
-          lines.push(`${date}  ${fmtUsd(costs.claude).padEnd(11)}${fmtUsd(costs.codex).padEnd(11)}${fmtUsd(costs.gemini).padEnd(11)}${fmtUsd(total)}`);
-        }
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "get_session_detail": {
-        const sid = String(a["session_id"] ?? "");
-        const session = db.prepare(`SELECT * FROM sessions WHERE id = ? OR id LIKE ?`).get(sid, `${sid}%`);
-        if (!session)
-          return { content: [{ type: "text", text: `Session not found: ${sid}` }], isError: true };
-        const requests = db.prepare(`SELECT * FROM requests WHERE session_id = ? ORDER BY timestamp ASC LIMIT 50`).all(session["id"]);
-        const lines = [
-          `session: ${String(session["id"]).slice(0, 16)}`,
-          `agent: ${session["agent"]}  project: ${session["project_name"] || "\u2014"}`,
-          `cost: ${fmtUsd(Number(session["total_cost_usd"]))}  tokens: ${fmtTok(Number(session["total_tokens"]))}  requests: ${session["request_count"]}`,
-          "",
-          "time      model                  input    output   cost"
-        ];
-        for (const r of requests) {
-          lines.push(`${String(r["timestamp"]).slice(11, 19)}  ${String(r["model"]).slice(0, 22).padEnd(23)}${fmtTok(Number(r["input_tokens"])).padEnd(9)}${fmtTok(Number(r["output_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
-        }
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "sync": {
-        const sources = a["sources"] ?? "all";
-        const parts = [];
-        if (sources === "all" || sources === "claude") {
-          const r = await ingestClaude(db);
-          parts.push(`claude: ${r["files"]} files, ${r["requests"]} requests, ${r["sessions"]} sessions`);
-        }
-        if (sources === "all" || sources === "codex") {
-          const r = await ingestCodex(db);
-          parts.push(`codex: ${r["sessions"]} sessions`);
-        }
-        if (sources === "all" || sources === "gemini") {
-          const r = await ingestGemini(db);
-          parts.push(`gemini: ${r["sessions"]} sessions`);
-        }
-        return { content: [{ type: "text", text: parts.join(`
-`) || "done" }] };
-      }
-      case "get_goals": {
-        const goals = getGoalStatuses(db);
-        if (goals.length === 0)
-          return { content: [{ type: "text", text: "No goals set." }] };
-        const lines = ["period   scope                limit      spent      used%  status"];
-        for (const g of goals) {
-          const scope = String(g["project_path"] ?? g["agent"] ?? "global").slice(0, 20);
-          const pct = Number(g["percent_used"]).toFixed(1);
-          const status = g["is_over"] ? "OVER" : g["is_at_risk"] ? "AT RISK" : "ON TRACK";
-          lines.push(`${String(g["period"]).padEnd(9)}${scope.padEnd(21)}${fmtUsd(Number(g["limit_usd"])).padEnd(11)}${fmtUsd(Number(g["current_spend_usd"])).padEnd(11)}${pct}%  ${status}`);
-        }
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      }
-      case "set_goal": {
-        const { randomUUID } = await import("crypto");
-        const now = new Date().toISOString();
-        upsertGoal(db, {
-          id: randomUUID(),
-          period: String(a["period"] ?? "month"),
-          project_path: a["project_path"] ?? null,
-          agent: a["agent"] ?? null,
-          limit_usd: Number(a["limit_usd"]),
-          created_at: now,
-          updated_at: now
-        });
-        return { content: [{ type: "text", text: `Goal set: ${a["period"]} $${a["limit_usd"]}` }] };
-      }
-      case "remove_goal": {
-        deleteGoal(db, String(a["id"] ?? ""));
-        return { content: [{ type: "text", text: "Goal removed." }] };
-      }
-      case "register_agent": {
-        const n = String(args["name"] ?? "");
-        const ex = [..._econAgents.values()].find((x) => x.name === n);
-        if (ex) {
-          ex.last_seen_at = new Date().toISOString();
-          return { content: [{ type: "text", text: JSON.stringify(ex) }] };
-        }
-        const id = Math.random().toString(36).slice(2, 10);
-        const ag = { id, name: n, last_seen_at: new Date().toISOString() };
-        _econAgents.set(id, ag);
-        return { content: [{ type: "text", text: JSON.stringify(ag) }] };
-      }
-      case "heartbeat": {
-        const ag = _econAgents.get(String(args["agent_id"] ?? ""));
-        if (!ag)
-          return { content: [{ type: "text", text: `Agent not found` }], isError: true };
-        ag.last_seen_at = new Date().toISOString();
-        return { content: [{ type: "text", text: `\u2665 ${ag.name}` }] };
-      }
-      case "set_focus": {
-        const ag = _econAgents.get(String(args["agent_id"] ?? ""));
-        if (!ag)
-          return { content: [{ type: "text", text: `Agent not found` }], isError: true };
-        ag["project_id"] = args["project_id"];
-        return { content: [{ type: "text", text: String(args["project_id"] ? `Focus: ${args["project_id"]}` : "Focus cleared") }] };
-      }
-      case "list_agents": {
-        return { content: [{ type: "text", text: JSON.stringify([..._econAgents.values()]) }] };
-      }
-      case "send_feedback": {
-        try {
-          const pkg = require_package();
-          db.prepare("INSERT INTO feedback (message, email, category, version) VALUES (?, ?, ?, ?)").run(String(a["message"]), a["email"] || null, a["category"] || "general", pkg.version);
-          return { content: [{ type: "text", text: "Feedback saved. Thank you!" }] };
-        } catch (e) {
-          return { content: [{ type: "text", text: String(e) }], isError: true };
-        }
-      }
-      default:
-        return { content: [{ type: "text", text: `Unknown tool: ${name}` }], isError: true };
+    return text(result);
+  });
+  server.tool("get_cost_summary", "Cost summary (total_usd, sessions, requests, tokens, human summary). period: today|week|month|year|all. machine: filter by hostname.", { period: z.enum(["today", "week", "month", "year", "all"]).optional(), machine: z.string().optional() }, async ({ period, machine }) => {
+    const resolved = period ?? "today";
+    const s = querySummary(db, resolved, machine);
+    const machineLabel = machine ? ` on ${machine}` : "";
+    return text([
+      `period: ${resolved}${machineLabel}`,
+      `cost: ${fmtUsd(s.total_usd)}`,
+      `sessions: ${s.sessions}`,
+      `requests: ${s.requests.toLocaleString()}`,
+      `tokens: ${fmtTok(s.tokens)}`,
+      `summary: You've spent ${fmtUsd(s.total_usd)} ${resolved === "all" ? "total" : resolved}${machineLabel} across ${s.sessions} sessions (${s.requests.toLocaleString()} requests, ${fmtTok(s.tokens)} tokens)`
+    ].join(`
+`));
+  });
+  server.tool("get_sessions", "List sessions. Returns compact table. Params: agent, project, machine, limit(20)", {
+    agent: z.enum(["claude", "takumi", "codex", "gemini"]).optional(),
+    project: z.string().optional(),
+    machine: z.string().optional(),
+    limit: z.number().int().positive().max(100).optional()
+  }, async ({ agent, project, machine, limit }) => {
+    const sessions = querySessions(db, {
+      agent,
+      project,
+      machine,
+      limit: limit ?? 20
+    });
+    const lines = ["id       agent  cost       tokens   project"];
+    for (const session of sessions)
+      lines.push(fmtSession(session));
+    return text(lines.join(`
+`));
+  });
+  server.tool("get_top_sessions", "Top sessions by cost. Params: n(10), agent", {
+    n: z.number().int().positive().max(100).optional(),
+    agent: z.enum(["claude", "takumi", "codex", "gemini"]).optional()
+  }, async ({ n, agent }) => {
+    const sessions = queryTopSessions(db, n ?? 10, agent);
+    const lines = ["rank  id       agent  cost       tokens   project"];
+    sessions.forEach((session, i) => lines.push(`${String(i + 1).padEnd(5)} ${fmtSession(session)}`));
+    return text(lines.join(`
+`));
+  });
+  server.tool("get_model_breakdown", "Cost per model. No params.", {}, async () => {
+    const rows = queryModelBreakdown(db);
+    const lines = ["model                          reqs    tokens   cost"];
+    for (const row of rows) {
+      lines.push(`${String(row["model"]).slice(0, 30).padEnd(31)}${String(row["requests"]).padEnd(8)}${fmtTok(Number(row["total_tokens"])).padEnd(9)}${fmtUsd(Number(row["cost_usd"]))}`);
+    }
+    return text(lines.join(`
+`));
+  });
+  server.tool("get_project_breakdown", "Cost per project. No params.", {}, async () => {
+    const rows = queryProjectBreakdown(db);
+    const lines = ["project              sessions tokens   cost"];
+    for (const row of rows) {
+      const name = String(row["project_name"] || row["project_path"] || "\u2014").slice(0, 20);
+      lines.push(`${name.padEnd(21)}${String(row["sessions"]).padEnd(9)}${fmtTok(Number(row["total_tokens"])).padEnd(9)}${fmtUsd(Number(row["cost_usd"]))}`);
+    }
+    return text(lines.join(`
+`));
+  });
+  server.tool("get_budget_status", "Budget limits vs spend, percent used, alert flags. No params.", {}, async () => {
+    const budgets = getBudgetStatuses(db);
+    if (budgets.length === 0)
+      return text("No budgets set.");
+    const lines = ["scope                period   spent      limit      used%  status"];
+    for (const budget of budgets) {
+      const scope = String(budget["project_path"] ?? "global").slice(0, 20);
+      const pct = Number(budget["percent_used"]).toFixed(1);
+      const status = budget["is_over_limit"] ? "OVER" : budget["is_over_alert"] ? "ALERT" : "OK";
+      lines.push(`${scope.padEnd(21)}${String(budget["period"]).padEnd(9)}${fmtUsd(Number(budget["current_spend_usd"])).padEnd(11)}${fmtUsd(Number(budget["limit_usd"])).padEnd(11)}${pct}%`.padEnd(49) + `  ${status}`);
+    }
+    return text(lines.join(`
+`));
+  });
+  server.tool("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("set_pricing", "Create or update a model pricing row. Values are USD per 1M tokens except cache_storage_per_1m_hour.", {
+    model: z.string().min(1),
+    input_per_1m: z.number().nonnegative(),
+    output_per_1m: z.number().nonnegative(),
+    cache_read_per_1m: z.number().nonnegative().optional(),
+    cache_write_per_1m: z.number().nonnegative().optional(),
+    cache_write_1h_per_1m: z.number().nonnegative().optional(),
+    cache_storage_per_1m_hour: z.number().nonnegative().optional()
+  }, async (input) => {
+    const model = input.model.trim();
+    if (!model)
+      return textError("model is required");
+    upsertModelPricing(db, {
+      model,
+      input_per_1m: input.input_per_1m,
+      output_per_1m: input.output_per_1m,
+      cache_read_per_1m: input.cache_read_per_1m ?? 0,
+      cache_write_per_1m: input.cache_write_per_1m ?? 0,
+      cache_write_1h_per_1m: input.cache_write_1h_per_1m ?? 0,
+      cache_storage_per_1m_hour: input.cache_storage_per_1m_hour ?? 0,
+      updated_at: new Date().toISOString()
+    });
+    return text(`Pricing set: ${model}`);
+  });
+  server.tool("remove_pricing", "Delete a model pricing row by model id.", { model: z.string() }, async ({ model }) => {
+    deleteModelPricing(db, model);
+    return text("Pricing removed.");
+  });
+  server.tool("get_daily", "Daily cost table by agent. Params: days(30)", { days: z.number().int().positive().max(365).optional() }, async ({ days }) => {
+    const rows = queryDailyBreakdown(db, days ?? 30);
+    const byDate = new Map;
+    for (const row of rows) {
+      const date = String(row["date"]);
+      const entry = byDate.get(date) ?? { claude: 0, takumi: 0, codex: 0, gemini: 0 };
+      if (row["agent"] === "claude")
+        entry.claude += Number(row["cost_usd"]);
+      else if (row["agent"] === "takumi")
+        entry.takumi += Number(row["cost_usd"]);
+      else if (row["agent"] === "codex")
+        entry.codex += Number(row["cost_usd"]);
+      else if (row["agent"] === "gemini")
+        entry.gemini += Number(row["cost_usd"]);
+      byDate.set(date, entry);
+    }
+    const lines = ["date        claude     takumi     codex      gemini     total"];
+    for (const [date, costs] of [...byDate.entries()].sort()) {
+      const total = costs.claude + costs.takumi + costs.codex + costs.gemini;
+      lines.push(`${date}  ${fmtUsd(costs.claude).padEnd(11)}${fmtUsd(costs.takumi).padEnd(11)}${fmtUsd(costs.codex).padEnd(11)}${fmtUsd(costs.gemini).padEnd(11)}${fmtUsd(total)}`);
+    }
+    return text(lines.join(`
+`));
+  });
+  server.tool("get_billing_summary", "Actual provider billing totals from admin API sync. Params: period(today|yesterday|week|month|year|all)", { period: z.enum(["today", "yesterday", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
+    const summary = queryBillingSummary(db, period ?? "month");
+    const lines = ["provider    billed"];
+    for (const [provider, cost] of Object.entries(summary.by_provider)) {
+      lines.push(`${provider.padEnd(11)}${fmtUsd(cost)}`);
+    }
+    lines.push(`total       ${fmtUsd(summary.total_usd)}`);
+    return text(lines.join(`
+`));
+  });
+  server.tool("get_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.string().optional()
+  }, async ({ period, limit_usd, project_path, agent }) => {
+    const now = new Date().toISOString();
+    upsertGoal(db, {
+      id: randomUUID(),
+      period,
+      project_path: project_path ?? null,
+      agent: agent ?? null,
+      limit_usd,
+      created_at: now,
+      updated_at: now
+    });
+    return text(`Goal set: ${period} $${limit_usd}`);
+  });
+  server.tool("remove_goal", "Delete a goal by id.", { id: z.string() }, async ({ id }) => {
+    deleteGoal(db, id);
+    return text("Goal removed.");
+  });
+  server.tool("list_machines", "List all machines that have synced data. No params.", {}, async () => {
+    const machines = listMachines(db);
+    if (machines.length === 0)
+      return text(`No machine data yet. Current machine: ${getMachineId()}`);
+    const lines = ["machine          sessions  requests  cost        last_active"];
+    for (const m of machines) {
+      lines.push(`${m.machine_id.padEnd(17)}${String(m.sessions).padEnd(10)}${String(m.requests).padEnd(10)}${fmtUsd(m.total_cost_usd).padEnd(12)}${m.last_active?.substring(0, 16) ?? "\u2014"}`);
+    }
+    lines.push(`
+current machine: ${getMachineId()}`);
+    return text(lines.join(`
+`));
+  });
+  server.tool("register_agent", "Register agent session.", { name: z.string(), session_id: z.string().optional() }, async ({ name }) => {
+    const existing = [..._econAgents.values()].find((agent2) => agent2.name === name);
+    if (existing) {
+      existing.last_seen_at = new Date().toISOString();
+      return text(JSON.stringify(existing));
+    }
+    const id = Math.random().toString(36).slice(2, 10);
+    const agent = { id, name, last_seen_at: new Date().toISOString() };
+    _econAgents.set(id, agent);
+    return text(JSON.stringify(agent));
+  });
+  server.tool("heartbeat", "Update last_seen_at.", { agent_id: z.string() }, async ({ agent_id }) => {
+    const agent = _econAgents.get(agent_id);
+    if (!agent)
+      return textError("Agent not found");
+    agent.last_seen_at = new Date().toISOString();
+    return text(`\u2665 ${agent.name}`);
+  });
+  server.tool("set_focus", "Set active project context.", { agent_id: z.string(), project_id: z.string().optional().nullable() }, async ({ agent_id, project_id }) => {
+    const agent = _econAgents.get(agent_id);
+    if (!agent)
+      return textError("Agent not found");
+    agent.project_id = project_id ?? undefined;
+    return text(project_id ? `Focus: ${project_id}` : "Focus cleared");
+  });
+  server.tool("list_agents", "List all registered agents.", {}, async () => text(JSON.stringify([..._econAgents.values()])));
+  server.tool("send_feedback", "Send feedback about this service.", {
+    message: z.string(),
+    email: z.string().optional(),
+    category: z.enum(["bug", "feature", "general"]).optional()
+  }, async ({ message, email, category }) => {
+    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");
     }
-  } catch (e) {
-    return { content: [{ type: "text", text: `Error: ${e instanceof Error ? e.message : String(e)}` }], isError: true };
   }
+  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;
+  }
+  startHttpServer({ port: resolveHttpPort(args) });
+  await new Promise(() => {});
+}
+main().catch((error) => {
+  console.error("MCP server error:", error);
+  process.exit(1);
 });
-var _econAgents = new Map;
-var transport = new StdioServerTransport;
-await server.connect(transport);