@hasna/economy 0.2.33 → 0.2.35

package/dist/cli/commands/brief.d.ts

@@ -0,0 +1,71 @@
+import { Command } from 'commander';
+import type { SqliteAdapter as Database } from '@hasna/cloud';
+type BriefPeriod = 'today' | 'week';
+export interface BriefTotals {
+    sessions: number;
+    requests: number;
+    input_tokens: number;
+    output_tokens: number;
+    cache_read_tokens: number;
+    cache_create_tokens: number;
+    cache_create_5m_tokens: number;
+    cache_create_1h_tokens: number;
+    total_tokens: number;
+    cost_usd: number;
+    last_active: string | null;
+}
+export interface BriefPeriodSummary extends BriefTotals {
+    label: string;
+    period: BriefPeriod | 'since';
+    since?: string;
+}
+export interface BriefMachineRow extends BriefTotals {
+    machine_id: string;
+    last_data_at: string | null;
+    last_data_age: string;
+}
+export interface BriefAgentRow extends BriefTotals {
+    agent: string;
+}
+export interface BriefAccountRow extends BriefTotals {
+    account_key: string;
+    account_tool: string;
+    account_name: string;
+    account_email: string | null;
+    account_source: string;
+}
+export interface BriefFreshnessMachine {
+    machine_id: string;
+    max_request_at: string | null;
+    request_age: string;
+    last_merge_sync_at: string | null;
+    merge_sync_age: string;
+}
+export interface EconomyBrief {
+    generated_at: string;
+    machine: string;
+    since: {
+        input: string;
+        timestamp: string;
+        label: string;
+    };
+    summaries: BriefPeriodSummary[];
+    machines: BriefMachineRow[];
+    agents: BriefAgentRow[];
+    accounts: BriefAccountRow[];
+    freshness: {
+        machines: BriefFreshnessMachine[];
+        max_request_line: string;
+        merge_sync_line: string;
+    };
+}
+interface BriefOptions {
+    since?: string;
+    machine?: string;
+    now?: Date;
+}
+export declare function buildBrief(db: Database, opts?: BriefOptions): EconomyBrief;
+export declare function renderBriefText(brief: EconomyBrief): string;
+export declare function registerBriefCommand(program: Command): void;
+export {};
+//# sourceMappingURL=brief.d.ts.map

package/dist/cli/commands/brief.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"brief.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/brief.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AAY7D,KAAK,WAAW,GAAG,OAAO,GAAG,MAAM,CAAA;AAEnC,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,sBAAsB,EAAE,MAAM,CAAA;IAC9B,sBAAsB,EAAE,MAAM,CAAA;IAC9B,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B;AAED,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,WAAW,GAAG,OAAO,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAClD,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,aAAc,SAAQ,WAAW;IAChD,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAClD,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE;QACL,KAAK,EAAE,MAAM,CAAA;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,SAAS,EAAE,kBAAkB,EAAE,CAAA;IAC/B,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,MAAM,EAAE,aAAa,EAAE,CAAA;IACvB,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,SAAS,EAAE;QACT,QAAQ,EAAE,qBAAqB,EAAE,CAAA;QACjC,gBAAgB,EAAE,MAAM,CAAA;QACxB,eAAe,EAAE,MAAM,CAAA;KACxB,CAAA;CACF;AAcD,UAAU,YAAY;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,IAAI,CAAA;CACX;AAgmBD,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,GAAE,YAAiB,GAAG,YAAY,CA4C9E;AAyDD,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAyE3D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsB3D"}

package/dist/cli/index.js

@@ -236,6 +236,7 @@ var DEFAULT_PRICING, LEGACY_DEFAULT_PRICING, ADDITIONAL_LEGACY_DEFAULT_PRICING,
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
+    "claude-opus-4-8": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
@@ -2437,7 +2438,7 @@ var init_paths = () => {};
 function normalizeEmail(email) {
   return (email ?? "").trim().toLowerCase();
 }
