@cortexkit/opencode-antigravity-auth 3.0.6 → 3.0.7

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 (164) hide show
  1. package/dist/cli.js +620 -120
  2. package/dist/cli.js.map +4 -4
  3. package/dist/cli.meta.json +128 -44
  4. package/dist/index.js +1469 -675
  5. package/dist/index.js.map +4 -4
  6. package/dist/index.meta.json +154 -73
  7. package/dist/server.js +1075 -280
  8. package/dist/server.js.map +4 -4
  9. package/dist/server.meta.json +1 -1
  10. package/dist/src/common-auth-embedded/claustrum/consumer.d.ts +11 -1
  11. package/dist/src/common-auth-embedded/claustrum/consumer.js +38 -1
  12. package/dist/src/common-auth-embedded/claustrum/custody.d.ts +29 -0
  13. package/dist/src/common-auth-embedded/claustrum/custody.js +17 -0
  14. package/dist/src/common-auth-embedded/claustrum/index.d.ts +1 -1
  15. package/dist/src/common-auth-embedded/fs/refresh-file-lock.d.ts +8 -2
  16. package/dist/src/common-auth-embedded/fs/refresh-file-lock.js +6 -1
  17. package/dist/src/common-auth-embedded/pi-slot/lock.js +7 -3
  18. package/dist/src/common-auth-embedded/quota/format.d.ts +14 -3
  19. package/dist/src/common-auth-embedded/quota/format.js +135 -18
  20. package/dist/src/common-auth-embedded/quota/index.d.ts +1 -1
  21. package/dist/src/common-auth-embedded/quota/index.js +1 -1
  22. package/dist/src/common-auth-embedded/setup/command-error.d.ts +32 -0
  23. package/dist/src/common-auth-embedded/setup/command-error.js +79 -0
  24. package/dist/src/common-auth-embedded/setup/command-runner.js +118 -24
  25. package/dist/src/common-auth-embedded/setup/command.js +75 -19
  26. package/dist/src/common-auth-embedded/setup/enroll.js +17 -5
  27. package/dist/src/common-auth-embedded/setup/index.d.ts +2 -1
  28. package/dist/src/common-auth-embedded/setup/index.js +1 -0
  29. package/dist/src/common-auth-embedded/setup/register.js +8 -2
  30. package/dist/src/common-auth-embedded/setup/types.d.ts +14 -0
  31. package/dist/src/common-auth-embedded/source-output.json +92 -76
  32. package/dist/src/common-auth-embedded/store/pool.d.ts +1 -1
  33. package/dist/src/common-auth-embedded/store/pool.js +0 -1
  34. package/dist/src/common-auth-embedded/store/refresh-lock.d.ts +0 -1
  35. package/dist/src/common-auth-embedded/store/refresh-lock.js +0 -1
  36. package/dist/src/ga/server/index.d.ts.map +1 -1
  37. package/dist/src/ga/server/index.js +4 -2
  38. package/dist/src/ga/server/index.js.map +1 -1
  39. package/dist/src/ga/tui/host-ga.d.ts.map +1 -1
  40. package/dist/src/ga/tui/host-ga.js +37 -3
  41. package/dist/src/ga/tui/host-ga.js.map +1 -1
  42. package/dist/src/plugin/config/schema.d.ts.map +1 -1
  43. package/dist/src/plugin/config/schema.js +2 -1
  44. package/dist/src/plugin/config/schema.js.map +1 -1
  45. package/dist/src/plugin/ga-location-services.d.ts.map +1 -1
  46. package/dist/src/plugin/ga-location-services.js +4 -3
  47. package/dist/src/plugin/ga-location-services.js.map +1 -1
  48. package/dist/src/plugin/gemini-dump.d.ts.map +1 -1
  49. package/dist/src/plugin/gemini-dump.js +2 -5
  50. package/dist/src/plugin/gemini-dump.js.map +1 -1
  51. package/dist/src/plugin/index.d.ts.map +1 -1
  52. package/dist/src/plugin/index.js +3 -3
  53. package/dist/src/plugin/index.js.map +1 -1
  54. package/dist/src/plugin/logging-utils.d.ts.map +1 -1
  55. package/dist/src/plugin/logging-utils.js +2 -5
  56. package/dist/src/plugin/logging-utils.js.map +1 -1
  57. package/dist/src/plugin/request.d.ts +1 -2
  58. package/dist/src/plugin/request.d.ts.map +1 -1
  59. package/dist/src/plugin/request.js +8 -12
  60. package/dist/src/plugin/request.js.map +1 -1
  61. package/dist/src/plugin/shared/request-services.d.ts +8 -1
  62. package/dist/src/plugin/shared/request-services.d.ts.map +1 -1
  63. package/dist/src/plugin/shared/request-services.js +140 -58
  64. package/dist/src/plugin/shared/request-services.js.map +1 -1
  65. package/dist/src/plugin/shared/vault-request-credentials.d.ts +12 -3
  66. package/dist/src/plugin/shared/vault-request-credentials.d.ts.map +1 -1
  67. package/dist/src/plugin/shared/vault-request-credentials.js +3 -0
  68. package/dist/src/plugin/shared/vault-request-credentials.js.map +1 -1
  69. package/dist/src/plugin/vault-custody.d.ts +14 -1
  70. package/dist/src/plugin/vault-custody.d.ts.map +1 -1
  71. package/dist/src/plugin/vault-custody.js +57 -10
  72. package/dist/src/plugin/vault-custody.js.map +1 -1
  73. package/dist/src/sidebar-projection.d.ts +4 -0
  74. package/dist/src/sidebar-projection.d.ts.map +1 -1
  75. package/dist/src/sidebar-projection.js +6 -2
  76. package/dist/src/sidebar-projection.js.map +1 -1
  77. package/dist/src/tui/quota-layout.d.ts +94 -0
  78. package/dist/src/tui/quota-layout.d.ts.map +1 -0
  79. package/dist/src/tui/quota-layout.js +139 -0
  80. package/dist/src/tui/quota-layout.js.map +1 -0
  81. package/dist/src/tui/route-layout.d.ts +8 -0
  82. package/dist/src/tui/route-layout.d.ts.map +1 -0
  83. package/dist/src/tui/route-layout.js +36 -0
  84. package/dist/src/tui/route-layout.js.map +1 -0
  85. package/dist/src/tui.d.ts.map +1 -1
  86. package/dist/src/tui.js +26 -128
  87. package/dist/src/tui.js.map +1 -1
  88. package/dist/tui-build-map.json +42 -13
  89. package/dist/tui-ga-build-map.json +46 -17
  90. package/dist/types/src/common-auth-embedded/claustrum/consumer.d.ts +11 -1
  91. package/dist/types/src/common-auth-embedded/claustrum/custody.d.ts +29 -0
  92. package/dist/types/src/common-auth-embedded/claustrum/index.d.ts +1 -1
  93. package/dist/types/src/common-auth-embedded/fs/refresh-file-lock.d.ts +8 -2
  94. package/dist/types/src/common-auth-embedded/quota/format.d.ts +14 -3
  95. package/dist/types/src/common-auth-embedded/quota/index.d.ts +1 -1
  96. package/dist/types/src/common-auth-embedded/setup/command-error.d.ts +32 -0
  97. package/dist/types/src/common-auth-embedded/setup/index.d.ts +2 -1
  98. package/dist/types/src/common-auth-embedded/setup/types.d.ts +14 -0
  99. package/dist/types/src/common-auth-embedded/store/pool.d.ts +1 -1
  100. package/dist/types/src/common-auth-embedded/store/refresh-lock.d.ts +0 -1
  101. package/dist/types/src/ga/server/index.d.ts.map +1 -1
  102. package/dist/types/src/plugin/config/schema.d.ts.map +1 -1
  103. package/dist/types/src/plugin/ga-location-services.d.ts.map +1 -1
  104. package/dist/types/src/plugin/gemini-dump.d.ts.map +1 -1
  105. package/dist/types/src/plugin/index.d.ts.map +1 -1
  106. package/dist/types/src/plugin/logging-utils.d.ts.map +1 -1
  107. package/dist/types/src/plugin/request.d.ts +1 -2
  108. package/dist/types/src/plugin/request.d.ts.map +1 -1
  109. package/dist/types/src/plugin/shared/request-services.d.ts +8 -1
  110. package/dist/types/src/plugin/shared/request-services.d.ts.map +1 -1
  111. package/dist/types/src/plugin/shared/vault-request-credentials.d.ts +12 -3
  112. package/dist/types/src/plugin/shared/vault-request-credentials.d.ts.map +1 -1
  113. package/dist/types/src/plugin/vault-custody.d.ts +14 -1
  114. package/dist/types/src/plugin/vault-custody.d.ts.map +1 -1
  115. package/package.json +3 -3
  116. package/src/common-auth-embedded/claustrum/consumer.d.ts +11 -1
  117. package/src/common-auth-embedded/claustrum/consumer.js +38 -1
  118. package/src/common-auth-embedded/claustrum/custody.d.ts +29 -0
  119. package/src/common-auth-embedded/claustrum/custody.js +17 -0
  120. package/src/common-auth-embedded/claustrum/index.d.ts +1 -1
  121. package/src/common-auth-embedded/fs/refresh-file-lock.d.ts +8 -2
  122. package/src/common-auth-embedded/fs/refresh-file-lock.js +6 -1
  123. package/src/common-auth-embedded/pi-slot/lock.js +7 -3
  124. package/src/common-auth-embedded/quota/format.d.ts +14 -3
  125. package/src/common-auth-embedded/quota/format.js +135 -18
  126. package/src/common-auth-embedded/quota/index.d.ts +1 -1
  127. package/src/common-auth-embedded/quota/index.js +1 -1
  128. package/src/common-auth-embedded/setup/command-error.d.ts +32 -0
  129. package/src/common-auth-embedded/setup/command-error.js +79 -0
  130. package/src/common-auth-embedded/setup/command-runner.js +118 -24
  131. package/src/common-auth-embedded/setup/command.js +75 -19
  132. package/src/common-auth-embedded/setup/enroll.js +17 -5
  133. package/src/common-auth-embedded/setup/index.d.ts +2 -1
  134. package/src/common-auth-embedded/setup/index.js +1 -0
  135. package/src/common-auth-embedded/setup/register.js +8 -2
  136. package/src/common-auth-embedded/setup/types.d.ts +14 -0
  137. package/src/common-auth-embedded/source-output.json +92 -76
  138. package/src/common-auth-embedded/store/pool.d.ts +1 -1
  139. package/src/common-auth-embedded/store/pool.js +0 -1
  140. package/src/common-auth-embedded/store/refresh-lock.d.ts +0 -1
  141. package/src/common-auth-embedded/store/refresh-lock.js +0 -1
  142. package/src/tui-compiled/common-auth-embedded/quota/format.js +135 -18
  143. package/src/tui-compiled/common-auth-embedded/quota/index.js +1 -1
  144. package/src/tui-compiled/tui/quota-layout.js +378 -0
  145. package/src/tui-compiled/tui/route-layout.js +30 -0
  146. package/src/tui-compiled/tui.js +145 -427
  147. package/src/tui-ga-compiled/host-ga.js +82 -52
  148. package/src/tui-ga-compiled/shared/6ca47cd4ec33fe72-route-layout.js +30 -0
  149. package/src/tui-ga-compiled/shared/8ae1927e5910ea81-sidebar-projection.js +2 -2
  150. package/src/tui-ga-compiled/shared/aef2402f8fc342f0-format.js +135 -18
  151. package/src/tui-ga-compiled/shared/bf17cbee28e58197-index.js +1 -1
  152. package/src/tui-ga-compiled/shared/dd4c9e1a907f8ef0-quota-layout.js +378 -0
  153. package/src/tui-ga-raw/host-ga.tsx +71 -30
  154. package/src/tui-ga-raw/shared/6ca47cd4ec33fe72-route-layout.js +30 -0
  155. package/src/tui-ga-raw/shared/8ae1927e5910ea81-sidebar-projection.js +2 -2
  156. package/src/tui-ga-raw/shared/aef2402f8fc342f0-format.js +135 -18
  157. package/src/tui-ga-raw/shared/bf17cbee28e58197-index.js +1 -1
  158. package/src/tui-ga-raw/shared/dd4c9e1a907f8ef0-quota-layout.tsx +391 -0
  159. package/src/tui-raw/common-auth-embedded/quota/format.js +135 -18
  160. package/src/tui-raw/common-auth-embedded/quota/index.js +1 -1
  161. package/src/tui-raw/tui/quota-layout.tsx +391 -0
  162. package/src/tui-raw/tui/route-layout.js +30 -0
  163. package/src/tui-raw/tui.tsx +50 -309
  164. package/src/tui.tsx +50 -309
