@hasna/economy 0.2.26 → 0.2.28

package/dist/server/index.js

@@ -566,6 +566,26 @@ function openDatabase(dbPath, skipSeed = false) {
   }
   return db;
 }
+function quoteSqlIdent(identifier) {
+  return `"${identifier.replace(/"/g, '""')}"`;
+}
+function hasColumn(db, table, column) {
+  const columns = db.prepare(`PRAGMA table_info(${quoteSqlIdent(table)})`).all();
+  return columns.some((c) => c.name === column);
+}
+function addColumnIfMissing(db, table, column, definition) {
+  if (hasColumn(db, table, column))
+    return false;
+  try {
+    db.exec(`ALTER TABLE ${quoteSqlIdent(table)} ADD COLUMN ${quoteSqlIdent(column)} ${definition}`);
+    return true;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (/duplicate column name/i.test(message))
+      return true;
+    throw error;
+  }
+}
 function initSchema(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS requests (
@@ -736,59 +756,31 @@ function initSchema(db) {
     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);
   `);
-  const cols = db.prepare(`PRAGMA table_info(requests)`).all();
-  if (!cols.some((c) => c.name === "machine_id")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN machine_id TEXT DEFAULT ''`);
-    db.exec(`ALTER TABLE sessions ADD COLUMN machine_id TEXT DEFAULT ''`);
-  }
-  if (!cols.some((c) => c.name === "cache_create_5m_tokens")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_5m_tokens INTEGER DEFAULT 0`);
+  addColumnIfMissing(db, "requests", "machine_id", `TEXT DEFAULT ''`);
+  addColumnIfMissing(db, "sessions", "machine_id", `TEXT DEFAULT ''`);
+  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`);
   }
-  if (!cols.some((c) => c.name === "cache_create_1h_tokens")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN cache_create_1h_tokens INTEGER DEFAULT 0`);
-  }
-  if (!cols.some((c) => c.name === "cost_basis")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN cost_basis TEXT DEFAULT 'estimated'`);
-  }
-  if (!cols.some((c) => c.name === "attribution_tag")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN attribution_tag TEXT DEFAULT ''`);
-  }
-  if (!cols.some((c) => c.name === "updated_at")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN updated_at TEXT DEFAULT ''`);
+  addColumnIfMissing(db, "requests", "cache_create_1h_tokens", "INTEGER DEFAULT 0");
+  addColumnIfMissing(db, "requests", "cost_basis", `TEXT DEFAULT 'estimated'`);
+  addColumnIfMissing(db, "requests", "attribution_tag", `TEXT DEFAULT ''`);
+  if (addColumnIfMissing(db, "requests", "updated_at", `TEXT DEFAULT ''`)) {
     db.exec(`UPDATE requests SET updated_at = timestamp WHERE updated_at = '' OR updated_at IS NULL`);
   }
-  if (!cols.some((c) => c.name === "synced_at")) {
-    db.exec(`ALTER TABLE requests ADD COLUMN synced_at TEXT DEFAULT ''`);
-  }
+  addColumnIfMissing(db, "requests", "synced_at", `TEXT DEFAULT ''`);
   for (const column of ["account_key", "account_tool", "account_name", "account_email", "account_source"]) {
-    if (!cols.some((c) => c.name === column)) {
-      db.exec(`ALTER TABLE requests ADD COLUMN ${column} TEXT DEFAULT ''`);
-    }
-  }
-  const sessionCols = db.prepare(`PRAGMA table_info(sessions)`).all();
-  if (!sessionCols.some((c) => c.name === "attribution_tag")) {
-    db.exec(`ALTER TABLE sessions ADD COLUMN attribution_tag TEXT DEFAULT ''`);
+    addColumnIfMissing(db, "requests", column, `TEXT DEFAULT ''`);
   }
