agent-shim 11.77.0 → 11.78.0

package/dist/cli.cjs

@@ -38198,7 +38198,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.77.0",
+      version: "11.78.0",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -117743,7 +117743,7 @@ function summariseIdentityAccount(account) {
 function loginKeyOf(account) {
   return account.accountUuid === void 0 ? void 0 : JSON.stringify([account.accountUuid, account.organizationUuid ?? null]);
 }
-function groupByLogin(items, loginOf) {
+function collectByLogin(items, loginOf) {
   const groups = /* @__PURE__ */ new Map();
   for (const item of items) {
     const key = loginOf(item) ?? /* @__PURE__ */ Symbol("no login");
@@ -117754,7 +117754,13 @@ function groupByLogin(items, loginOf) {
       group.push(item);
     }
   }
-  return [...groups.values()].flat();
+  return [...groups.values()];
+}
+function groupByLogin(items, loginOf) {
+  return collectByLogin(items, loginOf).flat();
+}
+function groupSharedLogins(items, loginOf) {
+  return collectByLogin(items, loginOf).filter((group) => group.length > 1);
 }
 function describeAccountHolder(summary) {
   const organisation = describeAccountOrganisation(summary);
@@ -123523,6 +123529,10 @@ var DOCTOR_SECTIONS = [
   "frontdoor",
   "models"
 ];
+function joinNames(names) {
+  const last = names.at(-1);
+  return names.length < 2 || last === void 0 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${last}`;
+}
 function refinePathShadow(status, ownExecutablePath, realpath) {
   if (status.status !== "shadowed") {
     return status;
@@ -123770,6 +123780,7 @@ function runDoctor(params) {
   const validProfileNames = new Set(profileSources.keys());
   const validProviderNames = /* @__PURE__ */ new Set([...params.providers.map((entry) => entry.name), ...Object.keys(params.providerAliases ?? {})]);
   const validIdentityNames = /* @__PURE__ */ new Set();
+  const signedInAccounts = [];
   for (const entry of params.identities) {
     const validated2 = validate3(IdentitySchema, entry, "identity", entry.name);
     if (!validated2.ok) {
@@ -123819,6 +123830,18 @@ function runDoctor(params) {
       signIn.state === "signed-out" ? `${entry.name} is signed out (${signIn.detail}). Run \`agent-shim run @${entry.name}\` and sign in.` : `${entry.name} ${standing} (${signIn.detail}).`,
       entry.name
     );
+    if (signIn.state === "signed-in" && entry.account !== void 0) {
+      signedInAccounts.push({ name: entry.name, account: entry.account });
+    }
+  }
+  for (const group of groupSharedLogins(signedInAccounts, (entry) => loginKeyOf(entry.account))) {
+    const names = group.map((entry) => entry.name);
+    const holder = group.map((entry) => summariseIdentityAccount(entry.account)).map((summary) => summary === void 0 ? void 0 : describeAccountHolder(summary)).find((described) => described !== void 0);
+    push(
+      "sign-in",
+      "warn",
+      `Identities ${joinNames(names)} hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window and all but one are redundant. Remove the redundant ones with \`agent-shim identity remove <name>\`.`
+    );
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
@@ -124107,7 +124130,7 @@ function collectDoctorReport(params) {
   const identities = identityNames.map((name) => {
     const farmRoot = import_node_path47.default.join(paths.identitiesDir, name);
     const identityPath = import_node_path47.default.join(farmRoot, "identity.json");
-    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: import_node_fs20.default.existsSync(credentialsFilePath(farmRoot)) };
+    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: import_node_fs20.default.existsSync(credentialsFilePath(farmRoot)), account: readIdentityAccount(realFsPort, paths.identitiesDir, name)?.account };
   });
   const profileNames = import_node_fs20.default.existsSync(paths.configProfilesDir) ? import_node_fs20.default.readdirSync(paths.configProfilesDir, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -".json".length)).sort() : [];
   const configProfiles = profileNames.map((name) => {

package/dist/index.cjs

@@ -4764,7 +4764,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.77.0",
+      version: "11.78.0",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -17084,6 +17084,65 @@ var import_node_fs10 = __toESM(require("node:fs"), 1);
 var import_node_path29 = __toESM(require("node:path"), 1);
 init_signIn();
 
+// src/identityAccounts.ts
+init_account();
+
+// src/usage/accountDescription.ts
+function describeAccountOrganisation(account) {
+  const parts = [account.organizationName, account.organizationType].filter((part) => part !== void 0);
+  return parts.length === 0 ? void 0 : parts.join(", ");
+}
+
+// src/identityAccounts.ts
+function readIdentityAccount(fs14, identitiesDir, identity) {
+  try {
+    const account = readAccountMetadata(fs14, identitiesDir, identity);
+    return account === void 0 ? void 0 : { account };
+  } catch (error) {
+    if (error instanceof AccountMetadataError) {
+      return { problem: error.message };
+    }
+    throw error;
+  }
+}
+function summariseIdentityAccount(account) {
+  const summary = {
+    ...account.emailAddress === void 0 ? {} : { emailAddress: account.emailAddress },
+    ...account.organizationName === void 0 ? {} : { organizationName: account.organizationName },
+    ...account.organizationType === void 0 ? {} : { organizationType: account.organizationType },
+    ...account.organizationRole === void 0 ? {} : { organizationRole: account.organizationRole },
+    ...account.billingType === void 0 ? {} : { billingType: account.billingType },
+    ...account.seatTier === void 0 ? {} : { seatTier: account.seatTier }
+  };
+  return Object.keys(summary).length === 0 ? void 0 : summary;
+}
+function loginKeyOf(account) {
+  return account.accountUuid === void 0 ? void 0 : JSON.stringify([account.accountUuid, account.organizationUuid ?? null]);
+}
+function collectByLogin(items, loginOf) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const key = loginOf(item) ?? /* @__PURE__ */ Symbol("no login");
+    const group = groups.get(key);
+    if (group === void 0) {
+      groups.set(key, [item]);
+    } else {
+      group.push(item);
+    }
+  }
+  return [...groups.values()];
+}
+function groupSharedLogins(items, loginOf) {
+  return collectByLogin(items, loginOf).filter((group) => group.length > 1);
+}
+function describeAccountHolder(summary) {
+  const organisation = describeAccountOrganisation(summary);
+  if (summary.emailAddress === void 0) {
+    return organisation;
+  }
+  return organisation === void 0 ? summary.emailAddress : `${summary.emailAddress} (${organisation})`;
+}
+
 // src/codex/siwcStore.ts
 var import_zod26 = require("zod");
 
@@ -17458,6 +17517,10 @@ var DOCTOR_SECTIONS = [
   "frontdoor",
   "models"
 ];
+function joinNames(names) {
+  const last = names.at(-1);
+  return names.length < 2 || last === void 0 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${last}`;
+}
 function refinePathShadow(status, ownExecutablePath, realpath) {
   if (status.status !== "shadowed") {
     return status;
@@ -17705,6 +17768,7 @@ function runDoctor(params) {
   const validProfileNames = new Set(profileSources.keys());
   const validProviderNames = /* @__PURE__ */ new Set([...params.providers.map((entry) => entry.name), ...Object.keys(params.providerAliases ?? {})]);
   const validIdentityNames = /* @__PURE__ */ new Set();
+  const signedInAccounts = [];
   for (const entry of params.identities) {
     const validated3 = validate(IdentitySchema, entry, "identity", entry.name);
     if (!validated3.ok) {
@@ -17754,6 +17818,18 @@ function runDoctor(params) {
       signIn.state === "signed-out" ? `${entry.name} is signed out (${signIn.detail}). Run \`agent-shim run @${entry.name}\` and sign in.` : `${entry.name} ${standing} (${signIn.detail}).`,
       entry.name
     );
+    if (signIn.state === "signed-in" && entry.account !== void 0) {
+      signedInAccounts.push({ name: entry.name, account: entry.account });
+    }
+  }
+  for (const group of groupSharedLogins(signedInAccounts, (entry) => loginKeyOf(entry.account))) {
+    const names = group.map((entry) => entry.name);
+    const holder = group.map((entry) => summariseIdentityAccount(entry.account)).map((summary) => summary === void 0 ? void 0 : describeAccountHolder(summary)).find((described) => described !== void 0);
+    push(
+      "sign-in",
+      "warn",
+      `Identities ${joinNames(names)} hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window and all but one are redundant. Remove the redundant ones with \`agent-shim identity remove <name>\`.`
+    );
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
@@ -18042,7 +18118,7 @@ function collectDoctorReport(params) {
   const identities = identityNames.map((name) => {
     const farmRoot = import_node_path29.default.join(paths.identitiesDir, name);
     const identityPath = import_node_path29.default.join(farmRoot, "identity.json");
-    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: import_node_fs10.default.existsSync(credentialsFilePath(farmRoot)) };
+    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: import_node_fs10.default.existsSync(credentialsFilePath(farmRoot)), account: readIdentityAccount(realFsPort, paths.identitiesDir, name)?.account };
   });
   const profileNames = import_node_fs10.default.existsSync(paths.configProfilesDir) ? import_node_fs10.default.readdirSync(paths.configProfilesDir, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -".json".length)).sort() : [];
   const configProfiles = profileNames.map((name) => {

package/dist/index.mjs

@@ -4740,7 +4740,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.77.0",
+      version: "11.78.0",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -16669,6 +16669,65 @@ import fs11 from "node:fs";
 import path29 from "node:path";
 init_signIn();
 
+// src/identityAccounts.ts
+init_account();
+
+// src/usage/accountDescription.ts
+function describeAccountOrganisation(account) {
+  const parts = [account.organizationName, account.organizationType].filter((part) => part !== void 0);
+  return parts.length === 0 ? void 0 : parts.join(", ");
+}
+
+// src/identityAccounts.ts
+function readIdentityAccount(fs14, identitiesDir, identity) {
+  try {
+    const account = readAccountMetadata(fs14, identitiesDir, identity);
+    return account === void 0 ? void 0 : { account };
+  } catch (error) {
+    if (error instanceof AccountMetadataError) {
+      return { problem: error.message };
+    }
+    throw error;
+  }
+}
+function summariseIdentityAccount(account) {
+  const summary = {
+    ...account.emailAddress === void 0 ? {} : { emailAddress: account.emailAddress },
+    ...account.organizationName === void 0 ? {} : { organizationName: account.organizationName },
+    ...account.organizationType === void 0 ? {} : { organizationType: account.organizationType },
+    ...account.organizationRole === void 0 ? {} : { organizationRole: account.organizationRole },
+    ...account.billingType === void 0 ? {} : { billingType: account.billingType },
+    ...account.seatTier === void 0 ? {} : { seatTier: account.seatTier }
+  };
+  return Object.keys(summary).length === 0 ? void 0 : summary;
+}
+function loginKeyOf(account) {
+  return account.accountUuid === void 0 ? void 0 : JSON.stringify([account.accountUuid, account.organizationUuid ?? null]);
+}
+function collectByLogin(items, loginOf) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const key = loginOf(item) ?? /* @__PURE__ */ Symbol("no login");
+    const group = groups.get(key);
+    if (group === void 0) {
+      groups.set(key, [item]);
+    } else {
+      group.push(item);
+    }
+  }
+  return [...groups.values()];
+}
+function groupSharedLogins(items, loginOf) {
+  return collectByLogin(items, loginOf).filter((group) => group.length > 1);
+}
+function describeAccountHolder(summary) {
+  const organisation = describeAccountOrganisation(summary);
+  if (summary.emailAddress === void 0) {
+    return organisation;
+  }
+  return organisation === void 0 ? summary.emailAddress : `${summary.emailAddress} (${organisation})`;
+}
+
 // src/codex/siwcStore.ts
 import { z as z26 } from "zod";
 
