dsh-plugin-subscription-oauth 0.8.15 → 0.8.17

package/lib/providers/grok.js

@@ -57,6 +57,10 @@ const EFFORT_LABELS = {
     low: { name: 'Low', description: 'Short chain of thought' },
     medium: { name: 'Medium', description: 'Balanced thinking budget' },
     high: { name: 'High', description: 'Deep chain of thought' },
+    // Not a thinking budget: this rung is the model's fast variant, which the composer's
+    // quick-mode button selects. It rides the effort channel so the row keeps its own id —
+    // a swapped model id would leave the picker with no way back to the standard model.
+    fast: { name: 'Fast', description: 'Lightspeed variant of this model' },
 };
 /**
  * Curated catalog entries.
@@ -123,13 +127,19 @@ function effortInfo(effort) {
     const label = EFFORT_LABELS[effort] ?? { name: effort, description: '' };
     return { id: ReasoningEffortId(effort), name: label.name, description: label.description };
 }
-/** The reasoning block for a catalog entry, or undefined when it supports none. */
-function reasoningInfo(entry) {
+/**
+ * The reasoning block for a catalog entry, or undefined when it supports none.
+ *
+ * @param entry - the catalog row.
+ * @param fast - add the `fast` rung when this row has a fast variant.
+ */
+function reasoningInfo(entry, fast = false) {
     const efforts = entry.reasoningEfforts;
-    if (efforts === undefined || efforts.length === 0)
+    const ids = fast ? [...efforts ?? [], 'fast'] : efforts;
+    if (ids === undefined || ids.length === 0)
         return undefined;
     return {
-        efforts: efforts.map(effortInfo),
+        efforts: ids.map(effortInfo),
         ...entry.defaultEffort === undefined ? {} : { defaultEffort: ReasoningEffortId(entry.defaultEffort) },
     };
 }
@@ -446,25 +456,18 @@ 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.
+        // One row per model, always under the model's own id: the host validates every GUI
+        // selection against this list, so publishing only the fast variant would leave the
+        // picker with no way back to the standard model. Fast mode is the row's `fast`
+        // reasoning rung instead (see `stream`).
         const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
-        const listed = resolveCatalog(imageless, [], hidden).entries.flatMap((entry) => {
-            const fast = this.fastVariants.variantOf(entry.id);
-            const base = {
-                provider: GROK_PROVIDER_ID,
-                id: entry.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;
+        return resolveCatalog(imageless, [], hidden).entries.map((entry) => ({
+            provider: GROK_PROVIDER_ID,
+            id: entry.id,
+            name: entry.name,
+            ...entry.description === undefined ? {} : { description: entry.description },
+            ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
+        }));
     }
     async hidden() {
         if (this.options.hiddenModels === undefined)
@@ -497,7 +500,9 @@ export class GrokAdapter extends LlmAdapter {
                 ...reasoning === undefined ? {} : { reasoning },
             };
         }
-        const reasoning = reasoningInfo(entry);
+        // A row with a fast variant offers the `fast` rung; the picker shows the row under
+        // its own name and the mode as the effort, which is what the trigger already reads.
+        const reasoning = reasoningInfo(entry, this.fastVariants.variantOf(entry.id) !== undefined);
         return {
             provider: GROK_PROVIDER_ID,
             id: model,
@@ -511,8 +516,17 @@ export class GrokAdapter extends LlmAdapter {
     }
     stream(options) {
         // Resolve @Nk context suffixes to the largest variant the endpoint offers.
-        const model = this.resolveModelId(options.model);
-        return streamProviderResponses({ ...options, model }, {
+        const base = this.resolveModelId(options.model);
+        // Fast mode rides the reasoning channel: `fast` is a rung of the row, not a model id
+        // of its own, so the row the picker selected stays dispatchable and the user can
+        // always select the standard model again. Only the wire id changes.
+        const fast = String(options.reasoningEffort ?? '') === 'fast';
+        const model = fast ? this.fastVariants.variantOf(base) ?? base : base;
+        const call = { ...options, model };
+        // xAI has no `fast` effort; the variant already carries the behaviour.
+        if (fast)
+            delete call.reasoningEffort;
+        return streamProviderResponses(call, {
             label: 'xAI API',
             tokens: this.options.tokens,
             request: (call, model, accessToken, signal) => this.request(call, model, accessToken, signal),

package/lib/providers/kimi.js

@@ -63,6 +63,10 @@ const EFFORT_LABELS = {
     high: { name: 'High', description: 'Deep chain of thought' },
     xhigh: { name: 'Max', description: 'Highest thinking budget Kimi accepts' },
     max: { name: 'Max', description: 'Highest thinking budget Kimi accepts' },
+    // Not a thinking budget: this rung is the model's fast variant, which the composer's
+    // quick-mode button selects. It rides the effort channel so the row keeps its own id —
+    // a swapped model id would leave the picker with no way back to the standard model.
+    fast: { name: 'Fast', description: 'Highspeed variant of this model' },
 };
 /**
  * Kimi Code's live coding catalog.
@@ -116,14 +120,20 @@ function effortInfo(effort) {
     const label = EFFORT_LABELS[effort] ?? { name: effort, description: '' };
     return { id: ReasoningEffortId(effort), name: label.name, description: label.description };
 }
-/** The reasoning block for a catalog entry, or undefined when it supports none. */
-function reasoningInfo(entry) {
+/**
+ * The reasoning block for a catalog entry, or undefined when it supports none.
+ *
+ * @param entry - the catalog row.
+ * @param fast - add the `fast` rung when this row has a fast variant.
+ */
+function reasoningInfo(entry, fast = false) {
     const efforts = entry.reasoningEfforts;
-    if (efforts === undefined || efforts.length === 0)
+    const ids = fast ? [...efforts ?? [], 'fast'] : efforts;
+    if (ids === undefined || ids.length === 0)
         return undefined;
-    const defaultEffort = entry.defaultEffort ?? efforts[efforts.length - 1];
+    const defaultEffort = entry.defaultEffort ?? ids[ids.length - 1];
     return {
-        efforts: efforts.map(effortInfo),
+        efforts: ids.map(effortInfo),
         ...defaultEffort === undefined ? {} : { defaultEffort: ReasoningEffortId(defaultEffort) },
     };
 }
@@ -206,25 +216,18 @@ 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.
+        // One row per model, always under the model's own id: the host validates every GUI
+        // selection against this list, so publishing only the fast variant would leave the
+        // picker with no way back to the standard model. Fast mode is the row's `fast`
+        // reasoning rung instead (see `stream`).
         const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
-        const listed = resolveCatalog(imageless, [], hidden).entries.flatMap((entry) => {
-            const fast = this.fastVariants.variantOf(entry.id);
-            const base = {
-                provider: KIMI_PROVIDER_ID,
-                id: entry.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;
+        return resolveCatalog(imageless, [], hidden).entries.map((entry) => ({
+            provider: KIMI_PROVIDER_ID,
+            id: entry.id,
+            name: entry.name,
+            ...entry.description === undefined ? {} : { description: entry.description },
+            ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
+        }));
     }
     /** The image-generation model id, when discovery reported one. */
     imageModelId() {
@@ -265,14 +268,14 @@ export class KimiAdapter extends LlmAdapter {
                 ...reasoning === undefined ? {} : { reasoning },
             };
         }
-        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.
-        const pair = this.fastVariants.pairOf(model);
+        // A row with a fast variant offers the `fast` rung; the picker shows the row under
+        // its own name and the mode as the effort, which is what the trigger already reads.
+        const reasoning = reasoningInfo(entry, this.fastVariants.variantOf(entry.id) !== undefined);
+        // An alias is just another spelling of the row, so it resolves onto the row's own id:
+        // that is what keeps a selection dispatchable and the picker able to show it.
         return {
             provider: KIMI_PROVIDER_ID,
-            id: pair !== undefined && pair.wireId === model ? model : entry.id,
+            id: entry.id,
             name: entry.name,
             ...entry.description === undefined ? {} : { description: entry.description },
             ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
@@ -282,7 +285,16 @@ export class KimiAdapter extends LlmAdapter {
         };
     }
     stream(options) {
-        return streamProviderResponses(options, {
+        // Fast mode rides the reasoning channel: `fast` is a rung of the row, not a model id
+        // of its own, so the row the picker selected stays dispatchable and the user can
+        // always select the standard model again. Only the wire id changes.
+        const fast = String(options.reasoningEffort ?? '') === 'fast';
+        const model = fast ? this.fastVariants.variantOf(options.model) ?? options.model : options.model;
+        const call = { ...options, model };
+        // Kimi has no `fast` effort; the variant already carries the behaviour.
+        if (fast)
+            delete call.reasoningEffort;
+        return streamProviderResponses(call, {
             label: 'Kimi API',
             tokens: this.options.tokens,
             request: (call, model, accessToken, signal) => this.request(call, model, accessToken, signal),

package/package.json

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