@hasna/economy 0.2.40 → 0.2.42

package/dist/mcp/index.js

@@ -573,6 +573,32 @@ function getDbPath() {
     return process.env["ECONOMY_DB"];
   return join(getDataDir(), "economy.db");
 }
+function isSqliteBusyError(error) {
+  const candidate = error;
+  const code = typeof candidate.code === "string" ? candidate.code : "";
+  const message = typeof candidate.message === "string" ? candidate.message : String(error);
+  return code === "SQLITE_BUSY" || code === "SQLITE_BUSY_RECOVERY" || /database is locked|SQLITE_BUSY/i.test(message);
+}
+function retryDelayMs(attempt) {
+  return Math.min(1000, 50 * 2 ** attempt);
+}
+function withSqliteBusyRetry(operation, context) {
+  const maxAttempts = 8;
+  let lastError;
+  for (let attempt = 0;attempt < maxAttempts; attempt++) {
+    try {
+      return operation();
+    } catch (error) {
+      if (!isSqliteBusyError(error))
+        throw error;
+      lastError = error;
+      if (attempt === maxAttempts - 1)
+        break;
+      Bun.sleepSync(retryDelayMs(attempt));
+    }
+  }
+  throw new Error(`SQLite database is locked after ${maxAttempts} attempts while ${context}. Another economy sync/merge may be recovering the database; retry shortly.`, { cause: lastError });
+}
 function openDatabase(dbPath, skipSeed = false) {
   const path = dbPath ?? getDbPath();
   if (path !== ":memory:") {
@@ -580,11 +606,21 @@ function openDatabase(dbPath, skipSeed = false) {
     if (dir && !existsSync(dir))
       mkdirSync(dir, { recursive: true });
   }
-  const db = new Database(path);
-  db.exec("PRAGMA journal_mode = WAL");
-  db.exec("PRAGMA busy_timeout = 5000");
-  db.exec("PRAGMA foreign_keys = ON");
-  initSchema(db);
+  const db = withSqliteBusyRetry(() => {
+    const opened = new Database(path);
+    try {
+      opened.exec("PRAGMA busy_timeout = 10000");
+      opened.exec("PRAGMA journal_mode = WAL");
+      opened.exec("PRAGMA foreign_keys = ON");
+      initSchema(opened);
+      return opened;
+    } catch (error) {
+      try {
+        opened.close();
+      } catch {}
+      throw error;
+    }
+  }, `opening ${path}`);
   if (!skipSeed) {
     Promise.resolve().then(() => (init_pricing(), exports_pricing)).then(({ ensurePricingSeeded: ensurePricingSeeded2 }) => ensurePricingSeeded2(db)).catch(() => {});
   }
@@ -946,36 +982,50 @@ function querySessions(db, filter = {}) {
     SELECT * FROM sessions ${where} ORDER BY started_at DESC LIMIT ? OFFSET ?
   `).all(...params, limit, offset);
 }
-function queryTopSessions(db, n = 10, agent) {
+function queryTopSessions(db, n = 10, agent, since) {
+  const conditions = [];
+  const params = [];
   if (agent) {
-    return db.prepare(`SELECT * FROM sessions WHERE agent = ? ORDER BY total_cost_usd DESC LIMIT ?`).all(agent, n);
+    conditions.push("agent = ?");
+    params.push(agent);
+  }
+  if (since) {
+    conditions.push("started_at >= ?");
+    params.push(since);
   }
-  return db.prepare(`SELECT * FROM sessions ORDER BY total_cost_usd DESC LIMIT ?`).all(n);
+  const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
+  return db.prepare(`SELECT * FROM sessions ${where} ORDER BY total_cost_usd DESC LIMIT ?`).all(...params, n);
 }
-function querySummary(db, period, machine, allMachines = false) {
+function querySummary(db, period, machine, allMachines = false, agent) {
   const rWhere = periodWhere(period);
   const sWhere = sessionPeriodWhere(period);
-  const machineClause = !allMachines && machine ? ` AND machine_id = '${machine.replace(/'/g, "''")}'` : "";
+  const machineClause = !allMachines && machine ? " AND machine_id = ?" : "";
+  const agentClause = agent ? " AND agent = ?" : "";
+  const params = [];
+  if (!allMachines && machine)
+    params.push(machine);
+  if (agent)
+    params.push(agent);
   const r = db.prepare(`
     SELECT COALESCE(SUM(cost_usd), 0) as total_usd,
            COUNT(*) as requests,
            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as tokens
-    FROM requests WHERE ${rWhere}${machineClause}
-  `).get();
+    FROM requests WHERE ${rWhere}${machineClause}${agentClause}
+  `).get(...params);
   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}
+    WHERE ${sWhere}${machineClause}${agentClause}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
-  `).get();
+  `).get(...params);
   const requestSessionCount = db.prepare(`
     SELECT COUNT(DISTINCT session_id) as sessions
     FROM requests
