@hasna/economy 0.5.8 → 0.5.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.9
+
+### Patch Changes
+
+- Give each journal recovery transaction its own bounded deadline so slow storage does not interrupt healthy collection, and stop ingestion whenever cleanup leaves unresolved recovery state.
+
 ## 0.5.8
 
 ### Patch Changes

package/dist/chunks/{index-a1gh3d6t.js → index-92x56q4h.js}

@@ -15,7 +15,7 @@ import {
   requireCurrentBillingDiffSummary,
   requireCurrentRangeStats,
   requireCurrentSavingsReport
-} from "./index-h2mcj7gv.js";
+} from "./index-spwpgdbb.js";
 import {
   deleteBudget,
   deleteGoal,

package/dist/chunks/{index-9za4cmq2.js → index-970htsxe.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   LOCAL_STORAGE_OPT_IN_KEYS
-} from "./index-h2mcj7gv.js";
+} from "./index-spwpgdbb.js";
 import {
   assessCostFromDb,
   getIngestState,

package/dist/chunks/{index-h2mcj7gv.js → index-spwpgdbb.js}

@@ -86,7 +86,7 @@ function comparisonValueChange(left, right) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.8",
+  version: "0.5.9",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/chunks/{index-gf3kan31.js → index-twkdyrw4.js}

@@ -4,7 +4,7 @@ import {
 } from "./index-w3bvv0ns.js";
 import {
   getStore
-} from "./index-a1gh3d6t.js";
+} from "./index-92x56q4h.js";
 import {
   formatReportedUsd,
   formatSummaryCoverage,

package/dist/chunks/{serve-14cgmx02.js → serve-tmv8zgvh.js}

@@ -5,7 +5,7 @@ import {
 } from "./index-w3bvv0ns.js";
 import {
   syncAll
-} from "./index-9za4cmq2.js";
+} from "./index-970htsxe.js";
 import {
   buildBrief,
   packageMetadata,
@@ -16,7 +16,7 @@ import {
   queryProjectDetail,
   queryRangeStats,
   querySavingsSummary
-} from "./index-h2mcj7gv.js";
+} from "./index-spwpgdbb.js";
 import {
   AGENTS,
   INGEST_SCHEMA_SQL,

package/dist/chunks/{tui-s6tpce3h.js → tui-j8brj3wf.js}

@@ -6,10 +6,10 @@ import {
   printStatusLine,
   printWaybarJson,
   runTui
-} from "./index-gf3kan31.js";
+} from "./index-twkdyrw4.js";
 import"./index-w3bvv0ns.js";
-import"./index-a1gh3d6t.js";
-import"./index-h2mcj7gv.js";
+import"./index-92x56q4h.js";
+import"./index-spwpgdbb.js";
 import"./index-zgvmrqyc.js";
 import"./index-p35cyhc4.js";
 export {

package/dist/chunks/{watch-cv5va8x6.js → watch-ksn2mezm.js}

@@ -2,12 +2,12 @@
 import {
   agentPaths,
   syncAll
-} from "./index-9za4cmq2.js";
+} from "./index-970htsxe.js";
 import {
   getStore,
   isCloudStore
-} from "./index-a1gh3d6t.js";
-import"./index-h2mcj7gv.js";
+} from "./index-92x56q4h.js";
+import"./index-spwpgdbb.js";
 import {
   formatSummaryValue
 } from "./index-zgvmrqyc.js";

package/dist/cli/index.js

