@hasna/economy 0.5.3 → 0.5.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.4
+
+### Patch Changes
+
+- Resolve account attribution through the current hosted Subscriptions client using its station-local paths and applied bindings. Preserve explicit legacy Accounts connections, reject ambiguous bindings, and avoid attributing an unmatched local profile to another station's shared selection.
+
 ## 0.5.3
 
 ### Patch Changes

package/README.md

@@ -9,7 +9,7 @@ AI coding cost tracker for Claude Code, Takumi, Codex, Gemini, OpenCode, Cursor,
 
 - Ingests local Claude Code, Takumi, Codex, Gemini, OpenCode, Cursor, Pi, and Hermes usage.
 - Tracks sessions, requests, projects, machines, models, cache tokens, cost centers, budgets, goals, and provider billing.
-- Attributes usage to `@hasna/accounts` profiles when agents run under managed account/profile config dirs.
+- Attributes usage to hosted Subscriptions profiles using their station-local configuration directories or applied bindings; explicit legacy Accounts connections remain supported.
 - Breaks down API-equivalent, metered API, subscription-included, estimated, and unknown cost by account, coding agent, and cost center.
 - Seeds editable model pricing with input, output, cache-read, 5-minute cache-write, 1-hour cache-write, and context-cache storage rates.
 - Handles tiered pricing such as Gemini long-prompt rates and OpenAI long-context rates.
@@ -130,7 +130,9 @@ economy sync --backfill-machine
 
 Full sync also imports active project metadata from `@hasna/projects` when the registry is available. The Codex source reads both `~/.codex/state_5.sqlite` and the Codewith store at `~/.codewith/state_5.sqlite` by default; explicit `HASNA_ECONOMY_CODEX_DB_PATH` and `HASNA_ECONOMY_CODEWITH_DB_PATH` values override those locations.
 
-Account attribution is automatic when the accounts API (`HASNA_ACCOUNTS_API_KEY`, the accounts credentials file, or the Keychain item `hasna.credentials.accounts.api-key`) resolves a matching active, applied, or env-dir profile for the agent. With **no** accounts credential the on-box registry `~/.hasna/accounts/accounts.json` is **not** read unless `HASNA_ECONOMY_LOCAL=1` is set: attribution is simply omitted, announced once on stderr, rather than filling hosted rows from an on-box file. Account identity is the email address plus coding agent, so `work@example.com` under Codex and Claude is reported as two accounts. You can also force attribution for a process with `ECONOMY_ACCOUNT=tool:name` or agent-specific overrides such as `ECONOMY_CODEX_ACCOUNT=codex:work`.
+Account attribution uses the hosted Subscriptions registry through the installed `subscriptions` CLI and its own credential resolver. Economy reads `subscriptions list --json` and `subscriptions tools list --json` once per resolution, retaining the owning package's station-local paths and applied bindings. It does not activate a profile or copy credentials. A matching explicit agent directory takes precedence; an unmatched or ambiguous directory cannot inherit another profile. With no explicit directory, a station's applied binding can supply attribution; the shared registry's current selection alone cannot identify the local account.
+
+An explicitly configured legacy Accounts connection (`HASNA_ACCOUNTS_API_KEY`, its credentials file or Keychain entry) keeps its authority and compatibility behavior. A configured but unusable legacy or Subscriptions connection fails closed. If neither is configured, `~/.hasna/accounts/accounts.json` is **not** read unless `HASNA_ECONOMY_LOCAL=1` is set; attribution is omitted with a diagnostic. The Subscriptions CLI is required when using its registry. Profile counts are not paid-subscription counts, and this read path does not create subscription fees or backfill historical usage. Account identity remains email plus coding agent (profile name when email is unknown). Explicit process overrides such as `ECONOMY_ACCOUNT=tool:name` or `ECONOMY_CODEX_ACCOUNT=codex:work` still take precedence.
 
 Session drilldown can be scoped to an account key, account name, or email:
 

