@cortexkit/opencode-antigravity-auth 3.0.4 → 3.0.6

package/src/tui-raw/common-auth-embedded/quota/merge.js

@@ -11,7 +11,7 @@
 // no entry gets an absence record. A pair outside the coverage is never
 // touched, so a header-shaped partial observation (which covers only what it
 // carries) cannot erase a family limit or the budget.
-import { ALL_SCOPE, entryTime, isQuotaMap, limitKey, } from "./map.js";
+import { ALL_SCOPE, decodeQuotaMap, entryTime, isQuotaCounters, limitKey, } from "./map.js";
 /** Thrown by `mergeQuotaObservation` when either argument is malformed. */
 export class QuotaCodecError extends TypeError {
     constructor(message) {
@@ -83,7 +83,8 @@ export function isQuotaObservation(value) {
     }
     if (!coverage.every(isObservedPair))
         return false;
-    return value.budget === undefined || isObservedBudget(value.budget);
+    return ((value.budget === undefined || isObservedBudget(value.budget)) &&
+        (value.counters === undefined || isQuotaCounters(value.counters)));
 }
 function compareEntries(left, right) {
     if (left.scope !== right.scope)
@@ -99,6 +100,16 @@ function mergeBudget(stored, observed, checkedAt) {
         return stored;
     return { ...observed, checkedAt };
 }
+function mergeCounters(stored, observed) {
+    const counters = new Map(Object.entries(stored ?? {}));
+    for (const [name, counter] of Object.entries(observed ?? {})) {
+        const existing = counters.get(name);
+        if (existing === undefined || counter.checkedAt >= existing.checkedAt) {
+            counters.set(name, counter);
+        }
+    }
+    return counters.size === 0 ? undefined : Object.fromEntries(counters);
+}
 /**
  * Applies `observation` to `stored` (undefined for a row with no map yet) and
  * returns the new map. Pure: neither argument is modified. Throws
@@ -106,13 +117,16 @@ function mergeBudget(stored, observed, checkedAt) {
  * write rather than persisting a map it could not read back.
  */
 export function mergeQuotaObservation(stored, observation) {
-    if (stored !== undefined && !isQuotaMap(stored)) {
+    // Decode the stored map the way reads do, so a malformed counter that reads
+    // already hide is dropped here too instead of refusing every later write.
+    const decoded = stored === undefined ? undefined : decodeQuotaMap(stored);
+    if (stored !== undefined && decoded === undefined) {
         throw new QuotaCodecError('stored quota map is malformed');
     }
     if (!isQuotaObservation(observation)) {
         throw new QuotaCodecError('quota observation is malformed');
     }
-    const base = stored ?? { limits: [] };
+    const base = decoded ?? { limits: [] };
     const at = observation.checkedAt;
     const entries = new Map();
     for (const entry of base.limits) {
@@ -152,11 +166,13 @@ export function mergeQuotaObservation(stored, observation) {
             : { scope, label: pair.label, kind: 'retired', retiredAt: at });
     }
     // Keys this module does not recognise are carried over untouched.
-    const { limits: _limits, budget: _budget, ...unknownKeys } = base;
+    const { limits: _limits, budget: _budget, counters: _counters, ...unknownKeys } = base;
     const budget = mergeBudget(base.budget, observation.budget, at);
+    const counters = mergeCounters(base.counters, observation.counters);
     return {
         ...unknownKeys,
         limits: [...entries.values()].sort(compareEntries),
         ...(budget === undefined ? {} : { budget }),
+        ...(counters === undefined ? {} : { counters }),
     };
 }

package/src/tui-raw/common-auth-embedded/quota/projection.js

@@ -6,7 +6,7 @@
 // scope, orders the result the way the primitives expect, and carries each
 // entry's (scope, label) so a decision names the limit it judged rather than
 // the position it occupied.
-import { ALL_SCOPE, } from "./map.js";
+import { ALL_SCOPE, readQuotaCounters, } from "./map.js";
 function project(entry) {
     if (entry.kind === 'retired') {
         return {
@@ -94,11 +94,13 @@ export function projectQuota(map, scope = ALL_SCOPE) {
         ? Math.min(...stamped.map((limit) => limit.checkedAt))
         : undefined;
     const budget = map?.budget?.kind === 'reading' ? projectBudget(map.budget) : undefined;
+    const counters = readQuotaCounters(map?.counters);
     return {
         scope,
         limits,
         ...(checkedAt === undefined ? {} : { checkedAt }),
         ...(budget === undefined ? {} : { budget }),
+        ...(counters === undefined ? {} : { counters }),
     };
 }
 /**

package/src/tui-raw/quota-presentation.js

@@ -1,8 +1,7 @@
 import {
   formatQuota,
   NO_QUOTA_READING,
-  quotaTextParts,
-  quotaWindowName
+  quotaWindowParts
 } from "./common-auth-embedded/quota/index.js";
 
 export { NO_QUOTA_READING };
@@ -23,20 +22,54 @@ function projectReading(label, reading) {
 export function formatQuotaReading(label, reading, now) {
   return formatQuota(projectReading(label, reading), { now });
 }
+export function quotaWindowText(reading, now) {
+  const part = quotaWindowParts(projectReading("", reading), {
+    now,
+    form: "full",
+    staleAfterMs: Number.POSITIVE_INFINITY
+  }).windows[0];
+  if (!part)
+    return {
+      name: "",
+      figure: NO_QUOTA_READING,
+      reset: "",
+      remaining: null,
+      resetSinceReading: !1
+    };
+  return {
+    name: part.name,
+    figure: part.figure,
+    reset: part.resetIn ?? "",
+    remaining: part.remainingPercent ?? null,
+    resetSinceReading: part.resetSinceReading
+  };
+}
+export function quotaReadingAge(readings, now) {
+  const limits = readings.flatMap((reading, index) => projectReading(`reading ${index}`, reading)?.limits ?? []);
+  if (limits.length === 0)
+    return "";
+  return quotaWindowParts({
+    scope: "all",
+    limits,
+    checkedAt: Math.min(...limits.map((limit) => limit.checkedAt))
+  }, { now, form: "compact" }).age ?? "";
+}
 export function quotaReadingParts(label, reading, now) {
-  const projected = projectReading(label, reading), limit = projected?.limits[0];
-  if (!limit)
+  const parts = quotaWindowParts(projectReading(label, reading), {
+    now,
+    form: "full"
+  }), part = parts.windows[0];
+  if (!part)
     return {
       name: label,
       figure: NO_QUOTA_READING,
       detail: "",
       remaining: null
     };
-  const full = quotaTextParts(projected, { now }), compact = quotaTextParts(projected, { now, form: "compact" }), name = quotaWindowName(limit), first = compact[0] ?? "", figure = first.startsWith(`${name} `) ? first.slice(name.length + 1) : first, reset = (full[0] ?? "").slice(first.length).replace(/^, /, "");
   return {
-    name,
-    figure,
-    detail: [reset, ...full.slice(1)].filter(Boolean).join(" \xB7 "),
-    remaining: limit.remainingPercent ?? null
+    name: part.name,
+    figure: part.figure,
+    detail: [part.resetIn ? `resets ${part.resetIn}` : "", parts.age].filter(Boolean).join(" \xB7 "),
+    remaining: part.remainingPercent ?? null
   };
 }

package/src/tui-raw/sidebar-state.js

@@ -52,6 +52,17 @@ export function readSidebarState(path = getSidebarStateFile()) {
   }
   return normalizeSidebarState(parsed);
 }
+function readSidebarStateVersion(path) {
+  try {
+    const parsed = JSON.parse(readFileSync(path, "utf-8"));
+    if (!isObject(parsed))
+      return;
+    const version = parsed.version;
+    return typeof version === "number" ? version : void 0;
+  } catch {
+    return;
+  }
+}
 function normalizeSidebarState(input) {
   if (!isObject(input))
     return { ...DEFAULT_SIDEBAR_STATE, lastError: "shape" };
@@ -155,7 +166,7 @@ function normalizeRouting(input) {
   return {
     accountId,
     modelFamily,
-    headerStyle,
+    headerStyle: "antigravity",
     strategy: strategy === "sticky" || strategy === "round-robin" || strategy === "hybrid" ? strategy : void 0,
     updatedAt
   };
@@ -346,6 +357,9 @@ async function performSidebarWrite(stateFile, merge) {
     const lock = await acquireSidebarLockWithRetry(stateFile);
     try {
       await lock.assertOwned();
+      const version = readSidebarStateVersion(stateFile);
+      if (version !== void 0 && version > SIDEBAR_STATE_VERSION)
+        return;
       const existing = readSidebarState(stateFile);
       await emitMergeStep("read-state");
       const merged = merge(existing);