@@ -1,6 +1,6 @@
1
+ import { memo as _$memo } from "opentui:runtime-module:%40opentui%2Fsolid";
1
2
  import { createTextNode as _$createTextNode } from "opentui:runtime-module:%40opentui%2Fsolid";
2
3
  import { use as _$use } from "opentui:runtime-module:%40opentui%2Fsolid";
3
- import { memo as _$memo } from "opentui:runtime-module:%40opentui%2Fsolid";
4
4
  import { createComponent as _$createComponent } from "opentui:runtime-module:%40opentui%2Fsolid";
5
5
  import { effect as _$effect } from "opentui:runtime-module:%40opentui%2Fsolid";
6
6
  import { insertNode as _$insertNode } from "opentui:runtime-module:%40opentui%2Fsolid";
@@ -22,14 +22,16 @@ import { createElement as _$createElement } from "opentui:runtime-module:%40open
22
22
  * score, and per-session routing decisions), so the fleet components are
23
23
  * adapted rather than copied verbatim:
24
24
  *
25
- * - `WindowRow` reads `remainingPercent + resetAt` from the Antigravity
26
- * `SidebarQuotaEntry` shape and colors via `quotaTone` (remaining
27
- * threshold) instead of `usageTone` (used threshold). Each window is one
28
- * line sized from the measured sidebar width.
25
+ * - The quota rows come from `tui/quota-layout.tsx`, shared with the
26
+ * OpenCode 2 sidebar: each window reads `remainingPercent + resetAt` from
27
+ * the Antigravity `SidebarQuotaEntry` shape, is colored via `quotaTone`
28
+ * (remaining threshold) instead of `usageTone` (used threshold), and is
29
+ * one line sized from the measured sidebar width.
29
30
  * - `AccountBlock` derives its status word (`active` / `idle` /
30
- * `cooling` / `off`) from the Antigravity account state, shows the
31
- * reading age once per account, and groups windows under `Gemini` and
32
- * `Other models` headers. The routing health score is not shown.
31
+ * `cooling` / `off`) from the Antigravity account state; the shared block
32
+ * shows the reading age once per account and groups windows under
33
+ * `Gemini` and `Other models` headers. The routing health score is not
34
+ * shown.
33
35
  * - `Routing` shows the mounted session's most recent `activeRouting`
