dsh-plugin-subscription-oauth 0.8.9 → 0.8.11

package/lib/providers/antigravity-catalog.d.ts

@@ -14,6 +14,10 @@
  */
 import type { UsageWindow } from '../protocol.js';
 import type { CatalogEntry } from './catalog.js';
+/** True when a model id names a specific tier of a family, not a model with a ladder. */
+export declare function isTierSuffixed(id: string): boolean;
+/** The base family a tier-suffixed id belongs to (`gemini-3.5-flash-low` → `gemini-3.5-flash`). */
+export declare function baseFamilyOf(id: string): string;
 /** Antigravity's own reasoning ladder, per model family. */
 export declare function antigravityEffortsFor(model: string): readonly string[];
 /**

package/lib/providers/antigravity-catalog.js

@@ -48,6 +48,16 @@ function modelInfo(raw) {
         ...raw.supportsImages === true ? { supportsImages: true } : {},
     };
 }
+/** A model id whose suffix fixes its reasoning tier, not a ladder the picker offers. */
+const TIER_SUFFIXED = /-(?:low|medium|high|extra-low|max)$/i;
+/** True when a model id names a specific tier of a family, not a model with a ladder. */
+export function isTierSuffixed(id) {
+    return TIER_SUFFIXED.test(id);
+}
+/** The base family a tier-suffixed id belongs to (`gemini-3.5-flash-low` → `gemini-3.5-flash`). */
+export function baseFamilyOf(id) {
+    return id.replace(/-(?:extra-low|low|medium|high|max)$/i, '');
+}
 /** Antigravity's own reasoning ladder, per model family. */
 export function antigravityEffortsFor(model) {
     if (/^claude-/.test(model))
@@ -166,8 +176,28 @@ export function parseAntigravityModels(payload) {
     }
     catch { /* diagnostics never break parsing */ }
     const entries = [];
+    const seenBase = new Set();
     for (const wireId of agentIds(payload)) {
         const info = modelInfo(models[wireId]);
+        // Tier-suffixed ids (gemini-3.5-flash-low, …-high) are the family's fixed tiers;
+        // they fold into the base family row so the picker shows one entry with a ladder,
+        // not one row per tier. The base row is inserted the first time a tier of it is seen.
+        if (isTierSuffixed(wireId)) {
+            const base = baseFamilyOf(wireId);
+            if (seenBase.has(base))
+                continue;
+            seenBase.add(base);
+            const baseInfo = modelInfo(models[base]) ?? info;
+            entries.push({
+                id: base,
+                name: displayNameOf(base, models[base] ?? {}),
+                contextWindow: baseInfo.maxTokens ?? baseInfo.maxInputTokens ?? baseInfo.inputTokenLimit ?? 1_048_576,
+                inputModalities: baseInfo.supportsImages === true ? ['text', 'image'] : ['text'],
+                reasoningEfforts: antigravityEffortsFor(base),
+            });
+            continue;
+        }
+        seenBase.add(wireId);
         const tiers = /-(?:low|medium|high)$/.test(wireId);
         const efforts = tiers ? [] : antigravityEffortsFor(wireId);
         const contextWindow = info.maxTokens ?? info.maxInputTokens ?? info.inputTokenLimit ?? 1_048_576;

package/lib/providers/grok.d.ts

@@ -112,6 +112,10 @@ interface GrokCliMetadata {
     reasoningEfforts?: readonly string[];
     defaultEffort?: string;
 }
+/** True when a model id names a fast/lightspeed variant of a base model. */
+export declare function isFastVariant(id: string): boolean;
+/** The base model id a fast variant belongs to (`grok-4.7-fast` → `grok-4.7`). */
+export declare function baseModelOf(id: string): string;
 /** Constructor dependencies for {@link GrokAdapter}. */
 export interface GrokAdapterOptions {
     /** API base; `<base>/responses` and `<base>/models`. */

package/lib/providers/grok.js

@@ -262,6 +262,16 @@ export async function refreshGrokToken(input) {
 }
 /** Model ids that are clearly not chat models. */
 const NON_CHAT_ID = /(?:^|[-_/])(?:image|video|imagine|embed|embedding|whisper|tts|vision-only)/i;
+/** Model ids that are the fast/lightspeed variant of a base model, matched per base. */
+const FAST_VARIANT = /(?:^|[-_])(?:fast|lightspeed|turbo|quick)$/i;
+/** True when a model id names a fast/lightspeed variant of a base model. */
+export function isFastVariant(id) {
+    return FAST_VARIANT.test(id);
+}
+/** The base model id a fast variant belongs to (`grok-4.7-fast` → `grok-4.7`). */
+export function baseModelOf(id) {
+    return id.replace(FAST_VARIANT, '');
+}
 /** Grok wire adapter: one instance serves the `grok` provider route. */
 export class GrokAdapter extends LlmAdapter {
     options;
@@ -514,13 +524,18 @@ export class GrokAdapter extends LlmAdapter {
                 return undefined;
             }
             const payload = await response.json();
+            // Fast/lightspeed variants ride with their base model: they share the base's
+            // visibility switch and are reached by a picker button, not a separate row.
             const ids = (payload.data ?? [])
                 .map((entry) => entry.id)
-                .filter((id) => typeof id === 'string' && id.length > 0 && !NON_CHAT_ID.test(id));
+                .filter((id) => typeof id === 'string' && id.length > 0 && !NON_CHAT_ID.test(id))
+                .map((id) => (isFastVariant(id) ? baseModelOf(id) : id))
+                .filter((id, index, list) => list.indexOf(id) === index);
             if (ids.length === 0) {
                 this.options.onWarn?.('xAI model discovery returned an empty catalog; using the built-in catalog');
                 return undefined;
             }
+            // Keep the fast-variant ids discoverable for the picker button, keyed by their base.
             const metadata = await this.fetchCliMetadata(fetchFn, signal);
             for (const [id, meta] of metadata)
                 this.metadata.set(id, meta);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subscription-oauth",
-  "version": "0.8.9",
+  "version": "0.8.11",
   "description": "Use subscription accounts as DeepSeek Harness LLM providers — Kimi Code (OAuth device flow), Grok / X Premium (OIDC + PKCE), Google Antigravity (Google OAuth + Cloud Code Assist) and GLM / BigModel (ZCode's browser sign-in) — with per-model visibility, drag-to-reorder Auto fallback and plan quotas from the web Settings page",
   "license": "MIT",
   "author": "EricFL1998",