agent-shim 11.74.0 → 11.75.0

package/dist/cli.cjs

@@ -37381,13 +37381,97 @@ var init_proxyBypass2 = __esm({
   }
 });
 
+// src/usage/account.ts
+function isObject2(value2) {
+  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+}
+function isIdentityName(name) {
+  return IdentitySchema.shape.name.safeParse(name).success;
+}
+function claudeJsonPath(identitiesDir, identity) {
+  return import_node_path24.default.join(identitiesDir, identity, CLAUDE_JSON);
+}
+function readAccountMetadata(fs31, identitiesDir, identity) {
+  if (!isIdentityName(identity)) {
+    throw new Error(`"${identity}" is not a valid identity name.`);
+  }
+  return readAccountMetadataFile(fs31, claudeJsonPath(identitiesDir, identity));
+}
+function readAccountMetadataFile(fs31, file2) {
+  const raw = fs31.readFileUtf8(file2);
+  if (raw === void 0) {
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw new AccountMetadataError(file2, "not valid JSON");
+  }
+  if (!isObject2(parsed)) {
+    throw new AccountMetadataError(file2, "not a JSON object");
+  }
+  const oauthAccount = parsed.oauthAccount;
+  if (!isObject2(oauthAccount)) {
+    return void 0;
+  }
+  const picked = {};
+  for (const key of Object.keys(AccountMetadataSchema.shape)) {
+    const value2 = oauthAccount[key];
+    if (value2 !== null && value2 !== void 0) {
+      picked[key] = value2;
+    }
+  }
+  const account = AccountMetadataSchema.safeParse(picked);
+  if (!account.success) {
+    throw new AccountMetadataError(file2, account.error.issues.map((issue2) => `${issue2.path.join(".")}: ${issue2.message}`).join("; "));
+  }
+  return account.data;
+}
+function createAccountReader(fs31, identitiesDir) {
+  const cache = /* @__PURE__ */ new Map();
+  return (identity) => {
+    if (!isIdentityName(identity)) {
+      throw new Error(`"${identity}" is not a valid identity name.`);
+    }
+    const stat = fs31.lstat(claudeJsonPath(identitiesDir, identity));
+    const stamp = stat === void 0 ? "absent" : `${String(stat.mtimeMs)}:${String(stat.sizeBytes)}`;
+    const cached2 = cache.get(identity);
+    if (cached2?.stamp === stamp) {
+      return cached2.account;
+    }
+    const account = readAccountMetadata(fs31, identitiesDir, identity);
+    cache.set(identity, { stamp, account });
+    return account;
+  };
+}
+var import_node_path24, CLAUDE_JSON, AccountMetadataError;
+var init_account = __esm({
+  "src/usage/account.ts"() {
+    "use strict";
+    import_node_path24 = __toESM(require("node:path"), 1);
+    init_cliError();
+    init_schema();
+    init_schema2();
+    CLAUDE_JSON = ".claude.json";
+    AccountMetadataError = class extends CliError {
+      constructor(file2, detail) {
+        super(`${file2}: ${detail}, so its account metadata cannot be read.`);
+        this.file = file2;
+        this.name = "AccountMetadataError";
+      }
+      file;
+    };
+  }
+});
+
 // package.json
 var package_default;
 var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.74.0",
+      version: "11.75.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>",
@@ -37493,90 +37577,6 @@ var init_package = __esm({
   }
 });
 