34
36
  * entry, or `No request yet` before the session's first request, since
35
37
  * Antigravity does not maintain a per-session sidebar state alongside the
@@ -51,11 +53,13 @@ import { dirname, join } from "node:path";
51
53
  import { fileURLToPath } from "node:url";
52
54
  import { createSlot } from "opentui:runtime-module:%40opentui%2Fsolid";
53
55
  import { createSignal, For, onCleanup, onMount, Show } from "opentui:runtime-module:solid-js";
54
- import { NO_QUOTA_READING, quotaReadingAge, quotaWindowText } from "./quota-presentation.js";
56
+ import { NO_QUOTA_READING } from "./quota-presentation.js";
55
57
  import { getRpcDir } from "./rpc/rpc-dir.js";
56
58
  import { readSidebarState } from "./sidebar-state.js";
57
59
  import { createTuiFileLogger } from "./tui/file-logger.js";
58
60
  import { createV1MenuTransport, dispatchV1Notification } from "./tui/host-v1.js";
61
+ import { ASSUMED_CONTENT_WIDTH, accountWindows, fitLabel, QuotaAccountBlock, quotaTone, RESET_SINCE_READING, showsFigure } from "./tui/quota-layout.js";
62
+ import { routeLineFits } from "./tui/route-layout.js";
59
63
  import { computeEffectiveOrder, DEFAULT_PREFS, DEFAULT_SLOT_ORDER, PLUGIN_KEY, queueTuiPreferenceUpdate, readTuiPreferencesFile, resolveAntigravityAuthPrefs, watchTuiPreferences } from "./tui-preferences.js";
60
64
  const ID = 'cortexkit.antigravity-auth';
61
65
  const POLL_INTERVAL_MS = 2000;
@@ -102,35 +106,11 @@ let rpcInFlight = false;
102
106
  const GLOBAL_NOTIFICATION_CURSOR = '__global__';
103
107
  const MAX_NOTIFICATION_CURSORS = 256;
104
108
 
105
- // Group headers name each quota pool in plain words.
106
- const GROUP_NAMES = {
107
- gemini: 'Gemini',
108
- 'non-gemini': 'Other models'
109
- };
110
-
111
109
  // The collapsed row has room for one word before the window name.
112
110
  const COLLAPSED_GROUP_NAMES = {
113
111
  gemini: 'Gemini',
114
112
  'non-gemini': 'Other'
115
113
  };
116
- const QUOTA_ORDER = ['gemini', 'non-gemini'];
117
-
118
- // Shown instead of a stored figure once the window has reset since it was
119
- // read: the stored figure describes the window before the reset.
120
- const RESET_SINCE_READING = 'reset since last check';
121
-
122
- // Content width (the panel's width inside its padding) used until the first
123
- // layout pass reports the real one. It fits the narrowest OpenCode sidebar.
124
- const ASSUMED_CONTENT_WIDTH = 28;
125
-
126
- // A window row is `<name> <bar> <figure> <reset>`. The bar shrinks to this
127
- // before the reset column is dropped; below it the bar is dropped too.
128
- const MIN_BAR_WIDTH = 4;
129
- // The widest figure the formatter writes: `100% left`.
130
- const FIGURE_WIDTH = 9;
131
- // A window name (`5h`, `7d`) and the space after it.
132
- const NAME_WIDTH = 3;
133
-
134
114
  // --- Theme tokens ----------------------------------------------------------
