dsh-subscriptions 0.2.0 → 0.2.3

package/lib/client/subscription-card-styles.js

@@ -1,48 +1,118 @@
 /** Shared visual language for OAuth, Cursor, and built-in provider cards. */
 export const subscriptionCardStyles = {
     card: {
-        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 12,
-        padding: '12px 14px', display: 'flex', flexDirection: 'column', gap: 6,
+        border: '1px solid var(--dsw-alias-border-l2)',
+        borderRadius: 12,
+        padding: '12px 14px',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
         color: 'var(--dsw-alias-label-primary)',
     },
     header: { display: 'flex', alignItems: 'center', gap: 8 },
     dot: { width: 8, height: 8, borderRadius: '50%', flexShrink: 0 },
-    name: { fontWeight: 500, fontSize: 14, lineHeight: '22px', color: 'var(--dsw-alias-label-primary)' },
-    status: { margin: 0, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)' },
-    error: { margin: 0, fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-state-error-primary)' },
-    actions: { display: 'flex', gap: 8, marginTop: 4, alignItems: 'center', flexWrap: 'wrap' },
+    name: {
+        fontWeight: 500,
+        fontSize: 14,
+        lineHeight: '22px',
+        color: 'var(--dsw-alias-label-primary)',
+    },
+    status: {
+        margin: 0,
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-label-tertiary)',
+    },
+    error: {
+        margin: 0,
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-state-error-primary)',
+    },
+    actions: {
+        display: 'flex',
+        gap: 8,
+        marginTop: 4,
+        alignItems: 'center',
+        flexWrap: 'wrap',
+    },
     button: {
-        boxSizing: 'border-box', display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
-        height: 28, padding: '0 10px', borderRadius: 14,
-        border: '1px solid var(--dsw-alias-border-l2)', background: 'transparent',
-        color: 'var(--dsw-alias-label-primary)', font: 'inherit', fontSize: 12, lineHeight: '18px',
+        boxSizing: 'border-box',
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        height: 28,
+        padding: '0 10px',
+        borderRadius: 14,
+        border: '1px solid var(--dsw-alias-border-l2)',
+        background: 'transparent',
+        color: 'var(--dsw-alias-label-primary)',
+        font: 'inherit',
+        fontSize: 12,
+        lineHeight: '18px',
         cursor: 'pointer',
     },
     account: {
-        display: 'flex', flexDirection: 'column', gap: 6,
-        border: '1px solid var(--dsw-alias-border-l2)', borderRadius: 8,
-        padding: '8px 10px', marginTop: 4,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
+        border: '1px solid var(--dsw-alias-border-l2)',
+        borderRadius: 8,
+        padding: '8px 10px',
+        marginTop: 4,
     },
     accountHeader: { display: 'flex', alignItems: 'center', gap: 8 },
-    accountName: { fontSize: 13, lineHeight: '20px', color: 'var(--dsw-alias-label-primary)', userSelect: 'all' },
+    accountName: {
+        fontSize: 13,
+        lineHeight: '20px',
+        color: 'var(--dsw-alias-label-primary)',
+        userSelect: 'all',
+    },
     defaultStar: { color: 'var(--dsw-alias-state-warn-label)' },
     usage: {
-        display: 'flex', flexDirection: 'column', gap: 6, marginTop: 4,
-        borderTop: '1px solid var(--dsw-alias-border-l2)', paddingTop: 8,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
+        marginTop: 4,
+        borderTop: '1px solid var(--dsw-alias-border-l2)',
+        paddingTop: 8,
     },
     usageHeader: { display: 'flex', alignItems: 'center', gap: 8 },
-    usageTitle: { fontSize: 12, lineHeight: '18px', fontWeight: 500, color: 'var(--dsw-alias-label-secondary)' },
-    usagePlan: { fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)' },
+    usageTitle: {
+        fontSize: 12,
+        lineHeight: '18px',
+        fontWeight: 500,
+        color: 'var(--dsw-alias-label-secondary)',
+    },
+    usagePlan: {
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-label-tertiary)',
+    },
     usageRefresh: {
-        boxSizing: 'border-box', display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
-        height: 22, padding: '0 8px', borderRadius: 11, marginLeft: 'auto',
-        border: '1px solid var(--dsw-alias-border-l2)', background: 'transparent',
-        color: 'var(--dsw-alias-label-secondary)', font: 'inherit', fontSize: 12, lineHeight: '18px',
+        boxSizing: 'border-box',
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        height: 22,
+        padding: '0 8px',
+        borderRadius: 11,
+        marginLeft: 'auto',
+        border: '1px solid var(--dsw-alias-border-l2)',
+        background: 'transparent',
+        color: 'var(--dsw-alias-label-secondary)',
+        font: 'inherit',
+        fontSize: 12,
+        lineHeight: '18px',
         cursor: 'pointer',
     },
     usageRow: { display: 'flex', flexDirection: 'column', gap: 3 },
     usageMeta: {
-        display: 'flex', justifyContent: 'space-between', gap: 8,
-        fontSize: 12, lineHeight: '18px', color: 'var(--dsw-alias-label-tertiary)',
+        display: 'flex',
+        justifyContent: 'space-between',
+        gap: 8,
+        fontSize: 12,
+        lineHeight: '18px',
+        color: 'var(--dsw-alias-label-tertiary)',
     },
 };

package/lib/client/usage-color-preferences.js