@@ -17043,6 +17102,10 @@ var DOCTOR_SECTIONS = [
   "frontdoor",
   "models"
 ];
+function joinNames(names) {
+  const last = names.at(-1);
+  return names.length < 2 || last === void 0 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${last}`;
+}
 function refinePathShadow(status, ownExecutablePath, realpath) {
   if (status.status !== "shadowed") {
     return status;
@@ -17290,6 +17353,7 @@ function runDoctor(params) {
   const validProfileNames = new Set(profileSources.keys());
   const validProviderNames = /* @__PURE__ */ new Set([...params.providers.map((entry) => entry.name), ...Object.keys(params.providerAliases ?? {})]);
   const validIdentityNames = /* @__PURE__ */ new Set();
+  const signedInAccounts = [];
   for (const entry of params.identities) {
     const validated3 = validate(IdentitySchema, entry, "identity", entry.name);
     if (!validated3.ok) {
@@ -17339,6 +17403,18 @@ function runDoctor(params) {
       signIn.state === "signed-out" ? `${entry.name} is signed out (${signIn.detail}). Run \`agent-shim run @${entry.name}\` and sign in.` : `${entry.name} ${standing} (${signIn.detail}).`,
       entry.name
     );
+    if (signIn.state === "signed-in" && entry.account !== void 0) {
+      signedInAccounts.push({ name: entry.name, account: entry.account });
+    }
+  }
+  for (const group of groupSharedLogins(signedInAccounts, (entry) => loginKeyOf(entry.account))) {
+    const names = group.map((entry) => entry.name);
+    const holder = group.map((entry) => summariseIdentityAccount(entry.account)).map((summary) => summary === void 0 ? void 0 : describeAccountHolder(summary)).find((described) => described !== void 0);
+    push(
+      "sign-in",
+      "warn",
+      `Identities ${joinNames(names)} hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window and all but one are redundant. Remove the redundant ones with \`agent-shim identity remove <name>\`.`
+    );
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
@@ -17627,7 +17703,7 @@ function collectDoctorReport(params) {
   const identities = identityNames.map((name) => {
     const farmRoot = path29.join(paths.identitiesDir, name);
     const identityPath = path29.join(farmRoot, "identity.json");
-    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: fs11.existsSync(credentialsFilePath(farmRoot)) };
+    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: fs11.existsSync(credentialsFilePath(farmRoot)), account: readIdentityAccount(realFsPort, paths.identitiesDir, name)?.account };
   });
   const profileNames = fs11.existsSync(paths.configProfilesDir) ? fs11.readdirSync(paths.configProfilesDir, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -".json".length)).sort() : [];
   const configProfiles = profileNames.map((name) => {

package/dist/types/index.d.ts

@@ -8876,6 +8876,180 @@ type PathShadowStatus = {
     readonly by: string;
 };
 
+/** One routed request, appended to the usage log when its response has finished. */
+declare const UsageRecordSchema: z.ZodObject<{
+    schemaVersion: z.ZodLiteral<1>;
+    at: z.ZodISODateTime;
+    identity: z.ZodOptional<z.ZodString>;
+    provider: z.ZodString;
+    sessionId: z.ZodOptional<z.ZodString>;
+    clientSessionId: z.ZodOptional<z.ZodString>;
+    project: z.ZodOptional<z.ZodString>;
+    viaHeadroom: z.ZodOptional<z.ZodBoolean>;
+    route: z.ZodString;
+    method: z.ZodString;
+    endpoint: z.ZodString;
+    model: z.ZodOptional<z.ZodString>;
+    requestedModel: z.ZodOptional<z.ZodString>;
+    candidateProviders: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    status: z.ZodNumber;
+    latencyMs: z.ZodNumber;
+    durationMs: z.ZodNumber;
+    outcome: z.ZodEnum<{
+        completed: "completed";
+        aborted: "aborted";
+    }>;
+    usage: z.ZodOptional<z.ZodObject<{
+        inputTokens: z.ZodOptional<z.ZodNumber>;
+        outputTokens: z.ZodOptional<z.ZodNumber>;
+        cacheCreationInputTokens: z.ZodOptional<z.ZodNumber>;
+        cacheReadInputTokens: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strict>>;
+    rateLimitHeaders: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    limit: z.ZodOptional<z.ZodObject<{
+        kind: z.ZodEnum<{
+            "rate-limited": "rate-limited";
+            "quota-exhausted": "quota-exhausted";
+        }>;
+        retryAfterSeconds: z.ZodOptional<z.ZodNumber>;
+        resetAt: z.ZodOptional<z.ZodISODateTime>;
+        window: z.ZodOptional<z.ZodString>;
+        evidence: z.ZodArray<z.ZodString>;
+    }, z.core.$strict>>;
+    requestId: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
+type UsageRecord = z.infer<typeof UsageRecordSchema>;
+/** One quota window from Anthropic's unified rate-limit headers. */
+declare const QuotaWindowSchema: z.ZodObject<{
+    utilization: z.ZodOptional<z.ZodNumber>;
+    resetsAt: z.ZodOptional<z.ZodISODateTime>;
+    status: z.ZodOptional<z.ZodString>;
+    graceUtilization: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strict>;
+type QuotaWindow = z.infer<typeof QuotaWindowSchema>;
+/**
+ * The account fields copied from an identity's stored Claude login (`oauthAccount` in the identity's `.claude.json`): who the account is and which plan and tier it is on. Never the token, which Claude Code keeps elsewhere. Each field is present only when the stored login has it; a setup-token identity has no profile scope and so none of them (see issue #44).
+ */
+declare const AccountMetadataSchema: z.ZodObject<{
+    accountUuid: z.ZodOptional<z.ZodString>;
+    emailAddress: z.ZodOptional<z.ZodString>;
+    displayName: z.ZodOptional<z.ZodString>;
+    organizationUuid: z.ZodOptional<z.ZodString>;
+    organizationName: z.ZodOptional<z.ZodString>;
+    organizationType: z.ZodOptional<z.ZodString>;
+    organizationRole: z.ZodOptional<z.ZodString>;
+    workspaceRole: z.ZodOptional<z.ZodString>;
+    billingType: z.ZodOptional<z.ZodString>;
+    seatTier: z.ZodOptional<z.ZodString>;
+    organizationRateLimitTier: z.ZodOptional<z.ZodString>;
+    userRateLimitTier: z.ZodOptional<z.ZodString>;
+    hasExtraUsageEnabled: z.ZodOptional<z.ZodBoolean>;
+    subscriptionCreatedAt: z.ZodOptional<z.ZodString>;
+    accountCreatedAt: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
+type AccountMetadata = z.infer<typeof AccountMetadataSchema>;
+/**
+ * The latest state for one identity, rewritten atomically after each recorded response: the snapshot file other tools read (`~/.agent-shim/usage/snapshots/<identity>.json`) without shelling out to `agent-shim`.
+ */
+declare const UsageSnapshotSchema: z.ZodObject<{
+    schemaVersion: z.ZodLiteral<1>;
+    identity: z.ZodString;
+    updatedAt: z.ZodISODateTime;
+    account: z.ZodOptional<z.ZodObject<{
+        accountUuid: z.ZodOptional<z.ZodString>;
+        emailAddress: z.ZodOptional<z.ZodString>;
+        displayName: z.ZodOptional<z.ZodString>;
+        organizationUuid: z.ZodOptional<z.ZodString>;
+        organizationName: z.ZodOptional<z.ZodString>;
+        organizationType: z.ZodOptional<z.ZodString>;
+        organizationRole: z.ZodOptional<z.ZodString>;
+        workspaceRole: z.ZodOptional<z.ZodString>;
+        billingType: z.ZodOptional<z.ZodString>;
+        seatTier: z.ZodOptional<z.ZodString>;
+        organizationRateLimitTier: z.ZodOptional<z.ZodString>;
+        userRateLimitTier: z.ZodOptional<z.ZodString>;
+        hasExtraUsageEnabled: z.ZodOptional<z.ZodBoolean>;
+        subscriptionCreatedAt: z.ZodOptional<z.ZodString>;
+        accountCreatedAt: z.ZodOptional<z.ZodString>;
+    }, z.core.$strict>>;
+    providers: z.ZodRecord<z.ZodString, z.ZodObject<{
+        lastRequestAt: z.ZodOptional<z.ZodISODateTime>;
+        lastStatus: z.ZodOptional<z.ZodNumber>;
+        lastModel: z.ZodOptional<z.ZodString>;
+        rateLimit: z.ZodOptional<z.ZodObject<{
+            observedAt: z.ZodISODateTime;
+            headers: z.ZodRecord<z.ZodString, z.ZodString>;
+            unified: z.ZodOptional<z.ZodObject<{
+                status: z.ZodOptional<z.ZodString>;
+                fiveHour: z.ZodOptional<z.ZodObject<{
+                    utilization: z.ZodOptional<z.ZodNumber>;
+                    resetsAt: z.ZodOptional<z.ZodISODateTime>;
+                    status: z.ZodOptional<z.ZodString>;
+                    graceUtilization: z.ZodOptional<z.ZodNumber>;
+                }, z.core.$strict>>;
+                sevenDay: z.ZodOptional<z.ZodObject<{
+                    utilization: z.ZodOptional<z.ZodNumber>;
+                    resetsAt: z.ZodOptional<z.ZodISODateTime>;
+                    status: z.ZodOptional<z.ZodString>;
+                    graceUtilization: z.ZodOptional<z.ZodNumber>;
+                }, z.core.$strict>>;
+                sevenDayOverageIncluded: z.ZodOptional<z.ZodObject<{
+                    utilization: z.ZodOptional<z.ZodNumber>;
+                    resetsAt: z.ZodOptional<z.ZodISODateTime>;
+                    status: z.ZodOptional<z.ZodString>;
+                    graceUtilization: z.ZodOptional<z.ZodNumber>;
+                }, z.core.$strict>>;
+                representativeClaim: z.ZodOptional<z.ZodString>;
+                resetAt: z.ZodOptional<z.ZodISODateTime>;
+                overageStatus: z.ZodOptional<z.ZodString>;
+                overageUtilization: z.ZodOptional<z.ZodNumber>;
+                overageResetsAt: z.ZodOptional<z.ZodISODateTime>;
+                overageDisabledReason: z.ZodOptional<z.ZodString>;
+                overageInUse: z.ZodOptional<z.ZodBoolean>;
+                extraUsageSpend: z.ZodOptional<z.ZodObject<{
+                    usedMinor: z.ZodNumber;
+                    limitMinor: z.ZodOptional<z.ZodNumber>;
+                    currency: z.ZodString;
+                }, z.core.$strict>>;
+                fallbackAvailable: z.ZodOptional<z.ZodBoolean>;
+            }, z.core.$strict>>;
+            planWindowsUnavailableAt: z.ZodOptional<z.ZodISODateTime>;
+        }, z.core.$strict>>;
+        lastLimit: z.ZodOptional<z.ZodObject<{
+            kind: z.ZodEnum<{
+                "rate-limited": "rate-limited";
+                "quota-exhausted": "quota-exhausted";
+            }>;
+            retryAfterSeconds: z.ZodOptional<z.ZodNumber>;
+            resetAt: z.ZodOptional<z.ZodISODateTime>;
+            window: z.ZodOptional<z.ZodString>;
+            evidence: z.ZodArray<z.ZodString>;
+            observedAt: z.ZodISODateTime;
+            status: z.ZodNumber;
+        }, z.core.$strict>>;
+        quota: z.ZodOptional<z.ZodObject<{
+            observedAt: z.ZodISODateTime;
+            source: z.ZodString;
+            level: z.ZodOptional<z.ZodString>;
+            account: z.ZodOptional<z.ZodObject<{
+                email: z.ZodOptional<z.ZodString>;
+                accountId: z.ZodOptional<z.ZodString>;
+            }, z.core.$strict>>;
+            windows: z.ZodArray<z.ZodObject<{
+                measures: z.ZodString;
+                periodMs: z.ZodOptional<z.ZodNumber>;
+                period: z.ZodOptional<z.ZodString>;
+                utilization: z.ZodNumber;
+                resetsAt: z.ZodOptional<z.ZodISODateTime>;
+                limit: z.ZodOptional<z.ZodNumber>;
+                used: z.ZodOptional<z.ZodNumber>;
+                remaining: z.ZodOptional<z.ZodNumber>;
+            }, z.core.$strict>>;
+        }, z.core.$strict>>;
+    }, z.core.$strict>>;
+}, z.core.$strict>;
+type UsageSnapshot = z.infer<typeof UsageSnapshotSchema>;
+
 /**
  * How the allowlist the headroom daemon serves lags the allowlist computed now. The daemon re-reads its allowlist file on every request that follows a change to it, and its supervisor rewrites the file and records the hash in the same tick, so a lag that lasts beyond one tick means the supervisor is not running or cannot write the file. A daemon started by an earlier release reads no file, and is reported as such instead.
  */
@@ -9085,6 +9259,8 @@ interface DoctorIdentityInput {
     readonly farmRoot: string;
     /** Whether the identity's `.credentials.json` exists, pre-resolved by the wiring layer since it is a file-existence check. */
     readonly credentialsFilePresent: boolean;
+    /** The account metadata of the identity's stored login, pre-resolved by the wiring layer since it is a read of the identity's `.claude.json`. Undefined when the identity has no stored login or its metadata cannot be read. */
+    readonly account: AccountMetadata | undefined;
 }
 /** One configuration profile's raw `<name>.json`, unparsed. */
 interface DoctorConfigProfileInput {
@@ -9192,180 +9368,6 @@ interface CollectDoctorReportParams {
  */
 declare function collectDoctorReport(params: CollectDoctorReportParams): DoctorReport;
 
-/** One routed request, appended to the usage log when its response has finished. */
-declare const UsageRecordSchema: z.ZodObject<{
-    schemaVersion: z.ZodLiteral<1>;
-    at: z.ZodISODateTime;
-    identity: z.ZodOptional<z.ZodString>;
-    provider: z.ZodString;
-    sessionId: z.ZodOptional<z.ZodString>;
-    clientSessionId: z.ZodOptional<z.ZodString>;
-    project: z.ZodOptional<z.ZodString>;
-    viaHeadroom: z.ZodOptional<z.ZodBoolean>;
-    route: z.ZodString;
-    method: z.ZodString;
-    endpoint: z.ZodString;
-    model: z.ZodOptional<z.ZodString>;
-    requestedModel: z.ZodOptional<z.ZodString>;
-    candidateProviders: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    status: z.ZodNumber;
-    latencyMs: z.ZodNumber;
-    durationMs: z.ZodNumber;
-    outcome: z.ZodEnum<{
-        completed: "completed";
-        aborted: "aborted";
-    }>;
-    usage: z.ZodOptional<z.ZodObject<{
-        inputTokens: z.ZodOptional<z.ZodNumber>;
-        outputTokens: z.ZodOptional<z.ZodNumber>;
-        cacheCreationInputTokens: z.ZodOptional<z.ZodNumber>;
-        cacheReadInputTokens: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strict>>;
-    rateLimitHeaders: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-    limit: z.ZodOptional<z.ZodObject<{
-        kind: z.ZodEnum<{
-            "rate-limited": "rate-limited";
-            "quota-exhausted": "quota-exhausted";
-        }>;
-        retryAfterSeconds: z.ZodOptional<z.ZodNumber>;
-        resetAt: z.ZodOptional<z.ZodISODateTime>;
-        window: z.ZodOptional<z.ZodString>;
-        evidence: z.ZodArray<z.ZodString>;
-    }, z.core.$strict>>;
-    requestId: z.ZodOptional<z.ZodString>;
-}, z.core.$strict>;
-type UsageRecord = z.infer<typeof UsageRecordSchema>;
-/** One quota window from Anthropic's unified rate-limit headers. */
-declare const QuotaWindowSchema: z.ZodObject<{
-    utilization: z.ZodOptional<z.ZodNumber>;
-    resetsAt: z.ZodOptional<z.ZodISODateTime>;
-    status: z.ZodOptional<z.ZodString>;
-    graceUtilization: z.ZodOptional<z.ZodNumber>;
-}, z.core.$strict>;
-type QuotaWindow = z.infer<typeof QuotaWindowSchema>;
-/**
- * The account fields copied from an identity's stored Claude login (`oauthAccount` in the identity's `.claude.json`): who the account is and which plan and tier it is on. Never the token, which Claude Code keeps elsewhere. Each field is present only when the stored login has it; a setup-token identity has no profile scope and so none of them (see issue #44).
- */
-declare const AccountMetadataSchema: z.ZodObject<{
-    accountUuid: z.ZodOptional<z.ZodString>;
-    emailAddress: z.ZodOptional<z.ZodString>;
-    displayName: z.ZodOptional<z.ZodString>;
-    organizationUuid: z.ZodOptional<z.ZodString>;
-    organizationName: z.ZodOptional<z.ZodString>;
-    organizationType: z.ZodOptional<z.ZodString>;
-    organizationRole: z.ZodOptional<z.ZodString>;
-    workspaceRole: z.ZodOptional<z.ZodString>;
-    billingType: z.ZodOptional<z.ZodString>;
-    seatTier: z.ZodOptional<z.ZodString>;
-    organizationRateLimitTier: z.ZodOptional<z.ZodString>;
-    userRateLimitTier: z.ZodOptional<z.ZodString>;
-    hasExtraUsageEnabled: z.ZodOptional<z.ZodBoolean>;
-    subscriptionCreatedAt: z.ZodOptional<z.ZodString>;
-    accountCreatedAt: z.ZodOptional<z.ZodString>;
-}, z.core.$strict>;
-type AccountMetadata = z.infer<typeof AccountMetadataSchema>;
-/**
- * The latest state for one identity, rewritten atomically after each recorded response: the snapshot file other tools read (`~/.agent-shim/usage/snapshots/<identity>.json`) without shelling out to `agent-shim`.
- */
-declare const UsageSnapshotSchema: z.ZodObject<{
-    schemaVersion: z.ZodLiteral<1>;
-    identity: z.ZodString;
-    updatedAt: z.ZodISODateTime;
-    account: z.ZodOptional<z.ZodObject<{
-        accountUuid: z.ZodOptional<z.ZodString>;
-        emailAddress: z.ZodOptional<z.ZodString>;
-        displayName: z.ZodOptional<z.ZodString>;
-        organizationUuid: z.ZodOptional<z.ZodString>;
-        organizationName: z.ZodOptional<z.ZodString>;
-        organizationType: z.ZodOptional<z.ZodString>;
-        organizationRole: z.ZodOptional<z.ZodString>;
-        workspaceRole: z.ZodOptional<z.ZodString>;
-        billingType: z.ZodOptional<z.ZodString>;
-        seatTier: z.ZodOptional<z.ZodString>;
-        organizationRateLimitTier: z.ZodOptional<z.ZodString>;
-        userRateLimitTier: z.ZodOptional<z.ZodString>;
-        hasExtraUsageEnabled: z.ZodOptional<z.ZodBoolean>;
-        subscriptionCreatedAt: z.ZodOptional<z.ZodString>;
-        accountCreatedAt: z.ZodOptional<z.ZodString>;
-    }, z.core.$strict>>;
-    providers: z.ZodRecord<z.ZodString, z.ZodObject<{
-        lastRequestAt: z.ZodOptional<z.ZodISODateTime>;
-        lastStatus: z.ZodOptional<z.ZodNumber>;
-        lastModel: z.ZodOptional<z.ZodString>;
-        rateLimit: z.ZodOptional<z.ZodObject<{
-            observedAt: z.ZodISODateTime;
-            headers: z.ZodRecord<z.ZodString, z.ZodString>;
-            unified: z.ZodOptional<z.ZodObject<{
-                status: z.ZodOptional<z.ZodString>;
-                fiveHour: z.ZodOptional<z.ZodObject<{
-                    utilization: z.ZodOptional<z.ZodNumber>;
-                    resetsAt: z.ZodOptional<z.ZodISODateTime>;
-                    status: z.ZodOptional<z.ZodString>;
-                    graceUtilization: z.ZodOptional<z.ZodNumber>;
-                }, z.core.$strict>>;
-                sevenDay: z.ZodOptional<z.ZodObject<{
-                    utilization: z.ZodOptional<z.ZodNumber>;
-                    resetsAt: z.ZodOptional<z.ZodISODateTime>;
-                    status: z.ZodOptional<z.ZodString>;
-                    graceUtilization: z.ZodOptional<z.ZodNumber>;
-                }, z.core.$strict>>;
-                sevenDayOverageIncluded: z.ZodOptional<z.ZodObject<{
-                    utilization: z.ZodOptional<z.ZodNumber>;
-                    resetsAt: z.ZodOptional<z.ZodISODateTime>;
-                    status: z.ZodOptional<z.ZodString>;
-                    graceUtilization: z.ZodOptional<z.ZodNumber>;
-                }, z.core.$strict>>;
-                representativeClaim: z.ZodOptional<z.ZodString>;
-                resetAt: z.ZodOptional<z.ZodISODateTime>;
-                overageStatus: z.ZodOptional<z.ZodString>;
-                overageUtilization: z.ZodOptional<z.ZodNumber>;
-                overageResetsAt: z.ZodOptional<z.ZodISODateTime>;
-                overageDisabledReason: z.ZodOptional<z.ZodString>;
-                overageInUse: z.ZodOptional<z.ZodBoolean>;
-                extraUsageSpend: z.ZodOptional<z.ZodObject<{
-                    usedMinor: z.ZodNumber;
-                    limitMinor: z.ZodOptional<z.ZodNumber>;
-                    currency: z.ZodString;
-                }, z.core.$strict>>;
-                fallbackAvailable: z.ZodOptional<z.ZodBoolean>;
-            }, z.core.$strict>>;
-            planWindowsUnavailableAt: z.ZodOptional<z.ZodISODateTime>;
-        }, z.core.$strict>>;
-        lastLimit: z.ZodOptional<z.ZodObject<{
-            kind: z.ZodEnum<{
-                "rate-limited": "rate-limited";
-                "quota-exhausted": "quota-exhausted";
-            }>;
-            retryAfterSeconds: z.ZodOptional<z.ZodNumber>;
-            resetAt: z.ZodOptional<z.ZodISODateTime>;
-            window: z.ZodOptional<z.ZodString>;
-            evidence: z.ZodArray<z.ZodString>;
-            observedAt: z.ZodISODateTime;
-            status: z.ZodNumber;
-        }, z.core.$strict>>;
-        quota: z.ZodOptional<z.ZodObject<{
-            observedAt: z.ZodISODateTime;
-            source: z.ZodString;
-            level: z.ZodOptional<z.ZodString>;
-            account: z.ZodOptional<z.ZodObject<{
-                email: z.ZodOptional<z.ZodString>;
-                accountId: z.ZodOptional<z.ZodString>;
-            }, z.core.$strict>>;
-            windows: z.ZodArray<z.ZodObject<{
-                measures: z.ZodString;
-                periodMs: z.ZodOptional<z.ZodNumber>;
-                period: z.ZodOptional<z.ZodString>;
-                utilization: z.ZodNumber;
-                resetsAt: z.ZodOptional<z.ZodISODateTime>;
-                limit: z.ZodOptional<z.ZodNumber>;
-                used: z.ZodOptional<z.ZodNumber>;
-                remaining: z.ZodOptional<z.ZodNumber>;
-            }, z.core.$strict>>;
-        }, z.core.$strict>>;
-    }, z.core.$strict>>;
-}, z.core.$strict>;
-type UsageSnapshot = z.infer<typeof UsageSnapshotSchema>;
-
 /** How a sign-out went: whether OpenAI was told, so the person knows the grant is dead on its side too. */
 interface SiwcLogoutResult {
     readonly hadGrant: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "11.77.0",
+  "version": "11.78.0",
   "description": "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   "license": "MIT",
   "author": "Joseph Mearman <joseph@mearman.co.uk>",