@hasna/economy 0.2.17 → 0.2.19

package/dist/server/index.js

@@ -29,99 +29,486 @@ __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);
+}
+function computeCostWithPricing(model, pricing, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, cacheWrite1hTokens, cacheStorageTokenHours) {
+  if (isFreeModel(model))
+    return 0;
+  let effective = pricing;
+  const promptTier = bestModelMatch(model, Object.entries(GEMINI_PROMPT_TIERS)) ?? bestModelMatch(model, Object.entries(QWEN_PROMPT_TIERS)) ?? bestModelMatch(model, Object.entries(MINIMAX_PROMPT_TIERS)) ?? bestModelMatch(model, Object.entries(XAI_PROMPT_TIERS)) ?? exactModelMatch(model, Object.entries(OPENAI_PROMPT_TIERS));
+  if (promptTier) {
+    const billablePromptTokens = inputTokens + cacheReadTokens + cacheWriteTokens + cacheWrite1hTokens;
+    if (billablePromptTokens > promptTier.threshold) {
+      effective = {
+        ...pricing,
+        inputPer1M: promptTier.inputPer1M ?? pricing.inputPer1M * (promptTier.inputMultiplier ?? 1),
+        outputPer1M: promptTier.outputPer1M ?? pricing.outputPer1M * (promptTier.outputMultiplier ?? 1),
+        cacheReadPer1M: promptTier.cacheReadPer1M ?? pricing.cacheReadPer1M * (promptTier.cacheReadMultiplier ?? 1),
+        cacheWritePer1M: promptTier.cacheWritePer1M ?? pricing.cacheWritePer1M * (promptTier.cacheWriteMultiplier ?? 1)
+      };
+    }
+  }
+  return (inputTokens * effective.inputPer1M + outputTokens * effective.outputPer1M + cacheReadTokens * effective.cacheReadPer1M + cacheWriteTokens * effective.cacheWritePer1M + cacheWrite1hTokens * (effective.cacheWrite1hPer1M ?? effective.cacheWritePer1M) + cacheStorageTokenHours * (effective.cacheStoragePer1MHour ?? 0)) / 1e6;
 }
-var DEFAULT_PRICING;
+var DEFAULT_PRICING, LEGACY_DEFAULT_PRICING, ADDITIONAL_LEGACY_DEFAULT_PRICING, REMOVED_DEFAULT_PRICING, FREE_PRICING, GEMINI_PROMPT_TIERS, OPENAI_PROMPT_TIERS, QWEN_PROMPT_TIERS, MINIMAX_PROMPT_TIERS, XAI_PROMPT_TIERS;
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
-    "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
-    "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
-    "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
-    "claude-sonnet-4-6": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
-    "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-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 },
-    "gemini-3.1-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0.31, cacheWritePer1M: 0 },
-    "gemini-2.5-pro": { inputPer1M: 1.25, outputPer1M: 10, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gemini-2.5-flash": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gemini-2.0-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "gemini-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 },
+    "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-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 },
     "gpt-5.3-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
-    "gpt-5.3-chat": { inputPer1M: 2, outputPer1M: 8, cacheReadPer1M: 0.5, cacheWritePer1M: 0 },
     "gpt-5.2-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
     "gpt-5-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
     "gpt-5-mini": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
     "gpt-5.2": { inputPer1M: 2, outputPer1M: 8, cacheReadPer1M: 0.5, cacheWritePer1M: 0 },
-    "gpt-4o": { inputPer1M: 2.5, outputPer1M: 10, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
-    "gpt-4o-mini": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
-    o1: { inputPer1M: 15, outputPer1M: 60, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
     "o1-mini": { inputPer1M: 3, outputPer1M: 12, cacheReadPer1M: 1.5, cacheWritePer1M: 0 },
-    o3: { inputPer1M: 10, outputPer1M: 40, cacheReadPer1M: 2.5, cacheWritePer1M: 0 },
-    "o3-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.55, cacheWritePer1M: 0 },
-    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, cacheWritePer1M: 0 },
+    "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 },
-    "qwen3.6": { inputPer1M: 0.3, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "minimax-m2.7": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "minimax-m2.7-highspeed": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "minimax-m1": { inputPer1M: 0.2, outputPer1M: 1.1, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "grok-3": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "grok-3-mini": { inputPer1M: 0.3, outputPer1M: 0.5, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "glm-5.1": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
     "glm-5": { inputPer1M: 0.7, outputPer1M: 0.7, cacheReadPer1M: 0, cacheWritePer1M: 0 },
-    "kimi-k2": { inputPer1M: 0.6, outputPer1M: 0.6, cacheReadPer1M: 0, cacheWritePer1M: 0 }
+    "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
+    }
   };
 });
 
@@ -190,6 +577,8 @@ 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,
@@ -260,6 +649,8 @@ function initSchema(db) {
       output_per_1m REAL NOT NULL DEFAULT 0,
       cache_read_per_1m REAL NOT NULL DEFAULT 0,
       cache_write_per_1m REAL NOT NULL DEFAULT 0,
+      cache_write_1h_per_1m REAL NOT NULL DEFAULT 0,
+      cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0,
       updated_at TEXT NOT NULL
     );
 
@@ -284,12 +675,100 @@ function initSchema(db) {
 
     CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date);
     CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider);
+
+    CREATE TABLE IF NOT EXISTS subscriptions (
+      id TEXT PRIMARY KEY,
+      agent TEXT,
+      provider TEXT NOT NULL,
+      plan TEXT NOT NULL,
+      monthly_fee_usd REAL NOT NULL DEFAULT 0,
+      included_usage_usd REAL NOT NULL DEFAULT 0,
+      billing_cycle_start TEXT,
+      reset_policy TEXT DEFAULT 'monthly',
+      active INTEGER NOT NULL DEFAULT 1,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS usage_snapshots (
+      id TEXT PRIMARY KEY,
+      agent TEXT NOT NULL,
+      date TEXT NOT NULL,
+      metric TEXT NOT NULL,
+      value REAL NOT NULL DEFAULT 0,
+      unit TEXT DEFAULT '',
+      machine_id TEXT DEFAULT '',
+      updated_at TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS savings_daily (
+      date TEXT NOT NULL,
+      agent TEXT DEFAULT '',
+      api_equivalent_usd REAL NOT NULL DEFAULT 0,
+      subscription_fee_usd REAL NOT NULL DEFAULT 0,
+      included_consumed_usd REAL NOT NULL DEFAULT 0,
+      on_demand_usd REAL NOT NULL DEFAULT 0,
+      saved_usd REAL NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (date, agent)
+    );
+
+    CREATE TABLE IF NOT EXISTS machines (
+      machine_id TEXT PRIMARY KEY,
+      hostname TEXT NOT NULL,
+      last_seen_at TEXT,
+      last_push_at TEXT,
+      last_pull_at TEXT,
+      economy_version TEXT,
+      updated_at TEXT NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_usage_agent_date ON usage_snapshots(agent, date);
+    CREATE INDEX IF NOT EXISTS idx_savings_date ON savings_daily(date);
   `);
   const cols = db.prepare(`PRAGMA table_info(requests)`).all();
   if (!cols.some((c) => c.name === "machine_id")) {
     db.exec(`ALTER TABLE requests ADD COLUMN machine_id TEXT DEFAULT ''`);
     db.exec(`ALTER TABLE sessions ADD COLUMN machine_id TEXT DEFAULT ''`);
   }
+  if (!cols.some((c) => c.name === "cache_create_5m_tokens")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_5m_tokens INTEGER DEFAULT 0`);
+    db.exec(`UPDATE requests SET cache_create_5m_tokens = cache_create_tokens WHERE cache_create_5m_tokens = 0`);
+  }
+  if (!cols.some((c) => c.name === "cache_create_1h_tokens")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_1h_tokens INTEGER DEFAULT 0`);
+  }
+  if (!cols.some((c) => c.name === "cost_basis")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN cost_basis TEXT DEFAULT 'estimated'`);
+  }
+  if (!cols.some((c) => c.name === "attribution_tag")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN attribution_tag TEXT DEFAULT ''`);
+  }
+  if (!cols.some((c) => c.name === "updated_at")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN updated_at TEXT DEFAULT ''`);
+    db.exec(`UPDATE requests SET updated_at = timestamp WHERE updated_at = '' OR updated_at IS NULL`);
+  }
+  if (!cols.some((c) => c.name === "synced_at")) {
+    db.exec(`ALTER TABLE requests ADD COLUMN synced_at TEXT DEFAULT ''`);
+  }
+  const sessionCols = db.prepare(`PRAGMA table_info(sessions)`).all();
+  if (!sessionCols.some((c) => c.name === "attribution_tag")) {
+    db.exec(`ALTER TABLE sessions ADD COLUMN attribution_tag TEXT DEFAULT ''`);
+  }
+  if (!sessionCols.some((c) => c.name === "updated_at")) {
+    db.exec(`ALTER TABLE sessions ADD COLUMN updated_at TEXT DEFAULT ''`);
+    db.exec(`UPDATE sessions SET updated_at = started_at WHERE updated_at = '' OR updated_at IS NULL`);
+  }
+  if (!sessionCols.some((c) => c.name === "synced_at")) {
+    db.exec(`ALTER TABLE sessions ADD COLUMN synced_at TEXT DEFAULT ''`);
+  }
+  const pricingCols = db.prepare(`PRAGMA table_info(model_pricing)`).all();
+  if (!pricingCols.some((c) => c.name === "cache_write_1h_per_1m")) {
+    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`);
+  }
+  if (!pricingCols.some((c) => c.name === "cache_storage_per_1m_hour")) {
+    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`);
+  }
   db.exec(`
     CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id);
     CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
@@ -328,21 +807,24 @@ function sessionPeriodWhere(period) {
   }
 }
 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, machine_id)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cost_usd, req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "");
+       cache_read_tokens, cache_create_tokens, cache_create_5m_tokens,
+       cache_create_1h_tokens, cost_usd, cost_basis, duration_ms, timestamp,
+       source_request_id, machine_id, attribution_tag, updated_at, synced_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", now, req.synced_at ?? "");
 }
 function upsertSession(db, session) {
+  const now = session.updated_at ?? new Date().toISOString();
   db.prepare(`
     INSERT OR REPLACE INTO sessions
       (id, agent, project_path, project_name, started_at, ended_at,
-       total_cost_usd, total_tokens, request_count, machine_id)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "");
+       total_cost_usd, total_tokens, request_count, machine_id, attribution_tag, updated_at, synced_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", now, session.synced_at ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -394,10 +876,10 @@ function queryTopSessions(db, n = 10, agent) {
   }
   return db.prepare(`SELECT * FROM sessions ORDER BY total_cost_usd DESC LIMIT ?`).all(n);
 }
-function querySummary(db, period, machine) {
+function querySummary(db, period, machine, allMachines = false) {
   const rWhere = periodWhere(period);
   const sWhere = sessionPeriodWhere(period);
-  const machineClause = machine ? ` AND machine_id = '${machine.replace(/'/g, "''")}'` : "";
+  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,
@@ -600,6 +1082,26 @@ function getIngestState(db, source, key) {
 function setIngestState(db, source, key, value) {
   db.prepare(`INSERT OR REPLACE INTO ingest_state (source, key, value) VALUES (?, ?, ?)`).run(source, key, value);
 }
+function 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
@@ -617,9 +1119,9 @@ function listMachines(db) {
 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);
@@ -642,14 +1144,644 @@ function seedModelPricing(db, defaults) {
       output_per_1m: p.outputPer1M,
       cache_read_per_1m: p.cacheReadPer1M,
       cache_write_per_1m: p.cacheWritePer1M,
+      cache_write_1h_per_1m: p.cacheWrite1hPer1M ?? 0,
+      cache_storage_per_1m_hour: p.cacheStoragePer1MHour ?? 0,
       updated_at: now
     });
   }
 }