-// src/usage/account.ts
-function isObject2(value2) {
-  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
-}
-function isIdentityName(name) {
-  return IdentitySchema.shape.name.safeParse(name).success;
-}
-function claudeJsonPath(identitiesDir, identity) {
-  return import_node_path25.default.join(identitiesDir, identity, CLAUDE_JSON);
-}
-function readAccountMetadata(fs31, identitiesDir, identity) {
-  if (!isIdentityName(identity)) {
-    throw new Error(`"${identity}" is not a valid identity name.`);
-  }
-  return readAccountMetadataFile(fs31, claudeJsonPath(identitiesDir, identity));
-}
-function readAccountMetadataFile(fs31, file2) {
-  const raw = fs31.readFileUtf8(file2);
-  if (raw === void 0) {
-    return void 0;
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    throw new AccountMetadataError(file2, "not valid JSON");
-  }
-  if (!isObject2(parsed)) {
-    throw new AccountMetadataError(file2, "not a JSON object");
-  }
-  const oauthAccount = parsed.oauthAccount;
-  if (!isObject2(oauthAccount)) {
-    return void 0;
-  }
-  const picked = {};
-  for (const key of Object.keys(AccountMetadataSchema.shape)) {
-    const value2 = oauthAccount[key];
-    if (value2 !== null && value2 !== void 0) {
-      picked[key] = value2;
-    }
-  }
-  const account = AccountMetadataSchema.safeParse(picked);
-  if (!account.success) {
-    throw new AccountMetadataError(file2, account.error.issues.map((issue2) => `${issue2.path.join(".")}: ${issue2.message}`).join("; "));
-  }
-  return account.data;
-}
-function createAccountReader(fs31, identitiesDir) {
-  const cache = /* @__PURE__ */ new Map();
-  return (identity) => {
-    if (!isIdentityName(identity)) {
-      throw new Error(`"${identity}" is not a valid identity name.`);
-    }
-    const stat = fs31.lstat(claudeJsonPath(identitiesDir, identity));
-    const stamp = stat === void 0 ? "absent" : `${String(stat.mtimeMs)}:${String(stat.sizeBytes)}`;
-    const cached2 = cache.get(identity);
-    if (cached2?.stamp === stamp) {
-      return cached2.account;
-    }
-    const account = readAccountMetadata(fs31, identitiesDir, identity);
-    cache.set(identity, { stamp, account });
-    return account;
-  };
-}
-var import_node_path25, CLAUDE_JSON, AccountMetadataError;
-var init_account = __esm({
-  "src/usage/account.ts"() {
-    "use strict";
-    import_node_path25 = __toESM(require("node:path"), 1);
-    init_cliError();
-    init_schema();
-    init_schema2();
-    CLAUDE_JSON = ".claude.json";
-    AccountMetadataError = class extends CliError {
-      constructor(file2, detail) {
-        super(`${file2}: ${detail}, so its account metadata cannot be read.`);
-        this.file = file2;
-        this.name = "AccountMetadataError";
-      }
-      file;
-    };
-  }
-});
-
 // src/usage/plan.ts
 function planOf(account) {
   const userTier = account?.userRateLimitTier;
@@ -117056,7 +117056,7 @@ function resolveLaunchIdentity(paths, cwd) {
 }
 
 // src/identityManager.ts
-var import_node_path24 = __toESM(require("node:path"), 1);
+var import_node_path25 = __toESM(require("node:path"), 1);
 init_commandDeps();
 
 // src/cli/credentialOption.ts
@@ -117526,6 +117526,71 @@ function registerProfileCommand(program2, deps) {
 // src/identityManager.ts
 init_identity();
 init_realPorts();
+
+// 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(", ");
+}
+function describeAccountPlan(account) {
+  const parts = [account.billingType === void 0 ? void 0 : `billing ${account.billingType}`, account.seatTier === void 0 ? void 0 : `seat tier ${account.seatTier}`].filter((part) => part !== void 0);
+  return parts.length === 0 ? void 0 : parts.join(", ");
+}
+
+// src/identityAccounts.ts
+function readIdentityAccount(fs31, identitiesDir, identity) {
+  try {
+    const account = readAccountMetadata(fs31, identitiesDir, identity);
+    return account === void 0 ? void 0 : { account };
+  } catch (error63) {
+    if (error63 instanceof AccountMetadataError) {
+      return { problem: error63.message };
+    }
+    throw error63;
+  }
+}
+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 groupByLogin(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()].flat();
+}
+function describeAccountHolder(summary) {
+  const organisation = describeAccountOrganisation(summary);
+  if (summary.emailAddress === void 0) {
+    return organisation;
+  }
+  return organisation === void 0 ? summary.emailAddress : `${summary.emailAddress} (${organisation})`;
+}
+function describeIdentityAccount(summary) {
+  return [describeAccountHolder(summary), summary.organizationRole === void 0 ? void 0 : `role ${summary.organizationRole}`, describeAccountPlan(summary)].filter((part) => part !== void 0).join("; ");
+}
+
+// src/identityManager.ts
 async function runIdentityWizard(prompts, paths, name, options = {}) {
   if (!IdentitySchema.safeParse({ name, allowAmbientCredential: false }).success) {
     throw new InvalidIdentityNameError(name);
@@ -117589,28 +117654,43 @@ async function tryRunAtIdentityShortcut(deps, argv) {
   await selectIdentity(deps, token.slice(1));
   return true;
 }
-function toIdentityView(paths, entry) {
+function toIdentityView(paths, { entry, read }, sharesLoginWith) {
+  const account = read?.account === void 0 ? void 0 : summariseIdentityAccount(read.account);
   return {
     name: entry.name,
     active: entry.isActive,
-    directory: import_node_path24.default.join(paths.identitiesDir, entry.name),
+    directory: import_node_path25.default.join(paths.identitiesDir, entry.name),
     ...entry.problem === void 0 ? {
       ...entry.identity.defaultConfigProfile === void 0 ? {} : { defaultConfigProfile: entry.identity.defaultConfigProfile },
       allowAmbientCredential: entry.identity.allowAmbientCredential,
       ...entry.identity.credential === void 0 ? {} : { credential: summariseCredential(entry.identity.credential) },
       ...entry.identity.anchors === void 0 ? {} : { anchors: entry.identity.anchors }
-    } : { problem: entry.problem }
+    } : { problem: entry.problem },
+    ...account === void 0 ? {} : { account },
+    ...read?.problem === void 0 ? {} : { accountProblem: read.problem },
+    ...sharesLoginWith.length === 0 ? {} : { sharesLoginWith }
   };
 }
-function formatIdentityLine(entry) {
+function collectIdentityRows(paths, entries) {
+  const items = entries.map((entry) => ({ entry, read: readIdentityAccount(realFarmFs, paths.identitiesDir, entry.name) }));
+  const loginOf = (item) => item.read?.account === void 0 ? void 0 : loginKeyOf(item.read.account);
+  return groupByLogin(items, loginOf).map((item) => {
+    const login = loginOf(item);
+    const sharing = login === void 0 ? [] : items.filter((other) => other !== item && loginOf(other) === login).map((other) => other.entry.name);
+    return { entry: item.entry, view: toIdentityView(paths, item, sharing) };
+  });
+}
+function formatIdentityLine(entry, view) {
   const marker = entry.isActive ? "* " : "  ";
+  const account = view.account === void 0 ? "" : `  ${describeIdentityAccount(view.account)}`;
+  const accountProblem = view.accountProblem === void 0 ? "" : `  [account unreadable: ${view.accountProblem}]`;
   if (entry.problem !== void 0) {
-    return `${marker}${entry.name} [unreadable: ${entry.problem}]`;
+    return `${marker}${entry.name} [unreadable: ${entry.problem}]${account}${accountProblem}`;
   }
   const defaultProfile = entry.identity.defaultConfigProfile === void 0 ? "" : ` (default profile: ${entry.identity.defaultConfigProfile})`;
   const ambient = entry.identity.allowAmbientCredential ? " [allows ambient credential]" : "";
   const credential = entry.identity.credential === void 0 ? "" : ` [credential ${describeCredential(entry.identity.credential)}]`;
-  return `${marker}${entry.name}${defaultProfile}${ambient}${credential}`;
+  return `${marker}${entry.name}${defaultProfile}${ambient}${credential}${account}${accountProblem}`;
 }
 function registerIdentityCommand(program2, deps) {
   const { paths } = deps;
@@ -117630,16 +117710,17 @@ function registerIdentityCommand(program2, deps) {
   withExamples(
     identity.command("list").description("List every identity, marking the active one with *.").option("--json", "Print the identities as JSON.").action((options) => {
       const entries = listIdentities(paths);
+      const rows = collectIdentityRows(paths, entries);
       if (options.json === true) {
-        printJson(entries.map((entry) => toIdentityView(paths, entry)));
+        printJson(rows.map((row) => row.view));
         return;
       }
-      if (entries.length === 0) {
+      if (rows.length === 0) {
         console.log("No identities yet. Run `agent-shim identity add <name>` to create one.");
         return;
       }
-      for (const entry of entries) {
-        console.log(formatIdentityLine(entry));
+      for (const row of rows) {
+        console.log(formatIdentityLine(row.entry, row.view));
       }
       if (entries.some((entry) => entry.problem !== void 0)) {
         console.log("\nRun `agent-shim doctor` for the full detail on every unreadable entry.");
@@ -117649,17 +117730,34 @@ function registerIdentityCommand(program2, deps) {
   );
   withExamples(
     identity.command("show <name>").description("Show one identity's settings and directory.").option("--json", "Print the identity as JSON.").action((name, options) => {
-      const entry = listIdentities(paths).find((candidate) => candidate.name === name);
-      if (entry === void 0) {
+      const row = collectIdentityRows(paths, listIdentities(paths)).find((candidate) => candidate.entry.name === name);
+      if (row === void 0) {
         throw new IdentityNotFoundError(name);
       }
-      const view = toIdentityView(paths, entry);
+      const { entry, view } = row;
       if (options.json === true) {
         printJson(view);
         return;
       }
       console.log(`Identity: ${view.name}${view.active ? " (active)" : ""}`);
       console.log(`Directory: ${view.directory}`);
+      const holder = view.account === void 0 ? void 0 : describeAccountHolder(view.account);
+      if (holder !== void 0) {
+        console.log(`Account: ${holder}`);
+      }
+      if (view.account?.organizationRole !== void 0) {
+        console.log(`Role: ${view.account.organizationRole}`);
+      }
+      const plan = view.account === void 0 ? void 0 : describeAccountPlan(view.account);
+      if (plan !== void 0) {
+        console.log(`Plan: ${plan}`);
+      }
+      if (view.accountProblem !== void 0) {
+        console.log(`Account unreadable: ${view.accountProblem}`);
+      }
+      if (view.sharesLoginWith !== void 0) {
+        console.log(`Shares login with: ${view.sharesLoginWith.join(", ")}`);
+      }
       if (view.problem !== void 0) {
         console.log(`Unreadable: ${view.problem}`);
         return;
@@ -117752,7 +117850,7 @@ function registerIdentityCommand(program2, deps) {
       if (!identityExists(paths, name)) {
         throw new IdentityNotFoundError(name);
       }
-      await confirmRemoval(deps, options.yes, `identity "${name}" and its directory ${import_node_path24.default.join(paths.identitiesDir, name)}`);
+      await confirmRemoval(deps, options.yes, `identity "${name}" and its directory ${import_node_path25.default.join(paths.identitiesDir, name)}`);
       removeIdentity(paths, name);
       reportMutation(options.json, { action: "removed", kind: "identity", name }, () => {
         console.log(`Removed identity "${name}".`);
@@ -157346,9 +157444,9 @@ function formatAccounts(views) {
     if (account === void 0) {
       lines.push("Account: (no stored login profile: never logged in, or a setup-token identity, which has no profile scope)");
     } else {
-      const organisation = [account.organizationName, account.organizationType].filter((part) => part !== void 0).join(", ");
+      const organisation = describeAccountOrganisation(account);
       lines.push(
-        `Account: ${account.emailAddress ?? "(no email)"}${organisation === "" ? "" : ` (${organisation})`}`,
+        `Account: ${account.emailAddress ?? "(no email)"}${organisation === void 0 ? "" : ` (${organisation})`}`,
         `Plan: billing ${account.billingType ?? "unknown"}, seat tier ${account.seatTier ?? "none"}`,
         `Rate-limit tier: organisation ${account.organizationRateLimitTier ?? "unknown"}, user ${account.userRateLimitTier ?? "unknown"}`,
         `Extra usage: ${account.hasExtraUsageEnabled === void 0 ? "unknown" : account.hasExtraUsageEnabled ? "enabled" : "disabled"}`

package/dist/index.cjs

@@ -4762,7 +4762,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.74.0",
+      version: "11.75.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>",

package/dist/index.mjs

@@ -4738,7 +4738,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.74.0",
+      version: "11.75.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>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "11.74.0",
+  "version": "11.75.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>",