135
115
  //
136
116
  // The sidebar pulls its colors from the live host theme (`api.theme.current`
@@ -218,21 +198,16 @@ function toneColor(theme, tone) {
218
198
  return theme.text;
219
199
  }
220
200
  }
221
- function quotaTone(usedPct, appearance) {
222
- if (usedPct < appearance.warnThreshold) return 'ok';
223
- if (usedPct < appearance.errorThreshold) return 'warn';
224
- return 'err';
225
- }
226
- function quotaBarSegments(remainingPct, width, appearance) {
227
- const usedCells = Math.max(0, Math.min(Math.round(remainingPct / 100 * width), width));
228
- const tone = quotaTone(100 - remainingPct, appearance);
229
- return [{
230
- text: appearance.barFilledChar.repeat(usedCells),
231
- tone
232
- }, {
233
- text: appearance.barEmptyChar.repeat(width - usedCells),
234
- tone
235
- }].filter(segment => segment.text.length > 0);
201
+
202
+ // The shared quota layout reads its colors through this palette. Muted text
203
+ // and the account label read `textMuted` and `text` straight from the theme,
204
+ // without the `toneColor` fallback chain.
205
+ function themePalette(theme) {
206
+ return {
207
+ text: () => theme().text,
208
+ muted: () => theme().textMuted,
209
+ tone: tone => toneColor(theme(), tone)
210
+ };
236
211
  }
237
212
  const EMPTY_STATE = {
238
213
  version: 2,
@@ -434,171 +409,8 @@ function CollapsedRow(props) {
434
409
  })();
435
410
  }
436
411
 
437
- // --- Width-fitted quota rows ------------------------------------------------
438
- //
439
- // The OpenCode 1 sidebar is about 32 to 48 columns wide. Every quota line is
440
- // sized from the measured content width so that it fits on one line: text is
441
- // never left to the renderer's wrapping, which breaks a row mid-word or down
442
- // to one character per line once the right-hand column runs out of room.
443
-
444
- // One entry per stored window, in group order. A pool stored before
445
- // per-window readings existed contributes one window without a name.
446
- function accountWindows(account, now) {
447
- const result = [];
448
- for (const key of QUOTA_ORDER) {
449
- const entry = account.quota[key];
450
- if (!entry) continue;
451
- const readings = entry.windows && entry.windows.length > 0 ? entry.windows.map(window => ({
452
- window: window.window,
453
- remainingPercent: window.remainingPercent,
454
- resetAt: window.resetAt,
455
- checkedAt: window.checkedAt
456
- })) : [{
457
- remainingPercent: entry.remainingPercent,
458
- resetAt: entry.resetAt,
459
- checkedAt: entry.checkedAt
460
- }];
461
- for (const reading of readings) result.push({
462
- key,
463
- reading,
464
- text: quotaWindowText(reading, now)
465
- });
466
- }
467
- return result;
468
- }
469
-
470
- // A window shows its figure only while no reset has happened since it was
471
- // read and it has a read time at all.
472
- function showsFigure(window) {
473
- return window.text.remaining != null && !window.text.resetSinceReading;
474
- }
475
- // Column widths for one `<name> <bar> <figure> <reset>` row within `width`
476
- // cells. The bar shrinks first, down to MIN_BAR_WIDTH; then the reset column
477
- // is dropped; then the bar.
478
- function windowRowLayout(width, named, resetWidth, maxBar) {
479
- const room = width - (named ? NAME_WIDTH : 0) - FIGURE_WIDTH;
480
- if (resetWidth > 0) {
481
- const bar = Math.min(maxBar, room - resetWidth - 2);
482
- if (bar >= MIN_BAR_WIDTH) return {
483
- bar,
484
- reset: true
485
- };
486
- }
487
- const bar = Math.min(maxBar, room - 1);
488
- return {
489
- bar: bar >= MIN_BAR_WIDTH ? bar : 0,
490
- reset: false
491
- };
492
- }
493
-
494
- // Shorten a label to `max` cells, marking the cut with an ellipsis.
495
- function fitLabel(label, max) {
496
- if (label.length <= max) return label;
497
- if (max <= 0) return '';
498
- if (max === 1) return '…';
499
- return `${label.slice(0, max - 1)}…`;
500
- }
501
-
502
- // One quota window on one line. The bar fills with remaining quota; the
503
- // figure and reset come from the shared formatter. A window that reset since
504
- // its reading shows that fact, dim, in place of the stale figure.
505
- function WindowRow(props) {
506
- const text = () => props.window.text;
507
- const tone = () => quotaTone(100 - (text().remaining ?? 0), props.appearance);
508
- return (() => {
509
- var _el$0 = _$createElement("box");
510
- _$setProp(_el$0, "width", '100%');
511
- _$setProp(_el$0, "flexDirection", 'row');
512
- _$insert(_el$0, _$createComponent(Show, {
513
- get when() {
514
- return text().name !== '';
515
- },
516
- get children() {
517
- var _el$1 = _$createElement("text");
518
- _$setProp(_el$1, "width", 3);
519
- _$setProp(_el$1, "flexShrink", 0);
520
- _$setProp(_el$1, "wrapMode", 'none');
521
- _$insert(_el$1, () => text().name);
522
- _$effect(_$p => _$setProp(_el$1, "fg", props.theme().textMuted, _$p));
523
- return _el$1;
524
- }
525
- }), null);
526
- _$insert(_el$0, _$createComponent(Show, {
527
- get when() {
528
- return showsFigure(props.window);
529
- },
530
- get fallback() {
531
- return (() => {
532
- var _el$14 = _$createElement("text");
533
- _$setProp(_el$14, "flexShrink", 1);
534
- _$setProp(_el$14, "wrapMode", 'none');
535
- _$insert(_el$14, (() => {
536
- var _c$ = _$memo(() => !!text().resetSinceReading);
537
- return () => _c$() ? RESET_SINCE_READING : text().figure;
538
- })());
539
- _$effect(_$p => _$setProp(_el$14, "fg", props.theme().textMuted, _$p));
540
- return _el$14;
541
- })();
542
- },
543
- get children() {
544
- return [_$createComponent(Show, {
545
- get when() {
546
- return props.layout.bar > 0;
547
- },
548
- get children() {
549
- var _el$10 = _$createElement("box");
550
- _$setProp(_el$10, "flexShrink", 0);
551
- _$setProp(_el$10, "flexDirection", 'row');
552
- _$insert(_el$10, _$createComponent(For, {
553
- get each() {
554
- return quotaBarSegments(text().remaining ?? 0, props.layout.bar, props.appearance);
555
- },
556
- children: segment => (() => {
557
- var _el$15 = _$createElement("text");
558
- _$setProp(_el$15, "wrapMode", 'none');
559
- _$insert(_el$15, () => segment.text);
560
- _$effect(_$p => _$setProp(_el$15, "fg", toneColor(props.theme(), segment.tone), _$p));
561
- return _el$15;
562
- })()
563
- }));
564
- _$effect(_$p => _$setProp(_el$10, "width", props.layout.bar + 1, _$p));
565
- return _el$10;
566
- }
567
- }), (() => {
568
- var _el$11 = _$createElement("text");
569
- _$setProp(_el$11, "flexShrink", 0);
570
- _$setProp(_el$11, "wrapMode", 'none');
571
- _$insert(_el$11, () => text().figure);
572
- _$effect(_$p => _$setProp(_el$11, "fg", toneColor(props.theme(), tone()), _$p));
573
- return _el$11;
574
- })(), (() => {
575
- var _el$12 = _$createElement("box");
576
- _$setProp(_el$12, "flexGrow", 1);
577
- return _el$12;
578
- })(), _$createComponent(Show, {
579
- get when() {
580
- return _$memo(() => !!props.layout.reset)() && text().reset !== '';
581
- },
582
- get children() {
583
- var _el$13 = _$createElement("text");
584
- _$setProp(_el$13, "flexShrink", 0);
585
- _$setProp(_el$13, "wrapMode", 'none');
586
- _$insert(_el$13, () => text().reset);
587
- _$effect(_$p => _$setProp(_el$13, "fg", props.theme().textMuted, _$p));
588
- return _el$13;
589
- }
590
- })];
591
- }
592
- }), null);
593
- return _el$0;
594
- })();
595
- }
596
-
597
- // Fleet AccountBlock, adapted to Antigravity's per-account data. The header
598
- // line is the account label, the reading age when the oldest reading is
599
- // stale, and the status word right-aligned; the age moves to its own dim
600
- // line when the three do not fit. Below it each quota group present gets a
601
- // plain-word header and one WindowRow per window. Status word priorities
412
+ // One account in the Quota section: the shared quota block, with the status
413
+ // word computed from the sidebar file's account state. Status word priorities
602
414
  // (first match wins):