@@ -24,8 +24,10 @@ export function setUsageColorPreset(value) {
     window.dispatchEvent(new Event(EVENT));
 }
 export function subscribeUsageColorPreset(notify) {
-    const storage = (event) => { if (event.key === KEY || event.key === null)
-        notify(); };
+    const storage = (event) => {
+        if (event.key === KEY || event.key === null)
+            notify();
+    };
     window.addEventListener(EVENT, notify);
     window.addEventListener('storage', storage);
     return () => {

package/lib/client/usage-pace.js

@@ -21,7 +21,7 @@ export function resetCountdownParts(ms) {
         { unit: 'hour', count: Math.floor((total % 1440) / 60) },
         { unit: 'minute', count: total % 60 },
     ];
-    return parts.filter(part => part.count > 0).slice(0, 2);
+    return parts.filter((part) => part.count > 0).slice(0, 2);
 }
 /**
  * Whether the reported percentage still describes the window now. Only a fresh
@@ -30,10 +30,14 @@ export function resetCountdownParts(ms) {
  * drawn: where the window stands in time never depends on the reading.
  */
 export function isUsageFresh(window, observation, now = Date.now()) {
-    return validUsage(window.usedPercent) && observation.stale !== true
-        && observation.observedAt !== undefined && Number.isFinite(observation.observedAt)
-        && observation.observedAt <= now && now - observation.observedAt <= USAGE_FRESHNESS_MS
-        && (window.resetsAt === undefined || Number.isFinite(window.resetsAt) && window.resetsAt > now);
+    return (validUsage(window.usedPercent) &&
+        observation.stale !== true &&
+        observation.observedAt !== undefined &&
+        Number.isFinite(observation.observedAt) &&
+        observation.observedAt <= now &&
+        now - observation.observedAt <= USAGE_FRESHNESS_MS &&
+        (window.resetsAt === undefined ||
+            (Number.isFinite(window.resetsAt) && window.resetsAt > now)));
 }
 /**
  * How far through its window the clock is, from the window's own timing alone.
@@ -48,10 +52,19 @@ export function elapsedPercent(window, now = Date.now()) {
     if (end === undefined || !Number.isFinite(end) || end <= now)
         return undefined;
     const duration = window.windowDurationMs;
-    const start = window.startsAt ?? (window.fixedWindow === true && duration !== undefined && Number.isFinite(duration) && duration > 0 ? end - duration : undefined);
-    if (start === undefined || !Number.isFinite(start) || start >= end || start > now)
+    const start = window.startsAt ??
+        (window.fixedWindow === true &&
+            duration !== undefined &&
+            Number.isFinite(duration) &&
+            duration > 0
+            ? end - duration
+            : undefined);
+    if (start === undefined ||
+        !Number.isFinite(start) ||
+        start >= end ||
+        start > now)
         return undefined;
-    return Math.min(100, Math.max(0, (now - start) / (end - start) * 100));
+    return Math.min(100, Math.max(0, ((now - start) / (end - start)) * 100));
 }
 export function usageColorState(used, elapsed, preset, fresh) {
     if (!validUsage(used))
@@ -65,8 +78,10 @@ export function usageColorState(used, elapsed, preset, fresh) {
 }
 export function usageBarColor(used, elapsed, preset = 'standard', fresh = true) {
     const state = usageColorState(used, elapsed, preset, fresh);
-    return state === 'red' ? 'var(--dsw-alias-state-error-primary)'
-        : state === 'yellow' ? 'var(--dsw-alias-state-warn-label)'
+    return state === 'red'
+        ? 'var(--dsw-alias-state-error-primary)'
+        : state === 'yellow'
+            ? 'var(--dsw-alias-state-warn-label)'
             : 'var(--dsw-alias-state-success-primary)';
 }
 /**
@@ -80,7 +95,10 @@ export function displayStartPercent(window, now = Date.now()) {
     const start = window.displayStartsAt;
     if (end === undefined || !Number.isFinite(end) || end <= now)
         return undefined;
-    if (start === undefined || !Number.isFinite(start) || start >= end || start > now)
+    if (start === undefined ||
+        !Number.isFinite(start) ||
+        start >= end ||
+        start > now)
         return undefined;
-    return Math.min(100, Math.max(0, (now - start) / (end - start) * 100));
+    return Math.min(100, Math.max(0, ((now - start) / (end - start)) * 100));
 }

package/lib/client/usage-window-filter.d.ts

@@ -0,0 +1,7 @@
+import type { UsageWindow } from './SubscriptionsSection.js';
+/**
+ * Keep model-scoped Google quotas aligned with the saved model-picker selection.
+ * Account-wide windows and other providers are unaffected; an absent selection
+ * follows discovery, while an empty selection hides every model-scoped window.
+ */
+export declare function visibleUsageWindows(provider: string, windows: UsageWindow[] | undefined, visibleModels: string[] | undefined): UsageWindow[];

package/lib/client/usage-window-filter.js

@@ -0,0 +1,12 @@
+/**
+ * Keep model-scoped Google quotas aligned with the saved model-picker selection.
+ * Account-wide windows and other providers are unaffected; an absent selection
+ * follows discovery, while an empty selection hides every model-scoped window.
+ */
+export function visibleUsageWindows(provider, windows, visibleModels) {
+    if (windows === undefined)
+        return [];
+    if (provider !== 'antigravity' || visibleModels === undefined)
+        return windows;
+    return windows.filter((window) => !window.scope || visibleModels.includes(window.scope));
+}