@hasna/economy 0.3.28 → 0.4.0

package/dist/cli/index.js

@@ -596,7 +596,62 @@ import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
 import { hostname, platform } from "os";
 import { homedir } from "os";
 import { join, resolve } from "path";
-import { dataDir } from "@hasna/paths";
+import { homedir as pathsResolverHomedir } from "os";
+import { join as pathsResolverJoin } from "path";
+function pathsResolverAssertApp(app) {
+  if (typeof app !== "string" || app.length === 0) {
+    throw new TypeError("paths: app must be a non-empty string");
+  }
+  if (!PATHS_RESOLVER_APP_SLUG_RE.test(app)) {
+    throw new TypeError(`paths: invalid app slug "${app}" \u2014 expected lowercase kebab-case ([a-z0-9]+(-[a-z0-9]+)*)`);
+  }
+}
+function pathsResolverAssertKind(kind) {
+  if (!Object.keys(PATHS_RESOLVER_KIND_ENV).includes(kind)) {
+    throw new TypeError(`paths: invalid path kind "${kind}" \u2014 expected one of ${Object.keys(PATHS_RESOLVER_KIND_ENV).join(", ")}`);
+  }
+}
+function pathsResolverBaseDir(kind, options) {
+  pathsResolverAssertKind(kind);
+  const env = options.env ?? process.env;
+  const override = env[PATHS_RESOLVER_KIND_ENV[kind]];
+  if (typeof override === "string" && override.length > 0)
+    return override;
+  const home = options.home ?? pathsResolverHomedir();
+  const platform2 = options.platform ?? process.platform;
+  if (platform2 === "darwin") {
+    switch (kind) {
+      case "config":
+      case "data":
+        return pathsResolverJoin(home, "Library", "Application Support", "Hasna");
+      case "cache":
+        return pathsResolverJoin(home, "Library", "Caches", "Hasna");
+      case "state":
+        return pathsResolverJoin(home, "Library", "Logs", "Hasna");
+    }
+  }
+  switch (kind) {
+    case "config":
+      return pathsResolverJoin(home, ".config", "hasna");
+    case "data":
+      return pathsResolverJoin(home, ".local", "share", "hasna");
+    case "state":
+      return pathsResolverJoin(home, ".local", "state", "hasna");
+    case "cache":
+      return pathsResolverJoin(home, ".cache", "hasna");
+  }
+}
+function pathsResolverResolve(kind, options) {
+  pathsResolverAssertApp(options.app);
+  const appSegment = options.internal === true ? pathsResolverJoin("internal", options.app) : options.app;
+  return pathsResolverJoin(pathsResolverBaseDir(kind, options), appSegment);
+}
+function dataDir(options) {
+  return pathsResolverResolve("data", options);
+}
+function cacheDir(options) {
+  return pathsResolverResolve("cache", options);
+}
 function normalizeMachineId(value) {
   const id = value?.trim().toLowerCase().split(".")[0];
   return id && id.length > 0 ? id : null;
@@ -619,7 +674,7 @@ function macHostMachineId() {
   return null;
 }
 function getMachineId() {
-  const envMachine = normalizeMachineId(process.env["ECONOMY_MACHINE_ID"]);
+  const envMachine = normalizeMachineId(process.env["HASNA_ECONOMY_MACHINE_ID"]);
   if (envMachine)
     return envMachine;
   const hostMachine = normalizeMachineId(hostname()) ?? "unknown";
@@ -1947,6 +2002,10 @@ function getIngestState(db, source, key) {
   const row = db.prepare(`SELECT value FROM ingest_state WHERE source = ? AND key = ?`).get(source, key);
   return row?.value ?? null;
 }
+function loadIngestState(db, source) {
+  const rows = db.prepare(`SELECT key, value FROM ingest_state WHERE source = ?`).all(source);
+  return new Map(rows.map((row) => [row.key, row.value]));
+}
 function setIngestState(db, source, key, value) {
   db.prepare(`INSERT OR REPLACE INTO ingest_state (source, key, value) VALUES (?, ?, ?)`).run(source, key, value);
 }
@@ -2392,7 +2451,7 @@ function bulkIngest(db, body) {
   const total = Object.values(ingested).reduce((a, b) => a + b, 0);
   return { ingested, total };
 }
-var numOr = (v, d = 0) => {
+var PATHS_RESOLVER_KIND_ENV, PATHS_RESOLVER_APP_SLUG_RE, numOr = (v, d = 0) => {
   if (v == null)
     return d;
   const num = Number(v);
@@ -2400,6 +2459,13 @@ var numOr = (v, d = 0) => {
 }, strOr = (v, d = "") => v == null ? d : String(v);
 var init_database = __esm(() => {
   init_sqlite_adapter();
+  PATHS_RESOLVER_KIND_ENV = {
+    config: "HASNA_CONFIG_HOME",
+    data: "HASNA_DATA_HOME",
+    state: "HASNA_STATE_HOME",
+    cache: "HASNA_CACHE_HOME"
+  };
+  PATHS_RESOLVER_APP_SLUG_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 });
 
 // package.json
@@ -2407,8 +2473,8 @@ var package_default;
 var init_package = __esm(() => {
   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",
+    version: "0.4.0",
+    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",
       url: "git+https://github.com/hasna/economy.git"
@@ -2439,7 +2505,6 @@ var init_package = __esm(() => {
     files: [
       "dist",
       "docs",
-      "dashboard/dist",
       "postinstall.js",
       "LICENSE",
       "README.md",
@@ -2449,12 +2514,11 @@ var init_package = __esm(() => {
       "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: "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",
@@ -2484,12 +2548,8 @@ var init_package = __esm(() => {
       access: "public"
     },
     dependencies: {
-      "@hasna/accounts": "0.2.23",
-      "@hasna/agent-registry": "^0.1.0",
-      "@hasna/contracts": "0.13.4",
+      "@hasna/contracts": "1.0.2",
       "@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",
@@ -2498,7 +2558,7 @@ var init_package = __esm(() => {
       zod: "^3.24.2"
     },
     devDependencies: {
-      "@types/bun": "latest",
+      "@types/bun": "1.3.14",
       "@types/pg": "^8.20.0",
       "bun-types": "latest",
       typescript: "^5.7.2"
@@ -3513,18 +3573,133 @@ function queryModelEfficiency(db) {
      FROM requests GROUP BY model ORDER BY cost DESC`).all();
 }
 
-// src/lib/contracts-client/storage.ts
-import { resolveStorageClient } from "@hasna/contracts/client/storage";
-var init_storage = () => {};
-
 // src/lib/cloud-storage.ts
+import {
+  appConfigDiskValue,
+  ClientTransportConfigurationError,
+  clientTransportEnvKeys,
+  createClientTransport,
+  credentialDiskSources,
+  credentialOverrideEnvKey,
+  credentialPointerEnvKey,
+  CREDENTIAL_PROFILE_ENV_KEY,
+  keychainConfigValue
+} from "@hasna/contracts/client";
+import { createHasnaStorageClient } from "@hasna/contracts/client/storage";
+function assertNoRetiredStorageMode(env) {
+  const legacyKey = RETIRED_STORAGE_MODE_KEYS.find((key) => Object.hasOwn(env, key) && env[key] !== undefined);
+  if (!legacyKey)
+    return;
+  throw new Error(`${legacyKey} was removed. Deployment modes no longer exist: delete the storage-mode variable. ` + `The client routes through the HTTP API resolved by @hasna/contracts ` + `(HASNA_ECONOMY_API_URL + HASNA_ECONOMY_API_KEY, the Keychain, or ` + `~/.hasna/economy/config/credentials), or serves the local SQLite store only when ` + `HASNA_ECONOMY_LOCAL=1 is set.`);
+}
+function envFlagSet(env, key) {
+  const raw = env[key];
+  if (raw === undefined)
+    return false;
+  const value = raw.trim().toLowerCase();
+  return value !== "" && value !== "0" && value !== "false" && value !== "no" && value !== "off";
+}
+function localStorageExplicitlyOptedIn(env) {
+  return LOCAL_STORAGE_OPT_IN_KEYS.some((key) => envFlagSet(env, key));
+}
+function economyAuthorityEnvKeys() {
+  const keys = clientTransportEnvKeys(ECONOMY_APP);
+  return [
+    ...keys.apiUrlKeys,
+    ...keys.apiKeyKeys,
+    credentialOverrideEnvKey(ECONOMY_APP),
+    credentialPointerEnvKey(ECONOMY_APP),
+    CREDENTIAL_PROFILE_ENV_KEY
+  ];
+}
+function hasEconomyEnvAuthorityIntent(env) {
+  return economyAuthorityEnvKeys().some((key) => (env[key] ?? "").trim().length > 0);
+}
+function hostedAuthorityConfigured(env, options = {}) {
+  const keys = clientTransportEnvKeys(ECONOMY_APP);
+  if (keys.apiUrlKeys.some((key) => (env[key] ?? "").trim().length > 0))
+    return true;
+  if (keychainConfigValue(ECONOMY_APP, env, options.credentials?.keychain) !== null)
+    return true;
+  return appConfigDiskValue(ECONOMY_APP, env, keys.apiUrlKeys) !== null;
+}
+function economyResolverEnv(env) {
+  const blanks = economyAuthorityEnvKeys().filter((key) => (key in env) && (env[key] ?? "").trim() === "");
+  if (blanks.length === 0)
+    return env;
+  const next = { ...env };
+  for (const key of blanks)
+    delete next[key];
+  return next;
+}
+function isAmbientEconomyEnv(env) {
+  if (typeof process !== "undefined" && env === process.env)
+    return true;
+  return env[CONTRACTS_AMBIENT_ENVIRONMENT] === true;
+}
+function economyResolverInputs(env, credentials = {}) {
+  const normalised = economyResolverEnv(env);
+  if (normalised === env)
+    return { env: normalised, credentials };
+  const keychain = { ...credentials.keychain };
+  if (keychain.enabled === undefined && keychain.run === undefined) {
+    keychain.enabled = isAmbientEconomyEnv(env);
+  }
+  return { env: normalised, credentials: { ...credentials, keychain } };
+}
+function resolveEconomyStorageClient(name, env, overrides = {}) {
+  const { env: resolverEnv, credentials } = economyResolverInputs(env, overrides.credentials);
+  const wired = createClientTransport(name, resolverEnv, {
+    credentials,
+    ...overrides.fetchImpl ? { fetchImpl: overrides.fetchImpl } : {},
+    ...overrides.headers ? { headers: overrides.headers } : {},
+    ...overrides.timeoutMs ? { timeoutMs: overrides.timeoutMs } : {},
+    ...overrides.retry !== undefined ? { retry: overrides.retry } : {},
+    ...overrides.sleepImpl ? { sleepImpl: overrides.sleepImpl } : {}
+  });
+  return {
+    transport: "http",
+    client: createHasnaStorageClient(name, wired.client),
+    resolution: wired.resolution
+  };
+}
+function localEconomyNotice() {
+  return `economy: local mode (${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1) \u2014 reading and writing the on-box ` + `SQLite store, not the hosted fleet. Data in the shared economy API is NOT included.`;
+}
+function credentialRequiredError(env, cause) {
+  const keys = clientTransportEnvKeys(ECONOMY_APP);
+  const clientEnv = env;
+  const detail = cause instanceof Error ? cause.message : `No API key could be resolved for '${ECONOMY_APP}'. Looked in the Keychain (macOS only), ` + `then for a credential file at ${credentialDiskSources(ECONOMY_APP, clientEnv).join(" or ") || "<no HOME set>"}, ` + `then for ${keys.apiKeyKeys[0]} in the environment.`;
+  const wayOut = hostedAuthorityConfigured(clientEnv) ? `${keys.apiUrlKeys[0]} (or the Keychain hasna.credentials.${ECONOMY_APP}.api-url item, or ` + `~/.hasna/${ECONOMY_APP}/config/credentials) selects a hosted service, so ${LOCAL_STORAGE_OPT_IN_KEYS[0]} ` + `does not apply; unset the authority to use the local store.` : `Or set ${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1 to explicitly opt into the local store.`;
+  return new Error(`Economy fails closed instead of silently serving the local SQLite store: ${detail} ` + `Set ${keys.apiUrlKeys[0]} and ${keys.apiKeyKeys[0]} (or store the key in the Keychain item ` + `hasna.credentials.${ECONOMY_APP}.api-key, or in ~/.hasna/${ECONOMY_APP}/config/credentials) to use the ` + `hosted economy API at ${keys.apiUrlKeys[0]} or the default fleet gateway. ` + wayOut);
+}
 function resolveEconomyCloudStorage(env = process.env, overrides) {
-  const resolved = resolveStorageClient(ECONOMY_APP, env, overrides);
-  return resolved.transport === "http" ? { active: true, client: resolved.client } : { active: false, client: null };
+  assertNoRetiredStorageMode(env);
+  const clientEnv = env;
+  if (localStorageExplicitlyOptedIn(env) && !hasEconomyEnvAuthorityIntent(clientEnv)) {
+    return { active: false, client: null };
+  }
+  let resolved;
+  try {
+    resolved = resolveEconomyStorageClient(ECONOMY_APP, clientEnv, overrides ?? {});
+  } catch (error) {
+    if (error instanceof ClientTransportConfigurationError) {
+      throw credentialRequiredError(env, error);
+    }
+    throw error;
+  }
+  return { active: true, client: resolved.client };
 }
 function economyCloudStorage(env = process.env) {
-  if (cache === undefined)
+  if (cache === undefined) {
     cache = resolveEconomyCloudStorage(env);
+    if (!cache.active && !localNoticePrinted) {
+      localNoticePrinted = true;
+      if (typeof process !== "undefined")
+        process.stderr.write(`${localEconomyNotice()}
+`);
+    }
+  }
   return cache;
 }
 function cleanQuery(query) {
@@ -3550,9 +3725,59 @@ async function cloudObject(storage, path, query) {
   }
   return raw;
 }
-var ECONOMY_APP = "economy", cache;
+function economyTransportReport(env = process.env, overrides) {
+  const clientEnv = env;
+  assertNoRetiredStorageMode(env);
+  if (localStorageExplicitlyOptedIn(env) && !hasEconomyEnvAuthorityIntent(clientEnv)) {
+    return {
+      ok: true,
+      selected: true,
+      transport: "sqlite",
+      source: "local-opt-in",
+      authority: null,
+      issues: []
+    };
+  }
+  try {
+    const resolved = resolveEconomyStorageClient(ECONOMY_APP, clientEnv, overrides ?? {});
+    return {
+      ok: true,
+      selected: true,
+      transport: "http",
+      source: resolved.resolution.transportSource,
+      authority: {
+        baseUrl: resolved.resolution.baseUrl,
+        apiUrlSource: resolved.resolution.apiUrlSource,
+        apiKeySource: resolved.resolution.apiKeySource,
+        apiKeyTier: resolved.resolution.apiKeyTier,
+        warning: resolved.resolution.warning
+      },
+      issues: []
+    };
+  } catch (error) {
+    if (error instanceof ClientTransportConfigurationError) {
+      return {
+        ok: false,
+        selected: true,
+        transport: "http",
+        source: null,
+        authority: null,
+        issues: [error.message]
+      };
+    }
+    throw error;
+  }
+}
+var ECONOMY_APP = "economy", RETIRED_STORAGE_MODE_KEYS, LOCAL_STORAGE_OPT_IN_KEYS, CONTRACTS_AMBIENT_ENVIRONMENT, cache, localNoticePrinted = false;
 var init_cloud_storage = __esm(() => {
-  init_storage();
+  RETIRED_STORAGE_MODE_KEYS = [
+    "HASNA_ECONOMY_STORAGE_MODE",
+    "HASNA_ECONOMY_MODE",
+    "ECONOMY_STORAGE_MODE",
+    "ECONOMY_MODE"
+  ];
+  LOCAL_STORAGE_OPT_IN_KEYS = ["HASNA_ECONOMY_LOCAL", "ECONOMY_LOCAL"];
+  CONTRACTS_AMBIENT_ENVIRONMENT = Symbol.for("hasna:contracts:ambientClientEnvironment");
 });
 
 // src/lib/store/index.ts
@@ -3953,7 +4178,7 @@ var init_store = __esm(() => {
 
 // src/lib/serve-auth.ts
 function getServeApiToken() {
-  return process.env["ECONOMY_API_TOKEN"] ?? process.env["HASNA_ECONOMY_API_TOKEN"];
+  return process.env["HASNA_ECONOMY_API_TOKEN"];
 }
 function getServeBindHost() {
   const explicit = process.env["ECONOMY_BIND"] ?? process.env["ECONOMY_HOST"];
@@ -3985,7 +4210,7 @@ __export(exports_tui, {
   buildWaybarJson: () => buildWaybarJson,
   buildStatusLine: () => buildStatusLine
 });
-import chalk3 from "chalk";
+import chalk2 from "chalk";
 function fmt(usd) {
   return "$" + usd.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
@@ -4063,20 +4288,20 @@ async function runTui(opts) {
   const render = async () => {
     const data = await gatherStatusData();
     process.stdout.write("\x1B[H\x1B[2J");
-    console.log(chalk3.bold.cyan("  economy"));
-    console.log(chalk3.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-    console.log(`  Today   ${chalk3.green(fmt(data.today.total_usd))}   ${data.today.sessions} sessions`);
+    console.log(chalk2.bold.cyan("  economy"));
+    console.log(chalk2.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(`  Today   ${chalk2.green(fmt(data.today.total_usd))}   ${data.today.sessions} sessions`);
     console.log(`  Week    ${fmt(data.week.total_usd)}   ${data.week.sessions} sessions`);
     console.log(`  Month   ${fmt(data.month.total_usd)}   saved ${fmt(data.savings.saved_usd)}`);
-    console.log(chalk3.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(chalk2.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
     console.log(`  Top agent: ${data.topAgent}`);
     if (data.quota)
       console.log(`  Quota:     ${data.quota}`);
     console.log(`  Fleet:     ${data.machineCount} machines`);
     console.log(`  Store:     ${data.transport === "cloud-http" ? "self_hosted (cloud API)" : "local"}`);
     if (getServeApiToken())
-      console.log(chalk3.dim("  API auth:  ECONOMY_API_TOKEN set"));
-    console.log(chalk3.dim(`
+      console.log(chalk2.dim("  API auth:  HASNA_ECONOMY_API_TOKEN set"));
+    console.log(chalk2.dim(`
   ${opts.watch ? `Refreshing every ${interval}s \u2014 Ctrl+C to exit` : "Run with --watch for live refresh"}`));
   };
   await render();
@@ -4122,32 +4347,344 @@ var init_agents = __esm(() => {
 
 // src/lib/paths.ts
 import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
+import { join as join2 } from "path";
 function getHomeDir2() {
   return process.env["USERPROFILE"] ?? process.env["HOME"] ?? homedir2();
 }
 function agentPaths() {
   const home = getHomeDir2();
   return {
-    claudeProjects: join4(home, ".claude", "projects"),
-    claudeCredentials: join4(home, ".claude", ".credentials.json"),
-    takumiProjects: join4(home, ".takumi", "projects"),
-    codexDir: join4(home, ".codex"),
-    codexDb: join4(home, ".codex", "state_5.sqlite"),
-    codexAuth: join4(home, ".codex", "auth.json"),
-    codexConfig: join4(home, ".codex", "config.toml"),
-    geminiTmp: join4(home, ".gemini", "tmp"),
-    geminiHistory: join4(home, ".gemini", "history"),
-    opencodeMessages: join4(home, ".local", "share", "opencode", "storage", "message"),
-    piSessions: join4(home, ".pi", "agent", "sessions"),
-    hermesDir: join4(home, ".hermes"),
-    hermesDb: join4(home, ".hermes", "state.db")
+    claudeProjects: join2(home, ".claude", "projects"),
+    claudeCredentials: join2(home, ".claude", ".credentials.json"),
+    takumiProjects: join2(home, ".takumi", "projects"),
+    codexDir: join2(home, ".codex"),
+    codexDb: join2(home, ".codex", "state_5.sqlite"),
+    codexAuth: join2(home, ".codex", "auth.json"),
+    codexConfig: join2(home, ".codex", "config.toml"),
+    geminiTmp: join2(home, ".gemini", "tmp"),
+    geminiHistory: join2(home, ".gemini", "history"),
+    opencodeMessages: join2(home, ".local", "share", "opencode", "storage", "message"),
+    piSessions: join2(home, ".pi", "agent", "sessions"),
+    hermesDir: join2(home, ".hermes"),
+    hermesDb: join2(home, ".hermes", "state.db")
   };
 }
 var init_paths = () => {};
 
+// src/lib/accounts-store.ts
+import { existsSync as existsSync3, readFileSync } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join4 } from "path";
+import { z } from "zod";
+import { resolveClientTransport, resolveCredential } from "@hasna/contracts/client";
+function validateEnvPath(value, label) {
+  const trimmed = value.trim();
+  if (!trimmed || trimmed.includes("\x00") || /[\r\n]/.test(trimmed))
+    throw new Error(`invalid ${label}`);
+  return trimmed;
+}
+function accountsHome() {
+  const override = process.env.ACCOUNTS_HOME;
+  if (override && override.trim())
+    return validateEnvPath(override, "ACCOUNTS_HOME");
+  return join4(homedir3(), ".hasna", "accounts");
+}
+function storePath() {
+  const override = process.env.ACCOUNTS_STORE_PATH;
+  if (override && override.trim())
+    return validateEnvPath(override, "ACCOUNTS_STORE_PATH");
+  return join4(accountsHome(), "accounts.json");
+}
+function parseStoreFile() {
+  const path = storePath();
+  if (!existsSync3(path))
+    return structuredClone(EMPTY_STORE);
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync(path, "utf8"));
+  } catch (err) {
+    throw new Error(`could not parse store at ${path}: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  const parsed = storeSchema.safeParse(raw);
+  if (!parsed.success) {
+    throw new Error(`invalid store at ${path}: ${parsed.error.issues.map((issue) => issue.message).join("; ")}`);
+  }
+  return parsed.data;
+}
+function loadAppliedMap() {
+  const applied = {};
+  for (const [toolId, name] of Object.entries(parseStoreFile().applied)) {
+    if (name && profileNameSchema.safeParse(name).success)
+      applied[toolId] = name;
+  }
+  return applied;
+}
+function appliedProfileName(toolId) {
+  return loadAppliedMap()[toolId];
+}
+
+class LocalStore2 {
+  transport = "local";
+  async listProfiles(tool) {
+    const profiles = parseStoreFile().profiles;
+    const filtered = tool ? profiles.filter((profile) => profile.tool === tool) : profiles;
+    return filtered.slice().sort((a, b) => a.tool.localeCompare(b.tool) || a.name.localeCompare(b.name));
+  }
+  async findProfile(name, tool) {
+    const matches = parseStoreFile().profiles.filter((profile) => profile.name === name && (!tool || profile.tool === tool));
+    return matches.length === 1 ? matches[0] : undefined;
+  }
+  async currentProfile(tool) {
+    const store = parseStoreFile();
+    const name = store.current[tool];
+    if (!name)
+      return;
+    return store.profiles.find((profile) => profile.name === name && profile.tool === tool);
+  }
+  async listTools() {
+    const custom = parseStoreFile().tools;
+    const byId = new Map;
+    for (const tool of BUILTIN_TOOLS)
+      byId.set(tool.id, tool);
+    for (const tool of custom)
+      byId.set(tool.id, tool);
+    return [...byId.values()].sort((a, b) => a.id.localeCompare(b.id));
+  }
+}
+function assertNoRetiredStorageMode2(env) {
+  const legacyKey = RETIRED_STORAGE_MODE_KEYS2.find((key) => Object.hasOwn(env, key) && env[key] !== undefined);
+  if (!legacyKey)
+    return;
+  throw new Error(`${legacyKey} was removed. Deployment modes no longer exist: delete the storage-mode variable. ` + `The accounts registry uses the local JSON store, or the HTTP API selected by ` + `HASNA_ACCOUNTS_API_URL + HASNA_ACCOUNTS_API_KEY.`);
+}
+function isNotFound(err) {
+  return Boolean(err && typeof err === "object" && err.status === 404);
+}
+function sleep(ms) {
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
+}
+async function cloudRequest(baseUrl, apiKey, path, query) {
+  const rel = path.startsWith("/") ? path : `/${path}`;
+  const url = query && Object.keys(query).length > 0 ? `${baseUrl}${rel}?${new URLSearchParams(query).toString()}` : `${baseUrl}${rel}`;
+  let lastError;
+  for (let attempt = 0;attempt < 3; attempt += 1) {
+    const controller = new AbortController;
+    const timer = setTimeout(() => controller.abort(), 30000);
+    let res;
+    try {
+      res = await fetch(url, {
+        method: "GET",
+        headers: {
+          "x-api-key": apiKey,
+          Authorization: `Bearer ${apiKey}`,
+          Accept: "application/json"
+        },
+        signal: controller.signal
+      });
+    } catch (error) {
+      lastError = error instanceof Error ? error : new Error(String(error));
+      clearTimeout(timer);
+      if (attempt < 2) {
+        const backoff = Math.min(2000, 200 * 2 ** attempt);
+        const jitter = Math.floor(Math.random() * (backoff / 2 + 1));
+        await sleep(backoff + jitter);
+      }
+      continue;
+    } finally {
+      clearTimeout(timer);
+    }
+    const text = await res.text();
+    let parsed;
+    if (text.length > 0) {
+      try {
+        parsed = JSON.parse(text);
+      } catch {
+        parsed = text;
+      }
+    }
+    if (!res.ok) {
+      lastError = new AccountsApiError("GET", rel, res.status, parsed);
+      if (attempt < 2 && RETRY_STATUSES.includes(res.status)) {
+        const backoff = Math.min(2000, 200 * 2 ** attempt);
+        const jitter = Math.floor(Math.random() * (backoff / 2 + 1));
+        await sleep(backoff + jitter);
+        continue;
+      }
+      break;
+    }
+    return parsed;
+  }
+  throw lastError;
+}
+function toProfile(account) {
+  const profile = {
+    name: String(account.name),
+    tool: String(account.tool),
+    dir: typeof account.dir === "string" ? account.dir : "",
+    createdAt: String(account.createdAt)
+  };
+  if (typeof account.email === "string")
+    profile.email = account.email;
+  if (typeof account.displayName === "string")
+    profile.displayName = account.displayName;
+  if (typeof account.description === "string")
+    profile.description = account.description;
+  if (typeof account.lastUsedAt === "string")
+    profile.lastUsedAt = account.lastUsedAt;
+  return profile;
+}
+
+class ApiStore2 {
+  baseUrl;
+  apiKey;
+  transport = "api";
+  constructor(baseUrl, apiKey) {
+    this.baseUrl = baseUrl;
+    this.apiKey = apiKey;
+  }
+  async listProfiles(tool) {
+    const raw = await cloudRequest(this.baseUrl, this.apiKey, "/accounts", tool ? { tool } : undefined);
+    const accounts = Array.isArray(raw?.accounts) ? raw.accounts : [];
+    return accounts.map((account) => toProfile(account)).sort((a, b) => a.tool.localeCompare(b.tool) || a.name.localeCompare(b.name));
+  }
+  async findProfile(name, tool) {
+    if (tool) {
+      try {
+        const account = await cloudRequest(this.baseUrl, this.apiKey, `/accounts/${encodeURIComponent(tool)}/${encodeURIComponent(name)}`);
+        return account ? toProfile(account) : undefined;
+      } catch (err) {
+        if (isNotFound(err))
+          return;
+        throw err;
+      }
+    }
+    const matches = (await this.listProfiles()).filter((profile) => profile.name === name);
+    return matches.length === 1 ? matches[0] : undefined;
+  }
+  async currentProfile(tool) {
+    let current;
+    try {
+      const raw = await cloudRequest(this.baseUrl, this.apiKey, `/current/${encodeURIComponent(tool)}`);
+      current = raw && typeof raw === "object" ? raw : null;
+    } catch (err) {
+      if (isNotFound(err))
+        return;
+      throw err;
+    }
+    if (!current || typeof current.name !== "string")
+      return;
+    return this.findProfile(current.name, tool);
+  }
+  async listTools() {
+    const raw = await cloudRequest(this.baseUrl, this.apiKey, "/tools");
+    const tools = Array.isArray(raw?.tools) ? raw.tools : [];
+    const custom = [];
+    for (const item of tools) {
+      if (item === null || typeof item !== "object")
+        continue;
+      const record = item;
+      if (record.builtin !== false)
+        continue;
+      const parsed = toolDefSchema.safeParse(item);
+      if (!parsed.success) {
+        throw new Error(`invalid custom tool "${String(record.id)}" returned by accounts-serve: ` + parsed.error.issues.map((issue) => issue.message).join("; "));
+      }
+      custom.push(parsed.data);
+    }
+    const byId = new Map;
+    for (const tool of BUILTIN_TOOLS)
+      byId.set(tool.id, tool);
+    for (const tool of custom)
+      byId.set(tool.id, tool);
+    return [...byId.values()].sort((a, b) => a.id.localeCompare(b.id));
+  }
+}
+function resolveStore(env = process.env, options = {}) {
+  assertNoRetiredStorageMode2(env);
+  const clientEnv = env;
+  try {
+    const credential = resolveCredential(ACCOUNTS_APP, clientEnv, options.credentials);
+    if (credential === null)
+      return new LocalStore2;
+    const resolution = resolveClientTransport(ACCOUNTS_APP, clientEnv, {
+      credentials: credential ? { ...options.credentials, apiKey: credential.apiKey } : options.credentials
+    });
+    return new ApiStore2(resolution.baseUrl, credential.apiKey);
+  } catch (err) {
+    console.warn(`accounts: API configuration unusable (${err instanceof Error ? err.message : String(err)}); using local store`);
+    return new LocalStore2;
+  }
+}
+var ACCOUNTS_APP = "accounts", profileNameSchema, profileSchema, toolDefSchema, storeSchema, EMPTY_STORE, BUILTIN_TOOLS, RETIRED_STORAGE_MODE_KEYS2, RETRY_STATUSES, AccountsApiError;
+var init_accounts_store = __esm(() => {
+  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");
+  profileSchema = z.object({
+    name: z.string(),
+    tool: z.string(),
+    email: z.string().optional(),
+    displayName: z.string().optional(),
+    dir: z.string(),
+    description: z.string().optional(),
+    createdAt: z.string(),
+    lastUsedAt: z.string().optional()
+  });
+  toolDefSchema = z.object({
+    id: z.string(),
+    label: z.string(),
+    envVar: z.string(),
+    defaultDir: z.string(),
+    bin: z.string()
+  });
+  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([])
+  });
+  EMPTY_STORE = {
+    version: 1,
+    current: {},
+    applied: {},
+    toolLocks: {},
+    profiles: [],
+    tools: []
+  };
+  BUILTIN_TOOLS = [
+    { id: "claude", label: "Claude Code", envVar: "CLAUDE_CONFIG_DIR", defaultDir: join4(homedir3(), ".claude"), bin: "claude" },
+    { id: "codex-app", label: "Codex App", envVar: "CODEX_HOME", defaultDir: join4(homedir3(), ".codex"), bin: "/Applications/Codex.app/Contents/MacOS/Codex" },
+    { id: "codex", label: "Codex CLI", envVar: "CODEX_HOME", defaultDir: join4(homedir3(), ".codex"), bin: "codex" },
+    { id: "codewith", label: "Codewith", envVar: "CODEWITH_HOME", defaultDir: join4(homedir3(), ".codewith"), bin: "codewith" },
+    { id: "takumi", label: "Takumi", envVar: "TAKUMI_CONFIG_DIR", defaultDir: join4(homedir3(), ".takumi"), bin: "takumi" },
+    { id: "gemini", label: "Gemini CLI", envVar: "GEMINI_CONFIG_DIR", defaultDir: join4(homedir3(), ".gemini"), bin: "gemini" },
+    { id: "opencode", label: "opencode", envVar: "OPENCODE_CONFIG_DIR", defaultDir: join4(homedir3(), ".config", "opencode"), bin: "opencode" },
+    { id: "cursor", label: "Cursor Agent", envVar: "CURSOR_CONFIG_DIR", defaultDir: join4(homedir3(), ".cursor"), bin: "cursor-agent" },
+    { id: "pi", label: "Pi Coding Agent", envVar: "PI_CODING_AGENT_HOME", defaultDir: join4(homedir3(), ".pi"), bin: "pi" },
+    { id: "hermes", label: "Hermes", envVar: "HERMES_HOME", defaultDir: join4(homedir3(), ".hermes"), bin: "hermes" },
+    { id: "kimi", label: "Kimi Code", envVar: "KIMI_CODE_HOME", defaultDir: join4(homedir3(), ".kimi-code"), bin: "kimi" },
+    { id: "grok", label: "Grok Build", envVar: "HOME", defaultDir: join4(homedir3(), ".grok"), bin: "grok" }
+  ];
+  RETIRED_STORAGE_MODE_KEYS2 = [
+    "HASNA_ACCOUNTS_STORAGE_MODE",
+    "ACCOUNTS_STORAGE_MODE",
+    "HASNA_ACCOUNTS_MODE",
+    "ACCOUNTS_MODE"
+  ];
+  RETRY_STATUSES = [408, 425, 429, 500, 502, 503, 504];
+  AccountsApiError = class AccountsApiError extends Error {
+    status;
+    body;
+    constructor(method, path, status, body) {
+      super(`accounts cloud request failed: ${method} ${path} -> ${status}`);
+      this.name = "AccountsApiError";
+      this.status = status;
+      this.body = body;
+    }
+  };
+});
+
 // src/lib/accounts.ts
-import { appliedProfileName, resolveStore } from "@hasna/accounts";
 function normalizeEmail(email) {
   return (email ?? "").trim().toLowerCase();
 }
@@ -4209,11 +4746,11 @@ async function profileForEnvDir(store, tool, env) {
   const normalized = normalizeDir(configuredDir);
   return (await store.listProfiles(tool.id)).find((profile) => normalizeDir(profile.dir) === normalized) ?? null;
 }
-async function resolveAccountForAgent(agent, env = process.env) {
+async function resolveAccountForAgent(agent, env = process.env, options = {}) {
   const override = envOverride(agent, env);
   if (override)
     return override;
-  const store = resolveStore(env);
+  const store = resolveStore(env, options);
   const tools = new Map((await store.listTools()).map((tool) => [tool.id, tool]));
   for (const toolId of AGENT_ACCOUNT_TOOLS[agent]) {
     const tool = tools.get(toolId);
@@ -4248,6 +4785,7 @@ function withAccount(record, account) {
 }
 var AGENT_ACCOUNT_TOOLS;
 var init_accounts = __esm(() => {
+  init_accounts_store();
   AGENT_ACCOUNT_TOOLS = {
     claude: ["claude"],
     takumi: ["takumi", "claude"],
@@ -4262,8 +4800,8 @@ var init_accounts = __esm(() => {
 
 // src/ingest/claude.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync2, existsSync as existsSync4, statSync as statSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join6, basename } from "path";
+import { homedir as homedir4 } from "os";
+import { join as join5, basename } from "path";
 function autoDetectProject(cwd, projects) {
   return projects.find((p) => cwd === p.path || cwd.startsWith(p.path + "/"));
 }
@@ -4276,9 +4814,9 @@ function collectJsonlFiles(projectDir) {
     try {
       for (const entry of readdirSync2(dir, { withFileTypes: true })) {
         if (entry.isDirectory())
-          walk(join6(dir, entry.name));
+          walk(join5(dir, entry.name));
         else if (entry.name.endsWith(".jsonl"))
-          files.push(join6(dir, entry.name));
+          files.push(join5(dir, entry.name));
       }
     } catch {}
   }
@@ -4303,9 +4841,10 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
   const touchedSessions = new Set;
   const registeredProjects = db.prepare(`SELECT path, name FROM projects ORDER BY LENGTH(path) DESC`).all();
   const account = await resolveAccountForAgent(agentName);
+  const ingestState = loadIngestState(db, agentName);
   const projectDirs = readdirSync2(projectsDir, { withFileTypes: true }).filter((d) => d.isDirectory());
   for (const projectDirEntry of projectDirs) {
-    const projectDirPath = join6(projectsDir, projectDirEntry.name);
+    const projectDirPath = join5(projectsDir, projectDirEntry.name);
     const projectPath = dirNameToPath(projectDirEntry.name);
     const jsonlFiles = collectJsonlFiles(projectDirPath);
     for (const filePath of jsonlFiles) {
@@ -4316,7 +4855,7 @@ async function ingestJsonlProjects(db, projectsDir, agentName, verbose = false)
       } catch {
         continue;
       }
-      const processed = getIngestState(db, agentName, stateKey);
+      const processed = ingestState.get(stateKey) ?? null;
       if (processed === fileMtime)
         continue;
       let lines;
@@ -4442,14 +4981,14 @@ var init_claude = __esm(() => {
   init_database();
   init_pricing();
   init_accounts();
-  CLAUDE_PROJECTS_DIR = join6(homedir3(), ".claude", "projects");
-  TAKUMI_PROJECTS_DIR = join6(homedir3(), ".takumi", "projects");
+  CLAUDE_PROJECTS_DIR = process.env["HASNA_ECONOMY_CLAUDE_PROJECTS_DIR"] ?? join5(homedir4(), ".claude", "projects");
+  TAKUMI_PROJECTS_DIR = process.env["HASNA_ECONOMY_TAKUMI_PROJECTS_DIR"] ?? join5(homedir4(), ".takumi", "projects");
 });
 
 // src/ingest/codex.ts
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join7, basename as basename2 } from "path";
+import { homedir as homedir5 } from "os";
+import { join as join6, basename as basename2 } from "path";
 import { Database as BunDatabase } from "bun:sqlite";
 function codexDbPath() {
   return process.env["HASNA_ECONOMY_CODEX_DB_PATH"] ?? DEFAULT_CODEX_DB_PATH;
@@ -4695,16 +5234,16 @@ var init_codex = __esm(() => {
   init_database();
   init_pricing();
   init_accounts();
-  DEFAULT_CODEX_DB_PATH = join7(homedir4(), ".codex", "state_5.sqlite");
-  DEFAULT_CODEX_CONFIG_PATH = join7(homedir4(), ".codex", "config.toml");
-  DEFAULT_CODEWITH_DB_PATH = join7(homedir4(), ".codewith", "state_5.sqlite");
-  DEFAULT_CODEWITH_CONFIG_PATH = join7(homedir4(), ".codewith", "config.toml");
+  DEFAULT_CODEX_DB_PATH = join6(homedir5(), ".codex", "state_5.sqlite");
+  DEFAULT_CODEX_CONFIG_PATH = join6(homedir5(), ".codex", "config.toml");
+  DEFAULT_CODEWITH_DB_PATH = join6(homedir5(), ".codewith", "state_5.sqlite");
+  DEFAULT_CODEWITH_CONFIG_PATH = join6(homedir5(), ".codewith", "config.toml");
 });
 
 // src/ingest/gemini.ts
 import { readdirSync as readdirSync3, readFileSync as readFileSync4, existsSync as existsSync6, statSync as statSync3 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join8, basename as basename3 } from "path";
+import { homedir as homedir6 } from "os";
+import { join as join7, basename as basename3 } from "path";
 function geminiTmpDir() {
   return process.env["HASNA_ECONOMY_GEMINI_TMP_DIR"] ?? DEFAULT_GEMINI_TMP_DIR;
 }
@@ -4726,7 +5265,7 @@ function listProjectDirs(...roots) {
     try {
       for (const entry of readdirSync3(root, { withFileTypes: true })) {
         if (entry.isDirectory())
-          dirs.add(join8(root, entry.name));
+          dirs.add(join7(root, entry.name));
       }
     } catch {}
   }
@@ -4737,7 +5276,7 @@ function projectRoot(projectDir, chatData) {
     return chatData.projectPath;
   if (chatData.project_path)
     return chatData.project_path;
-  const rootFile = join8(projectDir, ".project_root");
+  const rootFile = join7(projectDir, ".project_root");
   try {
     if (existsSync6(rootFile))
       return readFileSync4(rootFile, "utf-8").trim();
@@ -4759,17 +5298,17 @@ async function ingestGemini(db, verbose) {
   const account = await resolveAccountForAgent("gemini");
   const projectDirs = listProjectDirs(tmpDir, historyDir);
   for (const projectDir of projectDirs) {
-    const chatsDir = join8(projectDir, "chats");
+    const chatsDir = join7(projectDir, "chats");
     if (!existsSync6(chatsDir))
       continue;
     let chatFiles = [];
     try {
-      chatFiles = readdirSync3(chatsDir).filter((f) => f.endsWith(".json")).map((f) => join8(chatsDir, f));
+      chatFiles = readdirSync3(chatsDir).filter((f) => f.endsWith(".json")).map((f) => join7(chatsDir, f));
     } catch {
       continue;
     }
     for (const filePath of chatFiles) {
-      const stateKey = filePath.replace(homedir5(), "~");
+      const stateKey = filePath.replace(homedir6(), "~");
       let fileMtime = "0";
       try {
         fileMtime = statSync3(filePath).mtimeMs.toString();
@@ -4860,19 +5399,19 @@ var init_gemini = __esm(() => {
   init_database();
   init_pricing();
   init_accounts();
-  DEFAULT_GEMINI_TMP_DIR = join8(homedir5(), ".gemini", "tmp");
-  DEFAULT_GEMINI_HISTORY_DIR = join8(homedir5(), ".gemini", "history");
+  DEFAULT_GEMINI_TMP_DIR = join7(homedir6(), ".gemini", "tmp");
+  DEFAULT_GEMINI_HISTORY_DIR = join7(homedir6(), ".gemini", "history");
 });
 
 // src/ingest/opencode.ts
 import { existsSync as existsSync7, readFileSync as readFileSync5, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join9 } from "path";
+import { homedir as homedir7 } from "os";
+import { join as join8 } from "path";
 function walkJsonFiles(dir, acc = []) {
   if (!existsSync7(dir))
     return acc;
   for (const entry of readdirSync4(dir, { withFileTypes: true })) {
-    const p = join9(dir, entry.name);
+    const p = join8(dir, entry.name);
     if (entry.isDirectory())
       walkJsonFiles(p, acc);
     else if (entry.name.endsWith(".json"))
@@ -4892,7 +5431,7 @@ function parseSessionIdFromPath(filePath) {
   return null;
 }
 async function ingestOpenCode(db, verbose = false) {
-  const messageDir = join9(OPENCODE_STORAGE, "message");
+  const messageDir = join8(OPENCODE_STORAGE, "message");
   const files = walkJsonFiles(messageDir);
   let requests = 0;
   const touched = new Set;
@@ -4975,7 +5514,7 @@ var init_opencode = __esm(() => {
   init_database();
   init_pricing();
   init_accounts();
-  OPENCODE_STORAGE = join9(homedir6(), ".local", "share", "opencode", "storage");
+  OPENCODE_STORAGE = join8(homedir7(), ".local", "share", "opencode", "storage");
 });
 
 // src/ingest/cursor.ts
@@ -5104,13 +5643,13 @@ var init_cursor = __esm(() => {
 
 // src/ingest/pi.ts
 import { existsSync as existsSync8, readFileSync as readFileSync6, readdirSync as readdirSync5, statSync as statSync5 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join10 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join9 } from "path";
 function walkSessions(dir, acc = []) {
   if (!existsSync8(dir))
     return acc;
   for (const entry of readdirSync5(dir, { withFileTypes: true })) {
-    const p = join10(dir, entry.name);
+    const p = join9(dir, entry.name);
     if (entry.isDirectory())
       walkSessions(p, acc);
     else if (entry.name.endsWith(".json"))
@@ -5197,13 +5736,13 @@ var PI_SESSION_DIR;
 var init_pi = __esm(() => {
   init_database();
   init_accounts();
-  PI_SESSION_DIR = process.env["PI_CODING_AGENT_SESSION_DIR"] ?? join10(homedir7(), ".pi", "agent", "sessions");
+  PI_SESSION_DIR = process.env["PI_CODING_AGENT_SESSION_DIR"] ?? join9(homedir8(), ".pi", "agent", "sessions");
 });
 
 // src/ingest/hermes.ts
 import { existsSync as existsSync9, statSync as statSync6 } from "fs";
-import { homedir as homedir8 } from "os";
-import { join as join11 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join10 } from "path";
 function mapCostBasis(billingMode) {
   if (billingMode === "subscription")
     return "subscription_included";
@@ -5292,22 +5831,74 @@ var HERMES_DB;
 var init_hermes = __esm(() => {
   init_database();
   init_accounts();
-  HERMES_DB = join11(homedir8(), ".hermes", "state.db");
+  HERMES_DB = join10(homedir9(), ".hermes", "state.db");
 });
 
 // src/ingest/loops.ts
 import { existsSync as existsSync10 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join12 } from "path";
+import { homedir as homedir10 } from "os";
+import { join as join11 } from "path";
 import { Database as BunDatabase2 } from "bun:sqlite";
-import { dataDir as dataDir2 } from "@hasna/paths";
+import { homedir as pathsResolverHomedir2 } from "os";
+import { join as pathsResolverJoin2 } from "path";
+function pathsResolverAssertApp2(app) {
+  if (typeof app !== "string" || app.length === 0) {
+    throw new TypeError("paths: app must be a non-empty string");
+  }
+  if (!PATHS_RESOLVER_APP_SLUG_RE2.test(app)) {
+    throw new TypeError(`paths: invalid app slug "${app}" \u2014 expected lowercase kebab-case ([a-z0-9]+(-[a-z0-9]+)*)`);
+  }
+}
+function pathsResolverAssertKind2(kind) {
+  if (!Object.keys(PATHS_RESOLVER_KIND_ENV2).includes(kind)) {
+    throw new TypeError(`paths: invalid path kind "${kind}" \u2014 expected one of ${Object.keys(PATHS_RESOLVER_KIND_ENV2).join(", ")}`);
+  }
+}
+function pathsResolverBaseDir2(kind, options) {
+  pathsResolverAssertKind2(kind);
+  const env = options.env ?? process.env;
+  const override = env[PATHS_RESOLVER_KIND_ENV2[kind]];
+  if (typeof override === "string" && override.length > 0)
+    return override;
+  const home = options.home ?? pathsResolverHomedir2();
+  const platform2 = options.platform ?? process.platform;
+  if (platform2 === "darwin") {
+    switch (kind) {
+      case "config":
+      case "data":
+        return pathsResolverJoin2(home, "Library", "Application Support", "Hasna");
+      case "cache":
+        return pathsResolverJoin2(home, "Library", "Caches", "Hasna");
+      case "state":
+        return pathsResolverJoin2(home, "Library", "Logs", "Hasna");
+    }
+  }
+  switch (kind) {
+    case "config":
+      return pathsResolverJoin2(home, ".config", "hasna");
+    case "data":
+      return pathsResolverJoin2(home, ".local", "share", "hasna");
+    case "state":
+      return pathsResolverJoin2(home, ".local", "state", "hasna");
+    case "cache":
+      return pathsResolverJoin2(home, ".cache", "hasna");
+  }
+}
+function pathsResolverResolve2(kind, options) {
+  pathsResolverAssertApp2(options.app);
+  const appSegment = options.internal === true ? pathsResolverJoin2("internal", options.app) : options.app;
+  return pathsResolverJoin2(pathsResolverBaseDir2(kind, options), appSegment);
+}
+function dataDir2(options) {
+  return pathsResolverResolve2("data", options);
+}
 function defaultLoopsDbPath() {
   const resolved = dataDir2({
     app: "loops",
     home: process.env["HOME"] || process.env["USERPROFILE"] || undefined
   });
-  const legacy = join12(process.env["HOME"] || process.env["USERPROFILE"] || homedir9(), ".hasna", "loops", "loops.db");
-  return existsSync10(join12(resolved, "loops.db")) ? join12(resolved, "loops.db") : legacy;
+  const legacy = join11(process.env["HOME"] || process.env["USERPROFILE"] || homedir10(), ".hasna", "loops", "loops.db");
+  return existsSync10(join11(resolved, "loops.db")) ? join11(resolved, "loops.db") : legacy;
 }
 function loopsDbPath() {
   return process.env["HASNA_ECONOMY_LOOPS_DB_PATH"] ?? defaultLoopsDbPath();
@@ -5486,10 +6077,17 @@ async function ingestLoops(db, verbose = false) {
     rollupSession(db, sessionId);
   return { sessions: sessions.size, requests };
 }
-var LOOPS_INGEST_VERSION = "goal-runs-orchestration-v1";
+var PATHS_RESOLVER_KIND_ENV2, PATHS_RESOLVER_APP_SLUG_RE2, LOOPS_INGEST_VERSION = "goal-runs-orchestration-v1";
 var init_loops = __esm(() => {
   init_database();
   init_pricing();
+  PATHS_RESOLVER_KIND_ENV2 = {
+    config: "HASNA_CONFIG_HOME",
+    data: "HASNA_DATA_HOME",
+    state: "HASNA_STATE_HOME",
+    cache: "HASNA_CACHE_HOME"
+  };
+  PATHS_RESOLVER_APP_SLUG_RE2 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 });
 
 // src/ingest/claude-quota.ts
@@ -6130,26 +6728,26 @@ var init_open_projects = __esm(() => {
 var exports_config = {};
 __export(exports_config, {
   setConfigValue: () => setConfigValue,
-  saveConfig: () => saveConfig2,
-  loadConfig: () => loadConfig2,
+  saveConfig: () => saveConfig,
+  loadConfig: () => loadConfig,
   getConfigValue: () => getConfigValue
 });
-import { existsSync as existsSync13, readFileSync as readFileSync10, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
-import { dirname as dirname2, join as join14 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync11, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
+import { dirname as dirname2, join as join13 } from "path";
 function getConfigPath() {
-  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join14(getDataDir(), "config.json");
+  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join13(getDataDir(), "config.json");
 }
-function loadConfig2() {
+function loadConfig() {
   try {
     const configPath = getConfigPath();
     if (existsSync13(configPath)) {
-      const raw = readFileSync10(configPath, "utf-8");
+      const raw = readFileSync11(configPath, "utf-8");
       return { ...DEFAULTS, ...JSON.parse(raw) };
     }
   } catch {}
   return { ...DEFAULTS };
 }
-function saveConfig2(config) {
+function saveConfig(config) {
   const configPath = getConfigPath();
   const dir = dirname2(configPath);
   if (!existsSync13(dir))
@@ -6158,11 +6756,11 @@ function saveConfig2(config) {
 `);
 }
 function getConfigValue(key) {
-  const config = loadConfig2();
+  const config = loadConfig();
   return config[key] ?? null;
 }
 function setConfigValue(key, value) {
-  const config = loadConfig2();
+  const config = loadConfig();
   let parsed = value;
   if (value === "true")
     parsed = true;
@@ -6178,7 +6776,7 @@ function setConfigValue(key, value) {
     } catch {}
   }
   config[key] = parsed;
-  saveConfig2(config);
+  saveConfig(config);
 }
 var DEFAULTS;
 var init_config = __esm(() => {
@@ -6236,7 +6834,7 @@ __export(exports_webhooks, {
   checkAndFireWebhooks: () => checkAndFireWebhooks
 });
 async function checkAndFireWebhooks(db) {
-  const config = loadConfig2();
+  const config = loadConfig();
   const url = config["webhook-url"];
   if (!url)
     return;
@@ -6337,38 +6935,38 @@ var exports_watch = {};
 __export(exports_watch, {
   watchCosts: () => watchCosts
 });
-import chalk5 from "chalk";
+import chalk4 from "chalk";
 import { watch } from "fs";
 function fmt3(usd) {
-  return chalk5.green(`$${usd.toFixed(4)}`);
+  return chalk4.green(`$${usd.toFixed(4)}`);
 }
 function renderHeader(todayUsd, weekUsd, mode) {
   process.stdout.write("\x1B[H\x1B[2J");
-  console.log(chalk5.bold.cyan("  economy watch") + chalk5.dim(` \u2014 live cost stream (${mode})`));
-  console.log(chalk5.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(chalk4.bold.cyan("  economy watch") + chalk4.dim(` \u2014 live cost stream (${mode})`));
+  console.log(chalk4.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
   console.log(`  Today:  ${fmt3(todayUsd)}   Week: ${fmt3(weekUsd)}`);
-  console.log(chalk5.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  console.log(chalk5.dim("  [agent]  cost     model                  tokens   project"));
-  console.log(chalk5.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(chalk4.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(chalk4.dim("  [agent]  cost     model                  tokens   project"));
+  console.log(chalk4.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
 }
 function agentLabel(agent) {
   if (agent === "claude")
-    return chalk5.blue("[claude]");
+    return chalk4.blue("[claude]");
   if (agent === "codex")
-    return chalk5.yellow("[codex] ");
+    return chalk4.yellow("[codex] ");
   if (agent === "gemini")
-    return chalk5.green("[gemini]");
+    return chalk4.green("[gemini]");
   if (agent === "takumi")
-    return chalk5.magenta("[takumi]");
+    return chalk4.magenta("[takumi]");
   if (agent === "opencode")
-    return chalk5.cyan("[opncde]");
+    return chalk4.cyan("[opncde]");
   if (agent === "cursor")
-    return chalk5.white("[cursor]");
+    return chalk4.white("[cursor]");
   if (agent === "pi")
-    return chalk5.white("[pi    ]");
+    return chalk4.white("[pi    ]");
   if (agent === "hermes")
-    return chalk5.white("[hermes]");
-  return chalk5.gray(`[${agent.slice(0, 6).padEnd(6)}]`);
+    return chalk4.white("[hermes]");
+  return chalk4.gray(`[${agent.slice(0, 6).padEnd(6)}]`);
 }
 async function watchCosts(opts) {
   const store = getStore();
@@ -6388,7 +6986,7 @@ async function watchCosts(opts) {
   renderHeader(initialSummaryToday.total_usd, initialSummaryWeek.total_usd, mode);
   if (daemon) {
     const paths = getWatchPaths();
-    console.log(chalk5.dim(`
+    console.log(chalk4.dim(`
   Watching ${paths.length} paths \u2014 sync on change, refresh every ${opts.interval}s
 `));
     for (const p of paths) {
@@ -6401,11 +6999,11 @@ async function watchCosts(opts) {
       }
     }
   } else if (cloud) {
-    console.log(chalk5.dim(`
+    console.log(chalk4.dim(`
   Streaming from cloud API every ${opts.interval}s \u2014 Ctrl+C to exit
 `));
   } else {
-    console.log(chalk5.dim(`
+    console.log(chalk4.dim(`
   Polling every ${opts.interval}s \u2014 Ctrl+C to exit
 `));
   }
@@ -6453,9 +7051,9 @@ async function watchCosts(opts) {
     for (const line of lines)
       console.log(line);
     if (lines.length === 0)
-      console.log(chalk5.dim("  Waiting for new requests..."));
+      console.log(chalk4.dim("  Waiting for new requests..."));
     const suffix = daemon ? `file watch + ${opts.interval}s refresh` : cloud ? `cloud stream every ${opts.interval}s` : `polling every ${opts.interval}s`;
-    console.log(chalk5.dim(`
+    console.log(chalk4.dim(`
   Last updated: ${new Date().toLocaleTimeString()} \u2014 ${suffix} \u2014 Ctrl+C to exit`));
   }
   if (daemon)
@@ -6463,7 +7061,7 @@ async function watchCosts(opts) {
   await poll();
   const timer = setInterval(() => {
     poll().catch((e) => {
-      console.log(chalk5.dim(`
+      console.log(chalk4.dim(`
   Poll error: ${e instanceof Error ? e.message : String(e)} \u2014 retrying next tick`));
     });
   }, opts.interval * 1000);
@@ -6471,7 +7069,7 @@ async function watchCosts(opts) {
     clearInterval(timer);
     if (ingestTimer)
       clearTimeout(ingestTimer);
-    console.log(chalk5.dim(`
+    console.log(chalk4.dim(`
 
   Stopped watching.`));
     process.exit(0);
@@ -6526,7 +7124,7 @@ function sqliteToPostgres(sql) {
 // src/db/sync-pg.ts
 import { Worker, MessageChannel, receiveMessageOnPort } from "worker_threads";
 import { fileURLToPath } from "url";
-import { dirname as dirname3, join as join15 } from "path";
+import { dirname as dirname3, join as join14 } from "path";
 import { existsSync as existsSync15 } from "fs";
 function translateSqliteDates(sql) {
   let s = sql;
@@ -6552,9 +7150,9 @@ function translateSqliteDates(sql) {
 function resolveWorkerPath() {
   const here = dirname3(fileURLToPath(import.meta.url));
   const candidates = [
-    join15(here, "pg-sync-worker.ts"),
-    join15(here, "pg-sync-worker.js"),
-    join15(here, "..", "db", "pg-sync-worker.js")
+    join14(here, "pg-sync-worker.ts"),
+    join14(here, "pg-sync-worker.js"),
+    join14(here, "..", "db", "pg-sync-worker.js")
   ];
   for (const candidate of candidates)
     if (existsSync15(candidate))
@@ -8365,12 +8963,9 @@ var exports_serve = {};
 __export(exports_serve, {
   startServer: () => startServer,
   openApiDocument: () => openApiDocument,
-  createServerFetch: () => createServerFetch,
   createHandler: () => createHandler
 });
 import { randomUUID as randomUUID2 } from "crypto";
-import { existsSync as existsSync16 } from "fs";
-import { resolve as resolve2, sep } from "path";
 import { verifyApiKey, ApiKeyStore } from "@hasna/contracts/auth";
 function openApiDocument() {
   const spec = openApiSpec;
@@ -8431,37 +9026,6 @@ function requiredScopesForRequest(method, path) {
 function stringArray(value) {
   return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
 }
-function dashboardPath(root, pathname) {
-  let decoded;
-  try {
-    decoded = decodeURIComponent(pathname);
-  } catch {
-    return null;
-  }
-  const relativePath = decoded === "/" ? "index.html" : decoded.replace(/^\/+/, "");
-  const rootPath = resolve2(root);
-  const filePath = resolve2(rootPath, relativePath);
-  return filePath === rootPath || filePath.startsWith(rootPath + sep) ? filePath : null;
-}
-function createServerFetch(apiHandler, dashboardDir = DEFAULT_DASHBOARD_DIR) {
-  return async function fetch2(req) {
-    const url = new URL(req.url);
-    if (url.pathname.startsWith("/api") || url.pathname.startsWith("/v1") || FOUNDATION_PATHS.has(url.pathname)) {
-      return apiHandler(req);
-    }
-    if (existsSync16(dashboardDir)) {
-      const filePath = dashboardPath(dashboardDir, url.pathname);
-      if (filePath && existsSync16(filePath)) {
-        return new Response(Bun.file(filePath));
-      }
-      const indexPath = dashboardPath(dashboardDir, "/");
-      if (indexPath && existsSync16(indexPath)) {
-        return new Response(Bun.file(indexPath));
-      }
-    }
-    return apiHandler(req);
-  };
-}
 function applyFields(obj, fields) {
   if (!fields || fields.length === 0)
     return obj;
@@ -8985,13 +9549,13 @@ function startServer(port = 3456, options = {}) {
   const server = Bun.serve({
     port,
     hostname: hostname2,
-    fetch: createServerFetch(apiHandler, options.dashboardDir)
+    fetch: apiHandler
   });
   const address = `http://${hostname2 === "0.0.0.0" ? "localhost" : hostname2}:${server.port}`;
   log(`economy-serve listening on ${address}`);
   return server;
 }
-var CORS, APP = "economy", ECONOMY_WRITE_SCOPE, AGENT_ERROR, SYNC_SOURCES, DEFAULT_DASHBOARD_DIR, FOUNDATION_PATHS;
+var CORS, APP = "economy", ECONOMY_WRITE_SCOPE, AGENT_ERROR, SYNC_SOURCES;
 var init_serve = __esm(() => {
   init_database();
   init_pricing();
@@ -9012,8 +9576,6 @@ var init_serve = __esm(() => {
   ECONOMY_WRITE_SCOPE = `${APP}:write`;
   AGENT_ERROR = `agent must be one of: ${AGENTS.join(", ")}`;
   SYNC_SOURCES = ["all", ...AGENTS, "loops"];
-  DEFAULT_DASHBOARD_DIR = new URL("../../dashboard/dist", import.meta.url).pathname;
-  FOUNDATION_PATHS = new Set(["/health", "/healthz", "/ready", "/readyz", "/version", "/openapi.json"]);
 });
 
 // src/cli/commands/menubar.ts
@@ -9024,16 +9586,16 @@ __export(exports_menubar, {
   menubarStart: () => menubarStart,
   menubarInstall: () => menubarInstall
 });
-import chalk6 from "chalk";
+import chalk5 from "chalk";
 import { execFileSync as execFileSync3 } from "child_process";
-import { cpSync, existsSync as existsSync17, mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync3 } from "fs";
+import { cpSync, existsSync as existsSync16, mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir, arch } from "os";
-import { join as join16 } from "path";
+import { join as join15 } from "path";
 function getArch() {
   return arch() === "arm64" ? "arm64" : "x86_64";
 }
 function isInstalled() {
-  return existsSync17(APP_PATH);
+  return existsSync16(APP_PATH);
 }
 function isRunning() {
   try {
@@ -9045,13 +9607,13 @@ function isRunning() {
 }
 async function menubarInstall(opts) {
   if (isInstalled() && !opts.force) {
-    console.log(chalk6.yellow("Economy Bar is already installed. Use --force to reinstall."));
-    console.log(chalk6.dim(`  Location: ${APP_PATH}`));
+    console.log(chalk5.yellow("Economy Bar is already installed. Use --force to reinstall."));
+    console.log(chalk5.dim(`  Location: ${APP_PATH}`));
     return;
   }
   const cpuArch = getArch();
-  console.log(chalk6.cyan(`\u2192 Detecting architecture: ${cpuArch}`));
-  console.log(chalk6.cyan("\u2192 Fetching latest release info..."));
+  console.log(chalk5.cyan(`\u2192 Detecting architecture: ${cpuArch}`));
+  console.log(chalk5.cyan("\u2192 Fetching latest release info..."));
   let assetUrl;
   try {
     const res = await fetch(`https://api.github.com/repos/${REPO}/releases/latest`, {
@@ -9067,54 +9629,54 @@ async function menubarInstall(opts) {
       throw new Error(`No asset found for ${assetName}. Check releases at https://github.com/${REPO}/releases`);
     assetUrl = asset.browser_download_url;
   } catch (e) {
-    console.error(chalk6.red(`\u2717 Failed to fetch release info: ${e instanceof Error ? e.message : String(e)}`));
+    console.error(chalk5.red(`\u2717 Failed to fetch release info: ${e instanceof Error ? e.message : String(e)}`));
     process.exit(1);
   }
-  const zipPath = join16(tmpdir(), `economy-bar-${cpuArch}.zip`);
-  const extractDir = join16(tmpdir(), "economy-bar-extracted");
-  console.log(chalk6.cyan(`\u2192 Downloading ${assetUrl}...`));
+  const zipPath = join15(tmpdir(), `economy-bar-${cpuArch}.zip`);
+  const extractDir = join15(tmpdir(), "economy-bar-extracted");
+  console.log(chalk5.cyan(`\u2192 Downloading ${assetUrl}...`));
   try {
     const res = await fetch(assetUrl, { signal: AbortSignal.timeout(60000) });
     if (!res.ok)
       throw new Error(`Download failed: ${res.status}`);
     const buffer = await res.arrayBuffer();
     writeFileSync3(zipPath, Buffer.from(buffer));
-    console.log(chalk6.green(`\u2713 Downloaded (${(buffer.byteLength / 1024 / 1024).toFixed(1)} MB)`));
+    console.log(chalk5.green(`\u2713 Downloaded (${(buffer.byteLength / 1024 / 1024).toFixed(1)} MB)`));
   } catch (e) {
-    console.error(chalk6.red(`\u2717 Download failed: ${e instanceof Error ? e.message : String(e)}`));
+    console.error(chalk5.red(`\u2717 Download failed: ${e instanceof Error ? e.message : String(e)}`));
     process.exit(1);
   }
-  console.log(chalk6.cyan("\u2192 Installing to /Applications..."));
+  console.log(chalk5.cyan("\u2192 Installing to /Applications..."));
   try {
     rmSync(extractDir, { recursive: true, force: true });
     mkdirSync4(extractDir, { recursive: true });
     execFileSync3("unzip", ["-q", zipPath, "-d", extractDir], { stdio: "ignore" });
     if (isInstalled())
       rmSync(APP_PATH, { recursive: true, force: true });
-    cpSync(join16(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
+    cpSync(join15(extractDir, "Economy Bar.app"), APP_PATH, { recursive: true });
     try {
       execFileSync3("xattr", ["-rd", "com.apple.quarantine", APP_PATH], { stdio: "ignore" });
     } catch {}
     rmSync(zipPath, { force: true });
     rmSync(extractDir, { recursive: true, force: true });
-    console.log(chalk6.green(`\u2713 Installed to ${APP_PATH}`));
+    console.log(chalk5.green(`\u2713 Installed to ${APP_PATH}`));
   } catch (e) {
-    console.error(chalk6.red(`\u2717 Install failed: ${e instanceof Error ? e.message : String(e)}`));
+    console.error(chalk5.red(`\u2717 Install failed: ${e instanceof Error ? e.message : String(e)}`));
     process.exit(1);
   }
-  console.log(chalk6.cyan("\u2192 Launching Economy Bar..."));
+  console.log(chalk5.cyan("\u2192 Launching Economy Bar..."));
   try {
     execFileSync3("open", [APP_PATH], { stdio: "ignore" });
-    console.log(chalk6.bold.green(`
+    console.log(chalk5.bold.green(`
 \u2713 Economy Bar is running in your menu bar!`));
-    console.log(chalk6.dim("  Make sure economy serve is running: economy serve"));
+    console.log(chalk5.dim("  Make sure economy serve is running: economy serve"));
   } catch (e) {
-    console.log(chalk6.yellow("\u26A0 Installed but could not auto-launch. Open from /Applications manually."));
+    console.log(chalk5.yellow("\u26A0 Installed but could not auto-launch. Open from /Applications manually."));
   }
 }
 function menubarUninstall() {
   if (!isInstalled()) {
-    console.log(chalk6.yellow("Economy Bar is not installed."));
+    console.log(chalk5.yellow("Economy Bar is not installed."));
     return;
   }
   if (isRunning()) {
@@ -9124,26 +9686,26 @@ function menubarUninstall() {
     } catch {}
   }
   rmSync(APP_PATH, { recursive: true, force: true });
-  console.log(chalk6.green("\u2713 Economy Bar uninstalled"));
+  console.log(chalk5.green("\u2713 Economy Bar uninstalled"));
 }
 function menubarStart() {
   if (!isInstalled()) {
-    console.error(chalk6.red("Economy Bar is not installed. Run: economy menubar install"));
+    console.error(chalk5.red("Economy Bar is not installed. Run: economy menubar install"));
     process.exit(1);
   }
   execFileSync3("open", [APP_PATH], { stdio: "ignore" });
-  console.log(chalk6.green("\u2713 Economy Bar launched"));
+  console.log(chalk5.green("\u2713 Economy Bar launched"));
 }
 function menubarStop() {
   if (!isRunning()) {
-    console.log(chalk6.yellow("Economy Bar is not running."));
+    console.log(chalk5.yellow("Economy Bar is not running."));
     return;
   }
   try {
     execFileSync3("osascript", ["-e", 'quit app "Economy Bar"'], { stdio: "ignore" });
-    console.log(chalk6.green("\u2713 Economy Bar stopped"));
+    console.log(chalk5.green("\u2713 Economy Bar stopped"));
   } catch {
-    console.log(chalk6.yellow("Could not quit Economy Bar gracefully"));
+    console.log(chalk5.yellow("Could not quit Economy Bar gracefully"));
   }
 }
 var APP_PATH = "/Applications/Economy Bar.app", REPO = "hasna/economy";
@@ -9152,369 +9714,10 @@ var init_menubar = () => {};
 // src/cli/index.ts
 import { Command } from "commander";
 import { registerEventsCommands } from "@hasna/events/commander";
-import chalk7 from "chalk";
-
-// src/cli/brains.ts
-import { writeFile, mkdir } from "fs/promises";
-import { join as join3 } from "path";
-import chalk from "chalk";
-
-// src/lib/gatherer.ts
-init_store();
-var SYSTEM_PROMPT = "You are a cost-aware AI assistant that tracks API usage, identifies expensive patterns, and helps optimize spending.";
-function hasCostData(summary) {
-  return summary.total_usd > 0 || summary.sessions > 0 || summary.requests > 0 || summary.tokens > 0;
-}
-var gatherTrainingData = async (options = {}) => {
-  const limit = options.limit ?? 500;
-  const examples = [];
-  try {
-    const store = getStore();
-    const periods = ["today", "week", "month", "all"];
-    for (const period of periods) {
-      try {
-        const s = await store.summary(period);
-        if (!hasCostData(s))
-          continue;
-        examples.push({
-          messages: [
-            { role: "system", content: SYSTEM_PROMPT },
-            { role: "user", content: `What did I spend on AI ${period === "all" ? "in total" : period}?` },
-            {
-              role: "assistant",
-              content: `${period === "all" ? "Total" : period.charAt(0).toUpperCase() + period.slice(1)} AI spending: $${s.total_usd.toFixed(4)} across ${s.sessions} session(s), ${s.requests} request(s), ${s.tokens.toLocaleString()} tokens.`
-            }
-          ]
-        });
-      } catch {}
-    }
-    const sessions = await store.sessions({
-      limit: Math.min(Math.floor(limit / 4), 50),
-      since: options.since?.toISOString().substring(0, 10)
-    });
-    for (const s of sessions) {
-      examples.push({
-        messages: [
-          { role: "system", content: SYSTEM_PROMPT },
-          {
-            role: "user",
-            content: `How much did the session "${s.id.substring(0, 12)}" cost?`
-          },
-          {
-            role: "assistant",
-            content: `Session ${s.id.substring(0, 12)} (${s.agent}, project: ${s.project_name || "unknown"}): $${s.total_cost_usd.toFixed(4)}, ${s.total_tokens.toLocaleString()} tokens, ${s.request_count} requests. Started: ${s.started_at.substring(0, 16)}.`
-          }
-        ]
-      });
-      examples.push({
-        messages: [
-          { role: "system", content: SYSTEM_PROMPT },
-          {
-            role: "user",
-            content: `What was the token usage for session ${s.id.substring(0, 12)}?`
-          },
-          {
-            role: "assistant",
-            content: `Session ${s.id.substring(0, 12)} used ${s.total_tokens.toLocaleString()} tokens across ${s.request_count} requests on project "${s.project_name || "unknown"}" (${s.agent}).`
-          }
-        ]
-      });
-      if (examples.length >= limit)
-        break;
-    }
-    const modelBreakdown = await store.modelBreakdown();
-    if (modelBreakdown.length > 0) {
-      const topModels = modelBreakdown.slice(0, 5);
-      examples.push({
-        messages: [
-          { role: "system", content: SYSTEM_PROMPT },
-          { role: "user", content: "Which AI models have I spent the most on?" },
-          {
-            role: "assistant",
-            content: `Model cost breakdown (top ${topModels.length}):
-${topModels.map((m) => `- ${m.model} (${m.agent}): $${m.cost_usd.toFixed(4)}, ${m.requests} requests, ${m.total_tokens.toLocaleString()} tokens`).join(`
-`)}`
-          }
-        ]
-      });
-      for (const m of topModels) {
-        examples.push({
-          messages: [
-            { role: "system", content: SYSTEM_PROMPT },
-            { role: "user", content: `How much have I spent on ${m.model}?` },
-            {
-              role: "assistant",
-              content: `${m.model} (${m.agent}): $${m.cost_usd.toFixed(4)} total across ${m.requests.toLocaleString()} requests and ${m.total_tokens.toLocaleString()} tokens.`
-            }
-          ]
-        });
-      }
-    }
-    const projectBreakdown = await store.projectBreakdown();
-    if (projectBreakdown.length > 0) {
-      const topProjects = projectBreakdown.slice(0, 5);
-      examples.push({
-        messages: [
-          { role: "system", content: SYSTEM_PROMPT },
-          { role: "user", content: "Which projects are costing the most?" },
-          {
-            role: "assistant",
-            content: `Project cost breakdown (top ${topProjects.length}):
-${topProjects.map((p) => `- ${p.project_name || "unknown"}: $${p.cost_usd.toFixed(4)}, ${p.sessions} sessions`).join(`
-`)}`
-          }
-        ]
-      });
-      for (const p of topProjects.slice(0, 3)) {
-        examples.push({
-          messages: [
-            { role: "system", content: SYSTEM_PROMPT },
-            { role: "user", content: `What is the AI spend for project "${p.project_name}"?` },
-            {
-              role: "assistant",
-              content: `Project "${p.project_name}": $${p.cost_usd.toFixed(4)} across ${p.sessions} session(s) and ${p.requests.toLocaleString()} requests. Last active: ${p.last_active?.substring(0, 10) ?? "unknown"}.`
-            }
-          ]
-        });
-      }
-    }
-    try {
-      const budgets = await store.listBudgets();
-      if (budgets.length > 0) {
-        examples.push({
-          messages: [
-            { role: "system", content: SYSTEM_PROMPT },
-            { role: "user", content: "How am I tracking against my AI spending budgets?" },
-            {
-              role: "assistant",
-              content: `Budget status:
-${budgets.map((b) => `- ${b.project_path ?? "global"} (${b.period}): $${b.current_spend_usd.toFixed(4)} / $${b.limit_usd.toFixed(2)} (${b.percent_used.toFixed(1)}%) \u2014 ${b.is_over_limit ? "OVER LIMIT" : b.is_over_alert ? "ALERT" : "OK"}`).join(`
-`)}`
-            }
-          ]
-        });
-      }
-    } catch {}
-    try {
-      const goals = await store.listGoals();
-      if (goals.length > 0) {
-        examples.push({
-          messages: [
-            { role: "system", content: SYSTEM_PROMPT },
-            { role: "user", content: "Am I on track with my AI cost reduction goals?" },
-            {
-              role: "assistant",
-              content: `Goal progress:
-${goals.map((g) => `- ${g.period} goal (${g.project_path ?? g.agent ?? "global"}): $${g.current_spend_usd.toFixed(4)} / $${g.limit_usd.toFixed(2)} (${g.percent_used.toFixed(1)}%) \u2014 ${g.is_over ? "OVER" : g.is_at_risk ? "AT RISK" : "ON TRACK"}`).join(`
-`)}`
-            }
-          ]
-        });
-      }
-    } catch {}
-    const weekSummary = await store.summary("week");
-    const monthSummary = await store.summary("month");
-    if (weekSummary.total_usd > 0) {
-      const projectedMonthly = weekSummary.total_usd / 7 * 30;
-      examples.push({
-        messages: [
-          { role: "system", content: SYSTEM_PROMPT },
-          { role: "user", content: "Based on my usage, what will I spend this month?" },
-          {
-            role: "assistant",
-            content: `Based on your last 7 days ($${weekSummary.total_usd.toFixed(4)}), projected monthly spend is approximately $${projectedMonthly.toFixed(2)}. Current month-to-date: $${monthSummary.total_usd.toFixed(4)}.`
-          }
-        ]
-      });
-    }
-    if (modelBreakdown.length > 1) {
-      const expensive = modelBreakdown[0];
-      const cheaper = modelBreakdown[modelBreakdown.length - 1];
-      examples.push({
-        messages: [
-          { role: "system", content: SYSTEM_PROMPT },
-          { role: "user", content: "How can I reduce my AI API costs?" },
-          {
-            role: "assistant",
-            content: `Your most expensive model is ${expensive.model} at $${expensive.cost_usd.toFixed(4)}. Consider switching some workloads to ${cheaper.model} ($${cheaper.cost_usd.toFixed(4)}) for cost savings. Cache frequently repeated prompts to reduce cache-miss costs.`
-          }
-        ]
-      });
-    }
-  } catch {}
-  const finalExamples = examples.slice(0, limit);
-  return { source: "economy", examples: finalExamples, count: finalExamples.length };
-};
-
-// src/lib/model-config.ts
-init_database();
-import { existsSync as existsSync2, readFileSync, writeFileSync, mkdirSync as mkdirSync2 } from "fs";
-import { dirname, join as join2 } from "path";
-var DEFAULT_MODEL = "gpt-4o-mini";
-function getModelConfigPath() {
-  return process.env["HASNA_ECONOMY_CONFIG_PATH"] ?? join2(getDataDir(), "config.json");
-}
-function loadConfig() {
-  try {
-    const configPath = getModelConfigPath();
-    if (existsSync2(configPath)) {
-      return JSON.parse(readFileSync(configPath, "utf-8"));
-    }
-  } catch {}
-  return {};
-}
-function saveConfig(config) {
-  const configPath = getModelConfigPath();
-  const dir = dirname(configPath);
-  if (!existsSync2(dir))
-    mkdirSync2(dir, { recursive: true });
-  writeFileSync(configPath, JSON.stringify(config, null, 2) + `
-`);
-}
-function getActiveModel() {
-  return loadConfig().activeModel ?? DEFAULT_MODEL;
-}
-function setActiveModel(id) {
-  const config = loadConfig();
-  config.activeModel = id;
-  saveConfig(config);
-}
-function clearActiveModel() {
-  const config = loadConfig();
-  delete config.activeModel;
-  saveConfig(config);
-}
-
-// src/cli/brains.ts
-init_database();
-function registerBrainsCommand(program) {
-  const brainsCmd = program.command("brains").description("Fine-tune an AI model on your economy cost data");
-  brainsCmd.command("gather").description("Gather training data from economy cost data and write to the economy data root (training/)").option("--limit <n>", "Maximum number of training examples", "500").option("--output <path>", "Output file path (default: <data-root>/training/training-<timestamp>.jsonl)").action(async (opts) => {
-    const limit = opts.limit ? parseInt(opts.limit, 10) : 500;
-    console.log(chalk.cyan(`Gathering up to ${limit} training examples from economy data...`));
-    try {
-      const result = await gatherTrainingData({ limit });
-      if (result.count === 0) {
-        console.log(chalk.yellow("No training examples found. Make sure you have cost data synced."));
-        console.log(chalk.dim("Run: economy sync"));
-        return;
-      }
-      const defaultDir = join3(getDataDir(), "training");
-      await mkdir(defaultDir, { recursive: true });
-      const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
-      const outputPath = opts.output ?? join3(defaultDir, `training-${timestamp}.jsonl`);
-      const jsonl = result.examples.map((ex) => JSON.stringify(ex)).join(`
-`);
-      await writeFile(outputPath, jsonl, "utf-8");
-      console.log(chalk.green(`\u2713 Gathered ${result.count} training examples`));
-      console.log(chalk.dim(`  Written to: ${outputPath}`));
-      console.log(`
-${chalk.dim("Next step:")} economy brains train --base-model gpt-4o-mini`);
-    } catch (e) {
-      console.error(chalk.red(`Error: ${e instanceof Error ? e.message : String(e)}`));
-      process.exit(1);
-    }
-  });
-  brainsCmd.command("train").description("Start a fine-tuning job using gathered training data").option("--base-model <model>", "Base model to fine-tune", "gpt-4o-mini").option("--name <name>", "Name for the fine-tuned model", "economy-assistant").option("--dataset <path>", "Path to JSONL training file (default: latest in <data-root>/training/)").action(async (opts) => {
-    const baseModel = opts.baseModel ?? "gpt-4o-mini";
-    const name = opts.name ?? "economy-assistant";
-    console.log(chalk.cyan("Starting fine-tuning job..."));
-    console.log(chalk.dim(`  Base model: ${baseModel}`));
-    console.log(chalk.dim(`  Name: ${name}`));
-    let datasetPath = opts.dataset;
-    if (!datasetPath) {
-      const { readdirSync: readdirSync2 } = await import("fs");
-      const trainingDir = join3(getDataDir(), "training");
-      try {
-        const files = readdirSync2(trainingDir).filter((f) => f.endsWith(".jsonl")).sort().reverse();
-        if (files.length === 0) {
-          console.error(chalk.red("No training data found. Run: economy brains gather"));
-          process.exit(1);
-        }
-        datasetPath = join3(trainingDir, files[0]);
-        console.log(chalk.dim(`  Dataset: ${datasetPath}`));
-      } catch {
-        console.error(chalk.red("Training directory not found. Run: economy brains gather"));
-        process.exit(1);
-      }
-    }
-    try {
-      const brains = await import("@hasna/brains");
-      const startFinetune = brains["startFinetune"] ?? brains["start_finetune"];
-      if (typeof startFinetune !== "function") {
-        console.error(chalk.red("@hasna/brains not found or startFinetune not exported."));
-        console.error(chalk.dim("Install with: bun add @hasna/brains"));
-        process.exit(1);
-      }
-      const job = await startFinetune({
-        provider: "openai",
-        baseModel,
-        name,
-        dataset: datasetPath
-      });
-      const jobId = job["id"] ?? job["fine_tune_job_id"] ?? job["jobId"];
-      console.log(chalk.green(`\u2713 Fine-tuning job started: ${String(jobId ?? "unknown")}`));
-      console.log(`
-${chalk.dim("Check status:")} economy brains status ${String(jobId ?? "")}`);
-      console.log(`${chalk.dim("When complete, set model:")} economy brains model set <model-id>`);
-    } catch (e) {
-      console.error(chalk.red(`Error starting fine-tune: ${e instanceof Error ? e.message : String(e)}`));
-      process.exit(1);
-    }
-  });
-  const modelCmd = brainsCmd.command("model").description("View or set the active fine-tuned model").action(() => {
-    const active = getActiveModel();
-    const isDefault = active === DEFAULT_MODEL;
-    console.log(`Active model: ${chalk.cyan(active)}${isDefault ? chalk.dim(" (default)") : chalk.green(" (fine-tuned)")}`);
-    if (isDefault) {
-      console.log(chalk.dim(`
-To set a fine-tuned model: economy brains model set <model-id>`));
-    }
-  });
-  modelCmd.command("set <id>").description("Set the active fine-tuned model ID").action((id) => {
-    setActiveModel(id);
-    console.log(chalk.green(`\u2713 Active model set to: ${id}`));
-    console.log(chalk.dim("  Economy AI analysis will now use this model."));
-  });
-  modelCmd.command("clear").description(`Reset to default model (${DEFAULT_MODEL})`).action(() => {
-    clearActiveModel();
-    console.log(chalk.green(`\u2713 Active model cleared, using default: ${DEFAULT_MODEL}`));
-  });
-  brainsCmd.command("status [job-id]").description("Check the status of a fine-tuning job").option("--provider <provider>", "Provider: openai|thinker-labs", "openai").action(async (jobId, opts) => {
-    if (!jobId) {
-      console.error(chalk.red("Usage: economy brains status <job-id>"));
-      process.exit(1);
-    }
-    try {
-      const brains = await import("@hasna/brains");
-      const getFinetuneStatus = brains["getFinetuneStatus"] ?? brains["get_finetune_status"];
-      if (typeof getFinetuneStatus !== "function") {
-        console.error(chalk.red("@hasna/brains not installed. Run: bun add @hasna/brains"));
-        process.exit(1);
-      }
-      const status = await getFinetuneStatus({
-        jobId,
-        provider: opts.provider ?? "openai"
-      });
-      console.log(`Job ${chalk.cyan(jobId)}:`);
-      console.log(`  Status: ${String(status["status"] ?? "unknown")}`);
-      if (status["fine_tuned_model"]) {
-        console.log(`  Fine-tuned model: ${chalk.green(String(status["fine_tuned_model"]))}`);
-        console.log(`
-${chalk.dim("Set it active:")} economy brains model set ${String(status["fine_tuned_model"])}`);
-      }
-      if (status["error"]) {
-        console.log(chalk.red(`  Error: ${String(status["error"])}`));
-      }
-    } catch (e) {
-      console.error(chalk.red(`Error: ${e instanceof Error ? e.message : String(e)}`));
-      process.exit(1);
-    }
-  });
-}
+import chalk6 from "chalk";
 
 // src/cli/commands/todos.ts
-import chalk2 from "chalk";
+import chalk from "chalk";
 var ROADMAP_VERSION = "2026-05-23-b";
 var ROADMAP_GOAL = "Unified AI spend across 4+ machines: auto-sync local telemetry, track subscription usage & savings, ingest all major coding agents, and expose proactive CLI/MCP intelligence \u2014 not just per-machine API cost estimates.";
 var ROADMAP_PHASES = [
@@ -10110,7 +10313,7 @@ var ROADMAP_PHASES = [
       },
       {
         id: "12.4",
-        title: "economy init \u2014 detect agents, set ECONOMY_MACHINE_ID, cloud URL, MCP install, cloud schedule, cron hint",
+        title: "economy init \u2014 detect agents, set HASNA_ECONOMY_MACHINE_ID, cloud URL, MCP install, cloud schedule, cron hint",
         status: "done",
         deps: ["9.7", "12.1"]
       },
@@ -10189,7 +10392,7 @@ var ROADMAP_PHASES = [
       },
       {
         id: "14.5",
-        title: "economy serve auth token (ECONOMY_API_TOKEN) \u2014 localhost-only default, optional LAN bind",
+        title: "economy serve auth token (HASNA_ECONOMY_API_TOKEN) \u2014 localhost-only default, optional LAN bind",
         status: "done"
       }
     ]
@@ -10199,10 +10402,10 @@ var DEFAULT_TODO_LIST_LIMIT = 20;
 var TODO_TITLE_WIDTH = 140;
 function statusLabel(status) {
   if (status === "done")
-    return chalk2.green("done");
+    return chalk.green("done");
   if (status === "in_progress")
-    return chalk2.yellow("in progress");
-  return chalk2.dim("pending");
+    return chalk.yellow("in progress");
+  return chalk.dim("pending");
 }
 function countByStatus(tasks) {
   return tasks.reduce((acc, task) => {
@@ -10220,7 +10423,7 @@ function parseListLimit(value) {
     return;
   const parsed = Number(value);
   if (!Number.isFinite(parsed) || parsed <= 0 || !Number.isInteger(parsed)) {
-    console.error(chalk2.red("--limit must be a positive integer"));
+    console.error(chalk.red("--limit must be a positive integer"));
     process.exit(1);
   }
   return parsed;
@@ -10236,12 +10439,12 @@ function matchingTasks(phases, status) {
 }
 function printTodosHelp() {
   console.log();
-  console.log(chalk2.bold.cyan("  Economy Roadmap \u2014 fleet, usage & savings"));
+  console.log(chalk.bold.cyan("  Economy Roadmap \u2014 fleet, usage & savings"));
   console.log();
-  console.log(chalk2.dim(`  Version: ${ROADMAP_VERSION}`));
+  console.log(chalk.dim(`  Version: ${ROADMAP_VERSION}`));
   console.log(`  ${ROADMAP_GOAL}`);
   console.log();
-  console.log(chalk2.bold("  Commands"));
+  console.log(chalk.bold("  Commands"));
   console.log("    economy todos              Overview of phases and progress");
   console.log("    economy todos list         Compact task list (first 20 by default)");
   console.log("    economy todos list --verbose      Full task list with dependencies");
@@ -10249,12 +10452,12 @@ function printTodosHelp() {
   console.log("    economy todos list --phase <id>   Tasks for one phase (e.g. phase-9)");
   console.log("    economy todos show <task-id>      Task detail (e.g. 9.7)");
   console.log();
-  console.log(chalk2.bold("  Multi-machine storage"));
+  console.log(chalk.bold("  Multi-machine storage"));
   console.log("    local       on-box SQLite; economy sync ingests this machine's agent data");
   console.log("    cloud       CLI/MCP reads and writes the shared /v1 API directly with URL + key");
   console.log("    fleet       machine_id keeps shared summaries and per-machine filters distinct");
   console.log();
-  console.log(chalk2.bold("  Agents covered"));
+  console.log(chalk.bold("  Agents covered"));
   console.log("    claude       Claude Code telemetry + Pro/Max quota (partial)");
   console.log("    codex        Codex SQLite + ChatGPT subscription mode");
   console.log("    opencode     ~/.local/share/opencode/storage JSON + OTLP");
@@ -10263,7 +10466,7 @@ function printTodosHelp() {
   console.log("    hermes       ~/.hermes/state.db sessions + cost routing");
   console.log("    gemini/takumi  Existing; extend with usage quota where available");
   console.log();
-  console.log(chalk2.bold("  Key metrics (target)"));
+  console.log(chalk.bold("  Key metrics (target)"));
   console.log("    api_equivalent_usd     What the same tokens would cost at list API prices");
   console.log("    subscription_fee_usd   Monthly plan cost (prorated per period)");
   console.log("    included_consumed_usd  Usage counted against plan inclusion");
@@ -10273,30 +10476,30 @@ function printTodosHelp() {
 }
 function printTodosOverview() {
   console.log();
-  console.log(chalk2.bold.cyan("  Economy Roadmap"));
-  console.log(chalk2.dim(`  ${ROADMAP_VERSION} \u2014 ${ROADMAP_GOAL}`));
+  console.log(chalk.bold.cyan("  Economy Roadmap"));
+  console.log(chalk.dim(`  ${ROADMAP_VERSION} \u2014 ${ROADMAP_GOAL}`));
   console.log();
   const allTasks = ROADMAP_PHASES.flatMap((phase) => phase.tasks);
   const totals = countByStatus(allTasks);
-  console.log(`  ${chalk2.green(String(totals.done))} done \xB7 ${chalk2.yellow(String(totals.in_progress))} in progress \xB7 ${chalk2.dim(String(totals.pending))} pending \xB7 ${allTasks.length} total`);
+  console.log(`  ${chalk.green(String(totals.done))} done \xB7 ${chalk.yellow(String(totals.in_progress))} in progress \xB7 ${chalk.dim(String(totals.pending))} pending \xB7 ${allTasks.length} total`);
   console.log();
   for (const phase of ROADMAP_PHASES) {
     const counts = countByStatus(phase.tasks);
     const progress = phase.tasks.length > 0 ? Math.round(counts.done / phase.tasks.length * 100) : 0;
-    console.log(`  ${chalk2.bold(phase.id)}  ${phase.title}  ${chalk2.dim(`(${progress}% \xB7 ${phase.tasks.length} tasks)`)}`);
-    console.log(chalk2.dim(`    ${phase.summary}`));
+    console.log(`  ${chalk.bold(phase.id)}  ${phase.title}  ${chalk.dim(`(${progress}% \xB7 ${phase.tasks.length} tasks)`)}`);
+    console.log(chalk.dim(`    ${phase.summary}`));
   }
   console.log();
-  console.log(chalk2.dim("  Run: economy todos list --limit 20"));
-  console.log(chalk2.dim("  Run: economy todos list --verbose"));
-  console.log(chalk2.dim("  Run: economy todos --help"));
+  console.log(chalk.dim("  Run: economy todos list --limit 20"));
+  console.log(chalk.dim("  Run: economy todos list --verbose"));
+  console.log(chalk.dim("  Run: economy todos --help"));
   console.log();
 }
 function printTodosList(opts) {
   const phases = opts.phase ? ROADMAP_PHASES.filter((phase) => phase.id === opts.phase) : ROADMAP_PHASES;
   if (phases.length === 0) {
-    console.log(chalk2.red(`Unknown phase: ${opts.phase}`));
-    console.log(chalk2.dim(`Valid phases: ${ROADMAP_PHASES.map((phase) => phase.id).join(", ")}`));
+    console.log(chalk.red(`Unknown phase: ${opts.phase}`));
+    console.log(chalk.dim(`Valid phases: ${ROADMAP_PHASES.map((phase) => phase.id).join(", ")}`));
     return;
   }
   const allMatches = matchingTasks(phases, opts.status);
@@ -10316,10 +10519,10 @@ function printTodosList(opts) {
     return;
   }
   console.log();
-  console.log(chalk2.bold.cyan("  Economy Roadmap Tasks"));
-  console.log(chalk2.dim(`  ${allMatches.length} matching tasks \xB7 showing ${visible.length}${visible.length < allMatches.length ? ` of ${allMatches.length}` : ""}`));
+  console.log(chalk.bold.cyan("  Economy Roadmap Tasks"));
+  console.log(chalk.dim(`  ${allMatches.length} matching tasks \xB7 showing ${visible.length}${visible.length < allMatches.length ? ` of ${allMatches.length}` : ""}`));
   if (!opts.verbose && visible.length < allMatches.length) {
-    console.log(chalk2.dim("  Use --verbose for all tasks or economy todos show <task-id> for details."));
+    console.log(chalk.dim("  Use --verbose for all tasks or economy todos show <task-id> for details."));
   }
   console.log();
   const visibleByPhase = new Map;
@@ -10332,20 +10535,20 @@ function printTodosList(opts) {
     const tasks = visibleByPhase.get(phase.id) ?? [];
     if (tasks.length === 0)
       continue;
-    console.log(chalk2.bold.cyan(`  ${phase.id} \u2014 ${phase.title}`));
+    console.log(chalk.bold.cyan(`  ${phase.id} \u2014 ${phase.title}`));
     if (opts.verbose)
-      console.log(chalk2.dim(`  ${phase.summary}`));
+      console.log(chalk.dim(`  ${phase.summary}`));
     console.log();
     for (const task of tasks) {
-      const deps = task.deps?.length ? chalk2.dim(`  deps: ${task.deps.join(", ")}`) : "";
+      const deps = task.deps?.length ? chalk.dim(`  deps: ${task.deps.join(", ")}`) : "";
       const title = opts.verbose ? task.title : truncateText(task.title, TODO_TITLE_WIDTH);
-      console.log(`    ${chalk2.dim(task.id.padEnd(5))} ${statusLabel(task.status).padEnd(14)} ${title}${opts.verbose && deps ? `
+      console.log(`    ${chalk.dim(task.id.padEnd(5))} ${statusLabel(task.status).padEnd(14)} ${title}${opts.verbose && deps ? `
 ${" ".repeat(22)}${deps}` : ""}`);
     }
     console.log();
   }
   if (visible.length < allMatches.length) {
-    console.log(chalk2.dim(`  ... ${allMatches.length - visible.length} more tasks hidden. Use --limit <n>, --verbose, --phase <id>, or economy todos show <task-id>.`));
+    console.log(chalk.dim(`  ... ${allMatches.length - visible.length} more tasks hidden. Use --limit <n>, --verbose, --phase <id>, or economy todos show <task-id>.`));
     console.log();
   }
 }
@@ -10355,19 +10558,19 @@ function printTodoShow(taskId) {
     if (!task)
       continue;
     console.log();
-    console.log(chalk2.bold.cyan(`  ${task.id} \u2014 ${task.title}`));
+    console.log(chalk.bold.cyan(`  ${task.id} \u2014 ${task.title}`));
     console.log(`  Phase: ${phase.id} (${phase.title})`);
     console.log(`  Status: ${statusLabel(task.status)}`);
     if (task.deps?.length) {
       console.log(`  Depends on: ${task.deps.join(", ")}`);
     }
-    console.log(chalk2.dim(`
+    console.log(chalk.dim(`
   ${phase.summary}`));
     console.log();
     return;
   }
-  console.log(chalk2.red(`Task not found: ${taskId}`));
-  console.log(chalk2.dim("Run: economy todos list"));
+  console.log(chalk.red(`Task not found: ${taskId}`));
+  console.log(chalk.dim("Run: economy todos list"));
 }
 function registerTodosCommand(program) {
   const todosCmd = program.command("todos").description("Roadmap and granular tasks \u2014 fleet sync, usage tracking, subscription savings").option("--help-roadmap", "Show roadmap help (usage vs API spend, agents, metrics)").action((opts) => {
@@ -10380,7 +10583,7 @@ function registerTodosCommand(program) {
   todosCmd.command("list").description("List granular roadmap tasks").option("--phase <id>", "Filter by phase id (e.g. phase-4)").option("--status <status>", "Filter by status: pending|in_progress|done").option("--limit <n>", "Maximum tasks to print (default: 20)").option("--verbose", "Print all matching tasks with phase summaries and dependencies").option("--json", "Output the full filtered roadmap as JSON").action((opts) => {
     const status = opts.status;
     if (status && !["pending", "in_progress", "done"].includes(status)) {
-      console.error(chalk2.red("--status must be one of: pending, in_progress, done"));
+      console.error(chalk.red("--status must be one of: pending, in_progress, done"));
       process.exit(1);
     }
     printTodosList({
@@ -10406,9 +10609,9 @@ init_tui();
 init_store();
 init_pricing();
 init_agents();
-import chalk4 from "chalk";
-import { existsSync as existsSync3 } from "fs";
-import { join as join5 } from "path";
+import chalk3 from "chalk";
+import { existsSync as existsSync2 } from "fs";
+import { join as join3 } from "path";
 
 // src/cli/commands/completion.ts
 var TOP_LEVEL = [
@@ -10554,6 +10757,36 @@ function printCompletion(shell) {
 // src/cli/commands/extras.ts
 init_paths();
 init_billing_diff();
+init_cloud_storage();
+
+// src/lib/api-display-url.ts
+function gatewayApiV1Root(raw) {
+  if (typeof raw !== "string")
+    return null;
+  const trimmed = raw.trim();
+  if (!trimmed)
+    return null;
+  let parsed;
+  try {
+    parsed = new URL(trimmed);
+  } catch {
+    return null;
+  }
+  if (parsed.protocol !== "https:" || parsed.hostname !== "api.hasna.com")
+    return null;
+  if (parsed.username || parsed.password || parsed.search || parsed.hash)
+    return null;
+  const segments = parsed.pathname.split("/").filter(Boolean);
+  if (segments.length === 1 && segments[0] !== "v1") {
+    return `https://api.hasna.com/${segments[0]}/v1`;
+  }
+  if (segments.length === 2 && segments[1] === "v1") {
+    return `https://api.hasna.com/${segments[0]}/v1`;
+  }
+  return null;
+}
+
+// src/cli/commands/extras.ts
 function fmt2(usd) {
   return "$" + usd.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
@@ -10569,7 +10802,7 @@ function fmtTokens(n) {
 function parsePeriod(value, fallback = "month") {
   const p = value ?? fallback;
   if (!["today", "yesterday", "week", "month", "year", "all"].includes(p)) {
-    console.error(chalk4.red("--period must be today|yesterday|week|month|year|all"));
+    console.error(chalk3.red("--period must be today|yesterday|week|month|year|all"));
     process.exit(1);
   }
   return p;
@@ -10579,7 +10812,7 @@ function parseLimit(value, fallback, verbose) {
     return Number.POSITIVE_INFINITY;
   const parsed = Number(value ?? String(fallback));
   if (!Number.isFinite(parsed) || parsed <= 0 || !Number.isInteger(parsed)) {
-    console.error(chalk4.red("--limit must be a positive integer"));
+    console.error(chalk3.red("--limit must be a positive integer"));
     process.exit(1);
   }
   return parsed;
@@ -10594,28 +10827,28 @@ function registerExtendedCommands(program) {
       return;
     }
     console.log();
-    console.log(chalk4.bold.cyan(`  Usage \u2014 ${period}`));
+    console.log(chalk3.bold.cyan(`  Usage \u2014 ${period}`));
     console.log();
     if (snaps.length === 0) {
-      console.log(chalk4.yellow("  No usage snapshots yet. Run: economy sync --cursor"));
+      console.log(chalk3.yellow("  No usage snapshots yet. Run: economy sync --cursor"));
     } else {
       const limit = parseLimit(opts.limit, 20, opts.verbose);
       const visibleSnaps = snaps.slice(0, limit);
       if (visibleSnaps.length < snaps.length) {
-        console.log(chalk4.dim(`  ${snaps.length} snapshots \xB7 showing ${visibleSnaps.length}`));
+        console.log(chalk3.dim(`  ${snaps.length} snapshots \xB7 showing ${visibleSnaps.length}`));
         console.log();
       }
       for (const s of visibleSnaps) {
-        console.log(`  ${chalk4.white(s.agent.padEnd(10))} ${s.metric.padEnd(28)} ${s.value}${s.unit ? ` ${s.unit}` : ""}  ${chalk4.dim(s.date)}`);
+        console.log(`  ${chalk3.white(s.agent.padEnd(10))} ${s.metric.padEnd(28)} ${s.value}${s.unit ? ` ${s.unit}` : ""}  ${chalk3.dim(s.date)}`);
       }
       if (visibleSnaps.length < snaps.length) {
-        console.log(chalk4.dim(`
+        console.log(chalk3.dim(`
   ... ${snaps.length - visibleSnaps.length} more snapshots hidden. Use --limit <n>, --verbose, or --json.`));
       }
     }
     const spendLabel = agent ? `${agent} API-equivalent spend:` : "Fleet API-equivalent spend:";
     console.log(`
-  ${chalk4.dim(spendLabel)} ${fmt2(summary.total_usd)}`);
+  ${chalk3.dim(spendLabel)} ${fmt2(summary.total_usd)}`);
     console.log();
   });
   program.command("savings [period]").description("Subscription vs API-equivalent savings breakdown").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--json", "Output JSON").action(async (periodArg, opts) => {
@@ -10627,13 +10860,13 @@ function registerExtendedCommands(program) {
       return;
     }
     console.log();
-    console.log(chalk4.bold.cyan(`  Savings \u2014 ${period}${agent ? ` (${agent})` : ""}`));
+    console.log(chalk3.bold.cyan(`  Savings \u2014 ${period}${agent ? ` (${agent})` : ""}`));
     console.log();
     console.log(`  API equivalent:     ${fmt2(savings.api_equivalent_usd)}`);
     console.log(`  Subscription fee:   ${fmt2(savings.subscription_fee_usd)}`);
     console.log(`  Included consumed:  ${fmt2(savings.included_consumed_usd)}`);
     console.log(`  On-demand:          ${fmt2(savings.on_demand_usd)}`);
-    console.log(`  ${chalk4.bold("Saved:")}              ${chalk4.green(fmt2(savings.saved_usd))}`);
+    console.log(`  ${chalk3.bold("Saved:")}              ${chalk3.green(fmt2(savings.saved_usd))}`);
     console.log();
   });
   const subsCmd = program.command("subscriptions").description("Manage subscription plans");
@@ -10649,7 +10882,7 @@ function registerExtendedCommands(program) {
       reset_policy: "monthly",
       active: 1
     });
-    console.log(chalk4.green(`\u2713 Subscription set: ${opts.provider} / ${opts.plan}`));
+    console.log(chalk3.green(`\u2713 Subscription set: ${opts.provider} / ${opts.plan}`));
   });
   subsCmd.command("list").description("List subscription plans").option("--limit <n>", "Maximum subscription rows to print (default: 20)").option("--verbose", "Show all subscription rows").option("--json", "Output JSON").action(async (opts) => {
     const rows = await getStore().listSubscriptions();
@@ -10658,28 +10891,28 @@ function registerExtendedCommands(program) {
       return;
     }
     if (rows.length === 0) {
-      console.log(chalk4.yellow("No subscriptions configured."));
+      console.log(chalk3.yellow("No subscriptions configured."));
       return;
     }
     const limit = parseLimit(opts.limit, 20, opts.verbose);
     const visibleRows = rows.slice(0, limit);
     console.log();
     if (visibleRows.length < rows.length) {
-      console.log(chalk4.dim(`  ${rows.length} subscriptions \xB7 showing ${visibleRows.length}`));
+      console.log(chalk3.dim(`  ${rows.length} subscriptions \xB7 showing ${visibleRows.length}`));
       console.log();
     }
     for (const r of visibleRows) {
-      console.log(`  ${chalk4.white(r.provider)} / ${r.plan}  ${fmt2(r.monthly_fee_usd)}/mo  included ${fmt2(r.included_usage_usd)}  ${r.agent ?? "all agents"}`);
+      console.log(`  ${chalk3.white(r.provider)} / ${r.plan}  ${fmt2(r.monthly_fee_usd)}/mo  included ${fmt2(r.included_usage_usd)}  ${r.agent ?? "all agents"}`);
     }
     if (visibleRows.length < rows.length) {
-      console.log(chalk4.dim(`
+      console.log(chalk3.dim(`
   ... ${rows.length - visibleRows.length} more subscriptions hidden. Use --limit <n>, --verbose, or --json.`));
     }
     console.log();
   });
   subsCmd.command("remove <id>").description("Remove subscription by id").action(async (id) => {
     await getStore().removeSubscription(id);
-    console.log(chalk4.green("\u2713 Subscription removed"));
+    console.log(chalk3.green("\u2713 Subscription removed"));
   });
   program.command("status").description("One-line fleet health and spend summary").action(async () => {
     console.log(buildStatusLine(await gatherStatusData()));
@@ -10692,17 +10925,26 @@ function registerExtendedCommands(program) {
       const paths = [
         ["claude", agentPaths().claudeProjects],
         ["codex", agentPaths().codexDb],
-        ["gemini", join5(agentPaths().geminiTmp, "..")],
-        ["opencode", join5(agentPaths().opencodeMessages, "..", "..")],
+        ["gemini", join3(agentPaths().geminiTmp, "..")],
+        ["opencode", join3(agentPaths().opencodeMessages, "..", "..")],
         ["pi", agentPaths().piSessions],
         ["hermes", agentPaths().hermesDb]
       ];
       for (const [agent, path] of paths) {
-        checks.push({ ok: existsSync3(path), msg: `${agent}: ${existsSync3(path) ? path : "not found"}` });
+        checks.push({ ok: existsSync2(path), msg: `${agent}: ${existsSync2(path) ? path : "not found"}` });
       }
       checks.push({ ok: Boolean(process.env["CURSOR_SESSION_TOKEN"]), msg: `cursor token: ${process.env["CURSOR_SESSION_TOKEN"] ? "set" : "missing CURSOR_SESSION_TOKEN"}` });
     }
-    checks.push({ ok: true, msg: `storage: ${cloud ? "self_hosted/cloud (HASNA_ECONOMY_API_URL + key)" : "local"}` });
+    checks.push({ ok: true, msg: `storage: ${cloud ? "shared API (credential resolved via @hasna/contracts)" : "local (explicit opt-in)"}` });
+    if (cloud) {
+      const gatewayRoot = gatewayApiV1Root(process.env.HASNA_ECONOMY_API_URL ?? process.env.ECONOMY_API_URL);
+      if (gatewayRoot)
+        checks.push({ ok: true, msg: `api: ${gatewayRoot}` });
+      const report = economyTransportReport();
+      if (report.ok && report.authority) {
+        checks.push({ ok: true, msg: `credential source: ${report.authority.apiKeySource ?? "(unknown)"} (tier ${report.authority.apiKeyTier ?? "?"})` });
+      }
+    }
     if (!cloud) {
       const db = openDatabase();
       ensurePricingSeeded(db);
@@ -10725,19 +10967,49 @@ function registerExtendedCommands(program) {
     }
     checks.push(billingDriftCheck(await store.billingDiff("month")));
     console.log();
-    console.log(chalk4.bold.cyan("  Economy Doctor"));
+    console.log(chalk3.bold.cyan("  Economy Doctor"));
     console.log();
     for (const c of checks) {
-      console.log(`  ${c.ok ? chalk4.green("\u2713") : chalk4.yellow("!")} ${c.msg}`);
+      console.log(`  ${c.ok ? chalk3.green("\u2713") : chalk3.yellow("!")} ${c.msg}`);
     }
     console.log();
   });
+  program.command("transport").description("Report the resolved client transport and credential source (never the key)").option("--json", "Output JSON").action((opts) => {
+    const report = economyTransportReport();
+    if (!report.ok)
+      process.exitCode = 1;
+    if (opts.json) {
+      console.log(JSON.stringify(report, null, 2));
+      return;
+    }
+    if (!report.ok) {
+      console.log(chalk3.red("  economy transport: no hosted credential resolves."));
+      for (const issue of report.issues)
+        console.log(chalk3.dim(`    ${issue}`));
+      console.log(chalk3.dim("    Set HASNA_ECONOMY_API_KEY (Keychain, ~/.hasna/economy/config/credentials, or env), or set HASNA_ECONOMY_LOCAL=1 for the local store."));
+      return;
+    }
+    if (report.transport === "sqlite") {
+      console.log(`  transport: ${report.transport} (${report.source}) \u2014 on-box SQLite store`);
+      return;
+    }
+    console.log(`  transport: ${report.transport} (${report.source ?? "http"})`);
+    const a = report.authority;
+    if (a) {
+      console.log(`  api url:   ${a.baseUrl}`);
+      console.log(`  url source: ${a.apiUrlSource ?? "(none)"}`);
+      console.log(`  key source: ${a.apiKeySource ?? "(none)"}`);
+      console.log(`  key tier:   ${a.apiKeyTier ?? "(none)"}`);
+      if (a.warning)
+        console.log(chalk3.dim(`  warning:    ${a.warning}`));
+    }
+  });
   program.command("init").description("First-run setup wizard hints").action(async () => {
-    console.log(chalk4.bold.cyan(`
+    console.log(chalk3.bold.cyan(`
   Economy Init
 `));
     console.log("  Local mode (on-box SQLite):");
-    console.log("  1. Set machine id:  export ECONOMY_MACHINE_ID=spark01");
+    console.log("  1. Set machine id:  export HASNA_ECONOMY_MACHINE_ID=spark01");
     console.log("  2. Cursor token:    export CURSOR_SESSION_TOKEN=...");
     console.log("  3. Run ingest:      economy sync --verbose");
     console.log("  4. MCP install:     economy mcp --all");
@@ -10784,16 +11056,16 @@ function registerExtendedCommands(program) {
       const period = parsePeriod(opts.period, "month");
       const diff = await getStore().billingDiff(period);
       console.log();
-      console.log(chalk4.bold.cyan(`  Billing diff \u2014 ${period}`));
+      console.log(chalk3.bold.cyan(`  Billing diff \u2014 ${period}`));
       console.log(`  Estimated:  ${fmt2(diff.estimated_usd)}`);
       console.log(`  Actual:     ${fmt2(diff.actual_usd)}`);
       const deltaPct = diff.comparable ? `${diff.delta_usd >= 0 ? "+" : ""}${diff.delta_pct.toFixed(1)}%` : "n/a";
       console.log(`  Delta:      ${fmt2(Math.abs(diff.delta_usd))} (${deltaPct})`);
       if (!diff.comparable)
-        console.log(chalk4.yellow(`
+        console.log(chalk3.yellow(`
   ${billingDriftCheck(diff).msg}`));
       if (diff.is_alert)
-        console.log(chalk4.yellow(`
+        console.log(chalk3.yellow(`
   Suggestion: economy sync --recalculate && economy billing sync`));
       console.log();
     });
@@ -10810,17 +11082,17 @@ function registerFleetCommands(program) {
     const limit = parseLimit(opts.limit, 20, opts.verbose);
     const visibleMachines = machines.slice(0, limit);
     console.log();
-    console.log(chalk4.bold.cyan(`  Fleet \u2014 ${period}`));
+    console.log(chalk3.bold.cyan(`  Fleet \u2014 ${period}`));
     console.log(`  Total: ${fmt2(summary.total_usd)} \xB7 ${summary.sessions} sessions \xB7 ${summary.requests} requests`);
     if (visibleMachines.length < machines.length) {
-      console.log(chalk4.dim(`  ${machines.length} machines \xB7 showing ${visibleMachines.length}`));
+      console.log(chalk3.dim(`  ${machines.length} machines \xB7 showing ${visibleMachines.length}`));
     }
     console.log();
     for (const m of visibleMachines) {
-      console.log(`  ${chalk4.white(m.machine_id.padEnd(12))} ${fmt2(m.total_cost_usd).padEnd(10)} ${m.sessions} sessions`);
+      console.log(`  ${chalk3.white(m.machine_id.padEnd(12))} ${fmt2(m.total_cost_usd).padEnd(10)} ${m.sessions} sessions`);
     }
     if (visibleMachines.length < machines.length) {
-      console.log(chalk4.dim(`
+      console.log(chalk3.dim(`
   ... ${machines.length - visibleMachines.length} more machines hidden. Use --limit <n>, --verbose, or --json.`));
     }
     console.log();
@@ -10967,14 +11239,14 @@ init_billing();
 init_package_metadata();
 init_pricing();
 init_store();
-import { execSync } from "child_process";
 
 // src/lib/cloud-ingest.ts
 init_database();
 init_pricing();
 init_sync_all();
 init_billing();
-import { join as join13 } from "path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync10, renameSync, writeFileSync } from "fs";
+import { dirname, join as join12 } from "path";
 
 // src/lib/sync-maintenance.ts
 init_database();
@@ -11015,15 +11287,39 @@ var CLOUD_INGEST_TABLES = ["requests", "sessions", "billing_daily", "usage_snaps
 function getIngestCachePath() {
   if (process.env["HASNA_ECONOMY_INGEST_CACHE"])
     return process.env["HASNA_ECONOMY_INGEST_CACHE"];
-  return join13(getDataDir(), "ingest-cache.db");
+  const home = process.env["HOME"] || process.env["USERPROFILE"] || undefined;
+  return join12(cacheDir({ app: "economy", home }), "ingest-cache.json");
+}
+function readIngestCache(path) {
+  let text;
+  try {
+    text = readFileSync10(path, "utf8");
+  } catch {
+    return [];
+  }
+  try {
+    const parsed = JSON.parse(text);
+    const rows = Array.isArray(parsed?.ingest_state) ? parsed.ingest_state : [];
+    return rows.filter((row) => typeof row === "object" && row !== null && typeof row.source === "string" && typeof row.key === "string" && typeof row.value === "string");
+  } catch {
+    return [];
+  }
+}
+function writeIngestCache(path, rows) {
+  mkdirSync2(dirname(path), { recursive: true });
+  const tmp = `${path}.${process.pid}.tmp`;
+  writeFileSync(tmp, JSON.stringify({ version: 1, ingest_state: rows }), { mode: 384 });
+  renameSync(tmp, path);
 }
-function copyIngestState(from, to) {
-  const rows = from.prepare(`SELECT source, key, value FROM ingest_state`).all();
-  to.prepare(`DELETE FROM ingest_state`).run();
-  const insert = to.prepare(`INSERT INTO ingest_state (source, key, value) VALUES (?, ?, ?)`);
+function loadIngestState2(scratch, rows) {
+  scratch.prepare(`DELETE FROM ingest_state`).run();
+  const insert = scratch.prepare(`INSERT INTO ingest_state (source, key, value) VALUES (?, ?, ?)`);
   for (const row of rows)
     insert.run(row.source, row.key, row.value);
 }
+function dumpIngestState(scratch) {
+  return scratch.prepare(`SELECT source, key, value FROM ingest_state`).all();
+}
 function exportIngestRows(db) {
   const body = {};
   for (const table2 of CLOUD_INGEST_TABLES) {
@@ -11051,11 +11347,9 @@ async function postIngest(cloud, body) {
 async function syncAllToCloud(cloud, opts = {}) {
   const scratch = openDatabase(":memory:", true);
   ensurePricingSeeded(scratch);
-  const cache2 = openDatabase(opts.cachePath ?? getIngestCachePath(), true);
+  const cachePath = opts.cachePath ?? getIngestCachePath();
   try {
-    if (opts.force)
-      cache2.prepare(`DELETE FROM ingest_state`).run();
-    copyIngestState(cache2, scratch);
+    loadIngestState2(scratch, opts.force ? [] : readIngestCache(cachePath));
     const result = await syncAll(scratch, opts);
     if (opts.backfillMachine)
       backfillMachineId(scratch);
@@ -11063,19 +11357,16 @@ async function syncAllToCloud(cloud, opts = {}) {
       await recalculateZeroCostRequests(scratch);
     const body = exportIngestRows(scratch);
     if (Object.keys(body).length === 0) {
-      copyIngestState(scratch, cache2);
+      writeIngestCache(cachePath, dumpIngestState(scratch));
       return { ...result, posted: false };
     }
     const response = await postIngest(cloud, body);
-    copyIngestState(scratch, cache2);
+    writeIngestCache(cachePath, dumpIngestState(scratch));
     return { ...result, posted: true, ingested: response.ingested, total: response.total };
   } finally {
     try {
       scratch.close();
     } catch {}
-    try {
-      cache2.close();
-    } catch {}
   }
 }
 async function billingSyncToCloud(cloud, opts = {}) {
@@ -11119,6 +11410,43 @@ async function billingSyncToCloud(cloud, opts = {}) {
 init_cloud_storage();
 init_billing_diff();
 
+// src/lib/autosync-gate.ts
+init_database();
+init_store();
+var AUTOSYNC_STATE_SOURCE = "autosync";
+var AUTOSYNC_STATE_KEY = "last_run";
+var DEFAULT_AUTOSYNC_INTERVAL_MS = 10 * 60000;
+function autosyncIntervalMs(env = process.env) {
+  const raw = env["HASNA_ECONOMY_AUTOSYNC_INTERVAL"];
+  if (raw == null || raw.trim() === "")
+    return DEFAULT_AUTOSYNC_INTERVAL_MS;
+  const seconds = Number(raw);
+  if (!Number.isFinite(seconds) || seconds < 0)
+    return DEFAULT_AUTOSYNC_INTERVAL_MS;
+  return Math.round(seconds * 1000);
+}
+function autosyncMarkerStore(env = process.env) {
+  if (isCloudStore(env))
+    return openDatabase(getIngestCachePath());
+  return openDatabase();
+}
+function autosyncLastRun(db, env = process.env) {
+  const store = db ?? autosyncMarkerStore(env);
+  const value = getIngestState(store, AUTOSYNC_STATE_SOURCE, AUTOSYNC_STATE_KEY);
+  const ts = value == null ? NaN : Number(value);
+  return Number.isFinite(ts) && ts > 0 ? ts : 0;
+}
+function markAutoSync(db, env = process.env) {
+  const store = db ?? autosyncMarkerStore(env);
+  setIngestState(store, AUTOSYNC_STATE_SOURCE, AUTOSYNC_STATE_KEY, String(Date.now()));
+}
+function autoSyncDue(db, env = process.env) {
+  const interval = autosyncIntervalMs(env);
+  if (interval === 0)
+    return true;
+  return Date.now() - autosyncLastRun(db, env) >= interval;
+}
+
 // src/lib/contracts-client/transport.ts
 import { HasnaHttpError } from "@hasna/contracts/client";
 
@@ -11126,15 +11454,14 @@ import { HasnaHttpError } from "@hasna/contracts/client";
 var program = new Command;
 program.name("economy").description("AI coding cost tracker \u2014 Claude, Takumi, Codex, Gemini, OpenCode, Cursor, Pi, Hermes").version(packageMetadata.version);
 async function autoSync(opts = {}) {
-  if (isCloudStore()) {
-    const cloud = economyCloudStorage();
-    if (cloud.active)
-      await syncAllToCloud(cloud, opts);
+  if (isCloudStore())
+    return;
+  if (!autoSyncDue(undefined, process.env))
     return;
-  }
   const db = openDatabase();
   ensurePricingSeeded(db);
   await syncAll(db, opts);
+  markAutoSync(db, process.env);
 }
 function sparkline(values) {
   const chars = "\u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588";
@@ -11157,7 +11484,7 @@ function fmt4(usd) {
   } else {
     formatted = "$0.00";
   }
-  return chalk7.green(formatted);
+  return chalk6.green(formatted);
 }
 function fmtTokens2(n) {
   if (n >= 1e9)
@@ -11173,25 +11500,25 @@ function fmtCount(n) {
 }
 function fmtAgent(agent) {
   if (agent === "claude")
-    return chalk7.blue("claude");
+    return chalk6.blue("claude");
   if (agent === "codex")
-    return chalk7.yellow("codex");
+    return chalk6.yellow("codex");
   if (agent === "gemini")
-    return chalk7.green("gemini");
+    return chalk6.green("gemini");
   if (agent === "takumi")
-    return chalk7.magenta("takumi");
+    return chalk6.magenta("takumi");
   if (agent === "opencode")
-    return chalk7.cyan("opencode");
+    return chalk6.cyan("opencode");
   if (agent === "cursor")
-    return chalk7.white("cursor");
+    return chalk6.white("cursor");
   if (agent === "pi")
-    return chalk7.hex("#FF6B6B")("pi");
+    return chalk6.hex("#FF6B6B")("pi");
   if (agent === "hermes")
-    return chalk7.hex("#9B59B6")("hermes");
-  return chalk7.gray(agent);
+    return chalk6.hex("#9B59B6")("hermes");
+  return chalk6.gray(agent);
 }
 function fail(message) {
-  console.error(chalk7.red(message));
+  console.error(chalk6.red(message));
   process.exit(1);
 }
 function parseFiniteCliNumber(value, option) {
@@ -11243,7 +11570,7 @@ function resolveRowLimit(value, verbose, fallback) {
 function printHiddenRowsHint(total, shown, detail) {
   if (total <= shown)
     return;
-  console.log(chalk7.dim(`  ... ${total - shown} more rows hidden. ${detail}`));
+  console.log(chalk6.dim(`  ... ${total - shown} more rows hidden. ${detail}`));
 }
 function requireCliChoice(value, option, allowed) {
   const selected = value ?? allowed[0];
@@ -11253,11 +11580,11 @@ function requireCliChoice(value, option, allowed) {
 }
 function printTable(headers, rows) {
   const widths = headers.map((h, i) => Math.max(h.length, ...rows.map((r) => (r[i] ?? "").replace(/\x1b\[[0-9;]*m/g, "").length)));
-  const sep2 = widths.map((w) => "\u2500".repeat(w + 2)).join("\u253C");
+  const sep = widths.map((w) => "\u2500".repeat(w + 2)).join("\u253C");
   const header = headers.map((h, i) => ` ${h.padEnd(widths[i] ?? 0)} `).join("\u2502");
-  console.log(`\u250C${sep2.replace(/\u253C/g, "\u252C")}\u2510`);
+  console.log(`\u250C${sep.replace(/\u253C/g, "\u252C")}\u2510`);
   console.log(`\u2502${header}\u2502`);
-  console.log(`\u251C${sep2}\u2524`);
+  console.log(`\u251C${sep}\u2524`);
   for (const row of rows) {
     const line = row.map((cell, i) => {
       const plain = cell.replace(/\x1b\[[0-9;]*m/g, "");
@@ -11265,19 +11592,19 @@ function printTable(headers, rows) {
     }).join("\u2502");
     console.log(`\u2502${line}\u2502`);
   }
-  console.log(`\u2514${sep2.replace(/\u253C/g, "\u2534")}\u2518`);
+  console.log(`\u2514${sep.replace(/\u253C/g, "\u2534")}\u2518`);
 }
 function accountDisplayName(row) {
   return row.account_email || row.account_name || row.account_key || "unknown";
 }
 function printAccountBreakdown(rows) {
   printTable(["Account", "Agent", "Source", "Sessions", "Requests", "Tokens", "API Eq", "Billable", "Included"], rows.map((r) => [
-    chalk7.white(accountDisplayName(r)),
+    chalk6.white(accountDisplayName(r)),
     fmtAgent(r.account_tool),
-    chalk7.dim(r.account_source || "unknown"),
+    chalk6.dim(r.account_source || "unknown"),
     String(r.sessions),
     String(r.requests),
-    chalk7.cyan(fmtTokens2(r.total_tokens)),
+    chalk6.cyan(fmtTokens2(r.total_tokens)),
     fmt4(r.api_equivalent_usd),
     fmt4(r.billable_usd),
     fmt4(r.subscription_included_usd)
@@ -11296,13 +11623,13 @@ function parseSinceDate2(since) {
 async function printSummary(label, period) {
   const s = await getStore().summary(period);
   console.log();
-  console.log(chalk7.bold.cyan(`  ${label}`));
+  console.log(chalk6.bold.cyan(`  ${label}`));
   console.log();
   printTable(["Metric", "Value"], [
     ["Total cost", fmt4(s.total_usd)],
-    ["Sessions", chalk7.yellow(fmtCount(s.sessions))],
-    ["Requests", chalk7.yellow(fmtCount(s.requests))],
-    ["Tokens", chalk7.yellow(fmtTokens2(s.tokens))]
+    ["Sessions", chalk6.yellow(fmtCount(s.sessions))],
+    ["Requests", chalk6.yellow(fmtCount(s.requests))],
+    ["Tokens", chalk6.yellow(fmtTokens2(s.tokens))]
   ]);
   console.log();
 }
@@ -11324,7 +11651,7 @@ program.action(async () => {
   }, {});
   dailyValues = Object.values(daily);
   console.log();
-  console.log(chalk7.bold.cyan("  Economy"));
+  console.log(chalk6.bold.cyan("  Economy"));
   console.log();
   printTable(["Period", "Cost", "Sessions", "Requests", "Tokens"], [
     ["Today", fmt4(t.total_usd), fmtCount(t.sessions), fmtCount(t.requests), fmtTokens2(t.tokens)],
@@ -11333,13 +11660,13 @@ program.action(async () => {
   ]);
   if (dailyValues.length > 0) {
     console.log(`
-  ${chalk7.dim("14-day trend:")} ${sparkline(dailyValues)}`);
+  ${chalk6.dim("14-day trend:")} ${sparkline(dailyValues)}`);
   }
   if (projects.length > 0) {
     console.log(`
-  ${chalk7.dim("Top projects:")}`);
+  ${chalk6.dim("Top projects:")}`);
     for (const p of projects) {
-      console.log(`    ${chalk7.white(p.project_name.padEnd(25))} ${fmt4(p.cost_usd)}`);
+      console.log(`    ${chalk6.white(p.project_name.padEnd(25))} ${fmt4(p.cost_usd)}`);
     }
   }
   console.log();
@@ -11348,7 +11675,7 @@ program.command("sync").description("Ingest cost data from all coding agents").o
   if (isCloudStore()) {
     const cloud = economyCloudStorage();
     if (!cloud.active) {
-      console.log(chalk7.yellow("cloud mode: sync transport unavailable (set HASNA_ECONOMY_API_URL and HASNA_ECONOMY_API_KEY)"));
+      console.log(chalk6.yellow("cloud mode: sync transport unavailable (no credential resolved; set HASNA_ECONOMY_API_KEY or write ~/.hasna/economy/config/credentials)"));
       return;
     }
     const result2 = await syncAllToCloud(cloud, {
@@ -11368,11 +11695,11 @@ program.command("sync").description("Ingest cost data from all coding agents").o
     });
     if (result2.posted) {
       const parts = Object.entries(result2.ingested ?? {}).filter(([, n]) => n > 0).map(([table2, n]) => `${n} ${table2}`);
-      console.log(chalk7.green(`\u2713 pushed ${parts.join(", ")} to the shared API (${result2.total} rows)`));
+      console.log(chalk6.green(`\u2713 pushed ${parts.join(", ")} to the shared API (${result2.total} rows)`));
     } else {
-      console.log(chalk7.dim("\u2713 no new provider data to push (mtime cache current)"));
+      console.log(chalk6.dim("\u2713 no new provider data to push (mtime cache current)"));
     }
-    console.log(chalk7.bold.green(`
+    console.log(chalk6.bold.green(`
 \u2713 Sync complete`));
     return;
   }
@@ -11384,19 +11711,19 @@ program.command("sync").description("Ingest cost data from all coding agents").o
       const { syncOpenProjectsRegistry: syncOpenProjectsRegistry2 } = await Promise.resolve().then(() => (init_open_projects(), exports_open_projects));
       const p = await syncOpenProjectsRegistry2(db);
       if (opts.verbose)
-        console.log(chalk7.dim(`Synced open-projects registry: ${p.imported} imported, ${p.skipped} skipped`));
+        console.log(chalk6.dim(`Synced open-projects registry: ${p.imported} imported, ${p.skipped} skipped`));
     } catch (e) {
       if (opts.verbose)
-        console.log(chalk7.dim(`open-projects registry sync skipped: ${e instanceof Error ? e.message : String(e)}`));
+        console.log(chalk6.dim(`open-projects registry sync skipped: ${e instanceof Error ? e.message : String(e)}`));
     }
   }
   if (opts.force) {
     const ingestSources = [...AGENTS, "codex-codewith", "loops"];
     db.exec(`DELETE FROM ingest_state WHERE source IN (${ingestSources.map((a) => `'${a}'`).join(", ")})`);
     if (opts.verbose)
-      console.log(chalk7.dim("Cleared ingest cache"));
+      console.log(chalk6.dim("Cleared ingest cache"));
   }
-  process.stdout.write(chalk7.cyan("\u2192 Ingesting agent data... "));
+  process.stdout.write(chalk6.cyan("\u2192 Ingesting agent data... "));
   const result = await syncAll(db, {
     claude: opts.claude,
     takumi: opts.takumi,
@@ -11409,32 +11736,32 @@ program.command("sync").description("Ingest cost data from all coding agents").o
     loops: opts.loops,
     verbose: opts.verbose
   });
-  console.log(chalk7.green(`\u2713 deduped ${result.deduped}`));
+  console.log(chalk6.green(`\u2713 deduped ${result.deduped}`));
   if (opts.backfillMachine) {
     const machine = getMachineId();
     const r = backfillMachineId(db);
-    console.log(chalk7.cyan(`\u2192 Backfilled machine_id='${machine}': ${r.requests} requests, ${r.sessions} sessions`));
+    console.log(chalk6.cyan(`\u2192 Backfilled machine_id='${machine}': ${r.requests} requests, ${r.sessions} sessions`));
   }
   if (opts.recalculate) {
     const { getPricingFromDb: getPricingFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
     const r = await recalculateZeroCostRequests(db);
-    console.log(chalk7.cyan(`\u2192 Recalculated: ${r.fixed}/${r.total} zero-cost requests now have pricing`));
+    console.log(chalk6.cyan(`\u2192 Recalculated: ${r.fixed}/${r.total} zero-cost requests now have pricing`));
     const zeroCostBuckets = r.buckets;
     if (zeroCostBuckets.length > 0) {
-      console.log(chalk7.yellow("\u2192 Zero-cost token buckets remain:"));
+      console.log(chalk6.yellow("\u2192 Zero-cost token buckets remain:"));
       for (const row of zeroCostBuckets) {
         const pricing = getPricingFromDb2(db, row.model);
         const status = pricing ? pricing.inputPer1M === 0 && pricing.outputPer1M === 0 && pricing.cacheReadPer1M === 0 && pricing.cacheWritePer1M === 0 ? "explicit zero/free pricing" : "pricing configured; inspect/recalculate" : "missing pricing";
-        console.log(chalk7.yellow(`  ${row.agent}/${row.model}: ${row.requests} requests, ${fmtTokens2(row.total_tokens)} tokens (${status})`));
+        console.log(chalk6.yellow(`  ${row.agent}/${row.model}: ${row.requests} requests, ${fmtTokens2(row.total_tokens)} tokens (${status})`));
       }
-      console.log(chalk7.dim("  Add pricing with `economy pricing set <model> --input ... --output ...`, then rerun `economy sync --recalculate`."));
+      console.log(chalk6.dim("  Add pricing with `economy pricing set <model> --input ... --output ...`, then rerun `economy sync --recalculate`."));
     }
   }
   try {
     const { checkAndFireWebhooks: checkAndFireWebhooks2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
     await checkAndFireWebhooks2(db);
   } catch {}
-  console.log(chalk7.bold.green(`
+  console.log(chalk6.bold.green(`
 \u2713 Sync complete`));
 });
 program.command("today").description("Cost summary for today").action(async () => {
@@ -11464,7 +11791,7 @@ program.command("sessions").description("List coding sessions with costs").optio
     search: opts.search
   });
   if (sessions.length === 0) {
-    console.log(chalk7.yellow("No sessions found."));
+    console.log(chalk6.yellow("No sessions found."));
     return;
   }
   const f = opts.format ?? "table";
@@ -11486,13 +11813,13 @@ program.command("sessions").description("List coding sessions with costs").optio
   }
   console.log();
   printTable(["Session ID", "Agent", "Project", "Cost", "Tokens", "Requests", "Started"], sessions.map((s) => [
-    chalk7.dim(s.id.substring(0, 12)),
+    chalk6.dim(s.id.substring(0, 12)),
     fmtAgent(s.agent),
-    chalk7.white(s.project_name || chalk7.dim("unknown")),
+    chalk6.white(s.project_name || chalk6.dim("unknown")),
     fmt4(s.total_cost_usd),
-    chalk7.cyan(fmtTokens2(s.total_tokens)),
+    chalk6.cyan(fmtTokens2(s.total_tokens)),
     fmtCount(s.request_count),
-    chalk7.dim(s.started_at.substring(0, 16))
+    chalk6.dim(s.started_at.substring(0, 16))
   ]));
   console.log();
 });
@@ -11502,17 +11829,17 @@ program.command("top").description("Most expensive sessions").option("-n <n>", "
   const sinceDate = opts.since ? parseSinceDate2(opts.since) : undefined;
   const sessions = await getStore().topSessions(count, agent, sinceDate);
   if (sessions.length === 0) {
-    console.log(chalk7.yellow("No sessions found. Run `economy sync` first."));
+    console.log(chalk6.yellow("No sessions found. Run `economy sync` first."));
     return;
   }
   console.log();
   printTable(["#", "Project", "Agent", "Cost", "Tokens", "Started"], sessions.map((s, i) => [
-    chalk7.dim(String(i + 1)),
-    chalk7.white(s.project_name || chalk7.dim("unknown")),
+    chalk6.dim(String(i + 1)),
+    chalk6.white(s.project_name || chalk6.dim("unknown")),
     fmtAgent(s.agent),
     fmt4(s.total_cost_usd),
-    chalk7.cyan(fmtTokens2(s.total_tokens)),
-    chalk7.dim(s.started_at.substring(0, 16))
+    chalk6.cyan(fmtTokens2(s.total_tokens)),
+    chalk6.dim(s.started_at.substring(0, 16))
   ]));
   console.log();
 });
@@ -11531,10 +11858,10 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
     }
     const visibleRows = rows.slice(0, limit);
     printTable(["Project", "Sessions", "Requests", "Tokens", "Cost"], visibleRows.map((r) => [
-      chalk7.white(r.project_name || chalk7.dim("unknown")),
+      chalk6.white(r.project_name || chalk6.dim("unknown")),
       String(r.sessions),
       String(r.requests),
-      chalk7.cyan(fmtTokens2(r.total_tokens)),
+      chalk6.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.cost_usd)
     ]));
     printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
@@ -11549,7 +11876,7 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
       fmtAgent(r.agent),
       String(r.sessions),
       String(r.requests),
-      chalk7.cyan(fmtTokens2(r.total_tokens)),
+      chalk6.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.api_equivalent_usd),
       fmt4(r.billable_usd),
       fmt4(r.subscription_included_usd)
@@ -11572,15 +11899,15 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
       return;
     }
     if (rows.length === 0) {
-      console.log(chalk7.yellow("No cost-center usage yet. Run `economy sync --loops` or ingest app/service usage with /ingest."));
+      console.log(chalk6.yellow("No cost-center usage yet. Run `economy sync --loops` or ingest app/service usage with /ingest."));
     } else {
       const visibleRows = rows.slice(0, limit);
       printTable(["Kind", "Cost Center", "Sessions", "Requests", "Tokens", "Cost"], visibleRows.map((r) => [
-        chalk7.white(r.kind),
-        chalk7.white(r.name),
+        chalk6.white(r.kind),
+        chalk6.white(r.name),
         String(r.sessions),
         String(r.requests),
-        chalk7.cyan(fmtTokens2(r.total_tokens)),
+        chalk6.cyan(fmtTokens2(r.total_tokens)),
         fmt4(r.cost_usd)
       ]));
       printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
@@ -11593,10 +11920,10 @@ program.command("breakdown").description("Cost breakdown by model, agent, projec
     }
     const visibleRows = rows.slice(0, limit);
     printTable(["Model", "Agent", "Requests", "Tokens", "Cost"], visibleRows.map((r) => [
-      chalk7.white(r.model),
+      chalk6.white(r.model),
       fmtAgent(r.agent),
       String(r.requests),
-      chalk7.cyan(fmtTokens2(r.total_tokens)),
+      chalk6.cyan(fmtTokens2(r.total_tokens)),
       fmt4(r.cost_usd)
     ]));
     printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n>, --verbose, or --json.");
@@ -11612,15 +11939,15 @@ program.command("accounts [period]").description("List account usage by email ad
     return;
   }
   if (rows.length === 0) {
-    console.log(chalk7.yellow("No account-attributed sessions yet. Run `economy sync` first."));
+    console.log(chalk6.yellow("No account-attributed sessions yet. Run `economy sync` first."));
     return;
   }
   console.log();
-  console.log(chalk7.bold.cyan(`  Accounts \u2014 ${period}`));
+  console.log(chalk6.bold.cyan(`  Accounts \u2014 ${period}`));
   const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
   const visibleRows = rows.slice(0, limit);
   if (visibleRows.length < rows.length) {
-    console.log(chalk7.dim(`  ${rows.length} rows \xB7 showing ${visibleRows.length}`));
+    console.log(chalk6.dim(`  ${rows.length} rows \xB7 showing ${visibleRows.length}`));
   }
   console.log();
   printAccountBreakdown(visibleRows);
@@ -11652,27 +11979,27 @@ budgetCmd.command("set").description("Set a budget").option("--project <path>",
     limit_usd: limitUsd,
     alert_at_percent: alertAtPercent
   });
-  console.log(chalk7.green(`\u2713 Budget set: ${opts.costCenter ?? opts.project ?? "global"} \u2014 ${period} $${limitUsd}`));
+  console.log(chalk6.green(`\u2713 Budget set: ${opts.costCenter ?? opts.project ?? "global"} \u2014 ${period} $${limitUsd}`));
 });
 budgetCmd.command("list").description("List all budgets").option("--limit <n>", "Maximum budget rows to print (default: 20)").option("--verbose", "Show all budget rows").action(async (opts) => {
   const statuses = await getStore().listBudgets();
   if (statuses.length === 0) {
-    console.log(chalk7.yellow("No budgets set."));
+    console.log(chalk6.yellow("No budgets set."));
     return;
   }
   const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
   const visibleStatuses = statuses.slice(0, limit);
   console.log();
   if (visibleStatuses.length < statuses.length) {
-    console.log(chalk7.dim(`  ${statuses.length} budgets \xB7 showing ${visibleStatuses.length}`));
+    console.log(chalk6.dim(`  ${statuses.length} budgets \xB7 showing ${visibleStatuses.length}`));
     console.log();
   }
   printTable(["Scope", "Period", "Limit", "Spent", "Used%", "Status"], visibleStatuses.map((b) => {
     const pct = b.percent_used.toFixed(1);
-    const status = b.is_over_limit ? chalk7.red("OVER") : b.is_over_alert ? chalk7.yellow("ALERT") : chalk7.green("OK");
-    const pctColor = b.is_over_limit ? chalk7.red(pct + "%") : b.is_over_alert ? chalk7.yellow(pct + "%") : chalk7.green(pct + "%");
+    const status = b.is_over_limit ? chalk6.red("OVER") : b.is_over_alert ? chalk6.yellow("ALERT") : chalk6.green("OK");
+    const pctColor = b.is_over_limit ? chalk6.red(pct + "%") : b.is_over_alert ? chalk6.yellow(pct + "%") : chalk6.green(pct + "%");
     return [
-      chalk7.white(b.cost_center_id ?? b.project_path ?? "global"),
+      chalk6.white(b.cost_center_id ?? b.project_path ?? "global"),
       b.period,
       fmt4(b.limit_usd),
       fmt4(b.current_spend_usd),
@@ -11685,62 +12012,62 @@ budgetCmd.command("list").description("List all budgets").option("--limit <n>",
 });
 budgetCmd.command("remove <id>").description("Remove a budget by ID").action(async (id) => {
   await getStore().removeBudget(id);
-  console.log(chalk7.green(`\u2713 Budget removed`));
+  console.log(chalk6.green(`\u2713 Budget removed`));
 });
 var projectCmd = program.command("project").description("Manage tracked projects");
 projectCmd.command("add <path>").description("Add a project").option("--name <name>", "Human-readable name").action(async (path, opts) => {
   const { basename: basename4 } = __require("path");
   const name = opts.name ?? basename4(path);
   await getStore().addProject(path, name);
-  console.log(chalk7.green(`\u2713 Project added: ${path}`));
+  console.log(chalk6.green(`\u2713 Project added: ${path}`));
 });
 projectCmd.command("list").description("List all projects with costs").option("--limit <n>", "Maximum project rows to print (default: 20)").option("--verbose", "Show all project rows").action(async (opts) => {
   const projects = await getStore().listProjects();
   if (projects.length === 0) {
-    console.log(chalk7.yellow("No projects tracked yet."));
+    console.log(chalk6.yellow("No projects tracked yet."));
     return;
   }
   const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
   const visibleProjects = projects.slice(0, limit);
   console.log();
   if (visibleProjects.length < projects.length) {
-    console.log(chalk7.dim(`  ${projects.length} projects \xB7 showing ${visibleProjects.length}`));
+    console.log(chalk6.dim(`  ${projects.length} projects \xB7 showing ${visibleProjects.length}`));
     console.log();
   }
   printTable(["Project", "Path", "Sessions", "Cost", "Last Active"], visibleProjects.map((p) => [
-    chalk7.white(p.project_name || chalk7.dim("unknown")),
-    chalk7.dim(p.project_path.substring(0, 40)),
+    chalk6.white(p.project_name || chalk6.dim("unknown")),
+    chalk6.dim(p.project_path.substring(0, 40)),
     String(p.sessions),
     fmt4(p.cost_usd),
-    chalk7.dim(p.last_active?.substring(0, 16) ?? "\u2014")
+    chalk6.dim(p.last_active?.substring(0, 16) ?? "\u2014")
   ]));
   printHiddenRowsHint(projects.length, visibleProjects.length, "Use --limit <n>, --verbose, or economy project show <path>.");
   console.log();
 });
 projectCmd.command("remove <path>").description("Remove a project (keeps historical data)").action(async (path) => {
   await getStore().removeProject(path);
-  console.log(chalk7.green(`\u2713 Project removed`));
+  console.log(chalk6.green(`\u2713 Project removed`));
 });
 projectCmd.command("rename <path> <name>").description("Rename a project").action(async (path, name) => {
   try {
     await getStore().renameProject(path, name);
   } catch (e) {
-    console.error(chalk7.red(e instanceof Error ? e.message : String(e)));
+    console.error(chalk6.red(e instanceof Error ? e.message : String(e)));
     process.exit(1);
   }
-  console.log(chalk7.green(`\u2713 Renamed to: ${name}`));
+  console.log(chalk6.green(`\u2713 Renamed to: ${name}`));
 });
 projectCmd.command("show <nameOrPath>").description("Detailed project breakdown with sparkline").action(async (nameOrPath) => {
   await autoSync();
   const detail = await getStore().projectDetail(nameOrPath);
   if (!detail) {
-    console.log(chalk7.yellow(`No sessions found for: ${nameOrPath}`));
+    console.log(chalk6.yellow(`No sessions found for: ${nameOrPath}`));
     return;
   }
   const dailyValues = detail.daily.map((d) => d.cost_usd);
   console.log();
-  console.log(chalk7.bold.cyan(`  ${detail.project_name}`));
-  console.log(chalk7.dim(`  ${detail.project_path}`));
+  console.log(chalk6.bold.cyan(`  ${detail.project_name}`));
+  console.log(chalk6.dim(`  ${detail.project_path}`));
   console.log();
   printTable(["Metric", "Value"], [
     ["Total cost", fmt4(detail.total_cost_usd)],
@@ -11749,20 +12076,20 @@ projectCmd.command("show <nameOrPath>").description("Detailed project breakdown
   ]);
   if (dailyValues.length > 0) {
     console.log(`
-  ${chalk7.dim("14-day trend:")} ${sparkline(dailyValues)}`);
+  ${chalk6.dim("14-day trend:")} ${sparkline(dailyValues)}`);
   }
   if (detail.models.length > 0) {
     console.log(`
-  ${chalk7.dim("Model breakdown:")}`);
+  ${chalk6.dim("Model breakdown:")}`);
     for (const m of detail.models) {
-      console.log(`    ${chalk7.white(m.model.padEnd(30))} ${fmt4(m.cost_usd)} (${fmtCount(m.requests)} reqs)`);
+      console.log(`    ${chalk6.white(m.model.padEnd(30))} ${fmt4(m.cost_usd)} (${fmtCount(m.requests)} reqs)`);
     }
   }
   if (detail.top_sessions.length > 0) {
     console.log(`
-  ${chalk7.dim("Top sessions:")}`);
+  ${chalk6.dim("Top sessions:")}`);
     for (const s of detail.top_sessions) {
-      console.log(`    ${chalk7.dim(s.id.substring(0, 12))}  ${fmt4(s.total_cost_usd)}  ${chalk7.dim(String(s.started_at).substring(0, 16))}`);
+      console.log(`    ${chalk6.dim(s.id.substring(0, 12))}  ${fmt4(s.total_cost_usd)}  ${chalk6.dim(String(s.started_at).substring(0, 16))}`);
     }
   }
   console.log();
@@ -11771,18 +12098,18 @@ var configCmd = program.command("config").description("Manage economy configurat
 configCmd.command("set <key> <value>").description("Set a config value").action(async (_key, _value) => {
   const { setConfigValue: setConfigValue2 } = await Promise.resolve().then(() => (init_config(), exports_config));
   setConfigValue2(_key, _value);
-  console.log(chalk7.green(`\u2713 ${_key} = ${_value}`));
+  console.log(chalk6.green(`\u2713 ${_key} = ${_value}`));
 });
 configCmd.command("get <key>").description("Get a config value").action(async (key) => {
   const { getConfigValue: getConfigValue2 } = await Promise.resolve().then(() => (init_config(), exports_config));
-  console.log(getConfigValue2(key) ?? chalk7.dim("(not set)"));
+  console.log(getConfigValue2(key) ?? chalk6.dim("(not set)"));
 });
 configCmd.command("webhook-test").description("Send a test payload to the configured webhook URL").action(async () => {
-  const { loadConfig: loadConfig3 } = await Promise.resolve().then(() => (init_config(), exports_config));
-  const config = loadConfig3();
+  const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
+  const config = loadConfig2();
   const url = config["webhook-url"];
   if (!url) {
-    console.log(chalk7.yellow("No webhook-url configured. Run: economy config set webhook-url <url>"));
+    console.log(chalk6.yellow("No webhook-url configured. Run: economy config set webhook-url <url>"));
     return;
   }
   const payload = {
@@ -11799,21 +12126,21 @@ configCmd.command("webhook-test").description("Send a test payload to the config
     });
     const text = await res.text().catch(() => "");
     if (res.ok) {
-      console.log(chalk7.green(`\u2713 Webhook responded: HTTP ${res.status}`));
+      console.log(chalk6.green(`\u2713 Webhook responded: HTTP ${res.status}`));
       if (text)
-        console.log(chalk7.dim(text.slice(0, 200)));
+        console.log(chalk6.dim(text.slice(0, 200)));
     } else {
-      console.log(chalk7.red(`\u2717 Webhook failed: HTTP ${res.status}`));
+      console.log(chalk6.red(`\u2717 Webhook failed: HTTP ${res.status}`));
       if (text)
-        console.log(chalk7.dim(text.slice(0, 200)));
+        console.log(chalk6.dim(text.slice(0, 200)));
     }
   } catch (e) {
-    console.log(chalk7.red(`\u2717 Request failed: ${e instanceof Error ? e.message : String(e)}`));
+    console.log(chalk6.red(`\u2717 Request failed: ${e instanceof Error ? e.message : String(e)}`));
   }
 });
 configCmd.action(async () => {
-  const { loadConfig: loadConfig3 } = await Promise.resolve().then(() => (init_config(), exports_config));
-  const config = loadConfig3();
+  const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
+  const config = loadConfig2();
   console.log();
   printTable(["Key", "Value"], Object.entries(config).map(([k, v]) => [k, String(v)]));
   console.log();
@@ -11825,17 +12152,17 @@ pricingCmd.command("list").description("List all model prices").option("--limit
   const visibleRows = rows.slice(0, limit);
   console.log();
   if (visibleRows.length < rows.length) {
-    console.log(chalk7.dim(`  ${rows.length} pricing rows \xB7 showing ${visibleRows.length}`));
+    console.log(chalk6.dim(`  ${rows.length} pricing rows \xB7 showing ${visibleRows.length}`));
     console.log();
   }
   printTable(["Model", "Input/1M", "Output/1M", "CacheR/1M", "CacheW/1M", "CacheStorage/1M-h", "Out/1k"], visibleRows.map((r) => [
-    chalk7.white(r.model),
+    chalk6.white(r.model),
     fmt4(r.input_per_1m),
     fmt4(r.output_per_1m),
     fmt4(r.cache_read_per_1m),
     r.cache_write_1h_per_1m ? `${fmt4(r.cache_write_per_1m)} / ${fmt4(r.cache_write_1h_per_1m)}` : fmt4(r.cache_write_per_1m),
     fmt4(r.cache_storage_per_1m_hour ?? 0),
-    chalk7.dim(fmt4(r.output_per_1m / 1000))
+    chalk6.dim(fmt4(r.output_per_1m / 1000))
   ]));
   printHiddenRowsHint(rows.length, visibleRows.length, "Use --limit <n> or --verbose.");
   console.log();
@@ -11856,79 +12183,35 @@ pricingCmd.command("set <model>").description("Set pricing for a model").option(
     cache_write_1h_per_1m: cacheWrite1h,
     cache_storage_per_1m_hour: cacheStorage
   });
-  console.log(chalk7.green(`\u2713 Pricing updated for ${model}`));
+  console.log(chalk6.green(`\u2713 Pricing updated for ${model}`));
 });
 pricingCmd.command("remove <model>").description("Remove pricing for a model").action(async (model) => {
   await getStore().removePricing(model);
-  console.log(chalk7.green(`\u2713 Pricing removed for ${model}`));
+  console.log(chalk6.green(`\u2713 Pricing removed for ${model}`));
 });
 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: startServer2 } = await Promise.resolve().then(() => (init_serve(), exports_serve));
   startServer2(port);
 });
-program.command("dashboard").description("Open the web dashboard (auto-starts server if not running)").option("-p, --port <port>", "Server port", "3456").action(async (opts) => {
-  const port = parseCliPort(opts.port ?? "3456", "--port");
-  const url = `http://localhost:${port}`;
-  let serverRunning = false;
-  try {
-    const res = await fetch(`${url}/health`, { signal: AbortSignal.timeout(500) });
-    serverRunning = res.ok;
-  } catch {}
-  if (!serverRunning) {
-    console.log(chalk7.cyan(`\u2192 Starting economy server on port ${port}...`));
-    const { spawn } = await import("child_process");
-    const { resolve: resolve3, dirname: dirname4 } = await import("path");
-    const serveScript = resolve3(dirname4(process.argv[1]), "..", "server", "index.js");
-    const child = spawn(process.execPath, [serveScript], {
-      detached: true,
-      stdio: "ignore",
-      env: { ...process.env, ECONOMY_PORT: String(port) }
-    });
-    child.unref();
-    let attempts = 0;
-    while (attempts < 20) {
-      await new Promise((r) => setTimeout(r, 250));
-      try {
-        const res = await fetch(`${url}/health`, { signal: AbortSignal.timeout(300) });
-        if (res.ok) {
-          serverRunning = true;
-          break;
-        }
-      } catch {}
-      attempts++;
-    }
-    if (serverRunning) {
-      console.log(chalk7.green(`\u2713 Server started`));
-    } else {
-      console.log(chalk7.yellow(`\u26A0 Server didn't respond \u2014 open ${url} manually after running \`economy serve\``));
-    }
-  }
-  console.log(chalk7.cyan(`Opening ${url}`));
-  try {
-    execSync(`open ${url}`);
-  } catch {
-    console.log(chalk7.yellow(`Open your browser at ${url}`));
-  }
-});
 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) => {
   const doAll = opts.all || !opts.claude && !opts.codex && !opts.gemini;
   if (opts.claude || doAll) {
-    console.log(chalk7.bold.cyan(`
+    console.log(chalk6.bold.cyan(`
 Claude Code:`));
-    console.log(chalk7.white("  claude mcp add --transport stdio --scope user economy -- economy-mcp"));
+    console.log(chalk6.white("  claude mcp add --transport stdio --scope user economy -- economy-mcp"));
   }
   if (opts.codex || doAll) {
-    console.log(chalk7.bold.yellow(`
+    console.log(chalk6.bold.yellow(`
 Codex (~/.codex/config.toml):`));
-    console.log(chalk7.white(`  [mcp_servers.economy]
+    console.log(chalk6.white(`  [mcp_servers.economy]
   command = "economy-mcp"
   args = []`));
   }
   if (opts.gemini || doAll) {
-    console.log(chalk7.bold.green(`
+    console.log(chalk6.bold.green(`
 Gemini (~/.gemini/settings.json):`));
-    console.log(chalk7.white('  "mcpServers": { "economy": { "command": "economy-mcp", "args": [] } }'));
+    console.log(chalk6.white('  "mcpServers": { "economy": { "command": "economy-mcp", "args": [] } }'));
   }
   console.log();
 });
@@ -11937,12 +12220,12 @@ program.command("session <id>").description("Show detailed breakdown of a single
   await autoSync();
   const detail = await getStore().sessionDetail(id);
   if (!detail) {
-    console.log(chalk7.red(`Session not found: ${id}`));
+    console.log(chalk6.red(`Session not found: ${id}`));
     process.exit(1);
   }
   const { session, requests } = detail;
   console.log();
-  console.log(chalk7.bold.cyan(`  Session: ${session["id"].substring(0, 16)}...`));
+  console.log(chalk6.bold.cyan(`  Session: ${session["id"].substring(0, 16)}...`));
   console.log();
   printTable(["Field", "Value"], [
     ["Agent", String(session["agent"])],
@@ -11955,12 +12238,12 @@ program.command("session <id>").description("Show detailed breakdown of a single
   ]);
   if (requests.length > 0) {
     const visibleRequests = requests.slice(0, requestLimit);
-    console.log(chalk7.dim(`
+    console.log(chalk6.dim(`
   Requests (${visibleRequests.length}${visibleRequests.length < requests.length ? ` of ${requests.length}` : ""}):
 `));
     printTable(["Time", "Model", "Input", "Output", "Cache R", "Cache W", "Cost"], visibleRequests.map((r) => [
-      chalk7.dim(String(r["timestamp"]).substring(11, 19)),
-      chalk7.white(String(r["model"]).substring(0, 22)),
+      chalk6.dim(String(r["timestamp"]).substring(11, 19)),
+      chalk6.white(String(r["model"]).substring(0, 22)),
       fmtTokens2(r["input_tokens"]),
       fmtTokens2(r["output_tokens"]),
       fmtTokens2(r["cache_read_tokens"]),
@@ -11968,7 +12251,7 @@ program.command("session <id>").description("Show detailed breakdown of a single
       fmt4(r["cost_usd"])
     ]));
     if (requests.length > visibleRequests.length) {
-      console.log(chalk7.dim(`  ... ${requests.length - visibleRequests.length} more requests hidden. Use --limit <n> or --verbose.`));
+      console.log(chalk6.dim(`  ... ${requests.length - visibleRequests.length} more requests hidden. Use --limit <n> or --verbose.`));
     }
   }
   console.log();
@@ -11978,27 +12261,27 @@ program.command("machines").description("List all machines that have synced data
   const machines = await getStore().machines();
   const current = getMachineId();
   if (machines.length === 0) {
-    console.log(chalk7.yellow(`No machine data yet. Current machine: ${current}`));
+    console.log(chalk6.yellow(`No machine data yet. Current machine: ${current}`));
     return;
   }
   const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
   const visibleMachines = machines.slice(0, limit);
   console.log();
-  console.log(chalk7.bold.cyan("  Machines"));
+  console.log(chalk6.bold.cyan("  Machines"));
   if (visibleMachines.length < machines.length) {
-    console.log(chalk7.dim(`  ${machines.length} machines \xB7 showing ${visibleMachines.length}`));
+    console.log(chalk6.dim(`  ${machines.length} machines \xB7 showing ${visibleMachines.length}`));
   }
   console.log();
   printTable(["Machine", "Sessions", "Requests", "Cost", "Last Active"], visibleMachines.map((m) => [
-    m.machine_id === current ? chalk7.green(`${m.machine_id} (this)`) : chalk7.white(m.machine_id),
+    m.machine_id === current ? chalk6.green(`${m.machine_id} (this)`) : chalk6.white(m.machine_id),
     fmtCount(m.sessions),
     fmtCount(m.requests),
     fmt4(m.total_cost_usd),
-    chalk7.dim(m.last_active?.substring(0, 16) ?? "\u2014")
+    chalk6.dim(m.last_active?.substring(0, 16) ?? "\u2014")
   ]));
   printHiddenRowsHint(machines.length, visibleMachines.length, "Use --limit <n> or --verbose.");
   console.log(`
-  ${chalk7.dim("Current machine:")} ${chalk7.bold(current)}`);
+  ${chalk6.dim("Current machine:")} ${chalk6.bold(current)}`);
   console.log();
 });
 program.command("export").description("Export data as CSV").option("--type <type>", "Data type: sessions or requests", "sessions").option("--period <period>", "Period: today|week|month|all", "month").option("--output <file>", "Output file path (default: stdout)").action(async (opts) => {
@@ -12025,7 +12308,7 @@ program.command("export").description("Export data as CSV").option("--type <type
   if (opts.output) {
     const { writeFileSync: writeFileSync4 } = await import("fs");
     writeFileSync4(opts.output, csv);
-    console.log(chalk7.green(`\u2713 Exported to ${opts.output}`));
+    console.log(chalk6.green(`\u2713 Exported to ${opts.output}`));
   } else {
     process.stdout.write(csv);
   }
@@ -12081,11 +12364,11 @@ program.command("compare <period1> <period2>").description("Compare two periods
     const d = v1 - v2;
     const pct = v2 > 0 ? (d / v2 * 100).toFixed(1) : "\u2014";
     const sign = d >= 0 ? "+" : "";
-    const color = d > 0 ? chalk7.red : d < 0 ? chalk7.green : chalk7.dim;
+    const color = d > 0 ? chalk6.red : d < 0 ? chalk6.green : chalk6.dim;
     return color(`${sign}${pct}%`);
   }
   console.log();
-  console.log(chalk7.bold.cyan(`  ${p1} vs ${p2}`));
+  console.log(chalk6.bold.cyan(`  ${p1} vs ${p2}`));
   console.log();
   printTable(["Metric", p1, p2, "Change"], [
     ["Cost", fmt4(a.cost), fmt4(b.cost), delta(a.cost, b.cost)],
@@ -12101,12 +12384,12 @@ program.command("forecast").description("Project end-of-month cost based on curr
   const cheapest = f.cheapest_day;
   const mostExpensive = f.most_expensive_day;
   console.log();
-  console.log(chalk7.bold.cyan(`  Forecast (${f.day_of_month} of ${f.days_in_month} days)`));
+  console.log(chalk6.bold.cyan(`  Forecast (${f.day_of_month} of ${f.days_in_month} days)`));
   console.log();
   printTable(["Metric", "Value"], [
     ["Spent so far", fmt4(f.spent_so_far_usd)],
     ["Daily average", fmt4(f.daily_avg_usd)],
-    [chalk7.bold("Projected total"), chalk7.bold(fmt4(f.projected_usd).replace(chalk7.green(""), ""))],
+    [chalk6.bold("Projected total"), chalk6.bold(fmt4(f.projected_usd).replace(chalk6.green(""), ""))],
     ["Last 7-day rate", `${fmt4(f.last7_daily_avg_usd)}/day \u2192 ${fmt4(f.last7_projected_usd)}`],
     ["Cheapest day", cheapest ? `${fmt4(cheapest.cost_usd)} (${cheapest.date})` : "\u2014"],
     ["Most expensive", mostExpensive ? `${fmt4(mostExpensive.cost_usd)} (${mostExpensive.date})` : "\u2014"]
@@ -12117,14 +12400,14 @@ program.command("efficiency").description("Show output/input token ratio per mod
   await autoSync();
   const models = await getStore().efficiency();
   console.log();
-  console.log(chalk7.bold.cyan("  Token Efficiency"));
+  console.log(chalk6.bold.cyan("  Token Efficiency"));
   console.log();
   printTable(["Model", "Output/Input", "Cache Hit%", "Cost/1k Output", "Requests"], models.map((m) => {
     const ratio = m.input > 0 ? (m.output / m.input).toFixed(2) : "\u2014";
     const totalInput = m.input + m.cache_read + m.cache_write;
     const cacheHit = totalInput > 0 ? (m.cache_read / totalInput * 100).toFixed(1) + "%" : "\u2014";
     const costPer1kOutput = m.output > 0 ? fmt4(m.cost / m.output * 1000) : "\u2014";
-    return [chalk7.white(m.model), ratio, cacheHit, costPer1kOutput, fmtCount(m.requests)];
+    return [chalk6.white(m.model), ratio, cacheHit, costPer1kOutput, fmtCount(m.requests)];
   }));
   console.log();
 });
@@ -12156,29 +12439,29 @@ goalCmd.command("set").description("Set a spending goal").option("--period <peri
     agent,
     limit_usd: limitUsd
   });
-  console.log(chalk7.green(`\u2713 Goal set: ${period} $${limitUsd}${opts.project ? ` (${opts.project})` : ""}`));
+  console.log(chalk6.green(`\u2713 Goal set: ${period} $${limitUsd}${opts.project ? ` (${opts.project})` : ""}`));
 });
 goalCmd.command("list").description("List all goals with progress").option("--limit <n>", "Maximum goal rows to print (default: 20)").option("--verbose", "Show all goal rows").action(async (opts) => {
   const statuses = await getStore().listGoals();
   if (statuses.length === 0) {
-    console.log(chalk7.yellow("No goals set."));
+    console.log(chalk6.yellow("No goals set."));
     return;
   }
   const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
   const visibleStatuses = statuses.slice(0, limit);
   console.log();
   if (visibleStatuses.length < statuses.length) {
-    console.log(chalk7.dim(`  ${statuses.length} goals \xB7 showing ${visibleStatuses.length}`));
+    console.log(chalk6.dim(`  ${statuses.length} goals \xB7 showing ${visibleStatuses.length}`));
     console.log();
   }
   printTable(["Period", "Scope", "Limit", "Spent", "Used%", "Status"], visibleStatuses.map((g) => {
     const pct = g.percent_used.toFixed(1);
     const scope = g.project_path ?? g.agent ?? "global";
-    const status = g.is_over ? chalk7.red("OVER") : g.is_at_risk ? chalk7.yellow("AT RISK") : chalk7.green("ON TRACK");
-    const pctColor = g.is_over ? chalk7.red(pct + "%") : g.is_at_risk ? chalk7.yellow(pct + "%") : chalk7.green(pct + "%");
+    const status = g.is_over ? chalk6.red("OVER") : g.is_at_risk ? chalk6.yellow("AT RISK") : chalk6.green("ON TRACK");
+    const pctColor = g.is_over ? chalk6.red(pct + "%") : g.is_at_risk ? chalk6.yellow(pct + "%") : chalk6.green(pct + "%");
     return [
       g.period,
-      chalk7.white(scope),
+      chalk6.white(scope),
       fmt4(g.limit_usd),
       fmt4(g.current_spend_usd),
       pctColor,
@@ -12190,12 +12473,12 @@ goalCmd.command("list").description("List all goals with progress").option("--li
 });
 goalCmd.command("remove <id>").description("Remove a goal").action(async (id) => {
   await getStore().removeGoal(id);
-  console.log(chalk7.green(`\u2713 Goal removed`));
+  console.log(chalk6.green(`\u2713 Goal removed`));
 });
 goalCmd.command("status").description("Quick goal progress summary").option("--limit <n>", "Maximum goal rows to print (default: 20)").option("--verbose", "Show all goal rows").action(async (opts) => {
   const statuses = await getStore().listGoals();
   if (statuses.length === 0) {
-    console.log(chalk7.yellow("No goals set."));
+    console.log(chalk6.yellow("No goals set."));
     return;
   }
   const limit = resolveRowLimit(opts.limit, opts.verbose, 20);
@@ -12207,7 +12490,7 @@ goalCmd.command("status").description("Quick goal progress summary").option("--l
     const barFilled = Math.round(pct / 10);
     const barEmpty = 10 - barFilled;
     const bar = "\u2588".repeat(barFilled) + "\u2591".repeat(barEmpty);
-    const statusStr = g.is_over ? chalk7.red("\u2717 OVER") : g.is_at_risk ? chalk7.yellow("\u26A0 AT RISK") : chalk7.green("\u2713 ON TRACK");
+    const statusStr = g.is_over ? chalk6.red("\u2717 OVER") : g.is_at_risk ? chalk6.yellow("\u26A0 AT RISK") : chalk6.green("\u2713 ON TRACK");
     const label = `${g.period} (${scope})`.padEnd(20);
     console.log(`  ${label}  ${bar}  ${fmt4(g.current_spend_usd)} / ${fmt4(g.limit_usd)}  (${g.percent_used.toFixed(0)}%)  ${statusStr}`);
   }
@@ -12219,7 +12502,7 @@ program.command("remove <type> <id>").alias("rm").description("Remove a record.
   try {
     const t = type.toLowerCase();
     if (!(t in label)) {
-      console.error(chalk7.red(`Unknown type: ${type}. Use: budget | project | goal | pricing`));
+      console.error(chalk6.red(`Unknown type: ${type}. Use: budget | project | goal | pricing`));
       process.exit(1);
     }
     const store = getStore();
@@ -12237,9 +12520,9 @@ program.command("remove <type> <id>").alias("rm").description("Remove a record.
         await store.removePricing(id);
         break;
     }
-    console.log(chalk7.green(`\u2713 ${label[t]} ${id} removed`));
+    console.log(chalk6.green(`\u2713 ${label[t]} ${id} removed`));
   } catch (e) {
-    console.error(chalk7.red(`Failed: ${e instanceof Error ? e.message : String(e)}`));
+    console.error(chalk6.red(`Failed: ${e instanceof Error ? e.message : String(e)}`));
     process.exit(1);
   }
 });
@@ -12251,51 +12534,51 @@ billingCmd.command("sync").description("Sync actual billing from Anthropic, Open
   if (isCloudStore()) {
     const cloud = economyCloudStorage();
     if (!cloud.active) {
-      console.log(chalk7.yellow("cloud mode: billing sync transport unavailable (set HASNA_ECONOMY_API_URL and HASNA_ECONOMY_API_KEY)"));
+      console.log(chalk6.yellow("cloud mode: billing sync transport unavailable (no credential resolved; set HASNA_ECONOMY_API_KEY or write ~/.hasna/economy/config/credentials)"));
       return;
     }
     const result = await billingSyncToCloud(cloud, { days, anthropic: opts.anthropic, openai: opts.openai, gemini: opts.gemini });
     for (const [provider, p] of Object.entries(result.providers)) {
       if (p.ok)
-        console.log(chalk7.green(`\u2713 ${provider} billing: ${p.days} days, $${p.totalUsd.toFixed(2)}`));
+        console.log(chalk6.green(`\u2713 ${provider} billing: ${p.days} days, $${p.totalUsd.toFixed(2)}`));
       else
-        console.log(chalk7.red(`\u2717 ${provider}: ${p.error}`));
+        console.log(chalk6.red(`\u2717 ${provider}: ${p.error}`));
     }
     if (result.posted)
-      console.log(chalk7.green(`\u2713 pushed ${result.total} billing rows to the shared API`));
+      console.log(chalk6.green(`\u2713 pushed ${result.total} billing rows to the shared API`));
     return;
   }
   const db = openDatabase();
   const doAll = !opts.anthropic && !opts.openai && !opts.gemini;
   if (opts.anthropic || doAll) {
-    process.stdout.write(chalk7.cyan("\u2192 Syncing Anthropic billing... "));
+    process.stdout.write(chalk6.cyan("\u2192 Syncing Anthropic billing... "));
     try {
       const r = await syncAnthropicBilling(db, { days });
-      console.log(chalk7.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
+      console.log(chalk6.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
     } catch (e) {
-      console.log(chalk7.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
+      console.log(chalk6.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
     }
   }
   if (opts.openai || doAll) {
-    process.stdout.write(chalk7.cyan("\u2192 Syncing OpenAI billing... "));
+    process.stdout.write(chalk6.cyan("\u2192 Syncing OpenAI billing... "));
     try {
       const r = await syncOpenAIBilling(db, { days });
-      console.log(chalk7.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
+      console.log(chalk6.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
     } catch (e) {
-      console.log(chalk7.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
+      console.log(chalk6.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
     }
   }
   if (opts.gemini || doAll) {
-    process.stdout.write(chalk7.cyan("\u2192 Syncing Gemini billing... "));
+    process.stdout.write(chalk6.cyan("\u2192 Syncing Gemini billing... "));
     try {
       const r = await syncGeminiBilling(db, { days });
       if (r.skipped) {
-        console.log(chalk7.yellow(`skipped \u2014 ${r.skipped}`));
+        console.log(chalk6.yellow(`skipped \u2014 ${r.skipped}`));
       } else {
-        console.log(chalk7.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
+        console.log(chalk6.green(`\u2713 ${r.days} days, $${r.totalUsd.toFixed(2)}`));
       }
     } catch (e) {
-      console.log(chalk7.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
+      console.log(chalk6.red(`\u2717 ${e instanceof Error ? e.message : String(e)}`));
     }
   }
 });
@@ -12305,22 +12588,21 @@ billingCmd.command("show").description("Show actual billing totals vs our estima
   const actual = await store.billingSummary(period);
   const estimated = await store.summary(period);
   console.log();
-  console.log(chalk7.bold.cyan(`  Billing ${period} (actual from admin APIs)
+  console.log(chalk6.bold.cyan(`  Billing ${period} (actual from admin APIs)
 `));
-  printTable(["Provider", "Actual (billed)"], Object.entries(actual.by_provider).map(([p, c]) => [chalk7.white(p), fmt4(c)]));
+  printTable(["Provider", "Actual (billed)"], Object.entries(actual.by_provider).map(([p, c]) => [chalk6.white(p), fmt4(c)]));
   console.log();
-  console.log(`  ${chalk7.bold("Actual total:")}    ${fmt4(actual.total_usd)}`);
-  console.log(`  ${chalk7.dim("Our estimate:")}    ${fmt4(estimated.total_usd)}`);
+  console.log(`  ${chalk6.bold("Actual total:")}    ${fmt4(actual.total_usd)}`);
+  console.log(`  ${chalk6.dim("Our estimate:")}    ${fmt4(estimated.total_usd)}`);
   const diff = estimated.total_usd - actual.total_usd;
   const pct = billingDeltaPct(estimated.total_usd, actual.total_usd);
   const rendered = pct === null ? "n/a" : `${diff >= 0 ? "+" : ""}${pct.toFixed(1)}%`;
-  console.log(`  ${chalk7.dim("Difference:")}      ${fmt4(Math.abs(diff))} (${rendered})`);
+  console.log(`  ${chalk6.dim("Difference:")}      ${fmt4(Math.abs(diff))} (${rendered})`);
   if (pct === null) {
-    console.log(chalk7.yellow(`  ${chalk7.dim("Note:")}            no provider billing recorded for ${period} \u2014 drift is UNKNOWN, not zero.`));
+    console.log(chalk6.yellow(`  ${chalk6.dim("Note:")}            no provider billing recorded for ${period} \u2014 drift is UNKNOWN, not zero.`));
   }
   console.log();
 });
-registerBrainsCommand(program);
 registerTodosCommand(program);
 registerBriefCommand(program, { beforeRead: () => autoSync({ dedupe: false }) });
 registerExtendedCommands(program);