@hasna/economy 0.3.3 → 0.3.5

package/dist/cli/commands/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/watch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAGjD,UAAU,YAAY;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AA4BD,wBAAsB,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA0GlE"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/watch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAGjD,UAAU,YAAY;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AA4BD,wBAAsB,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgHlE"}

package/dist/cli/index.js

@@ -6330,7 +6330,12 @@ async function watchCosts(opts) {
   if (daemon)
     ingestPending = true;
   await poll();
-  const timer = setInterval(poll, opts.interval * 1000);
+  const timer = setInterval(() => {
+    poll().catch((e) => {
+      console.log(chalk5.dim(`
+  Poll error: ${e instanceof Error ? e.message : String(e)} \u2014 retrying next tick`));
+    });
+  }, opts.interval * 1000);
   process.on("SIGINT", () => {
     clearInterval(timer);
     if (ingestTimer)
@@ -6389,11 +6394,16 @@ function resolveWorkerPath() {
       return candidate;
   return candidates[0];
 }
+function isTransientConnError(message) {
+  const m = message.toLowerCase();
+  return m.includes("econnreset") || m.includes("econnrefused") || m.includes("etimedout") || m.includes("connection terminated") || m.includes("connection ended") || m.includes("timeout exceeded when trying to connect") || m.includes("terminating connection") || m.includes("server closed the connection");
+}
 
 class SyncPgAdapter {
   worker;
   port;
   counter = 0;
+  sleeper = new Int32Array(new SharedArrayBuffer(4));
   constructor(dsn) {
     const workerPath = resolveWorkerPath();
     this.worker = new Worker(workerPath, { workerData: { dsn } });
@@ -6402,25 +6412,45 @@ class SyncPgAdapter {
     this.port = channel.port1;
     this.worker.postMessage({ type: "init", port: channel.port2 }, [channel.port2]);
   }
-  query(sql, params) {
-    const pgSql = translateSqliteDates(translateSql(sql, "pg"));
-    const pgParams = translateParams(params);
+  drainReply(expectedId) {
+    const deadline = Date.now() + 30000;
+    for (;; ) {
+      const received = receiveMessageOnPort(this.port);
+      if (received) {
+        const reply = received.message;
+        if (reply.id === expectedId)
+          return reply;
+        continue;
+      }
+      if (Date.now() > deadline)
+        throw new Error("SyncPgAdapter: no reply from worker (timeout)");
+      Atomics.wait(this.sleeper, 0, 0, 1);
+    }
+  }
+  queryOnce(pgSql, pgParams) {
     const id = ++this.counter;
     const signal = new SharedArrayBuffer(4);
     const sig = new Int32Array(signal);
     Atomics.store(sig, 0, 0);
     this.worker.postMessage({ id, sql: pgSql, params: pgParams, signal });
     Atomics.wait(sig, 0, 0);
-    let received = receiveMessageOnPort(this.port);
-    for (let attempt = 0;!received && attempt < 1e6; attempt++)
-      received = receiveMessageOnPort(this.port);
-    if (!received)
-      throw new Error("SyncPgAdapter: no reply from worker");
-    const reply = received.message;
+    const reply = this.drainReply(id);
     if (!reply.ok)
       throw new Error(reply.error);
     return { rows: reply.rows, rowCount: reply.rowCount };
   }
+  query(sql, params) {
+    const pgSql = translateSqliteDates(translateSql(sql, "pg"));
+    const pgParams = translateParams(params);
+    try {
+      return this.queryOnce(pgSql, pgParams);
+    } catch (err) {
+      if (err instanceof Error && isTransientConnError(err.message)) {
+        return this.queryOnce(pgSql, pgParams);
+      }
+      throw err;
+    }
+  }
   run(sql, ...params) {
     const result = this.query(sql, params);
     return { changes: result.rowCount, lastInsertRowid: result.rows?.[0]?.["id"] ?? 0 };
@@ -10581,6 +10611,7 @@ init_billing();
 init_package_metadata();
 init_pricing();
 init_store();
+init_transport();
 import { execSync } from "child_process";
 var program = new Command;
 program.name("economy").description("AI coding cost tracker \u2014 Claude, Codex, Gemini, OpenCode, Cursor, Pi, Hermes").version(packageMetadata.version);
@@ -11650,4 +11681,16 @@ registerBriefCommand(program, { beforeRead: () => autoSync({ dedupe: false }) })
 registerExtendedCommands(program);
 registerFleetCommands(program);
 registerEventsCommands(program, { source: "economy" });
-program.parseAsync();
+function reportCliError(err2) {
+  if (err2 instanceof HasnaHttpError) {
+    if (err2.status === 404) {
+      fail(`economy: the cloud API has no endpoint for this command (${err2.method} ${err2.path} -> 404). ` + `The self-hosted server is likely running an older build \u2014 it needs an ECS redeploy of the current version.`);
+    }
+    if (err2.status === 401 || err2.status === 403) {
+      fail(`economy: cloud API rejected the request (${err2.status}). Check HASNA_ECONOMY_API_KEY.`);
+    }
+    fail(`economy: cloud API request failed (${err2.method} ${err2.path} -> ${err2.status}).`);
+  }
+  fail(`economy: ${err2 instanceof Error ? err2.message : String(err2)}`);
+}
+program.parseAsync().catch(reportCliError);

package/dist/db/sync-pg.d.ts

@@ -6,11 +6,31 @@ import { type DbAdapter, type PreparedStatement, type RunResult } from '@hasna/c
  * `DATE(col)` casts through `timestamptz`. Ordered most-specific first.
  */
 export declare function translateSqliteDates(sql: string): string;
+/**
+ * Connection-level failures where the query provably never executed (the pool
+ * could not hand out or keep a live backend). These are safe to retry once —
+ * the pg pool discards the dead client and dials a fresh one on the next query,
+ * so a single retry transparently absorbs RDS failover / idle-drop / connect
+ * timeout blips instead of surfacing a 500 the caller has to retry by hand.
+ */
+export declare function isTransientConnError(message: string): boolean;
 export declare class SyncPgAdapter implements DbAdapter {
     private readonly worker;
     private readonly port;
     private counter;
+    private readonly sleeper;
     constructor(dsn: string);
+    /**
+     * Drain the reply matching `expectedId`. The reply is enqueued on the port
+     * before the worker notifies, but cross-thread delivery can lag under CPU
+     * pressure — so poll on a wall-clock deadline (yielding via a 1ms Atomics.wait
+     * between empty reads) rather than a fixed iteration count, which could give
+     * up prematurely on a busy box and throw a spurious 500. Replies whose id does
+     * not match are stale results of a previously abandoned (timed-out) query;
+     * discard them so the port never cross-talks between requests.
+     */
+    private drainReply;
+    private queryOnce;
     private query;
     run(sql: string, ...params: unknown[]): RunResult;
     get(sql: string, ...params: unknown[]): unknown;

package/dist/db/sync-pg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-pg.d.ts","sourceRoot":"","sources":["../../src/db/sync-pg.ts"],"names":[],"mappings":"AAeA,OAAO,EAAiC,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAIpH;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAiCxD;AAaD,qBAAa,aAAc,YAAW,SAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,OAAO,CAAI;gBAEP,GAAG,EAAE,MAAM;IAYvB,OAAO,CAAC,KAAK;IAsBb,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS;IAIjD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO;IAG/C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE;IAGjD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAGvB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB;IASvC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI9B,KAAK,IAAI,IAAI;CAGd"}
+{"version":3,"file":"sync-pg.d.ts","sourceRoot":"","sources":["../../src/db/sync-pg.ts"],"names":[],"mappings":"AAeA,OAAO,EAAiC,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAIpH;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAiCxD;AAaD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAY7D;AAED,qBAAa,aAAc,YAAW,SAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,OAAO,CAAI;IAInB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2C;gBAEvD,GAAG,EAAE,MAAM;IAYvB;;;;;;;;OAQG;IACH,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,KAAK;IAcb,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS;IAIjD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO;IAG/C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE;IAGjD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAGvB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB;IASvC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI9B,KAAK,IAAI,IAAI;CAGd"}

package/dist/server/index.js

@@ -1988,11 +1988,16 @@ function resolveWorkerPath() {
       return candidate;
   return candidates[0];
 }
+function isTransientConnError(message) {
+  const m = message.toLowerCase();
+  return m.includes("econnreset") || m.includes("econnrefused") || m.includes("etimedout") || m.includes("connection terminated") || m.includes("connection ended") || m.includes("timeout exceeded when trying to connect") || m.includes("terminating connection") || m.includes("server closed the connection");
+}
 
 class SyncPgAdapter {
   worker;
   port;
   counter = 0;
+  sleeper = new Int32Array(new SharedArrayBuffer(4));
   constructor(dsn) {
     const workerPath = resolveWorkerPath();
     this.worker = new Worker(workerPath, { workerData: { dsn } });
@@ -2001,25 +2006,45 @@ class SyncPgAdapter {
     this.port = channel.port1;
     this.worker.postMessage({ type: "init", port: channel.port2 }, [channel.port2]);
   }
-  query(sql, params) {
-    const pgSql = translateSqliteDates(translateSql(sql, "pg"));
-    const pgParams = translateParams(params);
+  drainReply(expectedId) {
+    const deadline = Date.now() + 30000;
+    for (;; ) {
+      const received = receiveMessageOnPort(this.port);
+      if (received) {
+        const reply = received.message;
+        if (reply.id === expectedId)
+          return reply;
+        continue;
+      }
+      if (Date.now() > deadline)
+        throw new Error("SyncPgAdapter: no reply from worker (timeout)");
+      Atomics.wait(this.sleeper, 0, 0, 1);
+    }
+  }
+  queryOnce(pgSql, pgParams) {
     const id = ++this.counter;
     const signal = new SharedArrayBuffer(4);
     const sig = new Int32Array(signal);
     Atomics.store(sig, 0, 0);
     this.worker.postMessage({ id, sql: pgSql, params: pgParams, signal });
     Atomics.wait(sig, 0, 0);
-    let received = receiveMessageOnPort(this.port);
-    for (let attempt = 0;!received && attempt < 1e6; attempt++)
-      received = receiveMessageOnPort(this.port);
-    if (!received)
-      throw new Error("SyncPgAdapter: no reply from worker");
-    const reply = received.message;
+    const reply = this.drainReply(id);
     if (!reply.ok)
       throw new Error(reply.error);
     return { rows: reply.rows, rowCount: reply.rowCount };
   }
+  query(sql, params) {
+    const pgSql = translateSqliteDates(translateSql(sql, "pg"));
+    const pgParams = translateParams(params);
+    try {
+      return this.queryOnce(pgSql, pgParams);
+    } catch (err) {
+      if (err instanceof Error && isTransientConnError(err.message)) {
+        return this.queryOnce(pgSql, pgParams);
+      }
+      throw err;
+    }
+  }
   run(sql, ...params) {
     const result = this.query(sql, params);
     return { changes: result.rowCount, lastInsertRowid: result.rows?.[0]?.["id"] ?? 0 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, Gemini, OpenCode, Cursor, Pi, and Hermes",
   "repository": {
     "type": "git",