@hasna/economy 0.2.14 → 0.2.16

package/dist/cli/index.js

@@ -79,6 +79,7 @@ var DEFAULT_PRICING;
 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 },
@@ -89,24 +90,82 @@ var init_pricing = __esm(() => {
     "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-2.0-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "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 },
+    "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.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 }
+    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, 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 }
   };
 });
 
 // src/db/database.ts
+var exports_database = {};
+__export(exports_database, {
+  upsertSession: () => upsertSession,
+  upsertRequest: () => upsertRequest,
+  upsertProject: () => upsertProject,
+  upsertModelPricing: () => upsertModelPricing,
+  upsertGoal: () => upsertGoal,
+  upsertBudget: () => upsertBudget,
+  upsertBillingDaily: () => upsertBillingDaily,
+  setIngestState: () => setIngestState,
+  seedModelPricing: () => seedModelPricing,
+  rollupSession: () => rollupSession,
+  queryTopSessions: () => queryTopSessions,
+  querySummary: () => querySummary,
+  querySessions: () => querySessions,
+  queryRequestsSince: () => queryRequestsSince,
+  queryProjectBreakdown: () => queryProjectBreakdown,
+  queryModelBreakdown: () => queryModelBreakdown,
+  queryDailyBreakdown: () => queryDailyBreakdown,
+  queryBillingSummary: () => queryBillingSummary,
+  openDatabase: () => openDatabase,
+  listProjects: () => listProjects,
+  listModelPricing: () => listModelPricing,
+  listMachines: () => listMachines,
+  listGoals: () => listGoals,
+  listBudgets: () => listBudgets,
+  getProject: () => getProject,
+  getModelPricing: () => getModelPricing,
+  getMachineId: () => getMachineId,
+  getIngestState: () => getIngestState,
+  getGoalStatuses: () => getGoalStatuses,
+  getDbPath: () => getDbPath,
+  getDataDir: () => getDataDir,
+  getBudgetStatuses: () => getBudgetStatuses,
+  deleteProject: () => deleteProject,
+  deleteModelPricing: () => deleteModelPricing,
+  deleteGoal: () => deleteGoal,
+  deleteBudget: () => deleteBudget,
+  clearBillingRange: () => clearBillingRange
+});
 import { SqliteAdapter as Database } from "@hasna/cloud";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
 import { hostname } from "os";
