@hasna/economy 0.3.10 → 0.3.12

package/dist/cli/index.js

@@ -76,15 +76,15 @@ var init_sqlite_adapter = () => {};
 // src/lib/pricing.ts
 var exports_pricing = {};
 __export(exports_pricing, {
-  normalizeModelName: () => normalizeModelName,
-  getPricingFromRows: () => getPricingFromRows,
-  getPricingFromDb: () => getPricingFromDb,
-  getPricing: () => getPricing,
-  estimateCostFromRows: () => estimateCostFromRows,
-  ensurePricingSeeded: () => ensurePricingSeeded,
-  computeCostFromDb: () => computeCostFromDb,
+  DEFAULT_PRICING: () => DEFAULT_PRICING,
   computeCost: () => computeCost,
-  DEFAULT_PRICING: () => DEFAULT_PRICING
+  computeCostFromDb: () => computeCostFromDb,
+  ensurePricingSeeded: () => ensurePricingSeeded,
+  estimateCostFromRows: () => estimateCostFromRows,
+  getPricing: () => getPricing,
+  getPricingFromDb: () => getPricingFromDb,
+  getPricingFromRows: () => getPricingFromRows,
+  normalizeModelName: () => normalizeModelName
 });
 function normalizeModelName(raw) {
   return raw.trim().toLowerCase().replace(/^models\//, "").replace(/^[a-z0-9_.-]+\//, "").replace(/:.+$/, "").replace(/-\d{8}$/, "").replace(/-\d{4}-\d{2}-\d{2}$/, "");
@@ -591,68 +591,6 @@ var init_pricing = __esm(() => {
 });
 
 // src/db/database.ts
-var exports_database = {};
-__export(exports_database, {
-  upsertUsageSnapshot: () => upsertUsageSnapshot,
-  upsertSubscription: () => upsertSubscription,
-  upsertSession: () => upsertSession,
-  upsertRequest: () => upsertRequest,
-  upsertProject: () => upsertProject,
-  upsertModelPricing: () => upsertModelPricing,
-  upsertGoal: () => upsertGoal,
-  upsertCostCenter: () => upsertCostCenter,
-  upsertBudget: () => upsertBudget,
-  upsertBillingDaily: () => upsertBillingDaily,
-  setIngestState: () => setIngestState,
-  seedModelPricing: () => seedModelPricing,
-  rollupSession: () => rollupSession,
-  queryZeroCostTokenizedModels: () => queryZeroCostTokenizedModels,
-  queryUsageSnapshots: () => queryUsageSnapshots,
-  queryTopSessions: () => queryTopSessions,
-  querySummary: () => querySummary,
-  querySessions: () => querySessions,
-  queryRequestsSince: () => queryRequestsSince,
-  queryProjectBreakdownSince: () => queryProjectBreakdownSince,
-  queryProjectBreakdown: () => queryProjectBreakdown,
-  queryModelBreakdownSince: () => queryModelBreakdownSince,
-  queryModelBreakdown: () => queryModelBreakdown,
-  queryHourlyBreakdown: () => queryHourlyBreakdown,
-  queryDailyBreakdown: () => queryDailyBreakdown,
-  queryCostCenterBreakdown: () => queryCostCenterBreakdown,
-  queryBillingSummary: () => queryBillingSummary,
-  queryAgentBreakdownSince: () => queryAgentBreakdownSince,
-  queryAgentBreakdown: () => queryAgentBreakdown,
-  queryAccountBreakdownSince: () => queryAccountBreakdownSince,
-  queryAccountBreakdown: () => queryAccountBreakdown,
-  openDatabase: () => openDatabase,
-  listSubscriptions: () => listSubscriptions,
-  listProjects: () => listProjects,
-  listModelPricing: () => listModelPricing,
-  listMachines: () => listMachines,
-  listMachineRegistry: () => listMachineRegistry,
-  listGoals: () => listGoals,
-  listBudgets: () => listBudgets,
-  insertFeedback: () => insertFeedback,
-  getSessionDetail: () => getSessionDetail,
-  getProject: () => getProject,
-  getModelPricing: () => getModelPricing,
-  getMachineId: () => getMachineId,
-  getIngestState: () => getIngestState,
-  getGoalStatuses: () => getGoalStatuses,
-  getDbPath: () => getDbPath,
-  getDataDir: () => getDataDir,
-  getCostCenter: () => getCostCenter,
-  getBudgetStatuses: () => getBudgetStatuses,
-  deleteSubscription: () => deleteSubscription,
-  deleteProject: () => deleteProject,
-  deleteModelPricing: () => deleteModelPricing,
-  deleteGoal: () => deleteGoal,
-  deleteBudget: () => deleteBudget,
-  dedupeRequests: () => dedupeRequests,
-  countBillingRecords: () => countBillingRecords,
-  clearBillingRange: () => clearBillingRange,
-  bulkIngest: () => bulkIngest
-});
 import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
 import { hostname, platform } from "os";
@@ -1066,9 +1004,6 @@ function upsertCostCenter(db, center) {
     VALUES (?, ?, ?, ?, ?, ?, ?)
   `).run(center.id, center.kind, center.name, center.repo_path ?? null, center.labels_json ?? "{}", center.created_at, updatedAt);
 }
-function getCostCenter(db, id) {
-  return db.prepare(`SELECT * FROM cost_centers WHERE id = ?`).get(id);
-}
 function upsertRequest(db, req) {
   const now = req.updated_at ?? new Date().toISOString();
   db.prepare(`
@@ -2190,6 +2125,7 @@ function ingestSpecs() {
         "timestamp",
         "source_request_id",
         "machine_id",
+        "cost_center_id",
         "attribution_tag",
         "account_key",
         "account_tool",
@@ -2216,6 +2152,7 @@ function ingestSpecs() {
         strOr(r["timestamp"]),
         r["source_request_id"] == null ? null : strOr(r["source_request_id"]),
         strOr(r["machine_id"]),
+        r["cost_center_id"] == null ? null : strOr(r["cost_center_id"]),
         strOr(r["attribution_tag"]),
         strOr(r["account_key"]),
         strOr(r["account_tool"]),
@@ -2240,6 +2177,7 @@ function ingestSpecs() {
         "total_tokens",
         "request_count",
         "machine_id",
+        "cost_center_id",
         "attribution_tag",
         "account_key",
         "account_tool",
@@ -2260,6 +2198,7 @@ function ingestSpecs() {
         numOr(r["total_tokens"]),
         numOr(r["request_count"]),
         strOr(r["machine_id"]),
+        r["cost_center_id"] == null ? null : strOr(r["cost_center_id"]),
         strOr(r["attribution_tag"]),
         strOr(r["account_key"]),
         strOr(r["account_tool"]),
@@ -3441,448 +3380,14 @@ function queryModelEfficiency(db) {
      FROM requests GROUP BY model ORDER BY cost DESC`).all();
 }
 
-// src/lib/contracts-client/mode.ts
-function normalizeStorageMode(value) {
-  const normalized = value.trim().toLowerCase().replace(/-/g, "_");
-  if (normalized === "local")
-    return { mode: "local", deprecatedAlias: null };
-  if (normalized === "cloud")
-    return { mode: "cloud", deprecatedAlias: null };
-  if (DEPRECATED_STORAGE_MODE_ALIASES.includes(normalized)) {
-    return { mode: "cloud", deprecatedAlias: normalized };
-  }
-  throw new Error(`Unknown storage mode: ${value}. Use local or cloud.`);
-}
-function envToken(name) {
-  return name.toUpperCase().replace(/-/g, "_");
-}
-var DEPRECATED_STORAGE_MODE_ALIASES;
-var init_mode = __esm(() => {
-  DEPRECATED_STORAGE_MODE_ALIASES = ["remote", "hybrid", "self_hosted"];
-});
-
-// src/lib/contracts-client/transport.ts
-function defaultCloudBaseUrl(name) {
-  return `https://${name}.hasna.xyz`;
-}
-function clientTransportEnvKeys(name) {
-  const token = envToken(name);
-  return {
-    modeKeys: [
-      `HASNA_${token}_STORAGE_MODE`,
-      `HASNA_${token}_MODE`,
-      `${token}_STORAGE_MODE`,
-      `${token}_MODE`
-    ],
-    apiUrlKeys: [`HASNA_${token}_API_URL`, `${token}_API_URL`],
-    apiKeyKeys: [`HASNA_${token}_API_KEY`, `${token}_API_KEY`]
-  };
-}
-function firstEnv(env, keys) {
-  for (const key of keys) {
-    const value = env[key]?.trim();
-    if (value)
-      return { key, value };
-  }
-  return null;
-}
-function toV1BaseUrl(apiUrl) {
-  const url = new URL(apiUrl);
-  if (url.protocol !== "http:" && url.protocol !== "https:") {
-    throw new Error("API URL must use http or https.");
-  }
-  let path = url.pathname.replace(/\/+$/, "");
-  if (path.endsWith("/v1"))
-    path = path.slice(0, -"/v1".length);
-  url.pathname = `${path}/v1`;
-  url.search = "";
-  url.hash = "";
-  return url.toString().replace(/\/+$/, "");
-}
-function resolveClientTransport(name, env = process.env) {
-  const keys = clientTransportEnvKeys(name);
-  const modeHit = firstEnv(env, keys.modeKeys);
-  const urlHit = firstEnv(env, keys.apiUrlKeys);
-  const keyHit = firstEnv(env, keys.apiKeyKeys);
-  let mode = "local";
-  let deprecatedAlias = null;
-  let modeSource = "default";
-  const warnings = [];
-  if (modeHit) {
-    const normalized = normalizeStorageMode(modeHit.value);
-    mode = normalized.mode;
-    deprecatedAlias = normalized.deprecatedAlias;
-    modeSource = modeHit.key;
-    if (deprecatedAlias) {
-      warnings.push(`Deprecated mode '${deprecatedAlias}' from ${modeHit.key} is treated as 'cloud'. Prefer ${keys.modeKeys[0]}=cloud.`);
-    }
-  } else if (urlHit && keyHit) {
-    mode = "cloud";
-    modeSource = `${urlHit.key}+${keyHit.key}`;
-  } else if (urlHit) {
-    warnings.push(`${urlHit.key} is set but no API key is present (${keys.apiKeyKeys[0]}). ` + `Refusing to fall back to the local store, which would silently serve a different dataset. ` + `Set ${keys.apiKeyKeys[0]} to enable the cloud client, or set ${keys.modeKeys[0]}=local ` + `to use the local store deliberately.`);
-    return {
-      transport: "local",
-      mode: "local",
-      deprecatedAlias,
-      modeSource: urlHit.key,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: false,
-      apiKeySource: null,
-      misconfigured: true,
-      warning: warnings.join(" ")
-    };
-  }
-  if (mode === "local") {
-    return {
-      transport: "local",
-      mode,
-      deprecatedAlias,
-      modeSource,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: Boolean(keyHit),
-      apiKeySource: keyHit ? keyHit.key : null,
-      misconfigured: false,
-      warning: warnings.length > 0 ? warnings.join(" ") : null
-    };
-  }
-  if (!keyHit) {
-    warnings.push(`${modeSource}=cloud but no API key is set (${keys.apiKeyKeys[0]}). Refusing to route to cloud; using local store. Set ${keys.apiKeyKeys[0]} to enable the cloud client.`);
-    return {
-      transport: "local",
-      mode,
-      deprecatedAlias,
-      modeSource,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: false,
-      apiKeySource: null,
-      misconfigured: true,
-      warning: warnings.join(" ")
-    };
-  }
-  const rawUrl = urlHit?.value ?? defaultCloudBaseUrl(name);
-  const apiUrlSource = urlHit ? urlHit.key : "default";
-  let baseUrl;
-  try {
-    baseUrl = toV1BaseUrl(rawUrl);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    warnings.push(`Invalid API URL from ${apiUrlSource}: ${message}. Using local store.`);
-    return {
-      transport: "local",
-      mode,
-      deprecatedAlias,
-      modeSource,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: true,
-      apiKeySource: keyHit.key,
-      misconfigured: true,
-      warning: warnings.join(" ")
-    };
-  }
-  return {
-    transport: "cloud-http",
-    mode,
-    deprecatedAlias,
-    modeSource,
-    baseUrl,
-    apiUrlSource,
-    apiKeyPresent: true,
-    apiKeySource: keyHit.key,
-    misconfigured: false,
-    warning: warnings.length > 0 ? warnings.join(" ") : null
-  };
-}
-function appendQuery(path, query) {
-  if (!query)
-    return path;
-  const params = query instanceof URLSearchParams ? query : new URLSearchParams;
-  if (!(query instanceof URLSearchParams)) {
-    for (const [key, value] of Object.entries(query)) {
-      if (value === null || value === undefined)
-        continue;
-      if (Array.isArray(value)) {
-        for (const v of value)
-          params.append(key, String(v));
-      } else {
-        params.append(key, String(value));
-      }
-    }
-  }
-  const qs = params.toString();
-  if (!qs)
-    return path;
-  return `${path}${path.includes("?") ? "&" : "?"}${qs}`;
-}
-function createHasnaHttpTransport(options) {
-  const fetchImpl = options.fetchImpl ?? ((input, init) => fetch(input, init));
-  const base = options.baseUrl.replace(/\/+$/, "");
-  const timeoutMs = options.timeoutMs ?? 30000;
-  const sleep = options.sleepImpl ?? defaultSleep;
-  const defaultRetry = options.retry;
-  function resolveRetry(callRetry) {
-    const chosen = callRetry !== undefined ? callRetry : defaultRetry;
-    if (chosen === false)
-      return null;
-    const r = chosen ?? {};
-    return {
-      retries: r.retries ?? 2,
-      baseDelayMs: r.baseDelayMs ?? 200,
-      maxDelayMs: r.maxDelayMs ?? 2000,
-      retryStatuses: r.retryStatuses ?? [...DEFAULT_RETRY_STATUSES]
-    };
-  }
-  async function once(method, rel, url, body, opts) {
-    const headers = {
-      "x-api-key": options.apiKey,
-      Authorization: `Bearer ${options.apiKey}`,
-      Accept: "application/json",
-      ...options.headers ?? {},
-      ...opts.headers ?? {}
-    };
-    if (opts.idempotencyKey)
-      headers["Idempotency-Key"] = opts.idempotencyKey;
-    const init = { method, headers };
-    if (body !== undefined) {
-      headers["Content-Type"] = "application/json";
-      init.body = JSON.stringify(body);
-    }
-    const controller = new AbortController;
-    const onAbort = () => controller.abort();
-    if (opts.signal) {
-      if (opts.signal.aborted)
-        controller.abort();
-      else
-        opts.signal.addEventListener("abort", onAbort, { once: true });
-    }
-    const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? timeoutMs);
-    init.signal = controller.signal;
-    let response;
-    try {
-      response = await fetchImpl(url, init);
-    } catch (error) {
-      const err = error instanceof Error ? error : new Error(String(error));
-      if (opts.signal?.aborted)
-        return { ok: false, retryable: false, error: err };
-      return { ok: false, retryable: true, error: err };
-    } finally {
-      clearTimeout(timer);
-      if (opts.signal)
-        opts.signal.removeEventListener("abort", onAbort);
-    }
-    const text = await response.text();
-    let parsed = undefined;
-    if (text.length > 0) {
-      try {
-        parsed = JSON.parse(text);
-      } catch {
-        parsed = text;
-      }
-    }
-    if (!response.ok) {
-      const retry = resolveRetry(opts.retry);
-      const retryable = retry ? retry.retryStatuses.includes(response.status) : false;
-      return { ok: false, retryable, error: new HasnaHttpError(method, rel, response.status, parsed) };
-    }
-    return { ok: true, value: parsed };
-  }
-  async function request(method, path, body, opts = {}) {
-    const upper = method.toUpperCase();
-    const rel = appendQuery(path.startsWith("/") ? path : `/${path}`, opts.query);
-    const url = `${base}${rel}`;
-    const retry = resolveRetry(opts.retry);
-    const methodRetryable = IDEMPOTENT_METHODS.has(upper) || Boolean(opts.idempotencyKey);
-    const maxAttempts = retry && methodRetryable ? retry.retries + 1 : 1;
-    let last = null;
-    for (let attempt = 1;attempt <= maxAttempts; attempt++) {
-      const result = await once(upper, rel, url, body, opts);
-      if (result.ok)
-        return result.value;
-      last = result;
-      const canRetry = retry !== null && methodRetryable && result.retryable && attempt < maxAttempts;
-      if (!canRetry)
-        break;
-      const backoff = Math.min(retry.maxDelayMs, retry.baseDelayMs * 2 ** (attempt - 1));
-      const jitter = Math.floor(Math.random() * (backoff / 2 + 1));
-      await sleep(backoff + jitter);
-    }
-    throw last.error;
-  }
-  return {
-    baseUrl: base,
-    request,
-    get: (path, opts) => request("GET", path, undefined, opts),
-    post: (path, body, opts) => request("POST", path, body, opts),
-    put: (path, body, opts) => request("PUT", path, body, opts),
-    patch: (path, body, opts) => request("PATCH", path, body, opts),
-    del: (path, body, opts) => request("DELETE", path, body, opts)
-  };
-}
-function createClientTransport(name, env = process.env, overrides) {
-  const resolution = resolveClientTransport(name, env);
-  if (resolution.misconfigured) {
-    throw new Error(resolution.warning ?? `Client for '${name}' is misconfigured for cloud mode.`);
-  }
-  if (resolution.transport === "local" || !resolution.baseUrl) {
-    return { transport: "local", client: null, resolution };
-  }
-  const keys = clientTransportEnvKeys(name);
-  const apiKey = firstEnv(env, keys.apiKeyKeys)?.value;
-  if (!apiKey) {
-    throw new Error(`Client for '${name}' resolved to cloud-http without an API key.`);
-  }
-  return {
-    transport: "cloud-http",
-    client: createHasnaHttpTransport({
-      name,
-      baseUrl: resolution.baseUrl,
-      apiKey,
-      ...overrides?.fetchImpl ? { fetchImpl: overrides.fetchImpl } : {},
-      ...overrides?.headers ? { headers: overrides.headers } : {},
-      ...overrides?.timeoutMs ? { timeoutMs: overrides.timeoutMs } : {},
-      ...overrides?.retry !== undefined ? { retry: overrides.retry } : {},
-      ...overrides?.sleepImpl ? { sleepImpl: overrides.sleepImpl } : {}
-    }),
-    resolution
-  };
-}
-var HasnaHttpError, DEFAULT_RETRY_STATUSES, IDEMPOTENT_METHODS, defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var init_transport = __esm(() => {
-  init_mode();
-  HasnaHttpError = class HasnaHttpError extends Error {
-    status;
-    method;
-    path;
-    body;
-    constructor(method, path, status, body) {
-      super(`Hasna cloud request failed: ${method} ${path} -> ${status}`);
-      this.name = "HasnaHttpError";
-      this.status = status;
-      this.method = method;
-      this.path = path;
-      this.body = body;
-    }
-  };
-  DEFAULT_RETRY_STATUSES = [408, 425, 429, 500, 502, 503, 504];
-  IDEMPOTENT_METHODS = new Set(["GET", "HEAD", "PUT", "DELETE", "OPTIONS"]);
-});
-
 // src/lib/contracts-client/storage.ts
-function resourcePath(resource) {
-  const trimmed = resource.replace(/^\/+|\/+$/g, "");
-  if (!trimmed)
-    throw new Error("resource must be a non-empty path segment");
-  return `/${trimmed}`;
-}
-function entityPath(resource, id) {
-  if (id === undefined || id === null || `${id}`.length === 0) {
-    throw new Error("id must be a non-empty string");
-  }
-  return `${resourcePath(resource)}/${encodeURIComponent(String(id))}`;
-}
-function newIdempotencyKey() {
-  const g = globalThis;
-  if (g.crypto?.randomUUID)
-    return g.crypto.randomUUID();
-  return `idmp_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 12)}`;
-}
-function extractItems(raw) {
-  if (Array.isArray(raw))
-    return raw;
-  if (raw && typeof raw === "object") {
-    const obj = raw;
-    for (const key of ["items", "data", "results", "rows", "records"]) {
-      if (Array.isArray(obj[key]))
-        return obj[key];
-    }
-  }
-  return [];
-}
-function extractTotal(raw) {
-  if (raw && typeof raw === "object") {
-    const obj = raw;
-    for (const key of ["total", "count", "totalCount", "total_count"]) {
-      if (typeof obj[key] === "number")
-        return obj[key];
-    }
-  }
-  return null;
-}
-function extractCursor(raw) {
-  if (raw && typeof raw === "object") {
-    const obj = raw;
-    for (const key of ["cursor", "nextCursor", "next_cursor", "next"]) {
-      if (typeof obj[key] === "string")
-        return obj[key];
-    }
-  }
-  return null;
-}
-function createHasnaStorageClient(name, transport) {
-  return {
-    name,
-    baseUrl: transport.baseUrl,
-    transport,
-    async list(resource, options = {}) {
-      const raw = await transport.get(resourcePath(resource), options);
-      return {
-        items: extractItems(raw),
-        total: extractTotal(raw),
-        cursor: extractCursor(raw),
-        raw
-      };
-    },
-    async get(resource, id, options = {}) {
-      try {
-        return await transport.get(entityPath(resource, id), options);
-      } catch (error) {
-        if (error instanceof HasnaHttpError && error.status === 404)
-          return null;
-        throw error;
-      }
-    },
-    async create(resource, body, options = {}) {
-      const { idempotencyKey, ...rest } = options;
-      return transport.post(resourcePath(resource), body, {
-        ...rest,
-        idempotencyKey: idempotencyKey ?? newIdempotencyKey()
-      });
-    },
-    async update(resource, id, patch, options = {}) {
-      const { method = "PATCH", idempotencyKey, ...rest } = options;
-      const call = method === "PUT" ? transport.put : transport.patch;
-      return call(entityPath(resource, id), patch, { ...rest, ...idempotencyKey ? { idempotencyKey } : {} });
-    },
-    async delete(resource, id, options = {}) {
-      try {
-        await transport.del(entityPath(resource, id), undefined, options);
-      } catch (error) {
-        if (error instanceof HasnaHttpError && error.status === 404)
-          return;
-        throw error;
-      }
-    }
-  };
-}
-function resolveStorageClient(name, env = process.env, overrides) {
-  const wired = createClientTransport(name, env, overrides);
-  if (wired.transport === "cloud-http") {
-    return { transport: "cloud-http", client: createHasnaStorageClient(name, wired.client) };
-  }
-  return { transport: "local", client: null };
-}
-var init_storage = __esm(() => {
-  init_transport();
-});
+import { resolveStorageClient } from "@hasna/contracts/client/storage";
+var init_storage = () => {};
 
 // src/lib/cloud-storage.ts
 function resolveEconomyCloudStorage(env = process.env, overrides) {
   const resolved = resolveStorageClient(ECONOMY_APP, env, overrides);
-  return resolved.transport === "cloud-http" ? { active: true, client: resolved.client } : { active: false, client: null };
+  return resolved.transport === "http" ? { active: true, client: resolved.client } : { active: false, client: null };
 }
 function economyCloudStorage(env = process.env) {
   if (cache === undefined)
@@ -4340,12 +3845,12 @@ function isAuthorizedRequest(req, path) {
 // src/cli/commands/tui.ts
 var exports_tui = {};
 __export(exports_tui, {
-  runTui: () => runTui,
-  printWaybarJson: () => printWaybarJson,
-  printStatusLine: () => printStatusLine,
-  gatherStatusData: () => gatherStatusData,
+  buildStatusLine: () => buildStatusLine,
   buildWaybarJson: () => buildWaybarJson,
-  buildStatusLine: () => buildStatusLine
+  gatherStatusData: () => gatherStatusData,
+  printStatusLine: () => printStatusLine,
+  printWaybarJson: () => printWaybarJson,
+  runTui: () => runTui
 });
 import chalk3 from "chalk";
 function fmt(usd) {
@@ -6144,11 +5649,11 @@ async function syncAll(db, opts = {}) {
   const all = !anySpecific;
   const result = { deduped: 0 };
   if (all || opts.claude) {
-    result.claude = await ingestClaude(db, opts.verbose);
+    result.claude = await ingestClaude(db, opts.verbose, opts.projectsDir);
     result.claudeQuota = await ingestClaudeQuota(db, opts.verbose);
   }
   if (all || opts.takumi)
-    result.takumi = await ingestTakumi(db, opts.verbose);
+    result.takumi = await ingestTakumi(db, opts.verbose, opts.projectsDir);
   if (all || opts.codex) {
     result.codex = await ingestCodex(db, opts.verbose);
     result.codexQuota = await ingestCodexQuota(db, opts.verbose);
@@ -6186,9 +5691,9 @@ var init_sync_all = __esm(() => {
 // src/ingest/billing.ts
 var exports_billing = {};
 __export(exports_billing, {
-  syncOpenAIBilling: () => syncOpenAIBilling,
+  syncAnthropicBilling: () => syncAnthropicBilling,
   syncGeminiBilling: () => syncGeminiBilling,
-  syncAnthropicBilling: () => syncAnthropicBilling
+  syncOpenAIBilling: () => syncOpenAIBilling
 });
 import { readFileSync as readFileSync10 } from "fs";
 function getAnthropicAdminKey() {
@@ -6483,15 +5988,15 @@ var init_open_projects = __esm(() => {
 // src/lib/config.ts
 var exports_config = {};
 __export(exports_config, {
-  setConfigValue: () => setConfigValue,
-  saveConfig: () => saveConfig2,
+  getConfigValue: () => getConfigValue,
   loadConfig: () => loadConfig2,
-  getConfigValue: () => getConfigValue
+  saveConfig: () => saveConfig2,
+  setConfigValue: () => setConfigValue
 });
 import { existsSync as existsSync13, readFileSync as readFileSync11, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
-import { dirname as dirname2, join as join13 } from "path";
+import { dirname as dirname2, join as join14 } from "path";
 function getConfigPath() {
-  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join13(getDataDir(), "config.json");
+  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join14(getDataDir(), "config.json");
 }
 function loadConfig2() {
   try {
@@ -6880,7 +6385,7 @@ function sqliteToPostgres(sql) {
 // src/db/sync-pg.ts
 import { Worker, MessageChannel, receiveMessageOnPort } from "worker_threads";
 import { fileURLToPath } from "url";
-import { dirname as dirname3, join as join14 } from "path";
+import { dirname as dirname3, join as join15 } from "path";
 import { existsSync as existsSync15 } from "fs";
 function translateSqliteDates(sql) {
   let s = sql;
@@ -6906,9 +6411,9 @@ function translateSqliteDates(sql) {
 function resolveWorkerPath() {
   const here = dirname3(fileURLToPath(import.meta.url));
   const candidates = [
-    join14(here, "pg-sync-worker.ts"),
-    join14(here, "pg-sync-worker.js"),
-    join14(here, "..", "db", "pg-sync-worker.js")
+    join15(here, "pg-sync-worker.ts"),
+    join15(here, "pg-sync-worker.js"),
+    join15(here, "..", "db", "pg-sync-worker.js")
   ];
   for (const candidate of candidates)
     if (existsSync15(candidate))
@@ -7014,13 +6519,18 @@ var init_pg_migrate = () => {};
 var init_pg_migrations = () => {};
 
 // src/db/cloud.ts
-import { assertNoLegacyStorageMode } from "@hasna/contracts/server-backend";
 import pg2 from "pg";
+function assertNoRetiredBackendKey(env) {
+  const legacyKey = RETIRED_BACKEND_KEYS.find((key) => Object.hasOwn(env, key) && env[key] !== undefined);
+  if (!legacyKey)
+    return;
+  throw new Error(`${legacyKey} was removed. Delete the retired variable; ` + "set HASNA_ECONOMY_DATABASE_URL to select the postgresql server backend, " + "or leave it unset for sqlite.");
+}
 function getCloudDatabaseUrl(env = process.env) {
   return env["HASNA_ECONOMY_DATABASE_URL"]?.trim() || env["ECONOMY_DATABASE_URL"]?.trim() || env["DATABASE_URL"]?.trim() || undefined;
 }
 function resolveEconomyServerBackend(env = process.env) {
-  assertNoLegacyStorageMode("economy", env);
+  assertNoRetiredBackendKey(env);
   return getCloudDatabaseUrl(env) ? "postgresql" : "sqlite";
 }
 function isPostgresBackend(env = process.env) {
@@ -7059,10 +6569,17 @@ function authClientFromPool(pool) {
     }
   };
 }
+var RETIRED_BACKEND_KEYS;
 var init_cloud = __esm(() => {
   init_sync_pg();
   init_pg_migrate();
   init_pg_migrations();
+  RETIRED_BACKEND_KEYS = [
+    "HASNA_ECONOMY_STORAGE_MODE",
+    "HASNA_ECONOMY_MODE",
+    "ECONOMY_STORAGE_MODE",
+    "ECONOMY_MODE"
+  ];
 });
 
 // src/openapi.ts
@@ -8709,10 +8226,10 @@ var init_openapi = __esm(() => {
 // src/server/serve.ts
 var exports_serve = {};
 __export(exports_serve, {
-  startServer: () => startServer,
-  openApiDocument: () => openApiDocument,
+  createHandler: () => createHandler,
   createServerFetch: () => createServerFetch,
-  createHandler: () => createHandler
+  openApiDocument: () => openApiDocument,
+  startServer: () => startServer
 });
 import { randomUUID as randomUUID2 } from "crypto";
 import { existsSync as existsSync16 } from "fs";
@@ -9101,7 +8618,24 @@ function createHandler(db, options = {}) {
       const body = await jsonBody(req);
       if (!body)
         return err("invalid JSON body");
-      return ok(bulkIngest(db, body));
+      const result = bulkIngest(db, body);
+      const reqRows = Array.isArray(body?.["requests"]) ? body["requests"] : [];
+      const touchedSessions = new Set;
+      for (const r of reqRows) {
+        const sid = r?.["session_id"];
+        if (typeof sid === "string" && sid)
+          touchedSessions.add(sid);
+      }
+      for (const sid of touchedSessions) {
+        const hasReq = db.prepare(`SELECT COUNT(*) AS c FROM requests WHERE session_id = ?`).get(sid);
+        if (Number(hasReq?.c ?? 0) > 0)
+          rollupSession(db, sid);
+      }
+      try {
+        const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
+        await checkAndFireWebhooks2(db);
+      } catch {}
+      return ok(result);
     }
     if (path === "/api/usage" && method === "GET") {
       const period = url.searchParams.get("period") ?? "month";
@@ -9348,16 +8882,16 @@ var init_serve = __esm(() => {
 // src/cli/commands/menubar.ts
 var exports_menubar = {};
 __export(exports_menubar, {
-  menubarUninstall: () => menubarUninstall,
-  menubarStop: () => menubarStop,
+  menubarInstall: () => menubarInstall,
   menubarStart: () => menubarStart,
-  menubarInstall: () => menubarInstall
+  menubarStop: () => menubarStop,
+  menubarUninstall: () => menubarUninstall
 });
 import chalk6 from "chalk";
 import { execFileSync as execFileSync3 } from "child_process";
 import { cpSync, existsSync as existsSync17, mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir, arch } from "os";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 function getArch() {
   return arch() === "arm64" ? "arm64" : "x86_64";
 }
@@ -9399,8 +8933,8 @@ async function menubarInstall(opts) {
     console.error(chalk6.red(`\u2717 Failed to fetch release info: ${e instanceof Error ? e.message : String(e)}`));
     process.exit(1);
   }
-  const zipPath = join15(tmpdir(), `economy-bar-${cpuArch}.zip`);
-  const extractDir = join15(tmpdir(), "economy-bar-extracted");
+  const zipPath = join16(tmpdir(), `economy-bar-${cpuArch}.zip`);
+  const extractDir = join16(tmpdir(), "economy-bar-extracted");
   console.log(chalk6.cyan(`\u2192 Downloading ${assetUrl}...`));
   try {
     const res = await fetch(assetUrl, { signal: AbortSignal.timeout(60000) });
@@ -9420,7 +8954,7 @@ async function menubarInstall(opts) {
     execFileSync3("unzip", ["-q", zipPath, "-d", extractDir], { stdio: "ignore" });
     if (isInstalled())
       rmSync(APP_PATH, { recursive: true, force: true });
-    cpSync(join15(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
+    cpSync(join16(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
     try {
       execFileSync3("xattr", ["-rd", "com.apple.quarantine", APP_PATH], { stdio: "ignore" });
     } catch {}
@@ -11296,14 +10830,171 @@ init_billing();
 init_package_metadata();
 init_pricing();
 init_store();
-init_billing_diff();
-init_transport();
 import { execSync } from "child_process";
+
+// src/lib/cloud-ingest.ts
+init_database();
+init_pricing();
+init_sync_all();
+init_billing();
+import { join as join13 } from "path";
+
+// src/lib/sync-maintenance.ts
+init_database();
+function backfillMachineId(db) {
+  const machine = getMachineId();
+  const reqCount = db.prepare(`UPDATE requests SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+  const sessCount = db.prepare(`UPDATE sessions SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+  return { requests: Number(reqCount.changes), sessions: Number(sessCount.changes) };
+}
+async function recalculateZeroCostRequests(db) {
+  const { computeCostFromDb: computeCostFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
+  const zeroRows = db.prepare(`SELECT id, model, input_tokens, output_tokens, cache_read_tokens, cache_create_tokens, cache_create_5m_tokens, cache_create_1h_tokens
+     FROM requests
+     WHERE cost_usd = 0
+       AND (input_tokens > 0 OR output_tokens > 0 OR cache_read_tokens > 0 OR cache_create_tokens > 0)`).all();
+  let fixed = 0;
+  for (const r of zeroRows) {
+    const cache5m = r.cache_create_5m_tokens ?? r.cache_create_tokens;
+    const cost = computeCostFromDb2(db, r.model, r.input_tokens, r.output_tokens, r.cache_read_tokens, cache5m, r.cache_create_1h_tokens ?? 0);
+    if (cost > 0) {
+      db.prepare(`UPDATE requests SET cost_usd = ? WHERE id = ?`).run(cost, r.id);
+      fixed++;
+    }
+  }
+  if (fixed > 0) {
+    const touchedSessions = new Set(zeroRows.map((r) => {
+      const row = db.prepare(`SELECT session_id FROM requests WHERE id = ?`).get(r.id);
+      return row?.session_id;
+    }).filter(Boolean));
+    for (const sid of touchedSessions)
+      rollupSession(db, sid);
+  }
+  return { fixed, total: zeroRows.length, buckets: queryZeroCostTokenizedModels(db, 8) };
+}
+
+// src/lib/cloud-ingest.ts
+var CLOUD_INGEST_TABLES = ["requests", "sessions", "billing_daily", "usage_snapshots", "subscriptions"];
+function getIngestCachePath() {
+  if (process.env["HASNA_ECONOMY_INGEST_CACHE"])
+    return process.env["HASNA_ECONOMY_INGEST_CACHE"];
+  return join13(getDataDir(), "ingest-cache.db");
+}
+function copyIngestState(from, to) {
+  const rows = from.prepare(`SELECT source, key, value FROM ingest_state`).all();
+  to.prepare(`DELETE FROM ingest_state`).run();
+  const insert = to.prepare(`INSERT INTO ingest_state (source, key, value) VALUES (?, ?, ?)`);
+  for (const row of rows)
+    insert.run(row.source, row.key, row.value);
+}
+function exportIngestRows(db) {
+  const body = {};
+  for (const table2 of CLOUD_INGEST_TABLES) {
+    const rows = db.prepare(`SELECT * FROM ${table2}`).all();
+    if (rows.length > 0)
+      body[table2] = rows;
+  }
+  return body;
+}
+function unwrapEnvelope(raw) {
+  if (raw && typeof raw === "object" && "data" in raw) {
+    const data = raw.data;
+    return data && typeof data === "object" ? data : {};
+  }
+  return raw ?? {};
+}
+async function postIngest(cloud, body) {
+  const raw = await cloud.client.transport.post("/ingest", body);
+  const payload = unwrapEnvelope(raw);
+  return {
+    ingested: payload["ingested"] ?? {},
+    total: Number(payload["total"] ?? 0)
+  };
+}
+async function syncAllToCloud(cloud, opts = {}) {
+  const scratch = openDatabase(":memory:", true);
+  ensurePricingSeeded(scratch);
+  const cache2 = openDatabase(opts.cachePath ?? getIngestCachePath(), true);
+  try {
+    if (opts.force)
+      cache2.prepare(`DELETE FROM ingest_state`).run();
+    copyIngestState(cache2, scratch);
+    const result = await syncAll(scratch, opts);
+    if (opts.backfillMachine)
+      backfillMachineId(scratch);
+    if (opts.recalculate)
+      await recalculateZeroCostRequests(scratch);
+    const body = exportIngestRows(scratch);
+    if (Object.keys(body).length === 0) {
+      copyIngestState(scratch, cache2);
+      return { ...result, posted: false };
+    }
+    const response = await postIngest(cloud, body);
+    copyIngestState(scratch, cache2);
+    return { ...result, posted: true, ingested: response.ingested, total: response.total };
+  } finally {
+    try {
+      scratch.close();
+    } catch {}
+    try {
+      cache2.close();
+    } catch {}
+  }
+}
+async function billingSyncToCloud(cloud, opts = {}) {
+  const scratch = openDatabase(":memory:", true);
+  try {
+    const days = opts.days ?? 31;
+    const providers = {};
+    const attempts = [
+      ["anthropic", () => syncAnthropicBilling(scratch, { days })],
+      ["openai", () => syncOpenAIBilling(scratch, { days })],
+      ["gemini", () => syncGeminiBilling(scratch, { days })]
+    ];
+    const anySelected = opts.anthropic || opts.openai || opts.gemini;
+    let totalUsd = 0;
+    for (const [provider, run] of attempts) {
+      if (anySelected && !opts[provider])
+        continue;
+      {
+        try {
+          const r = await run();
+          providers[provider] = { ok: true, days: r.days, totalUsd: r.totalUsd };
+          totalUsd += r.totalUsd;
+        } catch (e) {
+          providers[provider] = { ok: false, error: e instanceof Error ? e.message : String(e) };
+        }
+      }
+    }
+    const body = exportIngestRows(scratch);
+    if (Object.keys(body).length === 0)
+      return { providers, totalUsd, posted: false };
+    const response = await postIngest(cloud, body);
+    return { providers, totalUsd, posted: true, ingested: response.ingested, total: response.total };
+  } finally {
+    try {
+      scratch.close();
+    } catch {}
+  }
+}
+
+// src/cli/index.ts
+init_cloud_storage();
+init_billing_diff();
+
+// src/lib/contracts-client/transport.ts
+import { HasnaHttpError } from "@hasna/contracts/client";
+
+// src/cli/index.ts
 var program = new Command;
 program.name("economy").description("AI coding cost tracker \u2014 Claude, Takumi, Codex, Gemini, OpenCode, Cursor, Pi, Hermes").version(packageMetadata.version);
 async function autoSync(opts = {}) {
-  if (isCloudStore())
+  if (isCloudStore()) {
+    const cloud = economyCloudStorage();
+    if (cloud.active)
+      await syncAllToCloud(cloud, opts);
     return;
+  }
   const db = openDatabase();
   ensurePricingSeeded(db);
   await syncAll(db, opts);
@@ -11518,7 +11209,34 @@ program.action(async () => {
 });
 program.command("sync").description("Ingest cost data from all coding agents").option("--claude", "Only ingest Claude Code telemetry").option("--takumi", "Only ingest Takumi sessions").option("--codex", "Only ingest Codex sessions").option("--gemini", "Only ingest Gemini CLI sessions").option("--opencode", "Only ingest OpenCode sessions").option("--cursor", "Only ingest Cursor usage").option("--pi", "Only ingest Pi sessions").option("--hermes", "Only ingest Hermes sessions").option("--loops", "Only ingest OpenLoops orchestration/judge token usage").option("-v, --verbose", "Verbose output").option("--force", "Force re-process all files (ignore mtime cache)").option("--backfill-machine", "Tag existing records that have no machine_id with current hostname").option("--recalculate", "Recalculate costs for all requests with cost_usd = 0").action(async (opts) => {
   if (isCloudStore()) {
-    console.log(chalk7.yellow("cloud mode: ingest is a local-only operation; nothing to sync (reads/writes route to the cloud API)"));
+    const cloud = economyCloudStorage();
+    if (!cloud.active) {
+      console.log(chalk7.yellow("cloud mode: sync transport unavailable (set HASNA_ECONOMY_API_URL and HASNA_ECONOMY_API_KEY)"));
+      return;
+    }
+    const result2 = await syncAllToCloud(cloud, {
+      claude: opts.claude,
+      takumi: opts.takumi,
+      codex: opts.codex,
+      gemini: opts.gemini,
+      opencode: opts.opencode,
+      cursor: opts.cursor,
+      pi: opts.pi,
+      hermes: opts.hermes,
+      loops: opts.loops,
+      verbose: opts.verbose,
+      force: opts.force,
+      backfillMachine: opts.backfillMachine,
+      recalculate: opts.recalculate
+    });
+    if (result2.posted) {
+      const parts = Object.entries(result2.ingested ?? {}).filter(([, n]) => n > 0).map(([table2, n]) => `${n} ${table2}`);
+      console.log(chalk7.green(`\u2713 pushed ${parts.join(", ")} to the shared API (${result2.total} rows)`));
+    } else {
+      console.log(chalk7.dim("\u2713 no new provider data to push (mtime cache current)"));
+    }
+    console.log(chalk7.bold.green(`
+\u2713 Sync complete`));
     return;
   }
   const db = openDatabase();
@@ -11557,34 +11275,14 @@ program.command("sync").description("Ingest cost data from all coding agents").o
   console.log(chalk7.green(`\u2713 deduped ${result.deduped}`));
   if (opts.backfillMachine) {
     const machine = getMachineId();
-    const reqCount = db.prepare(`UPDATE requests SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
-    const sessCount = db.prepare(`UPDATE sessions SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
-    console.log(chalk7.cyan(`\u2192 Backfilled machine_id='${machine}': ${reqCount.changes} requests, ${sessCount.changes} sessions`));
+    const r = backfillMachineId(db);
+    console.log(chalk7.cyan(`\u2192 Backfilled machine_id='${machine}': ${r.requests} requests, ${r.sessions} sessions`));
   }
   if (opts.recalculate) {
-    const { computeCostFromDb: computeCostFromDb2, getPricingFromDb: getPricingFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
-    const zeroRows = db.prepare(`SELECT id, model, input_tokens, output_tokens, cache_read_tokens, cache_create_tokens, cache_create_5m_tokens, cache_create_1h_tokens FROM requests WHERE cost_usd = 0 AND (input_tokens > 0 OR output_tokens > 0 OR cache_read_tokens > 0 OR cache_create_tokens > 0)`).all();
-    let fixed = 0;
-    for (const r of zeroRows) {
-      const cache5m = r.cache_create_5m_tokens ?? r.cache_create_tokens;
-      const cost = computeCostFromDb2(db, r.model, r.input_tokens, r.output_tokens, r.cache_read_tokens, cache5m, r.cache_create_1h_tokens ?? 0);
-      if (cost > 0) {
-        db.prepare(`UPDATE requests SET cost_usd = ? WHERE id = ?`).run(cost, r.id);
-        fixed++;
-      }
-    }
-    if (fixed > 0) {
-      const touchedSessions = new Set(zeroRows.map((r) => {
-        const row = db.prepare(`SELECT session_id FROM requests WHERE id = ?`).get(r.id);
-        return row?.session_id;
-      }).filter(Boolean));
-      const { rollupSession: rollupSession2 } = await Promise.resolve().then(() => (init_database(), exports_database));
-      for (const sid of touchedSessions) {
-        rollupSession2(db, sid);
-      }
-    }
-    console.log(chalk7.cyan(`\u2192 Recalculated: ${fixed}/${zeroRows.length} zero-cost requests now have pricing`));
-    const zeroCostBuckets = queryZeroCostTokenizedModels(db, 8);
+    const { getPricingFromDb: getPricingFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
+    const r = await recalculateZeroCostRequests(db);
+    console.log(chalk7.cyan(`\u2192 Recalculated: ${r.fixed}/${r.total} zero-cost requests now have pricing`));
+    const zeroCostBuckets = r.buckets;
     if (zeroCostBuckets.length > 0) {
       console.log(chalk7.yellow("\u2192 Zero-cost token buckets remain:"));
       for (const row of zeroCostBuckets) {
@@ -12410,13 +12108,26 @@ program.command("remove <type> <id>").alias("rm").description("Remove a record.
 });
 var billingCmd = program.command("billing").description("Pull actual billing from provider billing sources (ground truth)");
 billingCmd.command("sync").description("Sync actual billing from Anthropic, OpenAI, and Gemini billing sources").option("--days <n>", "Days of history to fetch", "31").option("--anthropic", "Only sync Anthropic").option("--openai", "Only sync OpenAI").option("--gemini", "Only sync Gemini").action(async (opts) => {
-  if (isCloudStore()) {
-    console.log(chalk7.yellow("cloud mode: billing ingest is a local-only operation; nothing to sync (reads route to the cloud API)"));
-    return;
-  }
   const days = parsePositiveCliInteger(opts.days ?? "31", "--days");
   if (days > 366)
     fail("--days must be between 1 and 366");
+  if (isCloudStore()) {
+    const cloud = economyCloudStorage();
+    if (!cloud.active) {
+      console.log(chalk7.yellow("cloud mode: billing sync transport unavailable (set HASNA_ECONOMY_API_URL and HASNA_ECONOMY_API_KEY)"));
+      return;
+    }
+    const result = await billingSyncToCloud(cloud, { days, anthropic: opts.anthropic, openai: opts.openai, gemini: opts.gemini });
+    for (const [provider, p] of Object.entries(result.providers)) {
+      if (p.ok)
+        console.log(chalk7.green(`\u2713 ${provider} billing: ${p.days} days, $${p.totalUsd.toFixed(2)}`));
+      else
+        console.log(chalk7.red(`\u2717 ${provider}: ${p.error}`));
+    }
+    if (result.posted)
+      console.log(chalk7.green(`\u2713 pushed ${result.total} billing rows to the shared API`));
+    return;
+  }
   const db = openDatabase();
   const doAll = !opts.anthropic && !opts.openai && !opts.gemini;
   if (opts.anthropic || doAll) {