603
415
  // - `off` when the account is disabled
604
416
  // - `cooling <wait>` when cooldownUntil is still in the future
@@ -621,126 +433,32 @@ function AccountBlock(props) {
621
433
  if (cooldownMs() > 0) return 'warn';
622
434
  return active() ? 'ok' : 'muted';
623
435
  };
624
- const windows = () => accountWindows(props.account, props.now());
625
- const age = () => quotaReadingAge(windows().map(window => window.reading), props.now());
626
- const ageInline = () => age() !== '' && props.account.label.length + 3 + age().length + 1 + statusWord().length <= props.width();
627
- const label = () => fitLabel(props.account.label, props.width() - 1 - statusWord().length);
628
- // One reset column width per account, so bars line up across its rows.
629
- const resetWidth = () => Math.max(0, ...windows().filter(showsFigure).map(window => window.text.reset.length));
630
- const layoutFor = window => windowRowLayout(props.width(), window.text.name !== '', resetWidth(), props.appearance.barWidth);
631
- const groups = () => QUOTA_ORDER.map(key => ({
632
- key,
633
- windows: windows().filter(window => window.key === key)
634
- })).filter(group => group.windows.length > 0);
635
- return (() => {
636
- var _el$16 = _$createElement("box"),
637
- _el$17 = _$createElement("box"),
638
- _el$18 = _$createElement("text"),
639
- _el$19 = _$createElement("b"),
640
- _el$21 = _$createElement("box"),
641
- _el$22 = _$createElement("text"),
642
- _el$23 = _$createElement("b");
643
- _$insertNode(_el$16, _el$17);
644
- _$setProp(_el$16, "width", '100%');
645
- _$setProp(_el$16, "flexDirection", 'column');
646
- _$insertNode(_el$17, _el$18);
647
- _$insertNode(_el$17, _el$21);
648
- _$insertNode(_el$17, _el$22);
649
- _$setProp(_el$17, "width", '100%');
650
- _$setProp(_el$17, "flexDirection", 'row');
651
- _$insertNode(_el$18, _el$19);
652
- _$setProp(_el$18, "flexShrink", 0);
653
- _$setProp(_el$18, "wrapMode", 'none');
654
- _$insert(_el$19, label);
655
- _$insert(_el$17, _$createComponent(Show, {
656
- get when() {
657
- return ageInline();
658
- },
659
- get children() {
660
- var _el$20 = _$createElement("text");
661
- _$setProp(_el$20, "flexShrink", 0);
662
- _$setProp(_el$20, "wrapMode", 'none');
663
- _$insert(_el$20, () => ` · ${age()}`);
664
- _$effect(_$p => _$setProp(_el$20, "fg", props.theme().textMuted, _$p));
665
- return _el$20;
666
- }
667
- }), _el$21);
668
- _$setProp(_el$21, "flexGrow", 1);
669
- _$insertNode(_el$22, _el$23);
670
- _$setProp(_el$22, "flexShrink", 0);
671
- _$setProp(_el$22, "wrapMode", 'none');
672
- _$insert(_el$23, statusWord);
673
- _$insert(_el$16, _$createComponent(Show, {
674
- get when() {
675
- return _$memo(() => age() !== '')() && !ageInline();
676
- },
677
- get children() {
678
- var _el$24 = _$createElement("text");
679
- _$setProp(_el$24, "wrapMode", 'none');
680
- _$insert(_el$24, age);
681
- _$effect(_$p => _$setProp(_el$24, "fg", props.theme().textMuted, _$p));
682
- return _el$24;
683
- }
684
- }), null);
685
- _$insert(_el$16, _$createComponent(Show, {
686
- get when() {
687
- return groups().length > 0;
688
- },
689
- get fallback() {
690
- return (() => {
691
- var _el$25 = _$createElement("text");
692
- _$setProp(_el$25, "wrapMode", 'none');
693
- _$insert(_el$25, NO_QUOTA_READING);
694
- _$effect(_$p => _$setProp(_el$25, "fg", props.theme().textMuted, _$p));
695
- return _el$25;
696
- })();
697
- },
698
- get children() {
699
- return _$createComponent(For, {
700
- get each() {
701
- return groups();
702
- },
703
- children: group => [(() => {
704
- var _el$26 = _$createElement("text");
705
- _$setProp(_el$26, "wrapMode", 'none');
706
- _$insert(_el$26, () => GROUP_NAMES[group.key]);
707
- _$effect(_$p => _$setProp(_el$26, "fg", props.theme().textMuted, _$p));
708
- return _el$26;
709
- })(), _$createComponent(For, {
710
- get each() {
711
- return group.windows;
712
- },
713
- children: window => _$createComponent(WindowRow, {
714
- get theme() {
715
- return props.theme;
716
- },
717
- get appearance() {
718
- return props.appearance;
719
- },
720
- window: window,
721
- get layout() {
722
- return layoutFor(window);
723
- }
724
- })
725
- })]
726
- });
727
- }
728
- }), null);
729
- _$effect(_p$ => {
730
- var _v$3 = props.marginTop ?? 0,
731
- _v$4 = props.theme().text,
732
- _v$5 = toneColor(props.theme(), statusTone());
733
- _v$3 !== _p$.e && (_p$.e = _$setProp(_el$16, "marginTop", _v$3, _p$.e));
734
- _v$4 !== _p$.t && (_p$.t = _$setProp(_el$18, "fg", _v$4, _p$.t));
735
- _v$5 !== _p$.a && (_p$.a = _$setProp(_el$22, "fg", _v$5, _p$.a));
736
- return _p$;
737
- }, {
738
- e: undefined,
739
- t: undefined,
740
- a: undefined
741
- });
742
- return _el$16;
743
- })();
436
+ return _$createComponent(QuotaAccountBlock, {
437
+ get palette() {
438
+ return themePalette(props.theme);
439
+ },
440
+ get appearance() {
441
+ return props.appearance;
442
+ },
443
+ get account() {
444
+ return props.account;
445
+ },
446
+ get status() {
447
+ return statusWord();
448
+ },
449
+ get statusTone() {
450
+ return statusTone();
451
+ },
452
+ get now() {
453
+ return props.now;
454
+ },
455
+ get width() {
456
+ return props.width;
457
+ },
458
+ get marginTop() {
459
+ return props.marginTop;
460
+ }
461
+ });
744
462
  }