@@ -8,16 +8,16 @@ import {
 import {
   buildStatusLine,
   gatherStatusData
-} from "../chunks/index-gf3kan31.js";
+} from "../chunks/index-twkdyrw4.js";
 import"../chunks/index-w3bvv0ns.js";
 import {
   agentPaths,
   syncAll
-} from "../chunks/index-9za4cmq2.js";
+} from "../chunks/index-970htsxe.js";
 import {
   getStore,
   isCloudStore
-} from "../chunks/index-a1gh3d6t.js";
+} from "../chunks/index-92x56q4h.js";
 import {
   billingDriftCheck,
   comparisonValueChange,
@@ -25,7 +25,7 @@ import {
   economyTransportReport,
   formatComparisonValue,
   packageMetadata
-} from "../chunks/index-h2mcj7gv.js";
+} from "../chunks/index-spwpgdbb.js";
 import {
   AGENTS,
   MAX_INGEST_BYTES,
@@ -1359,23 +1359,23 @@ function registerExtendedCommands(program) {
     console.log();
   });
   program.command("tui").description("Terminal status dashboard (Linux/SSH friendly)").option("--watch", "Live refresh").option("--interval <seconds>", "Refresh interval", "30").action(async (opts) => {
-    const { runTui } = await import("../chunks/tui-s6tpce3h.js");
+    const { runTui } = await import("../chunks/tui-j8brj3wf.js");
     await runTui({
       watch: Boolean(opts.watch),
       interval: Number(opts.interval ?? 30)
     });
   });
   program.command("waybar").description("Print waybar-compatible JSON status line").action(async () => {
-    const { printWaybarJson } = await import("../chunks/tui-s6tpce3h.js");
+    const { printWaybarJson } = await import("../chunks/tui-j8brj3wf.js");
     await printWaybarJson();
   });
   const barCmd = program.command("bar").description("Status bar helpers (Linux)");
   barCmd.command("tui").description("Alias for economy tui").option("--watch", "Live refresh").action(async (opts) => {
-    const { runTui } = await import("../chunks/tui-s6tpce3h.js");
+    const { runTui } = await import("../chunks/tui-j8brj3wf.js");
     await runTui({ watch: Boolean(opts.watch) });
   });
   barCmd.command("waybar").description("Alias for economy waybar").action(async () => {
-    const { printWaybarJson } = await import("../chunks/tui-s6tpce3h.js");
+    const { printWaybarJson } = await import("../chunks/tui-j8brj3wf.js");
     await printWaybarJson();
   });
   program.command("estimate").description("Estimate cost for token counts").requiredOption("--model <model>", "Model name").option("--input <n>", "Input tokens", "0").option("--output <n>", "Output tokens", "0").action(async (opts) => {
@@ -2024,18 +2024,19 @@ class IngestJournalMaintenance {
       throw new Error("Journal maintenance limit must be 1\u201332");
     await this.recover();
     await verifyJournalAuthority(this.journal, this.cloud);
-    const deadline = Date.now() + 30000;
+    const sweepDeadline = Date.now() + 30000;
     let retired = 0, bytes = 0;
     let backend;
     try {
       const names = this.journal.names();
       for (const name of names.filter((n) => n.endsWith(".intent.json"))) {
-        if (retired >= limit || Date.now() >= deadline || retired > 0 && bytes >= 1048576)
+        if (retired >= limit || Date.now() >= sweepDeadline || retired > 0 && bytes >= 1048576)
           break;
         if (!names.includes(name.replace(".intent.", ".receipt.")))
           continue;
         const intent = this.journal.intent(name), receipt = this.journal.receipt(intent.command);
-        backend ??= await this.backend(deadline);
+        const deadline = Date.now() + 30000;
+        backend = await this.backend(deadline);
         const m = {
           version: 1,
           target: this.journal.target,
@@ -2071,7 +2072,8 @@ class IngestJournalMaintenance {
     try {
       await this.maintain();
     } catch (error) {
-      if (exists(this.control) || !this.journal.canStage(command))
+      const deferrable = error instanceof JournalMaintenanceError && ["recovery_not_configured", "self_host_trash_authority_required", "trash_version_mismatch", "recovery_authority_unavailable"].includes(error.reason);
+      if (!deferrable || exists(this.control) || !this.journal.canStage(command))
         throw error;
     }
     if (!this.journal.canStage(command))
@@ -3200,7 +3202,7 @@ program.command("accounts [period]").description("List account usage by email ad
   console.log();
 });
 program.command("watch").description("Live stream of incoming costs").option("--interval <seconds>", "Poll interval in seconds", "10").option("--daemon", "Watch agent data directories and sync on change").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--notify <amount>", "Fire macOS notification when cumulative cost crosses this USD threshold").action(async (opts) => {
-  const { watchCosts } = await import("../chunks/watch-cv5va8x6.js");
+  const { watchCosts } = await import("../chunks/watch-ksn2mezm.js");
   await watchCosts({
     interval: parsePositiveCliInteger(opts.interval ?? "10", "--interval"),
     daemon: Boolean(opts.daemon),
@@ -3436,7 +3438,7 @@ pricingCmd.command("remove <model>").description("Remove pricing for a model").a
 });
 program.command("serve").description("Start the REST API server").option("-p, --port <port>", "Port", "3456").action(async (opts) => {
   const port = parseCliPort(opts.port ?? "3456", "--port");
-  const { startServer } = await import("../chunks/serve-14cgmx02.js");
+  const { startServer } = await import("../chunks/serve-tmv8zgvh.js");
   startServer(port);
 });
 program.command("mcp").description("Show MCP server install commands").option("--claude", "Install into Claude Code").option("--codex", "Install into Codex").option("--gemini", "Install into Gemini CLI").option("--all", "Install into all agents").action(async (opts) => {

package/dist/index.js

@@ -111,7 +111,7 @@ import { randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.8",
+  version: "0.5.9",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",
@@ -2345,18 +2345,19 @@ class IngestJournalMaintenance {
       throw new Error("Journal maintenance limit must be 1\u201332");
     await this.recover();
     await verifyJournalAuthority(this.journal, this.cloud);
-    const deadline = Date.now() + 30000;
+    const sweepDeadline = Date.now() + 30000;
     let retired = 0, bytes = 0;
     let backend;
     try {
       const names = this.journal.names();
       for (const name of names.filter((n) => n.endsWith(".intent.json"))) {
-        if (retired >= limit || Date.now() >= deadline || retired > 0 && bytes >= 1048576)
+        if (retired >= limit || Date.now() >= sweepDeadline || retired > 0 && bytes >= 1048576)
           break;
         if (!names.includes(name.replace(".intent.", ".receipt.")))
           continue;
         const intent = this.journal.intent(name), receipt = this.journal.receipt(intent.command);
-        backend ??= await this.backend(deadline);
+        const deadline = Date.now() + 30000;
+        backend = await this.backend(deadline);
         const m = {
           version: 1,
           target: this.journal.target,
@@ -2392,7 +2393,8 @@ class IngestJournalMaintenance {
     try {
       await this.maintain();
     } catch (error) {
-      if (exists(this.control) || !this.journal.canStage(command))
+      const deferrable = error instanceof JournalMaintenanceError && ["recovery_not_configured", "self_host_trash_authority_required", "trash_version_mismatch", "recovery_authority_unavailable"].includes(error.reason);
+      if (!deferrable || exists(this.control) || !this.journal.canStage(command))
         throw error;
     }
     if (!this.journal.canStage(command))

package/dist/lib/ingest-journal-maintenance.d.ts.map

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

package/dist/mcp/index.js

@@ -86,7 +86,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.8",
+  version: "0.5.9",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",
@@ -1343,18 +1343,19 @@ class IngestJournalMaintenance {
       throw new Error("Journal maintenance limit must be 1\u201332");
     await this.recover();
     await verifyJournalAuthority(this.journal, this.cloud);
-    const deadline = Date.now() + 30000;
+    const sweepDeadline = Date.now() + 30000;
     let retired = 0, bytes = 0;
     let backend;
     try {
       const names = this.journal.names();
       for (const name of names.filter((n) => n.endsWith(".intent.json"))) {
-        if (retired >= limit || Date.now() >= deadline || retired > 0 && bytes >= 1048576)
+        if (retired >= limit || Date.now() >= sweepDeadline || retired > 0 && bytes >= 1048576)
           break;
         if (!names.includes(name.replace(".intent.", ".receipt.")))
           continue;
         const intent = this.journal.intent(name), receipt = this.journal.receipt(intent.command);
-        backend ??= await this.backend(deadline);
+        const deadline = Date.now() + 30000;
+        backend = await this.backend(deadline);
         const m = {
           version: 1,
           target: this.journal.target,
@@ -1390,7 +1391,8 @@ class IngestJournalMaintenance {
     try {
       await this.maintain();
     } catch (error) {
-      if (exists(this.control) || !this.journal.canStage(command))
+      const deferrable = error instanceof JournalMaintenanceError && ["recovery_not_configured", "self_host_trash_authority_required", "trash_version_mismatch", "recovery_authority_unavailable"].includes(error.reason);
+      if (!deferrable || exists(this.control) || !this.journal.canStage(command))
         throw error;
     }
     if (!this.journal.canStage(command))

package/dist/otel/index.js

@@ -3281,18 +3281,19 @@ class IngestJournalMaintenance {
       throw new Error("Journal maintenance limit must be 1\u201332");
     await this.recover();
     await verifyJournalAuthority(this.journal, this.cloud);
-    const deadline = Date.now() + 30000;
+    const sweepDeadline = Date.now() + 30000;
     let retired = 0, bytes = 0;
     let backend;
     try {
       const names = this.journal.names();
       for (const name of names.filter((n) => n.endsWith(".intent.json"))) {
-        if (retired >= limit || Date.now() >= deadline || retired > 0 && bytes >= 1048576)
+        if (retired >= limit || Date.now() >= sweepDeadline || retired > 0 && bytes >= 1048576)
           break;
         if (!names.includes(name.replace(".intent.", ".receipt.")))
           continue;
         const intent = this.journal.intent(name), receipt = this.journal.receipt(intent.command);
-        backend ??= await this.backend(deadline);
+        const deadline = Date.now() + 30000;
+        backend = await this.backend(deadline);
         const m = {
           version: 1,
           target: this.journal.target,
@@ -3328,7 +3329,8 @@ class IngestJournalMaintenance {
     try {
       await this.maintain();
     } catch (error) {
-      if (exists(this.control) || !this.journal.canStage(command))
+      const deferrable = error instanceof JournalMaintenanceError && ["recovery_not_configured", "self_host_trash_authority_required", "trash_version_mismatch", "recovery_authority_unavailable"].includes(error.reason);
+      if (!deferrable || exists(this.control) || !this.journal.canStage(command))
         throw error;
     }
     if (!this.journal.canStage(command))
@@ -3480,7 +3482,7 @@ async function pushIngestRows(cloud, scratch) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.8",
+  version: "0.5.9",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/server/index.js

@@ -5578,7 +5578,7 @@ function isAuthorizedRequest(req, path) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.8",
+  version: "0.5.9",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/server/service-worker.js

@@ -7454,7 +7454,7 @@ import { randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.8",
+  version: "0.5.9",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/docs/ingest-journal.md

@@ -35,7 +35,11 @@ closed. No operator input can relabel an uncertain intent as rejected.
 
 A bounded sweep starts at 64 commands, 48 MiB, or insufficient next-command
 headroom. It retires at most 32 pairs or approximately 1 MiB per pass; a single
-large pair is handled individually. Each pass has a 30-second network deadline.
+large pair is handled individually. A sweep admits new transactions for up to
+30 seconds; each admitted transaction has its own 30-second deadline for all
+three captures. The last transaction may finish after admission closes, so this
+phase can take up to 60 seconds. Prerequisite recovery and authority checks have
+their own bounds.
 The active journal remains bounded; Trash's recoverable remote retention and
 unfinished transfer staging are governed by Trash's own policy.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "AI coding cost tracker — CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   "repository": {
     "type": "git",