@hasna/economy 0.5.3 → 0.5.5

package/dist/otel/index.js

@@ -2384,7 +2384,7 @@ import { join as join3, basename } from "path";
 // src/lib/accounts-store.ts
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
-import { z } from "zod";
+import { z as z2 } from "zod";
 import { resolveClientTransport, resolveCredential } from "@hasna/contracts/client";
 
 // src/lib/cloud-storage.ts
@@ -2515,32 +2515,61 @@ function economyCloudStorage(env = process.env) {
   return cache;
 }
 
-// src/lib/accounts-store.ts
-var profileNameSchema = z.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+// src/lib/subscriptions-registry.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+import { isAbsolute } from "path";
+import { z } from "zod";
+var execute = promisify(execFile);
+var nonempty = z.string().min(1);
 var profileSchema = z.object({
-  name: z.string(),
-  tool: z.string(),
+  name: nonempty,
+  tool: nonempty,
   email: z.string().optional(),
   displayName: z.string().optional(),
-  dir: z.string(),
+  dir: nonempty.refine(isAbsolute).refine((value) => !/[\0\r\n]/.test(value)),
+  createdAt: nonempty,
+  lastUsedAt: z.string().optional(),
   description: z.string().optional(),
-  createdAt: z.string(),
-  lastUsedAt: z.string().optional()
+  active: z.boolean(),
+  applied: z.boolean(),
+  switchedAway: z.object({ profile: nonempty, email: z.string().optional() }).optional()
+});
+var toolsSchema = z.array(z.object({
+  id: nonempty,
+  label: nonempty,
+  envVar: nonempty,
+  defaultDir: nonempty,
+  bin: nonempty
+}));
+
+// src/lib/accounts-store.ts
+var profileNameSchema = z2.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+var profileSchema2 = z2.object({
+  name: z2.string(),
+  tool: z2.string(),
+  email: z2.string().optional(),
+  displayName: z2.string().optional(),
+  dir: z2.string(),
+  description: z2.string().optional(),
+  createdAt: z2.string(),
+  lastUsedAt: z2.string().optional(),
+  switchedAway: z2.object({ profile: z2.string().min(1), email: z2.string().optional() }).optional()
 });
