@hasna/economy 0.3.5 → 0.3.7

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

@@ -1 +1 @@
-{"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,CAqpBjC"}
+{"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,CAg0BjC"}

package/dist/otel/index.js

@@ -668,6 +668,16 @@ function addColumnIfMissing(db, table, column, definition) {
 }
 function initSchema(db) {
   db.exec(`
+    CREATE TABLE IF NOT EXISTS cost_centers (
+      id TEXT PRIMARY KEY,
+      kind TEXT NOT NULL,
+      name TEXT NOT NULL,
+      repo_path TEXT,
+      labels_json TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL
+    );
+
     CREATE TABLE IF NOT EXISTS requests (
       id TEXT PRIMARY KEY,
       agent TEXT NOT NULL,
@@ -684,6 +694,7 @@ function initSchema(db) {
       timestamp TEXT NOT NULL,
       source_request_id TEXT,
       machine_id TEXT DEFAULT '',
+      cost_center_id TEXT,
       account_key TEXT DEFAULT '',
       account_tool TEXT DEFAULT '',
       account_name TEXT DEFAULT '',
@@ -702,6 +713,7 @@ function initSchema(db) {
       total_tokens INTEGER DEFAULT 0,
       request_count INTEGER DEFAULT 0,
       machine_id TEXT DEFAULT '',
+      cost_center_id TEXT,
       account_key TEXT DEFAULT '',
       account_tool TEXT DEFAULT '',
       account_name TEXT DEFAULT '',
@@ -722,6 +734,7 @@ function initSchema(db) {
       id TEXT PRIMARY KEY,
       project_path TEXT,
       agent TEXT,
+      cost_center_id TEXT,
       period TEXT NOT NULL,
       limit_usd REAL NOT NULL,
       alert_at_percent INTEGER DEFAULT 80,
@@ -752,6 +765,7 @@ function initSchema(db) {
     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_cost_centers_kind ON cost_centers(kind);
 
     CREATE TABLE IF NOT EXISTS model_pricing (
       model TEXT PRIMARY KEY,
@@ -838,6 +852,12 @@ function initSchema(db) {
   `);
   addColumnIfMissing(db, "requests", "machine_id", `TEXT DEFAULT ''`);
   addColumnIfMissing(db, "sessions", "machine_id", `TEXT DEFAULT ''`);
+  if (addColumnIfMissing(db, "cost_centers", "updated_at", `TEXT DEFAULT ''`)) {
+    db.exec(`UPDATE cost_centers SET updated_at = created_at WHERE updated_at = '' OR updated_at IS NULL`);
+  }
+  addColumnIfMissing(db, "requests", "cost_center_id", `TEXT`);
+  addColumnIfMissing(db, "sessions", "cost_center_id", `TEXT`);
+  addColumnIfMissing(db, "budgets", "cost_center_id", `TEXT`);
   if (addColumnIfMissing(db, "requests", "cache_create_5m_tokens", "INTEGER DEFAULT 0")) {
     db.exec(`UPDATE requests SET cache_create_5m_tokens = cache_create_tokens WHERE cache_create_5m_tokens = 0`);
   }
@@ -866,8 +886,20 @@ function initSchema(db) {
     CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
     CREATE INDEX IF NOT EXISTS idx_requests_account ON requests(account_key);
     CREATE INDEX IF NOT EXISTS idx_sessions_account ON sessions(account_key);
+    CREATE INDEX IF NOT EXISTS idx_requests_cost_center ON requests(cost_center_id);
+    CREATE INDEX IF NOT EXISTS idx_sessions_cost_center ON sessions(cost_center_id);
+    CREATE INDEX IF NOT EXISTS idx_budgets_cost_center ON budgets(cost_center_id);
+    CREATE INDEX IF NOT EXISTS idx_cost_centers_kind ON cost_centers(kind);
   `);
 }
+function upsertCostCenter(db, center) {
+  const updatedAt = center.updated_at ?? center.created_at;
+  db.prepare(`
+    INSERT OR REPLACE INTO cost_centers
+      (id, kind, name, repo_path, labels_json, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+  `).run(center.id, center.kind, center.name, center.repo_path ?? null, center.labels_json ?? "{}", center.created_at, updatedAt);
+}
 function upsertRequest(db, req) {
   const now = req.updated_at ?? new Date().toISOString();
   db.prepare(`
@@ -875,10 +907,10 @@ function upsertRequest(db, req) {
       (id, agent, session_id, model, input_tokens, output_tokens,
        cache_read_tokens, cache_create_tokens, cache_create_5m_tokens,
        cache_create_1h_tokens, cost_usd, cost_basis, duration_ms, timestamp,
-       source_request_id, machine_id, attribution_tag, account_key, account_tool,
+       source_request_id, machine_id, cost_center_id, attribution_tag, account_key, account_tool,
        account_name, account_email, account_source, updated_at, synced_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", req.account_key ?? "", req.account_tool ?? "", req.account_name ?? "", req.account_email ?? "", req.account_source ?? "", now, req.synced_at ?? "");
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(req.id, req.agent, req.session_id, req.model, req.input_tokens, req.output_tokens, req.cache_read_tokens, req.cache_create_tokens, req.cache_create_5m_tokens ?? req.cache_create_tokens, req.cache_create_1h_tokens ?? 0, req.cost_usd, req.cost_basis ?? "estimated", req.duration_ms, req.timestamp, req.source_request_id, req.machine_id ?? "", req.cost_center_id ?? null, req.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", req.account_key ?? "", req.account_tool ?? "", req.account_name ?? "", req.account_email ?? "", req.account_source ?? "", now, req.synced_at ?? "");
 }
 function upsertSession(db, session) {
   const now = session.updated_at ?? new Date().toISOString();
@@ -886,9 +918,9 @@ function upsertSession(db, session) {
     INSERT OR REPLACE INTO sessions
       (id, agent, project_path, project_name, started_at, ended_at,
        total_cost_usd, total_tokens, request_count, machine_id, attribution_tag,
-       account_key, account_tool, account_name, account_email, account_source, updated_at, synced_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", session.account_key ?? "", session.account_tool ?? "", session.account_name ?? "", session.account_email ?? "", session.account_source ?? "", now, session.synced_at ?? "");
+       cost_center_id, account_key, account_tool, account_name, account_email, account_source, updated_at, synced_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(session.id, session.agent, session.project_path, session.project_name, session.started_at, session.ended_at ?? null, session.total_cost_usd, session.total_tokens, session.request_count, session.machine_id ?? "", session.attribution_tag ?? process.env["ECONOMY_TAG"] ?? "", session.cost_center_id ?? null, session.account_key ?? "", session.account_tool ?? "", session.account_name ?? "", session.account_email ?? "", session.account_source ?? "", now, session.synced_at ?? "");
 }
 function rollupSession(db, sessionId) {
   db.prepare(`
@@ -914,9 +946,12 @@ function rollupSession(db, sessionId) {
                             ELSE account_email END,
       account_source = CASE WHEN account_source = '' OR account_source IS NULL
                             THEN COALESCE((SELECT account_source FROM requests WHERE session_id = ? AND account_source != '' ORDER BY timestamp DESC LIMIT 1), '')
-                            ELSE account_source END
+                            ELSE account_source END,
+      cost_center_id = CASE WHEN cost_center_id = '' OR cost_center_id IS NULL
+                            THEN COALESCE((SELECT cost_center_id FROM requests WHERE session_id = ? AND cost_center_id IS NOT NULL AND cost_center_id != '' ORDER BY timestamp DESC LIMIT 1), NULL)
+                            ELSE cost_center_id END
     WHERE id = ?
-  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
+  `).run(sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId, sessionId);
 }
 function upsertModelPricing(db, p) {
   db.prepare(`
@@ -995,6 +1030,97 @@ function attrsMap(attributes) {
   }
   return out;
 }
+var COST_CENTER_KINDS = ["loop", "app", "repo", "service", "team"];
+var PSEUDO_AGENTS = ["app", "service", "repo", "loop"];
+function isCostCenterKind(value) {
+  return COST_CENTER_KINDS.includes(value);
+}
+function asString(value) {
+  if (value == null)
+    return;
+  const text = String(value).trim();
+  return text ? text : undefined;
+}
+function firstString(source, keys) {
+  for (const key of keys) {
+    const value = asString(source[key]);
+    if (value)
+      return value;
+  }
+  return;
+}
+function normalizeCostCenterKind(raw) {
+  if (!raw)
+    return;
+  const value = raw.toLowerCase();
+  return isCostCenterKind(value) ? value : undefined;
+}
+function normalizeAgent(raw, kind) {
+  if (raw && isAgent(raw))
+    return raw;
+  if (raw && PSEUDO_AGENTS.includes(raw))
+    return raw;
+  if (kind && PSEUDO_AGENTS.includes(kind))
+    return kind;
+  return "service";
+}
+function slug(value) {
+  return value.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "unknown";
+}
+function costCenterId(kind, name, explicitId) {
+  if (explicitId)
+    return explicitId;
+  if (!kind || !name)
+    return;
+  return `${kind}:${slug(name)}`;
+}
+function projectNameFromPath(projectPath) {
+  if (!projectPath)
+    return;
+  return projectPath.split("/").filter(Boolean).at(-1);
+}
+function extractAttribution(source) {
+  const sourceKind = firstString(source, ["source", "source_kind", "ai.source"]);
+  const rawKind = firstString(source, ["cost_center_kind", "cost_center.kind", "economy.cost_center.kind"]) ?? sourceKind;
+  const costCenterKind = normalizeCostCenterKind(rawKind);
+  const costCenter = firstString(source, [
+    "cost_center",
+    "cost_center_name",
+    "cost_center.name",
+    "economy.cost_center",
+    "service.name",
+    "app",
+    "app.name",
+    "repo",
+    "repository"
+  ]);
+  const projectPath = firstString(source, ["project_path", "project.path", "repo_path", "repository.path"]);
+  const explicitId = firstString(source, ["cost_center_id", "cost_center.id", "economy.cost_center.id"]);
+  const costBasisRaw = firstString(source, ["cost_basis", "economy.cost_basis"]);
+  const costBasis = costBasisRaw && ["metered_api", "subscription_included", "estimated", "unknown"].includes(costBasisRaw) ? costBasisRaw : undefined;
+  return {
+    agent: normalizeAgent(firstString(source, ["agent", "ai.agent"]) ?? sourceKind, costCenterKind),
+    cost_center: costCenter,
+    cost_center_kind: costCenterKind,
+    cost_center_id: costCenterId(costCenterKind, costCenter, explicitId),
+    attribution_tag: firstString(source, ["attribution_tag", "attribution.tag", "economy.attribution_tag"]),
+    project_path: projectPath,
+    project_name: firstString(source, ["project_name", "project.name"]) ?? projectNameFromPath(projectPath) ?? costCenter,
+    repo: firstString(source, ["repo", "repository", "repository.name"]),
+    account_key: firstString(source, ["account_key", "account.key", "economy.account_key"]),
+    account_tool: firstString(source, ["account_tool", "account.tool", "economy.account_tool"]),
+    account_name: firstString(source, ["account_name", "account.name", "economy.account_name"]),
+    account_email: firstString(source, ["account_email", "account.email", "economy.account_email"]),
+    account_source: firstString(source, ["account_source", "account.source", "economy.account_source"]),
+    cost_basis: costBasis
+  };
+}
+function mergeAttribution(row, attribution) {
+  return {
+    ...row,
+    ...Object.fromEntries(Object.entries(attribution).filter(([, value]) => value !== undefined && value !== ""))
+  };
+}
 function metricKind(body) {
   const name = String(body["name"] ?? "").toLowerCase();
   if (name.includes("cost") || name.includes(".usd"))
@@ -1043,13 +1169,13 @@ function parseOtlpMetrics(body) {
             continue;
           const pointAttrs = attrsMap(dp.attributes);
           const merged = { ...resourceAttrs, ...pointAttrs };
-          const agentRaw = String(merged["agent"] ?? merged["ai.agent"] ?? "unknown");
-          const agent = isAgent(agentRaw) ? agentRaw : "opencode";
+          const attribution = extractAttribution(merged);
+          const agent = attribution.agent;
           const sessionId = String(merged["session_id"] ?? merged["session.id"] ?? "otel-session");
           const model = String(merged["model"] ?? merged["ai.model"] ?? "unknown");
           const sourceId = String(merged["request_id"] ?? merged["event.id"] ?? `${sessionId}-${kind}`);
           const key = `${agent}:${sourceId}`;
-          const row = partial.get(key) ?? {
+          const row = mergeAttribution(partial.get(key) ?? {
             key,
             agent,
             session_id: sessionId,
@@ -1059,7 +1185,7 @@ function parseOtlpMetrics(body) {
             output_tokens: 0,
             timestamp: new Date().toISOString(),
             source_request_id: sourceId
-          };
+          }, attribution);
           const asDouble = dp.asDouble;
           const asInt = dp.asInt;
           const value = asDouble ?? (asInt != null ? Number(asInt) : 0);
@@ -1086,16 +1212,27 @@ function parseOtlpMetrics(body) {
     input_tokens: r.input_tokens ?? 0,
     output_tokens: r.output_tokens ?? 0,
     timestamp: r.timestamp,
-    source_request_id: r.source_request_id
+    source_request_id: r.source_request_id,
+    cost_basis: r.cost_basis,
+    cost_center: r.cost_center,
+    cost_center_kind: r.cost_center_kind,
+    cost_center_id: r.cost_center_id,
+    attribution_tag: r.attribution_tag,
+    project_path: r.project_path,
+    project_name: r.project_name,
+    repo: r.repo,
+    account_key: r.account_key,
+    account_tool: r.account_tool,
+    account_name: r.account_name,
+    account_email: r.account_email,
+    account_source: r.account_source
   }));
 }
 function parseSimpleIngest(body) {
   if (!body || typeof body !== "object")
     return null;
   const b = body;
-  const agentRaw = String(b["agent"] ?? "");
-  if (!isAgent(agentRaw))
-    return null;
+  const attribution = extractAttribution(b);
   const cost = Number(b["cost_usd"] ?? 0);
   const input = Number(b["input_tokens"] ?? 0);
   const output = Number(b["output_tokens"] ?? 0);
@@ -1104,7 +1241,8 @@ function parseSimpleIngest(body) {
   const sessionId = String(b["session_id"] ?? "otel-session");
   const sourceId = String(b["request_id"] ?? b["source_request_id"] ?? `${sessionId}-${Date.now()}`);
   return {
-    agent: agentRaw,
+    ...attribution,
+    agent: attribution.agent,
     session_id: sessionId,
     model: String(b["model"] ?? "unknown"),
     cost_usd: cost,
@@ -1114,12 +1252,31 @@ function parseSimpleIngest(body) {
     source_request_id: sourceId
   };
 }
+function ensureCostCenter(db, row) {
+  const id = row.cost_center_id ?? costCenterId(row.cost_center_kind, row.cost_center);
+  if (!id || !row.cost_center_kind || !row.cost_center)
+    return id;
+  const labels = { source: "otel" };
+  if (row.repo)
+    labels["repo"] = row.repo;
+  upsertCostCenter(db, {
+    id,
+    kind: row.cost_center_kind,
+    name: row.cost_center,
+    repo_path: row.project_path ?? null,
+    labels_json: JSON.stringify(labels),
+    created_at: row.timestamp
+  });
+  return id;
+}
 async function ingestOtelRows(db, rows) {
   const machineId = getMachineId();
   const sessions = new Set;
   let requests = 0;
   for (const row of rows) {
-    const reqId = `otel-${row.agent}-${row.source_request_id}`;
+    const costCenterId2 = ensureCostCenter(db, row);
+    const requestScope = slug(costCenterId2 ?? row.cost_center ?? row.project_path ?? row.session_id);
+    const reqId = `otel-${row.agent}-${requestScope}-${row.source_request_id}`;
     upsertRequest(db, {
       id: reqId,
       agent: row.agent,
@@ -1130,25 +1287,38 @@ async function ingestOtelRows(db, rows) {
       cache_read_tokens: 0,
       cache_create_tokens: 0,
       cost_usd: row.cost_usd,
-      cost_basis: "estimated",
+      cost_basis: row.cost_basis ?? "estimated",
       duration_ms: 0,
       timestamp: row.timestamp,
       source_request_id: row.source_request_id,
       machine_id: machineId,
-      attribution_tag: "otel"
+      cost_center_id: costCenterId2 ?? null,
+      attribution_tag: row.attribution_tag ?? "otel",
+      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 ?? ""
     });
     if (!sessions.has(row.session_id)) {
       upsertSession(db, {
         id: row.session_id,
         agent: row.agent,
-        project_path: "",
-        project_name: "",
+        project_path: row.project_path ?? "",
+        project_name: row.project_name ?? row.repo ?? row.cost_center ?? "",
         started_at: row.timestamp,
         ended_at: null,
         total_cost_usd: 0,
         total_tokens: 0,
         request_count: 0,
-        machine_id: machineId
+        machine_id: machineId,
+        cost_center_id: costCenterId2 ?? null,
+        attribution_tag: row.attribution_tag ?? "otel",
+        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.add(row.session_id);
     }