745
463
  // The collapsed row's figure: the lowest current window across both groups.
746
464
  // A window that reset since its reading is not current and never binds.
@@ -873,40 +591,40 @@ export function SidebarPanel(props) {
873
591
  return !hasData() ? name : collapsed() ? `\u25b6 ${name}` : `\u25bc ${name}`;
874
592
  };
875
593
  return (() => {
876
- var _el$27 = _$createElement("box"),
877
- _el$28 = _$createElement("box"),
878
- _el$29 = _$createElement("box"),
879
- _el$30 = _$createElement("text"),
880
- _el$31 = _$createElement("b");
881
- _$insertNode(_el$27, _el$28);
882
- _$setProp(_el$27, "width", '100%');
883
- _$setProp(_el$27, "flexDirection", 'column');
884
- _$setProp(_el$27, "border", SINGLE_BORDER);
885
- _$setProp(_el$27, "paddingTop", 1);
886
- _$setProp(_el$27, "paddingBottom", 1);
887
- _$setProp(_el$27, "paddingLeft", 1);
888
- _$setProp(_el$27, "paddingRight", 1);
889
- _$insertNode(_el$28, _el$29);
594
+ var _el$0 = _$createElement("box"),
595
+ _el$1 = _$createElement("box"),
596
+ _el$10 = _$createElement("box"),
597
+ _el$11 = _$createElement("text"),
598
+ _el$12 = _$createElement("b");
599
+ _$insertNode(_el$0, _el$1);
600
+ _$setProp(_el$0, "width", '100%');
601
+ _$setProp(_el$0, "flexDirection", 'column');
602
+ _$setProp(_el$0, "border", SINGLE_BORDER);
603
+ _$setProp(_el$0, "paddingTop", 1);
604
+ _$setProp(_el$0, "paddingBottom", 1);
605
+ _$setProp(_el$0, "paddingLeft", 1);
606
+ _$setProp(_el$0, "paddingRight", 1);
607
+ _$insertNode(_el$1, _el$10);
890
608
  _$use(element => {
891
609
  headerRow = element;
892
- }, _el$28);
893
- _$setProp(_el$28, "onSizeChange", measureContentWidth);
894
- _$setProp(_el$28, "width", '100%');
895
- _$setProp(_el$28, "flexDirection", 'row');
896
- _$setProp(_el$28, "justifyContent", 'space-between');
897
- _$setProp(_el$28, "alignItems", 'center');
898
- _$setProp(_el$28, "onMouseDown", () => {
610
+ }, _el$1);
611
+ _$setProp(_el$1, "onSizeChange", measureContentWidth);
612
+ _$setProp(_el$1, "width", '100%');
613
+ _$setProp(_el$1, "flexDirection", 'row');
614
+ _$setProp(_el$1, "justifyContent", 'space-between');
615
+ _$setProp(_el$1, "alignItems", 'center');
616
+ _$setProp(_el$1, "onMouseDown", () => {
899
617
  // Mirror the fleet guard: only toggle when there is data to expand
900
618
  // into. Without this a click on the empty-awaiting header would just
901
619
  // toggle the affordance for nothing.
902
620
  if (hasData()) controller.toggleCollapsed();
903
621
  });
904
- _$insertNode(_el$29, _el$30);
905
- _$setProp(_el$29, "paddingLeft", 1);
906
- _$setProp(_el$29, "paddingRight", 1);
907
- _$insertNode(_el$30, _el$31);
908
- _$insert(_el$31, headerLabel);
909
- _$insert(_el$28, _$createComponent(Show, {
622
+ _$insertNode(_el$10, _el$11);
623
+ _$setProp(_el$10, "paddingLeft", 1);
624
+ _$setProp(_el$10, "paddingRight", 1);
625
+ _$insertNode(_el$11, _el$12);
626
+ _$insert(_el$12, headerLabel);
627
+ _$insert(_el$1, _$createComponent(Show, {
910
628
  get when() {
911
629
  return degraded();
912
630
  },
@@ -916,36 +634,36 @@ export function SidebarPanel(props) {
916
634
  return prefs().header.showVersion && PLUGIN_VERSION !== '';
917
635
  },
918
636
  get children() {
919
- var _el$36 = _$createElement("text");
920
- _$insert(_el$36, `v${PLUGIN_VERSION}`);
921
- _$effect(_$p => _$setProp(_el$36, "fg", theme().textMuted, _$p));
922
- return _el$36;
637
+ var _el$17 = _$createElement("text");
638
+ _$insert(_el$17, `v${PLUGIN_VERSION}`);
639
+ _$effect(_$p => _$setProp(_el$17, "fg", theme().textMuted, _$p));
640
+ return _el$17;
923
641
  }
924
642
  });
925
643
  },
926
644
  get children() {
927
- var _el$32 = _$createElement("box"),
928
- _el$33 = _$createElement("text"),
929
- _el$34 = _$createElement("b");
930
- _$insertNode(_el$32, _el$33);
931
- _$setProp(_el$32, "paddingLeft", 1);
932
- _$setProp(_el$32, "paddingRight", 1);
933
- _$insertNode(_el$33, _el$34);
934
- _$insertNode(_el$34, _$createTextNode(`LIMITED`));
645
+ var _el$13 = _$createElement("box"),
646
+ _el$14 = _$createElement("text"),
647
+ _el$15 = _$createElement("b");
648
+ _$insertNode(_el$13, _el$14);
649
+ _$setProp(_el$13, "paddingLeft", 1);
650
+ _$setProp(_el$13, "paddingRight", 1);
651
+ _$insertNode(_el$14, _el$15);
652
+ _$insertNode(_el$15, _$createTextNode(`LIMITED`));
935
653
  _$effect(_p$ => {
936
- var _v$6 = theme().warning,
937
- _v$7 = theme().background;
938
- _v$6 !== _p$.e && (_p$.e = _$setProp(_el$32, "backgroundColor", _v$6, _p$.e));
939
- _v$7 !== _p$.t && (_p$.t = _$setProp(_el$33, "fg", _v$7, _p$.t));
654
+ var _v$3 = theme().warning,
655
+ _v$4 = theme().background;
656
+ _v$3 !== _p$.e && (_p$.e = _$setProp(_el$13, "backgroundColor", _v$3, _p$.e));
657
+ _v$4 !== _p$.t && (_p$.t = _$setProp(_el$14, "fg", _v$4, _p$.t));
940
658
  return _p$;
941
659
  }, {
942
660
  e: undefined,
943
661
  t: undefined
944
662
  });
945
- return _el$32;
663
+ return _el$13;
946
664
  }
947
665
  }), null);
948
- _$insert(_el$27, _$createComponent(Show, {
666
+ _$insert(_el$0, _$createComponent(Show, {
949
667
  get when() {
950
668
  return _$memo(() => !!collapsed())() && hasData();
951
669
  },
@@ -983,32 +701,32 @@ export function SidebarPanel(props) {
983
701
  return label();
984
702
  },
985
703
  get children() {
986
- var _el$37 = _$createElement("box"),
987
- _el$38 = _$createElement("text"),
988
- _el$39 = _$createElement("b"),
989
- _el$40 = _$createElement("text");
990
- _$insertNode(_el$37, _el$38);
991
- _$insertNode(_el$37, _el$40);
992
- _$setProp(_el$37, "flexDirection", 'row');
993
- _$setProp(_el$37, "flexShrink", 0);
994
- _$insertNode(_el$38, _el$39);
995
- _$setProp(_el$38, "flexShrink", 0);
996
- _$setProp(_el$38, "wrapMode", 'none');
997
- _$insert(_el$39, figure);
998
- _$setProp(_el$40, "flexShrink", 0);
999
- _$setProp(_el$40, "wrapMode", 'none');
1000
- _$insert(_el$40, () => unavailable() ? ' ⊘' : ' ●');
704
+ var _el$18 = _$createElement("box"),
705
+ _el$19 = _$createElement("text"),
706
+ _el$20 = _$createElement("b"),
707
+ _el$21 = _$createElement("text");
708
+ _$insertNode(_el$18, _el$19);
709
+ _$insertNode(_el$18, _el$21);
710
+ _$setProp(_el$18, "flexDirection", 'row');
711
+ _$setProp(_el$18, "flexShrink", 0);
712
+ _$insertNode(_el$19, _el$20);
713
+ _$setProp(_el$19, "flexShrink", 0);
714
+ _$setProp(_el$19, "wrapMode", 'none');
715
+ _$insert(_el$20, figure);
716
+ _$setProp(_el$21, "flexShrink", 0);
717
+ _$setProp(_el$21, "wrapMode", 'none');
718
+ _$insert(_el$21, () => unavailable() ? ' ⊘' : ' ●');
1001
719
  _$effect(_p$ => {
1002
- var _v$1 = toneColor(theme(), tone()),
1003
- _v$10 = toneColor(theme(), unavailable() ? 'err' : tone());
1004
- _v$1 !== _p$.e && (_p$.e = _$setProp(_el$38, "fg", _v$1, _p$.e));
1005
- _v$10 !== _p$.t && (_p$.t = _$setProp(_el$40, "fg", _v$10, _p$.t));
720
+ var _v$8 = toneColor(theme(), tone()),
721
+ _v$9 = toneColor(theme(), unavailable() ? 'err' : tone());
722
+ _v$8 !== _p$.e && (_p$.e = _$setProp(_el$19, "fg", _v$8, _p$.e));
723
+ _v$9 !== _p$.t && (_p$.t = _$setProp(_el$21, "fg", _v$9, _p$.t));
1006
724
  return _p$;
1007
725
  }, {
1008
726
  e: undefined,
1009
727
  t: undefined
1010
728
  });
1011
- return _el$37;
729
+ return _el$18;
1012
730
  }
1013
731
  });
1014
732
  }
@@ -1016,7 +734,7 @@ export function SidebarPanel(props) {
1016
734
  })();
1017
735
  }
1018
736
  }), null);
