@hasna/economy 0.2.10 → 0.2.11

package/dist/server/index.d.ts

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

package/dist/server/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env bun
 // @bun
 var __defProp = Object.defineProperty;
 var __returnValue = (v) => v;
@@ -680,7 +681,7 @@ init_database();
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join3, basename as basename2 } from "path";
-import { Database as Database2 } from "bun:sqlite";
+import { Database as BunDatabase } from "bun:sqlite";
 var CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
 var CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
 async function ingestCodex(db, verbose = false) {
@@ -692,7 +693,7 @@ async function ingestCodex(db, verbose = false) {
   let codexDb = null;
   let ingested = 0;
   try {
-    codexDb = new Database2(CODEX_DB_PATH, { readonly: true });
+    codexDb = new BunDatabase(CODEX_DB_PATH, { readonly: true });
     const threads = codexDb.prepare(`SELECT id, cwd, created_at, updated_at, tokens_used, title FROM threads WHERE tokens_used > 0`).all();
     for (const thread of threads) {
       const stateKey = thread.id;
@@ -726,6 +727,83 @@ async function ingestCodex(db, verbose = false) {
   return { sessions: ingested };
 }
 
+// src/ingest/gemini.ts
+init_database();
+import { readdirSync as readdirSync3, readFileSync as readFileSync3, existsSync as existsSync4, statSync as statSync3 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join4 } from "path";
+var GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
+async function ingestGemini(db, verbose) {
+  if (!existsSync4(GEMINI_TMP_DIR)) {
+    if (verbose)
+      console.log("Gemini tmp dir not found:", GEMINI_TMP_DIR);
+    return { sessions: 0 };
+  }
+  let totalSessions = 0;
+  const touchedSessions = new Set;
+  let projectHashDirs = [];
+  try {
+    projectHashDirs = readdirSync3(GEMINI_TMP_DIR, { withFileTypes: true }).filter((d) => d.isDirectory() && /^[0-9a-f]{64}$/.test(d.name)).map((d) => join4(GEMINI_TMP_DIR, d.name));
+  } catch {
+    return { sessions: 0 };
+  }
+  for (const projectDir of projectHashDirs) {
+    const chatsDir = join4(projectDir, "chats");
+    if (!existsSync4(chatsDir))
+      continue;
+    let chatFiles = [];
+    try {
+      chatFiles = readdirSync3(chatsDir).filter((f) => f.endsWith(".json")).map((f) => join4(chatsDir, f));
+    } catch {
+      continue;
+    }
+    for (const filePath of chatFiles) {
+      const stateKey = filePath.replace(homedir4(), "~");
+      let fileMtime = "0";
+      try {
+        fileMtime = statSync3(filePath).mtimeMs.toString();
+      } catch {
+        continue;
+      }
+      const processed = getIngestState(db, "gemini", stateKey);
+      if (processed === fileMtime)
+        continue;
+      let chatData;
+      try {
+        chatData = JSON.parse(readFileSync3(filePath, "utf-8"));
+      } catch {
+        continue;
+      }
+      const sessionId = chatData.sessionId;
+      if (!sessionId)
+        continue;
+      const startTime = chatData.startTime ?? new Date().toISOString();
+      const existing = db.prepare(`SELECT id FROM sessions WHERE id = ?`).get(sessionId);
+      if (!existing) {
+        const session = {
+          id: sessionId,
+          agent: "gemini",
+          project_path: "",
+          project_name: "",
+          started_at: startTime,
+          ended_at: chatData.lastUpdated ?? null,
+          total_cost_usd: 0,
+          total_tokens: 0,
+          request_count: 0
+        };
+        upsertSession(db, session);
+        touchedSessions.add(sessionId);
+        totalSessions++;
+      }
+      setIngestState(db, "gemini", stateKey, fileMtime);
+    }
+  }
+  for (const sessionId of touchedSessions) {
+    rollupSession(db, sessionId);
+  }
+  return { sessions: totalSessions };
+}
+
 // src/server/serve.ts
 init_pricing();
 import { randomUUID } from "crypto";
@@ -746,6 +824,20 @@ function ok(data, meta) {
 function err(message, status = 400) {
   return json({ error: message }, status);
 }
+function normalizeBudgetPeriod(value) {
+  switch (value) {
+    case "day":
+    case "daily":
+      return "daily";
+    case "week":
+    case "weekly":
+      return "weekly";
+    case "month":
+    case "monthly":
+    default:
+      return "monthly";
+  }
+}
 function applyFields(obj, fields) {
   if (!fields || fields.length === 0)
     return obj;
@@ -771,12 +863,20 @@ function createHandler(db) {
     if (path === "/api/sessions" && method === "GET") {
       const agent = url.searchParams.get("agent");
       const project = url.searchParams.get("project") ?? undefined;
+      const search = url.searchParams.get("search") ?? undefined;
       const limit = Number(url.searchParams.get("limit") ?? 50);
       const offset = Number(url.searchParams.get("offset") ?? 0);
       const since = url.searchParams.get("since") ?? undefined;
       const fieldsParam = url.searchParams.get("fields");
       const fields = fieldsParam ? fieldsParam.split(",").map((f) => f.trim()).filter(Boolean) : undefined;
-      const sessions = querySessions(db, { agent: agent ?? undefined, project, limit, offset, since });
+      const sessions = querySessions(db, {
+        agent: agent ?? undefined,
+        project,
+        search,
+        limit,
+        offset,
+        since
+      });
       return ok(fields ? sessions.map((s) => applyFields(s, fields)) : sessions, { limit, offset });
     }
     if (path === "/api/top" && method === "GET") {
@@ -804,7 +904,7 @@ function createHandler(db) {
         id: randomUUID(),
         project_path: body["project_path"] ?? null,
         agent: body["agent"] ?? null,
-        period: body["period"] ?? "monthly",
+        period: normalizeBudgetPeriod(body["period"]),
         limit_usd: Number(body["limit_usd"]),
         alert_at_percent: Number(body["alert_at_percent"] ?? 80),
         created_at: now,
@@ -867,6 +967,8 @@ function createHandler(db) {
         results["claude"] = await ingestClaude(db);
       if (sources === "all" || sources === "codex")
         results["codex"] = await ingestCodex(db);
+      if (sources === "all" || sources === "gemini")
+        results["gemini"] = await ingestGemini(db);
       return ok(results);
     }
     const sessionRequestsMatch = path.match(/^\/api\/sessions\/([^/]+)\/requests$/);
@@ -916,15 +1018,15 @@ function startServer(port = 3456) {
         return apiHandler(req);
       }
       try {
-        const { existsSync: existsSync4 } = await import("fs");
-        if (existsSync4(dashboardDir)) {
+        const { existsSync: existsSync5 } = await import("fs");
+        if (existsSync5(dashboardDir)) {
           let filePath = url.pathname === "/" ? "/index.html" : url.pathname;
           const fullPath = dashboardDir + filePath;
-          if (existsSync4(fullPath)) {
+          if (existsSync5(fullPath)) {
             return new Response(Bun.file(fullPath));
           }
           const indexPath = dashboardDir + "/index.html";
-          if (existsSync4(indexPath)) {
+          if (existsSync5(indexPath)) {
             return new Response(Bun.file(indexPath));
           }
         }
@@ -935,6 +1037,62 @@ function startServer(port = 3456) {
   console.log(`economy-serve listening on http://localhost:${port}`);
 }
 
+// src/lib/package-metadata.ts
+import { readFileSync as readFileSync4 } from "fs";
+var cachedMetadata = null;
+function getPackageMetadata() {
+  if (cachedMetadata)
+    return cachedMetadata;
+  const raw = readFileSync4(new URL("../../package.json", import.meta.url), "utf8");
+  const parsed = JSON.parse(raw);
+  cachedMetadata = {
+    name: parsed.name ?? "@hasna/economy",
+    version: parsed.version ?? "0.0.0"
+  };
+  return cachedMetadata;
+}
+var packageMetadata = getPackageMetadata();
+
 // src/server/index.ts
-var port = Number(process.env["ECONOMY_PORT"] ?? 3456);
-startServer(port);
+function printHelp() {
+  console.log(`Usage: economy-serve [options]
+
+REST API server for ${packageMetadata.name}
+
+Options:
+  -p, --port <port>  Port to bind (default: ECONOMY_PORT or 3456)
+  -V, --version      output the version number
+  -h, --help         display help for command`);
+}
+function resolvePort(argv) {
+  for (let i = 0;i < argv.length; i++) {
+    const arg = argv[i];
+    if ((arg === "--port" || arg === "-p") && argv[i + 1]) {
+      const value2 = Number(argv[i + 1]);
+      if (!Number.isFinite(value2) || value2 <= 0) {
+        throw new Error(`Invalid port: ${argv[i + 1]}`);
+      }
+      return value2;
+    }
+  }
+  const value = Number(process.env["ECONOMY_PORT"] ?? 3456);
+  if (!Number.isFinite(value) || value <= 0) {
+    throw new Error(`Invalid ECONOMY_PORT: ${process.env["ECONOMY_PORT"]}`);
+  }
+  return value;
+}
+var args = process.argv.slice(2);
+if (args.includes("--help") || args.includes("-h")) {
+  printHelp();
+  process.exit(0);
+}
+if (args.includes("--version") || args.includes("-V")) {
+  console.log(packageMetadata.version);
+  process.exit(0);
+}
+try {
+  startServer(resolvePort(args));
+} catch (error) {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exit(1);
+}

package/dist/server/serve.d.ts

@@ -1,4 +1,4 @@
-import type { Database } from 'bun:sqlite';
+import type { SqliteAdapter as Database } from '@hasna/cloud';
 export declare function createHandler(db: Database): (req: Request) => Promise<Response>;
 export declare function startServer(port?: number): void;
 //# sourceMappingURL=serve.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/server/serve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AA2C1C,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,IACV,KAAK,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CA+K/D;AAED,wBAAgB,WAAW,CAAC,IAAI,SAAO,GAAG,IAAI,CAuC7C"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/server/serve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AA2D7D,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,IACV,KAAK,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAwL/D;AAED,wBAAgB,WAAW,CAAC,IAAI,SAAO,GAAG,IAAI,CAuC7C"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hasna/economy",
-  "version": "0.2.10",
-  "description": "AI coding cost tracker \u2014 CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini",
+  "version": "0.2.11",
+  "description": "AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,14 +53,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@hasna/cloud": "^0.1.0",
+    "@hasna/cloud": "^0.1.24",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "chalk": "^5.4.1",
-    "commander": "^13.1.0"
+    "commander": "^13.1.0",
+    "zod": "^3.24.2"
   },
   "devDependencies": {
     "@types/bun": "latest",
     "bun-types": "latest",
     "typescript": "^5.7.2"
   }
-}
+}