agent-shim 11.76.0 → 11.78.0

package/dist/cli.cjs

@@ -29874,19 +29874,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 label2 = row.label.padEnd(labelWidth);
+    lines.push(
+      row.notice === true ? `${indent}${style(NOTICE_FORMATS, label2)}${COLUMN_GAP}${style(NOTICE_FORMATS, row.value)}${detail}` : `${indent}${style(["dim"], label2)}${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"];
   }
 });
 
@@ -38194,7 +38198,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>",
@@ -38300,6 +38304,32 @@ var init_package = __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(label2, window, effective, nowMs) {
+  if (effective.reset) {
+    return `${label2} 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 `${label2} ${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
 function planOf(account) {
   const userTier = account?.userRateLimitTier;
@@ -38872,17 +38902,6 @@ function windowRatio(records) {
   }
   return (last.seven - first.seven) / (last.five - first.five);
 }
-function percent(fraction) {
-  return `${String(Math.round(fraction * PERCENT))}%`;
-}
-function describeWindow(label2, window, effective, nowMs) {
-  if (effective.reset) {
-    return `${label2} 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 `${label2} ${used}${resets}${window.status === "allowed_warning" ? " (nearly used)" : ""}`;
-}
 function capacityOf(plan) {
   return plan.kind === "subscription" ? plan.capacity : 1;
 }
@@ -39075,11 +39094,12 @@ function rankPool(input2) {
     ...holdForReturn === void 0 ? {} : { holdForReturn }
   };
 }
-var MS_PER_SECOND5, 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_SECOND5, 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();
@@ -39090,7 +39110,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;
@@ -67842,24 +67861,71 @@ 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}`;
+// 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`;
 }
-var init_candidateText = __esm({
-  "src/usage/candidateText.ts"() {
+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) };
+}
+function formatResetRow(row, nowMs) {
+  const used = row.utilization === void 0 ? "usage unknown" : `${String(Math.round(row.utilization * PERCENT3))}% used`;
+  const when = row.resetsAt === void 0 ? "no reset time reported" : row.reset ? `reset at ${row.resetsAt}` : `resets ${row.resetsAt} (in ${formatAge(Date.parse(row.resetsAt) - nowMs)})`;
+  return `${row.identity} / ${row.provider}: ${row.window} ${used}, ${when}${row.status === void 0 ? "" : ` (${row.status})`}`;
+}
+var MS_PER_HOUR3, HOURS_PER_DAY3, PERCENT3;
+var init_resets = __esm({
+  "src/usage/resets.ts"() {
     "use strict";
+    init_preflight();
+    init_rateLimit();
+    MS_PER_HOUR3 = 36e5;
+    HOURS_PER_DAY3 = 24;
+    PERCENT3 = 100;
   }
 });
 
 // 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) {
@@ -67868,6 +67934,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 text5 = account === void 0 ? void 0 : loginAccountText(account);
+  return text5 === void 0 ? [] : [{ label: "account", value: text5 }];
+}
+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: label2, window }) => window !== void 0 && isInformative(window, nowMs) ? [describeWindow(label2, 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 },
@@ -67879,6 +68007,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" }]
@@ -67908,10 +68039,16 @@ function farmRow(links, builtDirectories, adopted) {
 function noteRow(text5) {
   return { label: "note", value: text5 };
 }
+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"]);
   }
 });
 
@@ -68517,7 +68654,7 @@ function ageQuotaMap(quota, elapsedMs) {
     Object.entries(quota).map(([key, bucket]) => [key, bucket?.reset_in_seconds === void 0 ? bucket : { ...bucket, reset_in_seconds: Math.max(0, bucket.reset_in_seconds - elapsedSec) }])
   );
 }