package/dist/chunks/{index-s9mvven6.js → index-9arv0b1j.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   LOCAL_STORAGE_OPT_IN_KEYS
-} from "./index-1vz1arz5.js";
+} from "./index-n1wwqxfe.js";
 import {
   assessCostFromDb,
   getIngestState,
@@ -78,34 +78,141 @@ import { join as join2, basename } from "path";
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
-import { z } from "zod";
+import { z as z2 } from "zod";
 import { resolveClientTransport, resolveCredential } from "@hasna/contracts/client";
-var ACCOUNTS_APP = "accounts";
-var profileNameSchema = z.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+
+// src/lib/subscriptions-registry.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+import { isAbsolute } from "path";
+import { z } from "zod";
+var execute = promisify(execFile);
+var 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 = z.string().min(1);
 var profileSchema = z.object({
-  name: z.string(),
-  tool: z.string(),
+  name: nonempty,
+  tool: nonempty,
   email: z.string().optional(),
   displayName: z.string().optional(),
-  dir: z.string(),
+  dir: nonempty.refine(isAbsolute).refine((value) => !/[\0\r\n]/.test(value)),
+  createdAt: nonempty,
+  lastUsedAt: z.string().optional(),
   description: z.string().optional(),
-  createdAt: z.string(),
-  lastUsedAt: z.string().optional()
+  active: z.boolean(),
+  applied: z.boolean(),
+  switchedAway: z.object({ profile: nonempty, email: z.string().optional() }).optional()
 });
-var toolDefSchema = z.object({
-  id: z.string(),
-  label: z.string(),
-  envVar: z.string(),
-  defaultDir: z.string(),
-  bin: z.string()
+var toolsSchema = z.array(z.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 = z.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 = z2.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+var profileSchema2 = z2.object({
+  name: z2.string(),
+  tool: z2.string(),
+  email: z2.string().optional(),
+  displayName: z2.string().optional(),
+  dir: z2.string(),
+  description: z2.string().optional(),
+  createdAt: z2.string(),
+  lastUsedAt: z2.string().optional(),
+  switchedAway: z2.object({ profile: z2.string().min(1), email: z2.string().optional() }).optional()
+});
+var toolDefSchema = z2.object({
+  id: z2.string(),
+  label: z2.string(),
+  envVar: z2.string(),
+  defaultDir: z2.string(),
+  bin: z2.string()
 });
-var storeSchema = z.object({
-  version: z.literal(1),
-  current: z.record(z.string(), z.string()).default({}),
-  applied: z.record(z.string(), z.string()).default({}),
-  toolLocks: z.record(z.string(), z.string()).default({}),
-  profiles: z.array(profileSchema).default([]),
-  tools: z.array(toolDefSchema).default([])
+var storeSchema = z2.object({
+  version: z2.literal(1),
+  current: z2.record(z2.string(), z2.string()).default({}),
+  applied: z2.record(z2.string(), z2.string()).default({}),
+  toolLocks: z2.record(z2.string(), z2.string()).default({}),
+  profiles: z2.array(profileSchema2).default([]),
+  tools: z2.array(toolDefSchema).default([])
 });
 function localRegistryAllowed(env = process.env) {
   return LOCAL_STORAGE_OPT_IN_KEYS.some((key) => {
@@ -387,25 +494,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)
@@ -422,10 +538,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() {
@@ -513,7 +629,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);
@@ -527,8 +646,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)

package/dist/chunks/{index-mhrkwvtk.js → index-ct3zdefz.js}

@@ -14,7 +14,7 @@ import {
   querySavingsSummary,
   requireCurrentBillingDiffSummary,
   requireCurrentSavingsReport
-} from "./index-1vz1arz5.js";
+} from "./index-n1wwqxfe.js";
 import {
   deleteBudget,
   deleteGoal,

package/dist/chunks/{index-1vz1arz5.js → index-n1wwqxfe.js}

@@ -20,7 +20,7 @@ import {
 // 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",

package/dist/chunks/{index-bn04v378.js → index-nheq2nrz.js}

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

package/dist/chunks/{serve-8yqe7nhs.js → serve-ra46ms69.js}

@@ -5,7 +5,7 @@ import {
 } from "./index-w3bvv0ns.js";
 import {
   syncAll
-} from "./index-s9mvven6.js";
+} from "./index-9arv0b1j.js";
 import {
   buildBrief,
   packageMetadata,
@@ -16,7 +16,7 @@ import {
   queryProjectDetail,
   queryRangeStats,
   querySavingsSummary
-} from "./index-1vz1arz5.js";
+} from "./index-n1wwqxfe.js";
 import {
   AGENTS,
   INGEST_SCHEMA_SQL,

package/dist/chunks/{tui-fe94bvp9.js → tui-a1tvcw2j.js}

@@ -6,10 +6,10 @@ import {
   printStatusLine,
   printWaybarJson,
   runTui
-} from "./index-bn04v378.js";
+} from "./index-nheq2nrz.js";
 import"./index-w3bvv0ns.js";
-import"./index-mhrkwvtk.js";
-import"./index-1vz1arz5.js";
+import"./index-ct3zdefz.js";
+import"./index-n1wwqxfe.js";
 import"./index-f5jv6q5q.js";
 import"./index-p35cyhc4.js";
 export {

package/dist/chunks/{watch-ct8dvrpr.js → watch-rvd3dn6r.js}

@@ -2,12 +2,12 @@
 import {
   agentPaths,
   syncAll
-} from "./index-s9mvven6.js";
+} from "./index-9arv0b1j.js";
 import {
   getStore,
   isCloudStore
-} from "./index-mhrkwvtk.js";
-import"./index-1vz1arz5.js";
+} from "./index-ct3zdefz.js";
+import"./index-n1wwqxfe.js";
 import {
   formatSummaryValue
 } from "./index-f5jv6q5q.js";

package/dist/cli/index.js

@@ -8,22 +8,22 @@ import {
 import {
   buildStatusLine,
   gatherStatusData
-} from "../chunks/index-bn04v378.js";
+} from "../chunks/index-nheq2nrz.js";
 import"../chunks/index-w3bvv0ns.js";
 import {
   agentPaths,
   syncAll
-} from "../chunks/index-s9mvven6.js";
+} from "../chunks/index-9arv0b1j.js";
 import {
   getStore,
   isCloudStore
-} from "../chunks/index-mhrkwvtk.js";
+} from "../chunks/index-ct3zdefz.js";
 import {
   billingDriftCheck,
   economyCloudStorage,
   economyTransportReport,
   packageMetadata
-} from "../chunks/index-1vz1arz5.js";
+} from "../chunks/index-n1wwqxfe.js";
 import {
   AGENTS,
   MAX_INGEST_BYTES,
@@ -1357,23 +1357,23 @@ function registerExtendedCommands(program) {
     console.log();
   });
   program.command("tui").description("Terminal status dashboard (Linux/SSH friendly)").option("--watch", "Live refresh").option("--interval <seconds>", "Refresh interval", "30").action(async (opts) => {
-    const { runTui } = await import("../chunks/tui-fe94bvp9.js");
+    const { runTui } = await import("../chunks/tui-a1tvcw2j.js");
     await runTui({
       watch: Boolean(opts.watch),
       interval: Number(opts.interval ?? 30)
     });
   });
   program.command("waybar").description("Print waybar-compatible JSON status line").action(async () => {
-    const { printWaybarJson } = await import("../chunks/tui-fe94bvp9.js");
+    const { printWaybarJson } = await import("../chunks/tui-a1tvcw2j.js");
     await printWaybarJson();
   });
   const barCmd = program.command("bar").description("Status bar helpers (Linux)");
   barCmd.command("tui").description("Alias for economy tui").option("--watch", "Live refresh").action(async (opts) => {
-    const { runTui } = await import("../chunks/tui-fe94bvp9.js");
+    const { runTui } = await import("../chunks/tui-a1tvcw2j.js");
     await runTui({ watch: Boolean(opts.watch) });
   });
   barCmd.command("waybar").description("Alias for economy waybar").action(async () => {
-    const { printWaybarJson } = await import("../chunks/tui-fe94bvp9.js");
+    const { printWaybarJson } = await import("../chunks/tui-a1tvcw2j.js");
     await printWaybarJson();
   });
   program.command("estimate").description("Estimate cost for token counts").requiredOption("--model <model>", "Model name").option("--input <n>", "Input tokens", "0").option("--output <n>", "Output tokens", "0").action(async (opts) => {
@@ -3198,7 +3198,7 @@ program.command("accounts [period]").description("List account usage by email ad
   console.log();
 });
 program.command("watch").description("Live stream of incoming costs").option("--interval <seconds>", "Poll interval in seconds", "10").option("--daemon", "Watch agent data directories and sync on change").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--notify <amount>", "Fire macOS notification when cumulative cost crosses this USD threshold").action(async (opts) => {
-  const { watchCosts } = await import("../chunks/watch-ct8dvrpr.js");
+  const { watchCosts } = await import("../chunks/watch-rvd3dn6r.js");
   await watchCosts({
     interval: parsePositiveCliInteger(opts.interval ?? "10", "--interval"),
     daemon: Boolean(opts.daemon),
@@ -3434,7 +3434,7 @@ pricingCmd.command("remove <model>").description("Remove pricing for a model").a
 });
 program.command("serve").description("Start the REST API server").option("-p, --port <port>", "Port", "3456").action(async (opts) => {
   const port = parseCliPort(opts.port ?? "3456", "--port");
-  const { startServer } = await import("../chunks/serve-8yqe7nhs.js");
+  const { startServer } = await import("../chunks/serve-ra46ms69.js");
   startServer(port);
 });
 program.command("mcp").description("Show MCP server install commands").option("--claude", "Install into Claude Code").option("--codex", "Install into Codex").option("--gemini", "Install into Gemini CLI").option("--all", "Install into all agents").action(async (opts) => {

package/dist/index.js

@@ -62,7 +62,7 @@ import { randomUUID } from "crypto";
 // 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",

package/dist/lib/accounts-store.d.ts

@@ -1,8 +1,11 @@
 import { z } from 'zod';
 import { type CredentialChainOptions } from '@hasna/contracts/client';
+import { type SubscriptionsMetadataReader } from './subscriptions-registry.js';
 /** Test injection for the accounts credential chain (keychain runner, tier-1 key). */
 export interface ResolveAccountsStoreOptions {
     credentials?: CredentialChainOptions;
+    subscriptionsCredentials?: CredentialChainOptions;
+    readSubscriptionsMetadata?: SubscriptionsMetadataReader;
 }
 /** Minimal profile record — the fields economy's attribution reads. */
 declare const profileSchema: z.ZodObject<{
@@ -14,6 +17,16 @@ declare const profileSchema: z.ZodObject<{
     description: z.ZodOptional<z.ZodString>;
     createdAt: z.ZodString;
     lastUsedAt: z.ZodOptional<z.ZodString>;
+    switchedAway: z.ZodOptional<z.ZodObject<{
+        profile: z.ZodString;
+        email: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        profile: string;
+        email?: string | undefined;
+    }, {
+        profile: string;
+        email?: string | undefined;
+    }>>;
 }, "strip", z.ZodTypeAny, {
     name: string;
     dir: string;
@@ -23,6 +36,10 @@ declare const profileSchema: z.ZodObject<{
     email?: string | undefined;
     displayName?: string | undefined;
     lastUsedAt?: string | undefined;
+    switchedAway?: {
+        profile: string;
+        email?: string | undefined;
+    } | undefined;
 }, {
     name: string;
     dir: string;
@@ -32,6 +49,10 @@ declare const profileSchema: z.ZodObject<{
     email?: string | undefined;
     displayName?: string | undefined;
     lastUsedAt?: string | undefined;
+    switchedAway?: {
+        profile: string;
+        email?: string | undefined;
+    } | undefined;
 }>;
 /** Minimal tool definition — economy reads `id` and `envVar` (dir matching). */
 declare const toolDefSchema: z.ZodObject<{
@@ -62,9 +83,11 @@ export type ToolDef = z.infer<typeof toolDefSchema>;
  */
 export interface AccountsStore {
     readonly transport: 'local' | 'api' | 'none';
+    readonly registry?: 'accounts' | 'subscriptions';
     listProfiles(tool?: string): Promise<Profile[]>;
     findProfile(name: string, tool?: string): Promise<Profile | undefined>;
     currentProfile(tool: string): Promise<Profile | undefined>;
+    appliedProfile?(tool: string): Promise<Profile | undefined>;
     listTools(): Promise<ToolDef[]>;
 }
 /**
@@ -84,7 +107,8 @@ export declare function appliedProfileName(toolId: string): string | undefined;
  * Stale `*_STORAGE_MODE` / `*_MODE` variables are ignored — they never select
  * a store and never error (owner directive 2026-08-15).
  *
- * WITH NO CREDENTIAL the on-box JSON registry is served ONLY under economy's
+ * With neither a legacy Accounts nor current Subscriptions credential, the
+ * on-box JSON registry is served ONLY under economy's
  * explicit local opt-in (`HASNA_ECONOMY_LOCAL=1` / `ECONOMY_LOCAL=1`); every
  * other run gets {@link NoRegistryStore} — no on-box read, attribution absent,
  * one stderr line. Serving the on-box registry to a hosted client was the last

package/dist/lib/accounts-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts-store.d.ts","sourceRoot":"","sources":["../../src/lib/accounts-store.ts"],"names":[],"mappings":"AAsCA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAA6C,KAAK,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAMhH,sFAAsF;AACtF,MAAM,WAAW,2BAA2B;IAC1C,WAAW,CAAC,EAAE,sBAAsB,CAAA;CACrC;AAKD,uEAAuE;AACvE,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;EASjB,CAAA;AAEF,gFAAgF;AAChF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;EAMjB,CAAA;AAYF,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AACnD,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AAmBnD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;IAC5C,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IACtE,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IAC1D,SAAS,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;CAChC;AAwDD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGrE;AAwQD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,YAAY,CAC1B,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,OAAO,GAAE,2BAAgC,GACxC,aAAa,CAqCf;AA2DD,8DAA8D;AAC9D,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD"}
+{"version":3,"file":"accounts-store.d.ts","sourceRoot":"","sources":["../../src/lib/accounts-store.ts"],"names":[],"mappings":"AA4CA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAA6C,KAAK,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAEhH,OAAO,EAAyB,KAAK,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AAKrG,sFAAsF;AACtF,MAAM,WAAW,2BAA2B;IAC1C,WAAW,CAAC,EAAE,sBAAsB,CAAA;IACpC,wBAAwB,CAAC,EAAE,sBAAsB,CAAA;IACjD,yBAAyB,CAAC,EAAE,2BAA2B,CAAA;CACxD;AAKD,uEAAuE;AACvE,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUjB,CAAA;AAEF,gFAAgF;AAChF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;EAMjB,CAAA;AAYF,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AACnD,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AAmBnD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;IAC5C,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU,GAAG,eAAe,CAAA;IAChD,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IACtE,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IAC1D,cAAc,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IAC3D,SAAS,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;CAChC;AAwDD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGrE;AAwQD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,YAAY,CAC1B,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,OAAO,GAAE,2BAAgC,GACxC,aAAa,CAMf;AAuGD,8DAA8D;AAC9D,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD"}

package/dist/lib/accounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/lib/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,2BAA2B,EAAE,MAAM,qBAAqB,CAAA;AAExG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,UAAU,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,CAAA;CAC3D;AAqFD,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,KAAK,EACZ,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,OAAO,GAAE,2BAAgC,GACxC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAwBpC;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,kBAAkB,GAAG,IAAI,GACjC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAUjC"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/lib/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,2BAA2B,EAAE,MAAM,qBAAqB,CAAA;AAExG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,UAAU,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,CAAA;CAC3D;AAuFD,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,KAAK,EACZ,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,OAAO,GAAE,2BAAgC,GACxC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAmCpC;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,kBAAkB,GAAG,IAAI,GACjC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAUjC"}

package/dist/lib/subscriptions-registry.d.ts

@@ -0,0 +1,26 @@
+import type { AccountsStore, Profile, ToolDef } from './accounts-store.js';
+/** Read-only, package-owned metadata. Never project a credential into argv. */
+export type SubscriptionsMetadataReader = (args: string[], env: NodeJS.ProcessEnv) => Promise<unknown>;
+export declare const readSubscriptionsMetadata: SubscriptionsMetadataReader;
+/**
+ * The installed Subscriptions package owns station-local paths and applied
+ * bindings. Its hosted list combines those with the authoritative API records.
+ * Do not copy its home migration rules, read its registry file, or infer that
+ * the fleet-wide "current" selection identifies this station's running account.
+ */
+export declare class SubscriptionsRegistry implements AccountsStore {
+    private readonly read;
+    readonly transport: "api";
+    readonly registry: "subscriptions";
+    private readonly env;
+    private profiles?;
+    private tools?;
+    constructor(baseUrl: string, env: NodeJS.ProcessEnv, read?: SubscriptionsMetadataReader);
+    private allProfiles;
+    listProfiles(tool?: string): Promise<Profile[]>;
+    findProfile(name: string, tool?: string): Promise<Profile | undefined>;
+    appliedProfile(tool: string): Promise<Profile | undefined>;
+    currentProfile(_tool: string): Promise<Profile | undefined>;
+    listTools(): Promise<ToolDef[]>;
+}
+//# sourceMappingURL=subscriptions-registry.d.ts.map

package/dist/lib/subscriptions-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subscriptions-registry.d.ts","sourceRoot":"","sources":["../../src/lib/subscriptions-registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAI1E,+EAA+E;AAC/E,MAAM,MAAM,2BAA2B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAEtG,eAAO,MAAM,yBAAyB,EAAE,2BAoBvC,CAAA;AA+BD;;;;;GAKG;AACH,qBAAa,qBAAsB,YAAW,aAAa;IAOJ,OAAO,CAAC,QAAQ,CAAC,IAAI;IAN1E,QAAQ,CAAC,SAAS,EAAG,KAAK,CAAS;IACnC,QAAQ,CAAC,QAAQ,EAAG,eAAe,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAmB;IACvC,OAAO,CAAC,QAAQ,CAAC,CAA+C;IAChE,OAAO,CAAC,KAAK,CAAC,CAAoB;gBAEtB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAmB,IAAI,8BAA4B;IAMtG,OAAO,CAAC,WAAW;IAQb,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAK/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAKtE,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAM1D,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAK3D,SAAS,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;CAOtC"}

package/dist/lib/test-keychain-fixture.d.ts

@@ -1,8 +1,9 @@
 import type { CredentialChainOptions } from '@hasna/contracts/client';
 export declare const FIXTURE_STATION = "economy-hermetic-fixture";
-export declare function fixtureKeychainArgs(app: 'economy' | 'accounts', kind: 'api-key' | 'api-url'): string[];
-export declare function absentFixtureKeychain(app: 'economy' | 'accounts'): {
+export declare function fixtureKeychainArgs(app: 'economy' | 'accounts' | 'subscriptions', kind: 'api-key' | 'api-url'): string[];
+export declare function absentFixtureKeychain(app: 'economy' | 'accounts' | 'subscriptions'): {
     credentials: CredentialChainOptions;
+    subscriptionsCredentials?: CredentialChainOptions;
 };
 /** Explicit --preload is confined to the test child; installed clients are unchanged. */
 export declare function fixtureBunArgs(home: string): string[];

package/dist/lib/test-keychain-fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-keychain-fixture.d.ts","sourceRoot":"","sources":["../../src/lib/test-keychain-fixture.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAErE,eAAO,MAAM,eAAe,6BAA6B,CAAA;AAEzD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,SAAS,GAAG,UAAU,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,EAAE,CAEtG;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,UAAU,GAAG;IAAE,WAAW,EAAE,sBAAsB,CAAA;CAAE,CAO1G;AAED,yFAAyF;AACzF,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAerD"}
+{"version":3,"file":"test-keychain-fixture.d.ts","sourceRoot":"","sources":["../../src/lib/test-keychain-fixture.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAErE,eAAO,MAAM,eAAe,6BAA6B,CAAA;AAEzD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,SAAS,GAAG,UAAU,GAAG,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,EAAE,CAExH;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,UAAU,GAAG,eAAe,GAAG;IAAE,WAAW,EAAE,sBAAsB,CAAC;IAAC,wBAAwB,CAAC,EAAE,sBAAsB,CAAA;CAAE,CAS/K;AAED,yFAAyF;AACzF,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAerD"}