@hasna/economy 0.2.43 → 0.3.1

package/dist/mcp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,QAAQ,YAAY,CAAA;AACjC,eAAO,MAAM,qBAAqB,OAAO,CAAA;AAEzC,wBAAgB,WAAW,IAAI,GAAG,CAmsBjC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,QAAQ,YAAY,CAAA;AACjC,eAAO,MAAM,qBAAqB,OAAO,CAAA;AAEzC,wBAAgB,WAAW,IAAI,GAAG,CA8oBjC"}

package/dist/openapi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openapi.d.ts","sourceRoot":"","sources":["../src/openapi.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAuF/C,CAAA;AACD,eAAe,WAAW,CAAA"}
+{"version":3,"file":"openapi.d.ts","sourceRoot":"","sources":["../src/openapi.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAwjD/C,CAAA;AACD,eAAe,WAAW,CAAA"}

package/dist/otel/index.js

@@ -15,14 +15,15 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __require = import.meta.require;
 
 // src/lib/pricing.ts
 var exports_pricing = {};
 __export(exports_pricing, {
   normalizeModelName: () => normalizeModelName,
+  getPricingFromRows: () => getPricingFromRows,
   getPricingFromDb: () => getPricingFromDb,
   getPricing: () => getPricing,
+  estimateCostFromRows: () => estimateCostFromRows,
   ensurePricingSeeded: () => ensurePricingSeeded,
   computeCostFromDb: () => computeCostFromDb,
   computeCost: () => computeCost,
@@ -213,6 +214,25 @@ function computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens
     return 0;
   return computeCostWithPricing(model, pricing, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, cacheWrite1hTokens, cacheStorageTokenHours);
 }
+function getPricingFromRows(rows, model) {
+  if (isFreeModel(model))
+    return FREE_PRICING;
+  for (const key of modelLookupKeys(model)) {
+    const row = rows.find((r) => r.model === key);
+    if (row)
+      return modelPricingFromDbRow(row);
+  }
+  const match = bestModelMatch(model, rows.map((r) => [r.model, r]));
+  if (!match)
+    return null;
+  return modelPricingFromDbRow(match);
+}
+function estimateCostFromRows(rows, model, inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0, cacheWrite1hTokens = 0, cacheStorageTokenHours = 0) {
+  const pricing = getPricingFromRows(rows, model) ?? getPricing(model);
+  if (!pricing)
+    return 0;
+  return computeCostWithPricing(model, pricing, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, cacheWrite1hTokens, cacheStorageTokenHours);
+}
 function computeCostWithPricing(model, pricing, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, cacheWrite1hTokens, cacheStorageTokenHours) {
   if (isFreeModel(model))
     return 0;
@@ -931,194 +951,6 @@ function seedModelPricing(db, defaults) {
 }
 var init_database = () => {};
 
-// src/db/pg-migrations.ts
-var exports_pg_migrations = {};
-__export(exports_pg_migrations, {
-  PG_MIGRATIONS: () => PG_MIGRATIONS
-});
-var PG_MIGRATIONS;
-var init_pg_migrations = __esm(() => {
-  PG_MIGRATIONS = [
-    `CREATE TABLE IF NOT EXISTS requests (
-    id TEXT PRIMARY KEY,
-    agent TEXT NOT NULL,
-    session_id TEXT NOT NULL,
-    model TEXT NOT NULL,
-    input_tokens INTEGER DEFAULT 0,
-    output_tokens INTEGER DEFAULT 0,
-    cache_read_tokens INTEGER DEFAULT 0,
-    cache_create_tokens INTEGER DEFAULT 0,
-    cache_create_5m_tokens INTEGER DEFAULT 0,
-    cache_create_1h_tokens INTEGER DEFAULT 0,
-    cost_usd REAL NOT NULL DEFAULT 0,
-    duration_ms INTEGER DEFAULT 0,
-    timestamp TEXT NOT NULL,
-    source_request_id TEXT,
-    machine_id TEXT DEFAULT '',
-    account_key TEXT DEFAULT '',
-    account_tool TEXT DEFAULT '',
-    account_name TEXT DEFAULT '',
-    account_email TEXT DEFAULT '',
-    account_source TEXT DEFAULT ''
-  )`,
-    `CREATE TABLE IF NOT EXISTS sessions (
-    id TEXT PRIMARY KEY,
-    agent TEXT NOT NULL,
-    project_path TEXT DEFAULT '',
-    project_name TEXT DEFAULT '',
-    started_at TEXT NOT NULL,
-    ended_at TEXT,
-    total_cost_usd REAL DEFAULT 0,
-    total_tokens INTEGER DEFAULT 0,
-    request_count INTEGER DEFAULT 0,
-    machine_id TEXT DEFAULT '',
-    account_key TEXT DEFAULT '',
-    account_tool TEXT DEFAULT '',
-    account_name TEXT DEFAULT '',
-    account_email TEXT DEFAULT '',
-    account_source TEXT DEFAULT ''
-  )`,
-    `CREATE TABLE IF NOT EXISTS projects (
-    id TEXT PRIMARY KEY,
-    path TEXT UNIQUE NOT NULL,
-    name TEXT NOT NULL,
-    description TEXT,
-    tags TEXT DEFAULT '[]',
-    created_at TEXT NOT NULL
-  )`,
-    `CREATE TABLE IF NOT EXISTS budgets (
-    id TEXT PRIMARY KEY,
-    project_path TEXT,
-    agent TEXT,
-    period TEXT NOT NULL,
-    limit_usd REAL NOT NULL,
-    alert_at_percent INTEGER DEFAULT 80,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL
-  )`,
-    `CREATE TABLE IF NOT EXISTS goals (
-    id TEXT PRIMARY KEY,
-    period TEXT NOT NULL,
-    project_path TEXT,
-    agent TEXT,
-    limit_usd REAL NOT NULL,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL
-  )`,
-    `CREATE TABLE IF NOT EXISTS ingest_state (
-    source TEXT NOT NULL,
-    key TEXT NOT NULL,
-    value TEXT NOT NULL,
-    PRIMARY KEY (source, key)
-  )`,
-    `CREATE INDEX IF NOT EXISTS idx_requests_session ON requests(session_id)`,
-    `CREATE INDEX IF NOT EXISTS idx_requests_timestamp ON requests(timestamp)`,
-    `CREATE INDEX IF NOT EXISTS idx_requests_agent ON requests(agent)`,
-    `CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id)`,
-    `CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent)`,
-    `CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_path)`,
-    `CREATE INDEX IF NOT EXISTS idx_sessions_started ON sessions(started_at)`,
-    `CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id)`,
-    `CREATE TABLE IF NOT EXISTS model_pricing (
-    model TEXT PRIMARY KEY,
-    input_per_1m REAL NOT NULL DEFAULT 0,
-    output_per_1m REAL NOT NULL DEFAULT 0,
-    cache_read_per_1m REAL NOT NULL DEFAULT 0,
-    cache_write_per_1m REAL NOT NULL DEFAULT 0,
-    cache_write_1h_per_1m REAL NOT NULL DEFAULT 0,
-    cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0,
-    updated_at TEXT NOT NULL
-  )`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cache_create_5m_tokens INTEGER DEFAULT 0`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cache_create_1h_tokens INTEGER DEFAULT 0`,
-    `ALTER TABLE model_pricing ADD COLUMN IF NOT EXISTS cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`,
-    `ALTER TABLE model_pricing ADD COLUMN IF NOT EXISTS cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`,
-    `CREATE TABLE IF NOT EXISTS feedback (
-    id TEXT PRIMARY KEY DEFAULT gen_random_uuid()::text,
-    message TEXT NOT NULL,
-    email TEXT,
-    category TEXT DEFAULT 'general',
-    version TEXT,
-    machine_id TEXT,
-    created_at TEXT NOT NULL DEFAULT NOW()::text
-  )`,
-    `CREATE TABLE IF NOT EXISTS billing_daily (
-    date TEXT NOT NULL,
-    provider TEXT NOT NULL,
-    description TEXT DEFAULT '',
-    cost_usd REAL NOT NULL DEFAULT 0,
-    updated_at TEXT NOT NULL,
-    PRIMARY KEY (date, provider, description)
-  )`,
-    `CREATE INDEX IF NOT EXISTS idx_billing_date ON billing_daily(date)`,
-    `CREATE INDEX IF NOT EXISTS idx_billing_provider ON billing_daily(provider)`,
-    `CREATE TABLE IF NOT EXISTS subscriptions (
-    id TEXT PRIMARY KEY,
-    agent TEXT,
-    provider TEXT NOT NULL,
-    plan TEXT NOT NULL,
-    monthly_fee_usd REAL NOT NULL DEFAULT 0,
-    included_usage_usd REAL NOT NULL DEFAULT 0,
-    billing_cycle_start TEXT,
-    reset_policy TEXT DEFAULT 'monthly',
-    active INTEGER NOT NULL DEFAULT 1,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL
-  )`,
-    `CREATE TABLE IF NOT EXISTS usage_snapshots (
-    id TEXT PRIMARY KEY,
-    agent TEXT NOT NULL,
-    date TEXT NOT NULL,
-    metric TEXT NOT NULL,
-    value REAL NOT NULL DEFAULT 0,
-    unit TEXT DEFAULT '',
-    machine_id TEXT DEFAULT '',
-    updated_at TEXT NOT NULL
-  )`,
-    `CREATE TABLE IF NOT EXISTS savings_daily (
-    date TEXT NOT NULL,
-    agent TEXT DEFAULT '',
-    api_equivalent_usd REAL NOT NULL DEFAULT 0,
-    subscription_fee_usd REAL NOT NULL DEFAULT 0,
-    included_consumed_usd REAL NOT NULL DEFAULT 0,
-    on_demand_usd REAL NOT NULL DEFAULT 0,
-    saved_usd REAL NOT NULL DEFAULT 0,
-    updated_at TEXT NOT NULL,
-    PRIMARY KEY (date, agent)
-  )`,
-    `CREATE TABLE IF NOT EXISTS machines (
-    machine_id TEXT PRIMARY KEY,
-    hostname TEXT NOT NULL,
-    last_seen_at TEXT,
-    last_push_at TEXT,
-    last_pull_at TEXT,
-    economy_version TEXT,
-    updated_at TEXT NOT NULL
-  )`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS cost_basis TEXT DEFAULT 'estimated'`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS attribution_tag TEXT DEFAULT ''`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_key TEXT DEFAULT ''`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_tool TEXT DEFAULT ''`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_name TEXT DEFAULT ''`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_email TEXT DEFAULT ''`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS account_source TEXT DEFAULT ''`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS updated_at TEXT DEFAULT ''`,
-    `ALTER TABLE requests ADD COLUMN IF NOT EXISTS synced_at TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS attribution_tag TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_key TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_tool TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_name TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_email TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS account_source TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS updated_at TEXT DEFAULT ''`,
-    `ALTER TABLE sessions ADD COLUMN IF NOT EXISTS synced_at TEXT DEFAULT ''`,
-    `CREATE INDEX IF NOT EXISTS idx_usage_agent_date ON usage_snapshots(agent, date)`,
-    `CREATE INDEX IF NOT EXISTS idx_savings_date ON savings_daily(date)`,
-    `CREATE INDEX IF NOT EXISTS idx_requests_account ON requests(account_key)`,
-    `CREATE INDEX IF NOT EXISTS idx_sessions_account ON sessions(account_key)`
-  ];
-});
-
 // src/otel/index.ts
 init_database();
 
@@ -1327,9 +1159,6 @@ async function ingestOtelRows(db, rows) {
   return { requests, sessions: sessions.size };
 }
 
-// src/lib/cloud-sync.ts
-init_database();
-
 // src/lib/package-metadata.ts
 import { readFileSync } from "fs";
 var cachedMetadata = null;
@@ -1346,80 +1175,6 @@ function getPackageMetadata() {
 }
 var packageMetadata = getPackageMetadata();
 
-// src/lib/cloud-sync.ts
-var CLOUD_TABLES = [
-  "requests",
-  "sessions",
-  "projects",
-  "budgets",
-  "goals",
-  "model_pricing",
-  "billing_daily",
-  "subscriptions",
-  "usage_snapshots",
-  "savings_daily",
-  "machines",
-  "ingest_state"
-];
-function getCloudDatabaseUrl() {
-  return process.env["ECONOMY_CLOUD_DATABASE_URL"] ?? process.env["HASNA_ECONOMY_CLOUD_DATABASE_URL"] ?? null;
-}
-function isCloudAutoEnabled() {
-  return process.env["ECONOMY_CLOUD_AUTO"] === "1" || process.env["ECONOMY_CLOUD_AUTO"] === "true";
-}
-async function getCloudPg() {
-  const url = getCloudDatabaseUrl();
-  if (!url) {
-    throw new Error("Missing ECONOMY_CLOUD_DATABASE_URL (or HASNA_ECONOMY_CLOUD_DATABASE_URL)");
-  }
-  const { PgAdapterAsync } = await import("@hasna/cloud");
-  return new PgAdapterAsync(url);
-}
-async function runCloudMigrations(cloud) {
-  const { PG_MIGRATIONS: PG_MIGRATIONS2 } = await Promise.resolve().then(() => (init_pg_migrations(), exports_pg_migrations));
-  for (const sql of PG_MIGRATIONS2) {
-    await cloud.run(sql);
-  }
-}
-async function cloudPush(opts) {
-  const { syncPush, SqliteAdapter } = await import("@hasna/cloud");
-  const cloud = await getCloudPg();
-  const local = new SqliteAdapter(getDbPath());
-  await runCloudMigrations(cloud);
-  const tables = opts?.tables ?? [...CLOUD_TABLES];
-  const results = await syncPush(local, cloud, { tables, conflictColumn: "updated_at" });
-  const rows = results.reduce((s, r) => s + r.rowsWritten, 0);
-  touchMachineRegistry(local, "push");
-  local.close();
-  await cloud.close();
-  return { rows, machine: getMachineId() };
-}
-async function maybePushAfterIngest() {
-  if (!isCloudAutoEnabled() || !getCloudDatabaseUrl())
-    return false;
-  try {
-    await cloudPush();
-    return true;
-  } catch {
-    return false;
-  }
-}
-function touchMachineRegistry(db, direction) {
-  const now = new Date().toISOString();
-  const machine = getMachineId();
-  db.prepare(`
-    INSERT INTO machines (machine_id, hostname, last_seen_at, last_push_at, last_pull_at, economy_version, updated_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?)
-    ON CONFLICT(machine_id) DO UPDATE SET
-      hostname = excluded.hostname,
-      last_seen_at = excluded.last_seen_at,
-      last_push_at = CASE WHEN ? = 'push' THEN excluded.last_push_at ELSE machines.last_push_at END,
-      last_pull_at = CASE WHEN ? = 'pull' THEN excluded.last_pull_at ELSE machines.last_pull_at END,
-      economy_version = excluded.economy_version,
-      updated_at = excluded.updated_at
-  `).run(machine, machine, now, direction === "push" ? now : null, direction === "pull" ? now : null, packageMetadata.version, now, direction, direction);
-}
-
 // src/otel/index.ts
 function resolvePort(argv) {
   for (let i = 0;i < argv.length; i++) {
@@ -1468,7 +1223,6 @@ var server = Bun.serve({
       return Response.json({ ingested: 0, message: "no matching metrics" });
     }
     const result = await ingestOtelRows(db, rows);
-    await maybePushAfterIngest();
     return Response.json({ ingested: result.requests, sessions: result.sessions });
   }
 });