agent-shim 11.79.0 → 11.81.0

package/dist/index.cjs

@@ -183,7 +183,7 @@ function providerFilePath(directory, name, source) {
   }
   return import_node_path.default.join(directory, `${name}.json`);
 }
-var import_node_path, import_zod, FILESYSTEM_COMPONENT_BYTES, MAX_PID_DIGITS, UUID_CHARS, ATOMIC_WRITE_OVERHEAD_BYTES, FARM_SWAP_OVERHEAD_BYTES, MAX_NAME_BYTES, FILE_NAME_PATTERN, FILE_NAME, FILE_NAME_RULE, STORED_NAME_RULE, FileNameSchema, StoredNameSchema, UnsafeNameError, InvalidProviderNameError;
+var import_node_path, import_zod, FILESYSTEM_COMPONENT_BYTES, MAX_PID_DIGITS, UUID_CHARS, ATOMIC_WRITE_OVERHEAD_BYTES, FARM_SWAP_OVERHEAD_BYTES, MAX_NAME_BYTES, FILE_NAME_PATTERN, FILE_NAME, FILE_NAME_RULE, STORED_NAME_RULE, FileNameSchema, StoredNameSchema, LABEL_FORBIDDEN, IDENTITY_LABEL_RULE, IdentityLabelSchema, UnsafeNameError, InvalidProviderNameError;
 var init_names = __esm({
   "src/config/names.ts"() {
     "use strict";
@@ -202,6 +202,9 @@ var init_names = __esm({
     STORED_NAME_RULE = `must be non-empty, at most ${String(MAX_NAME_BYTES)} bytes, not "." or "..", and contain no path separator or NUL`;
     FileNameSchema = import_zod.z.string().min(1).regex(FILE_NAME, FILE_NAME_RULE);
     StoredNameSchema = import_zod.z.string().min(1).max(MAX_NAME_BYTES).refine(isStoredName, STORED_NAME_RULE);
+    LABEL_FORBIDDEN = /[\p{Cc}\p{Zl}\p{Zp}]/u;
+    IDENTITY_LABEL_RULE = `must be non-empty single-line text of at most ${String(MAX_NAME_BYTES)} characters, with no control characters and no leading or trailing whitespace`;
+    IdentityLabelSchema = import_zod.z.string().min(1).max(MAX_NAME_BYTES).refine((label) => label === label.trim() && !LABEL_FORBIDDEN.test(label), IDENTITY_LABEL_RULE);
     UnsafeNameError = class extends CliError {
       constructor(attemptedName, kind, rule = STORED_NAME_RULE, source) {
         super(`${source === void 0 ? "" : `${source}: `}${JSON.stringify(attemptedName)} is not a valid ${kind} name: a name ${rule}.`);
@@ -1228,6 +1231,8 @@ var init_schema = __esm({
     IdentitySchema = import_zod3.z.strictObject({
       $schema: import_zod3.z.string().optional(),
       name: FileNameSchema,
+      /** What the identity is for, in the person's words, drawn beside its name in `identity list` and `show`, the launch banner and the statusline. Display only: the name stays the key for lookup, paths, keychain service names and pools. */
+      label: IdentityLabelSchema.optional(),
       defaultConfigProfile: StoredNameSchema.optional(),
       /** The provider this identity exists for: a launch on the identity routes through it unless `--provider`, `--no-provider` or a cascade layer's `launch.provider` says otherwise. Its sessions run on the provider's credential, so the identity needs no stored login. */
       provider: StoredNameSchema.optional(),
@@ -4764,7 +4769,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.79.0",
+      version: "11.81.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 +7042,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 +7481,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 +7956,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 +8006,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 +8102,7 @@ var init_poolPick = __esm({
     init_cliError();
     init_identity();
     init_schema();
+    init_identityAccounts();
     init_account();
     init_pick();
     init_read();
@@ -11493,9 +11599,15 @@ function movedRows(facts) {
   }
   return [];
 }
+function identityText(facts) {
+  if (facts.identity === void 0) {
+    return "(none)";
+  }
+  return facts.identityLabel === void 0 ? facts.identity : `${facts.identity} (${facts.identityLabel})`;
+}
 function decisionRows(facts) {
   return [
-    { label: "identity", value: facts.identity ?? "(none)", detail: facts.identitySource },
+    { label: "identity", value: identityText(facts), detail: facts.identitySource },
     ...facts.pool === void 0 ? [] : [
       {
         label: "pool",
@@ -12021,6 +12133,7 @@ function decideLaunch(params, readOnly) {
   return {
     parsedArgv,
     identityDecision,
+    identityLabel: loadedIdentity?.config.label,
     poolPick,
     poolRanking,
     lastRanAs,
@@ -12051,6 +12164,7 @@ function prepareLaunch(params) {
   const rows = [
     ...decisionRows({
       identity: identityDecision.name,
+      identityLabel: decided.identityLabel,
       identitySource: identityDecision.source,
       pool: poolPick,
       ranking: resolvedFlags.explain ? poolRanking : void 0,
@@ -17036,6 +17150,12 @@ function setIdentityProvider(paths, identityName, providerName) {
   }
   return applyPatch(identityJsonPath(paths, identityName), IdentitySchema, { provider: providerName });
 }
+function setIdentityLabel(paths, identityName, label) {
+  if (!identityExists(paths, identityName)) {
+    throw new IdentityNotFoundError(identityName);
+  }
+  return applyPatch(identityJsonPath(paths, identityName), IdentitySchema, { label });
+}
 function setAllowAmbientCredential(paths, identityName, allow) {
   if (!identityExists(paths, identityName)) {
     throw new IdentityNotFoundError(identityName);
@@ -17084,65 +17204,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");
@@ -17496,6 +17558,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 = [
@@ -17518,10 +17601,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;
@@ -17834,6 +17913,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) => {
@@ -17849,6 +17929,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()) {
@@ -18467,6 +18550,7 @@ init_providersStore();
 // src/frontdoor/configSchemas.ts
 var import_zod30 = require("zod");
 init_schema();
+init_names();
 init_statusline();
 var RemovalConfirmationSchema = import_zod30.z.boolean();
 var CredentialWriteSchema = (targets) => import_zod30.z.strictObject({
@@ -18492,6 +18576,7 @@ var mutationOutput = (kind, action) => import_zod30.z.strictObject({ action: imp
 var storedMutationOutput = (kind, action, value) => import_zod30.z.strictObject({ action: import_zod30.z.literal(action), kind: import_zod30.z.literal(kind), name: import_zod30.z.string(), value });
 var IdentityValueSchema = import_zod30.z.strictObject({
   name: import_zod30.z.string(),
+  label: import_zod30.z.string().optional(),
   defaultConfigProfile: import_zod30.z.string().optional(),
   provider: import_zod30.z.string().optional(),
   allowAmbientCredential: import_zod30.z.boolean(),
@@ -18512,6 +18597,8 @@ var ConfigNameInputSchema = import_zod30.z.strictObject({ name: import_zod30.z.s
 var ConfigIdentityAddOutputSchema = storedMutationOutput("identity", "created", IdentityValueSchema);
 var ConfigIdentitySetInputSchema = import_zod30.z.strictObject({
   name: import_zod30.z.string().min(1),
+  /** The identity's display label; `false` clears it. */
+  label: import_zod30.z.union([IdentityLabelSchema, import_zod30.z.literal(false)]).optional(),
   defaultConfigProfile: import_zod30.z.union([import_zod30.z.string().min(1), import_zod30.z.literal(false)]).optional(),
   /** The provider the identity exists for; `false` clears it. */
   provider: import_zod30.z.union([import_zod30.z.string().min(1), import_zod30.z.literal(false)]).optional(),
@@ -18658,6 +18745,7 @@ function identityValue(name, paths) {
   }
   return {
     name: identity.name,
+    ...identity.label === void 0 ? {} : { label: identity.label },
     ...identity.defaultConfigProfile === void 0 ? {} : { defaultConfigProfile: identity.defaultConfigProfile },
     ...identity.provider === void 0 ? {} : { provider: identity.provider },
     allowAmbientCredential: identity.allowAmbientCredential,
@@ -18692,9 +18780,9 @@ function createConfigApiRouter(deps) {
             return { action: "created", kind: "identity", name: input.name, value: identityValue(input.name, paths) };
           })
         ),
-        set: route("/rest/config/identity/set", "Update an identity's default profile, provider, ambient-credential setting, credential or anchors").input(ConfigIdentitySetInputSchema).output(ConfigIdentitySetOutputSchema).handler(
+        set: route("/rest/config/identity/set", "Update an identity's label, default profile, provider, ambient-credential setting, credential or anchors").input(ConfigIdentitySetInputSchema).output(ConfigIdentitySetOutputSchema).handler(
           ({ input }) => guarded(() => {
-            requireChange(input.defaultConfigProfile !== void 0 || input.provider !== void 0 || input.allowAmbientCredential !== void 0 || input.credential !== void 0 || input.anchors !== void 0, "defaultConfigProfile, provider, allowAmbientCredential, credential or anchors");
+            requireChange(input.label !== void 0 || input.defaultConfigProfile !== void 0 || input.provider !== void 0 || input.allowAmbientCredential !== void 0 || input.credential !== void 0 || input.anchors !== void 0, "label, defaultConfigProfile, provider, allowAmbientCredential, credential or anchors");
             if (!identityExists(paths, input.name)) {
               throw new IdentityNotFoundError(input.name);
             }
@@ -18704,6 +18792,9 @@ function createConfigApiRouter(deps) {
             if (typeof input.provider === "string") {
               requireProviderExists(paths, input.provider);
             }
+            if (input.label !== void 0) {
+              setIdentityLabel(paths, input.name, input.label === false ? void 0 : input.label);
+            }
             if (input.defaultConfigProfile !== void 0) {
               setDefaultConfigProfile(paths, input.name, input.defaultConfigProfile === false ? void 0 : input.defaultConfigProfile);
             }