-  if (!sessionCols.some((c) => c.name === "updated_at")) {
-    db.exec(`ALTER TABLE sessions ADD COLUMN updated_at TEXT DEFAULT ''`);
+  addColumnIfMissing(db, "sessions", "attribution_tag", `TEXT DEFAULT ''`);
+  if (addColumnIfMissing(db, "sessions", "updated_at", `TEXT DEFAULT ''`)) {
     db.exec(`UPDATE sessions SET updated_at = started_at WHERE updated_at = '' OR updated_at IS NULL`);
   }
-  if (!sessionCols.some((c) => c.name === "synced_at")) {
-    db.exec(`ALTER TABLE sessions ADD COLUMN synced_at TEXT DEFAULT ''`);
-  }
+  addColumnIfMissing(db, "sessions", "synced_at", `TEXT DEFAULT ''`);
   for (const column of ["account_key", "account_tool", "account_name", "account_email", "account_source"]) {
-    if (!sessionCols.some((c) => c.name === column)) {
-      db.exec(`ALTER TABLE sessions ADD COLUMN ${column} TEXT DEFAULT ''`);
-    }
-  }
-  const pricingCols = db.prepare(`PRAGMA table_info(model_pricing)`).all();
-  if (!pricingCols.some((c) => c.name === "cache_write_1h_per_1m")) {
-    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_write_1h_per_1m REAL NOT NULL DEFAULT 0`);
-  }
-  if (!pricingCols.some((c) => c.name === "cache_storage_per_1m_hour")) {
-    db.exec(`ALTER TABLE model_pricing ADD COLUMN cache_storage_per_1m_hour REAL NOT NULL DEFAULT 0`);
+    addColumnIfMissing(db, "sessions", column, `TEXT DEFAULT ''`);
   }
+  addColumnIfMissing(db, "model_pricing", "cache_write_1h_per_1m", "REAL NOT NULL DEFAULT 0");
+  addColumnIfMissing(db, "model_pricing", "cache_storage_per_1m_hour", "REAL NOT NULL DEFAULT 0");
   db.exec(`
     CREATE INDEX IF NOT EXISTS idx_requests_machine ON requests(machine_id);
     CREATE INDEX IF NOT EXISTS idx_sessions_machine ON sessions(machine_id);
@@ -949,17 +941,22 @@ function querySummary(db, period, machine, allMachines = false) {
   const codexTotals = db.prepare(`
     SELECT COALESCE(SUM(total_cost_usd), 0) as cost_usd,
            COALESCE(SUM(total_tokens), 0) as tokens,
+           COALESCE(SUM(request_count), 0) as requests,
            COUNT(*) as sessions
     FROM sessions
     WHERE ${sWhere}${machineClause}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
   `).get();
-  const sessionCount = db.prepare(`SELECT COUNT(*) as sessions FROM sessions WHERE ${sWhere}${machineClause}`).get();
+  const requestSessionCount = db.prepare(`
+    SELECT COUNT(DISTINCT session_id) as sessions
+    FROM requests
+    WHERE ${rWhere}${machineClause}
+  `).get();
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
-    requests: r.requests,
+    requests: r.requests + codexTotals.requests,
     tokens: r.tokens + codexTotals.tokens,
-    sessions: sessionCount.sessions,
+    sessions: requestSessionCount.sessions + codexTotals.sessions,
     period
   };
 }
@@ -1038,9 +1035,7 @@ function queryAgentBreakdown(db, period = "all") {
   }
   return [...groups.values()].sort((a, b) => b.api_equivalent_usd - a.api_equivalent_usd);
 }
