@hasna/economy 0.3.26 → 0.3.28

package/dist/otel/index.js

@@ -594,7 +594,8 @@ import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
 import { hostname, platform } from "os";
 import { homedir } from "os";
-import { join } from "path";
+import { join, resolve } from "path";
+import { dataDir } from "@hasna/paths";
 function normalizeMachineId(value) {
   const id = value?.trim().toLowerCase().split(".")[0];
   return id && id.length > 0 ? id : null;
@@ -625,21 +626,48 @@ function getMachineId() {
     return macHostMachineId() ?? hostMachine;
   return hostMachine;
 }
-function getDataDir() {
+function getHomeDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
-  const newDir = join(home, ".hasna", "economy");
-  const oldDir = join(home, ".economy");
-  if (existsSync(oldDir) && !existsSync(newDir)) {
-    mkdirSync(newDir, { recursive: true });
+  if (!home)
+    throw new Error("Could not resolve the user home directory");
+  return home;
+}
+function getResolverDataRoot() {
+  return dataDir({
+    app: "economy",
+    home: process.env["HOME"] || process.env["USERPROFILE"] || undefined
+  });
+}
+function getLegacyDataRoot() {
+  return join(getHomeDir(), ".hasna", "economy");
+}
+function adoptResolverDataRoot(resolved, env = process.env) {
+  const dataOverride = env.HASNA_DATA_HOME;
+  if (typeof dataOverride === "string" && dataOverride.trim().length > 0)
+    return true;
+  return existsSync(join(resolved, "economy.db"));
+}
+function getExactDataRoot() {
+  const dir = process.env["HASNA_ECONOMY_HOME"] ?? process.env["ECONOMY_HOME"];
+  if (dir && dir.trim())
+    return dir.trim();
+  return;
+}
+function getDataDir() {
+  const exact = getExactDataRoot();
+  const effective = exact ? resolve(exact) : adoptResolverDataRoot(getResolverDataRoot()) ? resolve(getResolverDataRoot()) : getLegacyDataRoot();
+  const oldDir = join(getHomeDir(), ".economy");
+  if (existsSync(oldDir) && !existsSync(effective)) {
+    mkdirSync(effective, { recursive: true });
     for (const file of readdirSync(oldDir)) {
       const oldPath = join(oldDir, file);
       if (statSync(oldPath).isFile()) {
-        copyFileSync(oldPath, join(newDir, file));
+        copyFileSync(oldPath, join(effective, file));
       }
     }
   }
-  mkdirSync(newDir, { recursive: true });
-  return newDir;
+  mkdirSync(effective, { recursive: true });
+  return effective;
 }
 function getDbPath() {
   if (process.env["HASNA_ECONOMY_DB_PATH"])
@@ -1385,18 +1413,118 @@ async function ingestOtelRows(db, rows) {
     rollupSession(db, sessionId);
   return { requests, sessions: sessions.size };
 }
+// package.json
+var package_default = {
+  name: "@hasna/economy",
+  version: "0.3.28",
+  description: "AI coding cost tracker \u2014 CLI + MCP server + REST API + web dashboard for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/hasna/economy.git"
+  },
+  bugs: {
+    url: "https://github.com/hasna/economy/issues"
+  },
+  homepage: "https://github.com/hasna/economy#readme",
+  type: "module",
+  main: "dist/index.js",
+  types: "dist/index.d.ts",
+  bin: {
+    economy: "dist/cli/index.js",
+    "economy-mcp": "dist/mcp/index.js",
+    "economy-serve": "dist/server/index.js",
+    "economy-otel": "dist/otel/index.js"
+  },
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js"
+    },
+    "./sdk": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "docs",
+    "dashboard/dist",
+    "postinstall.js",
+    "LICENSE",
+    "README.md",
+    "CHANGELOG.md",
+    "SECURITY.md",
+    "CONTRIBUTING.md",
+    "CODE_OF_CONDUCT.md"
+  ],
+  scripts: {
+    build: "cd dashboard && bun install --frozen-lockfile && bun run build && cd .. && bun build src/cli/index.ts --outdir dist/cli --target bun --packages external && bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external && bun build src/server/index.ts --outdir dist/server --target bun --packages external && bun build src/db/pg-sync-worker.ts --outdir dist/server --target bun --packages external && bun build src/otel/index.ts --outdir dist/otel --target bun --packages external && bun build src/index.ts --outdir dist --target bun --packages external && tsc --emitDeclarationOnly --outDir dist",
+    "build:cli": "bun build src/cli/index.ts --outdir dist/cli --target bun --packages external",
+    "build:mcp": "bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external",
+    "build:server": "bun build src/server/index.ts --outdir dist/server --target bun --packages external",
+    "build:lib": "bun build src/index.ts --outdir dist --target bun --packages external",
+    "build:dashboard": "cd dashboard && bun run build",
+    "artifact-scan": "bun scripts/contracts-cli.mjs artifact-scan dist",
+    prepack: "bun run build && bun run artifact-scan",
+    typecheck: "tsc --noEmit",
+    test: "bun test",
+    "dev:cli": "bun run src/cli/index.ts",
+    "dev:mcp": "bun run src/mcp/index.ts",
+    "dev:serve": "bun run src/server/index.ts",
+    "dev:otel": "bun run src/otel/index.ts",
+    postinstall: "node postinstall.js"
+  },
+  keywords: [
+    "economy",
+    "cost",
+    "ai",
+    "claude",
+    "codex",
+    "gemini",
+    "mcp",
+    "cli",
+    "budget",
+    "tracking"
+  ],
+  author: "hasna",
+  license: "Apache-2.0",
+  publishConfig: {
+    registry: "https://registry.npmjs.org",
+    access: "public"
+  },
+  dependencies: {
+    "@hasna/accounts": "0.2.23",
+    "@hasna/agent-registry": "^0.1.0",
+    "@hasna/contracts": "0.13.4",
+    "@hasna/events": "^0.1.16",
+    "@hasna/mcp-harness": "^0.1.0",
+    "@hasna/paths": "0.1.0",
+    "@hasna/projects": "1.0.0",
+    "@modelcontextprotocol/sdk": "^1.12.1",
+    chalk: "^5.4.1",
+    commander: "^13.1.0",
+    pg: "8.13.1",
+    zod: "^3.24.2"
+  },
+  devDependencies: {
+    "@types/bun": "latest",
+    "@types/pg": "^8.20.0",
+    "bun-types": "latest",
+    typescript: "^5.7.2"
+  },
+  trustedDependencies: [
+    "@hasna/projects"
+  ]
+};
 
 // src/lib/package-metadata.ts
