@hasna/economy 0.2.24 → 0.2.26

package/README.md

@@ -106,6 +106,12 @@ Full sync also imports active project metadata from `@hasna/projects` when the r
 
 Account attribution is automatic when `@hasna/accounts` has a matching active, applied, or env-dir profile for the agent. You can also force attribution for a process with `ECONOMY_ACCOUNT=tool:name` or agent-specific overrides such as `ECONOMY_CODEX_ACCOUNT=codex:work`.
 
+Session drilldown can be scoped to an account key, account name, or email:
+
+```bash
+economy sessions --account work@example.com
+```
+
 Account breakdowns report `api_equivalent_usd` for the API list-price value of the usage, plus `billable_usd`/`metered_api_usd` for known direct API spend and `subscription_included_usd` for usage covered by a subscription.
 
 Subscription plans can be configured locally and are used by savings calculations:
@@ -180,7 +186,7 @@ Common endpoints:
 
 - `GET /health`
 - `GET /api/summary?period=today`
-- `GET /api/sessions?agent=codex&limit=20`
+- `GET /api/sessions?agent=codex&account=work@example.com&limit=20`
 - `GET /api/sessions/:id/requests`
 - `GET /api/models`
 - `GET /api/projects?period=month`
@@ -206,11 +212,11 @@ Common endpoints:
 
 Budget, goal, and subscription mutation endpoints validate agent scopes against `claude`, `takumi`, `codex`, `gemini`, `opencode`, `cursor`, `pi`, and `hermes`.
 
-The server also serves the built dashboard when `dashboard/dist` is present.
+The server also serves the built dashboard when `dashboard/dist` is present. The dashboard includes account-scoped session filtering, subscription plan create/update/delete controls in Savings, and savings/usage/account tables for subscription-aware cost analysis.
 
 ## Native macOS Menubar
 
-The `menubar/` app is a native SwiftUI `MenuBarExtra` app, not Electron. It targets Swift 5.9+ and macOS 14+, and talks to the REST API exposed by `economy-serve`. It shows today/week/month spend, token and request counts, top agents, top accounts, top projects, subscription savings, usage snapshots, recent sessions, and fleet status. The default server URL is `http://127.0.0.1:3456`.
+The `menubar/` app is a native SwiftUI `MenuBarExtra` app, not Electron. It targets Swift 5.9+ and macOS 14+, and talks to the REST API exposed by `economy-serve`. It shows today/week/month spend, token and request counts, top agents, top accounts, top projects, active subscription plans, subscription savings, multi-agent usage snapshots, recent sessions, and fleet status. The default server URL is `http://127.0.0.1:3456`.
 
 Build it on macOS:
 

package/dist/cli/index.js

@@ -2642,6 +2642,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 || !existsSync5(rolloutPath))
     return [];
@@ -2731,7 +2750,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();
@@ -6790,7 +6811,7 @@ program.command("month").description("Cost summary for this month").action(async
   await autoSync();
   printSummary("This Month", "month");
 });
-program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|takumi|codex|gemini)").option("--project <path>", "Filter by project path").option("--machine <id>", "Filter by machine hostname (e.g. spark01, apple01)").option("--limit <n>", "Number of sessions", "20").option("--format <fmt>", "Output format: table|compact|csv|json", "table").option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").option("--search <query>", "Search by project name, session id prefix, or agent").action(async (opts) => {
+program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|takumi|codex|gemini)").option("--project <path>", "Filter by project path").option("--account <query>", "Filter by account key, name, or email").option("--machine <id>", "Filter by machine hostname (e.g. spark01, apple01)").option("--limit <n>", "Number of sessions", "20").option("--format <fmt>", "Output format: table|compact|csv|json", "table").option("--since <date>", "Filter sessions since date or relative (e.g. 2026-03-01, 7d, 30d)").option("--search <query>", "Search by project name, session id prefix, or agent").action(async (opts) => {
   const limit = parsePositiveCliInteger(opts.limit ?? "20", "--limit");
   const agent = parseOptionalCliAgent(opts.agent);
   await autoSync();
@@ -6799,6 +6820,7 @@ program.command("sessions").description("List coding sessions with costs").optio
   let sessions = querySessions(db, {
     agent,
     project: opts.project,
+    account: opts.account,
     machine: opts.machine,
     limit,
     since: sinceDate,

package/dist/index.js

@@ -2087,6 +2087,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 || !existsSync4(rolloutPath))
     return [];
@@ -2176,7 +2195,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/ingest/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/ingest/codex.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AA6C7D,iBAAS,cAAc,IAAI,MAAM,CAUhC;AAoFD,wBAAsB,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,UAAQ,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CA4FhH;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/ingest/codex.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AA6C7D,iBAAS,cAAc,IAAI,MAAM,CAUhC;AAwGD,wBAAsB,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,UAAQ,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CA8FhH;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/dist/mcp/index.js

@@ -2122,6 +2122,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 +2230,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();
@@ -3450,7 +3471,7 @@ var TOOL_NAMES = [
 ];
 var TOOL_DESCRIPTIONS = {
   get_cost_summary: "period(today|week|month|year|all), machine?(hostname) -> {total_usd, sessions, requests, tokens, summary}",
-  get_sessions: `agent(${AGENTS.join("|")}), project(partial), machine?(hostname), limit(20) -> compact session table`,
+  get_sessions: `agent(${AGENTS.join("|")}), project(partial), account?(key/name/email), machine?(hostname), limit(20) -> compact session table`,
   get_top_sessions: `n(10), agent(${AGENTS.join("|")}) -> top sessions by cost`,
   list_machines: "no params -> machine_id, sessions, requests, cost, last_active",
   get_model_breakdown: "no params -> model, requests, tokens, cost",
@@ -3524,15 +3545,17 @@ server.tool("get_cost_summary", "Cost summary (total_usd, sessions, requests, to
   ].join(`
 `));
 });
-server.tool("get_sessions", "List sessions. Returns compact table. Params: agent, project, machine, limit(20)", {
+server.tool("get_sessions", "List sessions. Returns compact table. Params: agent, project, account, machine, limit(20)", {
   agent: z.enum(AGENTS).optional(),
   project: z.string().optional(),
+  account: z.string().optional(),
   machine: z.string().optional(),
   limit: z.number().int().positive().max(100).optional()
-}, async ({ agent, project, machine, limit }) => {
+}, async ({ agent, project, account, machine, limit }) => {
   const sessions = querySessions(db, {
     agent,
     project,
+    account,
     machine,
     limit: limit ?? 20
   });

package/dist/server/index.js

@@ -2549,6 +2549,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 +2657,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.24",
+  "version": "0.2.26",
   "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",