-function labelForPath(projectPath, projectName) {
-  if (projectName && projectName.trim() !== "")
-    return projectName;
+function pathProjectLabel(projectPath) {
   if (!projectPath)
     return "";
   const segments = projectPath.split("/").filter(Boolean);
@@ -1049,12 +1044,45 @@ function labelForPath(projectPath, projectName) {
     if (projectPrefix.test(seg))
       return seg;
   }
-  const generic = new Set(["web", "app", "apps", "packages", "src", "lib", "server", "client", "api", "frontend", "backend"]);
+  const generic = new Set([
+    "web",
+    "app",
+    "apps",
+    "packages",
+    "src",
+    "lib",
+    "server",
+    "client",
+    "api",
+    "frontend",
+    "backend",
+    "home",
+    "users",
+    "workspace",
+    "workspaces",
+    "hasna"
+  ]);
   for (let i = segments.length - 1;i >= 0; i--) {
     if (!generic.has(segments[i].toLowerCase()))
       return segments[i];
   }
-  return segments[segments.length - 1] ?? projectPath;
+  return null;
+}
+function isRepoLikeLabel(label) {
+  return /^(open|skill|hook|service|connect|platform|agent|tool|iapp|project|scaffold|capp)-/.test(label) || label.includes("-");
+}
+function labelForPath(projectPath, projectName) {
+  const pathLabel = pathProjectLabel(projectPath);
+  if (pathLabel && (!projectName || projectName.trim() === "" || isRepoLikeLabel(pathLabel)))
+    return pathLabel;
+  if (projectName && projectName.trim() !== "")
+    return projectName;
+  if (pathLabel)
+    return pathLabel;
+  return projectPath;
+}
+function groupKeyForPath(projectPath, projectName) {
+  return labelForPath(projectPath, projectName).trim().toLowerCase();
 }
 function queryProjectBreakdown(db, period = "all") {
   const requestWhere = requestPeriodWhere(period);
@@ -1069,14 +1097,15 @@ function queryProjectBreakdown(db, period = "all") {
     const label = labelForPath(s.project_path, s.project_name);
     if (!label)
       continue;
-    const g = groups.get(label) ?? { sessionIds: [], samplePath: s.project_path };
+    const key = groupKeyForPath(s.project_path, s.project_name);
+    const g = groups.get(key) ?? { label, sessionIds: [], samplePath: s.project_path };
     g.sessionIds.push(s.id);
     if (!g.samplePath)
       g.samplePath = s.project_path;
-    groups.set(label, g);
+    groups.set(key, g);
   }
   const result = [];
-  for (const [label, g] of groups.entries()) {
+  for (const g of groups.values()) {
     const placeholders = g.sessionIds.map(() => "?").join(",");
     const reqStats = placeholders.length ? db.prepare(`
           SELECT
@@ -1107,7 +1136,7 @@ function queryProjectBreakdown(db, period = "all") {
     const lastActive = [reqStats.last_active, sessionOnlyStats.last_active].filter(Boolean).sort().at(-1) ?? "";
     result.push({
       project_path: g.samplePath,
-      project_name: label,
+      project_name: g.label,
       sessions: totalSessions,
       requests: reqStats.requests + sessionOnlyStats.requests,
       total_tokens: reqStats.total_tokens + sessionOnlyStats.total_tokens,
@@ -1338,17 +1367,48 @@ function queryBillingSummary(db, period) {
   }
   return { total_usd: total, by_provider };
 }
-function listMachines(db) {
+function listMachines(db, period = "all") {
+  const rWhere = requestPeriodWhere(period);
+  const sWhere = sessionPeriodWhere(period);
   return db.prepare(`
+    WITH request_stats AS (
+      SELECT
+        machine_id,
+        COUNT(DISTINCT session_id) as sessions,
+        COUNT(*) as requests,
+        COALESCE(SUM(cost_usd), 0) as total_cost_usd,
+        MAX(timestamp) as last_active
+      FROM requests
+      WHERE machine_id != ''
+        AND ${rWhere}
+      GROUP BY machine_id
+    ),
+    session_only_stats AS (
+      SELECT
+        machine_id,
+        COUNT(*) as sessions,
+        COALESCE(SUM(request_count), 0) as requests,
+        COALESCE(SUM(total_cost_usd), 0) as total_cost_usd,
+        MAX(started_at) as last_active
+      FROM sessions
+      WHERE machine_id != ''
+        AND ${sWhere}
+        AND id NOT IN (SELECT DISTINCT session_id FROM requests)
+      GROUP BY machine_id
+    ),
+    combined AS (
+      SELECT * FROM request_stats
+      UNION ALL
+      SELECT * FROM session_only_stats
+    )
     SELECT
-      s.machine_id,
-      COUNT(DISTINCT s.id) as sessions,
-      COALESCE((SELECT COUNT(*) FROM requests r WHERE r.machine_id = s.machine_id), 0) as requests,
-      COALESCE(SUM(s.total_cost_usd), 0) as total_cost_usd,
-      MAX(s.started_at) as last_active
-    FROM sessions s
-    WHERE s.machine_id != ''
-    GROUP BY s.machine_id
+      machine_id,
+      COALESCE(SUM(sessions), 0) as sessions,
+      COALESCE(SUM(requests), 0) as requests,
+      COALESCE(SUM(total_cost_usd), 0) as total_cost_usd,
+      MAX(last_active) as last_active
+    FROM combined
+    GROUP BY machine_id
     ORDER BY total_cost_usd DESC
   `).all();
 }
@@ -1430,17 +1490,21 @@ function listMachineRegistry(db) {
 }
 function dedupeRequests(db) {
   const dupes = db.prepare(`
-    SELECT source_request_id, agent, MIN(id) as keep_id, COUNT(*) as cnt
+    SELECT source_request_id, agent, COALESCE(machine_id, '') as machine_id, MIN(id) as keep_id, COUNT(*) as cnt
     FROM requests
     WHERE source_request_id != '' AND source_request_id IS NOT NULL
-    GROUP BY source_request_id, agent
+    GROUP BY source_request_id, agent, COALESCE(machine_id, '')
     HAVING cnt > 1
   `).all();
   let removed = 0;
   for (const row of dupes) {
     const result = db.prepare(`
-      DELETE FROM requests WHERE source_request_id = ? AND agent = ? AND id != ?
-    `).run(row.source_request_id, row.agent, row.keep_id);
+      DELETE FROM requests
+      WHERE source_request_id = ?
+        AND agent = ?
+        AND COALESCE(machine_id, '') = ?
+        AND id != ?
+    `).run(row.source_request_id, row.agent, row.machine_id, row.keep_id);
     removed += result.changes;
   }
   return removed;
@@ -4023,7 +4087,7 @@ function createHandler(db) {
       const period = url.searchParams.get("period") ?? "month";
       return ok({
         summary: querySummary(db, period, undefined, true),
-        machines: listMachines(db),
+        machines: listMachines(db, period),
         registry: listMachineRegistry(db),
         current_machine: getMachineId()
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, Gemini, OpenCode, Cursor, Pi, and Hermes",
   "type": "module",
   "main": "dist/index.js",