@hasna/economy 0.2.36 → 0.2.38

package/README.md

@@ -102,7 +102,7 @@ economy sync --recalculate
 economy sync --backfill-machine
 ```
 
-Full sync also imports active project metadata from `@hasna/projects` when the registry is available.
+Full sync also imports active project metadata from `@hasna/projects` when the registry is available. The Codex source reads both legacy `~/.codex/state_5.sqlite` and current Codewith `~/.codewith/state_5.sqlite` usage stores by default; explicit `HASNA_ECONOMY_CODEX_DB_PATH` and `HASNA_ECONOMY_CODEWITH_DB_PATH` values override those locations.
 
 Account attribution is automatic when `@hasna/accounts` has a matching active, applied, or env-dir profile for the agent. Account identity is the email address plus coding agent, so `work@example.com` under Codex and Claude is reported as two accounts. You can also force attribution for a process with `ECONOMY_ACCOUNT=tool:name` or agent-specific overrides such as `ECONOMY_CODEX_ACCOUNT=codex:work`.
 

package/dist/cli/index.js

@@ -565,17 +565,40 @@ __export(exports_database, {
   clearBillingRange: () => clearBillingRange
 });
 import { SqliteAdapter as Database } from "@hasna/cloud";
+import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
-import { hostname } from "os";
+import { hostname, platform } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function normalizeMachineId(value) {
+  const id = value?.trim().toLowerCase().split(".")[0];
+  return id && id.length > 0 ? id : null;
+}
+function macHostMachineId() {
+  if (platform() !== "darwin")
+    return null;
+  for (const key of ["LocalHostName", "ComputerName", "HostName"]) {
+    try {
+      const value = execFileSync("/usr/sbin/scutil", ["--get", key], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 1000
+      });
+      const id = normalizeMachineId(value);
+      if (id && id !== "mac" && id !== "localhost")
+        return id;
+    } catch {}
+  }
+  return null;
+}
 function getMachineId() {
-  if (process.env["ECONOMY_MACHINE_ID"])
-    return process.env["ECONOMY_MACHINE_ID"];
-  const h = hostname().toLowerCase();
-  if (h.startsWith("spark") || h.startsWith("apple"))
-    return h.split(".")[0];
-  return h.split(".")[0];
+  const envMachine = normalizeMachineId(process.env["ECONOMY_MACHINE_ID"]);
+  if (envMachine)
+    return envMachine;
+  const hostMachine = normalizeMachineId(hostname()) ?? "unknown";
+  if (hostMachine === "mac" || hostMachine === "localhost")
+    return macHostMachineId() ?? hostMachine;
+  return hostMachine;
 }
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
@@ -2766,8 +2789,40 @@ function codexDbPath() {
 function codexConfigPath() {
   return process.env["HASNA_ECONOMY_CODEX_CONFIG_PATH"] ?? DEFAULT_CODEX_CONFIG_PATH;
 }
-function readCodexModel() {
-  const configPath = codexConfigPath();
+function codewithDbPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"] ?? DEFAULT_CODEWITH_DB_PATH;
+}
+function codewithConfigPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_CONFIG_PATH"] ?? DEFAULT_CODEWITH_CONFIG_PATH;
+}
+function codexSources() {
+  const explicitCodexPath = process.env["HASNA_ECONOMY_CODEX_DB_PATH"];
+  const explicitCodewithPath = process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"];
+  const sources = [{
+    label: "Codex",
+    dbPath: codexDbPath(),
+    configPath: codexConfigPath(),
+    sessionPrefix: "codex",
+    stateSource: "codex"
+  }];
+  if (!explicitCodexPath || explicitCodewithPath) {
+    sources.push({
+      label: "Codewith",
+      dbPath: codewithDbPath(),
+      configPath: codewithConfigPath(),
+      sessionPrefix: "codex-codewith",
+      stateSource: "codex-codewith"
+    });
+  }
+  const seen = new Set;
+  return sources.filter((source) => {
+    if (seen.has(source.dbPath))
+      return false;
+    seen.add(source.dbPath);
+    return true;
+  });
+}
+function readCodexModel(configPath = codexConfigPath()) {
   if (!existsSync5(configPath))
     return "gpt-5-codex";
   try {
@@ -2885,94 +2940,97 @@ function fallbackEvents(totalTokens) {
   }];
 }
 async function ingestCodex(db, verbose = false) {
-  const dbPath = codexDbPath();
-  if (!existsSync5(dbPath)) {
-    if (verbose)
-      console.log("Codex DB not found:", dbPath);
-    return { sessions: 0, requests: 0 };
-  }
   const machineId = getMachineId();
-  let codexDb = null;
   let ingested = 0;
   let requests = 0;
   const account = await resolveAccountForAgent("codex");
-  try {
-    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();
-      const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
-      const processed = getIngestState(db, "codex", thread.id);
-      if (processed === stateValue)
+  for (const source of codexSources()) {
+    if (!existsSync5(source.dbPath)) {
+      if (verbose)
+        console.log(`${source.label} DB not found:`, source.dbPath);
+      continue;
+    }
+    let codexDb = null;
+    try {
+      codexDb = openCodexDb(source.dbPath, verbose);
+      if (!codexDb)
         continue;
-      const projectPath = thread.cwd ?? "";
-      const projectName = projectPath ? basename2(projectPath) : "unknown";
-      const sessionId = `codex-${thread.id}`;
-      const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
-      const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
-      upsertSession(db, withAccount({
-        id: sessionId,
-        agent: "codex",
-        project_path: projectPath,
-        project_name: projectName,
-        started_at: startedAt,
-        ended_at: endedAt,
-        total_cost_usd: 0,
-        total_tokens: 0,
-        request_count: 0,
-        machine_id: machineId
-      }, account));
-      const events = readTokenEvents(thread.rollout_path);
-      const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
-      const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
-      db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
-      tokenEvents.forEach((event, index) => {
-        const usage = event.usage;
-        const inputTotal = usage.input_tokens ?? 0;
-        const cacheReadTokens = usage.cached_input_tokens ?? 0;
-        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
-        const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
-        const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
-        const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
-        const requestId = `${sessionId}-${index}`;
-        upsertRequest(db, withAccount({
-          id: requestId,
+      const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
+      for (const thread of threads) {
+        const model = thread.model ?? readCodexModel(source.configPath);
+        const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
+        const processed = getIngestState(db, source.stateSource, thread.id);
+        if (processed === stateValue)
+          continue;
+        const projectPath = thread.cwd ?? "";
+        const projectName = projectPath ? basename2(projectPath) : "unknown";
+        const sessionId = `${source.sessionPrefix}-${thread.id}`;
+        const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
+        const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
+        upsertSession(db, withAccount({
+          id: sessionId,
           agent: "codex",
-          session_id: sessionId,
-          model,
-          input_tokens: inputTokens,
-          output_tokens: outputTokens,
-          cache_read_tokens: cacheReadTokens,
-          cache_create_tokens: 0,
-          cost_usd: costUsd,
-          cost_basis: defaultCostBasisForAgent("codex"),
-          duration_ms: 0,
-          timestamp,
-          source_request_id: requestId,
+          project_path: projectPath,
+          project_name: projectName,
+          started_at: startedAt,
+          ended_at: endedAt,
+          total_cost_usd: 0,
+          total_tokens: 0,
+          request_count: 0,
           machine_id: machineId
         }, account));
-        requests++;
-      });
-      rollupSession(db, sessionId);
-      setIngestState(db, "codex", thread.id, stateValue);
-      ingested++;
-      if (verbose)
-        console.log(`Codex session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+        const events = readTokenEvents(thread.rollout_path);
+        const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+        const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
+        db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
+        tokenEvents.forEach((event, index) => {
+          const usage = event.usage;
+          const inputTotal = usage.input_tokens ?? 0;
+          const cacheReadTokens = usage.cached_input_tokens ?? 0;
+          const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+          const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
+          const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
+          const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
+          const requestId = `${sessionId}-${index}`;
+          upsertRequest(db, withAccount({
+            id: requestId,
+            agent: "codex",
+            session_id: sessionId,
+            model,
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            cache_read_tokens: cacheReadTokens,
+            cache_create_tokens: 0,
+            cost_usd: costUsd,
+            cost_basis: defaultCostBasisForAgent("codex"),
+            duration_ms: 0,
+            timestamp,
+            source_request_id: requestId,
+            machine_id: machineId
+          }, account));
+          requests++;
+        });
+        rollupSession(db, sessionId);
+        setIngestState(db, source.stateSource, thread.id, stateValue);
+        ingested++;
+        if (verbose)
+          console.log(`${source.label} session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+      }
+    } finally {
+      codexDb?.close();
     }
-  } finally {
-    codexDb?.close();
   }
   return { sessions: ingested, requests };
 }
-var DEFAULT_CODEX_DB_PATH, DEFAULT_CODEX_CONFIG_PATH, CODEX_INGEST_VERSION = "rollout-aggregate-v3";
+var DEFAULT_CODEX_DB_PATH, DEFAULT_CODEX_CONFIG_PATH, DEFAULT_CODEWITH_DB_PATH, DEFAULT_CODEWITH_CONFIG_PATH, CODEX_INGEST_VERSION = "rollout-aggregate-v3";
 var init_codex = __esm(() => {
   init_database();
   init_pricing();
   init_accounts();
   DEFAULT_CODEX_DB_PATH = join7(homedir4(), ".codex", "state_5.sqlite");
   DEFAULT_CODEX_CONFIG_PATH = join7(homedir4(), ".codex", "config.toml");
+  DEFAULT_CODEWITH_DB_PATH = join7(homedir4(), ".codewith", "state_5.sqlite");
+  DEFAULT_CODEWITH_CONFIG_PATH = join7(homedir4(), ".codewith", "config.toml");
 });
 
 // src/ingest/gemini.ts
@@ -4390,14 +4448,14 @@ var init_watch_paths = __esm(() => {
 });
 
 // src/cli/commands/notification.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 function appleScriptString(value) {
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
 }
 function notificationScript(title, body) {
   return `display notification ${appleScriptString(body)} with title ${appleScriptString(title)}`;
 }
-function sendNotification(title, body, execFile = execFileSync) {
+function sendNotification(title, body, execFile = execFileSync2) {
   try {
     execFile("osascript", ["-e", notificationScript(title, body)], { stdio: "ignore" });
   } catch {}
@@ -5038,7 +5096,7 @@ __export(exports_menubar, {
   menubarInstall: () => menubarInstall
 });
 import chalk6 from "chalk";
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 import { cpSync, existsSync as existsSync16, mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir, arch } from "os";
 import { join as join13 } from "path";
@@ -5050,7 +5108,7 @@ function isInstalled() {
 }
 function isRunning() {
   try {
-    const result = execFileSync2("pgrep", ["-x", "EconomyBar"], { stdio: "pipe" }).toString().trim();
+    const result = execFileSync3("pgrep", ["-x", "EconomyBar"], { stdio: "pipe" }).toString().trim();
     return result.length > 0;
   } catch {
     return false;
@@ -5101,12 +5159,12 @@ async function menubarInstall(opts) {
   try {
     rmSync(extractDir, { recursive: true, force: true });
     mkdirSync4(extractDir, { recursive: true });
-    execFileSync2("unzip", ["-q", zipPath, "-d", extractDir], { stdio: "ignore" });
+    execFileSync3("unzip", ["-q", zipPath, "-d", extractDir], { stdio: "ignore" });
     if (isInstalled())
       rmSync(APP_PATH, { recursive: true, force: true });
     cpSync(join13(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
     try {
-      execFileSync2("xattr", ["-rd", "com.apple.quarantine", APP_PATH], { stdio: "ignore" });
+      execFileSync3("xattr", ["-rd", "com.apple.quarantine", APP_PATH], { stdio: "ignore" });
     } catch {}
     rmSync(zipPath, { force: true });
     rmSync(extractDir, { recursive: true, force: true });
@@ -5117,7 +5175,7 @@ async function menubarInstall(opts) {
   }
   console.log(chalk6.cyan("\u2192 Launching Economy Bar..."));
   try {
-    execFileSync2("open", [APP_PATH], { stdio: "ignore" });
+    execFileSync3("open", [APP_PATH], { stdio: "ignore" });
     console.log(chalk6.bold.green(`
 \u2713 Economy Bar is running in your menu bar!`));
     console.log(chalk6.dim("  Make sure economy serve is running: economy serve"));
@@ -5132,8 +5190,8 @@ function menubarUninstall() {
   }
   if (isRunning()) {
     try {
-      execFileSync2("osascript", ["-e", 'quit app "Economy Bar"'], { stdio: "ignore" });
-      execFileSync2("sleep", ["1"], { stdio: "ignore" });
+      execFileSync3("osascript", ["-e", 'quit app "Economy Bar"'], { stdio: "ignore" });
+      execFileSync3("sleep", ["1"], { stdio: "ignore" });
     } catch {}
   }
   rmSync(APP_PATH, { recursive: true, force: true });
@@ -5144,7 +5202,7 @@ function menubarStart() {
     console.error(chalk6.red("Economy Bar is not installed. Run: economy menubar install"));
     process.exit(1);
   }
-  execFileSync2("open", [APP_PATH], { stdio: "ignore" });
+  execFileSync3("open", [APP_PATH], { stdio: "ignore" });
   console.log(chalk6.green("\u2713 Economy Bar launched"));
 }
 function menubarStop() {
@@ -5153,7 +5211,7 @@ function menubarStop() {
     return;
   }
   try {
-    execFileSync2("osascript", ["-e", 'quit app "Economy Bar"'], { stdio: "ignore" });
+    execFileSync3("osascript", ["-e", 'quit app "Economy Bar"'], { stdio: "ignore" });
     console.log(chalk6.green("\u2713 Economy Bar stopped"));
   } catch {
     console.log(chalk6.yellow("Could not quit Economy Bar gracefully"));

package/dist/db/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/db/database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/db/database.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -514,17 +514,40 @@ var init_pricing = __esm(() => {
 
 // src/db/database.ts
 import { SqliteAdapter as Database } from "@hasna/cloud";
+import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
-import { hostname } from "os";
+import { hostname, platform } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function normalizeMachineId(value) {
+  const id = value?.trim().toLowerCase().split(".")[0];
+  return id && id.length > 0 ? id : null;
+}
+function macHostMachineId() {
+  if (platform() !== "darwin")
+    return null;
+  for (const key of ["LocalHostName", "ComputerName", "HostName"]) {
+    try {
+      const value = execFileSync("/usr/sbin/scutil", ["--get", key], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 1000
+      });
+      const id = normalizeMachineId(value);
+      if (id && id !== "mac" && id !== "localhost")
+        return id;
+    } catch {}
+  }
+  return null;
+}
 function getMachineId() {
-  if (process.env["ECONOMY_MACHINE_ID"])
-    return process.env["ECONOMY_MACHINE_ID"];
-  const h = hostname().toLowerCase();
-  if (h.startsWith("spark") || h.startsWith("apple"))
-    return h.split(".")[0];
-  return h.split(".")[0];
+  const envMachine = normalizeMachineId(process.env["ECONOMY_MACHINE_ID"]);
+  if (envMachine)
+    return envMachine;
+  const hostMachine = normalizeMachineId(hostname()) ?? "unknown";
+  if (hostMachine === "mac" || hostMachine === "localhost")
+    return macHostMachineId() ?? hostMachine;
+  return hostMachine;
 }
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
@@ -2496,6 +2519,8 @@ import { join as join4, basename as basename2 } from "path";
 import { Database as BunDatabase2 } from "bun:sqlite";
 var DEFAULT_CODEX_DB_PATH = join4(homedir3(), ".codex", "state_5.sqlite");
 var DEFAULT_CODEX_CONFIG_PATH = join4(homedir3(), ".codex", "config.toml");
+var DEFAULT_CODEWITH_DB_PATH = join4(homedir3(), ".codewith", "state_5.sqlite");
+var DEFAULT_CODEWITH_CONFIG_PATH = join4(homedir3(), ".codewith", "config.toml");
 var CODEX_INGEST_VERSION = "rollout-aggregate-v3";
 function codexDbPath() {
   return process.env["HASNA_ECONOMY_CODEX_DB_PATH"] ?? DEFAULT_CODEX_DB_PATH;
@@ -2503,8 +2528,40 @@ function codexDbPath() {
 function codexConfigPath() {
   return process.env["HASNA_ECONOMY_CODEX_CONFIG_PATH"] ?? DEFAULT_CODEX_CONFIG_PATH;
 }
-function readCodexModel() {
-  const configPath = codexConfigPath();
+function codewithDbPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"] ?? DEFAULT_CODEWITH_DB_PATH;
+}
+function codewithConfigPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_CONFIG_PATH"] ?? DEFAULT_CODEWITH_CONFIG_PATH;
+}
+function codexSources() {
+  const explicitCodexPath = process.env["HASNA_ECONOMY_CODEX_DB_PATH"];
+  const explicitCodewithPath = process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"];
+  const sources = [{
+    label: "Codex",
+    dbPath: codexDbPath(),
+    configPath: codexConfigPath(),
+    sessionPrefix: "codex",
+    stateSource: "codex"
+  }];
+  if (!explicitCodexPath || explicitCodewithPath) {
+    sources.push({
+      label: "Codewith",
+      dbPath: codewithDbPath(),
+      configPath: codewithConfigPath(),
+      sessionPrefix: "codex-codewith",
+      stateSource: "codex-codewith"
+    });
+  }
+  const seen = new Set;
+  return sources.filter((source) => {
+    if (seen.has(source.dbPath))
+      return false;
+    seen.add(source.dbPath);
+    return true;
+  });
+}
+function readCodexModel(configPath = codexConfigPath()) {
   if (!existsSync5(configPath))
     return "gpt-5-codex";
   try {
@@ -2622,84 +2679,85 @@ function fallbackEvents(totalTokens) {
   }];
 }
 async function ingestCodex(db, verbose = false) {
-  const dbPath = codexDbPath();
-  if (!existsSync5(dbPath)) {
-    if (verbose)
-      console.log("Codex DB not found:", dbPath);
-    return { sessions: 0, requests: 0 };
-  }
   const machineId = getMachineId();
-  let codexDb = null;
   let ingested = 0;
   let requests = 0;
   const account = await resolveAccountForAgent("codex");
-  try {
-    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();
-      const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
-      const processed = getIngestState(db, "codex", thread.id);
-      if (processed === stateValue)
+  for (const source of codexSources()) {
+    if (!existsSync5(source.dbPath)) {
+      if (verbose)
+        console.log(`${source.label} DB not found:`, source.dbPath);
+      continue;
+    }
+    let codexDb = null;
+    try {
+      codexDb = openCodexDb(source.dbPath, verbose);
+      if (!codexDb)
         continue;
-      const projectPath = thread.cwd ?? "";
-      const projectName = projectPath ? basename2(projectPath) : "unknown";
-      const sessionId = `codex-${thread.id}`;
-      const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
-      const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
-      upsertSession(db, withAccount({
-        id: sessionId,
-        agent: "codex",
-        project_path: projectPath,
-        project_name: projectName,
-        started_at: startedAt,
-        ended_at: endedAt,
-        total_cost_usd: 0,
-        total_tokens: 0,
-        request_count: 0,
-        machine_id: machineId
-      }, account));
-      const events = readTokenEvents(thread.rollout_path);
-      const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
-      const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
-      db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
-      tokenEvents.forEach((event, index) => {
-        const usage = event.usage;
-        const inputTotal = usage.input_tokens ?? 0;
-        const cacheReadTokens = usage.cached_input_tokens ?? 0;
-        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
-        const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
-        const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
-        const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
-        const requestId = `${sessionId}-${index}`;
-        upsertRequest(db, withAccount({
-          id: requestId,
+      const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
+      for (const thread of threads) {
+        const model = thread.model ?? readCodexModel(source.configPath);
+        const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
+        const processed = getIngestState(db, source.stateSource, thread.id);
+        if (processed === stateValue)
+          continue;
+        const projectPath = thread.cwd ?? "";
+        const projectName = projectPath ? basename2(projectPath) : "unknown";
+        const sessionId = `${source.sessionPrefix}-${thread.id}`;
+        const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
+        const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
+        upsertSession(db, withAccount({
+          id: sessionId,
           agent: "codex",
-          session_id: sessionId,
-          model,
-          input_tokens: inputTokens,
-          output_tokens: outputTokens,
-          cache_read_tokens: cacheReadTokens,
-          cache_create_tokens: 0,
-          cost_usd: costUsd,
-          cost_basis: defaultCostBasisForAgent("codex"),
-          duration_ms: 0,
-          timestamp,
-          source_request_id: requestId,
+          project_path: projectPath,
+          project_name: projectName,
+          started_at: startedAt,
+          ended_at: endedAt,
+          total_cost_usd: 0,
+          total_tokens: 0,
+          request_count: 0,
           machine_id: machineId
         }, account));
-        requests++;
-      });
-      rollupSession(db, sessionId);
-      setIngestState(db, "codex", thread.id, stateValue);
-      ingested++;
-      if (verbose)
-        console.log(`Codex session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+        const events = readTokenEvents(thread.rollout_path);
+        const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+        const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
+        db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
+        tokenEvents.forEach((event, index) => {
+          const usage = event.usage;
+          const inputTotal = usage.input_tokens ?? 0;
+          const cacheReadTokens = usage.cached_input_tokens ?? 0;
+          const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+          const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
+          const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
+          const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
+          const requestId = `${sessionId}-${index}`;
+          upsertRequest(db, withAccount({
+            id: requestId,
+            agent: "codex",
+            session_id: sessionId,
+            model,
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            cache_read_tokens: cacheReadTokens,
+            cache_create_tokens: 0,
+            cost_usd: costUsd,
+            cost_basis: defaultCostBasisForAgent("codex"),
+            duration_ms: 0,
+            timestamp,
+            source_request_id: requestId,
+            machine_id: machineId
+          }, account));
+          requests++;
+        });
+        rollupSession(db, sessionId);
+        setIngestState(db, source.stateSource, thread.id, stateValue);
+        ingested++;
+        if (verbose)
+          console.log(`${source.label} session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+      }
+    } finally {
+      codexDb?.close();
     }
-  } finally {
-    codexDb?.close();
   }
   return { sessions: ingested, requests };
 }

package/dist/ingest/codex.d.ts

@@ -1,5 +1,5 @@
 import type { SqliteAdapter as Database } from '@hasna/cloud';
-declare function readCodexModel(): string;
+declare function readCodexModel(configPath?: string): string;
 export declare function ingestCodex(db: Database, verbose?: boolean): Promise<{
     sessions: number;
     requests: number;

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;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"}
+{"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;AA4F7D,iBAAS,cAAc,CAAC,UAAU,SAAoB,GAAG,MAAM,CAS9D;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,CA+FhH;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/dist/mcp/index.js

@@ -515,17 +515,40 @@ var init_pricing = __esm(() => {
 
 // src/db/database.ts
 import { SqliteAdapter as Database } from "@hasna/cloud";
+import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
-import { hostname } from "os";
+import { hostname, platform } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function normalizeMachineId(value) {
+  const id = value?.trim().toLowerCase().split(".")[0];
+  return id && id.length > 0 ? id : null;
+}
+function macHostMachineId() {
+  if (platform() !== "darwin")
+    return null;
+  for (const key of ["LocalHostName", "ComputerName", "HostName"]) {
+    try {
+      const value = execFileSync("/usr/sbin/scutil", ["--get", key], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 1000
+      });
+      const id = normalizeMachineId(value);
+      if (id && id !== "mac" && id !== "localhost")
+        return id;
+    } catch {}
+  }
+  return null;
+}
 function getMachineId() {
-  if (process.env["ECONOMY_MACHINE_ID"])
-    return process.env["ECONOMY_MACHINE_ID"];
-  const h = hostname().toLowerCase();
-  if (h.startsWith("spark") || h.startsWith("apple"))
-    return h.split(".")[0];
-  return h.split(".")[0];
+  const envMachine = normalizeMachineId(process.env["ECONOMY_MACHINE_ID"]);
+  if (envMachine)
+    return envMachine;
+  const hostMachine = normalizeMachineId(hostname()) ?? "unknown";
+  if (hostMachine === "mac" || hostMachine === "localhost")
+    return macHostMachineId() ?? hostMachine;
+  return hostMachine;
 }
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
@@ -2240,6 +2263,8 @@ import { join as join3, basename as basename2 } from "path";
 import { Database as BunDatabase } from "bun:sqlite";
 var DEFAULT_CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
 var DEFAULT_CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
+var DEFAULT_CODEWITH_DB_PATH = join3(homedir3(), ".codewith", "state_5.sqlite");
+var DEFAULT_CODEWITH_CONFIG_PATH = join3(homedir3(), ".codewith", "config.toml");
 var CODEX_INGEST_VERSION = "rollout-aggregate-v3";
 function codexDbPath() {
   return process.env["HASNA_ECONOMY_CODEX_DB_PATH"] ?? DEFAULT_CODEX_DB_PATH;
@@ -2247,8 +2272,40 @@ function codexDbPath() {
 function codexConfigPath() {
   return process.env["HASNA_ECONOMY_CODEX_CONFIG_PATH"] ?? DEFAULT_CODEX_CONFIG_PATH;
 }
-function readCodexModel() {
-  const configPath = codexConfigPath();
+function codewithDbPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"] ?? DEFAULT_CODEWITH_DB_PATH;
+}
+function codewithConfigPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_CONFIG_PATH"] ?? DEFAULT_CODEWITH_CONFIG_PATH;
+}
+function codexSources() {
+  const explicitCodexPath = process.env["HASNA_ECONOMY_CODEX_DB_PATH"];
+  const explicitCodewithPath = process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"];
+  const sources = [{
+    label: "Codex",
+    dbPath: codexDbPath(),
+    configPath: codexConfigPath(),
+    sessionPrefix: "codex",
+    stateSource: "codex"
+  }];
+  if (!explicitCodexPath || explicitCodewithPath) {
+    sources.push({
+      label: "Codewith",
+      dbPath: codewithDbPath(),
+      configPath: codewithConfigPath(),
+      sessionPrefix: "codex-codewith",
+      stateSource: "codex-codewith"
+    });
+  }
+  const seen = new Set;
+  return sources.filter((source) => {
+    if (seen.has(source.dbPath))
+      return false;
+    seen.add(source.dbPath);
+    return true;
+  });
+}
+function readCodexModel(configPath = codexConfigPath()) {
   if (!existsSync3(configPath))
     return "gpt-5-codex";
   try {
@@ -2366,84 +2423,85 @@ function fallbackEvents(totalTokens) {
   }];
 }
 async function ingestCodex(db, verbose = false) {
-  const dbPath = codexDbPath();
-  if (!existsSync3(dbPath)) {
-    if (verbose)
-      console.log("Codex DB not found:", dbPath);
-    return { sessions: 0, requests: 0 };
-  }
   const machineId = getMachineId();
-  let codexDb = null;
   let ingested = 0;
   let requests = 0;
   const account = await resolveAccountForAgent("codex");
-  try {
-    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();
-      const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
-      const processed = getIngestState(db, "codex", thread.id);
-      if (processed === stateValue)
+  for (const source of codexSources()) {
+    if (!existsSync3(source.dbPath)) {
+      if (verbose)
+        console.log(`${source.label} DB not found:`, source.dbPath);
+      continue;
+    }
+    let codexDb = null;
+    try {
+      codexDb = openCodexDb(source.dbPath, verbose);
+      if (!codexDb)
         continue;
-      const projectPath = thread.cwd ?? "";
-      const projectName = projectPath ? basename2(projectPath) : "unknown";
-      const sessionId = `codex-${thread.id}`;
-      const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
-      const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
-      upsertSession(db, withAccount({
-        id: sessionId,
-        agent: "codex",
-        project_path: projectPath,
-        project_name: projectName,
-        started_at: startedAt,
-        ended_at: endedAt,
-        total_cost_usd: 0,
-        total_tokens: 0,
-        request_count: 0,
-        machine_id: machineId
-      }, account));
-      const events = readTokenEvents(thread.rollout_path);
-      const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
-      const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
-      db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
-      tokenEvents.forEach((event, index) => {
-        const usage = event.usage;
-        const inputTotal = usage.input_tokens ?? 0;
-        const cacheReadTokens = usage.cached_input_tokens ?? 0;
-        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
-        const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
-        const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
-        const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
-        const requestId = `${sessionId}-${index}`;
-        upsertRequest(db, withAccount({
-          id: requestId,
+      const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
+      for (const thread of threads) {
+        const model = thread.model ?? readCodexModel(source.configPath);
+        const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
+        const processed = getIngestState(db, source.stateSource, thread.id);
+        if (processed === stateValue)
+          continue;
+        const projectPath = thread.cwd ?? "";
+        const projectName = projectPath ? basename2(projectPath) : "unknown";
+        const sessionId = `${source.sessionPrefix}-${thread.id}`;
+        const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
+        const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
+        upsertSession(db, withAccount({
+          id: sessionId,
           agent: "codex",
-          session_id: sessionId,
-          model,
-          input_tokens: inputTokens,
-          output_tokens: outputTokens,
-          cache_read_tokens: cacheReadTokens,
-          cache_create_tokens: 0,
-          cost_usd: costUsd,
-          cost_basis: defaultCostBasisForAgent("codex"),
-          duration_ms: 0,
-          timestamp,
-          source_request_id: requestId,
+          project_path: projectPath,
+          project_name: projectName,
+          started_at: startedAt,
+          ended_at: endedAt,
+          total_cost_usd: 0,
+          total_tokens: 0,
+          request_count: 0,
           machine_id: machineId
         }, account));
-        requests++;
-      });
-      rollupSession(db, sessionId);
-      setIngestState(db, "codex", thread.id, stateValue);
-      ingested++;
-      if (verbose)
-        console.log(`Codex session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+        const events = readTokenEvents(thread.rollout_path);
+        const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+        const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
+        db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
+        tokenEvents.forEach((event, index) => {
+          const usage = event.usage;
+          const inputTotal = usage.input_tokens ?? 0;
+          const cacheReadTokens = usage.cached_input_tokens ?? 0;
+          const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+          const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
+          const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
+          const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
+          const requestId = `${sessionId}-${index}`;
+          upsertRequest(db, withAccount({
+            id: requestId,
+            agent: "codex",
+            session_id: sessionId,
+            model,
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            cache_read_tokens: cacheReadTokens,
+            cache_create_tokens: 0,
+            cost_usd: costUsd,
+            cost_basis: defaultCostBasisForAgent("codex"),
+            duration_ms: 0,
+            timestamp,
+            source_request_id: requestId,
+            machine_id: machineId
+          }, account));
+          requests++;
+        });
+        rollupSession(db, sessionId);
+        setIngestState(db, source.stateSource, thread.id, stateValue);
+        ingested++;
+        if (verbose)
+          console.log(`${source.label} session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+      }
+    } finally {
+      codexDb?.close();
     }
-  } finally {
-    codexDb?.close();
   }
   return { sessions: ingested, requests };
 }

package/dist/otel/index.js

@@ -515,17 +515,40 @@ var init_pricing = __esm(() => {
 
 // src/db/database.ts
 import { SqliteAdapter as Database } from "@hasna/cloud";
+import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
-import { hostname } from "os";
+import { hostname, platform } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function normalizeMachineId(value) {
+  const id = value?.trim().toLowerCase().split(".")[0];
+  return id && id.length > 0 ? id : null;
+}
+function macHostMachineId() {
+  if (platform() !== "darwin")
+    return null;
+  for (const key of ["LocalHostName", "ComputerName", "HostName"]) {
+    try {
+      const value = execFileSync("/usr/sbin/scutil", ["--get", key], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 1000
+      });
+      const id = normalizeMachineId(value);
+      if (id && id !== "mac" && id !== "localhost")
+        return id;
+    } catch {}
+  }
+  return null;
+}
 function getMachineId() {
-  if (process.env["ECONOMY_MACHINE_ID"])
-    return process.env["ECONOMY_MACHINE_ID"];
-  const h = hostname().toLowerCase();
-  if (h.startsWith("spark") || h.startsWith("apple"))
-    return h.split(".")[0];
-  return h.split(".")[0];
+  const envMachine = normalizeMachineId(process.env["ECONOMY_MACHINE_ID"]);
+  if (envMachine)
+    return envMachine;
+  const hostMachine = normalizeMachineId(hostname()) ?? "unknown";
+  if (hostMachine === "mac" || hostMachine === "localhost")
+    return macHostMachineId() ?? hostMachine;
+  return hostMachine;
 }
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();

package/dist/server/index.js

@@ -515,17 +515,40 @@ var init_pricing = __esm(() => {
 
 // src/db/database.ts
 import { SqliteAdapter as Database } from "@hasna/cloud";
+import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
-import { hostname } from "os";
+import { hostname, platform } from "os";
 import { homedir } from "os";
 import { join } from "path";
+function normalizeMachineId(value) {
+  const id = value?.trim().toLowerCase().split(".")[0];
+  return id && id.length > 0 ? id : null;
+}
+function macHostMachineId() {
+  if (platform() !== "darwin")
+    return null;
+  for (const key of ["LocalHostName", "ComputerName", "HostName"]) {
+    try {
+      const value = execFileSync("/usr/sbin/scutil", ["--get", key], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 1000
+      });
+      const id = normalizeMachineId(value);
+      if (id && id !== "mac" && id !== "localhost")
+        return id;
+    } catch {}
+  }
+  return null;
+}
 function getMachineId() {
-  if (process.env["ECONOMY_MACHINE_ID"])
-    return process.env["ECONOMY_MACHINE_ID"];
-  const h = hostname().toLowerCase();
-  if (h.startsWith("spark") || h.startsWith("apple"))
-    return h.split(".")[0];
-  return h.split(".")[0];
+  const envMachine = normalizeMachineId(process.env["ECONOMY_MACHINE_ID"]);
+  if (envMachine)
+    return envMachine;
+  const hostMachine = normalizeMachineId(hostname()) ?? "unknown";
+  if (hostMachine === "mac" || hostMachine === "localhost")
+    return macHostMachineId() ?? hostMachine;
+  return hostMachine;
 }
 function getDataDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
@@ -2698,6 +2721,8 @@ import { join as join3, basename as basename2 } from "path";
 import { Database as BunDatabase } from "bun:sqlite";
 var DEFAULT_CODEX_DB_PATH = join3(homedir3(), ".codex", "state_5.sqlite");
 var DEFAULT_CODEX_CONFIG_PATH = join3(homedir3(), ".codex", "config.toml");
+var DEFAULT_CODEWITH_DB_PATH = join3(homedir3(), ".codewith", "state_5.sqlite");
+var DEFAULT_CODEWITH_CONFIG_PATH = join3(homedir3(), ".codewith", "config.toml");
 var CODEX_INGEST_VERSION = "rollout-aggregate-v3";
 function codexDbPath() {
   return process.env["HASNA_ECONOMY_CODEX_DB_PATH"] ?? DEFAULT_CODEX_DB_PATH;
@@ -2705,8 +2730,40 @@ function codexDbPath() {
 function codexConfigPath() {
   return process.env["HASNA_ECONOMY_CODEX_CONFIG_PATH"] ?? DEFAULT_CODEX_CONFIG_PATH;
 }
-function readCodexModel() {
-  const configPath = codexConfigPath();
+function codewithDbPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"] ?? DEFAULT_CODEWITH_DB_PATH;
+}
+function codewithConfigPath() {
+  return process.env["HASNA_ECONOMY_CODEWITH_CONFIG_PATH"] ?? DEFAULT_CODEWITH_CONFIG_PATH;
+}
+function codexSources() {
+  const explicitCodexPath = process.env["HASNA_ECONOMY_CODEX_DB_PATH"];
+  const explicitCodewithPath = process.env["HASNA_ECONOMY_CODEWITH_DB_PATH"];
+  const sources = [{
+    label: "Codex",
+    dbPath: codexDbPath(),
+    configPath: codexConfigPath(),
+    sessionPrefix: "codex",
+    stateSource: "codex"
+  }];
+  if (!explicitCodexPath || explicitCodewithPath) {
+    sources.push({
+      label: "Codewith",
+      dbPath: codewithDbPath(),
+      configPath: codewithConfigPath(),
+      sessionPrefix: "codex-codewith",
+      stateSource: "codex-codewith"
+    });
+  }
+  const seen = new Set;
+  return sources.filter((source) => {
+    if (seen.has(source.dbPath))
+      return false;
+    seen.add(source.dbPath);
+    return true;
+  });
+}
+function readCodexModel(configPath = codexConfigPath()) {
   if (!existsSync3(configPath))
     return "gpt-5-codex";
   try {
@@ -2824,84 +2881,85 @@ function fallbackEvents(totalTokens) {
   }];
 }
 async function ingestCodex(db, verbose = false) {
-  const dbPath = codexDbPath();
-  if (!existsSync3(dbPath)) {
-    if (verbose)
-      console.log("Codex DB not found:", dbPath);
-    return { sessions: 0, requests: 0 };
-  }
   const machineId = getMachineId();
-  let codexDb = null;
   let ingested = 0;
   let requests = 0;
   const account = await resolveAccountForAgent("codex");
-  try {
-    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();
-      const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
-      const processed = getIngestState(db, "codex", thread.id);
-      if (processed === stateValue)
+  for (const source of codexSources()) {
+    if (!existsSync3(source.dbPath)) {
+      if (verbose)
+        console.log(`${source.label} DB not found:`, source.dbPath);
+      continue;
+    }
+    let codexDb = null;
+    try {
+      codexDb = openCodexDb(source.dbPath, verbose);
+      if (!codexDb)
         continue;
-      const projectPath = thread.cwd ?? "";
-      const projectName = projectPath ? basename2(projectPath) : "unknown";
-      const sessionId = `codex-${thread.id}`;
-      const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
-      const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
-      upsertSession(db, withAccount({
-        id: sessionId,
-        agent: "codex",
-        project_path: projectPath,
-        project_name: projectName,
-        started_at: startedAt,
-        ended_at: endedAt,
-        total_cost_usd: 0,
-        total_tokens: 0,
-        request_count: 0,
-        machine_id: machineId
-      }, account));
-      const events = readTokenEvents(thread.rollout_path);
-      const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
-      const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
-      db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
-      tokenEvents.forEach((event, index) => {
-        const usage = event.usage;
-        const inputTotal = usage.input_tokens ?? 0;
-        const cacheReadTokens = usage.cached_input_tokens ?? 0;
-        const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
-        const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
-        const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
-        const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
-        const requestId = `${sessionId}-${index}`;
-        upsertRequest(db, withAccount({
-          id: requestId,
+      const threads = codexDb.prepare(buildThreadQuery(codexDb)).all();
+      for (const thread of threads) {
+        const model = thread.model ?? readCodexModel(source.configPath);
+        const stateValue = `${CODEX_INGEST_VERSION}:${thread.updated_at}:${thread.tokens_used}:${model}`;
+        const processed = getIngestState(db, source.stateSource, thread.id);
+        if (processed === stateValue)
+          continue;
+        const projectPath = thread.cwd ?? "";
+        const projectName = projectPath ? basename2(projectPath) : "unknown";
+        const sessionId = `${source.sessionPrefix}-${thread.id}`;
+        const startedAt = thread.created_at ? new Date(thread.created_at * 1000).toISOString() : new Date().toISOString();
+        const endedAt = thread.updated_at ? new Date(thread.updated_at * 1000).toISOString() : null;
+        upsertSession(db, withAccount({
+          id: sessionId,
           agent: "codex",
-          session_id: sessionId,
-          model,
-          input_tokens: inputTokens,
-          output_tokens: outputTokens,
-          cache_read_tokens: cacheReadTokens,
-          cache_create_tokens: 0,
-          cost_usd: costUsd,
-          cost_basis: defaultCostBasisForAgent("codex"),
-          duration_ms: 0,
-          timestamp,
-          source_request_id: requestId,
+          project_path: projectPath,
+          project_name: projectName,
+          started_at: startedAt,
+          ended_at: endedAt,
+          total_cost_usd: 0,
+          total_tokens: 0,
+          request_count: 0,
           machine_id: machineId
         }, account));
-        requests++;
-      });
-      rollupSession(db, sessionId);
-      setIngestState(db, "codex", thread.id, stateValue);
-      ingested++;
-      if (verbose)
-        console.log(`Codex session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+        const events = readTokenEvents(thread.rollout_path);
+        const tokenEvents = events.length > 0 ? events : fallbackEvents(thread.tokens_used);
+        const ingestedTokens = tokenEvents.reduce((sum, event) => sum + tokenTotal(event.usage), 0);
+        db.prepare(`DELETE FROM requests WHERE session_id = ?`).run(sessionId);
+        tokenEvents.forEach((event, index) => {
+          const usage = event.usage;
+          const inputTotal = usage.input_tokens ?? 0;
+          const cacheReadTokens = usage.cached_input_tokens ?? 0;
+          const inputTokens = Math.max(inputTotal - cacheReadTokens, 0);
+          const outputTokens = usage.output_tokens ?? Math.max((usage.total_tokens ?? 0) - inputTotal, 0);
+          const costUsd = computeCostFromDb(db, model, inputTokens, outputTokens, cacheReadTokens, 0);
+          const timestamp = event.timestamp ?? (thread.created_at ? new Date(thread.created_at * 1000 + index).toISOString() : new Date().toISOString());
+          const requestId = `${sessionId}-${index}`;
+          upsertRequest(db, withAccount({
+            id: requestId,
+            agent: "codex",
+            session_id: sessionId,
+            model,
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            cache_read_tokens: cacheReadTokens,
+            cache_create_tokens: 0,
+            cost_usd: costUsd,
+            cost_basis: defaultCostBasisForAgent("codex"),
+            duration_ms: 0,
+            timestamp,
+            source_request_id: requestId,
+            machine_id: machineId
+          }, account));
+          requests++;
+        });
+        rollupSession(db, sessionId);
+        setIngestState(db, source.stateSource, thread.id, stateValue);
+        ingested++;
+        if (verbose)
+          console.log(`${source.label} session ${thread.id}: ${ingestedTokens} tokens on ${model}`);
+      }
+    } finally {
+      codexDb?.close();
     }
-  } finally {
-    codexDb?.close();
   }
   return { sessions: ingested, requests };
 }

package/package.json

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