-function accountKey(tool, name, email) {
+function accountKey2(tool, name, email) {
   const normalizedEmail = normalizeEmail(email);
   return `${tool}:${normalizedEmail || name}`;
 }
@@ -2446,7 +2447,7 @@ function normalizeDir(value) {
 }
 function fromProfile(profile, source) {
   return {
-    account_key: accountKey(profile.tool, profile.name, profile.email),
+    account_key: accountKey2(profile.tool, profile.name, profile.email),
     account_tool: profile.tool,
     account_name: profile.name,
     ...profile.email ? { account_email: normalizeEmail(profile.email) } : {},
@@ -2463,7 +2464,7 @@ function fromOverride(raw, agent) {
     return null;
   const email = name.includes("@") ? normalizeEmail(name) : undefined;
   return {
-    account_key: accountKey(tool, name, email),
+    account_key: accountKey2(tool, name, email),
     account_tool: tool,
     account_name: name,
     ...email ? { account_email: email } : {},
@@ -2481,7 +2482,7 @@ function envOverride(agent, env) {
     return null;
   const email = normalizeEmail(env[`ECONOMY_${agentPrefix}_ACCOUNT_EMAIL`] ?? env["ECONOMY_ACCOUNT_EMAIL"]);
   return {
-    account_key: accountKey(tool, name, email),
+    account_key: accountKey2(tool, name, email),
     account_tool: tool,
     account_name: name,
     ...email ? { account_email: email } : {},
@@ -3924,12 +3925,45 @@ function getGeminiBillingExportPath() {
 function toISODate(d) {
   return d.toISOString().substring(0, 10);
 }
+function isValidDateParts(year, month, day) {
+  const d = new Date(Date.UTC(year, month - 1, day));
+  return d.getUTCFullYear() === year && d.getUTCMonth() === month - 1 && d.getUTCDate() === day;
+}
+function formatDateParts(year, month, day) {
+  return `${String(year).padStart(4, "0")}-${String(month).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
+}
 function parseDate(value) {
+  if (typeof value === "number" && Number.isInteger(value)) {
+    return value >= 100001 && value <= 999912 ? parseDate(String(value)) : null;
+  }
   if (typeof value !== "string" || !value.trim())
     return null;
-  const d = new Date(value);
+  const trimmed = value.trim();
+  const compactMonth = /^(\d{4})(\d{2})$/.exec(trimmed);
+  if (compactMonth) {
+    const year = Number(compactMonth[1]);
+    const month = Number(compactMonth[2]);
+    return isValidDateParts(year, month, 1) ? formatDateParts(year, month, 1) : null;
+  }
+  const dashedMonth = /^(\d{4})-(\d{2})$/.exec(trimmed);
+  if (dashedMonth) {
+    const year = Number(dashedMonth[1]);
+    const month = Number(dashedMonth[2]);
+    return isValidDateParts(year, month, 1) ? formatDateParts(year, month, 1) : null;
+  }
+  const isoDate = /^(\d{4})-(\d{2})-(\d{2})(?:$|[T\s])/.exec(trimmed);
+  if (isoDate) {
+    const year = Number(isoDate[1]);
+    const month = Number(isoDate[2]);
+    const day = Number(isoDate[3]);
+    if (!isValidDateParts(year, month, day))
+      return null;
+    if (trimmed.length === 10)
+      return formatDateParts(year, month, day);
+  }
+  const d = new Date(trimmed);
   if (Number.isNaN(d.getTime()))
-    return value.substring(0, 10);
+    return null;
   return toISODate(d);
 }
 function parseCsv(content) {
@@ -6699,6 +6733,721 @@ function registerFleetCommands(program) {
   });
 }
 
+// src/cli/commands/brief.ts
+init_database();
+init_pricing();
+var ZERO_REQUEST_TOTALS = {
+  sessions: 0,
+  request_sessions: 0,
+  requests: 0,
+  input_tokens: 0,
+  output_tokens: 0,
+  cache_read_tokens: 0,
+  cache_create_tokens: 0,
+  cache_create_5m_tokens: 0,
+  cache_create_1h_tokens: 0,
+  total_tokens: 0,
+  cost_usd: 0,
+  last_active: null
+};
+var ZERO_SESSION_TOTALS = {
+  sessions: 0,
+  requests: 0,
+  total_tokens: 0,
+  cost_usd: 0,
+  last_active: null
+};
+function machineFilter(machine) {
+  if (!machine || machine === "all")
+    return;
+  return machine;
+}
+function requestPeriodWhere2(period) {
+  if (period === "today")
+    return `DATE(timestamp) = DATE('now')`;
+  return `timestamp >= DATE('now', 'weekday 0', '-7 days')`;
+}
+function sessionPeriodWhere2(period) {
+  if (period === "today")
+    return `DATE(started_at) = DATE('now')`;
+  return `started_at >= DATE('now', 'weekday 0', '-7 days')`;
+}
+function baseRequestTotals(row) {
+  return {
+    ...ZERO_REQUEST_TOTALS,
+    ...row,
+    sessions: Number(row?.request_sessions ?? row?.sessions ?? 0),
+    request_sessions: Number(row?.request_sessions ?? row?.sessions ?? 0),
+    requests: Number(row?.requests ?? 0),
+    input_tokens: Number(row?.input_tokens ?? 0),
+    output_tokens: Number(row?.output_tokens ?? 0),
+    cache_read_tokens: Number(row?.cache_read_tokens ?? 0),
+    cache_create_tokens: Number(row?.cache_create_tokens ?? 0),
+    cache_create_5m_tokens: Number(row?.cache_create_5m_tokens ?? 0),
+    cache_create_1h_tokens: Number(row?.cache_create_1h_tokens ?? 0),
+    total_tokens: Number(row?.total_tokens ?? 0),
+    cost_usd: Number(row?.cost_usd ?? 0),
+    last_active: row?.last_active ?? null
+  };
+}
+function baseSessionTotals(row) {
+  return {
+    sessions: Number(row?.sessions ?? 0),
+    requests: Number(row?.requests ?? 0),
+    total_tokens: Number(row?.total_tokens ?? 0),
+    cost_usd: Number(row?.cost_usd ?? 0),
+    last_active: row?.last_active ?? null
+  };
+}
+function latestTimestamp(...values) {
+  return values.filter(Boolean).sort().at(-1) ?? null;
+}
+function combineTotals(requests, sessions) {
+  return {
+    sessions: requests.request_sessions + sessions.sessions,
+    requests: requests.requests + sessions.requests,
+    input_tokens: requests.input_tokens,
+    output_tokens: requests.output_tokens,
+    cache_read_tokens: requests.cache_read_tokens,
+    cache_create_tokens: requests.cache_create_tokens,
+    cache_create_5m_tokens: requests.cache_create_5m_tokens,
+    cache_create_1h_tokens: requests.cache_create_1h_tokens,
+    total_tokens: requests.total_tokens + sessions.total_tokens,
+    cost_usd: requests.cost_usd + sessions.cost_usd,
+    last_active: latestTimestamp(requests.last_active, sessions.last_active)
+  };
+}
+function emptyTotals() {
+  return combineTotals(ZERO_REQUEST_TOTALS, ZERO_SESSION_TOTALS);
+}
+function requestTotalsSql(where, machine) {
+  const params = [];
+  let machineClause = "";
+  if (machine) {
+    machineClause = " AND machine_id = ?";
+    params.push(machine);
+  }
+  return {
+    sql: `
+      SELECT
+        COUNT(DISTINCT session_id) as request_sessions,
+        COUNT(*) as requests,
+        COALESCE(SUM(input_tokens), 0) as input_tokens,
+        COALESCE(SUM(output_tokens), 0) as output_tokens,
+        COALESCE(SUM(cache_read_tokens), 0) as cache_read_tokens,
+        COALESCE(SUM(cache_create_tokens), 0) as cache_create_tokens,
+        COALESCE(SUM(COALESCE(cache_create_5m_tokens, cache_create_tokens)), 0) as cache_create_5m_tokens,
+        COALESCE(SUM(COALESCE(cache_create_1h_tokens, 0)), 0) as cache_create_1h_tokens,
+        COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+        COALESCE(SUM(cost_usd), 0) as cost_usd,
+        MAX(timestamp) as last_active
+      FROM requests
+      WHERE ${where}${machineClause}
+    `,
+    params
+  };
+}
+function sessionOnlyTotalsSql(where, machine) {
+  const params = [];
+  let machineClause = "";
+  if (machine) {
+    machineClause = " AND machine_id = ?";
+    params.push(machine);
+  }
+  return {
+    sql: `
+      SELECT
+        COUNT(*) as sessions,
+        COALESCE(SUM(request_count), 0) as requests,
+        COALESCE(SUM(total_tokens), 0) as total_tokens,
+        COALESCE(SUM(total_cost_usd), 0) as cost_usd,
+        MAX(started_at) as last_active
+      FROM sessions
+      WHERE ${where}${machineClause}
+        AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+    `,
+    params
+  };
+}
+function queryRequestTotals(db, where, params, machine) {
+  const q = requestTotalsSql(where, machine);
+  return baseRequestTotals(db.prepare(q.sql).get(...params, ...q.params));
+}
+function querySessionOnlyTotals(db, where, params, machine) {
+  const q = sessionOnlyTotalsSql(where, machine);
+  return baseSessionTotals(db.prepare(q.sql).get(...params, ...q.params));
+}
+function queryPeriodTotals(db, period, machine) {
+  const summary = querySummary(db, period, machine);
+  const requests = queryRequestTotals(db, requestPeriodWhere2(period), [], machine);
+  const sessions = querySessionOnlyTotals(db, sessionPeriodWhere2(period), [], machine);
+  const totals = combineTotals(requests, sessions);
+  return {
+    ...totals,
+    sessions: summary.sessions,
+    requests: summary.requests,
+    total_tokens: summary.tokens,
+    cost_usd: summary.total_usd
+  };
+}
+function querySinceTotals(db, since, machine) {
+  const requests = queryRequestTotals(db, "timestamp >= ?", [since], machine);
+  const sessions = querySessionOnlyTotals(db, "started_at >= ?", [since], machine);
+  return combineTotals(requests, sessions);
+}
+function parseSinceDate(input, now) {
+  const value = input.trim();
+  const match = value.match(/^(\d+(?:\.\d+)?)(m|h|d|w)$/i);
+  if (match) {
+    const amount = Number(match[1]);
+    const unit = match[2].toLowerCase();
+    const multiplier = unit === "m" ? 60000 : unit === "h" ? 60 * 60000 : unit === "d" ? 24 * 60 * 60000 : 7 * 24 * 60 * 60000;
+    return {
+      timestamp: new Date(now.getTime() - amount * multiplier).toISOString(),
+      label: value
+    };
+  }
+  const parsed = new Date(value);
+  if (Number.isNaN(parsed.getTime())) {
+    throw new Error("--since must be a duration like 24h, 7d, 30m, 2w, or an ISO date");
+  }
+  return { timestamp: parsed.toISOString(), label: value };
+}
+function queryMachineSinceRows(db, since, machine) {
+  const knownMachines = new Set;
+  for (const m of listMachines(db, "all")) {
+    if (m.machine_id)
+      knownMachines.add(m.machine_id);
+  }
+  for (const m of listMachineRegistry(db)) {
+    if (m.machine_id)
+      knownMachines.add(m.machine_id);
+  }
+  if (machine)
+    knownMachines.add(machine);
+  const requestMachineClause = machine ? " AND machine_id = ?" : "";
+  const requestRows = db.prepare(`
+    SELECT
+      machine_id,
+      COUNT(DISTINCT session_id) as request_sessions,
+      COUNT(*) as requests,
+      COALESCE(SUM(input_tokens), 0) as input_tokens,
+      COALESCE(SUM(output_tokens), 0) as output_tokens,
+      COALESCE(SUM(cache_read_tokens), 0) as cache_read_tokens,
+      COALESCE(SUM(cache_create_tokens), 0) as cache_create_tokens,
+      COALESCE(SUM(COALESCE(cache_create_5m_tokens, cache_create_tokens)), 0) as cache_create_5m_tokens,
+      COALESCE(SUM(COALESCE(cache_create_1h_tokens, 0)), 0) as cache_create_1h_tokens,
+      COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+      COALESCE(SUM(cost_usd), 0) as cost_usd,
+      MAX(timestamp) as last_active
+    FROM requests
+    WHERE timestamp >= ?
+      AND machine_id != ''
+      ${requestMachineClause}
+    GROUP BY machine_id
+  `).all(...machine ? [since, machine] : [since]);
+  const sessionMachineClause = machine ? " AND machine_id = ?" : "";
+  const sessionRows = db.prepare(`
+    SELECT
+      machine_id,
+      COUNT(*) as sessions,
+      COALESCE(SUM(request_count), 0) as requests,
+      COALESCE(SUM(total_tokens), 0) as total_tokens,
+      COALESCE(SUM(total_cost_usd), 0) as cost_usd,
+      MAX(started_at) as last_active
+    FROM sessions
+    WHERE started_at >= ?
+      AND machine_id != ''
+      ${sessionMachineClause}
+      AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+    GROUP BY machine_id
+  `).all(...machine ? [since, machine] : [since]);
+  const groups = new Map;
+  for (const row of requestRows) {
+    knownMachines.add(row.machine_id);
+    groups.set(row.machine_id, combineTotals(baseRequestTotals(row), ZERO_SESSION_TOTALS));
+  }
+  for (const row of sessionRows) {
+    knownMachines.add(row.machine_id);
+    const current = groups.get(row.machine_id) ?? emptyTotals();
+    const sessions = baseSessionTotals(row);
+    groups.set(row.machine_id, {
+      ...current,
+      sessions: current.sessions + sessions.sessions,
+      requests: current.requests + sessions.requests,
+      total_tokens: current.total_tokens + sessions.total_tokens,
+      cost_usd: current.cost_usd + sessions.cost_usd,
+      last_active: latestTimestamp(current.last_active, sessions.last_active)
+    });
+  }
+  const lastData = queryMachineLastData(db, machine);
+  const rows = [...knownMachines].filter((m) => !machine || m === machine).map((machineId) => {
+    const totals = groups.get(machineId) ?? emptyTotals();
+    const lastDataAt = lastData.get(machineId) ?? totals.last_active;
+    return {
+      machine_id: machineId,
+      ...totals,
+      last_data_at: lastDataAt,
+      last_data_age: ""
+    };
+  });
+  return rows.sort((a, b) => b.cost_usd - a.cost_usd || a.machine_id.localeCompare(b.machine_id));
+}
+function queryMachineLastData(db, machine) {
+  const filter = machine ? " AND machine_id = ?" : "";
+  const requestRows = db.prepare(`
+    SELECT machine_id, MAX(timestamp) as last_at
+    FROM requests
+    WHERE machine_id != ''${filter}
+    GROUP BY machine_id
+  `).all(...machine ? [machine] : []);
+  const sessionRows = db.prepare(`
+    SELECT machine_id, MAX(started_at) as last_at
+    FROM sessions
+    WHERE machine_id != ''${filter}
+    GROUP BY machine_id
+  `).all(...machine ? [machine] : []);
+  const result = new Map;
+  for (const row of [...requestRows, ...sessionRows]) {
+    result.set(row.machine_id, latestTimestamp(result.get(row.machine_id), row.last_at));
+  }
+  return result;
+}
+function queryAgentSinceRows(db, since, machine) {
+  const requestMachineClause = machine ? " AND machine_id = ?" : "";
+  const sessionMachineClause = machine ? " AND machine_id = ?" : "";
+  const rows = db.prepare(`
+    WITH request_rows AS (
+      SELECT
+        agent,
+        session_id,
+        1 as requests,
+        input_tokens,
+        output_tokens,
+        cache_read_tokens,
+        cache_create_tokens,
+        COALESCE(cache_create_5m_tokens, cache_create_tokens) as cache_create_5m_tokens,
+        COALESCE(cache_create_1h_tokens, 0) as cache_create_1h_tokens,
+        input_tokens + output_tokens + cache_read_tokens + cache_create_tokens as total_tokens,
+        cost_usd,
+        timestamp as last_active
+      FROM requests
+      WHERE timestamp >= ?${requestMachineClause}
+    ),
+    session_only_rows AS (
+      SELECT
+        agent,
+        id as session_id,
+        COALESCE(request_count, 0) as requests,
+        0 as input_tokens,
+        0 as output_tokens,
+        0 as cache_read_tokens,
+        0 as cache_create_tokens,
+        0 as cache_create_5m_tokens,
+        0 as cache_create_1h_tokens,
+        COALESCE(total_tokens, 0) as total_tokens,
+        COALESCE(total_cost_usd, 0) as cost_usd,
+        started_at as last_active
+      FROM sessions
+      WHERE started_at >= ?${sessionMachineClause}
+        AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+    ),
+    combined AS (
+      SELECT * FROM request_rows
+      UNION ALL
+      SELECT * FROM session_only_rows
+    )
+    SELECT
+      agent,
+      COUNT(DISTINCT session_id) as sessions,
+      COALESCE(SUM(requests), 0) as requests,
+      COALESCE(SUM(input_tokens), 0) as input_tokens,
+      COALESCE(SUM(output_tokens), 0) as output_tokens,
+      COALESCE(SUM(cache_read_tokens), 0) as cache_read_tokens,
+      COALESCE(SUM(cache_create_tokens), 0) as cache_create_tokens,
+      COALESCE(SUM(cache_create_5m_tokens), 0) as cache_create_5m_tokens,
+      COALESCE(SUM(cache_create_1h_tokens), 0) as cache_create_1h_tokens,
+      COALESCE(SUM(total_tokens), 0) as total_tokens,
+      COALESCE(SUM(cost_usd), 0) as cost_usd,
+      MAX(last_active) as last_active
+    FROM combined
+    GROUP BY agent
+    ORDER BY cost_usd DESC
+  `).all(...machine ? [since, machine, since, machine] : [since, since]);
+  if (rows.length > 0)
+    return rows;
+  return queryAgentBreakdown(db, "all", machine).filter((row) => row.last_active >= since).map(agentBreakdownToBriefRow);
+}
+function agentBreakdownToBriefRow(row) {
+  return {
+    agent: row.agent,
+    sessions: row.sessions,
+    requests: row.requests,
+    input_tokens: 0,
+    output_tokens: 0,
+    cache_read_tokens: 0,
+    cache_create_tokens: 0,
+    cache_create_5m_tokens: 0,
+    cache_create_1h_tokens: 0,
+    total_tokens: row.total_tokens,
+    cost_usd: row.cost_usd,
+    last_active: row.last_active
+  };
+}
+function normalizeAccountEmail2(email) {
+  return email.trim().toLowerCase();
+}
+function accountKey(row) {
+  const agent = row.agent || row.account_tool || "unknown";
+  const email = normalizeAccountEmail2(row.account_email);
+  if (email)
+    return `${agent}:${email}`;
+  if (row.account_name)
+    return `${agent}:${row.account_name}`;
+  return row.account_key || `${agent}:unknown`;
+}
+function addAccountRow(groups, row) {
+  if (!row.account_key && !row.account_tool && !row.account_name && !row.account_email)
+    return;
+  const key = accountKey(row);
+  const email = normalizeAccountEmail2(row.account_email);
+  const current = groups.get(key) ?? {
+    account_key: key,
+    account_tool: row.agent || row.account_tool || "unknown",
+    account_name: row.account_name || email || row.account_key || "unknown",
+    account_email: email || null,
+    account_source: row.account_source || "unknown",
+    sessionIds: new Set,
+    requests: 0,
+    input_tokens: 0,
+    output_tokens: 0,
+    cache_read_tokens: 0,
+    cache_create_tokens: 0,
+    cache_create_5m_tokens: 0,
+    cache_create_1h_tokens: 0,
+    total_tokens: 0,
+    cost_usd: 0,
+    last_active: null
+  };
+  if (row.session_id)
+    current.sessionIds.add(row.session_id);
+  if (!current.account_email && email)
+    current.account_email = email;
+  if ((!current.account_name || current.account_name === "unknown") && (row.account_name || email)) {
+    current.account_name = row.account_name || email;
+  }
+  if ((!current.account_source || current.account_source === "unknown") && row.account_source && row.account_source !== "unknown") {
+    current.account_source = row.account_source;
+  }
+  current.requests += Number(row.requests ?? 0);
+  current.input_tokens += Number(row.input_tokens ?? 0);
+  current.output_tokens += Number(row.output_tokens ?? 0);
+  current.cache_read_tokens += Number(row.cache_read_tokens ?? 0);
+  current.cache_create_tokens += Number(row.cache_create_tokens ?? 0);
+  current.cache_create_5m_tokens += Number(row.cache_create_5m_tokens ?? 0);
+  current.cache_create_1h_tokens += Number(row.cache_create_1h_tokens ?? 0);
+  current.total_tokens += Number(row.total_tokens ?? 0);
+  current.cost_usd += Number(row.cost_usd ?? 0);
+  current.last_active = latestTimestamp(current.last_active, row.last_active);
+  groups.set(key, current);
+}
+function queryAccountSinceRows(db, since, machine) {
+  const requestMachineClause = machine ? " AND r.machine_id = ?" : "";
+  const sessionMachineClause = machine ? " AND s.machine_id = ?" : "";
+  const requestRows = db.prepare(`
+    SELECT
+      r.session_id as session_id,
+      COALESCE(NULLIF(r.agent, ''), NULLIF(s.agent, ''), '') as agent,
+      COALESCE(NULLIF(r.account_key, ''), NULLIF(s.account_key, ''), '') as account_key,
+      COALESCE(NULLIF(r.account_tool, ''), NULLIF(s.account_tool, ''), '') as account_tool,
+      COALESCE(NULLIF(r.account_name, ''), NULLIF(s.account_name, ''), '') as account_name,
+      COALESCE(NULLIF(r.account_email, ''), NULLIF(s.account_email, ''), '') as account_email,
+      COALESCE(NULLIF(r.account_source, ''), NULLIF(s.account_source, ''), 'unknown') as account_source,
+      1 as requests,
+      COALESCE(r.input_tokens, 0) as input_tokens,
+      COALESCE(r.output_tokens, 0) as output_tokens,
+      COALESCE(r.cache_read_tokens, 0) as cache_read_tokens,
+      COALESCE(r.cache_create_tokens, 0) as cache_create_tokens,
+      COALESCE(r.cache_create_5m_tokens, r.cache_create_tokens, 0) as cache_create_5m_tokens,
+      COALESCE(r.cache_create_1h_tokens, 0) as cache_create_1h_tokens,
+      COALESCE(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens, 0) as total_tokens,
+      COALESCE(r.cost_usd, 0) as cost_usd,
+      r.timestamp as last_active
+    FROM requests r
+    LEFT JOIN sessions s ON s.id = r.session_id
+    WHERE r.timestamp >= ?${requestMachineClause}
+  `).all(...machine ? [since, machine] : [since]);
+  const sessionRows = db.prepare(`
+    SELECT
+      s.id as session_id,
+      s.agent as agent,
+      s.account_key as account_key,
+      s.account_tool as account_tool,
+      s.account_name as account_name,
+      COALESCE(s.account_email, '') as account_email,
+      COALESCE(NULLIF(s.account_source, ''), 'unknown') as account_source,
+      COALESCE(s.request_count, 0) as requests,
+      0 as input_tokens,
+      0 as output_tokens,
+      0 as cache_read_tokens,
+      0 as cache_create_tokens,
+      0 as cache_create_5m_tokens,
+      0 as cache_create_1h_tokens,
+      COALESCE(s.total_tokens, 0) as total_tokens,
+      COALESCE(s.total_cost_usd, 0) as cost_usd,
+      s.started_at as last_active
+    FROM sessions s
+    WHERE s.started_at >= ?${sessionMachineClause}
+      AND s.id NOT IN (SELECT DISTINCT session_id FROM requests)
+  `).all(...machine ? [since, machine] : [since]);
+  const groups = new Map;
+  for (const row of requestRows)
+    addAccountRow(groups, row);
+  for (const row of sessionRows)
+    addAccountRow(groups, row);
+  const rows = [...groups.values()].map(({ sessionIds, ...row }) => ({
+    ...row,
+    sessions: sessionIds.size
+  }));
+  rows.sort((a, b) => b.cost_usd - a.cost_usd || a.account_key.localeCompare(b.account_key));
+  if (rows.length > 0)
+    return rows;
+  return queryAccountBreakdown(db, "all", machine).filter((row) => row.last_active >= since).map(accountBreakdownToBriefRow);
+}
+function accountBreakdownToBriefRow(row) {
+  return {
+    account_key: row.account_key,
+    account_tool: row.account_tool,
+    account_name: row.account_name,
+    account_email: row.account_email,
+    account_source: row.account_source,
+    sessions: row.sessions,
+    requests: row.requests,
+    input_tokens: 0,
+    output_tokens: 0,
+    cache_read_tokens: 0,
+    cache_create_tokens: 0,
+    cache_create_5m_tokens: 0,
+    cache_create_1h_tokens: 0,
+    total_tokens: row.total_tokens,
+    cost_usd: row.cost_usd,
+    last_active: row.last_active
+  };
+}
+function queryFreshness(db, now, machine) {
+  const requestFilter = machine ? " AND machine_id = ?" : "";
+  const requestRows = db.prepare(`
+    SELECT machine_id, MAX(timestamp) as max_request_at
+    FROM requests
+    WHERE machine_id != ''${requestFilter}
+    GROUP BY machine_id
+  `).all(...machine ? [machine] : []);
+  const registryRows = listMachineRegistry(db).filter((row) => !machine || row.machine_id === machine);
+  const machines = new Map;
+  for (const row of requestRows) {
+    machines.set(row.machine_id, {
+      machine_id: row.machine_id,
+      max_request_at: row.max_request_at,
+      request_age: formatAge(row.max_request_at, now),
+      last_merge_sync_at: null,
+      merge_sync_age: "never"
+    });
+  }
+  for (const row of registryRows) {
+    const current = machines.get(row.machine_id) ?? {
+      machine_id: row.machine_id,
+      max_request_at: null,
+      request_age: "never",
+      last_merge_sync_at: null,
+      merge_sync_age: "never"
+    };
+    const syncAt = latestTimestamp(row.last_pull_at, row.last_push_at, row.updated_at);
+    current.last_merge_sync_at = syncAt;
+    current.merge_sync_age = formatAge(syncAt, now);
+    machines.set(row.machine_id, current);
+  }
+  const rows = [...machines.values()].sort((a, b) => a.machine_id.localeCompare(b.machine_id));
+  return {
+    machines: rows,
+    max_request_line: rows.length ? rows.map((row) => `${row.machine_id} ${row.max_request_at ?? "never"} (${row.request_age})`).join("; ") : "none",
+    merge_sync_line: rows.length ? rows.map((row) => `${row.machine_id} ${row.last_merge_sync_at ?? "never"} (${row.merge_sync_age})`).join("; ") : "none"
+  };
+}
+function buildBrief(db, opts = {}) {
+  const now = opts.now ?? new Date;
+  const machine = machineFilter(opts.machine);
+  const sinceInput = opts.since ?? "24h";
+  const since = parseSinceDate(sinceInput, now);
+  const summaries = [
+    {
+      label: "Today",
+      period: "today",
+      ...queryPeriodTotals(db, "today", machine)
+    },
+    {
+      label: "Week",
+      period: "week",
+      ...queryPeriodTotals(db, "week", machine)
+    },
+    {
+      label: `Since ${since.label}`,
+      period: "since",
+      since: since.timestamp,
+      ...querySinceTotals(db, since.timestamp, machine)
+    }
+  ];
+  const machines = queryMachineSinceRows(db, since.timestamp, machine);
+  for (const row of machines) {
+    row.last_data_age = formatAge(row.last_data_at, now);
+  }
+  return {
+    generated_at: now.toISOString(),
+    machine: machine ?? "all",
+    since: {
+      input: sinceInput,
+      timestamp: since.timestamp,
+      label: since.label
+    },
+    summaries,
+    machines,
+    agents: queryAgentSinceRows(db, since.timestamp, machine),
+    accounts: queryAccountSinceRows(db, since.timestamp, machine),
+    freshness: queryFreshness(db, now, machine)
+  };
+}
+function formatUsd(usd) {
+  if (usd >= 0.01)
+    return "$" + usd.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+  if (usd >= 0.0001)
+    return `${(usd * 100).toFixed(2).replace(/\.?0+$/, "")}c`;
+  if (usd > 0)
+    return "<0.01c";
+  return "$0.00";
+}
+function formatCount(n) {
+  return Math.round(n).toLocaleString("en-US");
+}
+function formatTokens(n) {
+  if (n >= 1e9)
+    return `${(n / 1e9).toFixed(1)}B`;
+  if (n >= 1e6)
+    return `${(n / 1e6).toFixed(1)}M`;
+  if (n >= 1000)
+    return `${(n / 1000).toFixed(1)}k`;
+  return formatCount(n);
+}
+function formatAge(timestamp, now) {
+  if (!timestamp)
+    return "never";
+  const t = new Date(timestamp).getTime();
+  if (!Number.isFinite(t))
+    return "unknown";
+  const ageMs = Math.max(0, now.getTime() - t);
+  const minutes = Math.floor(ageMs / 60000);
+  if (minutes < 1)
+    return "<1m";
+  if (minutes < 60)
+    return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 48)
+    return `${hours}h`;
+  return `${Math.floor(hours / 24)}d`;
+}
+function accountLabel(row) {
+  return row.account_email || row.account_name || row.account_key || "unknown";
+}
+function cacheLabel(row) {
+  const total = row.cache_read_tokens + row.cache_create_tokens;
+  const split = row.cache_create_5m_tokens || row.cache_create_1h_tokens ? `; 5m ${formatTokens(row.cache_create_5m_tokens)} / 1h ${formatTokens(row.cache_create_1h_tokens)}` : "";
+  return `${formatTokens(total)} (r ${formatTokens(row.cache_read_tokens)} / w ${formatTokens(row.cache_create_tokens)}${split})`;
+}
+function table(headers, rows) {
+  if (rows.length === 0)
+    return ["(none)"];
+  const widths = headers.map((header, index) => Math.max(header.length, ...rows.map((row) => (row[index] ?? "").length)));
+  const lines = [];
+  lines.push(headers.map((header, index) => header.padEnd(widths[index])).join("  "));
+  lines.push(widths.map((width) => "-".repeat(width)).join("  "));
+  for (const row of rows) {
+    lines.push(row.map((cell, index) => cell.padEnd(widths[index])).join("  "));
+  }
+  return lines;
+}
+function renderBriefText(brief) {
+  const lines = [];
+  lines.push(`Economy Brief - ${brief.machine === "all" ? "fleet" : brief.machine}`);
+  lines.push(`Generated: ${brief.generated_at}`);
+  lines.push(`Since: ${brief.since.label} (${brief.since.timestamp})`);
+  lines.push("");
+  lines.push("SUMMARY");
+  lines.push(...table(["Period", "Sessions", "Requests", "Input", "Output", "Cache", "Tokens", "Cost"], brief.summaries.map((row) => [
+    row.label,
+    formatCount(row.sessions),
+    formatCount(row.requests),
+    formatTokens(row.input_tokens),
+    formatTokens(row.output_tokens),
+    cacheLabel(row),
+    formatTokens(row.total_tokens),
+    formatUsd(row.cost_usd)
+  ])));
+  lines.push("");
+  lines.push(`PER-MACHINE - since ${brief.since.label}`);
+  lines.push(...table(["Machine", "Sessions", "Tokens", "Cache", "Cost", "Last Data Age"], brief.machines.map((row) => [
+    row.machine_id,
+    formatCount(row.sessions),
+    formatTokens(row.total_tokens),
+    cacheLabel(row),
+    formatUsd(row.cost_usd),
+    row.last_data_age
+  ])));
+  lines.push("");
+  lines.push(`PER-AGENT - since ${brief.since.label}`);
+  lines.push(...table(["Agent", "Sessions", "Requests", "Tokens", "Cache", "Cost", "Last Active"], brief.agents.map((row) => [
+    row.agent,
+    formatCount(row.sessions),
+    formatCount(row.requests),
+    formatTokens(row.total_tokens),
+    cacheLabel(row),
+    formatUsd(row.cost_usd),
+    row.last_active?.substring(0, 19) ?? "-"
+  ])));
+  lines.push("");
+  lines.push(`PER-ACCOUNT - since ${brief.since.label}`);
+  lines.push(...table(["Account", "Agent", "Sessions", "Requests", "Tokens", "Cost", "Last Active"], brief.accounts.map((row) => [
+    accountLabel(row),
+    row.account_tool,
+    formatCount(row.sessions),
+    formatCount(row.requests),
+    formatTokens(row.total_tokens),
+    formatUsd(row.cost_usd),
+    row.last_active?.substring(0, 19) ?? "-"
+  ])));
+  lines.push("");
+  lines.push("FRESHNESS");
+  lines.push(`Max request: ${brief.freshness.max_request_line}`);
+  lines.push(`Merge/sync: ${brief.freshness.merge_sync_line}`);
+  lines.push("");
+  return lines.join(`
+`);
+}
+function registerBriefCommand(program) {
+  program.command("brief").description("Fleet-wide usage brief with tokens, cache, cost, breakdowns, and freshness").option("--since <duration-or-date>", "Since window for breakdown tables (24h, 7d, ISO date)", "24h").option("--machine <id|all>", "Filter to one machine, or all machines", "all").option("--json", "Output JSON").action((opts) => {
+    try {
+      const db = openDatabase();
+      ensurePricingSeeded(db);
+      const brief = buildBrief(db, { since: opts.since, machine: opts.machine });
+      if (opts.json) {
+        console.log(JSON.stringify(brief, null, 2));
+        return;
+      }
+      console.log(renderBriefText(brief));
+    } catch (error) {
+      console.error(error instanceof Error ? error.message : String(error));
+      process.exit(1);
+    }
+  });
+}
+
 // src/cli/index.ts
 init_agents();
 init_sync_all();
@@ -6722,38 +7471,38 @@ var GENERIC_PEER_TABLES = [
 function quoteIdent(identifier) {
   return `"${identifier.replace(/"/g, '""')}"`;
 }
-function tableExists(db, table) {
-  const row = db.prepare(`SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?`).get(table);
+function tableExists(db, table2) {
+  const row = db.prepare(`SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?`).get(table2);
   return Boolean(row);
 }
-function tableColumns(db, table) {
-  if (!tableExists(db, table))
+function tableColumns(db, table2) {
+  if (!tableExists(db, table2))
     return [];
-  return db.prepare(`PRAGMA table_info(${quoteIdent(table)})`).all();
+  return db.prepare(`PRAGMA table_info(${quoteIdent(table2)})`).all();
 }
-function commonColumns(source, target, table) {
-  const sourceCols = new Set(tableColumns(source, table).map((c) => c.name));
-  return tableColumns(target, table).map((c) => c.name).filter((c) => sourceCols.has(c));
+function commonColumns(source, target, table2) {
+  const sourceCols = new Set(tableColumns(source, table2).map((c) => c.name));
+  return tableColumns(target, table2).map((c) => c.name).filter((c) => sourceCols.has(c));
 }
-function primaryKeyColumns(db, table) {
-  return tableColumns(db, table).filter((c) => c.pk > 0).sort((a, b) => a.pk - b.pk).map((c) => c.name);
+function primaryKeyColumns(db, table2) {
+  return tableColumns(db, table2).filter((c) => c.pk > 0).sort((a, b) => a.pk - b.pk).map((c) => c.name);
 }
-function selectRows(source, table, columns) {
+function selectRows(source, table2, columns) {
   if (columns.length === 0)
     return [];
   const select = columns.map(quoteIdent).join(", ");
-  return source.prepare(`SELECT ${select} FROM ${quoteIdent(table)}`).all();
+  return source.prepare(`SELECT ${select} FROM ${quoteIdent(table2)}`).all();
 }
-function rowByKey(target, table, keyColumns, row) {
+function rowByKey(target, table2, keyColumns, row) {
   if (keyColumns.length === 0)
     return null;
   if (keyColumns.some((c) => row[c] == null))
     return null;
   const where = keyColumns.map((c) => `${quoteIdent(c)} = ?`).join(" AND ");
-  return target.prepare(`SELECT * FROM ${quoteIdent(table)} WHERE ${where}`).get(...keyColumns.map((c) => row[c]));
+  return target.prepare(`SELECT * FROM ${quoteIdent(table2)} WHERE ${where}`).get(...keyColumns.map((c) => row[c]));
 }
-function hasId(target, table, id) {
-  return target.prepare(`SELECT id, machine_id FROM ${quoteIdent(table)} WHERE id = ?`).get(id);
+function hasId(target, table2, id) {
+  return target.prepare(`SELECT id, machine_id FROM ${quoteIdent(table2)} WHERE id = ?`).get(id);
 }
 function shouldReplace(source, existing) {
   if (!existing)
@@ -6779,30 +7528,30 @@ function normalizeRow(row, columns, sourceMachine, now) {
     next["attribution_tag"] = "";
   return next;
 }
-function insertOrReplace(target, table, columns, row) {
+function insertOrReplace(target, table2, columns, row) {
   const colSql = columns.map(quoteIdent).join(", ");
   const placeholders = columns.map(() => "?").join(", ");
   target.prepare(`
-    INSERT OR REPLACE INTO ${quoteIdent(table)} (${colSql})
+    INSERT OR REPLACE INTO ${quoteIdent(table2)} (${colSql})
     VALUES (${placeholders})
   `).run(...columns.map((c) => row[c] ?? null));
 }
-function collisionId(target, table, machine, originalId) {
+function collisionId(target, table2, machine, originalId) {
   const base = `${machine || "peer"}:${originalId}`;
-  const baseRow = hasId(target, table, base);
+  const baseRow = hasId(target, table2, base);
   if (!baseRow || String(baseRow["machine_id"] ?? "") === machine)
     return base;
   for (let i = 2;; i++) {
     const candidate = `${base}:${i}`;
-    const row = hasId(target, table, candidate);
+    const row = hasId(target, table2, candidate);
     if (!row || String(row["machine_id"] ?? "") === machine)
       return candidate;
   }
 }
-function mergeIdentityTable(target, source, table, sourceMachine, now, sessionIdMap) {
-  const stats = { table, inserted: 0, updated: 0, skipped: 0, collisions: 0 };
-  const columns = commonColumns(source, target, table);
-  const rows = selectRows(source, table, columns);
+function mergeIdentityTable(target, source, table2, sourceMachine, now, sessionIdMap) {
+  const stats = { table: table2, inserted: 0, updated: 0, skipped: 0, collisions: 0 };
+  const columns = commonColumns(source, target, table2);
+  const rows = selectRows(source, table2, columns);
   const idMap = new Map;
   for (const raw of rows) {
     const row = normalizeRow(raw, columns, sourceMachine, now);
@@ -6812,22 +7561,22 @@ function mergeIdentityTable(target, source, table, sourceMachine, now, sessionId
       continue;
     }
     const machine = String(row["machine_id"] ?? "");
-    const directExisting = hasId(target, table, originalId);
+    const directExisting = hasId(target, table2, originalId);
     if (directExisting && String(directExisting["machine_id"] ?? "") !== machine) {
-      row["id"] = collisionId(target, table, machine, originalId);
+      row["id"] = collisionId(target, table2, machine, originalId);
       stats.collisions++;
     }
-    if (table === "requests" && sessionIdMap) {
+    if (table2 === "requests" && sessionIdMap) {
       const originalSessionId = String(row["session_id"] ?? "");
       row["session_id"] = sessionIdMap.get(originalSessionId) ?? originalSessionId;
     }
-    const existing = hasId(target, table, String(row["id"]));
+    const existing = hasId(target, table2, String(row["id"]));
     idMap.set(originalId, String(row["id"]));
     if (existing && !shouldReplace(row, existing)) {
       stats.skipped++;
       continue;
     }
-    insertOrReplace(target, table, columns, row);
+    insertOrReplace(target, table2, columns, row);
     if (existing)
       stats.updated++;
     else
@@ -6836,10 +7585,10 @@ function mergeIdentityTable(target, source, table, sourceMachine, now, sessionId
   return { stats, idMap };
 }
 function mergeProjects(target, source) {
-  const table = "projects";
-  const stats = { table, inserted: 0, updated: 0, skipped: 0, collisions: 0 };
-  const columns = commonColumns(source, target, table);
-  const rows = selectRows(source, table, columns);
+  const table2 = "projects";
+  const stats = { table: table2, inserted: 0, updated: 0, skipped: 0, collisions: 0 };
+  const columns = commonColumns(source, target, table2);
+  const rows = selectRows(source, table2, columns);
   for (const raw of rows) {
     const row = { ...raw };
     const path = String(row["path"] ?? "");
@@ -6851,7 +7600,7 @@ function mergeProjects(target, source) {
     const existingByPath = target.prepare(`SELECT * FROM projects WHERE path = ?`).get(path);
     if (existingByPath) {
       row["id"] = existingByPath["id"] ?? id;
-      insertOrReplace(target, table, columns, row);
+      insertOrReplace(target, table2, columns, row);
       stats.updated++;
       continue;
     }
@@ -6863,24 +7612,24 @@ function mergeProjects(target, source) {
         row["id"] = `peer:${String(row["id"])}`;
       }
     }
-    insertOrReplace(target, table, columns, row);
+    insertOrReplace(target, table2, columns, row);
     stats.inserted++;
   }
   return stats;
 }
-function mergeGenericTable(target, source, table, sourceMachine, now) {
-  const stats = { table, inserted: 0, updated: 0, skipped: 0, collisions: 0 };
-  const columns = commonColumns(source, target, table);
-  const keyColumns = primaryKeyColumns(target, table).filter((c) => columns.includes(c));
-  const rows = selectRows(source, table, columns);
+function mergeGenericTable(target, source, table2, sourceMachine, now) {
+  const stats = { table: table2, inserted: 0, updated: 0, skipped: 0, collisions: 0 };
+  const columns = commonColumns(source, target, table2);
+  const keyColumns = primaryKeyColumns(target, table2).filter((c) => columns.includes(c));
+  const rows = selectRows(source, table2, columns);
   for (const raw of rows) {
     const row = normalizeRow(raw, columns, sourceMachine, now);
-    const existing = rowByKey(target, table, keyColumns, row);
+    const existing = rowByKey(target, table2, keyColumns, row);
     if (existing && !shouldReplace(row, existing)) {
       stats.skipped++;
       continue;
     }
-    insertOrReplace(target, table, columns, row);
+    insertOrReplace(target, table2, columns, row);
     if (existing)
       stats.updated++;
     else
@@ -6892,12 +7641,12 @@ function detectSourceMachine(source, fallback) {
   if (fallback && fallback.trim())
     return fallback.trim();
   const counts = new Map;
-  for (const table of ["sessions", "requests", "usage_snapshots"]) {
-    if (!tableExists(source, table))
+  for (const table2 of ["sessions", "requests", "usage_snapshots"]) {
+    if (!tableExists(source, table2))
       continue;
     const rows = source.prepare(`
       SELECT machine_id, COUNT(*) as cnt
-      FROM ${quoteIdent(table)}
+      FROM ${quoteIdent(table2)}
       WHERE machine_id != '' AND machine_id IS NOT NULL
       GROUP BY machine_id
     `).all();
@@ -6954,8 +7703,8 @@ function mergePeerDatabase(target, sourcePath, opts = {}) {
       const sessionMerge = mergeIdentityTable(target, source, "sessions", sourceMachine, now);
       tables.push(sessionMerge.stats);
       tables.push(mergeIdentityTable(target, source, "requests", sourceMachine, now, sessionMerge.idMap).stats);
-      for (const table of GENERIC_PEER_TABLES) {
-        tables.push(mergeGenericTable(target, source, table, sourceMachine, now));
+      for (const table2 of GENERIC_PEER_TABLES) {
+        tables.push(mergeGenericTable(target, source, table2, sourceMachine, now));
       }
       ensureMachineRegistry(target, sourceMachine, now);
       target.exec("COMMIT");
@@ -6969,8 +7718,8 @@ function mergePeerDatabase(target, sourcePath, opts = {}) {
     source.close();
   }
   const deduped = dedupeRequests(target);
-  const rowsWritten = tables.reduce((sum, table) => sum + table.inserted + table.updated, 0);
-  const collisions = tables.reduce((sum, table) => sum + table.collisions, 0);
+  const rowsWritten = tables.reduce((sum, table2) => sum + table2.inserted + table2.updated, 0);
+  const collisions = tables.reduce((sum, table2) => sum + table2.collisions, 0);
   return {
     source_path: sourcePath,
     source_machine: sourceMachine,
@@ -7134,7 +7883,7 @@ function printAccountBreakdown(rows) {
     fmt4(r.subscription_included_usd)
   ]));
 }
-function parseSinceDate(since) {
+function parseSinceDate2(since) {
   const relMatch = since.match(/^(\d+)d$/);
   if (relMatch) {
     const days = parseInt(relMatch[1], 10);
@@ -7279,7 +8028,7 @@ program.command("sessions").description("List coding sessions with costs").optio
   const agent = parseOptionalCliAgent(opts.agent);
   await autoSync();
   const db = openDatabase();
-  const sinceDate = opts.since ? parseSinceDate(opts.since) : undefined;
+  const sinceDate = opts.since ? parseSinceDate2(opts.since) : undefined;
   let sessions = querySessions(db, {
     agent,
     project: opts.project,
@@ -7326,7 +8075,7 @@ program.command("top").description("Most expensive sessions").option("-n <n>", "
   const count = parsePositiveCliInteger(opts.n ?? "10", "-n");
   const agent = parseOptionalCliAgent(opts.agent);
   const db = openDatabase();
-  const sinceDate = opts.since ? parseSinceDate(opts.since) : undefined;
+  const sinceDate = opts.since ? parseSinceDate2(opts.since) : undefined;
   let sessions = queryTopSessions(db, count, agent);
   if (sinceDate)
     sessions = sessions.filter((s) => s.started_at >= sinceDate);
@@ -7347,7 +8096,7 @@ program.command("top").description("Most expensive sessions").option("-n <n>", "
 });
 program.command("breakdown").description("Cost breakdown by model, agent, project, or account").option("--by <dimension>", "Dimension: model|agent|project|account", "model").option("--since <date>", "Filter since date or relative (e.g. 2026-03-01, 7d, 30d)").action((opts) => {
   const db = openDatabase();
-  const sinceDate = opts.since ? parseSinceDate(opts.since) : undefined;
+  const sinceDate = opts.since ? parseSinceDate2(opts.since) : undefined;
   console.log();
   if (opts.by === "project") {
     const rows = sinceDate ? db.prepare(`
@@ -7929,8 +8678,8 @@ program.command("merge-db <source-db>").description("Merge another Economy SQLit
   console.log();
   console.log(chalk7.bold.cyan(`  Merged Economy DB \u2014 ${result.source_machine}`));
   console.log(`  Rows written: ${fmtCount(result.rows_written)} \xB7 collisions remapped: ${fmtCount(result.collisions)} \xB7 deduped: ${fmtCount(result.deduped)}`);
-  for (const table of result.tables) {
-    console.log(`  ${chalk7.white(table.table.padEnd(16))}` + ` inserted ${fmtCount(table.inserted).padStart(6)}` + `  updated ${fmtCount(table.updated).padStart(6)}` + `  skipped ${fmtCount(table.skipped).padStart(6)}` + `  collisions ${fmtCount(table.collisions).padStart(3)}`);
+  for (const table2 of result.tables) {
+    console.log(`  ${chalk7.white(table2.table.padEnd(16))}` + ` inserted ${fmtCount(table2.inserted).padStart(6)}` + `  updated ${fmtCount(table2.updated).padStart(6)}` + `  skipped ${fmtCount(table2.skipped).padStart(6)}` + `  collisions ${fmtCount(table2.collisions).padStart(3)}`);
   }
   console.log();
 });
@@ -8309,6 +9058,7 @@ billingCmd.command("show").description("Show actual billing totals vs our estima
 });
 registerBrainsCommand(program);
 registerTodosCommand(program);
+registerBriefCommand(program);
 registerExtendedCommands(program);
 registerFleetCommands(program);
 registerEventsCommands(program, { source: "economy" });

package/dist/index.js

@@ -235,6 +235,7 @@ var DEFAULT_PRICING, LEGACY_DEFAULT_PRICING, ADDITIONAL_LEGACY_DEFAULT_PRICING,
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
+    "claude-opus-4-8": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },

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

@@ -1 +1 @@
-{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../src/ingest/billing.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AA0G7D,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;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,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwC/D"}
+{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../src/ingest/billing.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AA+I7D,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;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,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwC/D"}

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,CA8FxD,CAAA;AAqND,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOtD;AA2CD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAMtD;AA+GD,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAoBjF;AA4BD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAG7D;AAMD,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,SAAI,EACnB,gBAAgB,SAAI,EACpB,kBAAkB,SAAI,EACtB,sBAAsB,SAAI,GACzB,MAAM,CAIR;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,EACpB,kBAAkB,SAAI,EACtB,sBAAsB,SAAI,GACzB,MAAM,CAIR"}
+{"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,CA+FxD,CAAA;AAqND,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOtD;AA2CD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAMtD;AA+GD,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAoBjF;AA4BD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAG7D;AAMD,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,SAAI,EACnB,gBAAgB,SAAI,EACpB,kBAAkB,SAAI,EACtB,sBAAsB,SAAI,GACzB,MAAM,CAIR;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,EACpB,kBAAkB,SAAI,EACtB,sBAAsB,SAAI,GACzB,MAAM,CAIR"}

package/dist/mcp/index.js

@@ -236,6 +236,7 @@ var DEFAULT_PRICING, LEGACY_DEFAULT_PRICING, ADDITIONAL_LEGACY_DEFAULT_PRICING,
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
+    "claude-opus-4-8": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },

package/dist/otel/index.js

@@ -236,6 +236,7 @@ var DEFAULT_PRICING, LEGACY_DEFAULT_PRICING, ADDITIONAL_LEGACY_DEFAULT_PRICING,
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
+    "claude-opus-4-8": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },

package/dist/server/index.js

@@ -236,6 +236,7 @@ var DEFAULT_PRICING, LEGACY_DEFAULT_PRICING, ADDITIONAL_LEGACY_DEFAULT_PRICING,
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
+    "claude-opus-4-8": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-7": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
     "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25, cacheWrite1hPer1M: 10 },
@@ -1793,12 +1794,45 @@ function getGeminiBillingExportPath() {
 function toISODate(d) {
   return d.toISOString().substring(0, 10);
 }
+function isValidDateParts(year, month, day) {
+  const d = new Date(Date.UTC(year, month - 1, day));
+  return d.getUTCFullYear() === year && d.getUTCMonth() === month - 1 && d.getUTCDate() === day;
+}
+function formatDateParts(year, month, day) {
+  return `${String(year).padStart(4, "0")}-${String(month).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
+}
 function parseDate(value) {
+  if (typeof value === "number" && Number.isInteger(value)) {
+    return value >= 100001 && value <= 999912 ? parseDate(String(value)) : null;
+  }
   if (typeof value !== "string" || !value.trim())
     return null;
-  const d = new Date(value);
+  const trimmed = value.trim();
+  const compactMonth = /^(\d{4})(\d{2})$/.exec(trimmed);
+  if (compactMonth) {
+    const year = Number(compactMonth[1]);
+    const month = Number(compactMonth[2]);
+    return isValidDateParts(year, month, 1) ? formatDateParts(year, month, 1) : null;
+  }
+  const dashedMonth = /^(\d{4})-(\d{2})$/.exec(trimmed);
+  if (dashedMonth) {
+    const year = Number(dashedMonth[1]);
+    const month = Number(dashedMonth[2]);
+    return isValidDateParts(year, month, 1) ? formatDateParts(year, month, 1) : null;
+  }
+  const isoDate = /^(\d{4})-(\d{2})-(\d{2})(?:$|[T\s])/.exec(trimmed);
+  if (isoDate) {
+    const year = Number(isoDate[1]);
+    const month = Number(isoDate[2]);
+    const day = Number(isoDate[3]);
+    if (!isValidDateParts(year, month, day))
+      return null;
+    if (trimmed.length === 10)
+      return formatDateParts(year, month, day);
+  }
+  const d = new Date(trimmed);
   if (Number.isNaN(d.getTime()))
-    return value.substring(0, 10);
+    return null;
   return toISODate(d);
 }
 function parseCsv(content) {

package/package.json

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