dsh-plugin-subscription-oauth 0.8.12 → 0.8.14

package/lib/protocol.d.ts

@@ -12,7 +12,7 @@
 /** Prefix of every RPC method this plugin serves. */
 export declare const RPC_PREFIX = "subscription-oauth.";
 /** Endpoints the Settings page may call. */
-export declare const RPC_ENDPOINTS: readonly ["status", "login", "cancel", "logout", "setDefault", "refresh", "discover", "setModelVisible", "setModelOrder", "addModel", "removeModel", "usage", "reload", "deepseek-balance", "ccswitch-balance"];
+export declare const RPC_ENDPOINTS: readonly ["status", "login", "cancel", "logout", "setDefault", "refresh", "discover", "setModelVisible", "setModelOrder", "addModel", "removeModel", "usage", "reload", "deepseek-balance", "ccswitch-balance", "model-variants"];
 /** One endpoint name. */
 export type RpcEndpoint = typeof RPC_ENDPOINTS[number];
 /** Client → host envelope. */
@@ -120,6 +120,8 @@ export interface ModelSummary {
      * hidden or moved; the page renders it without those controls.
      */
     pinned?: boolean;
+    /** Fast/lightspeed variant wire id, when the provider reported one for this base. */
+    fastVariant?: string;
 }
 /** One metered allowance of a subscription plan. */
 export interface UsageWindow {
@@ -321,6 +323,10 @@ export interface RpcMap {
         payload: CcSwitchBalanceRequest;
         value: CcSwitchBalanceResult;
     };
+    'model-variants': {
+        payload: DiscoverRequest;
+        value: ModelVariantsResult;
+    };
 }
 /** One currency's wallet balance, as the platform reports it. */
 export interface WalletBalance {
@@ -347,6 +353,15 @@ export type BalanceResult =
  | {
     ok: false;
 };
+/** One model's fast and image variants, as discovery reported them. */
+export interface ModelVariants {
+    /** Fast/lightspeed variant wire id, when the provider reported one. */
+    fast?: string;
+    /** Image-generation model wire id, when the provider reported one. */
+    image?: string;
+}
+/** Result of `model-variants`: the variants for one model id. */
+export type ModelVariantsResult = ModelVariants | undefined;
 /** Payload of `deepseek-balance`. */
 export interface DeepSeekBalanceRequest {
     /** Client metadata the host's account service expects. */

package/lib/protocol.js

@@ -28,4 +28,5 @@ export const RPC_ENDPOINTS = [
     'reload',
     'deepseek-balance',
     'ccswitch-balance',
+    'model-variants',
 ];

package/lib/providers/ark-provider.js

@@ -170,5 +170,9 @@ export function createArkProvider(options) {
         removeModel: (id) => controller.removeModel(id),
         usage: (force) => controller.usage(force),
         reload: () => controller.reload(),
+        modelVariants: (id) => {
+            const image = adapter.imageModelId();
+            return image === undefined ? undefined : { image };
+        },
     };
 }

package/lib/providers/ark.d.ts

@@ -100,10 +100,14 @@ export interface ArkAdapterOptions {
 export declare class ArkAdapter extends LlmAdapter {
     private readonly options;
     private live;
+    /** Image-generation model id, when discovery reported one. */
+    private imageModel;
     constructor(options: ArkAdapterOptions);
     providerInfo(provider: string): LlmProviderInfo;
     providerRetryPolicy(): undefined;
     listModels(_provider: string): Promise<readonly LlmModelInfo[]>;
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId(): string | undefined;
     resolveModel(_provider: string, model: string): Promise<LlmResolvedModelInfo>;
     stream(options: GenerateOptions): AsyncIterable<StreamChunk>;
     /** Translate an auth failure into the message a user can act on. */

package/lib/providers/ark.js

@@ -23,6 +23,9 @@ import { proxiedFetch } from '../http.js';
 import { findEntry, resolveCatalog } from './catalog.js';
 import { streamProviderResponses, accountPoolHooks } from './responses-stream.js';
 import { toResponsesInput, toResponsesTools } from '../translate/responses.js';
+import { isImageModel } from './grok.js';
+/** Model ids that are clearly not chat models. */
+const NON_CHAT_ID = /(?:^|[-_/])(?:image|video|imagine|embed|embedding|whisper|tts|vision-only)/i;
 /** Provider route this module serves. */
 export const ARK_PROVIDER_ID = 'ark';
 /** Display name for the picker group and the Settings card. */
@@ -113,6 +116,8 @@ function extraEntry(id) {
 export class ArkAdapter extends LlmAdapter {
     options;
     live;
+    /** Image-generation model id, when discovery reported one. */
+    imageModel;
     constructor(options) {
         super();
         this.options = options;
@@ -129,7 +134,9 @@ export class ArkAdapter extends LlmAdapter {
         if (await this.options.tokens.session() === undefined)
             return [];
         const hidden = await this.hidden();
-        return resolveCatalog(this.catalog(), [], hidden).entries.map((entry) => ({
+        // Image models are never picker rows: they are agent-called, always on.
+        const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
+        return resolveCatalog(imageless, [], hidden).entries.map((entry) => ({
             provider: ARK_PROVIDER_ID,
             id: entry.id,
             name: entry.name,
@@ -137,6 +144,10 @@ export class ArkAdapter extends LlmAdapter {
             ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
         }));
     }
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId() {
+        return this.imageModel;
+    }
     async resolveModel(_provider, model) {
         const entry = findEntry(this.catalog(), model);
         if (entry === undefined) {
@@ -246,9 +257,12 @@ export class ArkAdapter extends LlmAdapter {
                 return undefined;
             }
             const body = await response.json();
-            const ids = (body.data ?? [])
+            const allIds = (body.data ?? [])
                 .map((entry) => (typeof entry?.id === 'string' ? entry.id.trim() : ''))
                 .filter((id) => id !== '');
+            // Image models are never picker rows: they are agent-called, always on.
+            this.imageModel = allIds.find((id) => isImageModel(id));
+            const ids = allIds.filter((id) => !NON_CHAT_ID.test(id));
             return ids.length === 0 ? undefined : ids;
         }
         catch (error) {

package/lib/providers/glm-provider.js

@@ -166,5 +166,9 @@ export function createGlmProvider(options) {
         removeModel: (id) => controller.removeModel(id),
         usage: (force) => controller.usage(force),
         reload: () => controller.reload(),
+        modelVariants: (id) => {
+            const image = adapter.imageModelId();
+            return image === undefined ? undefined : { image };
+        },
     };
 }

package/lib/providers/glm.d.ts

@@ -120,6 +120,8 @@ export declare class GlmAdapter extends LlmAdapter {
     private readonly options;
     /** Live catalog ids, once discovery succeeded this session. */
     private live;
+    /** Image-generation model id, when discovery reported one. */
+    private imageModel;
     constructor(options: GlmAdapterOptions);
     providerInfo(provider: string): LlmProviderInfo;
     providerRetryPolicy(): undefined;
@@ -134,6 +136,8 @@ export declare class GlmAdapter extends LlmAdapter {
     private shippedCatalog;
     /** Ids the user published by hand that this route does not already serve. */
     private addedEntries;
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId(): string | undefined;
     /** The ids the picker must currently omit. */
     private hidden;
     /**

package/lib/providers/glm.js

@@ -15,6 +15,9 @@ import { proxiedFetch } from '../http.js';
 import { findEntry, resolveCatalog } from './catalog.js';
 import { streamProviderResponses, accountPoolHooks } from './responses-stream.js';
 import { toResponsesInput, toResponsesTools } from '../translate/responses.js';
+import { isImageModel } from './grok.js';
+/** Model ids that are clearly not chat models. */
+const NON_CHAT_ID = /(?:^|[-_/])(?:image|video|imagine|embed|embedding|whisper|tts|vision-only)/i;
 /** Provider route this module serves. */
 export const GLM_PROVIDER_ID = 'glm';
 /** Display name for the picker group and the Settings card. */
@@ -220,6 +223,8 @@ export class GlmAdapter extends LlmAdapter {
     options;
     /** Live catalog ids, once discovery succeeded this session. */
     live;
+    /** Image-generation model id, when discovery reported one. */
+    imageModel;
     constructor(options) {
         super();
         this.options = options;
@@ -238,7 +243,9 @@ export class GlmAdapter extends LlmAdapter {
         if (await this.options.tokens.session() === undefined)
             return [];
         const hidden = await this.hidden();
-        return resolveCatalog(this.catalog(), [], hidden).entries.map((entry) => ({
+        // Image models are never picker rows: they are agent-called, always on.
+        const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
+        return resolveCatalog(imageless, [], hidden).entries.map((entry) => ({
             provider: GLM_PROVIDER_ID,
             id: entry.id,
             name: entry.name,
@@ -326,6 +333,10 @@ export class GlmAdapter extends LlmAdapter {
             .filter((id) => findEntry(own, id) === undefined)
             .map((id) => extraEntry(id));
     }
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId() {
+        return this.imageModel;
+    }
     /** The ids the picker must currently omit. */
     async hidden() {
         if (this.options.hiddenModels === undefined)
@@ -367,9 +378,12 @@ export class GlmAdapter extends LlmAdapter {
                 return undefined;
             }
             const body = await response.json();
-            const ids = (body.data ?? [])
+            const allIds = (body.data ?? [])
                 .map((entry) => (typeof entry?.id === 'string' ? entry.id.trim() : ''))
                 .filter((id) => id !== '');
+            // Image models are never picker rows: they are agent-called, always on.
+            this.imageModel = allIds.find((id) => isImageModel(id));
+            const ids = allIds.filter((id) => !NON_CHAT_ID.test(id));
             return ids.length === 0 ? undefined : ids;
         }
         catch (error) {

package/lib/providers/grok.d.ts

@@ -112,6 +112,8 @@ interface GrokCliMetadata {
     reasoningEfforts?: readonly string[];
     defaultEffort?: string;
 }
+/** True when a model id names an image-generation model. */
+export declare function isImageModel(id: string): boolean;
 /** 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`). */
@@ -150,6 +152,10 @@ export declare class GrokAdapter extends LlmAdapter {
     private discovered;
     /** Capability metadata from the CLI catalog, keyed by model id. */
     private readonly metadata;
+    /** Fast-variant wire id per base model, for the picker's quick-mode button. */
+    private readonly fastVariants;
+    /** Image-generation model id, when discovery reported one. */
+    private imageModel;
     /** Ids the user added by hand, cached so the sync catalog can name them. */
     private userAddedIds;
     constructor(options: GrokAdapterOptions);
@@ -182,6 +188,10 @@ export declare class GrokAdapter extends LlmAdapter {
     private addedEntries;
     /** Record the live catalog for the picker. */
     discover(ids: readonly string[], metadata?: ReadonlyMap<string, GrokCliMetadata>): void;
+    /** The fast/lightspeed variant wire id for a base model, when discovery reported one. */
+    fastVariant(baseId: string): string | undefined;
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId(): string | undefined;
     /** The curated catalog, for the Settings page's model list. */
     catalogEntries(): readonly CatalogEntry[];
     /** What this route itself serves, without the ids added by hand. */

package/lib/providers/grok.js

@@ -262,6 +262,12 @@ 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 image-generation models, matched per provider's naming. */
+const IMAGE_MODEL = /(?:^|[-_/])(?:image|imagine|draw|pic|photo)(?:[-_/]|$)/i;
+/** True when a model id names an image-generation model. */
+export function isImageModel(id) {
+    return IMAGE_MODEL.test(id);
+}
 /** 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. */
@@ -279,6 +285,10 @@ export class GrokAdapter extends LlmAdapter {
     discovered;
     /** Capability metadata from the CLI catalog, keyed by model id. */
     metadata = new Map();
+    /** Fast-variant wire id per base model, for the picker's quick-mode button. */
+    fastVariants = new Map();
+    /** Image-generation model id, when discovery reported one. */
+    imageModel;
     /** Ids the user added by hand, cached so the sync catalog can name them. */
     userAddedIds = [];
     constructor(options) {
@@ -299,7 +309,9 @@ export class GrokAdapter extends LlmAdapter {
             return [];
         await this.syncUserModels();
         const hidden = await this.hidden();
-        return resolveCatalog(this.catalog(), [], hidden).entries.map((entry) => ({
+        // Image models are never picker rows: they are agent-called, always on.
+        const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
+        return resolveCatalog(imageless, [], hidden).entries.map((entry) => ({
             provider: GROK_PROVIDER_ID,
             id: entry.id,
             name: entry.name,
@@ -445,6 +457,14 @@ export class GrokAdapter extends LlmAdapter {
         for (const [id, meta] of metadata)
             this.metadata.set(id, meta);
     }
+    /** The fast/lightspeed variant wire id for a base model, when discovery reported one. */
+    fastVariant(baseId) {
+        return this.fastVariants.get(baseId);
+    }
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId() {
+        return this.imageModel;
+    }
     /** The curated catalog, for the Settings page's model list. */
     catalogEntries() {
         return this.catalog();
@@ -524,18 +544,29 @@ export class GrokAdapter extends LlmAdapter {
                 return undefined;
             }
             const payload = await response.json();
+            const allIds = (payload.data ?? [])
+                .map((entry) => entry.id)
+                .filter((id) => typeof id === 'string' && id.length > 0);
+            // Image models are not chat models; they are picked by an agent, not the picker.
+            this.imageModel = allIds.find((id) => isImageModel(id));
+            const rawIds = allIds.filter((id) => !NON_CHAT_ID.test(id));
             // 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))
+            this.fastVariants.clear();
+            for (const id of rawIds) {
+                if (!isFastVariant(id))
+                    continue;
+                const base = baseModelOf(id);
+                if (!this.fastVariants.has(base))
+                    this.fastVariants.set(base, id);
+            }
+            const ids = rawIds
                 .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);
@@ -698,6 +729,7 @@ export function createGrokProvider(options) {
             { key: 'credentialFile', value: options.credentialFile },
         ],
         applyDiscovery: (ids) => { adapter.discover(ids); },
+        fastVariant: (baseId) => adapter.fastVariant(baseId),
     };
     const controller = new ProviderController({
         spec,
@@ -726,5 +758,13 @@ export function createGrokProvider(options) {
         removeModel: (id) => controller.removeModel(id),
         usage: (force) => controller.usage(force),
         reload: () => controller.reload(),
+        modelVariants: (id) => {
+            const fast = adapter.fastVariant(id);
+            const image = adapter.imageModelId();
+            return {
+                ...fast === undefined ? {} : { fast },
+                ...image === undefined ? {} : { image },
+            };
+        },
     };
 }

package/lib/providers/kimi-provider.js

@@ -119,6 +119,7 @@ export function createKimiProvider(options) {
             { key: 'credentialFile', value: options.credentialFile },
         ],
         applyDiscovery: (ids) => { adapter.discover(ids); },
+        fastVariant: (baseId) => adapter.fastVariant(baseId),
     };
     const controller = new ProviderController({
         spec,
@@ -149,5 +150,13 @@ export function createKimiProvider(options) {
         removeModel: (id) => controller.removeModel(id),
         usage: (force) => controller.usage(force),
         reload: () => controller.reload(),
+        modelVariants: (id) => {
+            const fast = adapter.fastVariant(id);
+            const image = adapter.imageModelId();
+            return {
+                ...fast === undefined ? {} : { fast },
+                ...image === undefined ? {} : { image },
+            };
+        },
     };
 }

package/lib/providers/kimi.d.ts

@@ -102,6 +102,10 @@ export declare class KimiAdapter extends LlmAdapter {
     private readonly options;
     /** Live catalog ids seen this session, used to accept renamed models. */
     private discovered;
+    /** Image-generation model id, when discovery reported one. */
+    private imageModel;
+    /** Fast-variant wire id per base model, for the picker's quick-mode button. */
+    private readonly fastVariants;
     /** Ids the user added by hand, cached so the sync catalog can name them. */
     private userAddedIds;
     /** Tools already reported as flattened, so each is stated once. */
@@ -116,6 +120,10 @@ export declare class KimiAdapter extends LlmAdapter {
     providerInfo(provider: string): LlmProviderInfo;
     providerRetryPolicy(): undefined;
     listModels(_provider: string): Promise<readonly LlmModelInfo[]>;
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId(): string | undefined;
+    /** The fast/lightspeed variant wire id for a base model, when discovery reported one. */
+    fastVariant(baseId: string): string | undefined;
     /** The ids the picker must currently omit. */
     private hidden;
     resolveModel(_provider: string, model: string): Promise<LlmResolvedModelInfo>;

package/lib/providers/kimi.js

@@ -15,6 +15,9 @@ import { streamProviderResponses, accountPoolHooks } from './responses-stream.js
 import { fallbackEntry, findEntry, resolveCatalog } from './catalog.js';
 import { streamResponses, toResponsesInput, toResponsesTools } from '../translate/responses.js';
 import { prepareMoonshotTool } from '../translate/moonshot-schema.js';
+import { isImageModel, isFastVariant, baseModelOf } from './grok.js';
+/** Model ids that are clearly not chat models. */
+const NON_CHAT_ID = /(?:^|[-_/])(?:image|video|imagine|embed|embedding|whisper|tts|vision-only)/i;
 /**
  * Coerce one decoded credential entry into a Kimi session.
  * @param value - decoded JSON value for one account.
@@ -129,6 +132,10 @@ export class KimiAdapter extends LlmAdapter {
     options;
     /** Live catalog ids seen this session, used to accept renamed models. */
     discovered;
+    /** Image-generation model id, when discovery reported one. */
+    imageModel;
+    /** Fast-variant wire id per base model, for the picker's quick-mode button. */
+    fastVariants = new Map();
     /** Ids the user added by hand, cached so the sync catalog can name them. */
     userAddedIds = [];
     /** Tools already reported as flattened, so each is stated once. */
@@ -171,7 +178,9 @@ export class KimiAdapter extends LlmAdapter {
             return [];
         await this.syncUserModels();
         const hidden = await this.hidden();
-        return resolveCatalog(this.catalog(), [], hidden).entries.map((entry) => ({
+        // Image models are never picker rows: they are agent-called, always on.
+        const imageless = this.catalog().filter((entry) => !isImageModel(entry.id));
+        return resolveCatalog(imageless, [], hidden).entries.map((entry) => ({
             provider: KIMI_PROVIDER_ID,
             id: entry.id,
             name: entry.name,
@@ -179,6 +188,14 @@ export class KimiAdapter extends LlmAdapter {
             ...entry.inputModalities === undefined ? {} : { inputModalities: entry.inputModalities },
         }));
     }
+    /** The image-generation model id, when discovery reported one. */
+    imageModelId() {
+        return this.imageModel;
+    }
+    /** The fast/lightspeed variant wire id for a base model, when discovery reported one. */
+    fastVariant(baseId) {
+        return this.fastVariants.get(baseId);
+    }
     /** The ids the picker must currently omit. */
     async hidden() {
         if (this.options.hiddenModels === undefined)
@@ -414,9 +431,22 @@ export class KimiAdapter extends LlmAdapter {
                 return undefined;
             }
             const payload = await response.json();
-            const ids = (payload.data ?? [])
+            const allIds = (payload.data ?? [])
                 .map((entry) => entry.id)
                 .filter((id) => typeof id === 'string' && id.length > 0);
+            // Image models are never picker rows: they are agent-called, always on.
+            this.imageModel = allIds.find((id) => isImageModel(id));
+            // 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.
+            this.fastVariants.clear();
+            for (const id of allIds) {
+                if (!isFastVariant(id))
+                    continue;
+                const base = baseModelOf(id);
+                if (!this.fastVariants.has(base))
+                    this.fastVariants.set(base, id);
+            }
+            const ids = allIds.filter((id) => !NON_CHAT_ID.test(id));
             if (ids.length === 0) {
                 this.options.onWarn?.('Kimi model discovery returned an empty catalog; using the built-in catalog');
                 return undefined;

package/package.json

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