agent-shim 11.76.0 → 11.78.0

package/dist/index.mjs

@@ -4740,7 +4740,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.76.0",
+      version: "11.78.0",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -5947,19 +5947,23 @@ function renderReport(rows, style) {
   const lines = [style(["bold"], REPORT_HEADING)];
   for (const row of rows) {
     const detail = row.detail === void 0 ? "" : ` ${style(["dim"], `(${row.detail})`)}`;
-    lines.push(`${indent}${style(["dim"], row.label.padEnd(labelWidth))}${COLUMN_GAP}${row.value}${detail}`);
+    const label = row.label.padEnd(labelWidth);
+    lines.push(
+      row.notice === true ? `${indent}${style(NOTICE_FORMATS, label)}${COLUMN_GAP}${style(NOTICE_FORMATS, row.value)}${detail}` : `${indent}${style(["dim"], label)}${COLUMN_GAP}${row.value}${detail}`
+    );
     for (const note of row.notes ?? []) {
       lines.push(`${indent}${" ".repeat(labelWidth)}${COLUMN_GAP}${style(["dim"], note)}`);
     }
   }
   return lines;
 }
-var REPORT_HEADING, COLUMN_GAP;
+var REPORT_HEADING, COLUMN_GAP, NOTICE_FORMATS;
 var init_report = __esm({
   "src/launcher/report.ts"() {
     "use strict";
     REPORT_HEADING = "agent-shim";
     COLUMN_GAP = "  ";
+    NOTICE_FORMATS = ["yellow", "bold"];
   }
 });
 
@@ -7008,52 +7012,6 @@ var init_account = __esm({
   }
 });
 