-import { readFileSync } from "fs";
 var cachedMetadata = null;
 function getPackageMetadata() {
   if (cachedMetadata)
     return cachedMetadata;
-  const raw = readFileSync(new URL("../../package.json", import.meta.url), "utf8");
-  const parsed = JSON.parse(raw);
   cachedMetadata = {
-    name: parsed.name ?? "@hasna/economy",
-    version: parsed.version ?? "0.0.0"
+    name: package_default.name ?? "@hasna/economy",
+    version: package_default.version ?? "0.0.0"
   };
   return cachedMetadata;
 }

package/dist/server/index.js

@@ -595,7 +595,8 @@ import { execFileSync } from "child_process";
 import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
 import { hostname, platform } from "os";
 import { homedir } from "os";
-import { join } from "path";
+import { join, resolve } from "path";
+import { dataDir } from "@hasna/paths";
 function normalizeMachineId(value) {
   const id = value?.trim().toLowerCase().split(".")[0];
   return id && id.length > 0 ? id : null;
@@ -626,21 +627,48 @@ function getMachineId() {
     return macHostMachineId() ?? hostMachine;
   return hostMachine;
 }
-function getDataDir() {
+function getHomeDir() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
-  const newDir = join(home, ".hasna", "economy");
-  const oldDir = join(home, ".economy");
-  if (existsSync(oldDir) && !existsSync(newDir)) {
-    mkdirSync(newDir, { recursive: true });
+  if (!home)
+    throw new Error("Could not resolve the user home directory");
+  return home;
+}
+function getResolverDataRoot() {
+  return dataDir({
+    app: "economy",
+    home: process.env["HOME"] || process.env["USERPROFILE"] || undefined
+  });
+}
+function getLegacyDataRoot() {
+  return join(getHomeDir(), ".hasna", "economy");
+}
+function adoptResolverDataRoot(resolved, env = process.env) {
+  const dataOverride = env.HASNA_DATA_HOME;
+  if (typeof dataOverride === "string" && dataOverride.trim().length > 0)
+    return true;
+  return existsSync(join(resolved, "economy.db"));
+}
+function getExactDataRoot() {
+  const dir = process.env["HASNA_ECONOMY_HOME"] ?? process.env["ECONOMY_HOME"];
+  if (dir && dir.trim())
+    return dir.trim();
+  return;
+}
+function getDataDir() {
+  const exact = getExactDataRoot();
+  const effective = exact ? resolve(exact) : adoptResolverDataRoot(getResolverDataRoot()) ? resolve(getResolverDataRoot()) : getLegacyDataRoot();
+  const oldDir = join(getHomeDir(), ".economy");
+  if (existsSync(oldDir) && !existsSync(effective)) {
+    mkdirSync(effective, { recursive: true });
     for (const file of readdirSync(oldDir)) {
       const oldPath = join(oldDir, file);
       if (statSync(oldPath).isFile()) {
-        copyFileSync(oldPath, join(newDir, file));
+        copyFileSync(oldPath, join(effective, file));
       }
     }
   }
-  mkdirSync(newDir, { recursive: true });
-  return newDir;
+  mkdirSync(effective, { recursive: true });
+  return effective;
 }
 function getDbPath() {
   if (process.env["HASNA_ECONOMY_DB_PATH"])
@@ -2874,7 +2902,7 @@ __export(exports_billing, {
   syncGeminiBilling: () => syncGeminiBilling,
   syncAnthropicBilling: () => syncAnthropicBilling
 });
-import { readFileSync as readFileSync9 } from "fs";
+import { readFileSync as readFileSync8 } from "fs";
 function getAnthropicAdminKey() {
   return process.env["HASNAXYZ_ANTHROPIC_LIVE_ADMIN_API_KEY"] ?? process.env["ANTHROPIC_ADMIN_API_KEY"] ?? null;
 }
@@ -3101,7 +3129,7 @@ async function syncGeminiBilling(db, opts = {}) {
   const start = opts.fromDate ? new Date(opts.fromDate) : new Date(end.getTime() - days * 24 * 3600000);
   const fromDateStr = toISODate(start);
   const toDateStr = toISODate(end);
-  const rows = parseBillingRows(readFileSync9(exportPath, "utf-8"));
+  const rows = parseBillingRows(readFileSync8(exportPath, "utf-8"));
   clearBillingRange(db, "gemini", fromDateStr, toDateStr);
   const updatedAt = new Date().toISOString();
   let totalUsd = 0;
@@ -3165,7 +3193,7 @@ var init_open_projects = __esm(() => {
 });
 
 // src/lib/config.ts
-import { existsSync as existsSync12, readFileSync as readFileSync10, writeFileSync, mkdirSync as mkdirSync2 } from "fs";
+import { existsSync as existsSync12, readFileSync as readFileSync9, writeFileSync, mkdirSync as mkdirSync2 } from "fs";
 import { dirname as dirname2, join as join11 } from "path";
 function getConfigPath() {
   return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join11(getDataDir(), "config.json");
@@ -3174,7 +3202,7 @@ function loadConfig() {
   try {
     const configPath = getConfigPath();
     if (existsSync12(configPath)) {
-      const raw = readFileSync10(configPath, "utf-8");
+      const raw = readFileSync9(configPath, "utf-8");
       return { ...DEFAULTS, ...JSON.parse(raw) };
     }
   } catch {}
@@ -4599,10 +4627,18 @@ import { existsSync as existsSync8 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join8 } from "path";
 import { Database as BunDatabase2 } from "bun:sqlite";
-var DEFAULT_LOOPS_DB_PATH = join8(homedir8(), ".hasna", "loops", "loops.db");
+import { dataDir as dataDir2 } from "@hasna/paths";
 var LOOPS_INGEST_VERSION = "goal-runs-orchestration-v1";
+function defaultLoopsDbPath() {
+  const resolved = dataDir2({
+    app: "loops",
+    home: process.env["HOME"] || process.env["USERPROFILE"] || undefined
+  });
+  const legacy = join8(process.env["HOME"] || process.env["USERPROFILE"] || homedir8(), ".hasna", "loops", "loops.db");
+  return existsSync8(join8(resolved, "loops.db")) ? join8(resolved, "loops.db") : legacy;
+}
 function loopsDbPath() {
-  return process.env["HASNA_ECONOMY_LOOPS_DB_PATH"] ?? DEFAULT_LOOPS_DB_PATH;
+  return process.env["HASNA_ECONOMY_LOOPS_DB_PATH"] ?? defaultLoopsDbPath();
 }
 function loopsModel() {
   return process.env["HASNA_ECONOMY_LOOPS_MODEL"] ?? process.env["ECONOMY_LOOPS_MODEL"] ?? "gpt-5.3-codex";
@@ -4786,11 +4822,11 @@ import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
 // src/lib/paths.ts
 import { homedir as homedir9 } from "os";
 import { join as join9 } from "path";
-function getHomeDir() {
+function getHomeDir2() {
   return process.env["USERPROFILE"] ?? process.env["HOME"] ?? homedir9();
 }
 function agentPaths() {
-  const home = getHomeDir();
+  const home = getHomeDir2();
   return {
     claudeProjects: join9(home, ".claude", "projects"),
     claudeCredentials: join9(home, ".claude", ".credentials.json"),
@@ -5975,19 +6011,119 @@ function isAuthorizedRequest(req, path) {
 // src/server/serve.ts
 import { randomUUID } from "crypto";
 import { existsSync as existsSync13 } from "fs";
-import { resolve, sep } from "path";
+import { resolve as resolve2, sep } from "path";
+// package.json
+var package_default = {
+  name: "@hasna/economy",
+  version: "0.3.28",
+  description: "AI coding cost tracker \u2014 CLI + MCP server + REST API + web dashboard for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/hasna/economy.git"
+  },
+  bugs: {
+    url: "https://github.com/hasna/economy/issues"
+  },
+  homepage: "https://github.com/hasna/economy#readme",
+  type: "module",
+  main: "dist/index.js",
+  types: "dist/index.d.ts",
+  bin: {
+    economy: "dist/cli/index.js",
+    "economy-mcp": "dist/mcp/index.js",
+    "economy-serve": "dist/server/index.js",
+    "economy-otel": "dist/otel/index.js"
+  },
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js"
+    },
+    "./sdk": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "docs",
+    "dashboard/dist",
+    "postinstall.js",
+    "LICENSE",
+    "README.md",
+    "CHANGELOG.md",
+    "SECURITY.md",
+    "CONTRIBUTING.md",
+    "CODE_OF_CONDUCT.md"
+  ],
+  scripts: {
+    build: "cd dashboard && bun install --frozen-lockfile && bun run build && cd .. && bun build src/cli/index.ts --outdir dist/cli --target bun --packages external && bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external && bun build src/server/index.ts --outdir dist/server --target bun --packages external && bun build src/db/pg-sync-worker.ts --outdir dist/server --target bun --packages external && bun build src/otel/index.ts --outdir dist/otel --target bun --packages external && bun build src/index.ts --outdir dist --target bun --packages external && tsc --emitDeclarationOnly --outDir dist",
+    "build:cli": "bun build src/cli/index.ts --outdir dist/cli --target bun --packages external",
+    "build:mcp": "bun build src/mcp/index.ts --outdir dist/mcp --target bun --packages external",
+    "build:server": "bun build src/server/index.ts --outdir dist/server --target bun --packages external",
+    "build:lib": "bun build src/index.ts --outdir dist --target bun --packages external",
+    "build:dashboard": "cd dashboard && bun run build",
+    "artifact-scan": "bun scripts/contracts-cli.mjs artifact-scan dist",
+    prepack: "bun run build && bun run artifact-scan",
+    typecheck: "tsc --noEmit",
+    test: "bun test",
+    "dev:cli": "bun run src/cli/index.ts",
+    "dev:mcp": "bun run src/mcp/index.ts",
+    "dev:serve": "bun run src/server/index.ts",
+    "dev:otel": "bun run src/otel/index.ts",
+    postinstall: "node postinstall.js"
+  },
+  keywords: [
+    "economy",
+    "cost",
+    "ai",
+    "claude",
+    "codex",
+    "gemini",
+    "mcp",
+    "cli",
+    "budget",
+    "tracking"
+  ],
+  author: "hasna",
+  license: "Apache-2.0",
+  publishConfig: {
+    registry: "https://registry.npmjs.org",
+    access: "public"
+  },
+  dependencies: {
+    "@hasna/accounts": "0.2.23",
+    "@hasna/agent-registry": "^0.1.0",
+    "@hasna/contracts": "0.13.4",
+    "@hasna/events": "^0.1.16",
+    "@hasna/mcp-harness": "^0.1.0",
+    "@hasna/paths": "0.1.0",
+    "@hasna/projects": "1.0.0",
+    "@modelcontextprotocol/sdk": "^1.12.1",
+    chalk: "^5.4.1",
+    commander: "^13.1.0",
+    pg: "8.13.1",
+    zod: "^3.24.2"
+  },
+  devDependencies: {
+    "@types/bun": "latest",
+    "@types/pg": "^8.20.0",
+    "bun-types": "latest",
+    typescript: "^5.7.2"
+  },
+  trustedDependencies: [
+    "@hasna/projects"
+  ]
+};
 
 // src/lib/package-metadata.ts
-import { readFileSync as readFileSync8 } from "fs";
 var cachedMetadata = null;
 function getPackageMetadata() {
   if (cachedMetadata)
     return cachedMetadata;
-  const raw = readFileSync8(new URL("../../package.json", import.meta.url), "utf8");
-  const parsed = JSON.parse(raw);
   cachedMetadata = {
-    name: parsed.name ?? "@hasna/economy",
-    version: parsed.version ?? "0.0.0"
+    name: package_default.name ?? "@hasna/economy",
+    version: package_default.version ?? "0.0.0"
   };
   return cachedMetadata;
 }
@@ -7709,8 +7845,8 @@ function dashboardPath(root, pathname) {
     return null;
   }
   const relativePath = decoded === "/" ? "index.html" : decoded.replace(/^\/+/, "");
-  const rootPath = resolve(root);
-  const filePath = resolve(rootPath, relativePath);
+  const rootPath = resolve2(root);
+  const filePath = resolve2(rootPath, relativePath);
   return filePath === rootPath || filePath.startsWith(rootPath + sep) ? filePath : null;
 }
 var FOUNDATION_PATHS = new Set(["/health", "/healthz", "/ready", "/readyz", "/version", "/openapi.json"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "description": "AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   "repository": {
     "type": "git",
@@ -23,12 +23,17 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
+    },
+    "./sdk": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     }
   },
   "files": [
     "dist",
     "docs",
     "dashboard/dist",
+    "postinstall.js",
     "LICENSE",
     "README.md",
     "CHANGELOG.md",
@@ -51,7 +56,7 @@
     "dev:mcp": "bun run src/mcp/index.ts",
     "dev:serve": "bun run src/server/index.ts",
     "dev:otel": "bun run src/otel/index.ts",
-    "postinstall": "mkdir -p $HOME/.hasna/economy/training 2>/dev/null || true"
+    "postinstall": "node postinstall.js"
   },
   "keywords": [
     "economy",
@@ -77,6 +82,7 @@
     "@hasna/contracts": "0.13.4",
     "@hasna/events": "^0.1.16",
     "@hasna/mcp-harness": "^0.1.0",
+    "@hasna/paths": "0.1.0",
     "@hasna/projects": "1.0.0",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "chalk": "^5.4.1",

package/postinstall.js

@@ -0,0 +1,31 @@
+// Best-effort install-time creation of the economy data home, resolving the
+// SAME effective data root the runtime uses (src/db/database.ts getDataDir):
+// an exact-app override (HASNA_ECONOMY_HOME / ECONOMY_HOME) wins; otherwise
+// the @hasna/paths XDG data home once adopted (HASNA_DATA_HOME set, or
+// economy.db already migrated there); otherwise the legacy
+// ~/.hasna/economy default. Failures are non-fatal: the runtime getDataDir()
+// creates the same directories on first use.
+import { existsSync, mkdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+const EXACT_OVERRIDE = (process.env["HASNA_ECONOMY_HOME"] || process.env["ECONOMY_HOME"] || "").trim();
+const DATA_HOME_OVERRIDE = (process.env["HASNA_DATA_HOME"] || "").trim();
+
+try {
+  const { dataDir } = await import("@hasna/paths");
+  const resolved = dataDir({ app: "economy" });
+  let root;
+  if (EXACT_OVERRIDE) {
+    root = EXACT_OVERRIDE;
+  } else if (DATA_HOME_OVERRIDE || existsSync(join(resolved, "economy.db"))) {
+    root = resolved;
+  } else {
+    root = join(homedir(), ".hasna", "economy");
+  }
+  for (const dir of [root, join(root, "training")]) {
+    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  }
+} catch {
+  // never fail an install over pre-created directories
+}