+function upsertSubscription(db, sub) {
+  db.prepare(`
+    INSERT OR REPLACE INTO subscriptions
+      (id, agent, provider, plan, monthly_fee_usd, included_usage_usd, billing_cycle_start, reset_policy, active, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(sub.id, sub.agent, sub.provider, sub.plan, sub.monthly_fee_usd, sub.included_usage_usd, sub.billing_cycle_start, sub.reset_policy, sub.active, sub.created_at, sub.updated_at);
+}
+function upsertUsageSnapshot(db, snap) {
+  const now = snap.updated_at ?? new Date().toISOString();
+  const id = snap.id ?? `${snap.agent}-${snap.date}-${snap.metric}-${snap.machine_id}`;
+  db.prepare(`
+    INSERT OR REPLACE INTO usage_snapshots (id, agent, date, metric, value, unit, machine_id, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, snap.agent, snap.date, snap.metric, snap.value, snap.unit, snap.machine_id, now);
+}
+function queryUsageSnapshots(db, opts = {}) {
+  const conditions = [];
+  const params = [];
+  if (opts.agent) {
+    conditions.push("agent = ?");
+    params.push(opts.agent);
+  }
+  if (opts.date) {
+    conditions.push("date = ?");
+    params.push(opts.date);
+  }
+  if (opts.since) {
+    conditions.push("date >= ?");
+    params.push(opts.since);
+  }
+  const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
+  return db.prepare(`SELECT * FROM usage_snapshots ${where} ORDER BY date DESC, agent, metric`).all(...params);
+}
+function 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/db/pg-migrations.ts
+var exports_pg_migrations = {};
+__export(exports_pg_migrations, {
+  PG_MIGRATIONS: () => PG_MIGRATIONS
+});
+var PG_MIGRATIONS;
+var init_pg_migrations = __esm(() => {
+  PG_MIGRATIONS = [
+    `CREATE TABLE IF NOT EXISTS requests (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    session_id TEXT NOT NULL,
+    model TEXT NOT NULL,
+    input_tokens INTEGER DEFAULT 0,
+    output_tokens INTEGER DEFAULT 0,
+    cache_read_tokens INTEGER DEFAULT 0,
+    cache_create_tokens INTEGER DEFAULT 0,
+    cache_create_5m_tokens INTEGER DEFAULT 0,
+    cache_create_1h_tokens INTEGER DEFAULT 0,
+    cost_usd REAL NOT NULL DEFAULT 0,
+    duration_ms INTEGER DEFAULT 0,
+    timestamp TEXT NOT NULL,
+    source_request_id TEXT,
+    machine_id TEXT DEFAULT ''
+  )`,
+    `CREATE TABLE IF NOT EXISTS sessions (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    project_path TEXT DEFAULT '',
+    project_name TEXT DEFAULT '',
+    started_at TEXT NOT NULL,
+    ended_at TEXT,
+    total_cost_usd REAL DEFAULT 0,
+    total_tokens INTEGER DEFAULT 0,
+    request_count INTEGER DEFAULT 0,
+    machine_id TEXT DEFAULT ''
+  )`,
+    `CREATE TABLE IF NOT EXISTS projects (
+    id TEXT PRIMARY KEY,
+    path TEXT UNIQUE NOT NULL,
+    name TEXT NOT NULL,
+    description TEXT,
+    tags TEXT DEFAULT '[]',
+    created_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS budgets (
+    id TEXT PRIMARY KEY,
+    project_path TEXT,
+    agent TEXT,
+    period TEXT NOT NULL,
+    limit_usd REAL NOT NULL,
+    alert_at_percent INTEGER DEFAULT 80,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS goals (
+    id TEXT PRIMARY KEY,
+    period TEXT NOT NULL,
+    project_path TEXT,
+    agent TEXT,
+    limit_usd REAL NOT NULL,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS ingest_state (
+    source TEXT NOT NULL,
+    key TEXT NOT NULL,
+    value TEXT NOT NULL,
+    PRIMARY KEY (source, key)
+  )`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_session ON requests(session_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_timestamp ON requests(timestamp)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_agent ON requests(agent)`,
+    `CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_path)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_started ON sessions(started_at)`,
+    `CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id)`,
+    `CREATE TABLE IF NOT EXISTS model_pricing (
+    model TEXT PRIMARY KEY,
+    input_per_1m REAL NOT NULL DEFAULT 0,
+    output_per_1m REAL NOT NULL DEFAULT 0,
+    cache_read_per_1m REAL NOT NULL DEFAULT 0,
+    cache_write_per_1m REAL NOT NULL DEFAULT 0,
+    cache_write_1h_per_1m REAL NOT NULL DEFAULT 0,
+    cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0,
+    updated_at TEXT NOT NULL
+  )`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cache_create_5m_tokens INTEGER DEFAULT 0`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cache_create_1h_tokens INTEGER DEFAULT 0`,
+    `ALTER TABLE model_pricing ADD COLUMN IF NOT EXISTS cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`,
+    `ALTER TABLE model_pricing ADD COLUMN IF NOT EXISTS cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`,
+    `CREATE TABLE IF NOT EXISTS feedback (
+    id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
+    message TEXT NOT NULL,
+    email TEXT,
+    category TEXT DEFAULT 'general',
+    version TEXT,
+    machine_id TEXT,
+    created_at TEXT NOT NULL DEFAULT NOW()::text
+  )`,
+    `CREATE TABLE IF NOT EXISTS billing_daily (
+    date TEXT NOT NULL,
+    provider TEXT NOT NULL,
+    description TEXT DEFAULT '',
+    cost_usd REAL NOT NULL DEFAULT 0,
+    updated_at TEXT NOT NULL,
+    PRIMARY KEY (date, provider, description)
+  )`,
+    `CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date)`,
+    `CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider)`,
+    `CREATE TABLE IF NOT EXISTS subscriptions (
+    id TEXT PRIMARY KEY,
+    agent TEXT,
+    provider TEXT NOT NULL,
+    plan TEXT NOT NULL,
+    monthly_fee_usd REAL NOT NULL DEFAULT 0,
+    included_usage_usd REAL NOT NULL DEFAULT 0,
+    billing_cycle_start TEXT,
+    reset_policy TEXT DEFAULT 'monthly',
+    active INTEGER NOT NULL DEFAULT 1,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS usage_snapshots (
+    id TEXT PRIMARY KEY,
+    agent TEXT NOT NULL,
+    date TEXT NOT NULL,
+    metric TEXT NOT NULL,
+    value REAL NOT NULL DEFAULT 0,
+    unit TEXT DEFAULT '',
+    machine_id TEXT DEFAULT '',
+    updated_at TEXT NOT NULL
+  )`,
+    `CREATE TABLE IF NOT EXISTS savings_daily (
+    date TEXT NOT NULL,
+    agent TEXT DEFAULT '',
+    api_equivalent_usd REAL NOT NULL DEFAULT 0,
+    subscription_fee_usd REAL NOT NULL DEFAULT 0,
+    included_consumed_usd REAL NOT NULL DEFAULT 0,
+    on_demand_usd REAL NOT NULL DEFAULT 0,
+    saved_usd REAL NOT NULL DEFAULT 0,
+    updated_at TEXT NOT NULL,
+    PRIMARY KEY (date, agent)
+  )`,
+    `CREATE TABLE IF NOT EXISTS machines (
+    machine_id TEXT PRIMARY KEY,
+    hostname TEXT NOT NULL,
+    last_seen_at TEXT,
+    last_push_at TEXT,
+    last_pull_at TEXT,
+    economy_version TEXT,
+    updated_at TEXT NOT NULL
+  )`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cost_basis TEXT DEFAULT 'estimated'`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS attribution_tag TEXT DEFAULT ''`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS updated_at TEXT DEFAULT ''`,
+    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS synced_at TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS attribution_tag TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS updated_at TEXT DEFAULT ''`,
+    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS synced_at TEXT DEFAULT ''`,
+    `CREATE INDEX IF NOT EXISTS idx_usage_agent_date ON usage_snapshots(agent, date)`,
+    `CREATE INDEX IF NOT EXISTS idx_savings_date ON savings_daily(date)`
+  ];
+});
+
+// src/ingest/billing.ts
+var exports_billing = {};
+__export(exports_billing, {
+  syncOpenAIBilling: () => syncOpenAIBilling,
+  syncGeminiBilling: () => syncGeminiBilling,
+  syncAnthropicBilling: () => syncAnthropicBilling
+});
+import { readFileSync as readFileSync10 } from "fs";
+function getAnthropicAdminKey() {
+  return process.env["HASNAXYZ_ANTHROPIC_LIVE_ADMIN_API_KEY"] ?? process.env["ANTHROPIC_ADMIN_API_KEY"] ?? null;
+}
+function getOpenAIAdminKey() {
+  return process.env["HASNAXYZ_OPENAI_LIVE_ADMIN_API_KEY"] ?? process.env["OPENAI_ADMIN_API_KEY"] ?? null;
+}
+function getGeminiBillingExportPath() {
+  return process.env["HASNA_ECONOMY_GEMINI_BILLING_EXPORT_PATH"] ?? process.env["HASNAXYZ_ECONOMY_GEMINI_BILLING_EXPORT_PATH"] ?? process.env["GEMINI_BILLING_EXPORT_PATH"] ?? null;
+}
+function toISODate(d) {
+  return d.toISOString().substring(0, 10);
+}
+function parseDate(value) {
+  if (typeof value !== "string" || !value.trim())
+    return null;
+  const d = new Date(value);
+  if (Number.isNaN(d.getTime()))
+    return value.substring(0, 10);
+  return toISODate(d);
+}
+function parseCsv(content) {
+  const lines = content.split(/\r?\n/).filter((line) => line.trim());
+  if (lines.length < 2)
+    return [];
+  const headers = parseCsvLine(lines[0]).map((h) => h.trim());
+  return lines.slice(1).map((line) => {
+    const values = parseCsvLine(line);
+    return Object.fromEntries(headers.map((header, i) => [header, values[i]?.trim() ?? ""]));
+  });
+}
+function parseCsvLine(line) {
+  const values = [];
+  let value = "";
+  let quoted = false;
+  for (let i = 0;i < line.length; i++) {
+    const char = line[i];
+    if (char === '"') {
+      if (quoted && line[i + 1] === '"') {
+        value += '"';
+        i++;
+      } else {
+        quoted = !quoted;
+      }
+    } else if (char === "," && !quoted) {
+      values.push(value);
+      value = "";
+    } else {
+      value += char;
+    }
+  }
+  values.push(value);
+  return values;
+}
+function parseBillingRows(content) {
+  const trimmed = content.trim();
+  if (!trimmed)
+    return [];
+  try {
+    const parsed = JSON.parse(trimmed);
+    if (Array.isArray(parsed))
+      return parsed;
+    if (parsed && typeof parsed === "object" && Array.isArray(parsed["rows"])) {
+      return parsed["rows"];
+    }
+  } catch {}
+  const jsonlRows = [];
+  for (const line of trimmed.split(/\r?\n/)) {
+    try {
+      const parsed = JSON.parse(line);
+      if (parsed && typeof parsed === "object")
+        jsonlRows.push(parsed);
+    } catch {
+      jsonlRows.length = 0;
+      break;
+    }
+  }
+  if (jsonlRows.length > 0)
+    return jsonlRows;
+  return parseCsv(content);
+}
+async function syncAnthropicBilling(db, opts = {}) {
+  const key = getAnthropicAdminKey();
+  if (!key)
+    throw new Error("Missing Anthropic admin key (HASNAXYZ_ANTHROPIC_LIVE_ADMIN_API_KEY)");
+  const now = new Date;
+  const end = opts.toDate ? new Date(opts.toDate) : new Date(now.getTime() + 24 * 3600000);
+  const days = opts.days ?? 31;
+  const start = opts.fromDate ? new Date(opts.fromDate) : new Date(end.getTime() - days * 24 * 3600000);
+  const startIso = start.toISOString().replace(/\.\d+/, "").replace(/:\d{2}Z$/, ":00Z");
+  const endIso = end.toISOString().replace(/\.\d+/, "").replace(/:\d{2}Z$/, ":00Z");
+  let totalUsd = 0;
+  const buckets = [];
+  let nextPage;
+  do {
+    const url = new URL("https://api.anthropic.com/v1/organizations/cost_report");
+    url.searchParams.set("starting_at", startIso);
+    url.searchParams.set("ending_at", endIso);
+    url.searchParams.set("bucket_width", "1d");
+    url.searchParams.set("limit", "31");
+    url.searchParams.append("group_by[]", "description");
+    if (nextPage)
+      url.searchParams.set("page", nextPage);
+    const res = await fetch(url.toString(), {
+      headers: { "anthropic-version": "2023-06-01", "x-api-key": key }
+    });
+    const data = await res.json();
+    if (data.error)
+      throw new Error(`Anthropic API: ${data.error.message}`);
+    if (data.data)
+      buckets.push(...data.data);
+    nextPage = data.has_more ? data.next_page : undefined;
+  } while (nextPage);
+  const fromDateStr = toISODate(start);
+  const toDateStr = toISODate(new Date(end.getTime() - 1000));
+  clearBillingRange(db, "anthropic", fromDateStr, toDateStr);
+  const updatedAt = new Date().toISOString();
+  for (const bucket of buckets) {
+    const date = bucket.starting_at.substring(0, 10);
+    for (const r of bucket.results) {
+      const usd = Number(r.amount) / 100;
+      if (usd === 0)
+        continue;
+      const desc = (r.description ?? "unknown").substring(0, 200);
+      upsertBillingDaily(db, { date, provider: "anthropic", description: desc, cost_usd: usd, updated_at: updatedAt });
+      totalUsd += usd;
+    }
+  }
+  return { days: buckets.length, totalUsd };
+}
+async function syncOpenAIBilling(db, opts = {}) {
+  const key = getOpenAIAdminKey();
+  if (!key)
+    throw new Error("Missing OpenAI admin key (HASNAXYZ_OPENAI_LIVE_ADMIN_API_KEY)");
+  const now = new Date;
+  const end = opts.toDate ? new Date(opts.toDate) : now;
+  const days = opts.days ?? 31;
+  const start = opts.fromDate ? new Date(opts.fromDate) : new Date(end.getTime() - days * 24 * 3600000);
+  const startSec = Math.floor(start.getTime() / 1000);
+  const endSec = Math.floor(end.getTime() / 1000);
+  let totalUsd = 0;
+  const buckets = [];
+  let nextPage;
+  do {
+    const url = new URL("https://api.openai.com/v1/organization/costs");
+    url.searchParams.set("start_time", String(startSec));
+    url.searchParams.set("end_time", String(endSec));
+    url.searchParams.set("bucket_width", "1d");
+    url.searchParams.set("limit", "31");
+    url.searchParams.append("group_by[]", "line_item");
+    if (nextPage)
+      url.searchParams.set("page", nextPage);
+    const res = await fetch(url.toString(), {
+      headers: { Authorization: `Bearer ${key}` }
+    });
+    const data = await res.json();
+    if (data.error)
+      throw new Error(`OpenAI API: ${data.error.message}`);
+    if (data.data)
+      buckets.push(...data.data);
+    nextPage = data.has_more ? data.next_page : undefined;
+  } while (nextPage);
+  const fromDateStr = toISODate(start);
+  const toDateStr = toISODate(new Date(end.getTime() - 1000));
+  clearBillingRange(db, "openai", fromDateStr, toDateStr);
+  const updatedAt = new Date().toISOString();
+  for (const bucket of buckets) {
+    const date = new Date(bucket.start_time * 1000).toISOString().substring(0, 10);
+    for (const r of bucket.results) {
+      const usd = Number(r.amount?.value ?? 0);
+      if (usd === 0)
+        continue;
+      const desc = (r.line_item ?? "unknown").substring(0, 200);
+      upsertBillingDaily(db, { date, provider: "openai", description: desc, cost_usd: usd, updated_at: updatedAt });
+      totalUsd += usd;
+    }
+  }
+  return { days: buckets.length, totalUsd };
+}
+async function syncGeminiBilling(db, opts = {}) {
+  const exportPath = getGeminiBillingExportPath();
+  if (!exportPath) {
+    return {
+      days: 0,
+      totalUsd: 0,
+      skipped: "Missing Gemini billing export path (HASNA_ECONOMY_GEMINI_BILLING_EXPORT_PATH, HASNAXYZ_ECONOMY_GEMINI_BILLING_EXPORT_PATH, or GEMINI_BILLING_EXPORT_PATH)"
+    };
+  }
+  const now = new Date;
+  const end = opts.toDate ? new Date(opts.toDate) : now;
+  const days = opts.days ?? 31;
+  const start = opts.fromDate ? new Date(opts.fromDate) : new Date(end.getTime() - days * 24 * 3600000);
+  const fromDateStr = toISODate(start);
+  const toDateStr = toISODate(end);
+  const rows = parseBillingRows(readFileSync10(exportPath, "utf-8"));
+  clearBillingRange(db, "gemini", fromDateStr, toDateStr);
+  const updatedAt = new Date().toISOString();
+  let totalUsd = 0;
+  const seenDays = new Set;
+  for (const row of rows) {
+    const date = parseDate(row["date"] ?? row["usage_start_time"] ?? row["start_time"] ?? row["invoice.month"]);
+    if (!date || date < fromDateStr || date > toDateStr)
+      continue;
+    const rawCost = row["cost_usd"] ?? row["costUsd"] ?? row["cost"] ?? row["amount"];
+    const costUsd = Number(rawCost);
+    if (!Number.isFinite(costUsd) || costUsd === 0)
+      continue;
+    const service = row["service.description"] ?? row["service"] ?? row["provider"] ?? "";
+    const sku = row["sku.description"] ?? row["sku"] ?? row["description"] ?? "Gemini API";
+    const description = `${String(service || "Google AI")}: ${String(sku)}`.substring(0, 200);
+    upsertBillingDaily(db, { date, provider: "gemini", description, cost_usd: costUsd, updated_at: updatedAt });
+    totalUsd += costUsd;
+    seenDays.add(date);
+  }
+  return { days: seenDays.size, totalUsd };
+}
+var init_billing = __esm(() => {
+  init_database();
+});
+
+// src/lib/open-projects.ts
+var exports_open_projects = {};
+__export(exports_open_projects, {
+  syncOpenProjectsRegistry: () => syncOpenProjectsRegistry
+});
+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 };
+}
+var init_open_projects = __esm(() => {
+  init_database();
+});
+
+// src/lib/config.ts
+import { existsSync as existsSync10, readFileSync as readFileSync11, writeFileSync, mkdirSync as mkdirSync2 } from "fs";
+import { dirname, join as join9 } from "path";
+function getConfigPath() {
+  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join9(getDataDir(), "config.json");
+}
+function loadConfig() {
+  try {
+    const configPath = getConfigPath();
+    if (existsSync10(configPath)) {
+      const raw = readFileSync11(configPath, "utf-8");
+      return { ...DEFAULTS, ...JSON.parse(raw) };
+    }
+  } catch {}
+  return { ...DEFAULTS };
+}
+var DEFAULTS;
+var init_config = __esm(() => {
+  init_database();
+  DEFAULTS = {
+    port: 3456,
+    "default-period": "today",
+    "auto-sync": true,
+    "sync-interval": 30,
+    "alert-thresholds": [5, 10, 25, 50, 100],
+    "webhook-url": null
+  };
+});
+
+// src/lib/spikes.ts
+function detectCostSpikes(dailyTotals, opts) {
+  const windowDays = opts?.windowDays ?? 7;
+  const multiplier = opts?.multiplier ?? 2;
+  const sorted = [...dailyTotals].sort((a, b) => a.date.localeCompare(b.date));
+  const spikes = [];
+  for (let i = windowDays;i < sorted.length; i++) {
+    const window = sorted.slice(i - windowDays, i);
+    const avg = window.reduce((s, d) => s + d.cost_usd, 0) / window.length;
+    const current = sorted[i];
+    if (avg > 0 && current.cost_usd > avg * multiplier) {
+      spikes.push({
+        date: current.date,
+        cost_usd: current.cost_usd,
+        average_usd: avg,
+        ratio: current.cost_usd / avg
+      });
+    }
+  }
+  return spikes;
+}
+function queryRecentSpikes(db, days = 14) {
+  const rows = db.prepare(`
+    SELECT DATE(timestamp) as date, COALESCE(SUM(cost_usd), 0) as cost_usd
+    FROM requests
+    WHERE timestamp >= DATE('now', '-' || ? || ' days')
+    GROUP BY DATE(timestamp)
+    ORDER BY date ASC
+  `).all(days);
+  return detectCostSpikes(rows);
+}
+function getTodaySpike(db) {
+  const today = new Date().toISOString().substring(0, 10);
+  const spikes = queryRecentSpikes(db, 14);
+  return spikes.find((s) => s.date === today) ?? null;
+}
+
+// src/lib/webhooks.ts
+var exports_webhooks = {};
+__export(exports_webhooks, {
+  checkAndFireWebhooks: () => checkAndFireWebhooks
+});
+async function checkAndFireWebhooks(db) {
+  const config = loadConfig();
+  const url = config["webhook-url"];
+  if (!url)
+    return;
+  const statuses = getBudgetStatuses(db);
+  for (const b of statuses) {
+    if (!b.is_over_alert)
+      continue;
+    const key = `webhook-budget-${b.id}-${b.period}`;
+    const lastFired = getIngestState(db, "webhook", key);
+    const pctBucket = Math.floor(b.percent_used / 10) * 10;
+    if (lastFired === String(pctBucket))
+      continue;
+    const delivered = await fireWebhook(url, {
+      event: "budget_alert",
+      budget_id: b.id,
+      project: b.project_path ?? "global",
+      period: b.period,
+      spend: b.current_spend_usd,
+      limit: b.limit_usd,
+      percent: Math.round(b.percent_used * 10) / 10
+    });
+    if (delivered)
+      setIngestState(db, "webhook", key, String(pctBucket));
+  }
+  const spike = getTodaySpike(db);
+  if (spike) {
+    const key = `webhook-spike-${spike.date}`;
+    if (getIngestState(db, "webhook", key) !== "1") {
+      const delivered = await fireWebhook(url, {
+        event: "cost_spike",
+        date: spike.date,
+        cost_usd: spike.cost_usd,
+        average_usd: spike.average_usd,
+        ratio: Math.round(spike.ratio * 100) / 100
+      });
+      if (delivered)
+        setIngestState(db, "webhook", key, "1");
+    }
+  }
+}
+async function fireWebhook(url, payload) {
+  try {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(payload),
+      signal: AbortSignal.timeout(5000)
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
+}
+var init_webhooks = __esm(() => {
+  init_config();
+  init_database();
+});
+
 // src/server/serve.ts
 init_database();
+init_pricing();
+
+// src/lib/agents.ts
+var AGENTS = [
+  "claude",
+  "takumi",
+  "codex",
+  "gemini",
+  "opencode",
+  "cursor",
+  "pi",
+  "hermes"
+];
+function isAgent(value) {
+  return AGENTS.includes(value);
+}
 
 // src/ingest/claude.ts
 init_database();
@@ -657,17 +1789,120 @@ init_pricing();
 import { readdirSync as readdirSync2, readFileSync, existsSync as existsSync2, statSync as statSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2, basename } from "path";
-function autoDetectProject(cwd, projects) {
-  return projects.find((p) => cwd === p.path || cwd.startsWith(p.path + "/"));
-}
-var CLAUDE_PROJECTS_DIR = join2(homedir2(), ".claude", "projects");
-var TAKUMI_PROJECTS_DIR = join2(homedir2(), ".takumi", "projects");
-function dirNameToPath(dirName) {
-  return dirName.replace(/^-/, "/").replace(/-/g, "/").replace(/\/\//g, "/-");
+
+// src/lib/savings.ts
+function periodWhere2(period, column) {
+  switch (period) {
+    case "today":
+      return `DATE(${column}) = DATE('now')`;
+    case "yesterday":
+      return `DATE(${column}) = DATE('now', '-1 day')`;
+    case "week":
+      return `${column} >= DATE('now', 'weekday 0', '-7 days')`;
+    case "month":
+      return `${column} >= DATE('now', 'start of month')`;
+    case "year":
+      return `${column} >= DATE('now', 'start of year')`;
+    case "all":
+      return "1=1";
+  }
 }
-function collectJsonlFiles(projectDir) {
-  const files = [];
-  function walk(dir) {
+function prorateMonthlyFee(monthlyFee, period) {
+  const now = new Date;
+  const dayOfMonth = now.getDate();
+  const daysInMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate();
+  switch (period) {
+    case "today":
+    case "yesterday":
+      return monthlyFee / daysInMonth;
+    case "week":
+      return monthlyFee / daysInMonth * 7;
+    case "month":
+      return monthlyFee;
+    case "year":
+      return monthlyFee * 12;
+    case "all":
+      return monthlyFee;
+  }
+}
+function computeSavedUsd(apiEquivalent, onDemand, subscriptionFee) {
+  return Math.max(0, apiEquivalent - onDemand - subscriptionFee);
+}
+function querySavingsSummary(db, period, agent) {
+  const where = periodWhere2(period, "timestamp");
+  const agentClause = agent ? " AND agent = ?" : "";
+  const params = agent ? [agent] : [];
+  const apiRow = db.prepare(`
+    SELECT COALESCE(SUM(cost_usd), 0) as total
+    FROM requests
+    WHERE ${where}${agentClause}
+      AND COALESCE(cost_basis, 'estimated') IN ('metered_api', 'estimated', 'unknown')
+  `).get(...params);
+  const includedRow = db.prepare(`
+    SELECT COALESCE(SUM(cost_usd), 0) as total
+    FROM requests
+    WHERE ${where}${agentClause}
+      AND cost_basis = 'subscription_included'
+  `).get(...params);
+  const subWhere = periodWhere2(period, "date");
+  const onDemandRow = db.prepare(`
+    SELECT COALESCE(SUM(value), 0) as total
+    FROM usage_snapshots
+    WHERE ${subWhere}${agent ? " AND agent = ?" : ""}
+      AND metric = 'on_demand_usd'
+  `).get(...params);
+  const subs = db.prepare(`
+    SELECT COALESCE(SUM(monthly_fee_usd), 0) as total
+    FROM subscriptions
+    WHERE active = 1${agent ? " AND agent = ?" : ""}
+  `).get(...agent ? [agent] : []);
+  const subscriptionFee = prorateMonthlyFee(subs.total, period);
+  const apiEquivalent = apiRow.total + includedRow.total;
+  const onDemand = onDemandRow.total;
+  const saved = computeSavedUsd(apiEquivalent, onDemand, subscriptionFee);
+  const byAgent = {};
+  if (!agent) {
+    for (const row of db.prepare(`
+      SELECT agent, COALESCE(SUM(cost_usd), 0) as api_eq
+      FROM requests WHERE ${where}
+      GROUP BY agent
+    `).all()) {
+      byAgent[row.agent] = {
+        api_equivalent_usd: row.api_eq,
+        saved_usd: row.api_eq
+      };
+    }
+  }
+  return {
+    period,
+    api_equivalent_usd: apiEquivalent,
+    subscription_fee_usd: subscriptionFee,
+    included_consumed_usd: includedRow.total,
+    on_demand_usd: onDemand,
+    saved_usd: saved,
+    by_agent: byAgent
+  };
+}
+function defaultCostBasisForAgent(agent) {
+  if (agent === "claude")
+    return "metered_api";
+  if (agent === "cursor")
+    return "subscription_included";
+  return "estimated";
+}
+
+// src/ingest/claude.ts
+function autoDetectProject(cwd, projects) {
+  return projects.find((p) => cwd === p.path || cwd.startsWith(p.path + "/"));
+}
+var CLAUDE_PROJECTS_DIR = join2(homedir2(), ".claude", "projects");
+var TAKUMI_PROJECTS_DIR = join2(homedir2(), ".takumi", "projects");
+function dirNameToPath(dirName) {
+  return dirName.replace(/^-/, "/").replace(/-/g, "/").replace(/\/\//g, "/-");
+}
+function collectJsonlFiles(projectDir) {
+  const files = [];
+  function walk(dir) {
     try {
       for (const entry of readdirSync2(dir, { withFileTypes: true })) {
         if (entry.isDirectory())
@@ -680,11 +1915,11 @@ function collectJsonlFiles(projectDir) {
   walk(projectDir);
   return files;
 }
-async function ingestClaude(db, verbose = false, _telemetryDir) {
-  return ingestJsonlProjects(db, CLAUDE_PROJECTS_DIR, "claude", verbose);
+async function ingestClaude(db, verbose = false, projectsDir = CLAUDE_PROJECTS_DIR) {
+  return ingestJsonlProjects(db, projectsDir, "claude", verbose);
 }
-async function ingestTakumi(db, verbose = false) {
-  return ingestJsonlProjects(db, TAKUMI_PROJECTS_DIR, "takumi", verbose);
+async function ingestTakumi(db, verbose = false, projectsDir = TAKUMI_PROJECTS_DIR) {
+  return ingestJsonlProjects(db, projectsDir, "takumi", verbose);
 }
 async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false) {
   if (!existsSync2(projectsDir)) {
@@ -745,13 +1980,21 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
           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 = `${agentName}-${sessionId}-${timestamp}`;
+        let costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, cacheWrite5mTokens, cacheWrite1hTokens);
+        costUsd = applyClaudeModifiers(costUsd, model, usage, entry);
+        const serverToolUse = usage.server_tool_use;
+        if (serverToolUse?.web_search_requests) {
+          costUsd += serverToolUse.web_search_requests * 0.01;
+        }
+        const sourceRequestId = entry.requestId ?? entry.request_id ?? entry.message.id ?? entry.uuid ?? `${sessionId}-${timestamp}`;
+        const reqId = `${agentName}-${sourceRequestId}`;
         upsertRequest(db, {
           id: reqId,
           agent: agentName,
@@ -761,10 +2004,13 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
           output_tokens: outputTokens,
           cache_read_tokens: cacheReadTokens,
           cache_create_tokens: cacheWriteTokens,
+          cache_create_5m_tokens: cacheWrite5mTokens,
+          cache_create_1h_tokens: cacheWrite1hTokens,
           cost_usd: costUsd,
+          cost_basis: defaultCostBasisForAgent(agentName),
           duration_ms: 0,
           timestamp,
-          source_request_id: reqId,
+          source_request_id: sourceRequestId,
           machine_id: machineId
         });
         if (!touchedSessions.has(sessionId)) {
@@ -799,82 +2045,254 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
   }
   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 existsSync3, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join3, basename as basename2 } from "path";
 import { Database as BunDatabase } from "bun:sqlite";
-var CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
-var CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
+var DEFAULT_CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
+var DEFAULT_CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
+var CODEX_INGEST_VERSION = "rollout-token-dedupe-v2";
+function codexDbPath() {
+  return process.env["HASNA_ECONOMY_CODEX_DB_PATH"] ?? DEFAULT_CODEX_DB_PATH;
+}
+function codexConfigPath() {
+  return process.env["HASNA_ECONOMY_CODEX_CONFIG_PATH"] ?? DEFAULT_CODEX_CONFIG_PATH;
+}
+function readCodexModel() {
+  const configPath = codexConfigPath();
+  if (!existsSync3(configPath))
+    return "gpt-5-codex";
+  try {
+    const content = readFileSync2(configPath, "utf-8");
+    const match = content.match(/^model\s*=\s*"([^"]+)"/m);
+    return match?.[1] ?? "gpt-5-codex";
+  } catch {
+    return "gpt-5-codex";
+  }
+}
+function buildThreadQuery(codexDb) {
+  const cols = new Set(codexDb.prepare(`PRAGMA table_info(threads)`).all().map((c) => c.name));
+  const modelSelect = cols.has("model") ? "model" : "NULL AS model";
+  const rolloutSelect = cols.has("rollout_path") ? "rollout_path" : "NULL AS rollout_path";
+  const providerSelect = cols.has("model_provider") ? "model_provider" : "NULL AS model_provider";
+  return `
+    SELECT id, ${rolloutSelect}, cwd, created_at, updated_at, tokens_used, title,
+           ${providerSelect}, ${modelSelect}
+    FROM threads WHERE tokens_used > 0
+  `;
+}
+function readTokenEvents(rolloutPath) {
+  if (!rolloutPath || !existsSync3(rolloutPath))
+    return [];
+  const events = [];
+  const seen = new Set;
+  for (const line of readFileSync2(rolloutPath, "utf-8").split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (!entry || typeof entry !== "object")
+      continue;
+    const payload = entry["payload"];
+    if (!payload || payload["type"] !== "token_count")
+      continue;
+    const info = payload["info"];
+    const usage = info?.["last_token_usage"];
+    if (!usage)
+      continue;
+    const total = usage.total_tokens ?? (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0);
+    if (total <= 0)
+      continue;
+    const key = JSON.stringify(usage);
+    if (seen.has(key))
+      continue;
+    seen.add(key);
+    const timestamp = entry["timestamp"];
+    events.push({ usage, timestamp: typeof timestamp === "string" ? timestamp : undefined });
+  }
+  return events;
+}
+function fallbackEvents(totalTokens) {
+  const inputTokens = Math.floor(totalTokens * 0.6);
+  return [{
+    usage: {
+      input_tokens: inputTokens,
+      cached_input_tokens: 0,
+      output_tokens: totalTokens - inputTokens,
+      total_tokens: totalTokens
+    }
+  }];
+}
 async function ingestCodex(db, verbose = false) {
-  if (!existsSync3(CODEX_DB_PATH)) {
+  const dbPath = codexDbPath();
+  if (!existsSync3(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;
   try {
-    codexDb = new BunDatabase(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}`,
+        id: sessionId,
         agent: "codex",
         project_path: projectPath,
         project_name: projectName,
         started_at: startedAt,
         ended_at: endedAt,
-        total_cost_usd: costUsd,
-        total_tokens: thread.tokens_used,
-        request_count: 1,
+        total_cost_usd: 0,
+        total_tokens: 0,
+        request_count: 0,
         machine_id: machineId
       });
-      setIngestState(db, "codex", stateKey, "done");
+      const events = readTokenEvents(thread.rollout_path);
+      const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+      db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
+      tokenEvents.forEach((event, index) => {
+        const usage = event.usage;
+        const inputTotal = usage.input_tokens ?? 0;
+        const cacheReadTokens = usage.cached_input_tokens ?? 0;
+        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+        const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
+        const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
+        const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
+        const requestId = `${sessionId}-${index}`;
+        upsertRequest(db, {
+          id: requestId,
+          agent: "codex",
+          session_id: sessionId,
+          model,
+          input_tokens: inputTokens,
+          output_tokens: outputTokens,
+          cache_read_tokens: cacheReadTokens,
+          cache_create_tokens: 0,
+          cost_usd: costUsd,
+          cost_basis: defaultCostBasisForAgent("codex"),
+          duration_ms: 0,
+          timestamp,
+          source_request_id: requestId,
+          machine_id: machineId
+        });
+        requests++;
+      });
+      rollupSession(db, sessionId);
+      setIngestState(db, "codex", thread.id, stateValue);
       ingested++;
       if (verbose)
-        console.log(`Codex session ${thread.id}: ${thread.tokens_used} tokens \u2192 $${costUsd.toFixed(4)}`);
+        console.log(`Codex session ${thread.id}: ${thread.tokens_used} tokens on ${model}`);
     }
   } finally {
     codexDb?.close();
   }
-  return { sessions: ingested };
+  return { sessions: ingested, requests };
 }
 
 // src/ingest/gemini.ts
 init_database();
+init_pricing();
 import { readdirSync as readdirSync3, readFileSync as readFileSync3, existsSync as existsSync4, statSync as statSync3 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
-var GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
+import { join as join4, basename as basename3 } from "path";
+var DEFAULT_GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
+var DEFAULT_GEMINI_HISTORY_DIR = join4(homedir4(), ".gemini", "history");
+function geminiTmpDir() {
+  return process.env["HASNA_ECONOMY_GEMINI_TMP_DIR"] ?? DEFAULT_GEMINI_TMP_DIR;
+}
+function geminiHistoryDir() {
+  return process.env["HASNA_ECONOMY_GEMINI_HISTORY_DIR"] ?? DEFAULT_GEMINI_HISTORY_DIR;
+}
+function numberField(...values) {
+  for (const value of values) {
+    if (typeof value === "number" && Number.isFinite(value))
+      return value;
+  }
+  return 0;
+}
+function listProjectDirs(...roots) {
+  const dirs = new Set;
+  for (const root of roots) {
+    if (!existsSync4(root))
+      continue;
+    try {
+      for (const entry of readdirSync3(root, { withFileTypes: true })) {
+        if (entry.isDirectory())
+          dirs.add(join4(root, entry.name));
+      }
+    } catch {}
+  }
+  return [...dirs];
+}
+function projectRoot(projectDir, chatData) {
+  if (chatData.projectPath)
+    return chatData.projectPath;
+  if (chatData.project_path)
+    return chatData.project_path;
+  const rootFile = join4(projectDir, ".project_root");
+  try {
+    if (existsSync4(rootFile))
+      return readFileSync3(rootFile, "utf-8").trim();
+  } catch {}
+  return "";
+}
 async function ingestGemini(db, verbose) {
-  if (!existsSync4(GEMINI_TMP_DIR)) {
+  const tmpDir = geminiTmpDir();
+  const historyDir = geminiHistoryDir();
+  if (!existsSync4(tmpDir) && !existsSync4(historyDir)) {
     if (verbose)
-      console.log("Gemini tmp dir not found:", GEMINI_TMP_DIR);
-    return { sessions: 0 };
+      console.log("Gemini tmp/history dirs not found:", tmpDir, historyDir);
+    return { sessions: 0, requests: 0 };
   }
   const machineId = getMachineId();
   let totalSessions = 0;
+  let totalRequests = 0;
   const touchedSessions = new Set;
-  let projectHashDirs = [];
-  try {
-    projectHashDirs = readdirSync3(GEMINI_TMP_DIR, { withFileTypes: true }).filter((d) => d.isDirectory() && /^[0-9a-f]{64}$/.test(d.name)).map((d) => join4(GEMINI_TMP_DIR, d.name));
-  } catch {
-    return { sessions: 0 };
-  }
-  for (const projectDir of projectHashDirs) {
+  const projectDirs = listProjectDirs(tmpDir, historyDir);
+  for (const projectDir of projectDirs) {
     const chatsDir = join4(projectDir, "chats");
     if (!existsSync4(chatsDir))
       continue;
@@ -901,17 +2319,19 @@ async function ingestGemini(db, verbose) {
       } catch {
         continue;
       }
-      const sessionId = chatData.sessionId;
+      const sessionId = chatData.sessionId ?? chatData.id ?? basename3(filePath, ".json");
       if (!sessionId)
         continue;
       const startTime = chatData.startTime ?? new Date().toISOString();
+      const projectPath = projectRoot(projectDir, chatData);
+      const projectName = projectPath ? basename3(projectPath) : "";
       const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
       if (!existing) {
         const session = {
           id: sessionId,
           agent: "gemini",
-          project_path: "",
-          project_name: "",
+          project_path: projectPath,
+          project_name: projectName,
           started_at: startTime,
           ended_at: chatData.lastUpdated ?? null,
           total_cost_usd: 0,
@@ -920,26 +2340,1074 @@ async function ingestGemini(db, verbose) {
           machine_id: machineId
         };
         upsertSession(db, session);
-        touchedSessions.add(sessionId);
         totalSessions++;
       }
+      touchedSessions.add(sessionId);
+      for (const [index, message] of (chatData.messages ?? []).entries()) {
+        const usage = message.usage ?? message.usageMetadata ?? message.response?.usageMetadata;
+        if (!usage)
+          continue;
+        const model = message.model ?? message.response?.modelVersion ?? message.response?.model ?? chatData.model;
+        if (!model)
+          continue;
+        const toolUsePromptTokens = numberField(usage.toolUsePromptTokenCount, usage.tool_use_prompt_token_count);
+        const inputTotal = numberField(usage.inputTokens, usage.input_tokens, usage.promptTokenCount, usage.prompt_token_count) + toolUsePromptTokens;
+        const cacheReadTokens = numberField(usage.cachedInputTokens, usage.cache_read_tokens, usage.cachedContentTokenCount, usage.cached_content_token_count);
+        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+        const thoughtsTokens = numberField(usage.thoughtsTokenCount, usage.thoughts_token_count);
+        const outputTokens = numberField(usage.outputTokens, usage.output_tokens, usage.candidatesTokenCount, usage.candidates_token_count) + thoughtsTokens;
+        const totalTokens = numberField(usage.totalTokens, usage.total_tokens, usage.totalTokenCount, usage.total_token_count);
+        if (inputTokens + outputTokens + cacheReadTokens + totalTokens === 0)
+          continue;
+        const computedCost = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
+        const costUsd = numberField(message.costUsd, message.cost_usd) || computedCost;
+        const timestamp = message.timestamp ?? chatData.lastUpdated ?? startTime;
+        const requestId = `gemini-${sessionId}-${message.id ?? index}`;
+        upsertRequest(db, {
+          id: requestId,
+          agent: "gemini",
+          session_id: sessionId,
+          model,
+          input_tokens: inputTokens,
+          output_tokens: outputTokens,
+          cache_read_tokens: cacheReadTokens,
+          cache_create_tokens: 0,
+          cost_usd: costUsd,
+          cost_basis: defaultCostBasisForAgent("gemini"),
+          duration_ms: 0,
+          timestamp,
+          source_request_id: message.id ?? requestId,
+          machine_id: machineId
+        });
+        totalRequests++;
+      }
       setIngestState(db, "gemini", stateKey, fileMtime);
     }
   }
   for (const sessionId of touchedSessions) {
     rollupSession(db, sessionId);
   }
-  return { sessions: totalSessions };
+  return { sessions: totalSessions, requests: totalRequests };
 }
 
-// src/server/serve.ts
+// src/ingest/opencode.ts
+init_database();
 init_pricing();
+import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join5 } from "path";
+var OPENCODE_STORAGE = join5(homedir5(), ".local", "share", "opencode", "storage");
+function walkJsonFiles(dir, acc = []) {
+  if (!existsSync5(dir))
+    return acc;
+  for (const entry of readdirSync4(dir, { withFileTypes: true })) {
+    const p = join5(dir, entry.name);
+    if (entry.isDirectory())
+      walkJsonFiles(p, acc);
+    else if (entry.name.endsWith(".json"))
+      acc.push(p);
+  }
+  return acc;
+}
+function parseSessionIdFromPath(filePath) {
+  const parts = filePath.split("/");
+  const msgIdx = parts.indexOf("message");
+  if (msgIdx >= 0 && parts[msgIdx + 1])
+    return parts[msgIdx + 1];
+  const sessionIdx = parts.indexOf("session");
+  if (sessionIdx >= 0 && parts[parts.length - 1]?.endsWith(".json")) {
+    return parts[parts.length - 1].replace(/\.json$/, "");
+  }
+  return null;
+}
+async function ingestOpenCode(db, verbose = false) {
+  const messageDir = join5(OPENCODE_STORAGE, "message");
+  const files = walkJsonFiles(messageDir);
+  let requests = 0;
+  const touched = new Set;
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  for (const file of files) {
+    const mtime = statSync4(file).mtimeMs;
+    const stateKey = file;
+    const prev = getIngestState(db, "opencode", stateKey);
+    if (prev && Number(prev) >= mtime)
+      continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(readFileSync4(file, "utf-8"));
+    } catch {
+      continue;
+    }
+    if (parsed.role !== "assistant")
+      continue;
+    const usage = parsed.usage;
+    if (!usage)
+      continue;
+    const sessionId = parseSessionIdFromPath(file) ?? `opencode-${statSync4(file).ino}`;
+    const model = normalizeModelName(parsed.model ?? "unknown");
+    const input = usage.inputTokens ?? 0;
+    const output = usage.outputTokens ?? 0;
+    const cacheRead = usage.cacheReadTokens ?? 0;
+    const cacheWrite = usage.cacheWriteTokens ?? 0;
+    if (input + output + cacheRead + cacheWrite === 0 && !usage.cost)
+      continue;
+    const timestamp = usage && parsed.time?.created ? new Date(parsed.time.created).toISOString() : new Date(statSync4(file).mtime).toISOString();
+    const sourceId = file.replace(OPENCODE_STORAGE, "");
+    const reqId = `opencode-${sourceId}`;
+    const costUsd = usage.cost ?? computeCostFromDb(db, model, input, output, cacheRead, cacheWrite, 0);
+    upsertRequest(db, {
+      id: reqId,
+      agent: "opencode",
+      session_id: sessionId,
+      model,
+      input_tokens: input,
+      output_tokens: output,
+      cache_read_tokens: cacheRead,
+      cache_create_tokens: cacheWrite,
+      cost_usd: costUsd,
+      cost_basis: defaultCostBasisForAgent("opencode"),
+      duration_ms: 0,
+      timestamp,
+      source_request_id: sourceId,
+      machine_id: machineId,
+      updated_at: now
+    });
+    requests++;
+    if (!touched.has(sessionId)) {
+      upsertSession(db, {
+        id: sessionId,
+        agent: "opencode",
+        project_path: "",
+        project_name: "",
+        started_at: timestamp,
+        ended_at: null,
+        total_cost_usd: 0,
+        total_tokens: 0,
+        request_count: 0,
+        machine_id: machineId,
+        updated_at: now
+      });
+      touched.add(sessionId);
+    }
+    setIngestState(db, "opencode", stateKey, String(mtime));
+    if (verbose)
+      console.log(`  opencode: ${reqId} ${model} $${costUsd.toFixed(4)}`);
+  }
+  for (const sid of touched)
+    rollupSession(db, sid);
+  return { files: files.length, requests, sessions: touched.size };
+}
+
+// src/ingest/cursor.ts
+init_database();
+function getCursorSessionToken() {
+  return process.env["CURSOR_SESSION_TOKEN"] ?? process.env["CURSOR_API_TOKEN"] ?? null;
+}
+async function cursorFetch(path, token) {
+  try {
+    const res = await fetch(`https://cursor.com${path}`, {
+      headers: {
+        Cookie: `WorkosCursorSessionToken=${token}`,
+        Accept: "application/json"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok)
+      return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+async function ingestCursor(db, verbose = false) {
+  const token = getCursorSessionToken();
+  if (!token) {
+    if (verbose)
+      console.log("  cursor: skipped \u2014 set CURSOR_SESSION_TOKEN");
+    return { requests: 0, snapshots: 0 };
+  }
+  const today = new Date().toISOString().substring(0, 10);
+  const prev = getIngestState(db, "cursor", `sync-${today}`);
+  if (prev)
+    return { requests: 0, snapshots: 0 };
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  let snapshots = 0;
+  const usage = await cursorFetch("/api/usage", token);
+  if (usage?.premiumRequests != null && usage.maxPremiumRequests) {
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "premium_requests_used",
+      value: usage.premiumRequests,
+      unit: "count",
+      machine_id: machineId
+    });
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "premium_requests_limit",
+      value: usage.maxPremiumRequests,
+      unit: "count",
+      machine_id: machineId
+    });
+    snapshots += 2;
+  }
+  const summary = await cursorFetch("/api/usage-summary", token);
+  const onDemand = summary?.individualUsage?.spend ?? summary?.teamUsage?.spend ?? 0;
+  const included = summary?.individualUsage?.includedSpend ?? 0;
+  if (onDemand > 0) {
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "on_demand_usd",
+      value: onDemand,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  if (included > 0) {
+    upsertUsageSnapshot(db, {
+      agent: "cursor",
+      date: today,
+      metric: "included_consumed_usd",
+      value: included,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  const sessionId = `cursor-${today}-${machineId}`;
+  if (onDemand + included > 0) {
+    upsertSession(db, {
+      id: sessionId,
+      agent: "cursor",
+      project_path: "",
+      project_name: "Cursor subscription",
+      started_at: `${today}T00:00:00.000Z`,
+      ended_at: now,
+      total_cost_usd: onDemand + included,
+      total_tokens: 0,
+      request_count: 1,
+      machine_id: machineId,
+      updated_at: now
+    });
+    upsertRequest(db, {
+      id: `cursor-${today}-${machineId}-usage`,
+      agent: "cursor",
+      session_id: sessionId,
+      model: "cursor-subscription",
+      input_tokens: 0,
+      output_tokens: 0,
+      cache_read_tokens: 0,
+      cache_create_tokens: 0,
+      cost_usd: onDemand + included,
+      cost_basis: "subscription_included",
+      duration_ms: 0,
+      timestamp: now,
+      source_request_id: today,
+      machine_id: machineId,
+      updated_at: now
+    });
+    rollupSession(db, sessionId);
+  }
+  setIngestState(db, "cursor", `sync-${today}`, now);
+  if (verbose)
+    console.log(`  cursor: on-demand $${onDemand.toFixed(2)}, included $${included.toFixed(2)}`);
+  return { requests: onDemand + included > 0 ? 1 : 0, snapshots };
+}
+
+// src/ingest/pi.ts
+init_database();
+import { existsSync as existsSync6, readFileSync as readFileSync5, readdirSync as readdirSync5, statSync as statSync5 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join6 } from "path";
+var PI_SESSION_DIR = process.env["PI_CODING_AGENT_SESSION_DIR"] ?? join6(homedir6(), ".pi", "agent", "sessions");
+function walkSessions(dir, acc = []) {
+  if (!existsSync6(dir))
+    return acc;
+  for (const entry of readdirSync5(dir, { withFileTypes: true })) {
+    const p = join6(dir, entry.name);
+    if (entry.isDirectory())
+      walkSessions(p, acc);
+    else if (entry.name.endsWith(".json"))
+      acc.push(p);
+  }
+  return acc;
+}
+async function ingestPi(db, verbose = false) {
+  const files = walkSessions(PI_SESSION_DIR);
+  let requests = 0;
+  const touched = new Set;
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  for (const file of files) {
+    const mtime = statSync5(file).mtimeMs;
+    const prev = getIngestState(db, "pi", file);
+    if (prev && Number(prev) >= mtime)
+      continue;
+    let data;
+    try {
+      data = JSON.parse(readFileSync5(file, "utf-8"));
+    } catch {
+      continue;
+    }
+    const sessionId = data.id ?? file.replace(/\.json$/, "").split("/").pop() ?? `pi-${statSync5(file).ino}`;
+    const turns = data.turns ?? data.messages?.filter((m) => m.role === "assistant") ?? [];
+    for (let i = 0;i < turns.length; i++) {
+      const turn = turns[i];
+      const usage = turn.usage;
+      if (!usage)
+        continue;
+      const input = usage.input ?? 0;
+      const output = usage.output ?? 0;
+      if (input + output === 0 && !usage.cost)
+        continue;
+      const model = turn.model ?? turn.provider ?? "unknown";
+      const timestamp = turn.timestamp ?? new Date(statSync5(file).mtime).toISOString();
+      const reqId = `pi-${sessionId}-${i}`;
+      upsertRequest(db, {
+        id: reqId,
+        agent: "pi",
+        session_id: sessionId,
+        model,
+        input_tokens: input,
+        output_tokens: output,
+        cache_read_tokens: usage.cacheRead ?? 0,
+        cache_create_tokens: usage.cacheWrite ?? 0,
+        cost_usd: usage.cost ?? 0,
+        cost_basis: defaultCostBasisForAgent("pi"),
+        duration_ms: 0,
+        timestamp,
+        source_request_id: `${sessionId}-${i}`,
+        machine_id: machineId,
+        updated_at: now
+      });
+      requests++;
+    }
+    if (turns.length > 0) {
+      upsertSession(db, {
+        id: sessionId,
+        agent: "pi",
+        project_path: "",
+        project_name: "",
+        started_at: turns[0]?.timestamp ?? now,
+        ended_at: null,
+        total_cost_usd: 0,
+        total_tokens: 0,
+        request_count: 0,
+        machine_id: machineId,
+        updated_at: now
+      });
+      touched.add(sessionId);
+    }
+    setIngestState(db, "pi", file, String(mtime));
+    if (verbose)
+      console.log(`  pi: ${sessionId} (${turns.length} turns)`);
+  }
+  for (const sid of touched)
+    rollupSession(db, sid);
+  return { files: files.length, requests, sessions: touched.size };
+}
+
+// src/ingest/hermes.ts
+init_database();
+import { existsSync as existsSync7, statSync as statSync6 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join7 } from "path";
+var HERMES_DB = join7(homedir7(), ".hermes", "state.db");
+function mapCostBasis(billingMode) {
+  if (billingMode === "subscription")
+    return "subscription_included";
+  if (billingMode === "api")
+    return "metered_api";
+  return defaultCostBasisForAgent("hermes");
+}
+async function ingestHermes(db, verbose = false) {
+  if (!existsSync7(HERMES_DB)) {
+    return { sessions: 0, requests: 0 };
+  }
+  const { Database: Sqlite } = await import("bun:sqlite");
+  const hermes = new Sqlite(HERMES_DB, { readonly: true });
+  const rows = hermes.prepare(`
+    SELECT id, source, model, started_at, ended_at,
+           input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
+           reasoning_tokens, estimated_cost_usd, actual_cost_usd, billing_mode, parent_session_id
+    FROM sessions
+    ORDER BY started_at DESC
+  `).all();
+  const stateKey = "state.db";
+  const mtime = statSyncSafe(HERMES_DB);
+  const prev = getIngestState(db, "hermes", stateKey);
+  if (prev && Number(prev) >= mtime && rows.length === 0) {
+    hermes.close();
+    return { sessions: 0, requests: 0 };
+  }
+  const machineId = getMachineId();
+  const now = new Date().toISOString();
+  let requests = 0;
+  for (const row of rows) {
+    const sessionId = `hermes-${row.id}`;
+    const startedAt = new Date(row.started_at * 1000).toISOString();
+    const endedAt = row.ended_at ? new Date(row.ended_at * 1000).toISOString() : null;
+    const cost = row.actual_cost_usd ?? row.estimated_cost_usd ?? 0;
+    const tokens = row.input_tokens + row.output_tokens + row.cache_read_tokens + row.cache_write_tokens + row.reasoning_tokens;
+    upsertSession(db, {
+      id: sessionId,
+      agent: "hermes",
+      project_path: row.source ?? "",
+      project_name: row.source ?? "",
+      started_at: startedAt,
+      ended_at: endedAt,
+      total_cost_usd: cost,
+      total_tokens: tokens,
+      request_count: 1,
+      machine_id: machineId,
+      updated_at: now
+    });
+    const reqId = `hermes-${row.id}-rollup`;
+    upsertRequest(db, {
+      id: reqId,
+      agent: "hermes",
+      session_id: sessionId,
+      model: row.model ?? "unknown",
+      input_tokens: row.input_tokens,
+      output_tokens: row.output_tokens + row.reasoning_tokens,
+      cache_read_tokens: row.cache_read_tokens,
+      cache_create_tokens: row.cache_write_tokens,
+      cost_usd: cost,
+      cost_basis: mapCostBasis(row.billing_mode),
+      duration_ms: 0,
+      timestamp: endedAt ?? startedAt,
+      source_request_id: row.id,
+      machine_id: machineId,
+      updated_at: now
+    });
+    requests++;
+    rollupSession(db, sessionId);
+    if (verbose)
+      console.log(`  hermes: ${sessionId} $${cost.toFixed(4)}`);
+  }
+  setIngestState(db, "hermes", stateKey, String(mtime));
+  hermes.close();
+  return { sessions: rows.length, requests };
+}
+function statSyncSafe(path) {
+  try {
+    return statSync6(path).mtimeMs;
+  } catch {
+    return 0;
+  }
+}
+
+// src/ingest/claude-quota.ts
+init_database();
+import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
+
+// src/lib/paths.ts
+import { homedir as homedir8 } from "os";
+import { join as join8 } from "path";
+function getHomeDir() {
+  return process.env["USERPROFILE"] ?? process.env["HOME"] ?? homedir8();
+}
+function agentPaths() {
+  const home = getHomeDir();
+  return {
+    claudeProjects: join8(home, ".claude", "projects"),
+    claudeCredentials: join8(home, ".claude", ".credentials.json"),
+    takumiProjects: join8(home, ".takumi", "projects"),
+    codexDir: join8(home, ".codex"),
+    codexDb: join8(home, ".codex", "state_5.sqlite"),
+    codexAuth: join8(home, ".codex", "auth.json"),
+    codexConfig: join8(home, ".codex", "config.toml"),
+    geminiTmp: join8(home, ".gemini", "tmp"),
+    geminiHistory: join8(home, ".gemini", "history"),
+    opencodeMessages: join8(home, ".local", "share", "opencode", "storage", "message"),
+    piSessions: join8(home, ".pi", "agent", "sessions"),
+    hermesDir: join8(home, ".hermes"),
+    hermesDb: join8(home, ".hermes", "state.db")
+  };
+}
+
+// src/ingest/claude-quota.ts
+var CREDENTIALS_PATH = agentPaths().claudeCredentials;
+var USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
+var OAUTH_BETA = "oauth-2025-04-20";
+function readClaudeToken() {
+  const fromEnv = process.env["CLAUDE_OAUTH_TOKEN"] ?? process.env["ANTHROPIC_OAUTH_TOKEN"];
+  if (fromEnv)
+    return { token: fromEnv };
+  if (!existsSync8(CREDENTIALS_PATH))
+    return null;
+  try {
+    const creds = JSON.parse(readFileSync7(CREDENTIALS_PATH, "utf-8"));
+    const oauth = creds.claudeAiOauth;
+    if (!oauth?.accessToken)
+      return null;
+    return {
+      token: oauth.accessToken,
+      subscriptionType: oauth.subscriptionType,
+      rateLimitTier: oauth.rateLimitTier
+    };
+  } catch {
+    return null;
+  }
+}
+function inferMonthlyFee(subscriptionType, rateLimitTier) {
+  const tier = `${subscriptionType ?? ""} ${rateLimitTier ?? ""}`.toLowerCase();
+  if (tier.includes("max") && tier.includes("20"))
+    return 200;
+  if (tier.includes("max"))
+    return 100;
+  if (tier.includes("pro"))
+    return 20;
+  if (tier.includes("team"))
+    return 30;
+  return 20;
+}
+async function fetchClaudeOAuthUsage(token) {
+  try {
+    const res = await fetch(USAGE_URL, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "anthropic-beta": OAUTH_BETA,
+        Accept: "application/json"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok)
+      return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+async function ingestClaudeQuota(db, verbose = false) {
+  const auth = readClaudeToken();
+  if (!auth) {
+    if (verbose)
+      console.log("  claude quota: skipped \u2014 no OAuth token (~/.claude/.credentials.json or CLAUDE_OAUTH_TOKEN)");
+    return { snapshots: 0 };
+  }
+  const today = new Date().toISOString().substring(0, 10);
+  const prev = getIngestState(db, "claude", `quota-${today}`);
+  if (prev)
+    return { snapshots: 0 };
+  const usage = await fetchClaudeOAuthUsage(auth.token);
+  if (!usage) {
+    if (verbose)
+      console.log("  claude quota: OAuth usage endpoint unavailable");
+    return { snapshots: 0 };
+  }
+  const machineId = getMachineId();
+  let snapshots = 0;
+  const windows = [
+    ["five_hour_utilization", usage.five_hour],
+    ["seven_day_utilization", usage.seven_day],
+    ["seven_day_sonnet_utilization", usage.seven_day_sonnet],
+    ["seven_day_opus_utilization", usage.seven_day_opus]
+  ];
+  for (const [metric, window] of windows) {
+    if (window?.utilization == null)
+      continue;
+    upsertUsageSnapshot(db, {
+      agent: "claude",
+      date: today,
+      metric,
+      value: Math.round(window.utilization * 1000) / 10,
+      unit: "percent",
+      machine_id: machineId
+    });
+    snapshots++;
+    if (window.resets_at) {
+      upsertUsageSnapshot(db, {
+        agent: "claude",
+        date: today,
+        metric: `${metric}_resets_at`,
+        value: Date.parse(window.resets_at),
+        unit: "epoch_ms",
+        machine_id: machineId
+      });
+      snapshots++;
+    }
+  }
+  if (usage.extra_usage?.spend != null) {
+    upsertUsageSnapshot(db, {
+      agent: "claude",
+      date: today,
+      metric: "on_demand_usd",
+      value: usage.extra_usage.spend,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  if (usage.extra_usage?.limit != null) {
+    upsertUsageSnapshot(db, {
+      agent: "claude",
+      date: today,
+      metric: "on_demand_limit_usd",
+      value: usage.extra_usage.limit,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  const monthlyFee = inferMonthlyFee(auth.subscriptionType, auth.rateLimitTier);
+  const now = new Date().toISOString();
+  upsertSubscription(db, {
+    id: "anthropic-claude-oauth",
+    provider: "anthropic",
+    agent: "claude",
+    plan: auth.rateLimitTier ?? auth.subscriptionType ?? "claude_pro",
+    monthly_fee_usd: monthlyFee,
+    included_usage_usd: monthlyFee,
+    billing_cycle_start: null,
+    reset_policy: "monthly",
+    active: 1,
+    created_at: now,
+    updated_at: now
+  });
+  setIngestState(db, "claude", `quota-${today}`, new Date().toISOString());
+  if (verbose)
+    console.log(`  claude quota: ${snapshots} snapshots`);
+  return { snapshots };
+}
+
+// src/ingest/codex-quota.ts
+init_database();
+import { existsSync as existsSync9, readFileSync as readFileSync8 } from "fs";
+var WHAM_USAGE_URL = process.env["CODEX_USAGE_URL"] ?? "https://chatgpt.com/backend-api/wham/usage";
+function readCodexAuth() {
+  const fromEnv = process.env["CODEX_OAUTH_TOKEN"];
+  if (fromEnv)
+    return { token: fromEnv, authMode: "chatgpt" };
+  const authPath = agentPaths().codexAuth;
+  if (!existsSync9(authPath))
+    return null;
+  try {
+    const auth = JSON.parse(readFileSync8(authPath, "utf-8"));
+    const token = auth.tokens?.access_token;
+    if (!token)
+      return null;
+    return {
+      token,
+      accountId: auth.tokens?.account_id,
+      authMode: auth.auth_mode ?? "chatgpt"
+    };
+  } catch {
+    return null;
+  }
+}
+function planMonthlyFee(planType) {
+  const plan = (planType ?? "").toLowerCase();
+  if (plan.includes("pro"))
+    return 200;
+  if (plan.includes("plus"))
+    return 20;
+  if (plan.includes("team"))
+    return 30;
+  return 20;
+}
+async function fetchCodexUsage(token, accountId) {
+  try {
+    const headers = {
+      Authorization: `Bearer ${token}`,
+      Accept: "application/json",
+      "User-Agent": "economy-cli"
+    };
+    if (accountId)
+      headers["ChatGPT-Account-Id"] = accountId;
+    const res = await fetch(WHAM_USAGE_URL, {
+      headers,
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok)
+      return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+async function ingestCodexQuota(db, verbose = false) {
+  const auth = readCodexAuth();
+  if (!auth) {
+    if (verbose)
+      console.log("  codex quota: skipped \u2014 no ~/.codex/auth.json or CODEX_OAUTH_TOKEN");
+    return { snapshots: 0 };
+  }
+  if (auth.authMode === "api_key" || auth.authMode === "api") {
+    if (verbose)
+      console.log("  codex quota: skipped \u2014 API key mode (no subscription quota)");
+    return { snapshots: 0 };
+  }
+  const today = new Date().toISOString().substring(0, 10);
+  const prev = getIngestState(db, "codex", `quota-${today}`);
+  if (prev)
+    return { snapshots: 0 };
+  const usage = await fetchCodexUsage(auth.token, auth.accountId);
+  if (!usage) {
+    if (verbose)
+      console.log("  codex quota: wham/usage endpoint unavailable");
+    return { snapshots: 0 };
+  }
+  const machineId = getMachineId();
+  let snapshots = 0;
+  const now = new Date().toISOString();
+  const windows = [
+    ["five_hour_utilization", usage.rate_limit?.primary_window],
+    ["seven_day_utilization", usage.rate_limit?.secondary_window]
+  ];
+  for (const [metric, window] of windows) {
+    if (window?.used_percent == null)
+      continue;
+    upsertUsageSnapshot(db, {
+      agent: "codex",
+      date: today,
+      metric,
+      value: window.used_percent,
+      unit: "percent",
+      machine_id: machineId
+    });
+    snapshots++;
+    if (window.reset_at) {
+      upsertUsageSnapshot(db, {
+        agent: "codex",
+        date: today,
+        metric: `${metric}_resets_at`,
+        value: window.reset_at * 1000,
+        unit: "epoch_ms",
+        machine_id: machineId
+      });
+      snapshots++;
+    }
+  }
+  if (usage.credits?.balance != null) {
+    upsertUsageSnapshot(db, {
+      agent: "codex",
+      date: today,
+      metric: "credits_balance_usd",
+      value: usage.credits.balance,
+      unit: "usd",
+      machine_id: machineId
+    });
+    snapshots++;
+  }
+  const monthlyFee = planMonthlyFee(usage.plan_type);
+  upsertSubscription(db, {
+    id: "openai-codex-oauth",
+    provider: "openai",
+    agent: "codex",
+    plan: usage.plan_type ?? "chatgpt_plus",
+    monthly_fee_usd: monthlyFee,
+    included_usage_usd: monthlyFee,
+    billing_cycle_start: null,
+    reset_policy: "monthly",
+    active: 1,
+    created_at: now,
+    updated_at: now
+  });
+  setIngestState(db, "codex", `quota-${today}`, now);
+  if (verbose)
+    console.log(`  codex quota: ${snapshots} snapshots (${usage.plan_type ?? "unknown plan"})`);
+  return { snapshots };
+}
+
+// src/lib/sync-all.ts
+init_database();
+
+// src/lib/cloud-sync.ts
+init_database();
+
+// src/lib/package-metadata.ts
+import { readFileSync as readFileSync9 } from "fs";
+var cachedMetadata = null;
+function getPackageMetadata() {
+  if (cachedMetadata)
+    return cachedMetadata;
+  const raw = readFileSync9(new URL("../../package.json", import.meta.url), "utf8");
+  const parsed = JSON.parse(raw);
+  cachedMetadata = {
+    name: parsed.name ?? "@hasna/economy",
+    version: parsed.version ?? "0.0.0"
+  };
+  return cachedMetadata;
+}
+var packageMetadata = getPackageMetadata();
+
+// src/lib/cloud-sync.ts
+var CLOUD_TABLES = [
+  "requests",
+  "sessions",
+  "projects",
+  "budgets",
+  "goals",
+  "model_pricing",
+  "billing_daily",
+  "subscriptions",
+  "usage_snapshots",
+  "savings_daily",
+  "machines",
+  "ingest_state"
+];
+function getCloudDatabaseUrl() {
+  return process.env["ECONOMY_CLOUD_DATABASE_URL"] ?? process.env["HASNA_ECONOMY_CLOUD_DATABASE_URL"] ?? null;
+}
+function isCloudAutoEnabled() {
+  return process.env["ECONOMY_CLOUD_AUTO"] === "1" || process.env["ECONOMY_CLOUD_AUTO"] === "true";
+}
+function getCloudPullIntervalMinutes() {
+  const raw = process.env["ECONOMY_CLOUD_PULL_INTERVAL"];
+  if (!raw)
+    return 15;
+  const n = Number(raw);
+  return Number.isFinite(n) && n > 0 ? n : 15;
+}
+async function getCloudPg() {
+  const url = getCloudDatabaseUrl();
+  if (!url) {
+    throw new Error("Missing ECONOMY_CLOUD_DATABASE_URL (or HASNA_ECONOMY_CLOUD_DATABASE_URL)");
+  }
+  const { PgAdapterAsync } = await import("@hasna/cloud");
+  return new PgAdapterAsync(url);
+}
+async function runCloudMigrations(cloud) {
+  const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
+  for (const sql of PG_MIGRATIONS2) {
+    await cloud.run(sql);
+  }
+}
+function isCloudIncrementalEnabled() {
+  return process.env["ECONOMY_CLOUD_INCREMENTAL"] === "1" || process.env["ECONOMY_CLOUD_INCREMENTAL"] === "true";
+}
+async function cloudPush(opts) {
+  const { syncPush, incrementalSyncPush, ensureSyncMetaTable, SqliteAdapter } = await import("@hasna/cloud");
+  const cloud = await getCloudPg();
+  const local = new SqliteAdapter(getDbPath());
+  await runCloudMigrations(cloud);
+  const tables = opts?.tables ?? [...CLOUD_TABLES];
+  let rows = 0;
+  if (isCloudIncrementalEnabled()) {
+    ensureSyncMetaTable(local);
+    const results = incrementalSyncPush(local, cloud, tables, { conflictColumn: "updated_at" });
+    rows = results.reduce((s, r) => s + r.synced_rows, 0);
+  } else {
+    const results = await syncPush(local, cloud, { tables, conflictColumn: "updated_at" });
+    rows = results.reduce((s, r) => s + r.rowsWritten, 0);
+  }
+  touchMachineRegistry(local, "push");
+  local.close();
+  await cloud.close();
+  return { rows, machine: getMachineId() };
+}
+async function cloudPull(opts) {
+  const { syncPull, incrementalSyncPull, ensureSyncMetaTable, SqliteAdapter } = await import("@hasna/cloud");
+  const cloud = await getCloudPg();
+  const local = new SqliteAdapter(getDbPath());
+  await runCloudMigrations(cloud);
+  const tables = opts?.tables ?? [...CLOUD_TABLES];
+  let rows = 0;
+  if (isCloudIncrementalEnabled()) {
+    ensureSyncMetaTable(local);
+    const results = incrementalSyncPull(cloud, local, tables, { conflictColumn: "updated_at" });
+    rows = results.reduce((s, r) => s + r.synced_rows, 0);
+  } else {
+    const results = await syncPull(cloud, local, { tables, conflictColumn: "updated_at" });
+    rows = results.reduce((s, r) => s + r.rowsWritten, 0);
+  }
+  touchMachineRegistry(local, "pull");
+  local.close();
+  await cloud.close();
+  setLastCloudPull();
+  return { rows, machine: getMachineId() };
+}
+function setLastCloudPull(at = new Date().toISOString()) {
+  const db = openDatabase();
+  db.prepare(`INSERT OR REPLACE INTO ingest_state (source, key, value) VALUES ('cloud', 'last_pull_at', ?)`).run(at);
+}
+function getLastCloudPull() {
+  const db = openDatabase();
+  const row = db.prepare(`SELECT value FROM ingest_state WHERE source = 'cloud' AND key = 'last_pull_at'`).get();
+  return row?.value ?? null;
+}
+function shouldPullFromCloud() {
+  if (!getCloudDatabaseUrl())
+    return false;
+  const last = getLastCloudPull();
+  if (!last)
+    return true;
+  const ageMs = Date.now() - new Date(last).getTime();
+  return ageMs > getCloudPullIntervalMinutes() * 60000;
+}
+async function maybePullFromCloud() {
+  if (!shouldPullFromCloud())
+    return false;
+  try {
+    await cloudPull();
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function maybePushAfterIngest() {
+  if (!isCloudAutoEnabled() || !getCloudDatabaseUrl())
+    return false;
+  try {
+    await cloudPush();
+    return true;
+  } catch {
+    return false;
+  }
+}
+function touchMachineRegistry(db, direction) {
+  const now = new Date().toISOString();
+  const machine = getMachineId();
+  db.prepare(`
+    INSERT INTO machines (machine_id, hostname, last_seen_at, last_push_at, last_pull_at, economy_version, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(machine_id) DO UPDATE SET
+      hostname = excluded.hostname,
+      last_seen_at = excluded.last_seen_at,
+      last_push_at = CASE WHEN ? = 'push' THEN excluded.last_push_at ELSE machines.last_push_at END,
+      last_pull_at = CASE WHEN ? = 'pull' THEN excluded.last_pull_at ELSE machines.last_pull_at END,
+      economy_version = excluded.economy_version,
+      updated_at = excluded.updated_at
+  `).run(machine, machine, now, direction === "push" ? now : null, direction === "pull" ? now : null, packageMetadata.version, now, direction, direction);
+}
+
+// src/lib/sync-all.ts
+async function syncAll(db, opts = {}) {
+  const anySpecific = Boolean(opts.claude || opts.takumi || opts.codex || opts.gemini || opts.opencode || opts.cursor || opts.pi || opts.hermes);
+  const all = !anySpecific;
+  await maybePullFromCloud();
+  const result = { deduped: 0, cloudPulled: false, cloudPushed: false };
+  if (all || opts.claude) {
+    result.claude = await ingestClaude(db, opts.verbose);
+    result.claudeQuota = await ingestClaudeQuota(db, opts.verbose);
+  }
+  if (all || opts.takumi)
+    result.takumi = await ingestTakumi(db, opts.verbose);
+  if (all || opts.codex) {
+    result.codex = await ingestCodex(db, opts.verbose);
+    result.codexQuota = await ingestCodexQuota(db, opts.verbose);
+  }
+  if (all || opts.gemini)
+    result.gemini = await ingestGemini(db, opts.verbose);
+  if (all || opts.opencode)
+    result.opencode = await ingestOpenCode(db, opts.verbose);
+  if (all || opts.cursor)
+    result.cursor = await ingestCursor(db, opts.verbose);
+  if (all || opts.pi)
+    result.pi = await ingestPi(db, opts.verbose);
+  if (all || opts.hermes)
+    result.hermes = await ingestHermes(db, opts.verbose);
+  result.deduped = dedupeRequests(db);
+  result.cloudPushed = await maybePushAfterIngest();
+  return result;
+}
+
+// src/lib/billing-diff.ts
+init_database();
+var PROVIDER_TO_AGENT = {
+  anthropic: "claude",
+  openai: "codex",
+  gemini: "gemini",
+  google: "gemini"
+};
+function queryBillingDiff(db, period, thresholdPct = 15) {
+  const estimated = querySummary(db, period, undefined, true);
+  const actual = queryBillingSummary(db, period);
+  const delta = estimated.total_usd - actual.total_usd;
+  const deltaPct = actual.total_usd > 0 ? delta / actual.total_usd * 100 : 0;
+  const agentRows = db.prepare(`
+    SELECT agent, COALESCE(SUM(cost_usd), 0) as estimated_usd
+    FROM requests
+    WHERE ${periodWhere3(period, "timestamp")}
+    GROUP BY agent
+  `).all();
+  const by_agent = agentRows.map((row) => {
+    const provider = Object.entries(PROVIDER_TO_AGENT).find(([, a]) => a === row.agent)?.[0];
+    const actualUsd = provider ? actual.by_provider[provider] ?? 0 : 0;
+    const rowDelta = row.estimated_usd - actualUsd;
+    const rowPct = actualUsd > 0 ? rowDelta / actualUsd * 100 : 0;
+    return {
+      agent: row.agent,
+      estimated_usd: row.estimated_usd,
+      actual_usd: actualUsd,
+      delta_usd: rowDelta,
+      delta_pct: rowPct
+    };
+  }).sort((a, b) => Math.abs(b.delta_usd) - Math.abs(a.delta_usd));
+  return {
+    period,
+    estimated_usd: estimated.total_usd,
+    actual_usd: actual.total_usd,
+    delta_usd: delta,
+    delta_pct: deltaPct,
+    threshold_pct: thresholdPct,
+    is_alert: Math.abs(deltaPct) > thresholdPct,
+    by_agent,
+    by_provider: actual.by_provider
+  };
+}
+function periodWhere3(period, column) {
+  switch (period) {
+    case "today":
+      return `DATE(${column}) = DATE('now')`;
+    case "yesterday":
+      return `DATE(${column}) = DATE('now', '-1 day')`;
+    case "week":
+      return `${column} >= DATE('now', 'weekday 0', '-7 days')`;
+    case "month":
+      return `${column} >= DATE('now', 'start of month')`;
+    case "year":
+      return `${column} >= DATE('now', 'start of year')`;
+    case "all":
+      return "1=1";
+  }
+}
+
+// src/server/serve.ts
+init_database();
+
+// src/lib/serve-auth.ts
+function getServeApiToken() {
+  return process.env["ECONOMY_API_TOKEN"] ?? process.env["HASNA_ECONOMY_API_TOKEN"];
+}
+function getServeBindHost() {
+  const explicit = process.env["ECONOMY_BIND"] ?? process.env["ECONOMY_HOST"];
+  if (explicit)
+    return explicit;
+  return getServeApiToken() ? "127.0.0.1" : "0.0.0.0";
+}
+function isAuthorizedRequest(req, path) {
+  const token = getServeApiToken();
+  if (!token)
+    return true;
+  if (path === "/health")
+    return true;
+  const auth = req.headers.get("Authorization");
+  if (auth === `Bearer ${token}`)
+    return true;
+  if (req.headers.get("X-Economy-Token") === token)
+    return true;
+  return false;
+}
+
+// src/server/serve.ts
 import { randomUUID } from "crypto";
+import { existsSync as existsSync11 } from "fs";
+import { resolve, sep } from "path";
 var CORS = {
   "Access-Control-Allow-Origin": "*",
   "Access-Control-Allow-Methods": "GET,POST,PUT,DELETE,OPTIONS",
-  "Access-Control-Allow-Headers": "Content-Type"
+  "Access-Control-Allow-Headers": "Content-Type, Authorization, X-Economy-Token"
 };
+var AGENT_ERROR = `agent must be one of: ${AGENTS.join(", ")}`;
+var SYNC_SOURCES = ["all", ...AGENTS];
+var DEFAULT_DASHBOARD_DIR = new URL("../../dashboard/dist", import.meta.url).pathname;
 function json(data, status = 200) {
   return new Response(JSON.stringify(data), {
     status,
@@ -966,6 +3434,56 @@ function normalizeBudgetPeriod(value) {
       return "monthly";
   }
 }
+function finiteNumber(value) {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : null;
+}
+async function jsonBody(req) {
+  const body = await req.json().catch(() => null);
+  return body && typeof body === "object" && !Array.isArray(body) ? body : null;
+}
+function optionalString(value) {
+  return typeof value === "string" ? value : null;
+}
+function optionalAgent(value) {
+  if (value == null || value === "")
+    return null;
+  return typeof value === "string" && AGENTS.includes(value) ? value : undefined;
+}
+function stringArray(value) {
+  return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
+function dashboardPath(root, pathname) {
+  let decoded;
+  try {
+    decoded = decodeURIComponent(pathname);
+  } catch {
+    return null;
+  }
+  const relativePath = decoded === "/" ? "index.html" : decoded.replace(/^\/+/, "");
+  const rootPath = resolve(root);
+  const filePath = resolve(rootPath, relativePath);
+  return filePath === rootPath || filePath.startsWith(rootPath + sep) ? filePath : null;
+}
+function createServerFetch(apiHandler, dashboardDir = DEFAULT_DASHBOARD_DIR) {
+  return async function fetch2(req) {
+    const url = new URL(req.url);
+    if (url.pathname.startsWith("/api") || url.pathname === "/health") {
+      return apiHandler(req);
+    }
+    if (existsSync11(dashboardDir)) {
+      const filePath = dashboardPath(dashboardDir, url.pathname);
+      if (filePath && existsSync11(filePath)) {
+        return new Response(Bun.file(filePath));
+      }
+      const indexPath = dashboardPath(dashboardDir, "/");
+      if (indexPath && existsSync11(indexPath)) {
+        return new Response(Bun.file(indexPath));
+      }
+    }
+    return apiHandler(req);
+  };
+}
 function applyFields(obj, fields) {
   if (!fields || fields.length === 0)
     return obj;
@@ -978,6 +3496,8 @@ function createHandler(db) {
     const method = req.method;
     if (method === "OPTIONS")
       return new Response(null, { status: 204, headers: CORS });
+    if (!isAuthorizedRequest(req, path))
+      return err("Unauthorized", 401);
     if (path === "/health")
       return ok({ status: "ok", ts: new Date().toISOString() });
     if (path === "/api/summary" && method === "GET") {
@@ -988,6 +3508,15 @@ function createHandler(db) {
     if (path === "/api/machines" && method === "GET") {
       return ok(listMachines(db), { current_machine: getMachineId() });
     }
+    if (path === "/api/fleet" && method === "GET") {
+      const period = url.searchParams.get("period") ?? "month";
+      return ok({
+        summary: querySummary(db, period, undefined, true),
+        machines: listMachines(db),
+        registry: listMachineRegistry(db),
+        current_machine: getMachineId()
+      });
+    }
     if (path === "/api/daily" && method === "GET") {
       const days = Number(url.searchParams.get("days") ?? 30);
       return ok(queryDailyBreakdown(db, days));
@@ -1021,6 +3550,41 @@ function createHandler(db) {
     if (path === "/api/models" && method === "GET") {
       return ok(queryModelBreakdown(db));
     }
+    if (path === "/api/billing" && method === "GET") {
+      const period = url.searchParams.get("period") ?? "month";
+      return ok(queryBillingSummary(db, period));
+    }
+    if (path === "/api/billing/diff" && method === "GET") {
+      const period = url.searchParams.get("period") ?? "month";
+      const threshold = Number(url.searchParams.get("threshold") ?? 15);
+      return ok(queryBillingDiff(db, period, Number.isFinite(threshold) ? threshold : 15));
+    }
+    if (path === "/api/billing/sync" && method === "POST") {
+      const body = await jsonBody(req) ?? {};
+      const days = Number(body["days"] ?? 31);
+      if (!Number.isFinite(days) || days <= 0 || days > 366)
+        return err("days must be between 1 and 366");
+      const providers = Array.isArray(body["providers"]) ? body["providers"] : ["anthropic", "openai", "gemini"];
+      const allowedProviders = new Set(["anthropic", "openai", "gemini"]);
+      if (providers.some((provider) => !allowedProviders.has(provider)))
+        return err("invalid billing provider");
+      const results = {};
+      const { syncAnthropicBilling: syncAnthropicBilling2, syncOpenAIBilling: syncOpenAIBilling2, syncGeminiBilling: syncGeminiBilling2 } = await Promise.resolve().then(() => (init_billing(), exports_billing));
+      async function capture(provider, fn) {
+        try {
+          results[provider] = await fn();
+        } catch (e) {
+          results[provider] = { error: e instanceof Error ? e.message : String(e) };
+        }
+      }
+      if (providers.includes("anthropic"))
+        await capture("anthropic", () => syncAnthropicBilling2(db, { days }));
+      if (providers.includes("openai"))
+        await capture("openai", () => syncOpenAIBilling2(db, { days }));
+      if (providers.includes("gemini"))
+        await capture("gemini", () => syncGeminiBilling2(db, { days }));
+      return ok(results);
+    }
     if (path === "/api/projects" && method === "GET") {
       return ok(queryProjectBreakdown(db));
     }
@@ -1032,38 +3596,54 @@ function createHandler(db) {
       return ok(getBudgetStatuses(db));
     }
     if (path === "/api/budgets" && method === "POST") {
-      const body = await req.json();
+      const body = await jsonBody(req);
+      if (!body)
+        return err("invalid JSON body");
+      const limitUsd = finiteNumber(body["limit_usd"]);
+      const alertAtPercent = finiteNumber(body["alert_at_percent"] ?? 80);
+      if (limitUsd == null || limitUsd <= 0)
+        return err("limit_usd must be a positive number");
+      if (alertAtPercent == null || alertAtPercent <= 0 || alertAtPercent > 100)
+        return err("alert_at_percent must be between 1 and 100");
+      const agent = optionalAgent(body["agent"]);
+      if (agent === undefined)
+        return err(AGENT_ERROR);
       const now = new Date().toISOString();
-      upsertBudget(db, {
+      const budget = {
         id: randomUUID(),
         project_path: body["project_path"] ?? null,
-        agent: body["agent"] ?? null,
+        agent,
         period: normalizeBudgetPeriod(body["period"]),
-        limit_usd: Number(body["limit_usd"]),
-        alert_at_percent: Number(body["alert_at_percent"] ?? 80),
+        limit_usd: limitUsd,
+        alert_at_percent: alertAtPercent,
         created_at: now,
         updated_at: now
-      });
-      return ok({ ok: true });
+      };
+      upsertBudget(db, budget);
+      return ok(getBudgetStatuses(db).find((b) => b.id === budget.id) ?? budget);
     }
     const budgetMatch = path.match(/^\/api\/budgets\/(.+)$/);
     if (budgetMatch && method === "DELETE") {
-      deleteBudget(db, budgetMatch[1]);
+      deleteBudget(db, decodeURIComponent(budgetMatch[1]));
       return ok({ ok: true });
     }
     if (path === "/api/project-registry" && method === "GET") {
       return ok(listProjects(db));
     }
     if (path === "/api/project-registry" && method === "POST") {
-      const body = await req.json();
-      const { basename: basename3 } = await import("path");
-      const projPath = body["path"];
+      const body = await jsonBody(req);
+      if (!body)
+        return err("invalid JSON body");
+      const { basename: basename4 } = await import("path");
+      const projPath = optionalString(body["path"])?.trim();
+      if (!projPath)
+        return err("path is required");
       upsertProject(db, {
         id: randomUUID(),
         path: projPath,
-        name: body["name"] ?? basename3(projPath),
-        description: body["description"] ?? null,
-        tags: body["tags"] ?? [],
+        name: optionalString(body["name"]) ?? basename4(projPath),
+        description: optionalString(body["description"]),
+        tags: stringArray(body["tags"]),
         created_at: new Date().toISOString()
       });
       return ok({ ok: true });
@@ -1077,16 +3657,33 @@ function createHandler(db) {
       return ok(listModelPricing(db));
     }
     if (path === "/api/pricing" && method === "POST") {
-      const body = await req.json();
-      upsertModelPricing(db, {
-        model: body["model"],
-        input_per_1m: Number(body["input_per_1m"]),
-        output_per_1m: Number(body["output_per_1m"]),
-        cache_read_per_1m: Number(body["cache_read_per_1m"] ?? 0),
-        cache_write_per_1m: Number(body["cache_write_per_1m"] ?? 0),
+      const body = await jsonBody(req);
+      if (!body)
+        return err("invalid JSON body");
+      const model = String(body["model"] ?? "").trim();
+      if (!model)
+        return err("model is required");
+      const input = finiteNumber(body["input_per_1m"]);
+      const output = finiteNumber(body["output_per_1m"]);
+      const cacheRead = finiteNumber(body["cache_read_per_1m"] ?? 0);
+      const cacheWrite = finiteNumber(body["cache_write_per_1m"] ?? 0);
+      const cacheWrite1h = finiteNumber(body["cache_write_1h_per_1m"] ?? 0);
+      const cacheStorage = finiteNumber(body["cache_storage_per_1m_hour"] ?? 0);
+      if ([input, output, cacheRead, cacheWrite, cacheWrite1h, cacheStorage].some((v) => v == null || v < 0)) {
+        return err("pricing values must be non-negative numbers");
+      }
+      const pricing = {
+        model,
+        input_per_1m: input,
+        output_per_1m: output,
+        cache_read_per_1m: cacheRead,
+        cache_write_per_1m: cacheWrite,
+        cache_write_1h_per_1m: cacheWrite1h,
+        cache_storage_per_1m_hour: cacheStorage,
         updated_at: new Date().toISOString()
-      });
-      return ok({ ok: true });
+      };
+      upsertModelPricing(db, pricing);
+      return ok(pricing);
     }
     const pricingMatch = path.match(/^\/api\/pricing\/(.+)$/);
     if (pricingMatch && method === "DELETE") {
@@ -1094,22 +3691,43 @@ function createHandler(db) {
       return ok({ ok: true });
     }
     if (path === "/api/sync" && method === "POST") {
-      const body = await req.json().catch(() => ({}));
+      const body = await jsonBody(req) ?? {};
       const sources = body["sources"] ?? "all";
+      if (!SYNC_SOURCES.includes(sources))
+        return err("invalid sync source");
       const results = {};
-      if (sources === "all" || sources === "claude")
-        results["claude"] = await ingestClaude(db);
-      if (sources === "all" || sources === "takumi")
-        results["takumi"] = await ingestTakumi(db);
-      if (sources === "all" || sources === "codex")
-        results["codex"] = await ingestCodex(db);
-      if (sources === "all" || sources === "gemini")
-        results["gemini"] = await ingestGemini(db);
+      if (sources === "all") {
+        try {
+          const { syncOpenProjectsRegistry: syncOpenProjectsRegistry2 } = await Promise.resolve().then(() => (init_open_projects(), exports_open_projects));
+          results["projects"] = await syncOpenProjectsRegistry2(db);
+        } catch {}
+      }
+      const selected = sources === "all" ? {} : { [sources]: true };
+      const syncResult = await syncAll(db, selected);
+      Object.assign(results, syncResult);
+      try {
+        const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
+        await checkAndFireWebhooks2(db);
+      } catch {}
       return ok(results);
     }
+    if (path === "/api/usage" && method === "GET") {
+      const period = url.searchParams.get("period") ?? "month";
+      const agent = url.searchParams.get("agent") ?? undefined;
+      const since = period === "month" ? new Date(new Date().getFullYear(), new Date().getMonth(), 1).toISOString().substring(0, 10) : undefined;
+      return ok({
+        snapshots: queryUsageSnapshots(db, { agent: agent && isAgent(agent) ? agent : undefined, since }),
+        summary: querySummary(db, period, undefined, true)
+      });
+    }
+    if (path === "/api/savings" && method === "GET") {
+      const period = url.searchParams.get("period") ?? "month";
+      const agent = url.searchParams.get("agent") ?? undefined;
+      return ok(querySavingsSummary(db, period, agent && isAgent(agent) ? agent : undefined));
+    }
     const sessionRequestsMatch = path.match(/^\/api\/sessions\/([^/]+)\/requests$/);
     if (sessionRequestsMatch && method === "GET") {
-      const sessionId = sessionRequestsMatch[1];
+      const sessionId = decodeURIComponent(sessionRequestsMatch[1]);
       const session = db.prepare(`SELECT * FROM sessions WHERE id = ? OR id LIKE ?`).get(sessionId, `${sessionId}%`);
       if (!session)
         return err("Session not found", 404);
@@ -1120,75 +3738,55 @@ function createHandler(db) {
       return ok(getGoalStatuses(db));
     }
     if (path === "/api/goals" && method === "POST") {
-      const body = await req.json();
+      const body = await jsonBody(req);
+      if (!body)
+        return err("invalid JSON body");
+      const period = body["period"] ?? "month";
+      if (!["day", "week", "month", "year"].includes(String(period)))
+        return err("period must be day, week, month, or year");
+      const limitUsd = finiteNumber(body["limit_usd"]);
+      if (limitUsd == null || limitUsd <= 0)
+        return err("limit_usd must be a positive number");
+      const agent = optionalAgent(body["agent"]);
+      if (agent === undefined)
+        return err(AGENT_ERROR);
       const now = new Date().toISOString();
-      upsertGoal(db, {
+      const goal = {
         id: randomUUID(),
-        period: body["period"] ?? "month",
-        project_path: body["project_path"] ?? null,
-        agent: body["agent"] ?? null,
-        limit_usd: Number(body["limit_usd"]),
+        period,
+        project_path: optionalString(body["project_path"]),
+        agent,
+        limit_usd: limitUsd,
         created_at: now,
         updated_at: now
-      });
-      return ok({ ok: true });
+      };
+      upsertGoal(db, goal);
+      return ok(getGoalStatuses(db).find((g) => g.id === goal.id) ?? goal);
     }
     const goalMatch = path.match(/^\/api\/goals\/(.+)$/);
     if (goalMatch && method === "DELETE") {
-      deleteGoal(db, goalMatch[1]);
+      deleteGoal(db, decodeURIComponent(goalMatch[1]));
       return ok({ ok: true });
     }
     return err("Not found", 404);
   };
 }
-function startServer(port = 3456) {
-  const db = openDatabase();
+function startServer(port = 3456, options = {}) {
+  const db = options.db ?? openDatabase();
   ensurePricingSeeded(db);
   const apiHandler = createHandler(db);
-  const dashboardDir = new URL("../../dashboard/dist", import.meta.url).pathname;
-  Bun.serve({
+  const hostname2 = options.hostname ?? getServeBindHost();
+  const server = Bun.serve({
     port,
-    async fetch(req) {
-      const url = new URL(req.url);
-      if (url.pathname.startsWith("/api") || url.pathname === "/health") {
-        return apiHandler(req);
-      }
-      try {
-        const { existsSync: existsSync5 } = await import("fs");
-        if (existsSync5(dashboardDir)) {
-          let filePath = url.pathname === "/" ? "/index.html" : url.pathname;
-          const fullPath = dashboardDir + filePath;
-          if (existsSync5(fullPath)) {
-            return new Response(Bun.file(fullPath));
-          }
-          const indexPath = dashboardDir + "/index.html";
-          if (existsSync5(indexPath)) {
-            return new Response(Bun.file(indexPath));
-          }
-        }
-      } catch {}
-      return apiHandler(req);
-    }
+    hostname: hostname2,
+    fetch: createServerFetch(apiHandler, options.dashboardDir)
   });
-  console.log(`economy-serve listening on http://localhost:${port}`);
+  const address = `http://${hostname2 === "0.0.0.0" ? "localhost" : hostname2}:${server.port}`;
+  const log = options.log ?? console.log;
+  log(`economy-serve listening on ${address}`);
+  return server;
 }
 
-// src/lib/package-metadata.ts
-import { readFileSync as readFileSync4 } from "fs";
-var cachedMetadata = null;
-function getPackageMetadata() {
-  if (cachedMetadata)
-    return cachedMetadata;
-  const raw = readFileSync4(new URL("../../package.json", import.meta.url), "utf8");
-  const parsed = JSON.parse(raw);
-  cachedMetadata = {
-    name: parsed.name ?? "@hasna/economy",
-    version: parsed.version ?? "0.0.0"
-  };
-  return cachedMetadata;
-}
-var packageMetadata = getPackageMetadata();
-
 // src/server/index.ts
 function printHelp() {
   console.log(`Usage: economy-serve [options]
@@ -1203,17 +3801,19 @@ Options:
 function resolvePort(argv) {
   for (let i = 0;i < argv.length; i++) {
     const arg = argv[i];
-    if ((arg === "--port" || arg === "-p") && argv[i + 1]) {
-      const value2 = Number(argv[i + 1]);
-      if (!Number.isFinite(value2) || value2 <= 0) {
-        throw new Error(`Invalid port: ${argv[i + 1]}`);
-      }
-      return value2;
+    if (arg === "--port" || arg === "-p") {
+      const raw = argv[i + 1];
+      if (!raw)
+        throw new Error(`Invalid port: ${raw ?? ""}`);
+      return parsePort(raw, "port");
     }
   }
-  const value = Number(process.env["ECONOMY_PORT"] ?? 3456);
-  if (!Number.isFinite(value) || value <= 0) {
-    throw new Error(`Invalid ECONOMY_PORT: ${process.env["ECONOMY_PORT"]}`);
+  return parsePort(process.env["ECONOMY_PORT"] ?? "3456", "ECONOMY_PORT");
+}
+function parsePort(raw, label) {
+  const value = Number(raw);
+  if (!Number.isInteger(value) || value < 1 || value > 65535) {
+    throw new Error(`Invalid ${label}: ${raw}`);
   }
   return value;
 }