agent-shim 11.78.0 → 11.80.0

package/README.md

@@ -57,7 +57,7 @@ That's it — with no further configuration, everything in `~/.claude` that isn'
 - **An identity** is a login: the thing that owns credentials and daemon state, selected with `agent-shim run @<name>` or, once `agent-shim shim enable` has run, `claude @<name>`.
 - **A configuration profile** is a reusable, named bundle of sharing rules, independent of any identity, resolved per working directory via directory rules or a committed `.agent-shim.json`.
 
-A third, optional thing sits on top of identities: **a pool** is a named list of them. Select `pool:<name>` where an identity name goes (`claude @pool:subs`) and agent-shim picks the member whose unused quota is closest to expiring, skipping any that are refused right now, using the usage it already records. A pool can instead declare `--preference listed`, which tries the members in the order the pool lists them, skipping only one that is refused right now. A member entry may itself name another pool (`pool:<name>`), which is ranked with its own policy and contributes its pick at that position, so "this identity first, then the fleet" nests the fleet rather than copying its member list; cycles are refused. See [docs/configuration-model.md](docs/configuration-model.md#pools-picking-an-account-at-launch).
+A third, optional thing sits on top of identities: **a pool** is a named list of them. Select `pool:<name>` where an identity name goes (`claude @pool:subs`) and agent-shim picks the member whose unused quota is closest to expiring, skipping any that are refused right now, using the usage it already records. A pool can instead declare `--preference listed`, which tries the members in the order the pool lists them, skipping only one that is refused right now. A member entry may itself name another pool (`pool:<name>`), which is ranked with its own policy and contributes its pick at that position, so "this identity first, then the fleet" nests the fleet rather than copying its member list; cycles are refused. Members that hold the same login (the same account in the same organisation) share one quota window, so a pool ranks them as one candidate and never fails over from one to the other; `pool add`, `pool set` and `doctor` warn when a pool lists two of them. See [docs/configuration-model.md](docs/configuration-model.md#pools-picking-an-account-at-launch). On a terminal, `agent-shim run` asks which identity to run as when none resolves, when a pool pick would change account, or when the identity is refused right now (`--pick` forces the question, `--no-pick` never asks); see [docs/configuration-model.md](docs/configuration-model.md#choosing-the-identity-at-launch-the-picker).
 
 Every top-level entry in `~/.claude` is classified into one of five categories, shipped as a default map (`config/categories.default.json`):
 
@@ -200,6 +200,7 @@ agent-shim run [@<identity>] [launch flags] [claude arguments]
   #   --claude-version <version>   run exactly this installed Claude Code version
   #   --delay <duration>   wait this long after the launcher's own output before starting claude; --[no-]pause waits for a key press instead
   #   --[no-]explain   with @pool:<name>, list every member the pick ranked and why, not only the one picked
+  #   --[no-]pick   on a terminal, ask which identity to run as, even when one resolved (--no-pick never asks); a launch also asks by itself when no identity resolves, a pool pick would change account or organisation, or the identity is refused right now
   #   --native   run the real claude with nothing from agent-shim applied; cannot be combined with the flags above
 claude @<identity> ...                      # the same, once `agent-shim shim enable` has run
 ```

package/dist/cli.cjs

@@ -38192,13 +38192,95 @@ var init_account = __esm({
   }
 });
 
+// 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(", ");
+}
+var init_accountDescription = __esm({
+  "src/usage/accountDescription.ts"() {
+    "use strict";
+  }
+});
+
+// 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 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 groupByLogin(items, loginOf) {
+  return collectByLogin(items, loginOf).flat();
+}
+function groupSharedLogins(items, loginOf) {
+  return collectByLogin(items, loginOf).filter((group) => group.length > 1);
+}
+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 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("; ");
+}
+var init_identityAccounts = __esm({
+  "src/identityAccounts.ts"() {
+    "use strict";
+    init_account();
+    init_accountDescription();
+  }
+});
+
 // package.json
 var package_default;
 var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.78.0",
+      version: "11.80.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>",
@@ -38918,6 +39000,9 @@ function assessRefusedNested(member, nested, nowMs) {
   };
 }
 function assess(member, nowMs) {
+  if (member.sameLoginAs !== void 0) {
+    return { candidate: { identity: member.identity, class: "ineligible", plan: planOf(member.account), reasons: [`same login as ${member.sameLoginAs}`] } };
+  }
   const nested = member.nested;
   if (nested === void 0) {
     return assessIdentity(member, nowMs);
@@ -39461,6 +39546,29 @@ function loadPoolMembers(fs31, paths, identities, nowMs) {
     }
   });
 }
+function snapshotAgeKey(member) {
+  return member.snapshot === void 0 ? Number.NEGATIVE_INFINITY : Date.parse(member.snapshot.updatedAt);
+}
+function collapseSharedLogins(members2) {
+  const groups = groupSharedLogins(members2, (member) => member.nested === void 0 && member.account !== void 0 ? loginKeyOf(member.account) : void 0);
+  const representativeOf = /* @__PURE__ */ new Map();
+  for (const group of groups) {
+    const representative = group.reduce((freshest, member) => snapshotAgeKey(member) > snapshotAgeKey(freshest) ? member : freshest);
+    for (const member of group) {
+      if (member !== representative) {
+        representativeOf.set(member, representative.identity);
+      }
+    }
+  }
+  return members2.map((member) => {
+    const representative = representativeOf.get(member);
+    return representative === void 0 ? member : { ...member, sameLoginAs: representative };
+  });
+}
+function stickyOnRepresentative(sticky, members2) {
+  const twin = sticky === void 0 ? void 0 : members2.find((member) => member.identity === sticky.identity && member.sameLoginAs !== void 0);
+  return sticky === void 0 || twin?.sameLoginAs === void 0 ? sticky : { ...sticky, identity: twin.sameLoginAs };
+}
 function rankPoolGraph(input2) {
   return rankNamedPool(input2, input2.poolName, [], input2.sticky);
 }
@@ -39488,13 +39596,15 @@ function rankNamedPool(input2, poolName, stack, sticky) {
     members2.push(typeof entry === "string" ? nested.member : { ...nested.member, policy: entry.when });
     missing.push(...nested.missing);
   }
+  const collapsed = collapseSharedLogins(members2);
+  const stickyPick = stickyOnRepresentative(sticky, collapsed);
   const ranking = rankPool({
-    members: members2,
+    members: collapsed,
     nowMs: input2.nowMs,
     resuming: input2.resuming,
     ...input2.resumeContextTokens === void 0 ? {} : { resumeContextTokens: input2.resumeContextTokens },
     ...input2.committedContextTokens === void 0 ? {} : { committedContextTokens: input2.committedContextTokens },
-    ...sticky === void 0 ? {} : { sticky },
+    ...stickyPick === void 0 ? {} : { sticky: stickyPick },
     ...pool.preference === void 0 ? {} : { preference: pool.preference }
   });
   return { ranking, missing };
@@ -39561,6 +39671,7 @@ var init_poolPick = __esm({
     init_cliError();
     init_identity();
     init_schema();
+    init_identityAccounts();
     init_account();
     init_pick();
     init_read();
@@ -67175,7 +67286,8 @@ var init_argv = __esm({
       { flag: "--remote-control", key: "remoteControl" },
       { flag: "--wait", key: "wait" },
       { flag: "--pause", key: "pause" },
-      { flag: "--explain", key: "explain" }
+      { flag: "--explain", key: "explain" },
+      { flag: "--pick", key: "pick" }
     ];
     LAUNCHER_FLAG_NAMES = [
       ...VALUED_FLAGS,
@@ -69956,7 +70068,7 @@ function decideLaunch(params, readOnly) {
   const configDirEscapeHatchApplies = env.CLAUDE_CONFIG_DIR !== void 0 && env.CLAUDE_CONFIG_DIR !== "";
   const decidedIdentity = decideIdentity({
     env,
-    argv0Identity: parsedArgv.identity,
+    argv0Identity: params.pickedIdentity ?? parsedArgv.identity,
     directoryPinnedIdentity: params.directoryPinnedIdentity,
     readActiveIdentityFile: () => {
       const raw = fs31.readFileUtf8(paths.activeIdentityFile);
@@ -117703,77 +117815,8 @@ function registerProfileCommand(program2, deps) {
 init_providersStore();
 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 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 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);
-  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
+init_identityAccounts();
+init_accountDescription();
 async function runIdentityWizard(prompts, paths, name, options = {}) {
   if (!IdentitySchema.safeParse({ name, allowAmbientCredential: false }).success) {
     throw new InvalidIdentityNameError(name);
@@ -123233,6 +123276,7 @@ init_realPorts();
 var import_node_fs20 = __toESM(require("node:fs"), 1);
 var import_node_path47 = __toESM(require("node:path"), 1);
 init_signIn();
+init_identityAccounts();
 init_load();
 init_unrecognisedKeys();
 init_schema();
@@ -123507,6 +123551,27 @@ init_providerAliases();
 init_providersStore();
 init_guard();
 init_identity();
+
+// src/poolSharedLogins.ts
+init_identityAccounts();
+init_identity();
+function sharedLoginMembers(members2, accountOf) {
+  const known = members2.flatMap((identity) => {
+    const account = poolNameOf(identity) === void 0 ? accountOf(identity) : void 0;
+    return account === void 0 ? [] : [{ identity, account }];
+  });
+  return groupSharedLogins(known, (entry) => loginKeyOf(entry.account)).flatMap((group) => {
+    const first = group[0];
+    return first === void 0 ? [] : [{ members: group.map((entry) => entry.identity), account: first.account }];
+  });
+}
+function describeSharedLoginMembers(poolName, shared) {
+  const summary = summariseIdentityAccount(shared.account);
+  const holder = summary === void 0 ? void 0 : describeAccountHolder(summary);
+  return `Pool "${poolName}" lists ${joinNames(shared.members)}, which hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window. A launch ranks them as one candidate and never fails over from one to another; keep one of them in the pool.`;
+}
+
+// src/doctorReport.ts
 init_extends();
 var DOCTOR_SEVERITIES = ["pass", "warn", "fail"];
 var DOCTOR_SECTIONS = [
@@ -123529,10 +123594,6 @@ 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;
@@ -123845,6 +123906,7 @@ function runDoctor(params) {
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
+  const accountByIdentity = new Map(params.identities.flatMap((entry) => validIdentityNames.has(entry.name) && entry.account !== void 0 ? [[entry.name, entry.account]] : []));
   for (const [poolName, pool] of Object.entries(pools)) {
     const missing = pool.identities.filter((member) => poolNameOf(poolMemberIdentity(member)) === void 0 && !validIdentityNames.has(poolMemberIdentity(member)));
     const undefinedPools = pool.identities.flatMap((member) => {
@@ -123860,6 +123922,9 @@ function runDoctor(params) {
       ];
       push("pool", "fail", `Pool "${poolName}" names ${problems.join(" and ")}.`, poolName);
     }
+    for (const shared of sharedLoginMembers(pool.identities.map(poolMemberIdentity), (identityName) => accountByIdentity.get(identityName))) {
+      push("pool", "warn", describeSharedLoginMembers(poolName, shared), poolName);
+    }
   }
   const reportedCycles = /* @__PURE__ */ new Set();
   for (const poolName of Object.keys(pools).sort()) {
@@ -156375,6 +156440,7 @@ init_schema();
 init_realPorts();
 init_candidateText();
 init_preflight();
+init_identityAccounts();
 function formatPoolPick(report, nowMs) {
   const head = report.pick === void 0 ? `Pool ${report.pool}: every member is refused right now${report.earliestReturn === void 0 ? "" : `; ${report.earliestReturn.identity} returns at ${report.earliestReturn.at} (in ${formatAge(Date.parse(report.earliestReturn.at) - nowMs)})`}` : `Pool ${report.pool}: a launch from ${report.directory} would run as ${report.pick}`;
   const rows = report.candidates.map((candidate, index) => {
@@ -156383,6 +156449,11 @@ function formatPoolPick(report, nowMs) {
   });
   return [head, ...rows, ...report.missing.map((name) => `  (skipped: ${name} is not an identity)`), ...report.stickyProblem === void 0 ? [] : [`Note: ${report.stickyProblem}; the last-pick record was ignored.`]];
 }
+function warnSharedLogins(paths, poolName, members2) {
+  for (const shared of sharedLoginMembers(members2, (identity) => readIdentityAccount(realFsPort, paths.identitiesDir, identity)?.account)) {
+    console.error(`agent-shim: warning: ${describeSharedLoginMembers(poolName, shared)}`);
+  }
+}
 function policyNotes(entry) {
   const notes = [
     ...entry?.preference === void 0 ? [] : [`preference: ${entry.preference}`],
@@ -156415,6 +156486,7 @@ function registerPoolCommand(program2, deps) {
       reportMutation(options.json, { action: "created", kind: "pool", name, value: created }, () => {
         console.log(`Created pool "${name}" with ${members2.join(", ")}.`);
       });
+      warnSharedLogins(paths, name, created.identities.map(poolMemberIdentity));
     }),
     ["agent-shim pool add subs --identity work --identity personal", "agent-shim pool add client --identity client-main --identity spare --preference listed"]
   );
@@ -156432,6 +156504,7 @@ function registerPoolCommand(program2, deps) {
       reportMutation(options.json, { action: "updated", kind: "pool", name, value: updated }, () => {
         console.log(`Pool "${name}" now has ${updated.identities.map(poolMemberIdentity).join(", ")}.`);
       });
+      warnSharedLogins(paths, name, updated.identities.map(poolMemberIdentity));
     }),
     ["agent-shim pool set subs --identity work --identity personal --identity spare", "agent-shim pool set subs --preference listed", "agent-shim pool set subs --resume-on-limit --compact-before-limit --compact-at-utilisation 85"]
   );
@@ -157480,6 +157553,7 @@ var import_node_path70 = __toESM(require("node:path"), 1);
 init_commandDeps();
 init_realPorts();
 init_account();
+init_accountDescription();
 init_signIn();
 init_resets();
 init_read();
@@ -157820,6 +157894,242 @@ function buildProgram(deps) {
 // src/runClaude.ts
 init_cliError();
 init_configProfilesStore();
+
+// src/launcher/pickerPrompt.ts
+function promptsIdentityPicker(prompts) {
+  return {
+    pick: async (request7) => {
+      const answer = await prompts.select({
+        message: request7.message,
+        options: request7.entries.map((entry) => ({ value: entry.value, label: entry.label })),
+        ...request7.initial === void 0 ? {} : { initialValue: request7.initial }
+      });
+      return prompts.isCancel(answer) ? { kind: "cancelled" } : { kind: "picked", value: answer };
+    }
+  };
+}
+
+// src/launcher/runPicker.ts
+init_cliError();
+init_schema();
+init_identityAccounts();
+init_account();
+init_candidateText();
+init_pick();
+init_poolPick();
+init_identity();
+init_launchReport();
+init_hold();
+
+// src/launcher/pickerEntries.ts
+var PART_SEPARATOR = " | ";
+function pickerLabel(facts) {
+  const name = [facts.rank === void 0 ? void 0 : `${String(facts.rank)}.`, facts.identity, facts.heading, facts.picked === true ? "(picked)" : void 0].filter((part) => part !== void 0).join(" ");
+  return [name, facts.detail, facts.account, facts.quota].filter((part) => part !== void 0).join(PART_SEPARATOR);
+}
+
+// src/launcher/pickerDecision.ts
+init_claudeSubcommand();
+function decidePicker(facts) {
+  if (!facts.interactive || facts.configDirEscapeHatch || facts.pick === false) {
+    return void 0;
+  }
+  if (facts.pick === true) {
+    return "requested";
+  }
+  if (facts.unattended) {
+    return void 0;
+  }
+  const { selection } = facts;
+  switch (selection.kind) {
+    case "none":
+      return "no-identity";
+    case "identity":
+      return selection.limited ? "no-eligible-identity" : void 0;
+    case "pool":
+      if (selection.outcome === "none-eligible") {
+        return facts.waiting ? void 0 : "no-eligible-identity";
+      }
+      return selection.outcome === "changes-account" ? "account-change" : void 0;
+    default:
+      return selection;
+  }
+}
+var TERMINATOR4 = "--";
+var UNATTENDED_FLAGS = /* @__PURE__ */ new Set(["-p", "--print", "--bg"]);
+function isUnattendedLaunch(passthrough) {
+  const end = passthrough.indexOf(TERMINATOR4);
+  const head = end === -1 ? passthrough : passthrough.slice(0, end);
+  return head.some((token) => UNATTENDED_FLAGS.has(token)) || isClaudeSubcommand(passthrough);
+}
+
+// src/launcher/runPicker.ts
+init_pool();
+var IdentityPickerCancelledError = class extends CliError {
+  exitCode = LAUNCH_CANCELLED_EXIT;
+  constructor() {
+    super("launch cancelled at the identity picker: no identity was chosen.");
+    this.name = "IdentityPickerCancelledError";
+  }
+};
+function memberTexts(member, nowMs) {
+  if (member === void 0) {
+    return {};
+  }
+  const billing = { login: member.account, snapshot: member.snapshot, provider: void 0, nowMs };
+  const account = accountRows(billing)[0]?.value;
+  const quotaRow2 = quotaRows(billing)[0];
+  return {
+    ...account === void 0 ? {} : { account },
+    ...quotaRow2 === void 0 ? {} : { quota: quotaRow2.detail === void 0 ? quotaRow2.value : `${quotaRow2.value} (${quotaRow2.detail})` }
+  };
+}
+function refusalOf(candidate) {
+  return candidate.class === "ineligible" ? candidate.reasons[0] : void 0;
+}
+function accountsDiffer(members2, left, right) {
+  const keyOf3 = (identity) => {
+    const account = members2.find((member) => member.identity === identity)?.account;
+    return account === void 0 ? void 0 : loginKeyOf(account);
+  };
+  const leftKey = keyOf3(left);
+  const rightKey = keyOf3(right);
+  return leftKey !== void 0 && rightKey !== void 0 && leftKey !== rightKey;
+}
+function poolContext(params, poolName, resuming, nowMs) {
+  const { paths, usageFs } = params;
+  const { sticky } = readStickyPick(usageFs, paths.usagePicksFile, params.cwd);
+  const { ranking } = rankPoolGraph({
+    fs: usageFs,
+    paths,
+    pools: params.pools ?? {},
+    poolName,
+    nowMs,
+    resuming,
+    identityExists: (name) => loadIdentity(paths.identitiesDir, name, params.fs) !== void 0,
+    ...sticky === void 0 ? {} : { sticky }
+  });
+  const pick2 = ranking.pick?.identity;
+  const named = [.../* @__PURE__ */ new Set([...ranking.candidates.map((candidate) => candidate.identity), ...sticky === void 0 ? [] : [sticky.identity]])].filter(isIdentityName);
+  const members2 = loadPoolMembers(usageFs, paths, named, nowMs);
+  const changes = pick2 !== void 0 && sticky !== void 0 && sticky.identity !== pick2 && accountsDiffer(members2, sticky.identity, pick2);
+  return {
+    selection: { kind: "pool", outcome: pick2 === void 0 ? "none-eligible" : changes ? "changes-account" : "keeps-account" },
+    entries: ranking.candidates.map((candidate, index) => ({
+      value: candidate.identity,
+      label: pickerLabel({
+        identity: candidate.identity,
+        rank: index + 1,
+        heading: candidateHeading(candidate),
+        picked: candidate.identity === pick2,
+        detail: refusalOf(candidate),
+        ...memberTexts(members2.find((member) => member.identity === candidate.identity), nowMs)
+      })
+    })),
+    initial: pick2,
+    poolPick: pick2,
+    message: (reason) => poolMessage(reason, poolName, pick2, sticky)
+  };
+}
+function poolMessage(reason, poolName, pick2, sticky) {
+  switch (reason) {
+    case "account-change":
+      return `Pool "${poolName}" would run this launch as ${pick2 ?? "(none)"}, a different account from ${sticky?.identity ?? "(none)"}, which this directory last ran as. Which identity should it run as?`;
+    case "no-eligible-identity":
+      return `Every member of pool "${poolName}" is refused right now. Which identity should this launch run as?`;
+    case "requested":
+    case "no-identity":
+      return `Pool "${poolName}" is selected for this launch. Which identity should it run as?`;
+    default:
+      return reason;
+  }
+}
+function identityContext(params, resuming, nowMs) {
+  const { paths, usageFs } = params;
+  const members2 = loadPoolMembers(usageFs, paths, params.identityNames(), nowMs);
+  const { candidates } = rankPool({ members: members2, nowMs, resuming, preference: "listed" });
+  const named = params.decision.name;
+  const limited = named !== void 0 && candidates.some((candidate) => candidate.identity === named && candidate.class === "ineligible");
+  const identityEntries = candidates.map((candidate) => ({
+    value: candidate.identity,
+    label: pickerLabel({ identity: candidate.identity, detail: refusalOf(candidate), ...memberTexts(members2.find((member) => member.identity === candidate.identity), nowMs) })
+  }));
+  const poolEntries = Object.entries(params.pools ?? {}).map(([name, pool]) => ({
+    value: `pool:${name}`,
+    label: pickerLabel({ identity: `pool:${name}`, detail: `members ${pool.identities.map(poolMemberIdentity).join(", ")}` })
+  }));
+  return {
+    selection: named === void 0 ? { kind: "none" } : { kind: "identity", limited },
+    entries: [...identityEntries, ...poolEntries],
+    initial: named,
+    poolPick: void 0,
+    message: (reason) => {
+      switch (reason) {
+        case "no-identity":
+          return "No identity is selected for this launch. Which identity should it run as?";
+        case "no-eligible-identity":
+          return `${named ?? "The selected identity"} is refused right now. Which identity should this launch run as?`;
+        case "requested":
+        case "account-change":
+          return "Which identity should this launch run as?";
+        default:
+          return reason;
+      }
+    }
+  };
+}
+async function runIdentityPicker(params) {
+  if (!params.interactive) {
+    return { kind: "unchanged" };
+  }
+  const nowMs = params.now();
+  const resuming = isResuming(params.parsed.rest);
+  const context = params.decision.pool === void 0 ? identityContext(params, resuming, nowMs) : poolContext(params, params.decision.pool, resuming, nowMs);
+  const reason = decidePicker({
+    interactive: params.interactive,
+    unattended: isUnattendedLaunch(params.parsed.rest),
+    pick: params.parsed.pick,
+    configDirEscapeHatch: params.decision.configDirEscapeHatch,
+    waiting: params.parsed.wait === true,
+    selection: context.selection
+  });
+  if (reason === void 0) {
+    return { kind: "unchanged" };
+  }
+  const request7 = { message: context.message(reason), entries: context.entries, ...context.initial === void 0 ? {} : { initial: context.initial } };
+  const answer = await params.picker.pick(request7);
+  if (answer.kind === "cancelled") {
+    return { kind: "cancelled" };
+  }
+  const chosen = answer.value;
+  if (chosen === (params.decision.pool === void 0 ? params.decision.name : context.poolPick)) {
+    return { kind: "unchanged" };
+  }
+  if (params.decision.pool !== void 0 && poolNameOf(chosen) === void 0) {
+    recordStickyPick(params.usageFs, params.paths.usagePicksFile, params.cwd, chosen, nowMs);
+  }
+  return { kind: "selected", selector: chosen };
+}
+
+// src/launchPicker.ts
+init_realPorts();
+async function pickLaunchIdentity(params) {
+  return await runIdentityPicker({
+    parsed: params.parsed,
+    decision: params.decision,
+    interactive: process.stdin.isTTY && process.stdout.isTTY,
+    paths: params.paths,
+    fs: realFsPort,
+    usageFs: params.farm.runtime.fs,
+    pools: params.farm.pools,
+    cwd: params.farm.runtime.cwd,
+    now: params.farm.runtime.now,
+    identityNames: () => listIdentities(params.paths).flatMap((listing) => "problem" in listing ? [] : [listing.name]),
+    picker: promptsIdentityPicker(realPromptsPort)
+  });
+}
+
+// src/runClaude.ts
 init_launchWiring();
 init_paths();
 
@@ -158589,6 +158899,7 @@ function otherLaunchFlags(parsed) {
     ...parsed.skipPermissions === void 0 ? [] : ["--[no-]skip-permissions"],
     ...parsed.remoteControl === void 0 ? [] : ["--[no-]remote-control"],
     ...parsed.wait === void 0 ? [] : ["--[no-]wait"],
+    ...parsed.pick === void 0 ? [] : ["--[no-]pick"],
     ...parsed.categoryFlags.length === 0 ? [] : ["--category"],
     ...parsed.shareFlags.length === 0 ? [] : ["--share"],
     ...parsed.hideFlags.length === 0 ? [] : ["--hide"]
@@ -158654,13 +158965,19 @@ async function runClaude(argvOverride) {
       }
     }
   }
-  await refreshPools({
-    paths,
-    cwd: process.cwd(),
-    poolNames: identityDecision.pool === void 0 ? [] : [identityDecision.pool],
-    spawnDaemon: spawnDetachedSupervisor,
-    log: realLogPort.warn
-  });
+  const refreshUsage = async (poolName2) => {
+    await refreshPools({ paths, cwd: process.cwd(), poolNames: poolName2 === void 0 ? [] : [poolName2], spawnDaemon: spawnDetachedSupervisor, log: realLogPort.warn });
+  };
+  await refreshUsage(identityDecision.pool);
+  const picked = await pickLaunchIdentity({ paths, farm, parsed: nativeArgv, decision: identityDecision });
+  if (picked.kind === "cancelled") {
+    throw new IdentityPickerCancelledError();
+  }
+  const pickedIdentity = picked.kind === "selected" ? picked.selector : void 0;
+  const launchDecision = pickedIdentity === void 0 ? identityDecision : decideIdentity({ env: procForDecision.env, argv0Identity: pickedIdentity, readActiveIdentityFile: () => void 0 });
+  if (launchDecision.pool !== identityDecision.pool) {
+    await refreshUsage(launchDecision.pool);
+  }
   const prepareParams = {
     ...realPrepareLaunchParams(paths, {
       proc: argvOverride === void 0 ? realProcPort : { ...realProcPort, argv: argvOverride },
@@ -158669,10 +158986,11 @@ async function runClaude(argvOverride) {
       farm,
       allowMissingConfigProfile
     }),
+    ...pickedIdentity === void 0 ? {} : { pickedIdentity },
     // Wired here rather than in realPrepareLaunchParams because the port re-invokes this very binary: correct for the agent-shim command line, wrong for a library host whose own executable is not agent-shim.
     update: realLaunchUpdatePort(paths)
   };
-  const poolName = identityDecision.pool;
+  const poolName = launchDecision.pool;
   if (poolName !== void 0 && farm.pools !== void 0 && supervisesLaunch(farm.pools[poolName], nativeArgv.rest)) {
     const code = await runSupervised({
       paths,

package/dist/index.cjs

@@ -4764,7 +4764,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.78.0",
+      version: "11.80.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>",
@@ -7037,6 +7037,78 @@ var init_account = __esm({
   }
 });
 
+// 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(", ");
+}
+var init_accountDescription = __esm({
+  "src/usage/accountDescription.ts"() {
+    "use strict";
+  }
+});
+
+// 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 joinNames(names) {
+  const last = names.at(-1);
+  return names.length < 2 || last === void 0 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${last}`;
+}
+function describeAccountHolder(summary) {
+  const organisation = describeAccountOrganisation(summary);
+  if (summary.emailAddress === void 0) {
+    return organisation;
+  }
+  return organisation === void 0 ? summary.emailAddress : `${summary.emailAddress} (${organisation})`;
+}
+var init_identityAccounts = __esm({
+  "src/identityAccounts.ts"() {
+    "use strict";
+    init_account();
+    init_accountDescription();
+  }
+});
+
 // src/usage/rateLimit.ts
 function epochSecondsToIso(value) {
   if (value === void 0) {
@@ -7404,6 +7476,9 @@ function assessRefusedNested(member, nested, nowMs) {
   };
 }
 function assess(member, nowMs) {
+  if (member.sameLoginAs !== void 0) {
+    return { candidate: { identity: member.identity, class: "ineligible", plan: planOf(member.account), reasons: [`same login as ${member.sameLoginAs}`] } };
+  }
   const nested = member.nested;
   if (nested === void 0) {
     return assessIdentity(member, nowMs);
@@ -7876,6 +7951,29 @@ function loadPoolMembers(fs14, paths, identities, nowMs) {
     }
   });
 }
+function snapshotAgeKey(member) {
+  return member.snapshot === void 0 ? Number.NEGATIVE_INFINITY : Date.parse(member.snapshot.updatedAt);
+}
+function collapseSharedLogins(members) {
+  const groups = groupSharedLogins(members, (member) => member.nested === void 0 && member.account !== void 0 ? loginKeyOf(member.account) : void 0);
+  const representativeOf = /* @__PURE__ */ new Map();
+  for (const group of groups) {
+    const representative = group.reduce((freshest, member) => snapshotAgeKey(member) > snapshotAgeKey(freshest) ? member : freshest);
+    for (const member of group) {
+      if (member !== representative) {
+        representativeOf.set(member, representative.identity);
+      }
+    }
+  }
+  return members.map((member) => {
+    const representative = representativeOf.get(member);
+    return representative === void 0 ? member : { ...member, sameLoginAs: representative };
+  });
+}
+function stickyOnRepresentative(sticky, members) {
+  const twin = sticky === void 0 ? void 0 : members.find((member) => member.identity === sticky.identity && member.sameLoginAs !== void 0);
+  return sticky === void 0 || twin?.sameLoginAs === void 0 ? sticky : { ...sticky, identity: twin.sameLoginAs };
+}
 function rankPoolGraph(input) {
   return rankNamedPool(input, input.poolName, [], input.sticky);
 }
@@ -7903,13 +8001,15 @@ function rankNamedPool(input, poolName, stack, sticky) {
     members.push(typeof entry === "string" ? nested.member : { ...nested.member, policy: entry.when });
     missing.push(...nested.missing);
   }
+  const collapsed = collapseSharedLogins(members);
+  const stickyPick = stickyOnRepresentative(sticky, collapsed);
   const ranking = rankPool({
-    members,
+    members: collapsed,
     nowMs: input.nowMs,
     resuming: input.resuming,
     ...input.resumeContextTokens === void 0 ? {} : { resumeContextTokens: input.resumeContextTokens },
     ...input.committedContextTokens === void 0 ? {} : { committedContextTokens: input.committedContextTokens },
-    ...sticky === void 0 ? {} : { sticky },
+    ...stickyPick === void 0 ? {} : { sticky: stickyPick },
     ...pool.preference === void 0 ? {} : { preference: pool.preference }
   });
   return { ranking, missing };
@@ -7997,6 +8097,7 @@ var init_poolPick = __esm({
     init_cliError();
     init_identity();
     init_schema();
+    init_identityAccounts();
     init_account();
     init_pick();
     init_read();
@@ -10726,7 +10827,8 @@ var init_argv = __esm({
       { flag: "--remote-control", key: "remoteControl" },
       { flag: "--wait", key: "wait" },
       { flag: "--pause", key: "pause" },
-      { flag: "--explain", key: "explain" }
+      { flag: "--explain", key: "explain" },
+      { flag: "--pick", key: "pick" }
     ];
     LAUNCHER_FLAG_NAMES = [
       ...VALUED_FLAGS,
@@ -11812,7 +11914,7 @@ function decideLaunch(params, readOnly) {
   const configDirEscapeHatchApplies = env.CLAUDE_CONFIG_DIR !== void 0 && env.CLAUDE_CONFIG_DIR !== "";
   const decidedIdentity = decideIdentity({
     env,
-    argv0Identity: parsedArgv.identity,
+    argv0Identity: params.pickedIdentity ?? parsedArgv.identity,
     directoryPinnedIdentity: params.directoryPinnedIdentity,
     readActiveIdentityFile: () => {
       const raw = fs14.readFileUtf8(paths.activeIdentityFile);
@@ -17083,65 +17185,7 @@ init_realPorts();
 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})`;
-}
+init_identityAccounts();
 
 // src/codex/siwcStore.ts
 var import_zod26 = require("zod");
@@ -17495,6 +17539,27 @@ init_providerAliases();
 init_providersStore();
 init_guard();
 init_identity();
+
+// src/poolSharedLogins.ts
+init_identityAccounts();
+init_identity();
+function sharedLoginMembers(members, accountOf) {
+  const known = members.flatMap((identity) => {
+    const account = poolNameOf(identity) === void 0 ? accountOf(identity) : void 0;
+    return account === void 0 ? [] : [{ identity, account }];
+  });
+  return groupSharedLogins(known, (entry) => loginKeyOf(entry.account)).flatMap((group) => {
+    const first = group[0];
+    return first === void 0 ? [] : [{ members: group.map((entry) => entry.identity), account: first.account }];
+  });
+}
+function describeSharedLoginMembers(poolName, shared) {
+  const summary = summariseIdentityAccount(shared.account);
+  const holder = summary === void 0 ? void 0 : describeAccountHolder(summary);
+  return `Pool "${poolName}" lists ${joinNames(shared.members)}, which hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window. A launch ranks them as one candidate and never fails over from one to another; keep one of them in the pool.`;
+}
+
+// src/doctorReport.ts
 init_extends();
 var DOCTOR_SEVERITIES = ["pass", "warn", "fail"];
 var DOCTOR_SECTIONS = [
@@ -17517,10 +17582,6 @@ 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;
@@ -17833,6 +17894,7 @@ function runDoctor(params) {
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
+  const accountByIdentity = new Map(params.identities.flatMap((entry) => validIdentityNames.has(entry.name) && entry.account !== void 0 ? [[entry.name, entry.account]] : []));
   for (const [poolName, pool] of Object.entries(pools)) {
     const missing = pool.identities.filter((member) => poolNameOf(poolMemberIdentity(member)) === void 0 && !validIdentityNames.has(poolMemberIdentity(member)));
     const undefinedPools = pool.identities.flatMap((member) => {
@@ -17848,6 +17910,9 @@ function runDoctor(params) {
       ];
       push("pool", "fail", `Pool "${poolName}" names ${problems.join(" and ")}.`, poolName);
     }
+    for (const shared of sharedLoginMembers(pool.identities.map(poolMemberIdentity), (identityName) => accountByIdentity.get(identityName))) {
+      push("pool", "warn", describeSharedLoginMembers(poolName, shared), poolName);
+    }
   }
   const reportedCycles = /* @__PURE__ */ new Set();
   for (const poolName of Object.keys(pools).sort()) {

package/dist/index.mjs

@@ -4740,7 +4740,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.78.0",
+      version: "11.80.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>",
@@ -7012,6 +7012,78 @@ var init_account = __esm({
   }
 });
 
+// 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(", ");
+}
+var init_accountDescription = __esm({
+  "src/usage/accountDescription.ts"() {
+    "use strict";
+  }
+});
+
+// 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 joinNames(names) {
+  const last = names.at(-1);
+  return names.length < 2 || last === void 0 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${last}`;
+}
+function describeAccountHolder(summary) {
+  const organisation = describeAccountOrganisation(summary);
+  if (summary.emailAddress === void 0) {
+    return organisation;
+  }
+  return organisation === void 0 ? summary.emailAddress : `${summary.emailAddress} (${organisation})`;
+}
+var init_identityAccounts = __esm({
+  "src/identityAccounts.ts"() {
+    "use strict";
+    init_account();
+    init_accountDescription();
+  }
+});
+
 // src/usage/rateLimit.ts
 function epochSecondsToIso(value) {
   if (value === void 0) {
@@ -7379,6 +7451,9 @@ function assessRefusedNested(member, nested, nowMs) {
   };
 }
 function assess(member, nowMs) {
+  if (member.sameLoginAs !== void 0) {
+    return { candidate: { identity: member.identity, class: "ineligible", plan: planOf(member.account), reasons: [`same login as ${member.sameLoginAs}`] } };
+  }
   const nested = member.nested;
   if (nested === void 0) {
     return assessIdentity(member, nowMs);
@@ -7853,6 +7928,29 @@ function loadPoolMembers(fs14, paths, identities, nowMs) {
     }
   });
 }
+function snapshotAgeKey(member) {
+  return member.snapshot === void 0 ? Number.NEGATIVE_INFINITY : Date.parse(member.snapshot.updatedAt);
+}
+function collapseSharedLogins(members) {
+  const groups = groupSharedLogins(members, (member) => member.nested === void 0 && member.account !== void 0 ? loginKeyOf(member.account) : void 0);
+  const representativeOf = /* @__PURE__ */ new Map();
+  for (const group of groups) {
+    const representative = group.reduce((freshest, member) => snapshotAgeKey(member) > snapshotAgeKey(freshest) ? member : freshest);
+    for (const member of group) {
+      if (member !== representative) {
+        representativeOf.set(member, representative.identity);
+      }
+    }
+  }
+  return members.map((member) => {
+    const representative = representativeOf.get(member);
+    return representative === void 0 ? member : { ...member, sameLoginAs: representative };
+  });
+}
+function stickyOnRepresentative(sticky, members) {
+  const twin = sticky === void 0 ? void 0 : members.find((member) => member.identity === sticky.identity && member.sameLoginAs !== void 0);
+  return sticky === void 0 || twin?.sameLoginAs === void 0 ? sticky : { ...sticky, identity: twin.sameLoginAs };
+}
 function rankPoolGraph(input) {
   return rankNamedPool(input, input.poolName, [], input.sticky);
 }
@@ -7880,13 +7978,15 @@ function rankNamedPool(input, poolName, stack, sticky) {
     members.push(typeof entry === "string" ? nested.member : { ...nested.member, policy: entry.when });
     missing.push(...nested.missing);
   }
+  const collapsed = collapseSharedLogins(members);
+  const stickyPick = stickyOnRepresentative(sticky, collapsed);
   const ranking = rankPool({
-    members,
+    members: collapsed,
     nowMs: input.nowMs,
     resuming: input.resuming,
     ...input.resumeContextTokens === void 0 ? {} : { resumeContextTokens: input.resumeContextTokens },
     ...input.committedContextTokens === void 0 ? {} : { committedContextTokens: input.committedContextTokens },
-    ...sticky === void 0 ? {} : { sticky },
+    ...stickyPick === void 0 ? {} : { sticky: stickyPick },
     ...pool.preference === void 0 ? {} : { preference: pool.preference }
   });
   return { ranking, missing };
@@ -7972,6 +8072,7 @@ var init_poolPick = __esm({
     init_cliError();
     init_identity();
     init_schema();
+    init_identityAccounts();
     init_account();
     init_pick();
     init_read();
@@ -10699,7 +10800,8 @@ var init_argv = __esm({
       { flag: "--remote-control", key: "remoteControl" },
       { flag: "--wait", key: "wait" },
       { flag: "--pause", key: "pause" },
-      { flag: "--explain", key: "explain" }
+      { flag: "--explain", key: "explain" },
+      { flag: "--pick", key: "pick" }
     ];
     LAUNCHER_FLAG_NAMES = [
       ...VALUED_FLAGS,
@@ -11787,7 +11889,7 @@ function decideLaunch(params, readOnly) {
   const configDirEscapeHatchApplies = env.CLAUDE_CONFIG_DIR !== void 0 && env.CLAUDE_CONFIG_DIR !== "";
   const decidedIdentity = decideIdentity({
     env,
-    argv0Identity: parsedArgv.identity,
+    argv0Identity: params.pickedIdentity ?? parsedArgv.identity,
     directoryPinnedIdentity: params.directoryPinnedIdentity,
     readActiveIdentityFile: () => {
       const raw = fs14.readFileUtf8(paths.activeIdentityFile);
@@ -16668,65 +16770,7 @@ init_realPorts();
 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})`;
-}
+init_identityAccounts();
 
 // src/codex/siwcStore.ts
 import { z as z26 } from "zod";
@@ -17080,6 +17124,27 @@ init_providerAliases();
 init_providersStore();
 init_guard();
 init_identity();
+
+// src/poolSharedLogins.ts
+init_identityAccounts();
+init_identity();
+function sharedLoginMembers(members, accountOf) {
+  const known = members.flatMap((identity) => {
+    const account = poolNameOf(identity) === void 0 ? accountOf(identity) : void 0;
+    return account === void 0 ? [] : [{ identity, account }];
+  });
+  return groupSharedLogins(known, (entry) => loginKeyOf(entry.account)).flatMap((group) => {
+    const first = group[0];
+    return first === void 0 ? [] : [{ members: group.map((entry) => entry.identity), account: first.account }];
+  });
+}
+function describeSharedLoginMembers(poolName, shared) {
+  const summary = summariseIdentityAccount(shared.account);
+  const holder = summary === void 0 ? void 0 : describeAccountHolder(summary);
+  return `Pool "${poolName}" lists ${joinNames(shared.members)}, which hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window. A launch ranks them as one candidate and never fails over from one to another; keep one of them in the pool.`;
+}
+
+// src/doctorReport.ts
 init_extends();
 var DOCTOR_SEVERITIES = ["pass", "warn", "fail"];
 var DOCTOR_SECTIONS = [
@@ -17102,10 +17167,6 @@ 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;
@@ -17418,6 +17479,7 @@ function runDoctor(params) {
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
+  const accountByIdentity = new Map(params.identities.flatMap((entry) => validIdentityNames.has(entry.name) && entry.account !== void 0 ? [[entry.name, entry.account]] : []));
   for (const [poolName, pool] of Object.entries(pools)) {
     const missing = pool.identities.filter((member) => poolNameOf(poolMemberIdentity(member)) === void 0 && !validIdentityNames.has(poolMemberIdentity(member)));
     const undefinedPools = pool.identities.flatMap((member) => {
@@ -17433,6 +17495,9 @@ function runDoctor(params) {
       ];
       push("pool", "fail", `Pool "${poolName}" names ${problems.join(" and ")}.`, poolName);
     }
+    for (const shared of sharedLoginMembers(pool.identities.map(poolMemberIdentity), (identityName) => accountByIdentity.get(identityName))) {
+      push("pool", "warn", describeSharedLoginMembers(poolName, shared), poolName);
+    }
   }
   const reportedCycles = /* @__PURE__ */ new Set();
   for (const poolName of Object.keys(pools).sort()) {

package/dist/types/index.d.ts

@@ -14032,6 +14032,8 @@ interface PrepareLaunchParams {
     readonly log: LogPort;
     /** Discovers the real `claude` binary to spawn. Injected so `runLauncher` never depends on `src/versionDiscovery.ts`'s own filesystem/PATH inputs directly — the caller (`src/cli.ts`) wires the real discovery, tests wire a fake that returns a fixed path. */
     readonly resolveClaudeBinary: ClaudeBinaryResolver;
+    /** The identity (or `pool:<name>`) the person chose at the identity picker, which takes the place of whatever the arguments named: the question was asked because that choice was not settled. */
+    readonly pickedIdentity?: string;
     /** An identity pinned to `$PWD` by a directory rule. Accepted as an already-resolved value — the rules-loading code that produces it lands in Phase 4/5. */
     readonly directoryPinnedIdentity?: string;
     /** A directory rule's `configProfile` selection for `$PWD`. Accepted as an already-resolved value for the same reason. */
@@ -26334,6 +26336,8 @@ interface PoolMember {
     readonly records: readonly UsageRecord[];
     /** Present when this member stands for a nested `pool:<name>` entry rather than a direct identity. */
     readonly nested?: NestedContribution;
+    /** The member that represents this member's login in the ranking, when both hold the same login and so draw on one quota window. This member is then ineligible as a candidate of its own, since ranking it beside its representative would count one window twice and could fail over to a login that is limited too. */
+    readonly sameLoginAs?: string;
     /** The member entry's policy condition, from the object form of a pool member: definite false skips the member as ineligible by policy, indeterminate demotes it to last within its class, naming the missing fact either way. */
     readonly policy?: WhenCondition;
 }

package/package.json

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