1019
- _$insert(_el$27, _$createComponent(Show, {
737
+ _$insert(_el$0, _$createComponent(Show, {
1020
738
  get when() {
1021
739
  return !collapsed() || !hasData();
1022
740
  },
@@ -1027,14 +745,14 @@ export function SidebarPanel(props) {
1027
745
  },
1028
746
  get fallback() {
1029
747
  return (() => {
1030
- var _el$41 = _$createElement("box"),
1031
- _el$42 = _$createElement("text");
1032
- _$insertNode(_el$41, _el$42);
1033
- _$setProp(_el$41, "marginTop", 1);
1034
- _$setProp(_el$41, "width", '100%');
1035
- _$insertNode(_el$42, _$createTextNode(`Waiting for quota…`));
1036
- _$effect(_$p => _$setProp(_el$42, "fg", theme().textMuted, _$p));
1037
- return _el$41;
748
+ var _el$22 = _$createElement("box"),
749
+ _el$23 = _$createElement("text");
750
+ _$insertNode(_el$22, _el$23);
751
+ _$setProp(_el$22, "marginTop", 1);
752
+ _$setProp(_el$22, "width", '100%');
753
+ _$insertNode(_el$23, _$createTextNode(`Waiting for quota…`));
754
+ _$effect(_$p => _$setProp(_el$23, "fg", theme().textMuted, _$p));
755
+ return _el$22;
1038
756
  })();
1039
757
  },
1040
758
  get children() {
@@ -1078,16 +796,16 @@ export function SidebarPanel(props) {
1078
796
  },
1079
797
  get fallback() {
1080
798
  return (() => {
1081
- var _el$44 = _$createElement("text");
1082
- _$insertNode(_el$44, _$createTextNode(`No request yet`));
1083
- _$setProp(_el$44, "wrapMode", 'none');
1084
- _$effect(_$p => _$setProp(_el$44, "fg", theme().textMuted, _$p));
1085
- return _el$44;
799
+ var _el$25 = _$createElement("text");
800
+ _$insertNode(_el$25, _$createTextNode(`No request yet`));
801
+ _$setProp(_el$25, "wrapMode", 'none');
802
+ _$effect(_$p => _$setProp(_el$25, "fg", theme().textMuted, _$p));
803
+ return _el$25;
1086
804
  })();
1087
805
  },
1088
806
  children: route => _$createComponent(Show, {
1089
807
  get when() {
1090
- return 'Route'.length + 1 + routeValue(route()).length <= contentWidth();
808
+ return routeLineFits('Route', routeValue(route()), contentWidth());
1091
809
  },
1092
810
  get fallback() {
1093
811
  return _$createComponent(For, {
@@ -1095,13 +813,13 @@ export function SidebarPanel(props) {
1095
813
  return routeLines(route());
1096
814
  },
1097
815
  children: line => (() => {
1098
- var _el$46 = _$createElement("text"),
1099
- _el$47 = _$createElement("b");
1100
- _$insertNode(_el$46, _el$47);
1101
- _$setProp(_el$46, "wrapMode", 'none');
1102
- _$insert(_el$47, line);
1103
- _$effect(_$p => _$setProp(_el$46, "fg", toneColor(theme(), 'accent'), _$p));
1104
- return _el$46;
816
+ var _el$27 = _$createElement("text"),
817
+ _el$28 = _$createElement("b");
818
+ _$insertNode(_el$27, _el$28);
819
+ _$setProp(_el$27, "wrapMode", 'none');
820
+ _$insert(_el$28, line);
821
+ _$effect(_$p => _$setProp(_el$27, "fg", toneColor(theme(), 'accent'), _$p));
822
+ return _el$27;
1105
823
  })()
1106
824
  });
1107
825
  },
@@ -1162,19 +880,19 @@ export function SidebarPanel(props) {
1162
880
  }
1163
881
  }), null);
1164
882
  _$effect(_p$ => {
1165
- var _v$8 = theme().borderActive,
1166
- _v$9 = theme().accent,
1167
- _v$0 = theme().background;
1168
- _v$8 !== _p$.e && (_p$.e = _$setProp(_el$27, "borderColor", _v$8, _p$.e));
1169
- _v$9 !== _p$.t && (_p$.t = _$setProp(_el$29, "backgroundColor", _v$9, _p$.t));
1170
- _v$0 !== _p$.a && (_p$.a = _$setProp(_el$30, "fg", _v$0, _p$.a));
883
+ var _v$5 = theme().borderActive,
884
+ _v$6 = theme().accent,
885
+ _v$7 = theme().background;
886
+ _v$5 !== _p$.e && (_p$.e = _$setProp(_el$0, "borderColor", _v$5, _p$.e));
887
+ _v$6 !== _p$.t && (_p$.t = _$setProp(_el$10, "backgroundColor", _v$6, _p$.t));
888
+ _v$7 !== _p$.a && (_p$.a = _$setProp(_el$11, "fg", _v$7, _p$.a));
1171
889
  return _p$;
1172
890
  }, {
1173
891
  e: undefined,
1174
892
  t: undefined,
1175
893
  a: undefined
1176
894
  });
1177
- return _el$27;
895
+ return _el$0;
1178
896
  })();
1179
897
  }
1180
898