@modelprofile.com/authswitch 3.1.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/dist_ts/00_commitinfo_data.js +1 -1
  2. package/dist_ts/accounts.d.ts +25 -2
  3. package/dist_ts/accounts.js +112 -15
  4. package/dist_ts/classes.accountlist.d.ts +10 -3
  5. package/dist_ts/classes.accountlist.js +71 -34
  6. package/dist_ts/classes.claudecodeharness.d.ts +2 -2
  7. package/dist_ts/classes.claudecodeharness.js +3 -3
  8. package/dist_ts/classes.claudestatus.d.ts +2 -2
  9. package/dist_ts/classes.claudestatus.js +7 -6
  10. package/dist_ts/classes.cli.d.ts +15 -0
  11. package/dist_ts/classes.cli.js +51 -16
  12. package/dist_ts/classes.codexharness.d.ts +2 -2
  13. package/dist_ts/classes.codexharness.js +3 -3
  14. package/dist_ts/classes.codexstatus.d.ts +3 -3
  15. package/dist_ts/classes.codexstatus.js +12 -11
  16. package/dist_ts/classes.fileharness.d.ts +2 -2
  17. package/dist_ts/classes.limits.js +56 -18
  18. package/dist_ts/classes.opencodeharness.d.ts +2 -2
  19. package/dist_ts/classes.opencodeharness.js +3 -3
  20. package/dist_ts/classes.tui.js +7 -4
  21. package/dist_ts/interfaces.harness.d.ts +17 -5
  22. package/dist_ts/interfaces.list.d.ts +5 -1
  23. package/package.json +2 -2
  24. package/readme.md +102 -22
  25. package/ts/00_commitinfo_data.ts +1 -1
  26. package/ts/accounts.ts +105 -12
  27. package/ts/classes.accountlist.ts +74 -35
  28. package/ts/classes.claudecodeharness.ts +3 -3
  29. package/ts/classes.claudestatus.ts +7 -6
  30. package/ts/classes.cli.ts +56 -15
  31. package/ts/classes.codexharness.ts +3 -3
  32. package/ts/classes.codexstatus.ts +12 -11
  33. package/ts/classes.fileharness.ts +2 -2
  34. package/ts/classes.limits.ts +63 -19
  35. package/ts/classes.opencodeharness.ts +3 -3
  36. package/ts/classes.tui.ts +6 -3
  37. package/ts/interfaces.harness.ts +19 -2
  38. package/ts/interfaces.list.ts +5 -1
@@ -1,5 +1,5 @@
1
1
  import * as plugins from './plugins.js';
2
- import { accountDetails, accountPlan, accountQuotaSummary, accountResets, accountState, accountUsageWindows, usageWindowName, until, readAccountRows } from './accounts.js';
2
+ import { accountBadge, accountDetails, accountPlan, accountQuotaSummary, accountResets, accountState, accountUsageWindows, usageWindowName, until, readAccountRows } from './accounts.js';
3
3
  import { plainText } from './formatting.js';
4
4
  import { AuthSwitchOperations } from './classes.operations.js';
5
5
  import { describeHarnessProcesses, describeStopOutcome } from './classes.harnessprocesses.js';
@@ -176,13 +176,16 @@ export class AuthSwitchTui {
176
176
  return;
177
177
  }
178
178
  }
179
- if (!await screen.confirm(`Switch ${plainText(harness.label)} to ${plainText(target.label)}?`, { confirmLabel: 'Switch' }))
179
+ // The dashboard already holds this account's status, so the badge costs no further lookup.
180
+ const badge = accountBadge(rows.find(row => row.account.id === target.id)?.status);
181
+ if (!await screen.confirm(`Switch ${plainText(harness.label)} to ${plainText(target.label)}${badge}?`, { confirmLabel: 'Switch' }))
180
182
  return;
181
183
  if (screen.signal.aborted)
182
184
  return;
183
185
  const outcome = await this.operations.run(harness, { harnessId: harness.id, action: 'switch', accountId: target.id }, message => screen.confirm(message), settleInstances(screen));
184
186
  await refresh(screen);
185
- showOutcome(outcome);
187
+ if (showOutcome(outcome))
188
+ ui.logs.append(`Now active: ${plainText(target.label)}${badge}`);
186
189
  };
