@hasna/economy 0.1.0 → 0.1.1

package/dist/index.js

@@ -73,19 +73,19 @@ var DEFAULT_PRICING;
 var init_pricing = __esm(() => {
   init_database();
   DEFAULT_PRICING = {
-    "claude-opus-4-6": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75 },
-    "claude-opus-4-5": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75 },
+    "claude-opus-4-6": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
+    "claude-opus-4-5": { inputPer1M: 5, outputPer1M: 25, cacheReadPer1M: 0.5, cacheWritePer1M: 6.25 },
     "claude-sonnet-4-6": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
     "claude-sonnet-4-5": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
-    "claude-haiku-4-5": { inputPer1M: 0.8, outputPer1M: 4, cacheReadPer1M: 0.08, cacheWritePer1M: 1 },
+    "claude-haiku-4-5": { inputPer1M: 1, outputPer1M: 5, cacheReadPer1M: 0.1, cacheWritePer1M: 1.25 },
     "claude-3-5-sonnet": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
-    "claude-3-5-haiku": { inputPer1M: 0.8, outputPer1M: 4, cacheReadPer1M: 0.08, cacheWritePer1M: 1 },
+    "claude-3-5-haiku": { inputPer1M: 1, outputPer1M: 5, cacheReadPer1M: 0.1, cacheWritePer1M: 1.25 },
     "claude-3-opus": { inputPer1M: 15, outputPer1M: 75, cacheReadPer1M: 1.5, cacheWritePer1M: 18.75 },
     "claude-3-sonnet": { inputPer1M: 3, outputPer1M: 15, cacheReadPer1M: 0.3, cacheWritePer1M: 3.75 },
     "claude-3-haiku": { inputPer1M: 0.25, outputPer1M: 1.25, cacheReadPer1M: 0.03, cacheWritePer1M: 0.3 },
-    "gpt-5.3-codex": { inputPer1M: 30, outputPer1M: 120, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
-    "gpt-5.2-codex": { inputPer1M: 30, outputPer1M: 120, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
-    "gpt-5-codex": { inputPer1M: 30, outputPer1M: 120, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
+    "gpt-5.3-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
+    "gpt-5.2-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
+    "gpt-5-codex": { inputPer1M: 1.75, outputPer1M: 14, cacheReadPer1M: 0.44, cacheWritePer1M: 0 },
     "gpt-4o": { inputPer1M: 2.5, outputPer1M: 10, cacheReadPer1M: 1.25, cacheWritePer1M: 0 },
     "gpt-4o-mini": { inputPer1M: 0.15, outputPer1M: 0.6, cacheReadPer1M: 0.075, cacheWritePer1M: 0 },
     o1: { inputPer1M: 15, outputPer1M: 60, cacheReadPer1M: 7.5, cacheWritePer1M: 0 },
@@ -284,8 +284,22 @@ function querySummary(db, period) {
            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as tokens
     FROM requests WHERE ${rWhere}
   `).get();
-  const s = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}`).get();
-  return { total_usd: r.total_usd, requests: r.requests, tokens: r.tokens, sessions: s.sessions, period };
+  const codexTotals = db.prepare(`
+    SELECT COALESCE(SUM(total_cost_usd), 0) as cost_usd,
+           COALESCE(SUM(total_tokens), 0) as tokens,
+           COUNT(*) as sessions
+    FROM sessions
+    WHERE ${sWhere}
+    AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+  `).get();
+  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}`).get();
+  return {
+    total_usd: r.total_usd + codexTotals.cost_usd,
+    requests: r.requests,
+    tokens: r.tokens + codexTotals.tokens,
+    sessions: sessionCount.sessions,
+    period
+  };
 }
 function queryModelBreakdown(db) {
   return db.prepare(`
@@ -300,14 +314,14 @@ function queryModelBreakdown(db) {
 }
 function queryProjectBreakdown(db) {
   return db.prepare(`
-    SELECT s.project_path, s.project_name,
-           COUNT(DISTINCT s.id) as sessions,
-           COALESCE(SUM(r.input_tokens + r.output_tokens + r.cache_read_tokens + r.cache_create_tokens), 0) as total_tokens,
-           COUNT(r.id) as requests,
-           COALESCE(SUM(s.total_cost_usd), 0) as cost_usd,
-           MAX(s.started_at) as last_active
-    FROM sessions s LEFT JOIN requests r ON r.session_id = s.id
-    GROUP BY s.project_path ORDER BY cost_usd DESC
+    SELECT project_path, project_name,
+           COUNT(*) as sessions,
+           COALESCE(SUM(total_tokens), 0) as total_tokens,
+           COALESCE(SUM(request_count), 0) as requests,
+           COALESCE(SUM(total_cost_usd), 0) as cost_usd,
+           MAX(started_at) as last_active
+    FROM sessions
+    GROUP BY project_path ORDER BY cost_usd DESC
   `).all();
 }
 function queryDailyBreakdown(db, days = 30) {
@@ -426,117 +440,139 @@ init_pricing();
 
 // src/ingest/claude.ts
 init_database();
-import { readdirSync, readFileSync, existsSync as existsSync2 } from "fs";
+init_pricing();
+import { readdirSync, readFileSync, existsSync as existsSync2, statSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2, basename } from "path";
-import { randomUUID } from "crypto";
-var TELEMETRY_DIR = join2(homedir2(), ".claude", "telemetry");
 var PROJECTS_DIR = join2(homedir2(), ".claude", "projects");
-function resolveProjectPath(sessionId) {
-  if (!existsSync2(PROJECTS_DIR))
-    return { projectPath: "", projectName: "unknown" };
-  try {
-    const projectDirs = readdirSync(PROJECTS_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
-    for (const dir of projectDirs) {
-      const sessionFile = join2(PROJECTS_DIR, dir.name, `${sessionId}.jsonl`);
-      if (existsSync2(sessionFile)) {
-        const projectPath = dir.name.replace(/^-/, "/").replace(/-/g, "/");
-        return { projectPath, projectName: basename(projectPath) };
+function dirNameToPath(dirName) {
+  return dirName.replace(/^-/, "/").replace(/-/g, "/").replace(/\/\//g, "/-");
+}
+function collectJsonlFiles(projectDir) {
+  const files = [];
+  function walk(dir) {
+    try {
+      for (const entry of readdirSync(dir, { withFileTypes: true })) {
+        if (entry.isDirectory())
+          walk(join2(dir, entry.name));
+        else if (entry.name.endsWith(".jsonl"))
+          files.push(join2(dir, entry.name));
       }
-    }
-  } catch {}
-  return { projectPath: "", projectName: "unknown" };
+    } catch {}
+  }
+  walk(projectDir);
+  return files;
 }
-async function ingestClaude(db, verbose = false, telemetryDir = TELEMETRY_DIR) {
-  if (!existsSync2(telemetryDir)) {
+async function ingestClaude(db, verbose = false, _telemetryDir) {
+  if (!existsSync2(PROJECTS_DIR)) {
     if (verbose)
-      console.log("Claude telemetry dir not found:", telemetryDir);
+      console.log("Claude projects dir not found:", PROJECTS_DIR);
     return { files: 0, requests: 0, sessions: 0 };
   }
-  const files = readdirSync(telemetryDir).filter((f) => f.endsWith(".json"));
+  let totalFiles = 0;
   let totalRequests = 0;
-  let processedFiles = 0;
   const touchedSessions = new Set;
-  for (const filename of files) {
-    const stateKey = filename;
-    const processed = getIngestState(db, "claude", stateKey);
-    if (processed === "done")
-      continue;
-    const filePath = join2(telemetryDir, filename);
-    let events;
-    try {
-      const raw = readFileSync(filePath, "utf-8");
-      events = JSON.parse(raw);
-      if (!Array.isArray(events))
-        events = [events];
-    } catch {
-      if (verbose)
-        console.log("Skip unreadable:", filename);
-      continue;
-    }
-    for (const event of events) {
-      const ed = event.event_data;
-      if (!ed || ed.event_name !== "tengu_api_success")
+  const projectDirs = readdirSync(PROJECTS_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
+  for (const projectDirEntry of projectDirs) {
+    const projectDirPath = join2(PROJECTS_DIR, projectDirEntry.name);
+    const projectPath = dirNameToPath(projectDirEntry.name);
+    const projectName = basename(projectPath);
+    const jsonlFiles = collectJsonlFiles(projectDirPath);
+    for (const filePath of jsonlFiles) {
+      const stateKey = filePath.replace(PROJECTS_DIR, "");
+      let fileMtime = "0";
+      try {
+        fileMtime = statSync(filePath).mtimeMs.toString();
+      } catch {
         continue;
-      const meta = ed.additional_metadata;
-      if (!meta)
+      }
+      const processed = getIngestState(db, "claude", stateKey);
+      if (processed === fileMtime)
         continue;
-      const sessionId = ed.session_id ?? randomUUID();
-      const timestamp = ed.client_timestamp ?? new Date().toISOString();
-      const model = meta.model ?? ed.model ?? "unknown";
-      const costUsd = meta.costUSD ?? 0;
-      const inputTokens = meta.inputTokens ?? (meta.uncachedInputTokens ?? 0);
-      const outputTokens = meta.outputTokens ?? 0;
-      const cacheReadTokens = meta.cachedInputTokens ?? 0;
-      const requestId = meta.requestId ?? randomUUID();
-      upsertRequest(db, {
-        id: `claude-${requestId}`,
-        agent: "claude",
-        session_id: sessionId,
-        model,
-        input_tokens: inputTokens,
-        output_tokens: outputTokens,
-        cache_read_tokens: cacheReadTokens,
-        cache_create_tokens: 0,
-        cost_usd: costUsd,
-        duration_ms: meta.durationMs ?? 0,
-        timestamp,
-        source_request_id: requestId
-      });
-      if (!touchedSessions.has(sessionId)) {
-        const { projectPath, projectName } = resolveProjectPath(sessionId);
-        const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
-        if (!existing) {
-          const session = {
-            id: sessionId,
-            agent: "claude",
-            project_path: projectPath,
-            project_name: projectName,
-            started_at: timestamp,
-            ended_at: null,
-            total_cost_usd: 0,
-            total_tokens: 0,
-            request_count: 0
-          };
-          upsertSession(db, session);
+      let lines;
+      try {
+        lines = readFileSync(filePath, "utf-8").split(`
+`).filter((l) => l.trim());
+      } catch {
+        continue;
+      }
+      const fileBasename = basename(filePath, ".jsonl");
+      const isUuid = /^[0-9a-f-]{36}$/.test(fileBasename);
+      let sessionId = isUuid ? fileBasename : fileBasename.replace(/^agent-/, "");
+      let sessionCwd = projectPath;
+      for (const line of lines) {
+        let entry;
+        try {
+          entry = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        if (entry.sessionId)
+          sessionId = entry.sessionId;
+        if (entry.cwd)
+          sessionCwd = entry.cwd;
+        if (entry.message?.role !== "assistant")
+          continue;
+        const usage = entry.message.usage;
+        if (!usage)
+          continue;
+        const model = entry.message.model;
+        if (!model)
+          continue;
+        const inputTokens = usage.input_tokens ?? 0;
+        const outputTokens = usage.output_tokens ?? 0;
+        const cacheWriteTokens = usage.cache_creation_input_tokens ?? 0;
+        const cacheReadTokens = usage.cache_read_input_tokens ?? 0;
+        const timestamp = entry.timestamp ?? new Date().toISOString();
+        if (inputTokens + outputTokens + cacheWriteTokens === 0)
+          continue;
+        const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
+        const reqId = `claude-${sessionId}-${timestamp}`;
+        upsertRequest(db, {
+          id: reqId,
+          agent: "claude",
+          session_id: sessionId,
+          model,
+          input_tokens: inputTokens,
+          output_tokens: outputTokens,
+          cache_read_tokens: cacheReadTokens,
+          cache_create_tokens: cacheWriteTokens,
+          cost_usd: costUsd,
+          duration_ms: 0,
+          timestamp,
+          source_request_id: reqId
+        });
+        if (!touchedSessions.has(sessionId)) {
+          const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
+          if (!existing) {
+            const session = {
+              id: sessionId,
+              agent: "claude",
+              project_path: sessionCwd || projectPath,
+              project_name: basename(sessionCwd || projectPath),
+              started_at: timestamp,
+              ended_at: null,
+              total_cost_usd: 0,
+              total_tokens: 0,
+              request_count: 0
+            };
+            upsertSession(db, session);
+          }
+          touchedSessions.add(sessionId);
         }
-        touchedSessions.add(sessionId);
+        totalRequests++;
       }
-      totalRequests++;
+      setIngestState(db, "claude", stateKey, fileMtime);
+      totalFiles++;
     }
-    setIngestState(db, "claude", stateKey, "done");
-    processedFiles++;
-    if (verbose)
-      console.log(`Processed ${filename}: found ${events.length} events`);
   }
   for (const sessionId of touchedSessions) {
     rollupSession(db, sessionId);
   }
-  return { files: processedFiles, requests: totalRequests, sessions: touchedSessions.size };
+  return { files: totalFiles, requests: totalRequests, sessions: touchedSessions.size };
 }
 // src/ingest/codex.ts
 init_database();
-init_pricing();
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join3, basename as basename2 } from "path";
@@ -571,9 +607,7 @@ async function ingestCodex(db, verbose = false) {
       const processed = getIngestState(db, "codex", stateKey);
       if (processed === "done")
         continue;
-      const inputTokens = Math.floor(thread.tokens_used * 0.6);
-      const outputTokens = thread.tokens_used - inputTokens;
-      const costUsd = computeCost(model, inputTokens, outputTokens);
+      const costUsd = 0;
       const projectPath = thread.cwd ?? "";
       const projectName = projectPath ? basename2(projectPath) : "unknown";
       const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();

package/dist/ingest/claude.d.ts

@@ -0,0 +1,7 @@
+import { Database } from 'bun:sqlite';
+export declare function ingestClaude(db: Database, verbose?: boolean, _telemetryDir?: string): Promise<{
+    files: number;
+    requests: number;
+    sessions: number;
+}>;
+//# sourceMappingURL=claude.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../src/ingest/claude.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAwDrC,wBAAsB,YAAY,CAChC,EAAE,EAAE,QAAQ,EACZ,OAAO,UAAQ,EACf,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAsHhE"}

package/dist/ingest/codex.d.ts

@@ -0,0 +1,7 @@
+import { Database } from 'bun:sqlite';
+declare function readCodexModel(): string;
+export declare function ingestCodex(db: Database, verbose?: boolean): Promise<{
+    sessions: number;
+}>;
+export { readCodexModel };
+//# sourceMappingURL=codex.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/ingest/codex.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAmBrC,iBAAS,cAAc,IAAI,MAAM,CAShC;AAED,wBAAsB,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,UAAQ,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CA0D9F;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/dist/lib/pricing.d.ts

@@ -0,0 +1,10 @@
+import type { Database } from 'bun:sqlite';
+import type { ModelPricing } from '../types/index.js';
+export declare const DEFAULT_PRICING: Record<string, ModelPricing>;
+export declare function normalizeModelName(raw: string): string;
+export declare function ensurePricingSeeded(db: Database): void;
+export declare function getPricingFromDb(db: Database, model: string): ModelPricing | null;
+export declare function getPricing(model: string): ModelPricing | null;
+export declare function computeCost(model: string, inputTokens: number, outputTokens: number, cacheReadTokens?: number, cacheWriteTokens?: number): number;
+export declare function computeCostFromDb(db: Database, model: string, inputTokens: number, outputTokens: number, cacheReadTokens?: number, cacheWriteTokens?: number): number;
+//# sourceMappingURL=pricing.d.ts.map

package/dist/lib/pricing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pricing.d.ts","sourceRoot":"","sources":["../../src/lib/pricing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAwBxD,CAAA;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKtD;AAGD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAEtD;AAGD,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAuBjF;AAGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAO7D;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,SAAI,EACnB,gBAAgB,SAAI,GACnB,MAAM,CASR;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,GACnB,MAAM,CASR"}

package/dist/mcp/index.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env bun
+export {};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":""}