@hasna/economy 0.5.3 → 0.5.4

package/dist/mcp/index.js

@@ -85,7 +85,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.3",
+  version: "0.5.4",
   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",
@@ -1507,7 +1507,7 @@ function registerIngestJournalTool(server) {
 }
 
 // src/mcp/server.ts
-import { z as z6 } from "zod";
+import { z as z7 } from "zod";
 
 // src/ingest/collection-outcome.ts
 import { AsyncLocalStorage } from "async_hooks";
@@ -1563,34 +1563,141 @@ import { join as join6, basename } from "path";
 import { existsSync as existsSync2, readFileSync as readFileSync3 } from "fs";
 import { homedir } from "os";
 import { join as join5 } from "path";
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 import { resolveClientTransport, resolveCredential } from "@hasna/contracts/client";
-var ACCOUNTS_APP = "accounts";
-var profileNameSchema = z5.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+
+// src/lib/subscriptions-registry.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+import { isAbsolute } from "path";
+import { z as z5 } from "zod";
+var execute = promisify(execFile);
+var readSubscriptionsMetadata = async (args, env) => {
+  let stdout;
+  try {
+    const result = await execute("subscriptions", args, {
+      env,
+      encoding: "utf8",
+      timeout: 30000,
+      maxBuffer: 16 * 1024 * 1024,
+      windowsHide: true
+    });
+    stdout = result.stdout;
+  } catch (error) {
+    const code = error?.code;
+    if (code === "ENOENT")
+      throw new Error("subscriptions: CLI not found on PATH; install the Subscriptions CLI to resolve station account metadata");
+    const status = typeof code === "number" && Number.isInteger(code) ? `exit ${code}` : "execution limit or transport failure";
+    throw new Error(`subscriptions: read-only metadata command failed (${status}); verify the installed CLI and its hosted credentials`);
+  }
+  try {
+    return JSON.parse(stdout);
+  } catch {
+    throw new Error("subscriptions: metadata command returned invalid JSON");
+  }
+};
+var nonempty = z5.string().min(1);
 var profileSchema = z5.object({
-  name: z5.string(),
-  tool: z5.string(),
+  name: nonempty,
+  tool: nonempty,
   email: z5.string().optional(),
   displayName: z5.string().optional(),
-  dir: z5.string(),
+  dir: nonempty.refine(isAbsolute).refine((value) => !/[\0\r\n]/.test(value)),
+  createdAt: nonempty,
+  lastUsedAt: z5.string().optional(),
   description: z5.string().optional(),
-  createdAt: z5.string(),
-  lastUsedAt: z5.string().optional()
+  active: z5.boolean(),
+  applied: z5.boolean(),
+  switchedAway: z5.object({ profile: nonempty, email: z5.string().optional() }).optional()
+});
+var toolsSchema = z5.array(z5.object({
+  id: nonempty,
+  label: nonempty,
+  envVar: nonempty,
+  defaultDir: nonempty,
+  bin: nonempty
+}));
+function unique(rows, identity) {
+  if (new Set(rows.map(identity)).size !== rows.length) {
+    throw new Error("subscriptions: duplicate identity in metadata response");
+  }
+  return rows;
+}
+
+class SubscriptionsRegistry {
+  read;
+  transport = "api";
+  registry = "subscriptions";
+  env;
+  profiles;
+  tools;
+  constructor(baseUrl, env, read = readSubscriptionsMetadata) {
+    this.read = read;
+    this.env = { ...env, HASNA_SUBSCRIPTIONS_API_URL: baseUrl.replace(/\/v1\/?$/, "") };
+  }
+  allProfiles() {
+    return this.profiles ??= this.read(["list", "--json"], this.env).then((raw) => {
+      const parsed = z5.array(profileSchema).safeParse(raw);
+      if (!parsed.success)
+        throw new Error("subscriptions: invalid profile metadata response");
+      return unique(parsed.data, (row) => JSON.stringify([row.tool, row.name]));
+    });
+  }
+  async listProfiles(tool) {
+    const rows = await this.allProfiles();
+    return rows.filter((row) => !tool || row.tool === tool);
+  }
+  async findProfile(name, tool) {
+    const matches = (await this.listProfiles(tool)).filter((row) => row.name === name);
+    return matches.length === 1 ? matches[0] : undefined;
+  }
+  async appliedProfile(tool) {
+    const matches = (await this.allProfiles()).filter((row) => row.tool === tool && row.applied);
+    if (matches.length > 1)
+      throw new Error("subscriptions: ambiguous station applied-profile binding");
+    return matches[0];
+  }
+  async currentProfile(_tool) {
+    return;
+  }
+  async listTools() {
+    return this.tools ??= this.read(["tools", "list", "--json"], this.env).then((raw) => {
+      const parsed = toolsSchema.safeParse(raw);
+      if (!parsed.success)
+        throw new Error("subscriptions: invalid tool metadata response");
+      return unique(parsed.data, (row) => row.id);
+    });
+  }
+}
+
+// src/lib/accounts-store.ts
+var ACCOUNTS_APP = "accounts";
+var profileNameSchema = z6.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+var profileSchema2 = z6.object({
+  name: z6.string(),
+  tool: z6.string(),
+  email: z6.string().optional(),
+  displayName: z6.string().optional(),
+  dir: z6.string(),
+  description: z6.string().optional(),
+  createdAt: z6.string(),
+  lastUsedAt: z6.string().optional(),
+  switchedAway: z6.object({ profile: z6.string().min(1), email: z6.string().optional() }).optional()
 });