-// src/usage/plan.ts
-import { z as z13 } from "zod";
-function planOf(account) {
-  const userTier = account?.userRateLimitTier;
-  if (userTier !== void 0 && ZERO_TIER.test(userTier)) {
-    return { kind: "pay-per-use", tier: userTier };
-  }
-  const tier = account?.organizationRateLimitTier ?? userTier;
-  const tierField = tier === void 0 ? {} : { tier };
-  if (tier === void 0) {
-    return { kind: "subscription", capacity: 1, recognised: false };
-  }
-  if (ZERO_TIER.test(tier)) {
-    return { kind: "pay-per-use", ...tierField };
-  }
-  const multiplier = TIER_MULTIPLIER.exec(tier)?.[1];
-  if (multiplier !== void 0) {
-    return { kind: "subscription", capacity: Number(multiplier), recognised: true, ...tierField };
-  }
-  return { kind: "subscription", capacity: 1, recognised: BASE_TIER.test(tier), ...tierField };
-}
-var PlanClassSchema, TIER_MULTIPLIER, ZERO_TIER, BASE_TIER;
-var init_plan2 = __esm({
-  "src/usage/plan.ts"() {
-    "use strict";
-    PlanClassSchema = z13.union([
-      z13.strictObject({
-        kind: z13.literal("subscription"),
-        /** The plan's size as a multiple of the smallest subscription tier (Max is 5, Ultra is 20). */
-        capacity: z13.number().positive(),
-        /** False when the tier string named no multiplier and no tier this project knows, so `capacity` is the neutral 1 rather than a reading. */
-        recognised: z13.boolean(),
-        /** The tier string the classification rests on, when the account had one. */
-        tier: z13.string().optional()
-      }),
-      z13.strictObject({
-        kind: z13.literal("pay-per-use"),
-        tier: z13.string().optional()
-      })
-    ]);
-    TIER_MULTIPLIER = /(?:^|_)(\d+)x$/;
-    ZERO_TIER = /(?:^|_)zero$/;
-    BASE_TIER = /(?:^|_)(?:pro|free)$/;
-  }
-});
-
 // src/usage/rateLimit.ts
 function epochSecondsToIso(value) {
   if (value === void 0) {
@@ -7145,39 +7103,6 @@ var init_rateLimit = __esm({
   }
 });
 
-// src/usage/scan.ts
-import { z as z14 } from "zod";
-var AnthropicUsageSchema, ErrorObjectSchema;
-var init_scan = __esm({
-  "src/usage/scan.ts"() {
-    "use strict";
-    AnthropicUsageSchema = z14.looseObject({
-      input_tokens: z14.number().int().nonnegative().nullish(),
-      output_tokens: z14.number().int().nonnegative().nullish(),
-      cache_creation_input_tokens: z14.number().int().nonnegative().nullish(),
-      cache_read_input_tokens: z14.number().int().nonnegative().nullish()
-    });
-    ErrorObjectSchema = z14.looseObject({
-      type: z14.string().optional(),
-      code: z14.union([z14.string(), z14.number()]).optional(),
-      message: z14.string().optional()
-    });
-  }
-});
-
-// src/usage/middleware.ts
-var ANTHROPIC_PROVIDER;
-var init_middleware = __esm({
-  "src/usage/middleware.ts"() {
-    "use strict";
-    init_route();
-    init_rateLimit();
-    init_scan();
-    init_schema2();
-    ANTHROPIC_PROVIDER = "anthropic";
-  }
-});
-
 // src/usage/preflight.ts
 function formatAge(ms) {
   const minutes = Math.floor(ms / (MS_PER_SECOND3 * SECONDS_PER_MINUTE));
@@ -7234,6 +7159,111 @@ var init_preflight = __esm({
   }
 });
 
+// src/usage/candidateText.ts
+function candidateHeading(candidate) {
+  const score = candidate.score === void 0 ? "" : ` score ${candidate.score.toFixed(2)}${candidate.scoreWindow === "fiveHour" ? " by 5h reset" : " by 7d reset"}`;
+  const dry = candidate.feasible ? "" : " (5h would run dry)";
+  return `[${candidate.class}${score}]${dry}`;
+}
+function percent(fraction) {
+  return `${String(Math.round(fraction * PERCENT))}%`;
+}
+function describeWindow(label, window, effective, nowMs) {
+  if (effective.reset) {
+    return `${label} window has reset`;
+  }
+  const used = effective.utilization === void 0 ? "usage unknown" : `${percent(effective.utilization)} used`;
+  const resets = effective.resetsAtMs === void 0 ? "" : `, resets in ${formatAge(effective.resetsAtMs - nowMs)}`;
+  return `${label} ${used}${resets}${window.status === "allowed_warning" ? " (nearly used)" : ""}`;
+}
+var PERCENT;
+var init_candidateText = __esm({
+  "src/usage/candidateText.ts"() {
+    "use strict";
+    init_preflight();
+    PERCENT = 100;
+  }
+});
+
+// src/usage/plan.ts
+import { z as z13 } from "zod";
+function planOf(account) {
+  const userTier = account?.userRateLimitTier;
+  if (userTier !== void 0 && ZERO_TIER.test(userTier)) {
+    return { kind: "pay-per-use", tier: userTier };
+  }
+  const tier = account?.organizationRateLimitTier ?? userTier;
+  const tierField = tier === void 0 ? {} : { tier };
+  if (tier === void 0) {
+    return { kind: "subscription", capacity: 1, recognised: false };
+  }
+  if (ZERO_TIER.test(tier)) {
+    return { kind: "pay-per-use", ...tierField };
+  }
+  const multiplier = TIER_MULTIPLIER.exec(tier)?.[1];
+  if (multiplier !== void 0) {
+    return { kind: "subscription", capacity: Number(multiplier), recognised: true, ...tierField };
+  }
+  return { kind: "subscription", capacity: 1, recognised: BASE_TIER.test(tier), ...tierField };
+}
+var PlanClassSchema, TIER_MULTIPLIER, ZERO_TIER, BASE_TIER;
+var init_plan2 = __esm({
+  "src/usage/plan.ts"() {
+    "use strict";
+    PlanClassSchema = z13.union([
+      z13.strictObject({
+        kind: z13.literal("subscription"),
+        /** The plan's size as a multiple of the smallest subscription tier (Max is 5, Ultra is 20). */
+        capacity: z13.number().positive(),
+        /** False when the tier string named no multiplier and no tier this project knows, so `capacity` is the neutral 1 rather than a reading. */
+        recognised: z13.boolean(),
+        /** The tier string the classification rests on, when the account had one. */
+        tier: z13.string().optional()
+      }),
+      z13.strictObject({
+        kind: z13.literal("pay-per-use"),
+        tier: z13.string().optional()
+      })
+    ]);
+    TIER_MULTIPLIER = /(?:^|_)(\d+)x$/;
+    ZERO_TIER = /(?:^|_)zero$/;
+    BASE_TIER = /(?:^|_)(?:pro|free)$/;
+  }
+});
+
+// src/usage/scan.ts
+import { z as z14 } from "zod";
+var AnthropicUsageSchema, ErrorObjectSchema;
+var init_scan = __esm({
+  "src/usage/scan.ts"() {
+    "use strict";
+    AnthropicUsageSchema = z14.looseObject({
+      input_tokens: z14.number().int().nonnegative().nullish(),
+      output_tokens: z14.number().int().nonnegative().nullish(),
+      cache_creation_input_tokens: z14.number().int().nonnegative().nullish(),
+      cache_read_input_tokens: z14.number().int().nonnegative().nullish()
+    });
+    ErrorObjectSchema = z14.looseObject({
+      type: z14.string().optional(),
+      code: z14.union([z14.string(), z14.number()]).optional(),
+      message: z14.string().optional()
+    });
+  }
+});
+
+// src/usage/middleware.ts
+var ANTHROPIC_PROVIDER;
+var init_middleware = __esm({
+  "src/usage/middleware.ts"() {
+    "use strict";
+    init_route();
+    init_rateLimit();
+    init_scan();
+    init_schema2();
+    ANTHROPIC_PROVIDER = "anthropic";
+  }
+});
+
 // src/usage/quotaFacts.ts
 function windowFacts(window, nowMs) {
   if (window?.utilization === void 0 || window.resetsAt === void 0) {
@@ -7333,17 +7363,6 @@ function windowRatio(records) {
   }
   return (last.seven - first.seven) / (last.five - first.five);
 }
-function percent(fraction) {
-  return `${String(Math.round(fraction * PERCENT))}%`;
-}
-function describeWindow(label, window, effective, nowMs) {
-  if (effective.reset) {
-    return `${label} window has reset`;
-  }
-  const used = effective.utilization === void 0 ? "usage unknown" : `${percent(effective.utilization)} used`;
-  const resets = effective.resetsAtMs === void 0 ? "" : `, resets in ${formatAge(effective.resetsAtMs - nowMs)}`;
-  return `${label} ${used}${resets}${window.status === "allowed_warning" ? " (nearly used)" : ""}`;
-}
 function capacityOf(plan) {
   return plan.kind === "subscription" ? plan.capacity : 1;
 }
@@ -7536,11 +7555,12 @@ function rankPool(input) {
     ...holdForReturn === void 0 ? {} : { holdForReturn }
   };
 }
-var MS_PER_SECOND4, MS_PER_HOUR2, HOURS_PER_DAY2, FIVE_HOURS, PROMPT_CACHE_TTL_HOURS, PERCENT, SEVEN_DAYS, FIVE_HOUR_WINDOW_MS, SEVEN_DAY_WINDOW_MS, PROMPT_CACHE_TTL_MS, CLASS_ORDER;
+var MS_PER_SECOND4, MS_PER_HOUR2, HOURS_PER_DAY2, FIVE_HOURS, PROMPT_CACHE_TTL_HOURS, SEVEN_DAYS, FIVE_HOUR_WINDOW_MS, SEVEN_DAY_WINDOW_MS, PROMPT_CACHE_TTL_MS, CLASS_ORDER;
 var init_pick = __esm({
   "src/usage/pick.ts"() {
     "use strict";
     init_conditions();
+    init_candidateText();
     init_plan2();
     init_middleware();
     init_preflight();
@@ -7551,7 +7571,6 @@ var init_pick = __esm({
     HOURS_PER_DAY2 = 24;
     FIVE_HOURS = 5;
     PROMPT_CACHE_TTL_HOURS = 1;
-    PERCENT = 100;
     SEVEN_DAYS = 7;
     FIVE_HOUR_WINDOW_MS = FIVE_HOURS * MS_PER_HOUR2;
     SEVEN_DAY_WINDOW_MS = SEVEN_DAYS * HOURS_PER_DAY2 * MS_PER_HOUR2;
@@ -9610,6 +9629,62 @@ var init_guard = __esm({
   }
 });
 
+// src/usage/resets.ts
+function formatPeriod(window) {
+  if (window.periodMs === void 0) {
+    return window.period ?? "unknown period";
+  }
+  const hours = window.periodMs / MS_PER_HOUR3;
+  return hours >= HOURS_PER_DAY3 && Number.isInteger(hours / HOURS_PER_DAY3) ? `${String(hours / HOURS_PER_DAY3)}d` : `${String(hours)}h`;
+}
+function groupOf(row) {
+  return row.resetsAt === void 0 ? 2 : row.reset ? 1 : 0;
+}
+function compareRows(left, right) {
+  return groupOf(left) - groupOf(right) || (left.resetsAt ?? "").localeCompare(right.resetsAt ?? "") || left.identity.localeCompare(right.identity) || left.provider.localeCompare(right.provider) || left.window.localeCompare(right.window);
+}
+function rowOf(snapshot, provider, window, observedAt2, recorded, nowMs) {
+  const effective = effectiveWindow(recorded, nowMs);
+  return {
+    identity: snapshot.identity,
+    provider,
+    window,
+    observedAt: observedAt2,
+    ...recorded.resetsAt === void 0 ? {} : { resetsAt: recorded.resetsAt },
+    reset: effective.reset,
+    ...effective.utilization === void 0 ? {} : { utilization: effective.utilization },
+    ...effective.status === void 0 ? {} : { status: effective.status }
+  };
+}
+function collectResets(snapshots, nowMs) {
+  const rows = snapshots.flatMap(
+    (snapshot) => Object.entries(snapshot.providers).flatMap(([provider, state]) => {
+      const unified = state.rateLimit?.unified;
+      const observedAt2 = state.rateLimit?.observedAt;
+      const overage = unified === void 0 ? void 0 : soleOverageWindow(unified);
+      const headerRows = observedAt2 === void 0 || unified === void 0 ? [] : [
+        ...unified.fiveHour === void 0 ? [] : [rowOf(snapshot, provider, "5h", observedAt2, unified.fiveHour, nowMs)],
+        ...unified.sevenDay === void 0 ? [] : [rowOf(snapshot, provider, "7d", observedAt2, unified.sevenDay, nowMs)],
+        ...overage === void 0 ? [] : [rowOf(snapshot, provider, "extra usage", observedAt2, overage, nowMs)]
+      ];
+      const quota = state.quota;
+      const quotaRows2 = quota === void 0 ? [] : quota.windows.map((window) => rowOf(snapshot, provider, `${window.measures} ${formatPeriod(window)}`, quota.observedAt, window, nowMs));
+      return [...headerRows, ...quotaRows2];
+    })
+  );
+  return { resets: rows.sort(compareRows) };
+}
+var MS_PER_HOUR3, HOURS_PER_DAY3;
+var init_resets = __esm({
+  "src/usage/resets.ts"() {
+    "use strict";
+    init_preflight();
+    init_rateLimit();
+    MS_PER_HOUR3 = 36e5;
+    HOURS_PER_DAY3 = 24;
+  }
+});
+
 // src/cli/commandDeps.ts
 var init_commandDeps = __esm({
   "src/cli/commandDeps.ts"() {
@@ -11316,24 +11391,9 @@ var init_hold = __esm({
   }
 });
 
-// src/usage/candidateText.ts
-function candidateHeading(candidate) {
-  const score = candidate.score === void 0 ? "" : ` score ${candidate.score.toFixed(2)}${candidate.scoreWindow === "fiveHour" ? " by 5h reset" : " by 7d reset"}`;
-  const dry = candidate.feasible ? "" : " (5h would run dry)";
-  return `[${candidate.class}${score}]${dry}`;
-}
-var init_candidateText = __esm({
-  "src/usage/candidateText.ts"() {
-    "use strict";
-  }
-});
-
 // src/launcher/launchReport.ts
 function poolDetail(pool) {
   const [reason] = pool.reasons;
-  if (pool.movedOff !== void 0) {
-    return { detail: `moved off ${pool.movedOff.identity}: ${pool.movedOff.reason}`, ...reason === void 0 ? {} : { notes: [reason] } };
-  }
   return reason === void 0 ? {} : { detail: reason };
 }
 function rankingNotes(ranking, picked) {
@@ -11342,6 +11402,68 @@ function rankingNotes(ranking, picked) {
     `   ${candidate.reasons.join("; ")}`
   ]);
 }
+function planText(account) {
+  const plan = planOf(account);
+  if (plan.kind === "pay-per-use") {
+    return "pay-per-use";
+  }
+  return plan.recognised ? `${String(plan.capacity)}x` : void 0;
+}
+function loginAccountText(account) {
+  const organisation = account.organizationName !== void 0 && account.organizationType !== void 0 && NAMED_ORGANISATION_TYPES.has(account.organizationType) ? account.organizationRole === void 0 ? account.organizationName : `${account.organizationName} (${account.organizationRole})` : void 0;
+  const parts = [account.emailAddress, organisation, planText(account)].filter((part) => part !== void 0);
+  return parts.length === 0 ? void 0 : parts.join(", ");
+}
+function accountRows(billing) {
+  if (billing === void 0) {
+    return [];
+  }
+  if (billing.provider !== void 0) {
+    const quota = billing.snapshot?.providers[billing.provider]?.quota;
+    const parts = [quota?.account?.email, quota?.level].filter((part) => part !== void 0);
+    return parts.length === 0 ? [] : [{ label: "account", value: parts.join(", "), detail: `provider ${billing.provider}` }];
+  }
+  const account = billing.login ?? billing.snapshot?.account;
+  const text = account === void 0 ? void 0 : loginAccountText(account);
+  return text === void 0 ? [] : [{ label: "account", value: text }];
+}
+function isInformative(window, nowMs) {
+  const effective = effectiveWindow(window, nowMs);
+  return effective.reset || effective.utilization !== void 0 || effective.resetsAtMs !== void 0;
+}
+function quotaRows(billing) {
+  if (billing === void 0) {
+    return [];
+  }
+  const { nowMs } = billing;
+  const state = billing.snapshot?.providers[billing.provider ?? ANTHROPIC_PROVIDER];
+  const recorded = billing.provider === void 0 ? {
+    observedAt: state?.rateLimit?.observedAt,
+    windows: [
+      { label: "5h", window: state?.rateLimit?.unified?.fiveHour },
+      { label: "7d", window: state?.rateLimit?.unified?.sevenDay }
+    ]
+  } : { observedAt: state?.quota?.observedAt, windows: (state?.quota?.windows ?? []).map((window) => ({ label: `${formatPeriod(window)} ${window.measures}`, window })) };
+  const described = recorded.windows.flatMap(({ label, window }) => window !== void 0 && isInformative(window, nowMs) ? [describeWindow(label, window, effectiveWindow(window, nowMs), nowMs)] : []);
+  return recorded.observedAt === void 0 || described.length === 0 ? [] : [{ label: "quota", value: described.join("; "), detail: `recorded ${formatAge(nowMs - Date.parse(recorded.observedAt))} ago` }];
+}
+function movedRows(facts) {
+  const { identity } = facts;
+  if (identity === void 0) {
+    return [];
+  }
+  const moved = (from, detail) => [{ label: "moved", value: `${from} -> ${identity}`, detail, notice: true }];
+  if (facts.limitRelaunchFrom !== void 0) {
+    return moved(facts.limitRelaunchFrom, `${facts.limitRelaunchFrom} ran out of quota; the session resumed here`);
+  }
+  if (facts.pool?.movedOff !== void 0) {
+    return moved(facts.pool.movedOff.identity, `the resumed conversation could not stay: ${facts.pool.movedOff.reason}`);
+  }
+  if (facts.lastRanAs !== void 0 && facts.lastRanAs.identity !== identity) {
+    return moved(facts.lastRanAs.identity, `this directory last ran as ${facts.lastRanAs.identity} ${formatAge(facts.lastRanAs.agoMs)} ago`);
+  }
+  return [];
+}
 function decisionRows(facts) {
   return [
     { label: "identity", value: facts.identity ?? "(none)", detail: facts.identitySource },
@@ -11353,6 +11475,9 @@ function decisionRows(facts) {
         ...facts.ranking === void 0 ? {} : { notes: rankingNotes(facts.ranking, facts.identity) }
       }
     ],
+    ...movedRows(facts),
+    ...accountRows(facts.billing),
+    ...quotaRows(facts.billing),
     ...facts.profile === void 0 ? [] : [{ label: "profile", value: facts.profile.name, detail: facts.profile.source }],
     ...facts.provider === void 0 ? [] : [{ label: "provider", value: facts.provider.name, detail: `credential ${facts.provider.credential}` }],
     ...facts.identityCredential === void 0 ? [] : [{ label: "credential", value: facts.identityCredential, detail: "the identity's own" }]
@@ -11382,10 +11507,16 @@ function farmRow(links, builtDirectories, adopted) {
 function noteRow(text) {
   return { label: "note", value: text };
 }
+var NAMED_ORGANISATION_TYPES;
 var init_launchReport = __esm({
   "src/launcher/launchReport.ts"() {
     "use strict";
     init_candidateText();
+    init_middleware();
+    init_plan2();
+    init_preflight();
+    init_resets();
+    NAMED_ORGANISATION_TYPES = /* @__PURE__ */ new Set(["claude_team", "claude_enterprise"]);
   }
 });
 
@@ -11460,7 +11591,8 @@ function resolvePoolLaunch(params) {
         explanation: `pool ${poolName}: ${move}${pick.reasons.slice(0, REASONS_LOGGED).join("; ")}`,
         reasons: pick.reasons,
         candidates: graph.ranking.candidates,
-        ...movedOff === void 0 ? {} : { movedOff }
+        ...movedOff === void 0 ? {} : { movedOff },
+        ...stickyRead.sticky === void 0 ? {} : { lastRanAs: stickyRead.sticky }
       };
     }
     if (earliestReturn === void 0) {
@@ -11638,7 +11770,8 @@ function pickFromPool(decided, params, parsedArgv, readOnly) {
   return {
     identityDecision: { ...decided, name: resolution.identity },
     poolPick: { name: decided.pool, reasons: resolution.reasons, ...resolution.movedOff === void 0 ? {} : { movedOff: resolution.movedOff } },
-    poolRanking: resolution.candidates
+    poolRanking: resolution.candidates,
+    ...resolution.lastRanAs === void 0 ? {} : { lastRanAs: { identity: resolution.lastRanAs.identity, agoMs: farmRuntime.now() - Date.parse(resolution.lastRanAs.at) } }
   };
 }
 function decideLaunch(params, readOnly) {
@@ -11665,7 +11798,7 @@ function decideLaunch(params, readOnly) {
       return trimmed === "" ? void 0 : trimmed;
     }
   });
-  const { identityDecision, poolPick, poolRanking } = pickFromPool(decidedIdentity, params, parsedArgv, readOnly);
+  const { identityDecision, poolPick, poolRanking, lastRanAs } = pickFromPool(decidedIdentity, params, parsedArgv, readOnly);
   const farmIdentity = configDirEscapeHatchApplies ? void 0 : identityDecision.name;
   const farm = farmIdentity === void 0 ? void 0 : params.farm;
   if (!readOnly && farm !== void 0 && farmIdentity !== void 0) {
@@ -11742,9 +11875,11 @@ function decideLaunch(params, readOnly) {
       log.warn(warning);
     }
   }
+  let billing;
   if (farm !== void 0 && farmIdentity !== void 0) {
+    let snapshot;
     try {
-      const snapshot = readUsageSnapshot(farm.fs, paths.usageSnapshotsDir, farmIdentity);
+      snapshot = readUsageSnapshot(farm.fs, paths.usageSnapshotsDir, farmIdentity);
       for (const warning of quotaWarnings(snapshot, selectedProvider?.name ?? ANTHROPIC_PROVIDER, farm.now())) {
         log.warn(warning);
       }
@@ -11754,6 +11889,16 @@ function decideLaunch(params, readOnly) {
       }
       log.warn(`agent-shim: ${error.message}`);
     }
+    let login;
+    try {
+      login = readAccountMetadata(farm.fs, paths.identitiesDir, farmIdentity);
+    } catch (error) {
+      if (!(error instanceof AccountMetadataError)) {
+        throw error;
+      }
+      log.warn(`agent-shim: ${error.message}`);
+    }
+    billing = { login, snapshot, provider: selectedProvider?.name, nowMs: farm.now() };
   }
   const identityCredentialBlock = selectedProvider === void 0 && farmIdentity !== void 0 ? loadedIdentity?.config.credential : void 0;
   const identityResolution = !readOnly && identityCredentialBlock !== void 0 && farmIdentity !== void 0 ? resolveIdentityCredential(farmIdentity, identityCredentialBlock, env, params.credentials) : void 0;
@@ -11852,6 +11997,8 @@ function decideLaunch(params, readOnly) {
     identityDecision,
     poolPick,
     poolRanking,
+    lastRanAs,
+    billing,
     notes,
     configDirEscapeHatch: configDirEscapeHatchApplies,
     farmIdentity,
@@ -11874,7 +12021,7 @@ function prepareLaunch(params) {
   const { paths, proc, log } = params;
   const { env } = proc;
   const decided = decideLaunch(params, false);
-  const { identityDecision, configProfileDecision, resolvedProvider, identityCredential, poolPick, poolRanking, notes, flags: resolvedFlags, args: finalArgv, configDirEscapeHatch: configDirEscapeHatchApplies, decision } = decided;
+  const { identityDecision, configProfileDecision, resolvedProvider, identityCredential, poolPick, poolRanking, lastRanAs, billing, notes, flags: resolvedFlags, args: finalArgv, configDirEscapeHatch: configDirEscapeHatchApplies, decision } = decided;
   const rows = [
     ...decisionRows({
       identity: identityDecision.name,
@@ -11883,7 +12030,10 @@ function prepareLaunch(params) {
       ranking: resolvedFlags.explain ? poolRanking : void 0,
       profile: configProfileDecision.name === void 0 ? void 0 : { name: configProfileDecision.name, source: configProfileDecision.source },
       provider: resolvedProvider === void 0 ? void 0 : { name: resolvedProvider.name, credential: `${resolvedProvider.credential.target} from ${describeSource(resolvedProvider.credential.source)}` },
-      identityCredential: identityCredential === void 0 ? void 0 : `${identityCredential.target} from ${describeSource(identityCredential.source)}`
+      identityCredential: identityCredential === void 0 ? void 0 : `${identityCredential.target} from ${describeSource(identityCredential.source)}`,
+      billing,
+      lastRanAs,
+      limitRelaunchFrom: params.supervised?.from
     })
   ];
   let warnings = [];
@@ -12068,6 +12218,7 @@ var init_launcher = __esm({
     init_schema();
     init_credential();
     init_middleware();
+    init_account();
     init_preflight();
     init_read();
     init_claudeVersion();
@@ -16308,56 +16459,7 @@ var CheckReportJsonSchema = z21.strictObject({
 // src/frontdoor/controlApi.ts
 init_middleware();
 init_preflight();
-
-// src/usage/resets.ts
-init_preflight();
-init_rateLimit();
-var MS_PER_HOUR3 = 36e5;
-var HOURS_PER_DAY3 = 24;
-function formatPeriod(window) {
-  if (window.periodMs === void 0) {
-    return window.period ?? "unknown period";
-  }
-  const hours = window.periodMs / MS_PER_HOUR3;
-  return hours >= HOURS_PER_DAY3 && Number.isInteger(hours / HOURS_PER_DAY3) ? `${String(hours / HOURS_PER_DAY3)}d` : `${String(hours)}h`;
-}
-function groupOf(row) {
-  return row.resetsAt === void 0 ? 2 : row.reset ? 1 : 0;
-}
-function compareRows(left, right) {
-  return groupOf(left) - groupOf(right) || (left.resetsAt ?? "").localeCompare(right.resetsAt ?? "") || left.identity.localeCompare(right.identity) || left.provider.localeCompare(right.provider) || left.window.localeCompare(right.window);
-}
-function rowOf(snapshot, provider, window, observedAt2, recorded, nowMs) {
-  const effective = effectiveWindow(recorded, nowMs);
-  return {
-    identity: snapshot.identity,
-    provider,
-    window,
-    observedAt: observedAt2,
-    ...recorded.resetsAt === void 0 ? {} : { resetsAt: recorded.resetsAt },
-    reset: effective.reset,
-    ...effective.utilization === void 0 ? {} : { utilization: effective.utilization },
-    ...effective.status === void 0 ? {} : { status: effective.status }
-  };
-}
-function collectResets(snapshots, nowMs) {
-  const rows = snapshots.flatMap(
-    (snapshot) => Object.entries(snapshot.providers).flatMap(([provider, state]) => {
-      const unified = state.rateLimit?.unified;
-      const observedAt2 = state.rateLimit?.observedAt;
-      const overage = unified === void 0 ? void 0 : soleOverageWindow(unified);
-      const headerRows = observedAt2 === void 0 || unified === void 0 ? [] : [
-        ...unified.fiveHour === void 0 ? [] : [rowOf(snapshot, provider, "5h", observedAt2, unified.fiveHour, nowMs)],
-        ...unified.sevenDay === void 0 ? [] : [rowOf(snapshot, provider, "7d", observedAt2, unified.sevenDay, nowMs)],
-        ...overage === void 0 ? [] : [rowOf(snapshot, provider, "extra usage", observedAt2, overage, nowMs)]
-      ];
-      const quota = state.quota;
-      const quotaRows = quota === void 0 ? [] : quota.windows.map((window) => rowOf(snapshot, provider, `${window.measures} ${formatPeriod(window)}`, quota.observedAt, window, nowMs));
-      return [...headerRows, ...quotaRows];
-    })
-  );
-  return { resets: rows.sort(compareRows) };
-}
+init_resets();
 
 // src/usage/resetsSchema.ts
 import { z as z22 } from "zod";
@@ -16567,6 +16669,65 @@ import fs11 from "node:fs";
 import path29 from "node:path";
 init_signIn();
 
+// src/identityAccounts.ts
+init_account();
+
+// src/usage/accountDescription.ts
+function describeAccountOrganisation(account) {
+  const parts = [account.organizationName, account.organizationType].filter((part) => part !== void 0);
+  return parts.length === 0 ? void 0 : parts.join(", ");
+}
+
+// src/identityAccounts.ts
+function readIdentityAccount(fs14, identitiesDir, identity) {
+  try {
+    const account = readAccountMetadata(fs14, identitiesDir, identity);
+    return account === void 0 ? void 0 : { account };
+  } catch (error) {
+    if (error instanceof AccountMetadataError) {
+      return { problem: error.message };
+    }
+    throw error;
+  }
+}
+function summariseIdentityAccount(account) {
+  const summary = {
+    ...account.emailAddress === void 0 ? {} : { emailAddress: account.emailAddress },
+    ...account.organizationName === void 0 ? {} : { organizationName: account.organizationName },
+    ...account.organizationType === void 0 ? {} : { organizationType: account.organizationType },
+    ...account.organizationRole === void 0 ? {} : { organizationRole: account.organizationRole },
+    ...account.billingType === void 0 ? {} : { billingType: account.billingType },
+    ...account.seatTier === void 0 ? {} : { seatTier: account.seatTier }
+  };
+  return Object.keys(summary).length === 0 ? void 0 : summary;
+}
+function loginKeyOf(account) {
+  return account.accountUuid === void 0 ? void 0 : JSON.stringify([account.accountUuid, account.organizationUuid ?? null]);
+}
+function collectByLogin(items, loginOf) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const key = loginOf(item) ?? /* @__PURE__ */ Symbol("no login");
+    const group = groups.get(key);
+    if (group === void 0) {
+      groups.set(key, [item]);
+    } else {
+      group.push(item);
+    }
+  }
+  return [...groups.values()];
+}
+function groupSharedLogins(items, loginOf) {
+  return collectByLogin(items, loginOf).filter((group) => group.length > 1);
+}
+function describeAccountHolder(summary) {
+  const organisation = describeAccountOrganisation(summary);
+  if (summary.emailAddress === void 0) {
+    return organisation;
+  }
+  return organisation === void 0 ? summary.emailAddress : `${summary.emailAddress} (${organisation})`;
+}
+
 // src/codex/siwcStore.ts
 import { z as z26 } from "zod";
 
@@ -16941,6 +17102,10 @@ var DOCTOR_SECTIONS = [
   "frontdoor",
   "models"
 ];
+function joinNames(names) {
+  const last = names.at(-1);
+  return names.length < 2 || last === void 0 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${last}`;
+}
 function refinePathShadow(status, ownExecutablePath, realpath) {
   if (status.status !== "shadowed") {
     return status;
@@ -17188,6 +17353,7 @@ function runDoctor(params) {
   const validProfileNames = new Set(profileSources.keys());
   const validProviderNames = /* @__PURE__ */ new Set([...params.providers.map((entry) => entry.name), ...Object.keys(params.providerAliases ?? {})]);
   const validIdentityNames = /* @__PURE__ */ new Set();
+  const signedInAccounts = [];
   for (const entry of params.identities) {
     const validated3 = validate(IdentitySchema, entry, "identity", entry.name);
     if (!validated3.ok) {
@@ -17237,6 +17403,18 @@ function runDoctor(params) {
       signIn.state === "signed-out" ? `${entry.name} is signed out (${signIn.detail}). Run \`agent-shim run @${entry.name}\` and sign in.` : `${entry.name} ${standing} (${signIn.detail}).`,
       entry.name
     );
+    if (signIn.state === "signed-in" && entry.account !== void 0) {
+      signedInAccounts.push({ name: entry.name, account: entry.account });
+    }
+  }
+  for (const group of groupSharedLogins(signedInAccounts, (entry) => loginKeyOf(entry.account))) {
+    const names = group.map((entry) => entry.name);
+    const holder = group.map((entry) => summariseIdentityAccount(entry.account)).map((summary) => summary === void 0 ? void 0 : describeAccountHolder(summary)).find((described) => described !== void 0);
+    push(
+      "sign-in",
+      "warn",
+      `Identities ${joinNames(names)} hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window and all but one are redundant. Remove the redundant ones with \`agent-shim identity remove <name>\`.`
+    );
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
@@ -17525,7 +17703,7 @@ function collectDoctorReport(params) {
   const identities = identityNames.map((name) => {
     const farmRoot = path29.join(paths.identitiesDir, name);
     const identityPath = path29.join(farmRoot, "identity.json");
-    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: fs11.existsSync(credentialsFilePath(farmRoot)) };
+    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: fs11.existsSync(credentialsFilePath(farmRoot)), account: readIdentityAccount(realFsPort, paths.identitiesDir, name)?.account };
   });
   const profileNames = fs11.existsSync(paths.configProfilesDir) ? fs11.readdirSync(paths.configProfilesDir, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -".json".length)).sort() : [];
   const configProfiles = profileNames.map((name) => {
@@ -20829,6 +21007,7 @@ init_supervisor();
 init_read();
 init_schema2();
 init_preflight();
+init_resets();
 init_pick();
 init_plan2();
 init_poolPick();