@hasna/economy 0.2.20 → 0.2.22

package/dist/index.js

@@ -14,6 +14,7 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
+var __require = import.meta.require;
 
 // src/lib/pricing.ts
 var exports_pricing = {};
@@ -27,88 +28,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 isFreeModel(model) {
+  return model.trim().toLowerCase().endsWith(":free");
 }
-function computeCost(model, inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0) {
+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);
 }
-var DEFAULT_PRICING;
+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, 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");
@@ -141,6 +557,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) {
@@ -159,10 +576,18 @@ 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 '',
+      account_key TEXT DEFAULT '',
+      account_tool TEXT DEFAULT '',
+      account_name TEXT DEFAULT '',
+      account_email TEXT DEFAULT '',
+      account_source TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS sessions (
@@ -174,7 +599,13 @@ 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 '',
+      account_key TEXT DEFAULT '',
+      account_tool TEXT DEFAULT '',
+      account_name TEXT DEFAULT '',
+      account_email TEXT DEFAULT '',
+      account_source TEXT DEFAULT ''
     );
 
     CREATE TABLE IF NOT EXISTS projects (
@@ -227,6 +658,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
     );
 
@@ -239,6 +672,127 @@ 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 ''`);
+  }
+  for (const column of ["account_key", "account_tool", "account_name", "account_email", "account_source"]) {
+    if (!cols.some((c) => c.name === column)) {
+      db.exec(`ALTER TABLE requests ADD COLUMN ${column} TEXT DEFAULT ''`);
+    }
+  }
+  const sessionCols = db.prepare(`PRAGMA table_info(sessions)`).all();
+  if (!sessionCols.some((c) => c.name === "attribution_tag")) {
+    db.exec(`ALTER TABLE sessions ADD COLUMN attribution_tag TEXT DEFAULT ''`);
+  }
+  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 ''`);
+  }
+  for (const column of ["account_key", "account_tool", "account_name", "account_email", "account_source"]) {
+    if (!sessionCols.some((c) => c.name === column)) {
+      db.exec(`ALTER TABLE sessions ADD COLUMN ${column} TEXT DEFAULT ''`);
+    }
+  }
+  const pricingCols = db.prepare(`PRAGMA table_info(model_pricing)`).all();
+  if (!pricingCols.some((c) => c.name === "cache_write_1h_per_1m")) {
+    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`);
+  }
+  if (!pricingCols.some((c) => c.name === "cache_storage_per_1m_hour")) {
+    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`);
+  }
+  db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id);
+    CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
+    CREATE INDEX IF NOT EXISTS idx_requests_account ON requests(account_key);
+    CREATE INDEX IF NOT EXISTS idx_sessions_account ON sessions(account_key);
   `);
 }
 function periodWhere(period) {
@@ -248,11 +802,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";
   }
@@ -264,31 +818,52 @@ 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 requestPeriodWhere(period) {
+  switch (period) {
+    case "today":
+      return `DATE(timestamp) = DATE('now')`;
+    case "yesterday":
+      return `DATE(timestamp) = DATE('now', '-1 day')`;
+    case "week":
+      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
+    case "month":
+      return `timestamp >= DATE('now', 'start of month')`;
+    case "year":
+      return `timestamp >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
 }
 function upsertRequest(db, req) {
+  const now = req.updated_at ?? new Date().toISOString();
   db.prepare(`
     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, account_key, account_tool,
+       account_name, account_email, account_source, updated_at, synced_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", req.account_key ?? "", req.account_tool ?? "", req.account_name ?? "", req.account_email ?? "", req.account_source ?? "", now, req.synced_at ?? "");
 }
 function upsertSession(db, session) {
+  const now = session.updated_at ?? new Date().toISOString();
   db.prepare(`
     INSERT OR REPLACE INTO sessions
       (id, agent, project_path, project_name, started_at, ended_at,
-       total_cost_usd, total_tokens, request_count)
-    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,
+       account_key, account_tool, account_name, account_email, account_source, updated_at, synced_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", session.account_key ?? "", session.account_tool ?? "", session.account_name ?? "", session.account_email ?? "", session.account_source ?? "", now, session.synced_at ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -299,9 +874,24 @@ function rollupSession(db, sessionId) {
       ended_at       = (SELECT MAX(timestamp) FROM requests WHERE session_id = ?),
       started_at     = CASE WHEN started_at = '' OR started_at IS NULL
                             THEN (SELECT MIN(timestamp) FROM requests WHERE session_id = ?)
-                            ELSE started_at END
+                            ELSE started_at END,
+      account_key    = CASE WHEN account_key = '' OR account_key IS NULL
+                            THEN COALESCE((SELECT account_key FROM requests WHERE session_id = ? AND account_key != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_key END,
+      account_tool   = CASE WHEN account_tool = '' OR account_tool IS NULL
+                            THEN COALESCE((SELECT account_tool FROM requests WHERE session_id = ? AND account_tool != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_tool END,
+      account_name   = CASE WHEN account_name = '' OR account_name IS NULL
+                            THEN COALESCE((SELECT account_name FROM requests WHERE session_id = ? AND account_name != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_name END,
+      account_email  = CASE WHEN account_email = '' OR account_email IS NULL
+                            THEN COALESCE((SELECT account_email FROM requests WHERE session_id = ? AND account_email != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_email END,
+      account_source = CASE WHEN account_source = '' OR account_source IS NULL
+                            THEN COALESCE((SELECT account_source FROM requests WHERE session_id = ? AND account_source != '' ORDER BY timestamp DESC LIMIT 1), '')
+                            ELSE account_source END
     WHERE id = ?
-  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
+  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
 }
 function querySessions(db, filter = {}) {
   const conditions = [];
@@ -314,10 +904,19 @@ function querySessions(db, filter = {}) {
     conditions.push("project_path LIKE ?");
     params.push(`%${filter.project}%`);
   }
+  if (filter.account) {
+    const q = `%${filter.account}%`;
+    conditions.push("(account_key LIKE ? OR account_name LIKE ? OR account_email LIKE ?)");
+    params.push(q, q, q);
+  }
   if (filter.since) {
     conditions.push("started_at >= ?");
     params.push(filter.since);
   }
+  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 ?)");
@@ -336,24 +935,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,
@@ -373,23 +973,213 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
-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
+function queryAgentBreakdown(db, period = "all") {
+  const requestWhere = requestPeriodWhere(period);
+  const groups = new Map;
+  const requestRows = db.prepare(`
+    SELECT agent,
+           COUNT(DISTINCT session_id) as sessions,
+           COUNT(*) as requests,
+           COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+           COALESCE(SUM(cost_usd), 0) as api_equivalent_usd,
+           COALESCE(SUM(CASE WHEN cost_basis = 'metered_api' THEN cost_usd ELSE 0 END), 0) as metered_api_usd,
+           COALESCE(SUM(CASE WHEN cost_basis = 'subscription_included' THEN cost_usd ELSE 0 END), 0) as subscription_included_usd,
+           COALESCE(SUM(CASE WHEN COALESCE(cost_basis, 'estimated') = 'estimated' THEN cost_usd ELSE 0 END), 0) as estimated_usd,
+           COALESCE(SUM(CASE WHEN cost_basis = 'unknown' THEN cost_usd ELSE 0 END), 0) as unknown_usd,
+           COALESCE(SUM(CASE WHEN cost_basis = 'metered_api' THEN cost_usd ELSE 0 END), 0) as billable_usd,
+           COALESCE(SUM(cost_usd), 0) as cost_usd,
+           MAX(timestamp) as last_active
+    FROM requests
+    WHERE ${requestWhere}
+    GROUP BY agent
+    ORDER BY api_equivalent_usd DESC
+  `).all();
+  for (const row of requestRows) {
+    groups.set(row.agent, row);
+  }
+  const sessionWhere = sessionPeriodWhere(period);
+  const sessionOnlyRows = db.prepare(`
+    SELECT agent,
+           COUNT(*) as sessions,
+           COALESCE(SUM(request_count), 0) as requests,
+           COALESCE(SUM(total_tokens), 0) as total_tokens,
+           COALESCE(SUM(total_cost_usd), 0) as cost_usd,
+           MAX(started_at) as last_active
+    FROM sessions
+    WHERE ${sessionWhere}
+      AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+    GROUP BY agent
+  `).all();
+  for (const row of sessionOnlyRows) {
+    const existing = groups.get(row.agent) ?? {
+      agent: row.agent,
+      sessions: 0,
+      requests: 0,
+      total_tokens: 0,
+      api_equivalent_usd: 0,
+      billable_usd: 0,
+      metered_api_usd: 0,
+      subscription_included_usd: 0,
+      estimated_usd: 0,
+      unknown_usd: 0,
+      cost_usd: 0,
+      last_active: ""
+    };
+    existing.sessions += row.sessions;
+    existing.requests += row.requests;
+    existing.total_tokens += row.total_tokens;
+    existing.api_equivalent_usd += row.cost_usd;
+    existing.estimated_usd += row.cost_usd;
+    existing.cost_usd += row.cost_usd;
+    if (!existing.last_active || row.last_active > existing.last_active)
+      existing.last_active = row.last_active;
+    groups.set(row.agent, existing);
+  }
+  return [...groups.values()].sort((a, b) => b.api_equivalent_usd - a.api_equivalent_usd);
+}
+function labelForPath(projectPath, projectName) {
+  if (projectName && projectName.trim() !== "")
+    return projectName;
+  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, period = "all") {
+  const where = sessionPeriodWhere(period);
+  const sessions = db.prepare(`
+    SELECT id, project_path, project_name, total_cost_usd, started_at
+    FROM sessions
+    WHERE ${where}
+      AND (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 queryAccountBreakdown(db, period = "all") {
+  const sWhere = sessionPeriodWhere(period);
+  const sessions = db.prepare(`
+    SELECT id, account_key, account_tool, account_name, account_email, account_source,
+           total_cost_usd, total_tokens, request_count, started_at
+    FROM sessions
+    WHERE ${sWhere}
+      AND (account_key != '' OR account_tool != '' OR account_name != '' OR account_email != '')
+  `).all();
+  const groups = new Map;
+  for (const session of sessions) {
+    const key = session.account_key || `${session.account_tool}:${session.account_name}`;
+    if (!key || key === ":")
+      continue;
+    const group = groups.get(key) ?? {
+      sessionIds: [],
+      account_tool: session.account_tool,
+      account_name: session.account_name,
+      account_email: session.account_email || null,
+      account_source: session.account_source || "unknown",
+      totalCost: 0,
+      totalTokens: 0,
+      requests: 0,
+      lastActive: ""
+    };
+    group.sessionIds.push(session.id);
+    group.totalCost += session.total_cost_usd || 0;
+    group.totalTokens += session.total_tokens || 0;
+    group.requests += session.request_count || 0;
+    if (!group.lastActive || session.started_at > group.lastActive)
+      group.lastActive = session.started_at;
+    groups.set(key, group);
+  }
+  const result = [];
+  for (const [key, group] of groups.entries()) {
+    const placeholders = group.sessionIds.map(() => "?").join(",");
+    const reqStats = placeholders ? db.prepare(`
+          SELECT
+            COUNT(*) as requests,
+            COALESCE(SUM(cost_usd), 0) as cost_usd,
+            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+            COALESCE(SUM(CASE WHEN cost_basis = 'metered_api' THEN cost_usd ELSE 0 END), 0) as metered_api_usd,
+            COALESCE(SUM(CASE WHEN cost_basis = 'subscription_included' THEN cost_usd ELSE 0 END), 0) as subscription_included_usd,
+            COALESCE(SUM(CASE WHEN COALESCE(cost_basis, 'estimated') = 'estimated' THEN cost_usd ELSE 0 END), 0) as estimated_usd,
+            COALESCE(SUM(CASE WHEN cost_basis = 'unknown' THEN cost_usd ELSE 0 END), 0) as unknown_usd
+          FROM requests WHERE session_id IN (${placeholders})
+        `).get(...group.sessionIds) : {
+      requests: 0,
+      cost_usd: 0,
+      total_tokens: 0,
+      metered_api_usd: 0,
+      subscription_included_usd: 0,
+      estimated_usd: 0,
+      unknown_usd: 0
+    };
+    const hasRequestCosts = reqStats.requests > 0;
+    const apiEquivalentUsd = hasRequestCosts ? reqStats.cost_usd : group.totalCost;
+    const estimatedUsd = hasRequestCosts ? reqStats.estimated_usd : group.totalCost;
+    const billableUsd = reqStats.metered_api_usd;
+    result.push({
+      account_key: key,
+      account_tool: group.account_tool,
+      account_name: group.account_name,
+      account_email: group.account_email,
+      account_source: group.account_source,
+      sessions: group.sessionIds.length,
+      requests: reqStats.requests || group.requests,
+      total_tokens: reqStats.total_tokens || group.totalTokens,
+      api_equivalent_usd: apiEquivalentUsd,
+      billable_usd: billableUsd,
+      metered_api_usd: reqStats.metered_api_usd,
+      subscription_included_usd: reqStats.subscription_included_usd,
+      estimated_usd: estimatedUsd,
+      unknown_usd: reqStats.unknown_usd,
+      cost_usd: apiEquivalentUsd,
+      last_active: group.lastActive
+    });
+  }
+  result.sort((a, b) => b.cost_usd - a.cost_usd);
+  return result;
 }
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`
@@ -507,12 +1297,46 @@ function setIngestState(db, source, key, value) {
 function queryRequestsSince(db, since) {
   return db.prepare(`SELECT * FROM requests WHERE timestamp > ? ORDER BY timestamp ASC`).all(since);
 }
+function upsertBillingDaily(db, row) {
+  db.prepare(`
+    INSERT OR REPLACE INTO billing_daily (date, provider, description, cost_usd, updated_at)
+    VALUES (?, ?, ?, ?, ?)
+  `).run(row.date, row.provider, row.description, row.cost_usd, row.updated_at);
+}
+function clearBillingRange(db, provider, fromDate, toDate) {
+  db.prepare(`DELETE FROM billing_daily WHERE provider = ? AND date >= ? AND date <= ?`).run(provider, fromDate, toDate);
+}
+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);
@@ -524,23 +1348,104 @@ 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 listSubscriptions(db) {
+  return db.prepare(`SELECT * FROM subscriptions ORDER BY provider, plan`).all();
+}
+function deleteSubscription(db, id) {
+  db.prepare(`DELETE FROM subscriptions WHERE id = ?`).run(id);
+}
+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 listMachineRegistry(db) {
+  return db.prepare(`SELECT * FROM machines ORDER BY last_seen_at DESC`).all();
+}
+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 = () => {};
 
+// src/lib/agents.ts
+var AGENTS = [
+  "claude",
+  "takumi",
+  "codex",
+  "gemini",
+  "opencode",
+  "cursor",
+  "pi",
+  "hermes"
+];
+var COST_BASIS = [
+  "metered_api",
+  "subscription_included",
+  "estimated",
+  "unknown"
+];
+function isAgent(value) {
+  return AGENTS.includes(value);
+}
 // src/index.ts
 init_database();
 init_pricing();
@@ -548,6 +1453,9 @@ init_pricing();
 // src/lib/gatherer.ts
 init_database();
 var SYSTEM_PROMPT = "You are a cost-aware AI assistant that tracks API usage, identifies expensive patterns, and helps optimize spending.";
+function hasCostData(summary) {
+  return summary.total_usd > 0 || summary.sessions > 0 || summary.requests > 0 || summary.tokens > 0;
+}
 var gatherTrainingData = async (options = {}) => {
   const limit = options.limit ?? 500;
   const examples = [];
@@ -557,6 +1465,8 @@ var gatherTrainingData = async (options = {}) => {
     for (const period of periods) {
       try {
         const s = querySummary(db, period);
+        if (!hasCostData(s))
+          continue;
         examples.push({
           messages: [
             { role: "system", content: SYSTEM_PROMPT },
@@ -729,22 +1639,26 @@ ${goals.map((g) => `- ${g.period} goal (${g.project_path ?? g.agent ?? "global"}
 // src/lib/model-config.ts
 init_database();
 import { existsSync as existsSync2, readFileSync, writeFileSync, mkdirSync as mkdirSync2 } from "fs";
-import { join as join2 } from "path";
+import { dirname, join as join2 } from "path";
 var DEFAULT_MODEL = "gpt-4o-mini";
-var CONFIG_PATH = join2(getDataDir(), "config.json");
+function getModelConfigPath() {
+  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join2(getDataDir(), "config.json");
+}
 function loadConfig() {
   try {
-    if (existsSync2(CONFIG_PATH)) {
-      return JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+    const configPath = getModelConfigPath();
+    if (existsSync2(configPath)) {
+      return JSON.parse(readFileSync(configPath, "utf-8"));
     }
   } catch {}
   return {};
 }
 function saveConfig(config) {
-  const dir = getDataDir();
+  const configPath = getModelConfigPath();
+  const dir = dirname(configPath);
   if (!existsSync2(dir))
     mkdirSync2(dir, { recursive: true });
-  writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + `
+  writeFileSync(configPath, JSON.stringify(config, null, 2) + `
 `);
 }
 function getActiveModel() {
@@ -760,16 +1674,181 @@ function clearActiveModel() {
   delete config.activeModel;
   saveConfig(config);
 }
+// src/lib/open-projects.ts
+init_database();
+async function syncOpenProjectsRegistry(db, listActiveProjects) {
+  let listProjects2 = listActiveProjects;
+  if (!listProjects2) {
+    const projectsApi = await import("@hasna/projects");
+    listProjects2 = projectsApi.listProjects;
+  }
+  const projects = listProjects2({ status: "active", limit: 5000 });
+  let imported = 0;
+  let skipped = 0;
+  for (const project of projects) {
+    if (!project.path) {
+      skipped++;
+      continue;
+    }
+    upsertProject(db, {
+      id: project.id,
+      path: project.path,
+      name: project.name,
+      description: project.description,
+      tags: project.tags ?? [],
+      created_at: project.created_at
+    });
+    imported++;
+  }
+  return { imported, skipped };
+}
 // src/ingest/claude.ts
 init_database();
 init_pricing();
 import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync3, statSync as statSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join3, basename } from "path";
+
+// src/lib/savings.ts
+function defaultCostBasisForAgent(agent) {
+  if (agent === "claude")
+    return "metered_api";
+  if (agent === "cursor")
+    return "subscription_included";
+  return "estimated";
+}
+
+// src/lib/accounts.ts
+var AGENT_ACCOUNT_TOOLS = {
+  claude: ["claude"],
+  takumi: ["takumi", "claude"],
+  codex: ["codex"],
+  gemini: ["gemini"],
+  opencode: ["opencode"],
+  cursor: ["cursor"],
+  pi: ["pi"],
+  hermes: ["hermes"]
+};
+function accountKey(tool, name) {
+  return `${tool}:${name}`;
+}
+function normalizeDir(value) {
+  return value.replace(/\/+$/, "");
+}
+function fromProfile(profile, source) {
+  return {
+    account_key: accountKey(profile.tool, profile.name),
+    account_tool: profile.tool,
+    account_name: profile.name,
+    ...profile.email ? { account_email: profile.email } : {},
+    account_source: source
+  };
+}
+function fromOverride(raw, agent) {
+  const value = raw.trim();
+  if (!value)
+    return null;
+  const candidateTool = AGENT_ACCOUNT_TOOLS[agent][0] ?? agent;
+  const [tool, name] = value.includes(":") ? value.split(":", 2) : [candidateTool, value];
+  if (!tool || !name)
+    return null;
+  return {
+    account_key: accountKey(tool, name),
+    account_tool: tool,
+    account_name: name,
+    account_source: "override"
+  };
+}
+function envOverride(agent, env) {
+  const agentPrefix = agent.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+  const raw = env[`ECONOMY_${agentPrefix}_ACCOUNT_KEY`] ?? env[`ECONOMY_${agentPrefix}_ACCOUNT`] ?? env["ECONOMY_ACCOUNT_KEY"] ?? env["ECONOMY_ACCOUNT"];
+  if (raw)
+    return fromOverride(raw, agent);
+  const tool = env[`ECONOMY_${agentPrefix}_ACCOUNT_TOOL`] ?? env["ECONOMY_ACCOUNT_TOOL"];
+  const name = env[`ECONOMY_${agentPrefix}_ACCOUNT_NAME`] ?? env["ECONOMY_ACCOUNT_NAME"];
+  if (!tool || !name)
+    return null;
+  return {
+    account_key: accountKey(tool, name),
+    account_tool: tool,
+    account_name: name,
+    account_email: env[`ECONOMY_${agentPrefix}_ACCOUNT_EMAIL`] ?? env["ECONOMY_ACCOUNT_EMAIL"],
+    account_source: "override"
+  };
+}
+function knownToolIds(api) {
+  try {
+    return new Set(api.listTools().map((tool) => tool.id));
+  } catch {
+    return new Set;
+  }
+}
+function profileForEnvDir(api, tool, env) {
+  const configuredDir = env[tool.envVar];
+  if (!configuredDir)
+    return null;
+  const normalized = normalizeDir(configuredDir);
+  try {
+    return api.listProfiles(tool.id).find((profile) => normalizeDir(profile.dir) === normalized) ?? null;
+  } catch {
+    return null;
+  }
+}
+async function resolveAccountForAgent(agent, env = process.env) {
+  const override = envOverride(agent, env);
+  if (override)
+    return override;
+  let api;
+  try {
+    api = await import("@hasna/accounts");
+  } catch {
+    return null;
+  }
+  const toolIds = knownToolIds(api);
+  for (const toolId of AGENT_ACCOUNT_TOOLS[agent]) {
+    if (!toolIds.has(toolId))
+      continue;
+    let tool;
+    try {
+      tool = api.getTool(toolId);
+    } catch {
+      continue;
+    }
+    const envProfile = profileForEnvDir(api, tool, env);
+    if (envProfile)
+      return fromProfile(envProfile, "env");
+    try {
+      const applied = api.appliedProfile(toolId);
+      if (applied)
+        return fromProfile(applied, "applied");
+    } catch {}
+    try {
+      const current = api.currentProfile(toolId);
+      if (current)
+        return fromProfile(current, "current");
+    } catch {}
+  }
+  return null;
+}
+function withAccount(record, account) {
+  if (!account)
+    return record;
+  return {
+    ...record,
+    account_key: account.account_key,
+    account_tool: account.account_tool,
+    account_name: account.account_name,
+    account_email: account.account_email ?? "",
+    account_source: account.account_source
+  };
+}
+
+// src/ingest/claude.ts
 function autoDetectProject(cwd, projects) {
   return projects.find((p) => cwd === p.path || cwd.startsWith(p.path + "/"));
 }
-var PROJECTS_DIR = join3(homedir2(), ".claude", "projects");
+var CLAUDE_PROJECTS_DIR = join3(homedir2(), ".claude", "projects");
+var TAKUMI_PROJECTS_DIR = join3(homedir2(), ".takumi", "projects");
 function dirNameToPath(dirName) {
   return dirName.replace(/^-/, "/").replace(/-/g, "/").replace(/\/\//g, "/-");
 }
@@ -788,30 +1867,38 @@ function collectJsonlFiles(projectDir) {
   walk(projectDir);
   return files;
 }
-async function ingestClaude(db, verbose = false, _telemetryDir) {
-  if (!existsSync3(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 (!existsSync3(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 account = await resolveAccountForAgent(agentName);
+  const projectDirs = readdirSync2(projectsDir, { withFileTypes: true }).filter((d) => d.isDirectory());
   for (const projectDirEntry of projectDirs) {
-    const projectDirPath = join3(PROJECTS_DIR, projectDirEntry.name);
+    const projectDirPath = join3(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;
@@ -846,27 +1933,39 @@ 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}`;
-        upsertRequest(db, {
+        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, withAccount({
           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
+        }, account));
         if (!touchedSessions.has(sessionId)) {
           const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
           if (!existing) {
@@ -874,22 +1973,23 @@ 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);
+            upsertSession(db, withAccount(session, account));
           }
           touchedSessions.add(sessionId);
         }
         totalRequests++;
       }
-      setIngestState(db, "claude", stateKey, fileMtime);
+      setIngestState(db, agentName, stateKey, fileMtime);
       totalFiles++;
     }
   }
@@ -898,79 +1998,397 @@ 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();
+init_pricing();
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join4, basename as basename2 } from "path";
-import { Database as Database2 } from "bun:sqlite";
-var CODEX_DB_PATH = join4(homedir3(), ".codex", "state_5.sqlite");
-var CODEX_CONFIG_PATH = join4(homedir3(), ".codex", "config.toml");
+import { Database as BunDatabase } from "bun:sqlite";
+var DEFAULT_CODEX_DB_PATH = join4(homedir3(), ".codex", "state_5.sqlite");
+var DEFAULT_CODEX_CONFIG_PATH = join4(homedir3(), ".codex", "config.toml");
+var CODEX_INGEST_VERSION = "rollout-aggregate-v3";
+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() {
-  if (!existsSync4(CODEX_CONFIG_PATH))
-    return "gpt-5.3-codex";
+  const configPath = codexConfigPath();
+  if (!existsSync4(configPath))
+    return "gpt-5-codex";
   try {
-    const content = readFileSync3(CODEX_CONFIG_PATH, "utf-8");
+    const content = readFileSync3(configPath, "utf-8");
     const match = content.match(/^model\s*=\s*"([^"]+)"/m);
-    return match?.[1] ?? "gpt-5.3-codex";
+    return match?.[1] ?? "gpt-5-codex";
   } catch {
-    return "gpt-5.3-codex";
+    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 || !existsSync4(rolloutPath))
+    return [];
+  const fallbackUsages = new Map;
+  let fallbackTimestamp;
+  let aggregate = null;
+  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 timestamp = entry["timestamp"];
+    const entryTimestamp = typeof timestamp === "string" ? timestamp : undefined;
+    const totalUsage = info?.["total_token_usage"];
+    if (totalUsage && tokenTotal(totalUsage) > 0) {
+      aggregate = { usage: totalUsage, timestamp: entryTimestamp };
+      continue;
+    }
+    const usage = info?.["last_token_usage"];
+    if (!usage)
+      continue;
+    if (tokenTotal(usage) <= 0)
+      continue;
+    const key = JSON.stringify(usage);
+    if (!fallbackUsages.has(key))
+      fallbackUsages.set(key, usage);
+    fallbackTimestamp = entryTimestamp ?? fallbackTimestamp;
+  }
+  if (aggregate)
+    return [aggregate];
+  if (fallbackUsages.size === 0)
+    return [];
+  return [{ usage: sumTokenUsages([...fallbackUsages.values()]), timestamp: fallbackTimestamp }];
+}
+function tokenTotal(usage) {
+  return usage.total_tokens ?? (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0);
+}
+function sumTokenUsages(usages) {
+  const result = {
+    input_tokens: 0,
+    cached_input_tokens: 0,
+    output_tokens: 0,
+    reasoning_output_tokens: 0,
+    total_tokens: 0
+  };
+  for (const usage of usages) {
+    result.input_tokens = (result.input_tokens ?? 0) + (usage.input_tokens ?? 0);
+    result.cached_input_tokens = (result.cached_input_tokens ?? 0) + (usage.cached_input_tokens ?? 0);
+    result.output_tokens = (result.output_tokens ?? 0) + (usage.output_tokens ?? 0);
+    result.reasoning_output_tokens = (result.reasoning_output_tokens ?? 0) + (usage.reasoning_output_tokens ?? 0);
+    result.total_tokens = (result.total_tokens ?? 0) + tokenTotal(usage);
+  }
+  return result;
+}
+function fallbackEvents(totalTokens) {
+  const inputTokens = Math.floor(totalTokens * 0.6);
+  return [{
+    usage: {
+      input_tokens: inputTokens,
+      cached_input_tokens: 0,
+      output_tokens: totalTokens - inputTokens,
+      total_tokens: totalTokens
+    }
+  }];
+}
 async function ingestCodex(db, verbose = false) {
-  if (!existsSync4(CODEX_DB_PATH)) {
+  const dbPath = codexDbPath();
+  if (!existsSync4(dbPath)) {
     if (verbose)
-      console.log("Codex DB not found:", CODEX_DB_PATH);
-    return { sessions: 0 };
+      console.log("Codex DB not found:", dbPath);
+    return { sessions: 0, requests: 0 };
   }
+  const machineId = getMachineId();
   let codexDb = null;
   let ingested = 0;
+  let requests = 0;
+  const account = await resolveAccountForAgent("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();
+    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}`,
+      upsertSession(db, withAccount({
+        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
+      }, account));
+      const events = readTokenEvents(thread.rollout_path);
+      const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+      const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
+      db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
+      tokenEvents.forEach((event, index) => {
+        const usage = event.usage;
+        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, withAccount({
+          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
+        }, account));
+        requests++;
       });
-      setIngestState(db, "codex", stateKey, "done");
+      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}: ${ingestedTokens} tokens on ${model}`);
     }
   } finally {
     codexDb?.close();
   }
-  return { sessions: ingested };
+  return { sessions: ingested, requests };
+}
+// src/ingest/gemini.ts
+init_database();
+init_pricing();
+import { readdirSync as readdirSync3, readFileSync as readFileSync4, existsSync as existsSync5, statSync as statSync3 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join5, basename as basename3 } from "path";
+var DEFAULT_GEMINI_TMP_DIR = join5(homedir4(), ".gemini", "tmp");
+var DEFAULT_GEMINI_HISTORY_DIR = join5(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 (!existsSync5(root))
+      continue;
+    try {
+      for (const entry of readdirSync3(root, { withFileTypes: true })) {
+        if (entry.isDirectory())
+          dirs.add(join5(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 = join5(projectDir, ".project_root");
+  try {
+    if (existsSync5(rootFile))
+      return readFileSync4(rootFile, "utf-8").trim();
+  } catch {}
+  return "";
+}
+async function ingestGemini(db, verbose) {
+  const tmpDir = geminiTmpDir();
+  const historyDir = geminiHistoryDir();
+  if (!existsSync5(tmpDir) && !existsSync5(historyDir)) {
+    if (verbose)
+      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;
+  const account = await resolveAccountForAgent("gemini");
+  const projectDirs = listProjectDirs(tmpDir, historyDir);
+  for (const projectDir of projectDirs) {
+    const chatsDir = join5(projectDir, "chats");
+    if (!existsSync5(chatsDir))
+      continue;
+    let chatFiles = [];
+    try {
+      chatFiles = readdirSync3(chatsDir).filter((f) => f.endsWith(".json")).map((f) => join5(chatsDir, f));
+    } catch {
+      continue;
+    }
+    for (const filePath of chatFiles) {
+      const stateKey = filePath.replace(homedir4(), "~");
+      let fileMtime = "0";
+      try {
+        fileMtime = statSync3(filePath).mtimeMs.toString();
+      } catch {
+        continue;
+      }
+      const processed = getIngestState(db, "gemini", stateKey);
+      if (processed === fileMtime)
+        continue;
+      let chatData;
+      try {
+        chatData = JSON.parse(readFileSync4(filePath, "utf-8"));
+      } catch {
+        continue;
+      }
+      const sessionId = chatData.sessionId ?? 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: projectPath,
+          project_name: projectName,
+          started_at: startTime,
+          ended_at: chatData.lastUpdated ?? null,
+          total_cost_usd: 0,
+          total_tokens: 0,
+          request_count: 0,
+          machine_id: machineId
+        };
+        upsertSession(db, withAccount(session, account));
+        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, withAccount({
+          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
+        }, account));
+        totalRequests++;
+      }
+      setIngestState(db, "gemini", stateKey, fileMtime);
+    }
+  }
+  for (const sessionId of touchedSessions) {
+    rollupSession(db, sessionId);
+  }
+  return { sessions: totalSessions, requests: totalRequests };
 }
 export {
+  upsertUsageSnapshot,
+  upsertSubscription,
   upsertSession,
   upsertRequest,
   upsertProject,
   upsertModelPricing,
   upsertGoal,
   upsertBudget,
+  upsertBillingDaily,
+  syncOpenProjectsRegistry,
   setIngestState,
   setActiveModel,
   seedModelPricing,
   rollupSession,
   readCodexModel,
+  queryUsageSnapshots,
   queryTopSessions,
   querySummary,
   querySessions,
@@ -978,18 +2396,29 @@ export {
   queryProjectBreakdown,
   queryModelBreakdown,
   queryDailyBreakdown,
+  queryBillingSummary,
+  queryAgentBreakdown,
+  queryAccountBreakdown,
   openDatabase,
   normalizeModelName,
+  listSubscriptions,
   listProjects,
   listModelPricing,
+  listMachines,
+  listMachineRegistry,
   listGoals,
   listBudgets,
+  isAgent,
+  ingestTakumi,
+  ingestJsonlProjects,
+  ingestGemini,
   ingestCodex,
   ingestClaude,
   getProject,
   getPricingFromDb,
   getPricing,
   getModelPricing,
+  getMachineId,
   getIngestState,
   getGoalStatuses,
   getDbPath,
@@ -998,13 +2427,18 @@ export {
   getActiveModel,
   gatherTrainingData,
   ensurePricingSeeded,
+  deleteSubscription,
   deleteProject,
   deleteModelPricing,
   deleteGoal,
   deleteBudget,
+  dedupeRequests,
   computeCostFromDb,
   computeCost,
+  clearBillingRange,
   clearActiveModel,
   DEFAULT_PRICING,
-  DEFAULT_MODEL
+  DEFAULT_MODEL,
+  COST_BASIS,
+  AGENTS
 };