@hasna/economy 0.2.25 → 0.2.27

package/dist/mcp/index.js

@@ -1038,9 +1038,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 +1047,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 +1100,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 +1139,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,
@@ -1406,17 +1438,21 @@ function queryUsageSnapshots(db, opts = {}) {
 }
 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;
@@ -2122,6 +2158,25 @@ function buildThreadQuery(codexDb) {
     FROM threads WHERE tokens_used > 0
   `;
 }
+function openCodexDb(dbPath, verbose) {
+  let lastError;
+  for (const readonly of [true, false]) {
+    let codexDb = null;
+    try {
+      codexDb = readonly ? new BunDatabase(dbPath, { readonly: true }) : new BunDatabase(dbPath);
+      codexDb.prepare("PRAGMA schema_version").get();
+      return codexDb;
+    } catch (error) {
+      lastError = error;
+      codexDb?.close();
+    }
+  }
+  if (verbose) {
+    const message = lastError instanceof Error ? lastError.message : String(lastError);
+    console.log("Codex DB unreadable:", dbPath, message);
+  }
+  return null;
+}
 function readTokenEvents(rolloutPath) {
   if (!rolloutPath || !existsSync3(rolloutPath))
     return [];
@@ -2211,7 +2266,9 @@ async function ingestCodex(db, verbose = false) {
   let requests = 0;
   const account = await resolveAccountForAgent("codex");
   try {
-    codexDb = new BunDatabase(dbPath, { readonly: true });
+    codexDb = openCodexDb(dbPath, verbose);
+    if (!codexDb)
+      return { sessions: 0, requests: 0 };
     const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
     for (const thread of threads) {
       const model = thread.model ?? readCodexModel();

package/dist/server/index.js

@@ -1038,9 +1038,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 +1047,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 +1100,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 +1139,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,
@@ -1430,17 +1462,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;
@@ -2549,6 +2585,25 @@ function buildThreadQuery(codexDb) {
     FROM threads WHERE tokens_used > 0
   `;
 }
+function openCodexDb(dbPath, verbose) {
+  let lastError;
+  for (const readonly of [true, false]) {
+    let codexDb = null;
+    try {
+      codexDb = readonly ? new BunDatabase(dbPath, { readonly: true }) : new BunDatabase(dbPath);
+      codexDb.prepare("PRAGMA schema_version").get();
+      return codexDb;
+    } catch (error) {
+      lastError = error;
+      codexDb?.close();
+    }
+  }
+  if (verbose) {
+    const message = lastError instanceof Error ? lastError.message : String(lastError);
+    console.log("Codex DB unreadable:", dbPath, message);
+  }
+  return null;
+}
 function readTokenEvents(rolloutPath) {
   if (!rolloutPath || !existsSync3(rolloutPath))
     return [];
@@ -2638,7 +2693,9 @@ async function ingestCodex(db, verbose = false) {
   let requests = 0;
   const account = await resolveAccountForAgent("codex");
   try {
-    codexDb = new BunDatabase(dbPath, { readonly: true });
+    codexDb = openCodexDb(dbPath, verbose);
+    if (!codexDb)
+      return { sessions: 0, requests: 0 };
     const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
     for (const thread of threads) {
       const model = thread.model ?? readCodexModel();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.2.25",
+  "version": "0.2.27",
   "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",