dsh-plugin-subscription-oauth 0.8.15 → 0.8.16

package/lib/auth/provider-controller.js

@@ -300,20 +300,26 @@ export class ProviderController {
         // every startup would be noise.
         if (!await this.options.store.hasAny())
             return this.status();
-        // Discovery resolves tokens to read the model list, but a resolve must never
-        // open the browser: a transient network failure, or a token the endpoint refuses
-        // while still being within its stored expiry, is not a signal to start a login.
-        // Only an explicit user action (the connect button) opens the consent page.
+        // Discovery reads the live catalog on startup so the picker shows what the account
+        // actually serves without a manual refresh. A resolve must never open the browser:
+        // a refresh failure is recorded as the route's last error, never as a login prompt.
         const discovered = [];
         for (const account of Object.keys(await this.options.store.list())) {
+            // An unexpired token is used as-is; a lapsed one is refreshed in memory so the
+            // catalog still loads on startup. The refreshed token is not written back to the
+            // store here — a durable renewal still happens on the next real request.
             let session = await this.options.store.get(account);
             if (session === undefined)
                 continue;
-            // A token that is still within its stored expiry is used as-is; a lapsed one
-            // is a silent skip (the route works, the catalog is just not refreshed).
             if (session.expiresAt <= Date.now()) {
-                this.options.onWarn?.(`${spec.id} model discovery for ${account} skipped: token expired`);
-                continue;
+                try {
+                    const refreshed = await this.options.tokens.resolve(account, true);
+                    session = { ...session, accessToken: refreshed.accessToken, expiresAt: refreshed.expiresAt };
+                }
+                catch {
+                    this.options.onWarn?.(`${spec.id} model discovery for ${account} skipped: token refresh failed`);
+                    continue;
+                }
             }
             const ids = await spec.discover(session.accessToken);
             if (ids !== undefined) {

package/lib/providers/grok.js

@@ -446,23 +446,22 @@ export class GrokAdapter extends LlmAdapter {
             return [];
         await this.syncUserModels();
         const hidden = await this.hidden();
-        // A fast variant is not a picker row, but the host validates a GUI selection
-        // against the exact list `listModels` returns, so the variant must appear there
-        // or selecting it is refused with `session/model-unavailable`. The picker's
-        // menu collapses entries that share one `group` value into a single choice,
-        // so the variant rides with its base id as the group: the host can name and
-        // select it, and the picker still shows one row per model.
+        // The host validates a GUI selection against the exact ids `listModels` returns
+        // and refuses an unknown one with `session/model-unavailable`, and its picker
+        // lists every returned id as its own row. So a fast variant is published under
+        // its base id: selecting it names the variant the request must send, and the
+        // base's own id is withheld so the variant does not appear twice.
         const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
-        const listed = resolveCatalog(imageless, [], hidden).entries.flatMap((entry) => {
+        const listed = resolveCatalog(imageless, [], hidden).entries.map((entry) => {
             const fast = this.fastVariants.variantOf(entry.id);
-            const base = {
+            const id = fast ?? entry.id;
+            return {
                 provider: GROK_PROVIDER_ID,
-                id: entry.id,
+                id,
                 name: entry.name,
                 ...entry.description === undefined ? {} : { description: entry.description },
                 ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
             };
-            return fast === undefined ? [base] : [base, { provider: GROK_PROVIDER_ID, id: fast, name: entry.name, group: entry.id, description: 'Fast variant', ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities } }];
         });
         return listed;
     }
@@ -498,10 +497,13 @@ export class GrokAdapter extends LlmAdapter {
             };
         }
         const reasoning = reasoningInfo(entry);
+        // The fast selection names itself "Fast" so the picker trigger reads the mode, not
+        // the base model it replaces; the id stays the fast wire id the request must send.
+        const fast = pair !== undefined && pair.wireId === model;
         return {
             provider: GROK_PROVIDER_ID,
             id: model,
-            name: entry.name,
+            name: fast ? `${entry.name} Fast` : entry.name,
             ...entry.description === undefined ? {} : { description: entry.description },
             ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
             context: { contextWindow: entry.contextWindow },

package/lib/providers/kimi.js

@@ -206,23 +206,22 @@ export class KimiAdapter extends LlmAdapter {
             return [];
         await this.syncUserModels();
         const hidden = await this.hidden();
-        // A fast variant is not a picker row, but the host validates a GUI selection
-        // against the exact list `listModels` returns, so the variant must appear there
-        // or selecting it is refused with `session/model-unavailable`. The picker's
-        // menu collapses entries that share one `group` value into a single choice,
-        // so the variant rides with its base id as the group: the host can name and
-        // select it, and the picker still shows one row per model.
+        // The host validates a GUI selection against the exact ids `listModels` returns
+        // and refuses an unknown one with `session/model-unavailable`, and its picker
+        // lists every returned id as its own row. So a fast variant is published under
+        // its base id: selecting it names the variant the request must send, and the
+        // base's own id is withheld so the variant does not appear twice.
         const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
-        const listed = resolveCatalog(imageless, [], hidden).entries.flatMap((entry) => {
+        const listed = resolveCatalog(imageless, [], hidden).entries.map((entry) => {
             const fast = this.fastVariants.variantOf(entry.id);
-            const base = {
+            const id = fast ?? entry.id;
+            return {
                 provider: KIMI_PROVIDER_ID,
-                id: entry.id,
+                id,
                 name: entry.name,
                 ...entry.description === undefined ? {} : { description: entry.description },
                 ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
             };
-            return fast === undefined ? [base] : [base, { provider: KIMI_PROVIDER_ID, id: fast, name: entry.name, group: entry.id, description: 'Fast variant', ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities } }];
         });
         return listed;
     }
@@ -268,12 +267,14 @@ export class KimiAdapter extends LlmAdapter {
         const reasoning = reasoningInfo(entry);
         // A fast variant is a wire id of its own — the button switches to it and back, so the
         // selection must keep that id — while an ordinary alias is just another spelling of
-        // the row and resolves onto it.
+        // the row and resolves onto it. The fast selection names itself "Fast" so the picker
+        // trigger reads the mode, not the base model it replaces.
         const pair = this.fastVariants.pairOf(model);
+        const fast = pair !== undefined && pair.wireId === model;
         return {
             provider: KIMI_PROVIDER_ID,
-            id: pair !== undefined && pair.wireId === model ? model : entry.id,
-            name: entry.name,
+            id: fast ? model : entry.id,
+            name: fast ? `${entry.name} Fast` : entry.name,
             ...entry.description === undefined ? {} : { description: entry.description },
             ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
             context: { contextWindow: entry.contextWindow },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subscription-oauth",
-  "version": "0.8.15",
+  "version": "0.8.16",
   "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",