-var toolDefSchema = z5.object({
-  id: z5.string(),
-  label: z5.string(),
-  envVar: z5.string(),
-  defaultDir: z5.string(),
-  bin: z5.string()
+var toolDefSchema = z6.object({
+  id: z6.string(),
+  label: z6.string(),
+  envVar: z6.string(),
+  defaultDir: z6.string(),
+  bin: z6.string()
 });
-var storeSchema = z5.object({
-  version: z5.literal(1),
-  current: z5.record(z5.string(), z5.string()).default({}),
-  applied: z5.record(z5.string(), z5.string()).default({}),
-  toolLocks: z5.record(z5.string(), z5.string()).default({}),
-  profiles: z5.array(profileSchema).default([]),
-  tools: z5.array(toolDefSchema).default([])
+var storeSchema = z6.object({
+  version: z6.literal(1),
+  current: z6.record(z6.string(), z6.string()).default({}),
+  applied: z6.record(z6.string(), z6.string()).default({}),
+  toolLocks: z6.record(z6.string(), z6.string()).default({}),
+  profiles: z6.array(profileSchema2).default([]),
+  tools: z6.array(toolDefSchema).default([])
 });
 function localRegistryAllowed(env = process.env) {
   return LOCAL_STORAGE_OPT_IN_KEYS.some((key) => {
@@ -1872,25 +1979,34 @@ class ApiStore {
   }
 }
 function resolveStore(env = process.env, options = {}) {
+  const legacy = resolveRegistryTransport(ACCOUNTS_APP, env, options.credentials);
+  if (legacy)
+    return new ApiStore(legacy.baseUrl, legacy.apiKey);
+  const current = resolveRegistryTransport("subscriptions", env, options.subscriptionsCredentials);
+  if (current)
+    return new SubscriptionsRegistry(current.baseUrl, env, options.readSubscriptionsMetadata);
+  return unconfiguredStore(env);
+}
+function resolveRegistryTransport(app, env, credentials) {
   const clientEnv = env;
-  const credential = resolveCredential(ACCOUNTS_APP, clientEnv, options.credentials);
+  const credential = resolveCredential(app, clientEnv, credentials);
   if (credential === null) {
     try {
-      resolveClientTransport(ACCOUNTS_APP, clientEnv, options.credentials ? { credentials: options.credentials } : {});
+      resolveClientTransport(app, clientEnv, credentials ? { credentials } : {});
     } catch (err) {
       if (isNoAccountsCredentialConfigurationError(err))
-        return unconfiguredStore(env);
+        return null;
       throw err;
     }
-    return unconfiguredStore(env);
+    return null;
   }
   if (credential.tier === "pointer") {
-    throw new Error(`accounts: ${credential.source} names a secrets-vault item, and the local accounts API store resolves ` + "credentials synchronously, so it cannot complete the pointer per request. It is a deliberate " + "selection and is not resolved around. Use a literal tier instead \u2014 the Keychain item " + "hasna.credentials.accounts.api-key, ~/.hasna/accounts/config/credentials, or HASNA_ACCOUNTS_API_KEY.");
+    throw new Error(`${app}: ${credential.source} names a secrets-vault item, and the registry adapter resolves ` + "credentials synchronously, so it cannot complete the pointer per request. It is a deliberate " + "selection and is not resolved around. Use a literal tier instead \u2014 the Keychain item " + `hasna.credentials.${app}.api-key, ~/.hasna/${app}/config/credentials, or HASNA_${app.toUpperCase()}_API_KEY.`);
   }
-  const resolution = resolveClientTransport(ACCOUNTS_APP, clientEnv, {
-    credentials: { ...options.credentials, apiKey: credential.apiKey }
+  const resolution = resolveClientTransport(app, clientEnv, {
+    credentials: { ...credentials, apiKey: credential.apiKey }
   });
-  return new ApiStore(resolution.baseUrl, credential.apiKey);
+  return { baseUrl: resolution.baseUrl, apiKey: credential.apiKey };
 }
 function isNoAccountsCredentialConfigurationError(error) {
   if (typeof error !== "object" || error === null)
@@ -1907,10 +2023,10 @@ function unconfiguredStore(env) {
   return new NoRegistryStore;
 }
 function accountsLocalModeNotice() {
-  return `accounts: LOCAL mode (${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1) \u2014 no Hasna Accounts credential resolved, so ` + "attribution reads the on-box JSON registry (~/.hasna/accounts/accounts.json) instead of accounts-serve. " + "To go hosted, put the fleet key in the Keychain item hasna.credentials.accounts.api-key, write " + "~/.hasna/accounts/config/credentials, or set HASNA_ACCOUNTS_API_KEY.";
+  return `accounts: LOCAL mode (${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1) \u2014 neither Accounts nor Subscriptions credentials resolved, so ` + "attribution reads the on-box JSON registry (~/.hasna/accounts/accounts.json) instead of accounts-serve. " + "For hosted attribution, configure the Subscriptions CLI through its normal sign-in or credential resolver.";
 }
 function accountsRefusalNotice() {
-  return "accounts: no Hasna Accounts credential resolved (Keychain item hasna.credentials.accounts.api-key, " + "~/.hasna/accounts/config/credentials, HASNA_ACCOUNTS_API_KEY), so spend attribution is omitted. The " + `on-box registry (~/.hasna/accounts/accounts.json) is NOT read without ${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1 \u2014 ` + "economy fails closed instead of attributing hosted spend from an on-box file.";
+  return "accounts: neither Accounts nor Subscriptions credentials resolved (legacy hasna.credentials.accounts.api-key, " + "~/.hasna/accounts/config/credentials, HASNA_ACCOUNTS_API_KEY; current hasna.credentials.subscriptions.api-key, " + "~/.hasna/subscriptions/config/credentials, HASNA_SUBSCRIPTIONS_API_KEY), so spend attribution is omitted. The " + `on-box registry (~/.hasna/accounts/accounts.json) is NOT read without ${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1 \u2014 ` + "economy fails closed instead of attributing hosted spend from an on-box file.";
 }
 var accountsLocalNoticePrinted = false;
 function announceAccountsLocalMode() {
@@ -1998,7 +2114,10 @@ async function profileForEnvDir(store, tool, env) {
   if (!configuredDir)
     return null;
   const normalized = normalizeDir(configuredDir);
-  return (await store.listProfiles(tool.id)).find((profile) => normalizeDir(profile.dir) === normalized) ?? null;
+  const matches = (await store.listProfiles(tool.id)).filter((profile) => normalizeDir(profile.dir) === normalized);
+  if (matches.length > 1)
+    throw new Error("account attribution: multiple profiles match the configured directory");
+  return matches[0] ?? null;
 }
 async function resolveAccountForAgent(agent, env = process.env, options = {}) {
   const override = envOverride(agent, env);
@@ -2012,8 +2131,15 @@ async function resolveAccountForAgent(agent, env = process.env, options = {}) {
       continue;
     const envProfile = await profileForEnvDir(store, tool, env);
     if (envProfile)
-      return fromProfile(envProfile, "env");
-    const appliedName = appliedProfileName(toolId);
+      return envProfile.switchedAway ? null : fromProfile(envProfile, "env");
+    if (store.registry === "subscriptions" && env[tool.envVar])
+      return null;
+    if (store.appliedProfile) {
+      const applied = await store.appliedProfile(toolId);
+      if (applied)
+        return applied.switchedAway ? null : fromProfile(applied, "applied");
+    }
+    const appliedName = store.registry === "subscriptions" ? undefined : appliedProfileName(toolId);
     if (appliedName) {
       const applied = await store.findProfile(appliedName, toolId);
       if (applied)
@@ -5332,17 +5458,17 @@ function buildServer() {
   function textError(message) {
     return { content: [{ type: "text", text: message }], isError: true };
   }
-  server.tool("search_tools", "List tool names matching query. Use first to find relevant tools.", { query: z6.string().optional() }, async ({ query }) => {
+  server.tool("search_tools", "List tool names matching query. Use first to find relevant tools.", { query: z7.string().optional() }, async ({ query }) => {
     const q2 = query?.toLowerCase();
     const matches = q2 ? TOOL_NAMES.filter((name) => name.includes(q2)) : [...TOOL_NAMES];
     return text(matches.join(", "));
   });
-  server.tool("describe_tools", "Get param hints for specific tools by name.", { names: z6.array(z6.string()) }, async ({ names }) => {
+  server.tool("describe_tools", "Get param hints for specific tools by name.", { names: z7.array(z7.string()) }, async ({ names }) => {
     const result = names.map((name) => `${name}: ${TOOL_DESCRIPTIONS[name] ?? "see tool schema"}`).join(`
 `);
     return text(result);
   });
-  server.tool("get_cost_summary", "Stored usage-value summary with pricing coverage; never a paid-spend or complete-source claim. period: today|week|month|year|all. machine: filter by hostname.", { period: z6.enum(["today", "week", "month", "year", "all"]).optional(), machine: z6.string().optional() }, async ({ period, machine }) => {
+  server.tool("get_cost_summary", "Stored usage-value summary with pricing coverage; never a paid-spend or complete-source claim. period: today|week|month|year|all. machine: filter by hostname.", { period: z7.enum(["today", "week", "month", "year", "all"]).optional(), machine: z7.string().optional() }, async ({ period, machine }) => {
     const resolved = period ?? "today";
     const s = await store.summary(resolved, machine);
     const machineLabel = machine ? ` on ${machine}` : "";
@@ -5358,11 +5484,11 @@ function buildServer() {
 `));
   });
   server.tool("get_sessions", "List sessions. Returns compact table. Params: agent, project, account, machine, limit(20)", {
-    agent: z6.enum(AGENTS).optional(),
-    project: z6.string().optional(),
-    account: z6.string().optional(),
-    machine: z6.string().optional(),
-    limit: z6.number().int().positive().max(100).optional()
+    agent: z7.enum(AGENTS).optional(),
+    project: z7.string().optional(),
+    account: z7.string().optional(),
+    machine: z7.string().optional(),
+    limit: z7.number().int().positive().max(100).optional()
   }, async ({ agent, project, account, machine, limit }) => {
     const sessions = await store.sessions({ agent, project, account, machine, limit: limit ?? 20 });
     const lines = ["id       agent  cost       tokens   project"];
@@ -5372,8 +5498,8 @@ function buildServer() {
 `));
   });
   server.tool("get_top_sessions", "Top sessions by cost. Params: n(10), agent", {
-    n: z6.number().int().positive().max(100).optional(),
-    agent: z6.enum(AGENTS).optional()
+    n: z7.number().int().positive().max(100).optional(),
+    agent: z7.enum(AGENTS).optional()
   }, async ({ n, agent }) => {
     const sessions = await store.topSessions(n ?? 10, agent);
     const lines = ["rank  id       agent  cost       tokens   project"];
@@ -5381,7 +5507,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_model_breakdown", "Cost per model. Params: limit(20), verbose, json.", { limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional(), json: z6.boolean().optional() }, async ({ limit, verbose, json }) => {
+  server.tool("get_model_breakdown", "Cost per model. Params: limit(20), verbose, json.", { limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional(), json: z7.boolean().optional() }, async ({ limit, verbose, json }) => {
     const rows = await store.modelBreakdown();
     if (json)
       return text(JSON.stringify(rows, null, 2));
@@ -5396,7 +5522,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_project_breakdown", "Cost per project. Params: period(today|week|month|year|all), limit(20), verbose, json.", { period: z6.enum(["today", "week", "month", "year", "all"]).optional(), limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional(), json: z6.boolean().optional() }, async ({ period, limit, verbose, json }) => {
+  server.tool("get_project_breakdown", "Cost per project. Params: period(today|week|month|year|all), limit(20), verbose, json.", { period: z7.enum(["today", "week", "month", "year", "all"]).optional(), limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional(), json: z7.boolean().optional() }, async ({ period, limit, verbose, json }) => {
     const rows = await store.projectBreakdown({ period: period ?? "all" });
     if (json)
       return text(JSON.stringify(rows, null, 2));
@@ -5412,7 +5538,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_agent_breakdown", "Cost per coding agent. Params: period(today|week|month|year|all). Shows API-equivalent, billable API, and subscription-included usage.", { period: z6.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
+  server.tool("get_agent_breakdown", "Cost per coding agent. Params: period(today|week|month|year|all). Shows API-equivalent, billable API, and subscription-included usage.", { period: z7.enum(["today", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
     const rows = await store.agentBreakdown({ period: period ?? "all" });
     if (rows.length === 0)
       return text("No agent usage yet.");
@@ -5423,7 +5549,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_account_breakdown", "Cost per account/profile. Params: period(today|week|month|year|all), limit(20), verbose, json. Shows API-equivalent, billable API, and subscription-included usage.", { period: z6.enum(["today", "week", "month", "year", "all"]).optional(), limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional(), json: z6.boolean().optional() }, async ({ period, limit, verbose, json }) => {
+  server.tool("get_account_breakdown", "Cost per account/profile. Params: period(today|week|month|year|all), limit(20), verbose, json. Shows API-equivalent, billable API, and subscription-included usage.", { period: z7.enum(["today", "week", "month", "year", "all"]).optional(), limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional(), json: z7.boolean().optional() }, async ({ period, limit, verbose, json }) => {
     const rows = await store.accountBreakdown({ period: period ?? "all" });
     if (json)
       return text(JSON.stringify(rows, null, 2));
@@ -5442,12 +5568,12 @@ function buildServer() {
 `));
   });
   server.tool("get_cost_center_breakdown", "Cost per cost center. Params: period, kind, cursor(0), limit(20), verbose, json. json=true preserves the complete legacy array.", {
-    period: z6.enum(["today", "week", "month", "year", "all"]).optional(),
-    kind: z6.enum(["loop", "app", "repo", "service", "team"]).optional(),
-    cursor: z6.number().int().nonnegative().optional(),
-    limit: z6.number().int().positive().max(100).optional(),
-    verbose: z6.boolean().optional(),
-    json: z6.boolean().optional()
+    period: z7.enum(["today", "week", "month", "year", "all"]).optional(),
+    kind: z7.enum(["loop", "app", "repo", "service", "team"]).optional(),
+    cursor: z7.number().int().nonnegative().optional(),
+    limit: z7.number().int().positive().max(100).optional(),
+    verbose: z7.boolean().optional(),
+    json: z7.boolean().optional()
   }, async ({ period, kind, cursor, limit, verbose, json }) => {
     const rows = await store.costCenterBreakdown({ period: period ?? "all", kind });
     if (json)
@@ -5470,7 +5596,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_budget_status", "Budget limits vs spend, percent used, alert flags. Params: limit(20), verbose, json.", { limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional(), json: z6.boolean().optional() }, async ({ limit, verbose, json }) => {
+  server.tool("get_budget_status", "Budget limits vs spend, percent used, alert flags. Params: limit(20), verbose, json.", { limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional(), json: z7.boolean().optional() }, async ({ limit, verbose, json }) => {
     const budgets = await store.listBudgets();
     if (json)
       return text(JSON.stringify(budgets, null, 2));
@@ -5491,12 +5617,12 @@ function buildServer() {
 `));
   });
   server.tool("set_budget", "Create a spending budget. period: daily|weekly|monthly. limit_usd must be positive. alert_at_percent defaults to 80.", {
-    period: z6.enum(["daily", "weekly", "monthly"]),
-    limit_usd: z6.number().positive(),
-    project_path: z6.string().optional(),
-    agent: z6.enum(AGENTS).optional(),
-    cost_center_id: z6.string().optional(),
-    alert_at_percent: z6.number().positive().max(100).optional()
+    period: z7.enum(["daily", "weekly", "monthly"]),
+    limit_usd: z7.number().positive(),
+    project_path: z7.string().optional(),
+    agent: z7.enum(AGENTS).optional(),
+    cost_center_id: z7.string().optional(),
+    alert_at_percent: z7.number().positive().max(100).optional()
   }, async ({ period, limit_usd, project_path, agent, cost_center_id, alert_at_percent }) => {
     const id = await store.setBudget({
       project_path: project_path ?? null,
@@ -5508,11 +5634,11 @@ function buildServer() {
     });
     return text(`Budget set: ${id}`);
   });
-  server.tool("remove_budget", "Delete a budget by id.", { id: z6.string() }, async ({ id }) => {
+  server.tool("remove_budget", "Delete a budget by id.", { id: z7.string() }, async ({ id }) => {
     await store.removeBudget(id);
     return text("Budget removed.");
   });
-  server.tool("get_pricing", "Editable model pricing rows. Includes input/output/cache rates and context-cache storage. Params: limit(20), verbose, json.", { limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional(), json: z6.boolean().optional() }, async ({ limit, verbose, json }) => {
+  server.tool("get_pricing", "Editable model pricing rows. Includes input/output/cache rates and context-cache storage. Params: limit(20), verbose, json.", { limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional(), json: z7.boolean().optional() }, async ({ limit, verbose, json }) => {
     const rows = await store.listPricing();
     if (json)
       return text(JSON.stringify(rows, null, 2));
@@ -5528,13 +5654,13 @@ function buildServer() {
 `));
   });
   server.tool("set_pricing", "Create or update a model pricing row. Values are USD per 1M tokens except cache_storage_per_1m_hour.", {
-    model: z6.string().min(1),
-    input_per_1m: z6.number().nonnegative(),
-    output_per_1m: z6.number().nonnegative(),
-    cache_read_per_1m: z6.number().nonnegative().optional(),
-    cache_write_per_1m: z6.number().nonnegative().optional(),
-    cache_write_1h_per_1m: z6.number().nonnegative().optional(),
-    cache_storage_per_1m_hour: z6.number().nonnegative().optional()
+    model: z7.string().min(1),
+    input_per_1m: z7.number().nonnegative(),
+    output_per_1m: z7.number().nonnegative(),
+    cache_read_per_1m: z7.number().nonnegative().optional(),
+    cache_write_per_1m: z7.number().nonnegative().optional(),
+    cache_write_1h_per_1m: z7.number().nonnegative().optional(),
+    cache_storage_per_1m_hour: z7.number().nonnegative().optional()
   }, async (input) => {
     const model = input.model.trim();
     if (!model)
@@ -5550,11 +5676,11 @@ function buildServer() {
     });
     return text(`Pricing set: ${model}`);
   });
-  server.tool("remove_pricing", "Delete a model pricing row by model id.", { model: z6.string() }, async ({ model }) => {
+  server.tool("remove_pricing", "Delete a model pricing row by model id.", { model: z7.string() }, async ({ model }) => {
     await store.removePricing(model);
     return text("Pricing removed.");
   });
-  server.tool("get_daily", "Daily cost table by agent. Params: days(30)", { days: z6.number().int().positive().max(365).optional() }, async ({ days }) => {
+  server.tool("get_daily", "Daily cost table by agent. Params: days(30)", { days: z7.number().int().positive().max(365).optional() }, async ({ days }) => {
     const rows = await store.daily(days ?? 30);
     const byDate = new Map;
     for (const row of rows) {
@@ -5578,7 +5704,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_billing_summary", "Recorded provider billing-row subtotals; complete account/source coverage is unverified. Params: period(today|yesterday|week|month|year|all)", { period: z6.enum(["today", "yesterday", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
+  server.tool("get_billing_summary", "Recorded provider billing-row subtotals; complete account/source coverage is unverified. Params: period(today|yesterday|week|month|year|all)", { period: z7.enum(["today", "yesterday", "week", "month", "year", "all"]).optional() }, async ({ period }) => {
     const summary = await store.billingSummary(period ?? "month");
     const lines = ["provider    recorded subtotal"];
     for (const [provider, cost] of Object.entries(summary.by_provider)) {
@@ -5589,7 +5715,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_session_detail", "Per-request breakdown of a single session. Params: session_id (prefix ok), limit(20), verbose.", { session_id: z6.string(), limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional() }, async ({ session_id, limit, verbose }) => {
+  server.tool("get_session_detail", "Per-request breakdown of a single session. Params: session_id (prefix ok), limit(20), verbose.", { session_id: z7.string(), limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional() }, async ({ session_id, limit, verbose }) => {
     const detail = await store.sessionDetail(session_id);
     if (!detail)
       return textError(`Session not found: ${session_id}`);
@@ -5613,7 +5739,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("sync", `Ingest new cost data. sources: ${SYNC_SOURCES.join("|")} ('loops' reads another app's on-box store and is refused for a hosted client). Set json=true for the full result object.`, { sources: z6.enum([...SYNC_SOURCES]).optional(), json: z6.boolean().optional() }, async ({ sources, json }) => {
+  server.tool("sync", `Ingest new cost data. sources: ${SYNC_SOURCES.join("|")} ('loops' reads another app's on-box store and is refused for a hosted client). Set json=true for the full result object.`, { sources: z7.enum([...SYNC_SOURCES]).optional(), json: z7.boolean().optional() }, async ({ sources, json }) => {
     const selected = sources ?? "all";
     const opts = selected === "all" ? {} : { [selected]: true };
     if (isCloudStore()) {
@@ -5670,7 +5796,7 @@ function buildServer() {
     return { ...text(lines.join(`
 `)), isError: failed };
   });
-  server.tool("get_usage", "Usage snapshots and fleet summary. period: today|week|month|year|all, agent, limit(20). Set json=true for full data.", { period: z6.enum(["today", "week", "month", "year", "all"]).optional(), agent: z6.enum(AGENTS).optional(), limit: z6.number().int().positive().max(100).optional(), json: z6.boolean().optional() }, async ({ period, agent, limit, json }) => {
+  server.tool("get_usage", "Usage snapshots and fleet summary. period: today|week|month|year|all, agent, limit(20). Set json=true for full data.", { period: z7.enum(["today", "week", "month", "year", "all"]).optional(), agent: z7.enum(AGENTS).optional(), limit: z7.number().int().positive().max(100).optional(), json: z7.boolean().optional() }, async ({ period, agent, limit, json }) => {
     const p = period ?? "month";
     const { snapshots: snaps, summary } = await store.usage(p, agent);
     if (json)
@@ -5693,7 +5819,7 @@ function buildServer() {
     return text(lines.join(`
 `));
   });
-  server.tool("get_savings", "Estimated subscription-included usage benefit versus mapped current plan fees; unavailable when evidence is missing. Paid API cost is not savings. Params: period, agent, limit(20), json.", { period: z6.enum(["today", "week", "month", "year", "all"]).optional(), agent: z6.enum(AGENTS).optional(), limit: z6.number().int().positive().max(100).optional(), json: z6.boolean().optional() }, async ({ period, agent, limit, json }) => {
+  server.tool("get_savings", "Estimated subscription-included usage benefit versus mapped current plan fees; unavailable when evidence is missing. Paid API cost is not savings. Params: period, agent, limit(20), json.", { period: z7.enum(["today", "week", "month", "year", "all"]).optional(), agent: z7.enum(AGENTS).optional(), limit: z7.number().int().positive().max(100).optional(), json: z7.boolean().optional() }, async ({ period, agent, limit, json }) => {
     const savings = await store.savings(period ?? "month", agent);
     if (json)
       return text(JSON.stringify(savings, null, 2));
@@ -5734,17 +5860,17 @@ function buildServer() {
 `));
   });
   server.tool("set_subscription", "Configure an account subscription plan. Explicit amounts are configured observations; omitted amounts remain unknown.", {
-    id: z6.string().optional(),
-    provider: z6.string().min(1),
-    plan: z6.string().min(1),
-    account_key: z6.string().min(1).max(256),
-    agent: z6.enum(AGENTS).optional(),
-    monthly_fee_usd: z6.number().nonnegative().optional(),
-    included_usage_usd: z6.number().nonnegative().optional(),
-    billing_cycle_start: z6.string().optional(),
-    reset_policy: z6.string().optional(),
-    active: z6.boolean().optional(),
-    json: z6.boolean().optional()
+    id: z7.string().optional(),
+    provider: z7.string().min(1),
+    plan: z7.string().min(1),
+    account_key: z7.string().min(1).max(256),
+    agent: z7.enum(AGENTS).optional(),
+    monthly_fee_usd: z7.number().nonnegative().optional(),
+    included_usage_usd: z7.number().nonnegative().optional(),
+    billing_cycle_start: z7.string().optional(),
+    reset_policy: z7.string().optional(),
+    active: z7.boolean().optional(),
+    json: z7.boolean().optional()
   }, async (input) => {
     const row = await store.setSubscription({
       id: input.id,
@@ -5768,15 +5894,15 @@ agent: ${row.agent ?? "unallocated"}
 fee: ${money.fee}
 included: ${money.included}`);
   });
-  server.tool("remove_subscription", "Delete a subscription plan by id.", { id: z6.string() }, async ({ id }) => {
+  server.tool("remove_subscription", "Delete a subscription plan by id.", { id: z7.string() }, async ({ id }) => {
     await store.removeSubscription(id);
     return text("Subscription removed.");
   });
-  server.tool("estimate_cost", "Pre-flight usage-value estimate for token counts; missing model pricing returns MODEL_PRICING_UNAVAILABLE, never a free estimate.", { model: z6.string().min(1), input_tokens: z6.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER).optional(), output_tokens: z6.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER).optional() }, async ({ model, input_tokens, output_tokens }) => {
+  server.tool("estimate_cost", "Pre-flight usage-value estimate for token counts; missing model pricing returns MODEL_PRICING_UNAVAILABLE, never a free estimate.", { model: z7.string().min(1), input_tokens: z7.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER).optional(), output_tokens: z7.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER).optional() }, async ({ model, input_tokens, output_tokens }) => {
     const cost = await store.estimate({ model, inputTokens: input_tokens ?? 0, outputTokens: output_tokens ?? 0 });
     return text(`${model}: ${fmtUsd(cost)} (${input_tokens ?? 0} in / ${output_tokens ?? 0} out)`);
   });
-  server.tool("get_goals", "All spending goals with current progress. Params: limit(20), verbose, json.", { limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional(), json: z6.boolean().optional() }, async ({ limit, verbose, json }) => {
+  server.tool("get_goals", "All spending goals with current progress. Params: limit(20), verbose, json.", { limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional(), json: z7.boolean().optional() }, async ({ limit, verbose, json }) => {
     const goals = await store.listGoals();
     if (json)
       return text(JSON.stringify(goals, null, 2));
@@ -5797,10 +5923,10 @@ included: ${money.included}`);
 `));
   });
   server.tool("set_goal", "Create/update a spending goal. period(day|week|month|year), limit_usd, project_path?, agent?", {
-    period: z6.enum(["day", "week", "month", "year"]),
-    limit_usd: z6.number().positive(),
-    project_path: z6.string().optional(),
-    agent: z6.string().optional()
+    period: z7.enum(["day", "week", "month", "year"]),
+    limit_usd: z7.number().positive(),
+    project_path: z7.string().optional(),
+    agent: z7.string().optional()
   }, async ({ period, limit_usd, project_path, agent }) => {
     await store.setGoal({
       period,
@@ -5810,11 +5936,11 @@ included: ${money.included}`);
     });
     return text(`Goal set: ${period} $${limit_usd}`);
   });
-  server.tool("remove_goal", "Delete a goal by id.", { id: z6.string() }, async ({ id }) => {
+  server.tool("remove_goal", "Delete a goal by id.", { id: z7.string() }, async ({ id }) => {
     await store.removeGoal(id);
     return text("Goal removed.");
   });
-  server.tool("list_machines", "List all machines that have synced data. Params: limit(20), verbose, json.", { limit: z6.number().int().positive().max(100).optional(), verbose: z6.boolean().optional(), json: z6.boolean().optional() }, async ({ limit, verbose, json }) => {
+  server.tool("list_machines", "List all machines that have synced data. Params: limit(20), verbose, json.", { limit: z7.number().int().positive().max(100).optional(), verbose: z7.boolean().optional(), json: z7.boolean().optional() }, async ({ limit, verbose, json }) => {
     const machines = await store.machines();
     if (json)
       return text(JSON.stringify(machines, null, 2));
@@ -5836,9 +5962,9 @@ current machine: ${getMachineId()}`);
   registerAgentTools(server, { service: "economy" });
   registerIngestJournalTool(server);
   server.tool("send_feedback", "Send feedback about this service.", {
-    message: z6.string(),
-    email: z6.string().optional(),
-    category: z6.enum(["bug", "feature", "general"]).optional()
+    message: z7.string(),
+    email: z7.string().optional(),
+    category: z7.enum(["bug", "feature", "general"]).optional()
   }, async ({ message, email, category }) => {
     try {
       await store.sendFeedback({ message, email, category });