-var toolDefSchema = z.object({
-  id: z.string(),
-  label: z.string(),
-  envVar: z.string(),
-  defaultDir: z.string(),
-  bin: z.string()
+var toolDefSchema = z2.object({
+  id: z2.string(),
+  label: z2.string(),
+  envVar: z2.string(),
+  defaultDir: z2.string(),
+  bin: z2.string()
 });
-var storeSchema = z.object({
-  version: z.literal(1),
-  current: z.record(z.string(), z.string()).default({}),
-  applied: z.record(z.string(), z.string()).default({}),
-  toolLocks: z.record(z.string(), z.string()).default({}),
-  profiles: z.array(profileSchema).default([]),
-  tools: z.array(toolDefSchema).default([])
+var storeSchema = z2.object({
+  version: z2.literal(1),
+  current: z2.record(z2.string(), z2.string()).default({}),
+  applied: z2.record(z2.string(), z2.string()).default({}),
+  toolLocks: z2.record(z2.string(), z2.string()).default({}),
+  profiles: z2.array(profileSchema2).default([]),
+  tools: z2.array(toolDefSchema).default([])
 });
 var BUILTIN_TOOLS = [
   { id: "claude", label: "Claude Code", envVar: "CLAUDE_CONFIG_DIR", defaultDir: join2(homedir2(), ".claude"), bin: "claude" },
@@ -2558,33 +2587,26 @@ var BUILTIN_TOOLS = [
 ];
 
 // src/ingest/claude.ts
-var CLAUDE_PROJECTS_DIR = process.env["HASNA_ECONOMY_CLAUDE_PROJECTS_DIR"] ?? join3(homedir3(), ".claude", "projects");
 var TAKUMI_PROJECTS_DIR = process.env["HASNA_ECONOMY_TAKUMI_PROJECTS_DIR"] ?? join3(homedir3(), ".takumi", "projects");
 
 // src/ingest/codex.ts
 init_database();
 init_pricing();
-import { homedir as homedir4 } from "os";
-import { join as join4, basename as basename2 } from "path";
-var DEFAULT_CODEX_DB_PATH = join4(homedir4(), ".codex", "state_5.sqlite");
-var DEFAULT_CODEX_CONFIG_PATH = join4(homedir4(), ".codex", "config.toml");
-var DEFAULT_CODEWITH_DB_PATH = join4(homedir4(), ".codewith", "state_5.sqlite");
-var DEFAULT_CODEWITH_CONFIG_PATH = join4(homedir4(), ".codewith", "config.toml");
 
 // src/ingest/gemini.ts
 init_database();
 init_pricing();
-import { homedir as homedir5 } from "os";
-import { join as join5, basename as basename3 } from "path";
-var DEFAULT_GEMINI_TMP_DIR = join5(homedir5(), ".gemini", "tmp");
-var DEFAULT_GEMINI_HISTORY_DIR = join5(homedir5(), ".gemini", "history");
+import { homedir as homedir4 } from "os";
+import { join as join4, basename as basename2 } from "path";
+var DEFAULT_GEMINI_TMP_DIR = join4(homedir4(), ".gemini", "tmp");
+var DEFAULT_GEMINI_HISTORY_DIR = join4(homedir4(), ".gemini", "history");
 
 // src/ingest/opencode.ts
 init_database();
 init_pricing();
-import { homedir as homedir6 } from "os";
-import { join as join6 } from "path";
-var OPENCODE_STORAGE = join6(homedir6(), ".local", "share", "opencode", "storage");
+import { homedir as homedir5 } from "os";
+import { join as join5 } from "path";
+var OPENCODE_STORAGE = join5(homedir5(), ".local", "share", "opencode", "storage");
 
 // src/ingest/quota-observation.ts
 init_database();
@@ -2592,15 +2614,15 @@ init_observation_provenance();
 
 // src/ingest/pi.ts
 init_database();
-import { homedir as homedir7 } from "os";
-import { join as join7 } from "path";
-var PI_SESSION_DIR = process.env["PI_CODING_AGENT_SESSION_DIR"] ?? join7(homedir7(), ".pi", "agent", "sessions");
+import { homedir as homedir6 } from "os";
+import { join as join6 } from "path";
+var PI_SESSION_DIR = process.env["PI_CODING_AGENT_SESSION_DIR"] ?? join6(homedir6(), ".pi", "agent", "sessions");
 
 // src/ingest/hermes.ts
 init_database();
-import { homedir as homedir8 } from "os";
-import { join as join8 } from "path";
-var HERMES_DB = join8(homedir8(), ".hermes", "state.db");
+import { homedir as homedir7 } from "os";
+import { join as join7 } from "path";
+var HERMES_DB = join7(homedir7(), ".hermes", "state.db");
 
 // src/ingest/loops.ts
 init_database();
@@ -2673,7 +2695,7 @@ init_ingest_validation();
 init_database();
 import { constants, closeSync, fsyncSync, fstatSync, lstatSync, mkdirSync as mkdirSync3, openSync, readFileSync, opendirSync, realpathSync, writeFileSync } from "fs";
 import { createHash as createHash4 } from "crypto";
-import { join as join9, resolve as resolve2 } from "path";
+import { join as join8, resolve as resolve2 } from "path";
 var MAX_COMMANDS = 1000;
 var MAX_BYTES = 64 * 1024 * 1024;
 var RECEIPT_RESERVE = 4096;
@@ -2701,7 +2723,7 @@ function definitiveIngestRefusal(status, body) {
   };
 }
 function getIngestJournalPath() {
-  return process.env.HASNA_ECONOMY_INGEST_JOURNAL ?? join9(cacheDir({ app: "economy", home: process.env.HOME || process.env.USERPROFILE }), "pending-ingest");
+  return process.env.HASNA_ECONOMY_INGEST_JOURNAL ?? join8(cacheDir({ app: "economy", home: process.env.HOME || process.env.USERPROFILE }), "pending-ingest");
 }
 function targetId(cloud) {
   const url = new URL(cloud.client.transport.baseUrl);
@@ -2804,7 +2826,7 @@ class IngestJournal {
   constructor(cloud, path = getIngestJournalPath()) {
     this.target = targetId(cloud);
     secureDirectory(path);
-    this.directory = join9(realpathSync(path), this.target);
+    this.directory = join8(realpathSync(path), this.target);
     secureDirectory(this.directory);
   }
   names() {
@@ -2830,7 +2852,7 @@ class IngestJournal {
         throw new Error("Orphaned ingest outcome requires maintenance recovery");
       if (name.endsWith(".refusal.json") && set.has(name.replace(".refusal.", ".receipt.")))
         throw new Error("Conflicting ingest receipt and refusal");
-      const stat = lstatSync(join9(this.directory, name));
+      const stat = lstatSync(join8(this.directory, name));
       if (!stat.isFile() || stat.isSymbolicLink() || (stat.mode & 63) !== 0)
         throw new Error("Unsafe ingest journal record");
       if (stat.size > MAX_INGEST_BYTES + 4096)
@@ -2842,10 +2864,10 @@ class IngestJournal {
     return names;
   }
   file(key, kind) {
-    return join9(this.directory, `${sha(key)}.${kind}.json`);
+    return join8(this.directory, `${sha(key)}.${kind}.json`);
   }
   intent(name) {
-    const record = readJson(join9(this.directory, name), MAX_INGEST_BYTES + 4096);
+    const record = readJson(join8(this.directory, name), MAX_INGEST_BYTES + 4096);
     if (record.version !== 1 || record.target !== this.target || !record.command || typeof record.command.idempotency_key !== "string" || record.body_hash !== canonicalIngestBodyHash(record.command) || name !== `${sha(record.command.idempotency_key)}.intent.json`)
       throw new Error("Invalid ingest journal intent");
     validateIngest(record.command);
@@ -3004,7 +3026,7 @@ class IngestJournal {
 // src/lib/ingest-journal-maintenance.ts
 import { constants as constants2, closeSync as closeSync2, fstatSync as fstatSync2, lstatSync as lstatSync2, openSync as openSync2, readFileSync as readFileSync2, readdirSync as readdirSync2 } from "fs";
 import { createHash as createHash5 } from "crypto";
-import { join as join10 } from "path";
+import { join as join9 } from "path";
 var uuid = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/;
 var digest2 = /^[a-f0-9]{64}$/;
 var sha2 = (bytes) => createHash5("sha256").update(bytes).digest("hex");
@@ -3064,7 +3086,7 @@ async function confirm(cloud, anchor, deadline) {
 }
 async function verifyJournalAuthority(journal, cloud) {
   journal.assertCloud(cloud);
-  const path = join10(journal.directory, ".authority.json");
+  const path = join9(journal.directory, ".authority.json");
   if (!exists(path)) {
     const names = journal.names();
     const name = names.find((n) => n.endsWith(".intent.json") && names.includes(n.replace(".intent.", ".receipt.")));
@@ -3108,8 +3130,8 @@ class IngestJournalMaintenance {
     this.cloud = cloud;
     this.factory = factory;
     journal.assertCloud(cloud);
-    this.control = join10(journal.directory, ".maintenance");
-    this.operationRoot = join10(journal.directory, ".recovery");
+    this.control = join9(journal.directory, ".maintenance");
+    this.operationRoot = join9(journal.directory, ".recovery");
   }
   manifest() {
     secureDirectory(this.control);
@@ -3118,10 +3140,10 @@ class IngestJournalMaintenance {
       throw new Error("Unexpected maintenance entry");
     let size = 0;
     for (const name of names)
-      size += lstatSync2(join10(this.control, name)).size;
+      size += lstatSync2(join9(this.control, name)).size;
     if (size > MAINTENANCE_RESERVE)
       throw new Error("Maintenance metadata exceeds reserve");
-    const m = validAnchor(readJson(join10(this.control, "manifest.json"), 8192), this.journal.target);
+    const m = validAnchor(readJson(join9(this.control, "manifest.json"), 8192), this.journal.target);
     for (const part of [m.intent, m.receipt_file])
       if (!part || !digest2.test(part.sha256) || !digest2.test(part.capture_sha256 ?? "") || !Number.isSafeInteger(part.sizeBytes) || part.sizeBytes < 1 || part.sizeBytes > 4198400 || part.mode !== 384 || !/^\d+$/.test(part.device) || !/^\d+$/.test(part.inode) || !Number.isFinite(part.ctime))
         throw new Error("Invalid maintenance snapshot");
@@ -3146,7 +3168,7 @@ class IngestJournalMaintenance {
         if (!operation.receipt || operation.receipt.sha256 !== expected.capture_sha256 || operation.receipt.sizeBytes !== expected.sizeBytes || operation.receipt.mode !== expected.mode)
           throw new Error("Trash snapshot mismatch");
         sameSource(operation.path, expected);
-        const path = join10(this.control, `${kind}.operation.json`);
+        const path = join9(this.control, `${kind}.operation.json`);
         createExact(path, { id: operation.id });
         if (readJson(path, 1024).id !== operation.id)
           throw new Error("Conflicting Trash operation");
@@ -3171,7 +3193,7 @@ class IngestJournalMaintenance {
   async pairFile(backend, m, kind, deadline) {
     await confirm(this.cloud, m, deadline);
     const path = this.journal.file(m.key, kind), expected = kind === "receipt" ? m.receipt_file : m.intent;
-    const saved = join10(this.control, `${kind}.operation.json`);
+    const saved = join9(this.control, `${kind}.operation.json`);
     let id;
     if (exists(saved))
       id = readJson(saved, 1024).id;
@@ -3277,14 +3299,14 @@ class IngestJournalMaintenance {
           key: intent.command.idempotency_key,
           body_hash: intent.body_hash,
           receipt,
-          intent: snapshot(join10(this.journal.directory, name)),
+          intent: snapshot(join9(this.journal.directory, name)),
           receipt_file: snapshot(this.journal.file(intent.command.idempotency_key, "receipt"))
         };
         await confirm(this.cloud, m, deadline);
         m.intent.capture_sha256 = backend.snapshot(this.journal.file(m.key, "intent")).sha256;
         m.receipt_file.capture_sha256 = backend.snapshot(this.journal.file(m.key, "receipt")).sha256;
         secureDirectory(this.control);
-        if (!createExact(join10(this.control, "manifest.json"), m))
+        if (!createExact(join9(this.control, "manifest.json"), m))
           throw new Error("Existing maintenance transaction");
         await this.finish(backend, deadline);
         retired++;
@@ -3316,7 +3338,7 @@ class IngestJournalMaintenance {
 
 // src/lib/ingest-journal-lock.ts
 import { constants as constants3, closeSync as closeSync3, fstatSync as fstatSync3, lstatSync as lstatSync3, openSync as openSync3 } from "fs";
-import { join as join11 } from "path";
+import { join as join10 } from "path";
 async function withIngestJournalLock(directory, action) {
   if (process.platform !== "linux" && process.platform !== "darwin")
     throw new Error("Ingest journal locking requires Linux or macOS");
@@ -3324,7 +3346,7 @@ async function withIngestJournalLock(directory, action) {
   const library = dlopen(process.platform === "darwin" ? "/usr/lib/libSystem.B.dylib" : "libc.so.6", {
     flock: { args: [FFIType.i32, FFIType.i32], returns: FFIType.i32 }
   });
-  const path = join11(directory, ".lease");
+  const path = join10(directory, ".lease");
   let fd;
   try {
     fd = openSync3(path, constants3.O_RDWR | constants3.O_CREAT | constants3.O_NOFOLLOW | constants3.O_NONBLOCK, 384);
@@ -3345,11 +3367,11 @@ async function withIngestJournalLock(directory, action) {
 }
 
 // src/lib/ingest-journal-operation.ts
-import { z as z2 } from "zod";
-var ingestJournalOperationSchema = z2.discriminatedUnion("action", [
-  z2.object({ action: z2.literal("status") }).strict(),
-  z2.object({ action: z2.literal("reconcile") }).strict(),
-  z2.object({ action: z2.literal("maintain"), confirm: z2.literal(true), limit: z2.number().int().min(1).max(32).default(32) }).strict()
+import { z as z3 } from "zod";
+var ingestJournalOperationSchema = z3.discriminatedUnion("action", [
+  z3.object({ action: z3.literal("status") }).strict(),
+  z3.object({ action: z3.literal("reconcile") }).strict(),
+  z3.object({ action: z3.literal("maintain"), confirm: z3.literal(true), limit: z3.number().int().min(1).max(32).default(32) }).strict()
 ]);
 
 // src/lib/cloud-ingest.ts
@@ -3458,7 +3480,7 @@ async function pushIngestRows(cloud, scratch) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.3",
+  version: "0.5.5",
   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",