@@ -253,6 +312,18 @@ function initSchema(db) {
       machine_id TEXT,
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
+
+    CREATE TABLE IF NOT EXISTS billing_daily (
+      date TEXT NOT NULL,
+      provider TEXT NOT NULL,
+      description TEXT DEFAULT '',
+      cost_usd REAL NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (date, provider, description)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date);
+    CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider);
   `);
   const cols = db.prepare(`PRAGMA table_info(requests)`).all();
   if (!cols.some((c) => c.name === "machine_id")) {
@@ -271,11 +342,11 @@ function periodWhere(period) {
     case "yesterday":
       return `DATE(timestamp) = DATE('now', '-1 day')`;
     case "week":
-      return `timestamp >= DATE('now', '-7 days')`;
+      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `timestamp >= DATE('now', '-30 days')`;
+      return `timestamp >= DATE('now', 'start of month')`;
     case "year":
-      return `timestamp >= DATE('now', '-365 days')`;
+      return `timestamp >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -287,11 +358,11 @@ function sessionPeriodWhere(period) {
     case "yesterday":
       return `DATE(started_at) = DATE('now', '-1 day')`;
     case "week":
-      return `started_at >= DATE('now', '-7 days')`;
+      return `started_at >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `started_at >= DATE('now', '-30 days')`;
+      return `started_at >= DATE('now', 'start of month')`;
     case "year":
-      return `started_at >= DATE('now', '-365 days')`;
+      return `started_at >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -403,19 +474,39 @@ function queryModelBreakdown(db) {
 }
 function queryProjectBreakdown(db) {
   return db.prepare(`
+    WITH labeled AS (
+      SELECT
+        s.id,
+        s.project_path,
+        s.total_cost_usd,
+        s.started_at,
+        COALESCE(
+          NULLIF(s.project_name, ''),
+          CASE
+            WHEN s.project_path LIKE '%/%'
+              THEN substr(s.project_path, length(rtrim(s.project_path, replace(s.project_path, '/', ''))) + 1)
+            ELSE s.project_path
+          END
+        ) as label
+      FROM sessions s
+      WHERE s.project_path != '' OR s.project_name != ''
+    )
     SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
+      MIN(l.project_path) as project_path,
+      l.label as project_name,
+      COUNT(DISTINCT l.id) as sessions,
+      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)), 0) as requests,
+      COALESCE(
+        (SELECT SUM(r.cost_usd) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        SUM(l.total_cost_usd)
+      ) as cost_usd,
+      COALESCE(
+        (SELECT SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        0
+      ) as total_tokens,
+      MAX(l.started_at) as last_active
+    FROM labeled l
+    GROUP BY l.label
     ORDER BY cost_usd DESC
   `).all();
 }
@@ -535,6 +626,26 @@ function setIngestState(db, source, key, value) {
 function queryRequestsSince(db, since) {
   return db.prepare(`SELECT * FROM requests WHERE timestamp > ? ORDER BY timestamp ASC`).all(since);
 }
+function upsertBillingDaily(db, row) {
+  db.prepare(`
+    INSERT OR REPLACE INTO billing_daily (date, provider, description, cost_usd, updated_at)
+    VALUES (?, ?, ?, ?, ?)
+  `).run(row.date, row.provider, row.description, row.cost_usd, row.updated_at);
+}
+function clearBillingRange(db, provider, fromDate, toDate) {
+  db.prepare(`DELETE FROM billing_daily WHERE provider = ? AND date >= ? AND date <= ?`).run(provider, fromDate, toDate);
+}
+function queryBillingSummary(db, period) {
+  const where = period === "today" ? `date = DATE('now')` : period === "yesterday" ? `date = DATE('now', '-1 day')` : period === "week" ? `date >= DATE('now', 'weekday 0', '-7 days')` : period === "month" ? `date >= DATE('now', 'start of month')` : period === "year" ? `date >= DATE('now', 'start of year')` : "1=1";
+  const rows = db.prepare(`SELECT provider, SUM(cost_usd) as cost FROM billing_daily WHERE ${where} GROUP BY provider`).all();
+  const by_provider = {};
+  let total = 0;
+  for (const r of rows) {
+    by_provider[r.provider] = r.cost;
+    total += r.cost;
+  }
+  return { total_usd: total, by_provider };
+}
 function listMachines(db) {
   return db.prepare(`
     SELECT
@@ -566,11 +677,11 @@ function deleteModelPricing(db, model) {
   db.prepare(`DELETE FROM model_pricing WHERE model = ?`).run(model);
 }
 function seedModelPricing(db, defaults) {
-  const existing = db.prepare(`SELECT COUNT(*) as count FROM model_pricing`).get();
-  if (existing.count > 0)
-    return;
+  const existing = new Set(db.prepare(`SELECT model FROM model_pricing`).all().map((r) => r.model));
   const now = new Date().toISOString();
   for (const [model, p] of Object.entries(defaults)) {
+    if (existing.has(model))
+      continue;
     upsertModelPricing(db, {
       model,
       input_per_1m: p.inputPer1M,
@@ -1915,6 +2026,119 @@ init_claude();
 init_codex();
 init_gemini();
 
+// src/ingest/billing.ts
+init_database();
+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 toISODate(d) {
+  return d.toISOString().substring(0, 10);
+}
+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 };
+}
+
+// src/cli/index.ts
+init_database();
+
 // src/lib/package-metadata.ts
 import { readFileSync as readFileSync5 } from "fs";
 var cachedMetadata = null;
@@ -2054,7 +2278,7 @@ program.action(async () => {
   }
   console.log();
 });
-program.command("sync").description("Ingest cost data from Claude Code, Codex, and Gemini").option("--claude", "Only ingest Claude Code telemetry").option("--takumi", "Only ingest Takumi sessions").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").option("--backfill-machine", "Tag existing records that have no machine_id with current hostname").action(async (opts) => {
+program.command("sync").description("Ingest cost data from Claude Code, Codex, and Gemini").option("--claude", "Only ingest Claude Code telemetry").option("--takumi", "Only ingest Takumi sessions").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").option("--backfill-machine", "Tag existing records that have no machine_id with current hostname").option("--recalculate", "Recalculate costs for all requests with cost_usd = 0").action(async (opts) => {
   const db = openDatabase();
   ensurePricingSeeded(db);
   if (opts.force) {
@@ -2093,6 +2317,29 @@ program.command("sync").description("Ingest cost data from Claude Code, Codex, a
     const sessCount = db.prepare(`UPDATE sessions SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
     console.log(chalk4.cyan(`\u2192 Backfilled machine_id='${machine}': ${reqCount.changes} requests, ${sessCount.changes} sessions`));
   }
+  if (opts.recalculate) {
+    const { computeCostFromDb: computeCostFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
+    const zeroRows = db.prepare(`SELECT id, model, input_tokens, output_tokens, cache_read_tokens, cache_create_tokens FROM requests WHERE cost_usd = 0 AND (input_tokens > 0 OR output_tokens > 0)`).all();
+    let fixed = 0;
+    for (const r of zeroRows) {
+      const cost = computeCostFromDb2(db, r.model, r.input_tokens, r.output_tokens, r.cache_read_tokens, r.cache_create_tokens);
+      if (cost > 0) {
+        db.prepare(`UPDATE requests SET cost_usd = ? WHERE id = ?`).run(cost, r.id);
+        fixed++;
+      }
+    }
+    if (fixed > 0) {
+      const touchedSessions = new Set(zeroRows.map((r) => {
+        const row = db.prepare(`SELECT session_id FROM requests WHERE id = ?`).get(r.id);
+        return row?.session_id;
+      }).filter(Boolean));
+      const { rollupSession: rollupSession2 } = await Promise.resolve().then(() => (init_database(), exports_database));
+      for (const sid of touchedSessions) {
+        rollupSession2(db, sid);
+      }
+    }
+    console.log(chalk4.cyan(`\u2192 Recalculated: ${fixed}/${zeroRows.length} zero-cost requests now have pricing`));
+  }
   try {
     const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
     await checkAndFireWebhooks2(db);
@@ -2956,5 +3203,46 @@ cloudCmd.command("status").description("Check cloud connection status").action(a
   }
   console.log();
 });
+var billingCmd = program.command("billing").description("Pull actual billing from provider admin APIs (ground truth)");
+billingCmd.command("sync").description("Sync actual billing from Anthropic and OpenAI admin APIs").option("--days <n>", "Days of history to fetch", "31").option("--anthropic", "Only sync Anthropic").option("--openai", "Only sync OpenAI").action(async (opts) => {
+  const db = openDatabase();
+  const days = Number(opts.days ?? 31);
+  const doBoth = !opts.anthropic && !opts.openai;
+  if (opts.anthropic || doBoth) {
+    process.stdout.write(chalk4.cyan("\u2192 Syncing Anthropic billing... "));
+    try {
+      const r = await syncAnthropicBilling(db, { days });
+      console.log(chalk4.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
+    } catch (e) {
+      console.log(chalk4.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
+    }
+  }
+  if (opts.openai || doBoth) {
+    process.stdout.write(chalk4.cyan("\u2192 Syncing OpenAI billing... "));
+    try {
+      const r = await syncOpenAIBilling(db, { days });
+      console.log(chalk4.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
+    } catch (e) {
+      console.log(chalk4.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
+    }
+  }
+});
+billingCmd.command("show").description("Show actual billing totals vs our estimated costs").option("--period <p>", "Period: today|yesterday|week|month|year|all", "month").action((opts) => {
+  const db = openDatabase();
+  const period = opts.period ?? "month";
+  const actual = queryBillingSummary(db, period);
+  const estimated = querySummary(db, period);
+  console.log();
+  console.log(chalk4.bold.cyan(`  Billing ${period} (actual from admin APIs)
+`));
+  printTable(["Provider", "Actual (billed)"], Object.entries(actual.by_provider).map(([p, c]) => [chalk4.white(p), fmt2(c)]));
+  console.log();
+  console.log(`  ${chalk4.bold("Actual total:")}    ${fmt2(actual.total_usd)}`);
+  console.log(`  ${chalk4.dim("Our estimate:")}    ${fmt2(estimated.total_usd)}`);
+  const diff = estimated.total_usd - actual.total_usd;
+  const pct = actual.total_usd > 0 ? diff / actual.total_usd * 100 : 0;
+  console.log(`  ${chalk4.dim("Difference:")}      ${fmt2(Math.abs(diff))} (${diff >= 0 ? "+" : ""}${pct.toFixed(1)}%)`);
+  console.log();
+});
 registerBrainsCommand(program);
 program.parse();

package/dist/db/database.d.ts

@@ -48,6 +48,19 @@ export declare function getGoalStatuses(db: Database): GoalStatus[];
 export declare function getIngestState(db: Database, source: string, key: string): string | null;
 export declare function setIngestState(db: Database, source: string, key: string, value: string): void;
 export declare function queryRequestsSince(db: Database, since: string): EconomyRequest[];
+export interface BillingDaily {
+    date: string;
+    provider: 'anthropic' | 'openai' | string;
+    description: string;
+    cost_usd: number;
+    updated_at: string;
+}
+export declare function upsertBillingDaily(db: Database, row: BillingDaily): void;
+export declare function clearBillingRange(db: Database, provider: string, fromDate: string, toDate: string): void;
+export declare function queryBillingSummary(db: Database, period: Period): {
+    total_usd: number;
+    by_provider: Record<string, number>;
+};
 export interface MachineInfo {
     machine_id: string;
     sessions: number;

package/dist/db/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/db/database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/db/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AAKxD,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,cAAc,EACd,MAAM,EACN,YAAY,EACZ,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,MAAM,EACN,aAAa,EACd,MAAM,mBAAmB,CAAA;AAE1B,wBAAgB,YAAY,IAAI,MAAM,CAKrC;AAED,wBAAgB,UAAU,IAAI,MAAM,CAkBnC;AAED,wBAAgB,SAAS,IAAI,MAAM,CAIlC;AAED,wBAAgB,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,UAAQ,GAAG,QAAQ,CAgBxE;AAmJD,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,GAAG,IAAI,CAarE;AAID,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAYzE;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAYnE;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAE,aAAkB,GAAG,cAAc,EAAE,CAkBxF;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,SAAK,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,EAAE,CAKvF;AAID,wBAAgB,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CA8BxF;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,cAAc,EAAE,CAUlE;AAED,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,QAAQ,GAAG,gBAAgB,EAAE,CAuCtE;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,SAAK,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAQrH;AAID,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAKzE;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAI5E;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,QAAQ,GAAG,cAAc,EAAE,CAG3D;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAE9D;AAID,wBAAgB,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAU/D;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM,EAAE,CAElD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAE3D;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,GAAG,YAAY,EAAE,CA2B9D;AAID,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,UAAW,SAAQ,IAAI;IACtC,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;IACpB,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CASzD;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAEzD;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,EAAE,CAE9C;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,GAAG,UAAU,EAAE,CA6B1D;AAID,wBAAgB,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGvF;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAE7F;AAID,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,CAEhF;AAID,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAA;IACzC,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,GAAG,IAAI,CAKxE;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAExG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAY5H;AAID,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,QAAQ,GAAG,WAAW,EAAE,CAaxD;AAID,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,cAAc,GAAG,IAAI,CAMxE;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAElF;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,GAAG,cAAc,EAAE,CAE/D;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAEpE;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,IAAI,CAgB3K"}

package/dist/index.js

@@ -77,6 +77,7 @@ var DEFAULT_PRICING;
 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 },
@@ -87,20 +88,38 @@ var init_pricing = __esm(() => {
     "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-2.0-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "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 },
+    "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.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 }
+    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, 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 }
   };
 });
 
@@ -251,6 +270,18 @@ function initSchema(db) {
       machine_id TEXT,
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
+
+    CREATE TABLE IF NOT EXISTS billing_daily (
+      date TEXT NOT NULL,
+      provider TEXT NOT NULL,
+      description TEXT DEFAULT '',
+      cost_usd REAL NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (date, provider, description)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date);
+    CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider);
   `);
   const cols = db.prepare(`PRAGMA table_info(requests)`).all();
   if (!cols.some((c) => c.name === "machine_id")) {
@@ -269,11 +300,11 @@ function periodWhere(period) {
     case "yesterday":
       return `DATE(timestamp) = DATE('now', '-1 day')`;
     case "week":
-      return `timestamp >= DATE('now', '-7 days')`;
+      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `timestamp >= DATE('now', '-30 days')`;
+      return `timestamp >= DATE('now', 'start of month')`;
     case "year":
-      return `timestamp >= DATE('now', '-365 days')`;
+      return `timestamp >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -285,11 +316,11 @@ function sessionPeriodWhere(period) {
     case "yesterday":
       return `DATE(started_at) = DATE('now', '-1 day')`;
     case "week":
-      return `started_at >= DATE('now', '-7 days')`;
+      return `started_at >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `started_at >= DATE('now', '-30 days')`;
+      return `started_at >= DATE('now', 'start of month')`;
     case "year":
-      return `started_at >= DATE('now', '-365 days')`;
+      return `started_at >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -401,19 +432,39 @@ function queryModelBreakdown(db) {
 }
 function queryProjectBreakdown(db) {
   return db.prepare(`
+    WITH labeled AS (
+      SELECT
+        s.id,
+        s.project_path,
+        s.total_cost_usd,
+        s.started_at,
+        COALESCE(
+          NULLIF(s.project_name, ''),
+          CASE
+            WHEN s.project_path LIKE '%/%'
+              THEN substr(s.project_path, length(rtrim(s.project_path, replace(s.project_path, '/', ''))) + 1)
+            ELSE s.project_path
+          END
+        ) as label
+      FROM sessions s
+      WHERE s.project_path != '' OR s.project_name != ''
+    )
     SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
+      MIN(l.project_path) as project_path,
+      l.label as project_name,
+      COUNT(DISTINCT l.id) as sessions,
+      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)), 0) as requests,
+      COALESCE(
+        (SELECT SUM(r.cost_usd) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        SUM(l.total_cost_usd)
+      ) as cost_usd,
+      COALESCE(
+        (SELECT SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        0
+      ) as total_tokens,
+      MAX(l.started_at) as last_active
+    FROM labeled l
+    GROUP BY l.label
     ORDER BY cost_usd DESC
   `).all();
 }
@@ -533,6 +584,26 @@ function setIngestState(db, source, key, value) {
 function queryRequestsSince(db, since) {
   return db.prepare(`SELECT * FROM requests WHERE timestamp > ? ORDER BY timestamp ASC`).all(since);
 }
+function upsertBillingDaily(db, row) {
+  db.prepare(`
+    INSERT OR REPLACE INTO billing_daily (date, provider, description, cost_usd, updated_at)
+    VALUES (?, ?, ?, ?, ?)
+  `).run(row.date, row.provider, row.description, row.cost_usd, row.updated_at);
+}
+function clearBillingRange(db, provider, fromDate, toDate) {
+  db.prepare(`DELETE FROM billing_daily WHERE provider = ? AND date >= ? AND date <= ?`).run(provider, fromDate, toDate);
+}
+function queryBillingSummary(db, period) {
+  const where = period === "today" ? `date = DATE('now')` : period === "yesterday" ? `date = DATE('now', '-1 day')` : period === "week" ? `date >= DATE('now', 'weekday 0', '-7 days')` : period === "month" ? `date >= DATE('now', 'start of month')` : period === "year" ? `date >= DATE('now', 'start of year')` : "1=1";
+  const rows = db.prepare(`SELECT provider, SUM(cost_usd) as cost FROM billing_daily WHERE ${where} GROUP BY provider`).all();
+  const by_provider = {};
+  let total = 0;
+  for (const r of rows) {
+    by_provider[r.provider] = r.cost;
+    total += r.cost;
+  }
+  return { total_usd: total, by_provider };
+}
 function listMachines(db) {
   return db.prepare(`
     SELECT
@@ -564,11 +635,11 @@ function deleteModelPricing(db, model) {
   db.prepare(`DELETE FROM model_pricing WHERE model = ?`).run(model);
 }
 function seedModelPricing(db, defaults) {
-  const existing = db.prepare(`SELECT COUNT(*) as count FROM model_pricing`).get();
-  if (existing.count > 0)
-    return;
+  const existing = new Set(db.prepare(`SELECT model FROM model_pricing`).all().map((r) => r.model));
   const now = new Date().toISOString();
   for (const [model, p] of Object.entries(defaults)) {
+    if (existing.has(model))
+      continue;
     upsertModelPricing(db, {
       model,
       input_per_1m: p.inputPer1M,
@@ -1018,6 +1089,7 @@ export {
   upsertModelPricing,
   upsertGoal,
   upsertBudget,
+  upsertBillingDaily,
   setIngestState,
   setActiveModel,
   seedModelPricing,
@@ -1030,6 +1102,7 @@ export {
   queryProjectBreakdown,
   queryModelBreakdown,
   queryDailyBreakdown,
+  queryBillingSummary,
   openDatabase,
   normalizeModelName,
   listProjects,
@@ -1059,6 +1132,7 @@ export {
   deleteBudget,
   computeCostFromDb,
   computeCost,
+  clearBillingRange,
   clearActiveModel,
   DEFAULT_PRICING,
   DEFAULT_MODEL

package/dist/ingest/billing.d.ts

@@ -0,0 +1,18 @@
+import type { SqliteAdapter as Database } from '@hasna/cloud';
+export declare function syncAnthropicBilling(db: Database, opts?: {
+    days?: number;
+    fromDate?: string;
+    toDate?: string;
+}): Promise<{
+    days: number;
+    totalUsd: number;
+}>;
+export declare function syncOpenAIBilling(db: Database, opts?: {
+    days?: number;
+    fromDate?: string;
+    toDate?: string;
+}): Promise<{
+    days: number;
+    totalUsd: number;
+}>;
+//# sourceMappingURL=billing.d.ts.map

package/dist/ingest/billing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../src/ingest/billing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AAgC7D,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,QAAQ,EACZ,IAAI,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/D,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAuD7C;AAeD,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,QAAQ,EACZ,IAAI,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/D,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAqD7C"}

package/dist/lib/pricing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pricing.d.ts","sourceRoot":"","sources":["../../src/lib/pricing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CA6BxD,CAAA;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKtD;AAGD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAEtD;AAGD,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAuBjF;AAGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAO7D;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,SAAI,EACnB,gBAAgB,SAAI,GACnB,MAAM,CASR;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,QAAQ,EACZ,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,SAAI,EACnB,gBAAgB,SAAI,GACnB,MAAM,CASR"}
+{"version":3,"file":"pricing.d.ts","sourceRoot":"","sources":["../../src/lib/pricing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAqDxD,CAAA;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKtD;AAGD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAEtD;AAGD,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAuBjF;AAGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAO7D;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,SAAI,EACnB,gBAAgB,SAAI,GACnB,MAAM,CASR;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,QAAQ,EACZ,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,SAAI,EACnB,gBAAgB,SAAI,GACnB,MAAM,CASR"}

package/dist/mcp/index.js

@@ -78,6 +78,7 @@ var DEFAULT_PRICING;
 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 },
@@ -88,20 +89,38 @@ var init_pricing = __esm(() => {
     "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-2.0-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "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 },
+    "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.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 }
+    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, 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 }
   };
 });
 
@@ -252,6 +271,18 @@ function initSchema(db) {
       machine_id TEXT,
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
+
+    CREATE TABLE IF NOT EXISTS billing_daily (
+      date TEXT NOT NULL,
+      provider TEXT NOT NULL,
+      description TEXT DEFAULT '',
+      cost_usd REAL NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (date, provider, description)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date);
+    CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider);
   `);
   const cols = db.prepare(`PRAGMA table_info(requests)`).all();
   if (!cols.some((c) => c.name === "machine_id")) {
@@ -270,11 +301,11 @@ function periodWhere(period) {
     case "yesterday":
       return `DATE(timestamp) = DATE('now', '-1 day')`;
     case "week":
-      return `timestamp >= DATE('now', '-7 days')`;
+      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `timestamp >= DATE('now', '-30 days')`;
+      return `timestamp >= DATE('now', 'start of month')`;
     case "year":
-      return `timestamp >= DATE('now', '-365 days')`;
+      return `timestamp >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -286,11 +317,11 @@ function sessionPeriodWhere(period) {
     case "yesterday":
       return `DATE(started_at) = DATE('now', '-1 day')`;
     case "week":
-      return `started_at >= DATE('now', '-7 days')`;
+      return `started_at >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `started_at >= DATE('now', '-30 days')`;
+      return `started_at >= DATE('now', 'start of month')`;
     case "year":
-      return `started_at >= DATE('now', '-365 days')`;
+      return `started_at >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -402,19 +433,39 @@ function queryModelBreakdown(db) {
 }
 function queryProjectBreakdown(db) {
   return db.prepare(`
+    WITH labeled AS (
+      SELECT
+        s.id,
+        s.project_path,
+        s.total_cost_usd,
+        s.started_at,
+        COALESCE(
+          NULLIF(s.project_name, ''),
+          CASE
+            WHEN s.project_path LIKE '%/%'
+              THEN substr(s.project_path, length(rtrim(s.project_path, replace(s.project_path, '/', ''))) + 1)
+            ELSE s.project_path
+          END
+        ) as label
+      FROM sessions s
+      WHERE s.project_path != '' OR s.project_name != ''
+    )
     SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
+      MIN(l.project_path) as project_path,
+      l.label as project_name,
+      COUNT(DISTINCT l.id) as sessions,
+      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)), 0) as requests,
+      COALESCE(
+        (SELECT SUM(r.cost_usd) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        SUM(l.total_cost_usd)
+      ) as cost_usd,
+      COALESCE(
+        (SELECT SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        0
+      ) as total_tokens,
+      MAX(l.started_at) as last_active
+    FROM labeled l
+    GROUP BY l.label
     ORDER BY cost_usd DESC
   `).all();
 }
@@ -528,11 +579,11 @@ function getModelPricing(db, model) {
   return db.prepare(`SELECT * FROM model_pricing WHERE model = ?`).get(model);
 }
 function seedModelPricing(db, defaults) {
-  const existing = db.prepare(`SELECT COUNT(*) as count FROM model_pricing`).get();
-  if (existing.count > 0)
-    return;
+  const existing = new Set(db.prepare(`SELECT model FROM model_pricing`).all().map((r) => r.model));
   const now = new Date().toISOString();
   for (const [model, p] of Object.entries(defaults)) {
+    if (existing.has(model))
+      continue;
     upsertModelPricing(db, {
       model,
       input_per_1m: p.inputPer1M,

package/dist/server/index.js

@@ -79,6 +79,7 @@ var DEFAULT_PRICING;
 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 },
@@ -89,20 +90,38 @@ var init_pricing = __esm(() => {
     "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-2.0-flash": { inputPer1M: 0.075, outputPer1M: 0.3, cacheReadPer1M: 0, cacheWritePer1M: 0 },
+    "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 },
+    "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.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 }
+    "o4-mini": { inputPer1M: 1.1, outputPer1M: 4.4, cacheReadPer1M: 0.275, 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 }
   };
 });
 
@@ -253,6 +272,18 @@ function initSchema(db) {
       machine_id TEXT,
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
+
+    CREATE TABLE IF NOT EXISTS billing_daily (
+      date TEXT NOT NULL,
+      provider TEXT NOT NULL,
+      description TEXT DEFAULT '',
+      cost_usd REAL NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (date, provider, description)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date);
+    CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider);
   `);
   const cols = db.prepare(`PRAGMA table_info(requests)`).all();
   if (!cols.some((c) => c.name === "machine_id")) {
@@ -271,11 +302,11 @@ function periodWhere(period) {
     case "yesterday":
       return `DATE(timestamp) = DATE('now', '-1 day')`;
     case "week":
-      return `timestamp >= DATE('now', '-7 days')`;
+      return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `timestamp >= DATE('now', '-30 days')`;
+      return `timestamp >= DATE('now', 'start of month')`;
     case "year":
-      return `timestamp >= DATE('now', '-365 days')`;
+      return `timestamp >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -287,11 +318,11 @@ function sessionPeriodWhere(period) {
     case "yesterday":
       return `DATE(started_at) = DATE('now', '-1 day')`;
     case "week":
-      return `started_at >= DATE('now', '-7 days')`;
+      return `started_at >= DATE('now', 'weekday 0', '-7 days')`;
     case "month":
-      return `started_at >= DATE('now', '-30 days')`;
+      return `started_at >= DATE('now', 'start of month')`;
     case "year":
-      return `started_at >= DATE('now', '-365 days')`;
+      return `started_at >= DATE('now', 'start of year')`;
     case "all":
       return "1=1";
   }
@@ -403,19 +434,39 @@ function queryModelBreakdown(db) {
 }
 function queryProjectBreakdown(db) {
   return db.prepare(`
+    WITH labeled AS (
+      SELECT
+        s.id,
+        s.project_path,
+        s.total_cost_usd,
+        s.started_at,
+        COALESCE(
+          NULLIF(s.project_name, ''),
+          CASE
+            WHEN s.project_path LIKE '%/%'
+              THEN substr(s.project_path, length(rtrim(s.project_path, replace(s.project_path, '/', ''))) + 1)
+            ELSE s.project_path
+          END
+        ) as label
+      FROM sessions s
+      WHERE s.project_path != '' OR s.project_name != ''
+    )
     SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
+      MIN(l.project_path) as project_path,
+      l.label as project_name,
+      COUNT(DISTINCT l.id) as sessions,
+      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)), 0) as requests,
+      COALESCE(
+        (SELECT SUM(r.cost_usd) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        SUM(l.total_cost_usd)
+      ) as cost_usd,
+      COALESCE(
+        (SELECT SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens) FROM requests r WHERE r.session_id IN (SELECT id FROM labeled WHERE label = l.label)),
+        0
+      ) as total_tokens,
+      MAX(l.started_at) as last_active
+    FROM labeled l
+    GROUP BY l.label
     ORDER BY cost_usd DESC
   `).all();
 }
@@ -557,11 +608,11 @@ function deleteModelPricing(db, model) {
   db.prepare(`DELETE FROM model_pricing WHERE model = ?`).run(model);
 }
 function seedModelPricing(db, defaults) {
-  const existing = db.prepare(`SELECT COUNT(*) as count FROM model_pricing`).get();
-  if (existing.count > 0)
-    return;
+  const existing = new Set(db.prepare(`SELECT model FROM model_pricing`).all().map((r) => r.model));
   const now = new Date().toISOString();
   for (const [model, p] of Object.entries(defaults)) {
+    if (existing.has(model))
+      continue;
     upsertModelPricing(db, {
       model,
       input_per_1m: p.inputPer1M,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini",
   "type": "module",
   "main": "dist/index.js",