187
190
  const remove = async (screen) => {
188
191
  const selected = table.selected;
@@ -238,4 +241,4 @@ export class AuthSwitchTui {
238
241
  return 0;
239
242
  }
240
243
  }
241
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tui.js","sourceRoot":"","sources":["../ts/classes.tui.ts"],"names":[],"mappings":"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"}
244
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tui.js","sourceRoot":"","sources":["../ts/classes.tui.ts"],"names":[],"mappings":"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"}
@@ -127,12 +127,19 @@ export interface IHarnessUsageWindow {
127
127
  /** Set when the provider picks this window as the one a single-value summary shows. */
128
128
  headline?: true;
129
129
  }
130
+ /**
131
+ * The provider's own name for an account's plan, and where that name comes from.
132
+ *
133
+ * `live` was read from the provider in this lookup; `stored` is the last name the saved login
134
+ * carries, which is the only answer available while a provider cannot be reached.
135
+ */
136
+ export interface IAccountType {
137
+ plan: string;
138
+ source: 'live' | 'stored';
139
+ }
130
140
  export interface IHarnessStatusSummary {
131
141
  /** A plan name does not imply an active billing status. */
132
- subscription?: {
133
- plan: string;
134
- source: 'live' | 'stored';
135
- };
142
+ subscription?: IAccountType;
136
143
  /** Live billing information only. Never infer these fields from a plan or entitlement expiry. */
137
144
  billing?: {
138
145
  hasActiveSubscription?: boolean;
@@ -157,6 +164,11 @@ export interface IHarnessOutcome {
157
164
  lines: string[];
158
165
  problems: string[];
159
166
  }
167
+ /** A read-only status lookup. */
168
+ export interface IHarnessStatusOptions {
169
+ /** Cancels the lookup's requests; an adapter still bounds each request with its own timeout. */
170
+ signal?: AbortSignal;
171
+ }
160
172
  /** A single text-only inference request. Credentials remain inside the adapter. */
161
173
  export interface IHarnessPreuseOptions {
162
174
  prompt: string;
@@ -179,7 +191,7 @@ export interface IAuthHarness {
179
191
  readState(): THarnessResult<IHarnessState>;
180
192
  /** Running instances of this harness, when the adapter owns their lifecycle. */
181
193
  readonly processes?: IHarnessProcessControl;
182
- readAccountStatus(accountIdArg: string): Promise<IHarnessAccountStatus>;
194
+ readAccountStatus(accountIdArg: string, optionsArg?: IHarnessStatusOptions): Promise<IHarnessAccountStatus>;
183
195
  readonly loginProviders?: IHarnessLoginProvider[];
184
196
  beginLogin?(options: IHarnessLoginOptions): Promise<IHarnessLoginHandle>;
185
197
  /** Optional quota-consuming capability; never changes the active login. */
@@ -1,4 +1,4 @@
1
- import type { IHarnessAccount, IHarnessAccountStatus, IHarnessCredentialDrift, TUsageSeverity } from './interfaces.harness.js';
1
+ import type { IAccountType, IHarnessAccount, IHarnessAccountStatus, IHarnessCredentialDrift, TUsageSeverity } from './interfaces.harness.js';
2
2
  /** Credential-free, versioned output of list --json. Missing status fields stay omitted. */
3
3
  export interface IAccountList {
4
4
  schemaVersion: 2;
@@ -37,6 +37,8 @@ export interface IAccountLimitRow {
37
37
  accountId: string | null;
38
38
  slotId?: string;
39
39
  isActive: boolean;
40
+ /** The adapter's plan name (`max`, `pro`), sanitised but not display-formatted; null when none is known or the row names no account. */
41
+ accountType: IAccountType | null;
40
42
  /** The provider's own window name, or null when no limit data is available. */
41
43
  limitType: string | null;
42
44
  scope: 'account' | 'feature' | null;
@@ -66,6 +68,8 @@ export interface IActiveAccountRow {
66
68
  account: string | null;
67
69
  accountId: string | null;
68
70
  slotId?: string;
71
+ /** The adapter's plan name (`max`, `pro`), sanitised but not display-formatted; null when none is known or the row names no account. */
72
+ accountType: IAccountType | null;
69
73
  /** When authswitch last saved this login; null when it was never stashed. */
70
74
  savedAt: string | null;
71
75
  /** Human elapsed time for the same `savedAt`, relative to `generatedAt`. */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@modelprofile.com/authswitch",
3
- "version": "3.1.0",
3
+ "version": "3.3.0",
4
4
  "private": false,
5
5
  "description": "Manage Codex, OpenCode and Claude Code accounts with guided switching and live usage status",
6
6
  "main": "dist_ts/index.js",
@@ -31,7 +31,7 @@
31
31
  "dependencies": {
32
32
  "@modelprofile.com/flexharness-models": "^7.0.1",
33
33
  "@modelprofile.com/flexharness-providers": "^7.0.1",
34
- "@push.rocks/smartconsole": "^1.1.0"
34
+ "@push.rocks/smartconsole": "^1.3.0"
35
35
  },
36
36
  "files": [
37
37
  "ts/**/*",
package/readme.md CHANGED
@@ -307,6 +307,34 @@ authswitch codex use
307
307
 
308
308
  The account argument also accepts the directory slug, the local part, or a unique prefix, so `authswitch codex use alice` resolves to `alice@example.com` when that is unambiguous. It is deliberately not a substring match — this argument decides which credential becomes active, and an incidental substring hit should never pick an account you did not name.
309
309
 
310
+ So you know what you switch to, every harness's switch names the account with a
311
+ badge of its type and its current usage:
312
+
313
+ ```
314
+ ? Which Claude Code account should be active?
315
+ ❯ phil@example.com (active) (type:Max) (5h:12%) (w:75%)
316
+ alice@example.com (type:Pro, unverified) (w:40%)
317
+ ...
318
+ Now active: alice@example.com (type:Pro, unverified) (w:40%)
319
+ ```
320
+
321
+ The badge appears in the account picker of `use`, in the dashboard's switch
322
+ confirmation and on the `Now active:` line that reports a completed switch (in the
323
+ dashboard, its activity log). `type` is the account type as `limits` shows it; `5h`
324
+ and `w` are the account's five-hour and weekly usage windows, rounded to whole
325
+ percent. Feature limits never appear in it, and when several account windows share a
326
+ period without the provider picking one of them, that part is left out rather than
327
+ guessed.
328
+
329
+ Usage is read live, read-only and once per command. The picker looks up the offered
330
+ accounts, at most four at a time, before it asks; a switch named on the command line
331
+ switches first and then looks up only its target for the `Now active:` line. Whatever
332
+ has not answered after 2.5 seconds is left out and its requests are cancelled, so the
333
+ command still exits at once. Every part the provider did not report is omitted, and
334
+ with none known the account is named alone. Reading usage never delays the switch
335
+ beyond that deadline and never fails it. The dashboard reuses the status it already
336
+ shows and makes no extra lookup.
337
+
310
338
  ## What a switch actually does
311
339
 
312
340
  `use` runs as one sequence, and steps 1 to 4 stop at the first failure:
@@ -363,34 +391,54 @@ no invented 5-hour limit.
363
391
  Email addresses identify Codex accounts throughout the overview, usage/reset
364
392
  schedules, earned reset expiry details, grouped credits and activity metrics,
365
393
  saved-login notes and availability/actions tables. Other harnesses use their
366
- account labels. Provider facts already represented by structured fields are not
367
- repeated. Narrow terminals use compact account sections. Missing
368
- data stays Unavailable or Not reported; known zeroes remain zero. Stored plans are
369
- marked unverified. Renewal/cancellation dates are shown only when an adapter can
394
+ account labels. When accounts of one harness share a label, every table numbers
395
+ the later ones (`alice@example.com (2)`), so each account keeps its own column in
396
+ the metric comparisons and reads the same everywhere. Provider facts already
397
+ represented by structured fields are not repeated. Narrow terminals use compact
398
+ account sections. Missing
399
+ data stays Unavailable or Not reported; known zeroes remain zero. Plans read as in
400
+ `limits` and the switch badge (`Max`), and stored plans are marked unverified
401
+ (`Plus, unverified`). Renewal/cancellation dates are shown only when an adapter can
370
402
  provide live billing data. Codex uses the desktop app's account-check endpoint for
371
403
  automatic renewal, explicit renewal/cancellation dates and subscription expiry.
372
404
 
405
+ Tables that list an account on several rows (the usage/reset schedule,
406
+ feature-specific limits, earned reset details, and availability/actions) draw a
407
+ divider between one account and the next. The divider follows the account id, not
408
+ the email, so two accounts that share an address stay separate blocks, and the
409
+ harness-level availability row is a block of its own. The overview and the metric
410
+ comparisons show each account once and have no dividers. Each `list` section covers
411
+ one harness, so no colour line is drawn. Narrow terminals separate the same blocks
412
+ with a rule line.
413
+
373
414
  ### Condensed views
374
415
 
375
416
  `authswitch limits` answers "how much is left, and when does it come back" in one
376
417
  table. It is one row per account **and** limit type, sorted by provider and then by
377
- account email, with a two-unit countdown (`2h 13m`, `3d 4h`, `45m`, `<1m`, `due`):
418
+ account email with each harness and each account kept together, and a two-unit countdown (`2h 13m`, `3d 4h`, `45m`, `<1m`, `due`):
378
419
 
379
420
  ```
380
421
  Account limits
381
422
  ┌──────────────────────┬─────────────────────────┬───────────────────────┬────────┬───────────────┐
382
423
  │ Provider │ Account │ Limit type │ Used % │ Resets in │
383
424
  ├──────────────────────┼─────────────────────────┼───────────────────────┼────────┼───────────────┤
384
- │ Claude Code │ phil@example.com │ Claude weekly │ 75% │ 4d 3h │
385
- │ Claude Code │ phil@example.com │ Claude five-hour │ 12% │ 1h 2m │
386
- │ Claude Code │ phil@example.com │ Fable weekly │ 88% │ 2d 5h │
387
- │ Codex │ alice@example.com │ Codex secondary │ 12% │ 3d 4h │
388
- │ Codex │ alice@example.com │ Codex primary │ 37% │ 2h 13m │
389
- │ Codex │ alice@example.com │ Code review secondary │ 100% │ 3h 59m │
390
- │ Codex │ bob@example.com │ n/a │ n/a │ n/a │
391
- │ OpenCode / anthropic │ anthropic API key 20e75 │ n/a │ n/a │ n/a │
392
- │ │ 1c3b707 │ │ │ │
393
- │ OpenCode / openai │ alice@example.com │ Codex primary │ 0% │ not scheduled │
425
+ ┃ Claude Code │ phil@example.com │ Claude weekly │ 75% │ 4d 3h │
426
+ ┃ │ Max │ Claude five-hour │ 12% │ 1h 2m │
427
+ ┃ │ │ Fable weekly │ 88% │ 2d 5h │
428
+ ├──────────────────────┼─────────────────────────┼───────────────────────┼────────┼───────────────┤
429
+ ┃ Codex │ alice@example.com │ Codex secondary │ 12% │ 3d 4h │
430
+ ┃ │ Pro │ Codex primary │ 37% │ 2h 13m │
431
+ ┃ │ │ Code review secondary │ 100% │ 3h 59m │
432
+ ┃ ├─────────────────────────┼───────────────────────┼────────┼───────────────┤
433
+ ┃ │ bob@example.com │ n/a │ n/a │ n/a │
434
+ ┃ │ Plus, unverified │ │ │ │
435
+ ├──────────────────────┼─────────────────────────┼───────────────────────┼────────┼───────────────┤
436
+ ┃ OpenCode / anthropic │ anthropic API key 20e75 │ n/a │ n/a │ n/a │
437
+ ┃ │ 1c3b707 │ │ │ │
438
+ ┃ │ n/a │ │ │ │
439
+ ├──────────────────────┼─────────────────────────┼───────────────────────┼────────┼───────────────┤
440
+ ┃ OpenCode / openai │ alice@example.com │ Codex primary │ 0% │ not scheduled │
441
+ ┃ │ Pro │ │ │ │
394
442
  └──────────────────────┴─────────────────────────┴───────────────────────┴────────┴───────────────┘
395
443
 
396
444
  n/a — Codex · bob@example.com: Subscription and limits: Login expired or was rejected.
@@ -411,12 +459,35 @@ session and the weekly total keeps its kind in parentheses
411
459
  (`Claude weekly (weekly_oauth)`). The provider column names the harness, qualified by
412
460
  the credential slot when a harness owns several (`OpenCode / openai`).
413
461
 
462
+ Each provider and each account is named once. The **Provider** cell spans all rows of
463
+ its provider, and the **Account** cell spans the rows of its account with two lines:
464
+ the account label, and beneath it, dimmed, the **account type** — the provider's own
465
+ plan name with its first letter capitalised (`Max`, `Pro`, `Prolite`). A type read
466
+ from the stored login because the live lookup failed is marked `unverified` (`Plus, unverified`), and
467
+ an account whose provider reports no plan, such as an API-key login, shows `n/a`. A
468
+ provider row without an account has no type line.
469
+
414
470
  **Used %** is coloured by the provider's own reading when it reports one: orange for
415
471
  `warning`, red for `critical`, uncoloured for `normal`. Without a reading, `n/a` is
416
472
  orange and an exhausted window (100% or more) is red. Colour is omitted when
417
473
  `NO_COLOR` is set, output is not a terminal, or the terminal is narrower than 40
418
474
  columns.
419
475
 
476
+ Rows are grouped in two independent ways. A divider separates one account from the
477
+ next, so an account's limit types read as one block; a provider row without an
478
+ account is a block of its own. Inside a provider's span the divider starts at the
479
+ **Account** column, and a change of provider draws a full rule. A line along the left edge (`┃`) marks the harness:
480
+ all its rows share one colour, including every credential slot of an OpenCode
481
+ installation, and the next harness takes the next colour (cyan, orange, green, pink,
482
+ blue, then again from the start). Without colour the `┃` edge still shows where the
483
+ data rows are. Groups follow harness and account ids, never labels: two accounts
484
+ that share an email are separate blocks, ordered by account id, and two harnesses
485
+ that share a label are ordered by harness id. A harness is placed by its first
486
+ provider name, so no other provider sorts between its slots. Below 40 columns the
487
+ table becomes labelled lines; every row repeats its provider and its account with
488
+ the type as a second line, a rule line separates the accounts, and no colour line is
489
+ drawn.
490
+
420
491
  `authswitch active` answers "what am I logged in as" for every harness at once:
421
492
 
422
493
  ```
@@ -424,11 +495,11 @@ Active accounts
424
495
  ┌──────────────────────┬────────────────────────────────┬────────────┬─────────────────┐
425
496
  │ Provider │ Account │ Saved │ Source │
426
497
  ├──────────────────────┼────────────────────────────────┼────────────┼─────────────────┤
427
- │ Claude Code │ phil@example.com │ 45m ago │ credential file │
428
- │ Codex │ alice@example.com │ 2h 13m ago │ credential file │
429
- │ Flex │ none │ n/a │ none │
430
- │ OpenCode / anthropic │ anthropic API key 20e751c3b707 │ 30d ago │ credential file │
431
- │ OpenCode / openai │ alice@example.com │ not saved │ credential file │
498
+ ┃ Claude Code │ phil@example.com │ 45m ago │ credential file │
499
+ ┃ Codex │ alice@example.com │ 2h 13m ago │ credential file │
500
+ ┃ Flex │ none │ n/a │ none │
501
+ ┃ OpenCode / anthropic │ anthropic API key 20e751c3b707 │ 30d ago │ credential file │
502
+ ┃ OpenCode / openai │ alice@example.com │ not saved │ credential file │
432
503
  └──────────────────────┴────────────────────────────────┴────────────┴─────────────────┘
433
504
 
434
505
  note — OpenCode / openai · alice@example.com: This active login is not saved yet; authswitch cannot restore it after a switch.
@@ -439,6 +510,8 @@ own live credential, `stash only` means nothing is active and only saved copies
439
510
  exist, `none` means neither. **Saved** is how long ago `authswitch` last saved that
440
511
  login, or `not saved` — which is also the warning that a switch could not bring it
441
512
  back. A harness with no active login keeps its row and explains itself in a note.
513
+ Each harness has its own colour line, ordered and coloured as in `limits`; the
514
+ table has no dividers, since every row is a different credential slot.
442
515
 
443
516
  **Source** also answers whether the file still holds what the last switch wrote.
444
517
  When authswitch switches a login it records that account and the hash of the
@@ -471,7 +544,10 @@ arguments to these commands exit with 2.
471
544
 
472
545
  `limits --json` emits `IAccountLimits` and `active --json` emits `IActiveAccounts`:
473
546
  the same rows as the tables, plus the machine-readable fields the tables condense —
474
- `accountId`, `slotId`, `scope`, `windowSeconds`, the ISO `resetAt` beside the human
547
+ `accountId`, `slotId`, `accountType` (`{ plan, source }` with the adapter's plan
548
+ name, such as `max` or `pro`, sanitised but not display-formatted, and `source` `live`
549
+ or `stored`; null when no type is known or the row names no account; both documents
550
+ carry it), `scope`, `windowSeconds`, the ISO `resetAt` beside the human
475
551
  `resetsIn`, the provider's `severity` (`normal`, `warning`, `critical`, or null when
476
552
  it gave none) and `headline` (true for the window the provider picks for a
477
553
  single-value summary), the ISO `savedAt` beside the human `savedAgo`, the per-row
@@ -564,7 +640,11 @@ process.exitCode = await cli.run(process.argv.slice(2));
564
640
 
565
641
  Each adapter owns discovery, identity matching, save verification, credential
566
642
  storage, switching and process lifecycle, live status APIs, and diagnostics.
567
- `readState()` and `readAccountStatus()` must be read-only. `switchAccount()` must
643
+ `readState()` and `readAccountStatus()` must be read-only. `readAccountStatus(accountId,
644
+ options)` receives an optional `IHarnessStatusOptions` whose `signal` cancels the
645
+ lookup's requests; authswitch aborts it when a status is no longer wanted, such as a
646
+ switch badge past its deadline or a closed dashboard, so an adapter should pass it to
647
+ every request it makes. `switchAccount()` must
568
648
  preserve and verify the outgoing credential without relying on the interactive
569
649
  save prompt. `removeAccount()` removes only the saved copy. Status facts carry
570
650
  provider-specific labels and units; unsupported capabilities are explicit. Adapter
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@modelprofile.com/authswitch',
6
- version: '3.1.0',
6
+ version: '3.3.0',
7
7
  description: 'Manage Codex, OpenCode and Claude Code accounts with guided switching and live usage status'
8
8
  }
package/ts/accounts.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { IAuthHarness, IHarnessAccount, IHarnessAccountStatus, IHarnessCredentialDrift, IHarnessState, IHarnessUsageWindow } from './interfaces.harness.js';
1
+ import type { IAccountType, IAuthHarness, IHarnessAccount, IHarnessAccountStatus, IHarnessCredentialDrift, IHarnessState, IHarnessUsageWindow } from './interfaces.harness.js';
2
2
  import { plainText } from './formatting.js';
3
3
 
4
4
  export interface IAccountRow {
@@ -68,10 +68,24 @@ export const credentialDriftNote = (harnessIdArg: string, driftArg: IHarnessCred
68
68
  + (driftArg.expectedLabel === null ? 'Switch to the intended account again.'
69
69
  : `Run authswitch ${plainText(harnessIdArg)} use ${plainText(driftArg.expectedLabel)} again.`);
70
70
 
71
- export const accountPlan = (rowArg: IAccountRow): string => {
72
- const subscription = rowArg.status?.summary?.subscription;
73
- return subscription ? `${plainText(subscription.plan)}${subscription.source === 'stored' ? ' (stored; unverified)' : ' (live)'}` : rowArg.status ? 'Unavailable' : 'Loading';
71
+ /**
72
+ * How every view marks a plan that comes from the saved login because the provider did not confirm it: the
73
+ * word both earlier plan cells used, kept short so the type line of a limits cell does not wrap.
74
+ */
75
+ const STORED_PLAN_MARK = 'unverified';
76
+ /**
77
+ * How an account type reads in every view: the provider's plan name with its first letter capitalised
78
+ * (`max` reads `Max`), and a plan taken from the stored login marked `Plus, unverified`. The text holds no
79
+ * parentheses, so it reads the same inside a badge part. Nothing is invented: an unknown type is null, and
80
+ * each view decides how to show that.
81
+ */
82
+ export const accountTypeText = (typeArg: IAccountType | null | undefined): string | null => {
83
+ if (!typeArg) return null;
84
+ const plan = plainText(typeArg.plan);
85
+ return `${plan.charAt(0).toUpperCase()}${plan.slice(1)}${typeArg.source === 'stored' ? `, ${STORED_PLAN_MARK}` : ''}`;
74
86
  };
87
+ export const accountPlan = (rowArg: IAccountRow): string =>
88
+ accountTypeText(rowArg.status?.summary?.subscription) ?? (rowArg.status ? 'Unavailable' : 'Loading');
75
89
  type TAccountStatusRow = Pick<IAccountRow, 'status'>;
76
90
  /**
77
91
  * How a single-value summary names a window among the windows it shows. An account window is named by
@@ -113,6 +127,88 @@ export const accountQuotaSummary = (rowArg: TAccountStatusRow, nowArg: number):
113
127
  ...windows.slice(1).filter(window => window.usedPercent >= 100).map(window => `${usageWindowName(window, windows)} exhausted\nResets in: ${until(window.resetAt, nowArg)}`),
114
128
  ] : [])].join('\n');
115
129
  };
130
+ /** The badge's usage meters: the general account windows a switch decision weighs, never a feature quota. */
131
+ const BADGE_WINDOWS = [['5h', 18000], ['w', 604800]] as const;
132
+ /**
133
+ * The account window a badge part reads: the only account window of that period, or the provider's headline
134
+ * pick among several. Any other choice would be a guess, so the part is left out and no meter reads as another's.
135
+ */
136
+ const badgeWindow = (windowsArg: readonly IHarnessUsageWindow[], secondsArg: number): IHarnessUsageWindow | undefined => {
137
+ const matches = windowsArg.filter(window => window.scope !== 'feature' && window.durationSeconds === secondsArg);
138
+ const candidates = matches.length > 1 ? matches.filter(window => window.headline === true) : matches;
139
+ return candidates.length === 1 ? candidates[0] : undefined;
140
+ };
141
+ /**
142
+ * What a switch activates, in one line: ` (type:Max) (5h:63%) (w:88%)`, appended to the account label.
143
+ *
144
+ * Each part is the provider's own reading, rounded to a whole percent, and is omitted when it was not
145
+ * reported; with no part known the badge is empty, so a missing reading never reads as zero usage.
146
+ */
147
+ export const accountBadge = (statusArg: IHarnessAccountStatus | undefined): string => {
148
+ const type = accountTypeText(statusArg?.summary?.subscription);
149
+ const windows = statusArg?.summary?.usageWindows ?? [];
150
+ return [
151
+ ...(type === null ? [] : [`type:${type}`]),
152
+ ...BADGE_WINDOWS.flatMap(([name, seconds]) => {
153
+ const window = badgeWindow(windows, seconds);
154
+ return window === undefined ? [] : [`${name}:${Math.round(window.usedPercent)}%`];
155
+ }),
156
+ ].map(part => ` (${part})`).join('');
157
+ };
158
+ /** How many accounts' statuses are read at once, so a long account list never floods a provider. */
159
+ const STATUS_LOOKUP_CONCURRENCY = 4;
160
+ /**
161
+ * Read-only, bounded status lookups: at most four accounts at a time, started in order, each handed the
162
+ * caller's signal. A lookup that fails reports undefined; once the signal aborts, no further lookup starts.
163
+ * A callback that throws rejects the call, and no other lookup starts after it.
164
+ */
165
+ const lookupStatuses = async (
166
+ harnessArg: IAuthHarness,
167
+ accountIdsArg: readonly string[],
168
+ optionsArg: { signal?: AbortSignal; onStatus: (indexArg: number, statusArg: IHarnessAccountStatus | undefined) => void | Promise<void> },
169
+ ): Promise<void> => {
170
+ let next = 0;
171
+ let failed = false;
172
+ const worker = async (): Promise<void> => {
173
+ while (!failed && next < accountIdsArg.length && !optionsArg.signal?.aborted) {
174
+ const index = next++;
175
+ let status: IHarnessAccountStatus | undefined;
176
+ try { status = await harnessArg.readAccountStatus(accountIdsArg[index], { signal: optionsArg.signal }); }
177
+ catch { status = undefined; }
178
+ try { await optionsArg.onStatus(index, status); }
179
+ catch (error) { failed = true; throw error; }
180
+ }
181
+ };
182
+ await Promise.all(Array.from({ length: Math.min(STATUS_LOOKUP_CONCURRENCY, accountIdsArg.length) }, worker));
183
+ };
184
+ /** How long a switch waits for the badges of the accounts it offers or activates. */
185
+ const ACCOUNT_BADGE_TIMEOUT_MS = 2500;
186
+ /**
187
+ * The badge of every named account whose status answered before one shared deadline.
188
+ *
189
+ * Read-only and never fatal: a switch must not wait on a provider past this deadline, nor fail because
190
+ * usage could not be read, so a lookup that fails or misses the deadline contributes no badge and the
191
+ * caller shows the label alone. At the deadline every lookup still running is cancelled, so no request
192
+ * outlives the call and keeps the command from exiting.
193
+ */
194
+ export const readAccountBadges = async (
195
+ harnessArg: IAuthHarness,
196
+ accountIdsArg: readonly string[],
197
+ timeoutMsArg = ACCOUNT_BADGE_TIMEOUT_MS,
198
+ ): Promise<Map<string, string>> => {
199
+ const badges = new Map<string, string>();
200
+ if (!accountIdsArg.length) return badges;
201
+ const cancel = new AbortController();
202
+ const lookups = lookupStatuses(harnessArg, accountIdsArg, { signal: cancel.signal, onStatus: (index, status) => {
203
+ if (status !== undefined && !cancel.signal.aborted) badges.set(accountIdsArg[index], accountBadge(status));
204
+ } });
205
+ // A referenced timer: the command must stay alive until the deadline even when a stalled lookup holds nothing open.
206
+ let timer: ReturnType<typeof setTimeout> | undefined;
207
+ const deadline = new Promise<void>(resolve => { timer = setTimeout(resolve, timeoutMsArg); });
208
+ try { await Promise.race([lookups, deadline]); }
209
+ finally { clearTimeout(timer); cancel.abort(); }
210
+ return badges;
211
+ };
116
212
  export const accountState = (rowArg: IAccountRow): string => `${rowArg.account.isActive ? '* active, ' : ''}${rowArg.account.isStashed ? 'saved' : 'not saved'}`;
117
213
  export const accountDetails = (rowArg: IAccountRow): string => [
118
214
  plainText(rowArg.account.label), accountState(rowArg),
@@ -122,7 +218,7 @@ export const accountDetails = (rowArg: IAccountRow): string => [
122
218
  ...(rowArg.status?.problems.map(problemArg => `Unavailable: ${plainText(problemArg)}`) ?? []),
123
219
  ].join('\n');
124
220
 
125
- /** Read-only, bounded parallel status lookup. No account is switched to inspect it. */
221
+ /** Read-only, bounded parallel status lookup. No account is switched to inspect it; the signal cancels lookups in flight. */
126
222
  export const readAccountRows = async (
127
223
  harnessArg: IAuthHarness,
128
224
  optionsArg: { signal?: AbortSignal; onUpdate?: (rowsArg: IAccountRow[], stateArg: IHarnessState) => void | Promise<void> } = {},
@@ -130,12 +226,9 @@ export const readAccountRows = async (
130
226
  const state = await harnessArg.readState();
131
227
  const rows = state.accounts.map(account => ({ harness: harnessArg, account } as IAccountRow));
132
228
  await optionsArg.onUpdate?.(rows, state);
133
- for (let index = 0; index < rows.length && !optionsArg.signal?.aborted; index += 4) {
134
- await Promise.all(rows.slice(index, index + 4).map(async row => {
135
- try { row.status = await harnessArg.readAccountStatus(row.account.id); }
136
- catch { row.status = { facts: [], problems: ['Could not read account status.'] }; }
137
- if (!optionsArg.signal?.aborted) await optionsArg.onUpdate?.(rows, state);
138
- }));
139
- }
229
+ await lookupStatuses(harnessArg, rows.map(row => row.account.id), { signal: optionsArg.signal, onStatus: async (index, status) => {
230
+ rows[index].status = status ?? { facts: [], problems: ['Could not read account status.'] };
231
+ if (!optionsArg.signal?.aborted) await optionsArg.onUpdate?.(rows, state);
232
+ } });
140
233
  return { rows, state };
141
234
  };