@hasna/economy 0.2.15 → 0.2.17

package/dist/cli/index.js

@@ -96,9 +96,9 @@ var init_pricing = __esm(() => {
     "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: 10, cacheReadPer1M: 0.625, cacheWritePer1M: 0 },
-    "gpt-5.4-pro": { inputPer1M: 5, outputPer1M: 20, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
-    "gpt-5.4-mini": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.075, 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 },
@@ -134,6 +134,7 @@ __export(exports_database, {
   upsertModelPricing: () => upsertModelPricing,
   upsertGoal: () => upsertGoal,
   upsertBudget: () => upsertBudget,
+  upsertBillingDaily: () => upsertBillingDaily,
   setIngestState: () => setIngestState,
   seedModelPricing: () => seedModelPricing,
   rollupSession: () => rollupSession,
@@ -144,6 +145,7 @@ __export(exports_database, {
   queryProjectBreakdown: () => queryProjectBreakdown,
   queryModelBreakdown: () => queryModelBreakdown,
   queryDailyBreakdown: () => queryDailyBreakdown,
+  queryBillingSummary: () => queryBillingSummary,
   openDatabase: () => openDatabase,
   listProjects: () => listProjects,
   listModelPricing: () => listModelPricing,
@@ -161,7 +163,8 @@ __export(exports_database, {
   deleteProject: () => deleteProject,
   deleteModelPricing: () => deleteModelPricing,
   deleteGoal: () => deleteGoal,
-  deleteBudget: () => deleteBudget
+  deleteBudget: () => deleteBudget,
+  clearBillingRange: () => clearBillingRange
 });
 import { SqliteAdapter as Database } from "@hasna/cloud";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
@@ -309,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")) {
@@ -327,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";
   }
@@ -343,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";
   }
@@ -457,23 +472,66 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
+function labelForPath(projectPath, projectName) {
+  if (projectName && projectName.trim() !== "")
+    return projectName;
+  if (!projectPath)
+    return "";
+  const segments = projectPath.split("/").filter(Boolean);
+  const projectPrefix = /^(open|skill|hook|service|connect|platform|agent|tool|iapp|project|scaffold|capp)-/;
+  for (const seg of segments) {
+    if (projectPrefix.test(seg))
+      return seg;
+  }
+  const generic = new Set(["web", "app", "apps", "packages", "src", "lib", "server", "client", "api", "frontend", "backend"]);
+  for (let i = segments.length - 1;i >= 0; i--) {
+    if (!generic.has(segments[i].toLowerCase()))
+      return segments[i];
+  }
+  return segments[segments.length - 1] ?? projectPath;
+}
 function queryProjectBreakdown(db) {
-  return db.prepare(`
-    SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
-    ORDER BY cost_usd DESC
+  const sessions = db.prepare(`
+    SELECT id, project_path, project_name, total_cost_usd, started_at
+    FROM sessions
+    WHERE project_path != '' OR project_name != ''
   `).all();
+  const groups = new Map;
+  for (const s of sessions) {
+    const label = labelForPath(s.project_path, s.project_name);
+    if (!label)
+      continue;
+    const g = groups.get(label) ?? { sessionIds: [], samplePath: s.project_path, totalCost: 0, lastActive: "" };
+    g.sessionIds.push(s.id);
+    g.totalCost += s.total_cost_usd || 0;
+    if (!g.lastActive || s.started_at > g.lastActive)
+      g.lastActive = s.started_at;
+    if (!g.samplePath)
+      g.samplePath = s.project_path;
+    groups.set(label, g);
+  }
+  const result = [];
+  for (const [label, g] of groups.entries()) {
+    const placeholders = g.sessionIds.map(() => "?").join(",");
+    const reqStats = placeholders.length ? db.prepare(`
+          SELECT
+            COUNT(*) as requests,
+            COALESCE(SUM(cost_usd), 0) as cost_usd,
+            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens
+          FROM requests WHERE session_id IN (${placeholders})
+        `).get(...g.sessionIds) : { requests: 0, cost_usd: 0, total_tokens: 0 };
+    result.push({
+      project_path: g.samplePath,
+      project_name: label,
+      sessions: g.sessionIds.length,
+      requests: reqStats.requests,
+      total_tokens: reqStats.total_tokens,
+      cost_usd: reqStats.cost_usd > 0 ? reqStats.cost_usd : g.totalCost,
+      last_active: g.lastActive
+    });
+  }
+  result.sort((a, b) => b.cost_usd - a.cost_usd);
+  return result;
 }
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`
@@ -591,6 +649,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
@@ -1971,6 +2049,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;
@@ -3035,5 +3226,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":"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"}

package/dist/index.js

@@ -94,9 +94,9 @@ var init_pricing = __esm(() => {
     "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: 10, cacheReadPer1M: 0.625, cacheWritePer1M: 0 },
-    "gpt-5.4-pro": { inputPer1M: 5, outputPer1M: 20, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
-    "gpt-5.4-mini": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.075, 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 },
@@ -270,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")) {
@@ -288,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";
   }
@@ -304,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";
   }
@@ -418,23 +430,66 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
+function labelForPath(projectPath, projectName) {
+  if (projectName && projectName.trim() !== "")
+    return projectName;
+  if (!projectPath)
+    return "";
+  const segments = projectPath.split("/").filter(Boolean);
+  const projectPrefix = /^(open|skill|hook|service|connect|platform|agent|tool|iapp|project|scaffold|capp)-/;
+  for (const seg of segments) {
+    if (projectPrefix.test(seg))
+      return seg;
+  }
+  const generic = new Set(["web", "app", "apps", "packages", "src", "lib", "server", "client", "api", "frontend", "backend"]);
+  for (let i = segments.length - 1;i >= 0; i--) {
+    if (!generic.has(segments[i].toLowerCase()))
+      return segments[i];
+  }
+  return segments[segments.length - 1] ?? projectPath;
+}
 function queryProjectBreakdown(db) {
-  return db.prepare(`
-    SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
-    ORDER BY cost_usd DESC
+  const sessions = db.prepare(`
+    SELECT id, project_path, project_name, total_cost_usd, started_at
+    FROM sessions
+    WHERE project_path != '' OR project_name != ''
   `).all();
+  const groups = new Map;
+  for (const s of sessions) {
+    const label = labelForPath(s.project_path, s.project_name);
+    if (!label)
+      continue;
+    const g = groups.get(label) ?? { sessionIds: [], samplePath: s.project_path, totalCost: 0, lastActive: "" };
+    g.sessionIds.push(s.id);
+    g.totalCost += s.total_cost_usd || 0;
+    if (!g.lastActive || s.started_at > g.lastActive)
+      g.lastActive = s.started_at;
+    if (!g.samplePath)
+      g.samplePath = s.project_path;
+    groups.set(label, g);
+  }
+  const result = [];
+  for (const [label, g] of groups.entries()) {
+    const placeholders = g.sessionIds.map(() => "?").join(",");
+    const reqStats = placeholders.length ? db.prepare(`
+          SELECT
+            COUNT(*) as requests,
+            COALESCE(SUM(cost_usd), 0) as cost_usd,
+            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens
+          FROM requests WHERE session_id IN (${placeholders})
+        `).get(...g.sessionIds) : { requests: 0, cost_usd: 0, total_tokens: 0 };
+    result.push({
+      project_path: g.samplePath,
+      project_name: label,
+      sessions: g.sessionIds.length,
+      requests: reqStats.requests,
+      total_tokens: reqStats.total_tokens,
+      cost_usd: reqStats.cost_usd > 0 ? reqStats.cost_usd : g.totalCost,
+      last_active: g.lastActive
+    });
+  }
+  result.sort((a, b) => b.cost_usd - a.cost_usd);
+  return result;
 }
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`
@@ -552,6 +607,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
@@ -1037,6 +1112,7 @@ export {
   upsertModelPricing,
   upsertGoal,
   upsertBudget,
+  upsertBillingDaily,
   setIngestState,
   setActiveModel,
   seedModelPricing,
@@ -1049,6 +1125,7 @@ export {
   queryProjectBreakdown,
   queryModelBreakdown,
   queryDailyBreakdown,
+  queryBillingSummary,
   openDatabase,
   normalizeModelName,
   listProjects,
@@ -1078,6 +1155,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/mcp/index.js

@@ -95,9 +95,9 @@ var init_pricing = __esm(() => {
     "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: 10, cacheReadPer1M: 0.625, cacheWritePer1M: 0 },
-    "gpt-5.4-pro": { inputPer1M: 5, outputPer1M: 20, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
-    "gpt-5.4-mini": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.075, 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 },
@@ -271,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")) {
@@ -289,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";
   }
@@ -305,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";
   }
@@ -419,23 +431,66 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
+function labelForPath(projectPath, projectName) {
+  if (projectName && projectName.trim() !== "")
+    return projectName;
+  if (!projectPath)
+    return "";
+  const segments = projectPath.split("/").filter(Boolean);
+  const projectPrefix = /^(open|skill|hook|service|connect|platform|agent|tool|iapp|project|scaffold|capp)-/;
+  for (const seg of segments) {
+    if (projectPrefix.test(seg))
+      return seg;
+  }
+  const generic = new Set(["web", "app", "apps", "packages", "src", "lib", "server", "client", "api", "frontend", "backend"]);
+  for (let i = segments.length - 1;i >= 0; i--) {
+    if (!generic.has(segments[i].toLowerCase()))
+      return segments[i];
+  }
+  return segments[segments.length - 1] ?? projectPath;
+}
 function queryProjectBreakdown(db) {
-  return db.prepare(`
-    SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
-    ORDER BY cost_usd DESC
+  const sessions = db.prepare(`
+    SELECT id, project_path, project_name, total_cost_usd, started_at
+    FROM sessions
+    WHERE project_path != '' OR project_name != ''
   `).all();
+  const groups = new Map;
+  for (const s of sessions) {
+    const label = labelForPath(s.project_path, s.project_name);
+    if (!label)
+      continue;
+    const g = groups.get(label) ?? { sessionIds: [], samplePath: s.project_path, totalCost: 0, lastActive: "" };
+    g.sessionIds.push(s.id);
+    g.totalCost += s.total_cost_usd || 0;
+    if (!g.lastActive || s.started_at > g.lastActive)
+      g.lastActive = s.started_at;
+    if (!g.samplePath)
+      g.samplePath = s.project_path;
+    groups.set(label, g);
+  }
+  const result = [];
+  for (const [label, g] of groups.entries()) {
+    const placeholders = g.sessionIds.map(() => "?").join(",");
+    const reqStats = placeholders.length ? db.prepare(`
+          SELECT
+            COUNT(*) as requests,
+            COALESCE(SUM(cost_usd), 0) as cost_usd,
+            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens
+          FROM requests WHERE session_id IN (${placeholders})
+        `).get(...g.sessionIds) : { requests: 0, cost_usd: 0, total_tokens: 0 };
+    result.push({
+      project_path: g.samplePath,
+      project_name: label,
+      sessions: g.sessionIds.length,
+      requests: reqStats.requests,
+      total_tokens: reqStats.total_tokens,
+      cost_usd: reqStats.cost_usd > 0 ? reqStats.cost_usd : g.totalCost,
+      last_active: g.lastActive
+    });
+  }
+  result.sort((a, b) => b.cost_usd - a.cost_usd);
+  return result;
 }
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`

package/dist/server/index.js

@@ -96,9 +96,9 @@ var init_pricing = __esm(() => {
     "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: 10, cacheReadPer1M: 0.625, cacheWritePer1M: 0 },
-    "gpt-5.4-pro": { inputPer1M: 5, outputPer1M: 20, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
-    "gpt-5.4-mini": { inputPer1M: 0.3, outputPer1M: 1.2, cacheReadPer1M: 0.075, 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 },
@@ -272,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")) {
@@ -290,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";
   }
@@ -306,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";
   }
@@ -420,23 +432,66 @@ function queryModelBreakdown(db) {
     FROM requests GROUP BY model, agent ORDER BY cost_usd DESC
   `).all();
 }
+function labelForPath(projectPath, projectName) {
+  if (projectName && projectName.trim() !== "")
+    return projectName;
+  if (!projectPath)
+    return "";
+  const segments = projectPath.split("/").filter(Boolean);
+  const projectPrefix = /^(open|skill|hook|service|connect|platform|agent|tool|iapp|project|scaffold|capp)-/;
+  for (const seg of segments) {
+    if (projectPrefix.test(seg))
+      return seg;
+  }
+  const generic = new Set(["web", "app", "apps", "packages", "src", "lib", "server", "client", "api", "frontend", "backend"]);
+  for (let i = segments.length - 1;i >= 0; i--) {
+    if (!generic.has(segments[i].toLowerCase()))
+      return segments[i];
+  }
+  return segments[segments.length - 1] ?? projectPath;
+}
 function queryProjectBreakdown(db) {
-  return db.prepare(`
-    SELECT
-      s.project_path,
-      COALESCE(p.name, s.project_name) as project_name,
-      COUNT(DISTINCT s.id) as sessions,
-      COUNT(r.id) as requests,
-      COALESCE(SUM(r.cost_usd), COALESCE(SUM(s.total_cost_usd), 0)) as cost_usd,
-      COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    LEFT JOIN projects p ON p.path = s.project_path OR p.name = s.project_name
-    LEFT JOIN requests r ON r.session_id = s.id
-    WHERE s.project_path != '' OR s.project_name != ''
-    GROUP BY s.project_path
-    ORDER BY cost_usd DESC
+  const sessions = db.prepare(`
+    SELECT id, project_path, project_name, total_cost_usd, started_at
+    FROM sessions
+    WHERE project_path != '' OR project_name != ''
   `).all();
+  const groups = new Map;
+  for (const s of sessions) {
+    const label = labelForPath(s.project_path, s.project_name);
+    if (!label)
+      continue;
+    const g = groups.get(label) ?? { sessionIds: [], samplePath: s.project_path, totalCost: 0, lastActive: "" };
+    g.sessionIds.push(s.id);
+    g.totalCost += s.total_cost_usd || 0;
+    if (!g.lastActive || s.started_at > g.lastActive)
+      g.lastActive = s.started_at;
+    if (!g.samplePath)
+      g.samplePath = s.project_path;
+    groups.set(label, g);
+  }
+  const result = [];
+  for (const [label, g] of groups.entries()) {
+    const placeholders = g.sessionIds.map(() => "?").join(",");
+    const reqStats = placeholders.length ? db.prepare(`
+          SELECT
+            COUNT(*) as requests,
+            COALESCE(SUM(cost_usd), 0) as cost_usd,
+            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens
+          FROM requests WHERE session_id IN (${placeholders})
+        `).get(...g.sessionIds) : { requests: 0, cost_usd: 0, total_tokens: 0 };
+    result.push({
+      project_path: g.samplePath,
+      project_name: label,
+      sessions: g.sessionIds.length,
+      requests: reqStats.requests,
+      total_tokens: reqStats.total_tokens,
+      cost_usd: reqStats.cost_usd > 0 ? reqStats.cost_usd : g.totalCost,
+      last_active: g.lastActive
+    });
+  }
+  result.sort((a, b) => b.cost_usd - a.cost_usd);
+  return result;
 }
 function queryDailyBreakdown(db, days = 30) {
   return db.prepare(`

package/package.json

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