-var MS_PER_SECOND9, DEFAULT_RETRY_AFTER_SECONDS, FRACTION_DIGITS, GEMINI_5H_KEYS, GEMINI_WEEKLY_KEYS, ARGON_WEEKLY_KEYS, THIRD_PARTY_5H_KEYS, THIRD_PARTY_WEEKLY_KEYS, QUOTA_FAMILY_WINDOWS, SECONDS_PER_HOUR, HOURS_PER_FIVE_HOUR_WINDOW, DAYS_PER_WEEK, HOURS_PER_DAY3, FIVE_HOUR_PERIOD_SECONDS, WEEK_PERIOD_SECONDS, ANTIGRAVITY_QUOTA_REFRESH_MS;
+var MS_PER_SECOND9, DEFAULT_RETRY_AFTER_SECONDS, FRACTION_DIGITS, GEMINI_5H_KEYS, GEMINI_WEEKLY_KEYS, ARGON_WEEKLY_KEYS, THIRD_PARTY_5H_KEYS, THIRD_PARTY_WEEKLY_KEYS, QUOTA_FAMILY_WINDOWS, SECONDS_PER_HOUR, HOURS_PER_FIVE_HOUR_WINDOW, DAYS_PER_WEEK, HOURS_PER_DAY4, FIVE_HOUR_PERIOD_SECONDS, WEEK_PERIOD_SECONDS, ANTIGRAVITY_QUOTA_REFRESH_MS;
 var init_quota = __esm({
   "src/antigravity/quota.ts"() {
     "use strict";
@@ -68541,9 +68678,9 @@ var init_quota = __esm({
     SECONDS_PER_HOUR = 3600;
     HOURS_PER_FIVE_HOUR_WINDOW = 5;
     DAYS_PER_WEEK = 7;
-    HOURS_PER_DAY3 = 24;
+    HOURS_PER_DAY4 = 24;
     FIVE_HOUR_PERIOD_SECONDS = HOURS_PER_FIVE_HOUR_WINDOW * SECONDS_PER_HOUR;
-    WEEK_PERIOD_SECONDS = DAYS_PER_WEEK * HOURS_PER_DAY3 * SECONDS_PER_HOUR;
+    WEEK_PERIOD_SECONDS = DAYS_PER_WEEK * HOURS_PER_DAY4 * SECONDS_PER_HOUR;
     ANTIGRAVITY_QUOTA_REFRESH_MS = 6e4;
   }
 });
@@ -69215,7 +69352,7 @@ async function fetchCatalogue(params) {
   }
   throw new CatalogueFetchError(`no catalogue from ${outcomes.join("; ")}`);
 }
-var import_picomatch3, DEFAULT_CANDIDATE_URLS, MS_PER_SECOND10, SECONDS_PER_HOUR3, HOURS_PER_DAY4, MS_PER_HOUR3, HOURS_BETWEEN_RETRIES, HTTP_OK, HTTP_MULTIPLE_CHOICES, CATALOGUE_MAX_AGE_MS, CATALOGUE_RETRY_MS, CATALOGUE_REQUEST_SECONDS, CATALOGUE_REQUEST_TIMEOUT_MS, CATALOGUE_REFRESH_TIMEOUT_MS, CatalogueModelSchema, CatalogueCacheSchema, CatalogueFetchError;
+var import_picomatch3, DEFAULT_CANDIDATE_URLS, MS_PER_SECOND10, SECONDS_PER_HOUR3, HOURS_PER_DAY5, MS_PER_HOUR4, HOURS_BETWEEN_RETRIES, HTTP_OK, HTTP_MULTIPLE_CHOICES, CATALOGUE_MAX_AGE_MS, CATALOGUE_RETRY_MS, CATALOGUE_REQUEST_SECONDS, CATALOGUE_REQUEST_TIMEOUT_MS, CATALOGUE_REFRESH_TIMEOUT_MS, CatalogueModelSchema, CatalogueCacheSchema, CatalogueFetchError;
 var init_providerCatalogue = __esm({
   "src/providerCatalogue.ts"() {
     "use strict";
@@ -69225,13 +69362,13 @@ var init_providerCatalogue = __esm({
     DEFAULT_CANDIDATE_URLS = 2;
     MS_PER_SECOND10 = 1e3;
     SECONDS_PER_HOUR3 = 3600;
-    HOURS_PER_DAY4 = 24;
-    MS_PER_HOUR3 = SECONDS_PER_HOUR3 * MS_PER_SECOND10;
+    HOURS_PER_DAY5 = 24;
+    MS_PER_HOUR4 = SECONDS_PER_HOUR3 * MS_PER_SECOND10;
     HOURS_BETWEEN_RETRIES = 1;
     HTTP_OK = 200;
     HTTP_MULTIPLE_CHOICES = 300;
-    CATALOGUE_MAX_AGE_MS = HOURS_PER_DAY4 * MS_PER_HOUR3;
-    CATALOGUE_RETRY_MS = HOURS_BETWEEN_RETRIES * MS_PER_HOUR3;
+    CATALOGUE_MAX_AGE_MS = HOURS_PER_DAY5 * MS_PER_HOUR4;
+    CATALOGUE_RETRY_MS = HOURS_BETWEEN_RETRIES * MS_PER_HOUR4;
     CATALOGUE_REQUEST_SECONDS = 10;
     CATALOGUE_REQUEST_TIMEOUT_MS = CATALOGUE_REQUEST_SECONDS * MS_PER_SECOND10;
     CATALOGUE_REFRESH_TIMEOUT_MS = DEFAULT_CANDIDATE_URLS * CATALOGUE_REQUEST_TIMEOUT_MS;
@@ -69407,7 +69544,7 @@ function joined(parts) {
   const last = parts[parts.length - 1];
   return last === void 0 || parts.length === 1 ? last ?? "" : `${parts.slice(0, -1).join(", ")} and ${last}`;
 }
-function rowOf(model, reaches) {
+function rowOf2(model, reaches) {
   const lead = reaches.find((reach) => reach.standing === "first") ?? reaches[0];
   if (lead === void 0) {
     throw new Error(`model ${model} is reached by no tier`);
@@ -69429,7 +69566,7 @@ function rowsOfTable(table) {
       reachesByModel.set(model, reaches);
     });
   }
-  return [...reachesByModel].map(([model, reaches]) => rowOf(model, reaches));
+  return [...reachesByModel].map(([model, reaches]) => rowOf2(model, reaches));
 }
 function antigravityRows(provider) {
   const config2 = resolveAntigravityConfig(provider.antigravity);
@@ -69606,7 +69743,8 @@ function resolvePoolLaunch(params) {
         explanation: `pool ${poolName}: ${move}${pick2.reasons.slice(0, REASONS_LOGGED).join("; ")}`,
         reasons: pick2.reasons,
         candidates: graph.ranking.candidates,
-        ...movedOff === void 0 ? {} : { movedOff }
+        ...movedOff === void 0 ? {} : { movedOff },
+        ...stickyRead.sticky === void 0 ? {} : { lastRanAs: stickyRead.sticky }
       };
     }
     if (earliestReturn === void 0) {
@@ -69801,7 +69939,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) {
@@ -69828,7 +69967,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) {
@@ -69905,9 +70044,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);
       }
@@ -69917,6 +70058,16 @@ function decideLaunch(params, readOnly) {
       }
       log.warn(`agent-shim: ${error63.message}`);
     }
+    let login;
+    try {
+      login = readAccountMetadata(farm.fs, paths.identitiesDir, farmIdentity);
+    } catch (error63) {
+      if (!(error63 instanceof AccountMetadataError)) {
+        throw error63;
+      }
+      log.warn(`agent-shim: ${error63.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;
@@ -70015,6 +70166,8 @@ function decideLaunch(params, readOnly) {
     identityDecision,
     poolPick,
     poolRanking,
+    lastRanAs,
+    billing,
     notes,
     configDirEscapeHatch: configDirEscapeHatchApplies,
     farmIdentity,
@@ -70037,7 +70190,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,
@@ -70046,7 +70199,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 = [];
@@ -70235,6 +70391,7 @@ var init_launcher = __esm({
     init_schema();
     init_credential();
     init_middleware();
+    init_account();
     init_preflight();
     init_read();
     init_claudeVersion();
@@ -70489,7 +70646,7 @@ function zaiWindow(limit) {
   return {
     measures: ZAI_MEASURES[limit.type] ?? limit.type.toLowerCase(),
     ...unitMs === void 0 ? { period: `unit ${String(limit.unit)} x ${String(limit.number)}` } : { periodMs: unitMs * limit.number },
-    utilization: limit.percentage / PERCENT3,
+    utilization: limit.percentage / PERCENT4,
     ...limit.nextResetTime === void 0 ? {} : { resetsAt: new Date(limit.nextResetTime).toISOString() },
     ...limit.usage === void 0 ? {} : { limit: limit.usage },
     ...limit.currentValue === void 0 ? {} : { used: limit.currentValue },
@@ -70524,9 +70681,9 @@ function adapterFor(baseUrl) {
 }
 function quotaFreshnessMs(quota) {
   const lengths = quota.windows.flatMap((window) => window.periodMs === void 0 ? [] : [window.periodMs]);
-  return lengths.length === 0 ? Number.POSITIVE_INFINITY : Math.min(...lengths) / PERCENT3;
+  return lengths.length === 0 ? Number.POSITIVE_INFINITY : Math.min(...lengths) / PERCENT4;
 }
-var ProviderQuotaError, MS_PER_SECOND11, SECONDS_PER_HOUR4, HOURS_PER_DAY5, DAYS_PER_MONTH, PERCENT3, HTTP_OK2, ZAI_SOURCE, ZAI_HOST, ZAI_QUOTA_URL, ZAI_UNIT_HOURS, ZAI_UNIT_MONTHS, ZAI_UNIT_MS, ZAI_MEASURES, ZaiLimitSchema, ZaiResponseSchema, zaiQuotaAdapter, OPENROUTER_SOURCE, OPENROUTER_HOST, OPENROUTER_KEY_URL, OPENROUTER_CREDITS_URL, HTTP_FORBIDDEN, MS_PER_DAY3, OpenRouterKeySchema, OpenRouterCreditsSchema, openRouterQuotaAdapter, ANTIGRAVITY_SOURCE, ANTIGRAVITY_HOST, ANTIGRAVITY_QUOTA_URL, ANTIGRAVITY_USER_URL, GOOGLE_TOKENINFO_URL, FIVE_HOURS2, DAYS_PER_WEEK2, FIVE_HOURS_MS, WEEK_MS, AntigravityBucketSchema, AntigravitySummarySchema, GoogleTokenInfoSchema, AntigravityUserSchema, ANTIGRAVITY_WINDOW_MS, antigravityQuotaAdapter, PROVIDER_QUOTA_ADAPTERS;
+var ProviderQuotaError, MS_PER_SECOND11, SECONDS_PER_HOUR4, HOURS_PER_DAY6, DAYS_PER_MONTH, PERCENT4, HTTP_OK2, ZAI_SOURCE, ZAI_HOST, ZAI_QUOTA_URL, ZAI_UNIT_HOURS, ZAI_UNIT_MONTHS, ZAI_UNIT_MS, ZAI_MEASURES, ZaiLimitSchema, ZaiResponseSchema, zaiQuotaAdapter, OPENROUTER_SOURCE, OPENROUTER_HOST, OPENROUTER_KEY_URL, OPENROUTER_CREDITS_URL, HTTP_FORBIDDEN, MS_PER_DAY3, OpenRouterKeySchema, OpenRouterCreditsSchema, openRouterQuotaAdapter, ANTIGRAVITY_SOURCE, ANTIGRAVITY_HOST, ANTIGRAVITY_QUOTA_URL, ANTIGRAVITY_USER_URL, GOOGLE_TOKENINFO_URL, FIVE_HOURS2, DAYS_PER_WEEK2, FIVE_HOURS_MS, WEEK_MS, AntigravityBucketSchema, AntigravitySummarySchema, GoogleTokenInfoSchema, AntigravityUserSchema, ANTIGRAVITY_WINDOW_MS, antigravityQuotaAdapter, PROVIDER_QUOTA_ADAPTERS;
 var init_providerQuota = __esm({
   "src/usage/providerQuota.ts"() {
     "use strict";
@@ -70541,9 +70698,9 @@ var init_providerQuota = __esm({
     };
     MS_PER_SECOND11 = 1e3;
     SECONDS_PER_HOUR4 = 3600;
-    HOURS_PER_DAY5 = 24;
+    HOURS_PER_DAY6 = 24;
     DAYS_PER_MONTH = 30;
-    PERCENT3 = 100;
+    PERCENT4 = 100;
     HTTP_OK2 = 200;
     ZAI_SOURCE = "z.ai";
     ZAI_HOST = "api.z.ai";
@@ -70552,7 +70709,7 @@ var init_providerQuota = __esm({
     ZAI_UNIT_MONTHS = 5;
     ZAI_UNIT_MS = /* @__PURE__ */ new Map([
       [ZAI_UNIT_HOURS, SECONDS_PER_HOUR4 * MS_PER_SECOND11],
-      [ZAI_UNIT_MONTHS, DAYS_PER_MONTH * HOURS_PER_DAY5 * SECONDS_PER_HOUR4 * MS_PER_SECOND11]
+      [ZAI_UNIT_MONTHS, DAYS_PER_MONTH * HOURS_PER_DAY6 * SECONDS_PER_HOUR4 * MS_PER_SECOND11]
     ]);
     ZAI_MEASURES = { TOKENS_LIMIT: "tokens", TIME_LIMIT: "tool-calls" };
     ZaiLimitSchema = external_exports.object({
@@ -70604,7 +70761,7 @@ var init_providerQuota = __esm({
     OPENROUTER_KEY_URL = `https://${OPENROUTER_HOST}/api/v1/key`;
     OPENROUTER_CREDITS_URL = `https://${OPENROUTER_HOST}/api/v1/credits`;
     HTTP_FORBIDDEN = 403;
-    MS_PER_DAY3 = HOURS_PER_DAY5 * SECONDS_PER_HOUR4 * MS_PER_SECOND11;
+    MS_PER_DAY3 = HOURS_PER_DAY6 * SECONDS_PER_HOUR4 * MS_PER_SECOND11;
     OpenRouterKeySchema = external_exports.object({
       data: external_exports.object({
         limit: external_exports.number().nonnegative().nullable(),
@@ -70653,7 +70810,7 @@ var init_providerQuota = __esm({
     FIVE_HOURS2 = 5;
     DAYS_PER_WEEK2 = 7;
     FIVE_HOURS_MS = FIVE_HOURS2 * SECONDS_PER_HOUR4 * MS_PER_SECOND11;
-    WEEK_MS = DAYS_PER_WEEK2 * HOURS_PER_DAY5 * SECONDS_PER_HOUR4 * MS_PER_SECOND11;
+    WEEK_MS = DAYS_PER_WEEK2 * HOURS_PER_DAY6 * SECONDS_PER_HOUR4 * MS_PER_SECOND11;
     AntigravityBucketSchema = external_exports.object({
       bucketId: external_exports.string(),
       remainingFraction: external_exports.number().optional(),
@@ -117586,7 +117743,7 @@ function summariseIdentityAccount(account) {
 function loginKeyOf(account) {
   return account.accountUuid === void 0 ? void 0 : JSON.stringify([account.accountUuid, account.organizationUuid ?? null]);
 }
-function groupByLogin(items, loginOf) {
+function collectByLogin(items, loginOf) {
   const groups = /* @__PURE__ */ new Map();
   for (const item of items) {
     const key = loginOf(item) ?? /* @__PURE__ */ Symbol("no login");
@@ -117597,7 +117754,13 @@ function groupByLogin(items, loginOf) {
       group.push(item);
     }
   }
-  return [...groups.values()].flat();
+  return [...groups.values()];
+}
+function groupByLogin(items, loginOf) {
+  return collectByLogin(items, loginOf).flat();
+}
+function groupSharedLogins(items, loginOf) {
+  return collectByLogin(items, loginOf).filter((group) => group.length > 1);
 }
 function describeAccountHolder(summary) {
   const organisation = describeAccountOrganisation(summary);
@@ -123366,6 +123529,10 @@ var DOCTOR_SECTIONS = [
   "frontdoor",
   "models"
 ];
+function joinNames(names) {
+  const last = names.at(-1);
+  return names.length < 2 || last === void 0 ? names.join("") : `${names.slice(0, -1).join(", ")} and ${last}`;
+}
 function refinePathShadow(status, ownExecutablePath, realpath) {
   if (status.status !== "shadowed") {
     return status;
@@ -123613,6 +123780,7 @@ function runDoctor(params) {
   const validProfileNames = new Set(profileSources.keys());
   const validProviderNames = /* @__PURE__ */ new Set([...params.providers.map((entry) => entry.name), ...Object.keys(params.providerAliases ?? {})]);
   const validIdentityNames = /* @__PURE__ */ new Set();
+  const signedInAccounts = [];
   for (const entry of params.identities) {
     const validated2 = validate3(IdentitySchema, entry, "identity", entry.name);
     if (!validated2.ok) {
@@ -123662,6 +123830,18 @@ function runDoctor(params) {
       signIn.state === "signed-out" ? `${entry.name} is signed out (${signIn.detail}). Run \`agent-shim run @${entry.name}\` and sign in.` : `${entry.name} ${standing} (${signIn.detail}).`,
       entry.name
     );
+    if (signIn.state === "signed-in" && entry.account !== void 0) {
+      signedInAccounts.push({ name: entry.name, account: entry.account });
+    }
+  }
+  for (const group of groupSharedLogins(signedInAccounts, (entry) => loginKeyOf(entry.account))) {
+    const names = group.map((entry) => entry.name);
+    const holder = group.map((entry) => summariseIdentityAccount(entry.account)).map((summary) => summary === void 0 ? void 0 : describeAccountHolder(summary)).find((described) => described !== void 0);
+    push(
+      "sign-in",
+      "warn",
+      `Identities ${joinNames(names)} hold the same login${holder === void 0 ? "" : ` (${holder})`}, so they share one quota window and all but one are redundant. Remove the redundant ones with \`agent-shim identity remove <name>\`.`
+    );
   }
   const validatedGlobalConfig = params.globalConfig.raw === void 0 ? void 0 : validateJson(GlobalConfigSchema, params.globalConfig);
   const pools = validatedGlobalConfig?.ok === true ? validatedGlobalConfig.data.pools ?? {} : {};
@@ -123950,7 +124130,7 @@ function collectDoctorReport(params) {
   const identities = identityNames.map((name) => {
     const farmRoot = import_node_path47.default.join(paths.identitiesDir, name);
     const identityPath = import_node_path47.default.join(farmRoot, "identity.json");
-    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: import_node_fs20.default.existsSync(credentialsFilePath(farmRoot)) };
+    return { name, path: identityPath, raw: realFsPort.readFileUtf8(identityPath), farmRoot, credentialsFilePresent: import_node_fs20.default.existsSync(credentialsFilePath(farmRoot)), account: readIdentityAccount(realFsPort, paths.identitiesDir, name)?.account };
   });
   const profileNames = import_node_fs20.default.existsSync(paths.configProfilesDir) ? import_node_fs20.default.readdirSync(paths.configProfilesDir, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -".json".length)).sort() : [];
   const configProfiles = profileNames.map((name) => {
@@ -129577,62 +129757,7 @@ var CheckReportJsonSchema = external_exports.strictObject({
 // src/frontdoor/controlApi.ts
 init_middleware();
 init_preflight();
-
-// src/usage/resets.ts
-init_preflight();
-init_rateLimit();
-var MS_PER_HOUR4 = 36e5;
-var HOURS_PER_DAY6 = 24;
-var PERCENT4 = 100;
-function formatPeriod(window) {
-  if (window.periodMs === void 0) {
-    return window.period ?? "unknown period";
-  }
-  const hours = window.periodMs / MS_PER_HOUR4;
-  return hours >= HOURS_PER_DAY6 && Number.isInteger(hours / HOURS_PER_DAY6) ? `${String(hours / HOURS_PER_DAY6)}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 rowOf2(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 ? [] : [rowOf2(snapshot, provider, "5h", observedAt2, unified.fiveHour, nowMs)],
-        ...unified.sevenDay === void 0 ? [] : [rowOf2(snapshot, provider, "7d", observedAt2, unified.sevenDay, nowMs)],
-        ...overage === void 0 ? [] : [rowOf2(snapshot, provider, "extra usage", observedAt2, overage, nowMs)]
-      ];
-      const quota = state.quota;
-      const quotaRows = quota === void 0 ? [] : quota.windows.map((window) => rowOf2(snapshot, provider, `${window.measures} ${formatPeriod(window)}`, quota.observedAt, window, nowMs));
-      return [...headerRows, ...quotaRows];
-    })
-  );
-  return { resets: rows.sort(compareRows) };
-}
-function formatResetRow(row, nowMs) {
-  const used = row.utilization === void 0 ? "usage unknown" : `${String(Math.round(row.utilization * PERCENT4))}% used`;
-  const when = row.resetsAt === void 0 ? "no reset time reported" : row.reset ? `reset at ${row.resetsAt}` : `resets ${row.resetsAt} (in ${formatAge(Date.parse(row.resetsAt) - nowMs)})`;
-  return `${row.identity} / ${row.provider}: ${row.window} ${used}, ${when}${row.status === void 0 ? "" : ` (${row.status})`}`;
-}
+init_resets();
 
 // src/usage/resetsSchema.ts
 init_zod();
@@ -157356,6 +157481,7 @@ init_commandDeps();
 init_realPorts();
 init_account();
 init_signIn();
+init_resets();
 init_read();
 init_anthropicUsageRefresh();
 init_middleware();
@@ -158297,7 +158423,7 @@ async function supervise(deps, first) {
         launch = { ...base, conversation: "resume", member: identity };
         continue;
       }
-      launch = { ...base, conversation: "resume", member: outcome.to, ...outcome.kind === "remodel" ? { model: outcome.model } : {} };
+      launch = { ...base, conversation: "resume", member: outcome.to, from: identity, ...outcome.kind === "remodel" ? { model: outcome.model } : {} };
       const compactedOnOld = compactedHere;
       compactedHere = false;
       if (compaction !== void 0) {