-    WHERE ${rWhere}${machineClause}
-  `).get();
+    WHERE ${rWhere}${machineClause}${agentClause}
+  `).get(...params);
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
     requests: r.requests + codexTotals.requests,

package/dist/otel/index.js

@@ -573,6 +573,32 @@ function getDbPath() {
     return process.env["ECONOMY_DB"];
   return join(getDataDir(), "economy.db");
 }
+function isSqliteBusyError(error) {
+  const candidate = error;
+  const code = typeof candidate.code === "string" ? candidate.code : "";
+  const message = typeof candidate.message === "string" ? candidate.message : String(error);
+  return code === "SQLITE_BUSY" || code === "SQLITE_BUSY_RECOVERY" || /database is locked|SQLITE_BUSY/i.test(message);
+}
+function retryDelayMs(attempt) {
+  return Math.min(1000, 50 * 2 ** attempt);
+}
+function withSqliteBusyRetry(operation, context) {
+  const maxAttempts = 8;
+  let lastError;
+  for (let attempt = 0;attempt < maxAttempts; attempt++) {
+    try {
+      return operation();
+    } catch (error) {
+      if (!isSqliteBusyError(error))
+        throw error;
+      lastError = error;
+      if (attempt === maxAttempts - 1)
+        break;
+      Bun.sleepSync(retryDelayMs(attempt));
+    }
+  }
+  throw new Error(`SQLite database is locked after ${maxAttempts} attempts while ${context}. Another economy sync/merge may be recovering the database; retry shortly.`, { cause: lastError });
+}
 function openDatabase(dbPath, skipSeed = false) {
   const path = dbPath ?? getDbPath();
   if (path !== ":memory:") {
@@ -580,11 +606,21 @@ function openDatabase(dbPath, skipSeed = false) {
     if (dir && !existsSync(dir))
       mkdirSync(dir, { recursive: true });
   }
-  const db = new Database(path);
-  db.exec("PRAGMA journal_mode = WAL");
-  db.exec("PRAGMA busy_timeout = 5000");
-  db.exec("PRAGMA foreign_keys = ON");
-  initSchema(db);
+  const db = withSqliteBusyRetry(() => {
+    const opened = new Database(path);
+    try {
+      opened.exec("PRAGMA busy_timeout = 10000");
+      opened.exec("PRAGMA journal_mode = WAL");
+      opened.exec("PRAGMA foreign_keys = ON");
+      initSchema(opened);
+      return opened;
+    } catch (error) {
+      try {
+        opened.close();
+      } catch {}
+      throw error;
+    }
+  }, `opening ${path}`);
   if (!skipSeed) {
     Promise.resolve().then(() => (init_pricing(), exports_pricing)).then(({ ensurePricingSeeded: ensurePricingSeeded2 }) => ensurePricingSeeded2(db)).catch(() => {});
   }

package/dist/server/index.js

@@ -573,6 +573,32 @@ function getDbPath() {
     return process.env["ECONOMY_DB"];
   return join(getDataDir(), "economy.db");
 }
+function isSqliteBusyError(error) {
+  const candidate = error;
+  const code = typeof candidate.code === "string" ? candidate.code : "";
+  const message = typeof candidate.message === "string" ? candidate.message : String(error);
+  return code === "SQLITE_BUSY" || code === "SQLITE_BUSY_RECOVERY" || /database is locked|SQLITE_BUSY/i.test(message);
+}
+function retryDelayMs(attempt) {
+  return Math.min(1000, 50 * 2 ** attempt);
+}
+function withSqliteBusyRetry(operation, context) {
+  const maxAttempts = 8;
+  let lastError;
+  for (let attempt = 0;attempt < maxAttempts; attempt++) {
+    try {
+      return operation();
+    } catch (error) {
+      if (!isSqliteBusyError(error))
+        throw error;
+      lastError = error;
+      if (attempt === maxAttempts - 1)
+        break;
+      Bun.sleepSync(retryDelayMs(attempt));
+    }
+  }
+  throw new Error(`SQLite database is locked after ${maxAttempts} attempts while ${context}. Another economy sync/merge may be recovering the database; retry shortly.`, { cause: lastError });
+}
 function openDatabase(dbPath, skipSeed = false) {
   const path = dbPath ?? getDbPath();
   if (path !== ":memory:") {
@@ -580,11 +606,21 @@ function openDatabase(dbPath, skipSeed = false) {
     if (dir && !existsSync(dir))
       mkdirSync(dir, { recursive: true });
   }
-  const db = new Database(path);
-  db.exec("PRAGMA journal_mode = WAL");
-  db.exec("PRAGMA busy_timeout = 5000");
-  db.exec("PRAGMA foreign_keys = ON");
-  initSchema(db);
+  const db = withSqliteBusyRetry(() => {
+    const opened = new Database(path);
+    try {
+      opened.exec("PRAGMA busy_timeout = 10000");
+      opened.exec("PRAGMA journal_mode = WAL");
+      opened.exec("PRAGMA foreign_keys = ON");
+      initSchema(opened);
+      return opened;
+    } catch (error) {
+      try {
+        opened.close();
+      } catch {}
+      throw error;
+    }
+  }, `opening ${path}`);
   if (!skipSeed) {
     Promise.resolve().then(() => (init_pricing(), exports_pricing)).then(({ ensurePricingSeeded: ensurePricingSeeded2 }) => ensurePricingSeeded2(db)).catch(() => {});
   }
@@ -946,36 +982,50 @@ function querySessions(db, filter = {}) {
     SELECT * FROM sessions ${where} ORDER BY started_at DESC LIMIT ? OFFSET ?
   `).all(...params, limit, offset);
 }
-function queryTopSessions(db, n = 10, agent) {
+function queryTopSessions(db, n = 10, agent, since) {
+  const conditions = [];
+  const params = [];
   if (agent) {
-    return db.prepare(`SELECT * FROM sessions WHERE agent = ? ORDER BY total_cost_usd DESC LIMIT ?`).all(agent, n);
+    conditions.push("agent = ?");
+    params.push(agent);
   }
-  return db.prepare(`SELECT * FROM sessions ORDER BY total_cost_usd DESC LIMIT ?`).all(n);
+  if (since) {
+    conditions.push("started_at >= ?");
+    params.push(since);
+  }
+  const where = conditions.length ? `WHERE ${conditions.join(" AND ")}` : "";
+  return db.prepare(`SELECT * FROM sessions ${where} ORDER BY total_cost_usd DESC LIMIT ?`).all(...params, n);
 }
-function querySummary(db, period, machine, allMachines = false) {
+function querySummary(db, period, machine, allMachines = false, agent) {
   const rWhere = periodWhere(period);
   const sWhere = sessionPeriodWhere(period);
-  const machineClause = !allMachines && machine ? ` AND machine_id = '${machine.replace(/'/g, "''")}'` : "";
+  const machineClause = !allMachines && machine ? " AND machine_id = ?" : "";
+  const agentClause = agent ? " AND agent = ?" : "";
+  const params = [];
+  if (!allMachines && machine)
+    params.push(machine);
+  if (agent)
+    params.push(agent);
   const r = db.prepare(`
     SELECT COALESCE(SUM(cost_usd), 0) as total_usd,
            COUNT(*) as requests,
            COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as tokens
-    FROM requests WHERE ${rWhere}${machineClause}
-  `).get();
+    FROM requests WHERE ${rWhere}${machineClause}${agentClause}
+  `).get(...params);
   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}
+    WHERE ${sWhere}${machineClause}${agentClause}
     AND id NOT IN (SELECT DISTINCT session_id FROM requests)
-  `).get();
+  `).get(...params);
   const requestSessionCount = db.prepare(`
     SELECT COUNT(DISTINCT session_id) as sessions
     FROM requests
-    WHERE ${rWhere}${machineClause}
-  `).get();
+    WHERE ${rWhere}${machineClause}${agentClause}
+  `).get(...params);
   return {
     total_usd: r.total_usd + codexTotals.cost_usd,
     requests: r.requests + codexTotals.requests,
@@ -4314,7 +4364,8 @@ function createHandler(db) {
     if (path === "/api/top" && method === "GET") {
       const n = Number(url.searchParams.get("n") ?? 10);
       const agent = url.searchParams.get("agent") ?? undefined;
-      return ok(queryTopSessions(db, n, agent));
+      const since = url.searchParams.get("since") ?? undefined;
+      return ok(queryTopSessions(db, n, agent, since));
     }
     if (path === "/api/models" && method === "GET") {
       return ok(queryModelBreakdown(db));

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,aAAa,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAA;AAuC7D,UAAU,kBAAkB;IAC1B,EAAE,CAAC,EAAE,QAAQ,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAChC;AAqED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAAE,YAAY,SAAwB,IACzF,KAAK,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAwB7D;AAQD,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,IACV,KAAK,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAqX/D;AAED,wBAAgB,WAAW,CAAC,IAAI,SAAO,EAAE,OAAO,GAAE,kBAAuB,GAAG,UAAU,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,CAcvG"}
+{"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;AAuC7D,UAAU,kBAAkB;IAC1B,EAAE,CAAC,EAAE,QAAQ,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAChC;AAqED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAAE,YAAY,SAAwB,IACzF,KAAK,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAwB7D;AAQD,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,IACV,KAAK,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAsX/D;AAED,wBAAgB,WAAW,CAAC,IAAI,SAAO,EAAE,OAAO,GAAE,kBAAuB,GAAG,UAAU,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,CAcvG"}