@selesai/code 0.13.40 → 0.14.3

package/dist/core/model-runtime.js

@@ -1,13 +1,29 @@
 import { dirname, join } from "node:path";
-import { createModels, lazyStream, ModelsError, normalizeContext, } from "@earendil-works/pi-ai";
+import { clampThinkingLevel, createModels, lazyStream, ModelsError, normalizeContext, } from "@earendil-works/pi-ai";
 import * as builtinProviderCatalog from "@earendil-works/pi-ai/providers/all";
+import { assertChatModel, assertClassifierInputSupported, assertClassifierModel, assertImageModel, classifierErrorResult, imageErrorResult, } from "@earendil-works/pi-ai/utils/model-operations";
 import { getAgentDir, getBundledDefaultsDir } from "../config.js";
+import { operationSignal, raceWithAbortSignal } from "../utils/abort.js";
 import { AuthStorage as DefaultAuthStorage } from "./auth-storage.js";
 import { ModelConfig } from "./model-config.js";
 import { FileModelsStore, InMemoryCodingAgentModelsStore } from "./models-store.js";
 import { composeModelProvider, configuredRequestAuthStatus, resolveCompatibilityRequestConfig, resolveConfiguredModelHeaders, validateExtensionProvider, } from "./provider-composer.js";
 import { withRemoteCatalog } from "./remote-catalog-provider.js";
 import { RuntimeCredentials } from "./runtime-credentials.js";
+import { createVirtualModel, findLatestResponse, isVirtualModel, withVirtualModels, } from "./virtual-models.js";
+/** Credentials changed successfully, but the local model/auth snapshot could not be synchronized. */
+export class CredentialSynchronizationError extends Error {
+    providerId;
+    operation;
+    credential;
+    constructor(providerId, operation, credential, options) {
+        super(`Credential ${operation} committed for ${providerId}, but local synchronization failed`, options);
+        this.name = "CredentialSynchronizationError";
+        this.providerId = providerId;
+        this.operation = operation;
+        this.credential = credential;
+    }
+}
 function mergeHeaders(base, override) {
     if (!base && !override)
         return undefined;
@@ -30,6 +46,8 @@ export class ModelRuntime {
     builtins = new Map();
     nativeExtensionProviders = new Map();
     extensionProviders = new Map();
+    /** Virtual models by provider id, then model id. */
+    virtualModels = new Map();
     compositionErrors = new Map();
     modelsPath;
     modelNetworkEnabled;
@@ -41,8 +59,11 @@ export class ModelRuntime {
         storedProviders: new Set(),
         auth: new Map(),
     };
-    availabilityRefresh;
+    availabilityRefreshSeq = 0;
+    availabilityErrorSeq = 0;
+    providerAvailabilitySeq = new Map();
     availabilityError;
+    credentialOperations = new Map();
     constructor(credentials, config, modelsPath, modelsStore, providers, modelNetworkEnabled) {
         this.credentials = credentials;
         this.config = config;
@@ -75,12 +96,17 @@ export class ModelRuntime {
         runtime.configureRadiusProviders();
         runtime.rebuildProviders();
         const refreshFromNetwork = runtime.modelNetworkEnabled && options.allowModelNetwork === true;
-        const controller = refreshFromNetwork ? new AbortController() : undefined;
-        const timeout = controller
-            ? setTimeout(() => controller.abort(), options.modelRefreshTimeoutMs ?? 15_000)
-            : undefined;
+        const controller = refreshFromNetwork && options.modelRefreshTimeoutMs !== undefined ? new AbortController() : undefined;
+        const timeout = controller ? setTimeout(() => controller.abort(), options.modelRefreshTimeoutMs) : undefined;
+        const signal = controller
+            ? options.signal
+                ? AbortSignal.any([options.signal, controller.signal])
+                : controller.signal
+            : options.signal;
         try {
-            await runtime.refresh({ allowNetwork: refreshFromNetwork, signal: controller?.signal });
+            if (options.refreshOnCreate !== false) {
+                await runtime.refresh({ allowNetwork: refreshFromNetwork, signal });
+            }
         }
         finally {
             if (timeout)
@@ -109,32 +135,38 @@ export class ModelRuntime {
             ...this.nativeExtensionProviders.keys(),
             ...this.config.getProviderIds(),
             ...this.extensionProviders.keys(),
+            ...this.virtualModels.keys(),
         ]);
     }
+    /** Returns the provider without virtual models, or undefined when only virtual models define it. */
     recomposeProvider(providerId) {
+        const provider = this.composeProvider(providerId);
+        const virtualModels = [...(this.virtualModels.get(providerId)?.values() ?? [])].map((entry) => entry.model);
+        if (virtualModels.length > 0)
+            this.models.setProvider(withVirtualModels(providerId, provider, virtualModels));
+        else if (provider)
+            this.models.setProvider(provider);
+        else
+            this.models.deleteProvider(providerId);
+        return provider;
+    }
+    /** The provider without virtual models, or undefined when nothing defines it. */
+    composeProvider(providerId) {
         const base = this.nativeExtensionProviders.get(providerId) ?? this.builtins.get(providerId);
         const extension = this.extensionProviders.get(providerId);
-        if (!base && !this.config.getProvider(providerId) && !extension) {
-            this.models.deleteProvider(providerId);
-            this.compositionErrors.delete(providerId);
-            return;
-        }
-        if (base && !this.config.getProvider(providerId) && !extension) {
+        if (!this.config.getProvider(providerId) && !extension) {
             // No overlays: use the builtin untouched so its auth/login/stream behavior is exact.
-            this.models.setProvider(base);
             this.compositionErrors.delete(providerId);
-            return;
+            return base;
         }
         try {
-            this.models.setProvider(composeModelProvider(providerId, base, this.config, extension));
+            const provider = composeModelProvider(providerId, base, this.config, extension);
             this.compositionErrors.delete(providerId);
+            return provider;
         }
         catch (error) {
             this.compositionErrors.set(providerId, error instanceof Error ? error.message : String(error));
-            if (base)
-                this.models.setProvider(base);
-            else
-                this.models.deleteProvider(providerId);
+            return base;
         }
     }
     rebuildProviders() {
@@ -152,16 +184,18 @@ export class ModelRuntime {
             available: all.filter((model) => this.snapshot.configuredProviders.has(model.provider)),
         };
     }
-    async runAvailabilityRefresh() {
+    async runAvailabilityRefresh(seq, errorSeq, signal) {
         const providers = this.models.getProviders();
         const [available, checks, credentials] = await Promise.all([
-            this.models.getAvailable(),
+            this.models.getAvailable(undefined, { signal }),
             Promise.all(providers.map(async (provider) => [
                 provider.id,
-                await this.models.checkAuth(provider.id),
+                await this.models.checkAuth(provider.id, { signal }),
             ])),
-            this.credentials.list(),
+            this.credentials.list({ signal }),
         ]);
+        if (seq !== this.availabilityRefreshSeq)
+            return;
         const auth = new Map(checks);
         const configuredProviders = new Set(checks
             .filter((entry) => entry[1] !== undefined)
@@ -173,28 +207,76 @@ export class ModelRuntime {
             storedProviders: new Set(credentials.map((entry) => entry.providerId)),
             auth,
         };
-        this.availabilityError = undefined;
+        if (errorSeq === this.availabilityErrorSeq)
+            this.availabilityError = undefined;
     }
-    queueAvailabilityRefresh(after) {
-        const refresh = (after ?? Promise.resolve()).catch(() => { }).then(() => this.runAvailabilityRefresh());
-        const recorded = refresh.catch((error) => {
-            this.availabilityError = error instanceof Error ? error.message : String(error);
+    queueAvailabilityRefresh(signal) {
+        const seq = ++this.availabilityRefreshSeq;
+        for (const [providerId, providerSeq] of this.providerAvailabilitySeq) {
+            this.providerAvailabilitySeq.set(providerId, providerSeq + 1);
+        }
+        const errorSeq = ++this.availabilityErrorSeq;
+        const effectiveSignal = operationSignal(signal);
+        return this.runAvailabilityRefresh(seq, errorSeq, effectiveSignal).catch((error) => {
+            if (errorSeq === this.availabilityErrorSeq && !effectiveSignal.aborted) {
+                this.availabilityError = error instanceof Error ? error.message : String(error);
+            }
             throw error;
         });
-        const tracked = recorded.finally(() => {
-            if (this.availabilityRefresh === tracked)
-                this.availabilityRefresh = undefined;
-        });
-        this.availabilityRefresh = tracked;
-        return tracked;
     }
-    /** Coalesce concurrent readers onto the pending refresh. */
-    refreshAvailability() {
-        return this.availabilityRefresh ?? this.queueAvailabilityRefresh(undefined);
-    }
-    /** Mutations must not observe an in-flight refresh started before them. */
-    forceRefreshAvailability() {
-        return this.queueAvailabilityRefresh(this.availabilityRefresh);
+    async refreshProviderAvailability(providerId, signal) {
+        // Invalidate any full availability pass that started before this credential change.
+        ++this.availabilityRefreshSeq;
+        const providerSeq = (this.providerAvailabilitySeq.get(providerId) ?? 0) + 1;
+        this.providerAvailabilitySeq.set(providerId, providerSeq);
+        const errorSeq = ++this.availabilityErrorSeq;
+        try {
+            const [available, auth, credential] = await Promise.all([
+                this.models.getAvailable(providerId, { signal }),
+                this.models.checkAuth(providerId, { signal }),
+                this.credentials.read(providerId, { signal }),
+            ]);
+            signal.throwIfAborted();
+            if (this.providerAvailabilitySeq.get(providerId) !== providerSeq)
+                return;
+            const configuredProviders = new Set(this.snapshot.configuredProviders);
+            const storedProviders = new Set(this.snapshot.storedProviders);
+            const authByProvider = new Map(this.snapshot.auth);
+            if (auth) {
+                configuredProviders.add(providerId);
+                authByProvider.set(providerId, auth);
+            }
+            else {
+                configuredProviders.delete(providerId);
+                authByProvider.delete(providerId);
+            }
+            if (credential)
+                storedProviders.add(providerId);
+            else
+                storedProviders.delete(providerId);
+            const all = [...this.models.getModels()];
+            const availableById = new Map([...this.snapshot.available.filter((model) => model.provider !== providerId), ...available].map((model) => [
+                `${model.provider}\0${model.id}`,
+                model,
+            ]));
+            this.snapshot = {
+                all,
+                available: all.flatMap((model) => availableById.get(`${model.provider}\0${model.id}`) ?? []),
+                configuredProviders,
+                storedProviders,
+                auth: authByProvider,
+            };
+            if (errorSeq === this.availabilityErrorSeq)
+                this.availabilityError = undefined;
+        }
+        catch (error) {
+            if (this.providerAvailabilitySeq.get(providerId) === providerSeq &&
+                errorSeq === this.availabilityErrorSeq &&
+                !signal.aborted) {
+                this.availabilityError = error instanceof Error ? error.message : String(error);
+            }
+            throw error;
+        }
     }
     getProviders() {
         return this.models.getProviders();
@@ -208,24 +290,41 @@ export class ModelRuntime {
     getModel(providerId, modelId) {
         return this.models.getModel(providerId, modelId);
     }
-    async checkAuth(providerId) {
-        return this.models.checkAuth(providerId);
+    getModelsOfType(type, providerId) {
+        return this.models.getModelsOfType(type, providerId);
+    }
+    getModelOfType(type, providerId, modelId) {
+        return this.models.getModelOfType(type, providerId, modelId);
+    }
+    getAllModels(providerId) {
+        return this.models.getAllModels(providerId);
     }
-    async getAvailable(providerId) {
+    getAvailableOfType(type, providerId, options) {
+        return this.models.getAvailableOfType(type, providerId, options);
+    }
+    getAllAvailable(providerId, options) {
+        return this.models.getAllAvailable(providerId, options);
+    }
+    async checkAuth(providerId, options) {
+        return this.models.checkAuth(providerId, options);
+    }
+    async getAvailable(providerId, options) {
         if (providerId) {
-            if (this.availabilityRefresh) {
-                await this.availabilityRefresh;
-                return this.snapshot.available.filter((model) => model.provider === providerId);
-            }
+            const errorSeq = ++this.availabilityErrorSeq;
             try {
-                return await this.models.getAvailable(providerId);
+                const available = await this.models.getAvailable(providerId, options);
+                if (errorSeq === this.availabilityErrorSeq)
+                    this.availabilityError = undefined;
+                return available;
             }
             catch (error) {
-                this.availabilityError = error instanceof Error ? error.message : String(error);
+                if (errorSeq === this.availabilityErrorSeq && !options?.signal?.aborted) {
+                    this.availabilityError = error instanceof Error ? error.message : String(error);
+                }
                 throw error;
             }
         }
-        await this.refreshAvailability();
+        await this.queueAvailabilityRefresh(options?.signal);
         return this.snapshot.available;
     }
     getAvailableSnapshot() {
@@ -259,6 +358,9 @@ export class ModelRuntime {
     isUsingOAuth(providerId) {
         return this.snapshot.auth.get(providerId)?.type === "oauth";
     }
+    isUsingSubscription(providerId) {
+        return this.isUsingOAuth(providerId) && this.models.getProvider(providerId)?.auth.oauth?.isSubscription === true;
+    }
     hasConfiguredAuth(providerId) {
         return this.snapshot.configuredProviders.has(providerId);
     }
@@ -277,26 +379,62 @@ export class ModelRuntime {
             },
         };
     }
-    async setRuntimeApiKey(providerId, apiKey, refreshOptions = {}) {
-        this.credentials.setRuntimeApiKey(providerId, apiKey);
-        const auth = new Map(this.snapshot.auth).set(providerId, { type: "api_key", source: "runtime API key" });
-        const configuredProviders = new Set(this.snapshot.configuredProviders).add(providerId);
-        const storedProviders = new Set(this.snapshot.storedProviders).add(providerId);
-        this.snapshot = {
-            ...this.snapshot,
-            auth,
-            configuredProviders,
-            storedProviders,
-            available: this.snapshot.all.filter((model) => configuredProviders.has(model.provider)),
-        };
-        await this.refresh(refreshOptions);
+    enqueueCredentialOperation(providerId, signal, task) {
+        const previous = this.credentialOperations.get(providerId) ?? Promise.resolve();
+        let markStarted;
+        const started = new Promise((resolve) => {
+            markStarted = resolve;
+        });
+        const operation = (async () => {
+            await previous.catch(() => { });
+            signal.throwIfAborted();
+            markStarted?.();
+            return task();
+        })();
+        const tail = operation.catch(() => { });
+        this.credentialOperations.set(providerId, tail);
+        void tail.then(() => {
+            if (this.credentialOperations.get(providerId) === tail)
+                this.credentialOperations.delete(providerId);
+        });
+        return raceWithAbortSignal(started, signal).then(() => operation);
     }
-    async removeRuntimeApiKey(providerId) {
-        this.credentials.removeRuntimeApiKey(providerId);
-        await this.refresh({ allowNetwork: this.modelNetworkEnabled });
+    async synchronizeCredentialState(providerId, operation, credential, signal) {
+        try {
+            signal.throwIfAborted();
+            this.recomposeProvider(providerId);
+            const compositionError = this.compositionErrors.get(providerId);
+            if (compositionError)
+                throw new Error(compositionError);
+            const result = await this.models.refresh({ allowNetwork: false, providers: [providerId], signal });
+            if (result.aborted)
+                signal.throwIfAborted();
+            const refreshError = result.errors.get(providerId);
+            if (refreshError)
+                throw refreshError;
+            this.updateModelSnapshot();
+            await this.refreshProviderAvailability(providerId, signal);
+        }
+        catch (cause) {
+            throw new CredentialSynchronizationError(providerId, operation, credential, { cause });
+        }
     }
-    listCredentials() {
-        return this.credentials.list();
+    setRuntimeApiKey(providerId, apiKey, options = {}) {
+        const signal = operationSignal(options.signal);
+        return this.enqueueCredentialOperation(providerId, signal, async () => {
+            this.credentials.setRuntimeApiKey(providerId, apiKey);
+            await this.synchronizeCredentialState(providerId, "setRuntimeApiKey", { type: "api_key", key: apiKey }, signal);
+        });
+    }
+    removeRuntimeApiKey(providerId, options = {}) {
+        const signal = operationSignal(options.signal);
+        return this.enqueueCredentialOperation(providerId, signal, async () => {
+            this.credentials.removeRuntimeApiKey(providerId);
+            await this.synchronizeCredentialState(providerId, "removeRuntimeApiKey", undefined, signal);
+        });
+    }
+    listCredentials(options) {
+        return this.credentials.list(options);
     }
     getProviderAuthStatus(providerId) {
         if (this.credentials.hasRuntimeApiKey(providerId))
@@ -328,9 +466,10 @@ export class ModelRuntime {
         const env = resolution.env || providerOptions.env
             ? { ...(resolution.env ?? {}), ...(providerOptions.env ?? {}) }
             : undefined;
+        const requestModel = resolution.auth.baseUrl ? { ...model, baseUrl: resolution.auth.baseUrl } : model;
         return {
             provider,
-            model: resolution.auth.baseUrl ? { ...model, baseUrl: resolution.auth.baseUrl } : model,
+            model: requestModel,
             options: {
                 ...providerOptions,
                 apiKey: providerOptions.apiKey ?? resolution.auth.apiKey,
@@ -342,6 +481,7 @@ export class ModelRuntime {
     stream(model, context, options) {
         const transcript = normalizeContext(context);
         return lazyStream(model, async () => {
+            assertChatModel(model);
             const prepared = await this.prepareRequest(model, options);
             return prepared.provider.stream(prepared.model, transcript, prepared.options);
         });
@@ -351,7 +491,27 @@ export class ModelRuntime {
     }
     streamSimple(model, context, options) {
         const transcript = normalizeContext(context);
+        if (isVirtualModel(model)) {
+            // Requests outside the agent loop are routed here. Callers sized them before routing, so
+            // cap the output budget to the routed model.
+            return lazyStream(model, async () => {
+                const route = await this.resolveModel(model, transcript.messages, {
+                    reason: "direct",
+                    thinkingLevel: options?.reasoning ?? "off",
+                    signal: options?.signal,
+                });
+                const { maxTokens: limit } = route.model;
+                const maxTokens = options?.maxTokens && limit > 0 ? Math.min(options.maxTokens, limit) : options?.maxTokens;
+                const reasoning = route.thinkingLevel === "off" ? undefined : route.thinkingLevel;
+                // Caller credentials were resolved for the virtual model's provider. Another provider
+                // resolves its own, so they are not sent to the wrong vendor.
+                const { apiKey, headers, env, ...rest } = options ?? {};
+                const auth = route.model.provider === model.provider ? { apiKey, headers, env } : {};
+                return this.streamSimple(route.model, context, { ...rest, ...auth, maxTokens, reasoning });
+            });
+        }
         return lazyStream(model, async () => {
+            assertChatModel(model);
             const prepared = await this.prepareRequest(model, options);
             return prepared.provider.streamSimple(prepared.model, transcript, prepared.options);
         });
@@ -361,6 +521,7 @@ export class ModelRuntime {
     }
     streamDeferred(model, handle, options) {
         return lazyStream(model, async () => {
+            assertChatModel(model);
             const prepared = await this.prepareRequest(model, options);
             if (!prepared.provider.fetchDeferred) {
                 throw new ModelsError("provider", `Provider ${model.provider} does not support deferred responses`);
@@ -372,22 +533,54 @@ export class ModelRuntime {
         return this.streamDeferred(model, handle, options).result();
     }
     async cancelDeferred(model, handle, options) {
+        assertChatModel(model);
         const prepared = await this.prepareRequest(model, options);
         if (!prepared.provider.cancelDeferred) {
             throw new ModelsError("provider", `Provider ${model.provider} does not support deferred responses`);
         }
         await prepared.provider.cancelDeferred(prepared.model, handle, prepared.options);
     }
-    async login(providerId, type, interaction) {
-        const credential = await this.models.login(providerId, type, interaction);
-        await this.refresh({ allowNetwork: this.modelNetworkEnabled });
-        return credential;
+    async generateImages(model, context, options) {
+        try {
+            assertImageModel(model);
+            const prepared = await this.prepareRequest(model, options);
+            if (!prepared.provider.generateImages) {
+                throw new ModelsError("provider", `Provider ${model.provider} does not support image generation`);
+            }
+            return await prepared.provider.generateImages(prepared.model, context, prepared.options);
+        }
+        catch (error) {
+            return imageErrorResult(model, error, options?.signal?.aborted);
+        }
     }
-    async logout(providerId) {
-        await this.models.logout(providerId);
-        // Reset credential-dependent compatibility projections before the unconfigured provider is skipped by refresh.
-        this.recomposeProvider(providerId);
-        await this.refresh({ allowNetwork: this.modelNetworkEnabled });
+    async classify(model, context, options) {
+        try {
+            assertClassifierModel(model);
+            assertClassifierInputSupported(model, context);
+            const prepared = await this.prepareRequest(model, options);
+            if (!prepared.provider.classify) {
+                throw new ModelsError("provider", `Provider ${model.provider} does not support classification`);
+            }
+            return await prepared.provider.classify(prepared.model, context, prepared.options);
+        }
+        catch (error) {
+            return classifierErrorResult(model, error, options?.signal?.aborted);
+        }
+    }
+    login(providerId, type, interaction, options) {
+        const signal = operationSignal(interaction.signal);
+        return this.enqueueCredentialOperation(providerId, signal, async () => {
+            const credential = await this.models.login(providerId, type, { ...interaction, signal }, options);
+            await this.synchronizeCredentialState(providerId, "login", credential, signal);
+            return credential;
+        });
+    }
+    logout(providerId, options = {}) {
+        const signal = operationSignal(options.signal);
+        return this.enqueueCredentialOperation(providerId, signal, async () => {
+            await this.models.logout(providerId, { signal });
+            await this.synchronizeCredentialState(providerId, "logout", undefined, signal);
+        });
     }
     getCredentialStore() {
         return this.credentials.getStore();
@@ -402,7 +595,14 @@ export class ModelRuntime {
             ...(this.modelsPath ? [this.modelsPath] : []),
         ]);
         this.configureRadiusProviders();
-        this.rebuildProviders();
+        if (options.providers) {
+            for (const providerId of new Set(options.providers))
+                this.recomposeProvider(providerId);
+            this.updateModelSnapshot();
+        }
+        else {
+            this.rebuildProviders();
+        }
         const refreshOptions = {
             ...options,
             allowNetwork: options.allowNetwork ?? this.modelNetworkEnabled,
@@ -413,14 +613,29 @@ export class ModelRuntime {
             aborted: refreshOptions.signal?.aborted ?? false,
             errors: new Map(),
         };
+        const errors = new Map(result.errors);
         this.updateModelSnapshot();
-        try {
-            await this.forceRefreshAvailability();
+        if (options.providers) {
+            await Promise.all([...new Set(options.providers)].map(async (providerId) => {
+                try {
+                    await this.refreshProviderAvailability(providerId, operationSignal(options.signal));
+                }
+                catch (error) {
+                    if (!options.signal?.aborted) {
+                        errors.set(providerId, error instanceof Error ? error : new Error(String(error)));
+                    }
+                }
+            }));
         }
-        catch {
-            // Availability errors are recorded by forceRefreshAvailability; refreshed models remain usable.
+        else {
+            try {
+                await this.queueAvailabilityRefresh(options.signal);
+            }
+            catch {
+                // Availability errors are recorded by the latest pass; refreshed models remain usable.
+            }
         }
-        return result;
+        return { aborted: result.aborted || (options.signal?.aborted ?? false), errors };
     }
     registerNativeProvider(provider) {
         if (!provider.id.trim())
@@ -429,8 +644,29 @@ export class ModelRuntime {
         this.nativeExtensionProviders.set(provider.id, provider);
         this.recomposeProvider(provider.id);
         this.updateModelSnapshot();
+        this.markProvisionallyConfigured(provider.id, configuredRequestAuthStatus(this.config.getProvider(provider.id), undefined), provider.auth.oauth && !provider.auth.apiKey ? "oauth" : "api_key");
         void this.refresh({ allowNetwork: false });
     }
+    /**
+     * Mark a newly registered provider as configured when it has a stored credential or a configured
+     * API key. Availability checks run asynchronously, and callers such as initial model selection
+     * read the snapshot before they finish. The next availability pass replaces this entry.
+     */
+    markProvisionallyConfigured(providerId, configuredStatus, type) {
+        if (!this.snapshot.storedProviders.has(providerId) && !configuredStatus?.configured)
+            return;
+        const configuredProviders = new Set(this.snapshot.configuredProviders).add(providerId);
+        const auth = new Map(this.snapshot.auth);
+        // Never clobber a real check result.
+        if (!auth.get(providerId))
+            auth.set(providerId, { type, source: "configured provider" });
+        this.snapshot = {
+            ...this.snapshot,
+            auth,
+            configuredProviders,
+            available: this.snapshot.all.filter((model) => configuredProviders.has(model.provider)),
+        };
+    }
     registerProvider(providerId, config) {
         // Validate the incoming registration on its own, like the legacy registry:
         // a broken re-registration must throw without touching the stored config.
@@ -447,24 +683,7 @@ export class ModelRuntime {
         this.extensionProviders.set(providerId, effective);
         this.recomposeProvider(providerId);
         this.updateModelSnapshot();
-        if (this.snapshot.storedProviders.has(providerId) ||
-            configuredRequestAuthStatus(this.config.getProvider(providerId), effective)?.configured) {
-            const configuredProviders = new Set(this.snapshot.configuredProviders).add(providerId);
-            const auth = new Map(this.snapshot.auth);
-            // Provisional entry until the async refresh lands; never clobber a real check result.
-            if (!auth.get(providerId)) {
-                auth.set(providerId, {
-                    type: effective.oauth && !effective.apiKey ? "oauth" : "api_key",
-                    source: "configured provider",
-                });
-            }
-            this.snapshot = {
-                ...this.snapshot,
-                auth,
-                configuredProviders,
-                available: this.snapshot.all.filter((model) => configuredProviders.has(model.provider)),
-            };
-        }
+        this.markProvisionallyConfigured(providerId, configuredRequestAuthStatus(this.config.getProvider(providerId), effective), effective.oauth && !effective.apiKey ? "oauth" : "api_key");
         void this.refresh({ allowNetwork: false });
     }
     unregisterProvider(providerId) {
@@ -474,4 +693,79 @@ export class ModelRuntime {
         this.updateModelSnapshot();
         void this.refresh({ allowNetwork: false });
     }
+    /**
+     * Register a virtual model under `definition.provider`, which may also list physical models or
+     * several virtual models. Re-registering the same provider and id replaces the virtual model.
+     * Throws when the id belongs to a physical model of that provider.
+     */
+    registerVirtualModel(definition) {
+        const { provider: providerId, id } = definition;
+        if (!providerId.trim() || !id.trim())
+            throw new Error("Virtual model provider and id must not be empty.");
+        const existing = this.models.getModel(providerId, id);
+        if (existing && !isVirtualModel(existing)) {
+            throw new Error(`Virtual model ${providerId}/${id} conflicts with a physical model.`);
+        }
+        const models = this.virtualModels.get(providerId) ?? new Map();
+        models.set(id, { model: createVirtualModel(definition), route: (request) => definition.route(request) });
+        this.virtualModels.set(providerId, models);
+        if (!this.recomposeProvider(providerId) && !this.snapshot.configuredProviders.has(providerId)) {
+            // A provider of only virtual models needs no credentials. Mark it configured now: session
+            // restore checks auth before the refresh below lands.
+            const auth = new Map(this.snapshot.auth).set(providerId, { type: "api_key", source: "virtual" });
+            const configuredProviders = new Set(this.snapshot.configuredProviders).add(providerId);
+            this.snapshot = { ...this.snapshot, auth, configuredProviders };
+        }
+        this.updateModelSnapshot();
+        void this.refresh({ allowNetwork: false });
+    }
+    unregisterVirtualModel(providerId, id) {
+        const models = this.virtualModels.get(providerId);
+        if (!models?.delete(id))
+            return;
+        if (models.size === 0)
+            this.virtualModels.delete(providerId);
+        this.recomposeProvider(providerId);
+        this.updateModelSnapshot();
+        void this.refresh({ allowNetwork: false });
+    }
+    /**
+     * Ask a virtual model's router for the model and thinking level of one request. The router must
+     * return a physical catalog model whose provider has credentials; the thinking level is clamped
+     * to that model. Throws when routing fails.
+     *
+     * `previous` reports the latest successful response in `messages`. A retry passes the failed
+     * response as `options.failed`; `messages` no longer contains it. `options.state` is the router
+     * state stored by the caller, which also stores the returned state.
+     */
+    async resolveModel(model, messages, options) {
+        const name = `Virtual model ${model.provider}/${model.id}`;
+        const virtual = this.virtualModels.get(model.provider)?.get(model.id);
+        if (!virtual)
+            throw new Error(`${name} is not registered.`);
+        const { failed, ...request } = options;
+        const latest = findLatestResponse(messages);
+        const previousModel = latest && this.getPhysicalModel(latest.provider, latest.model);
+        // A failed routing attempt names the virtual model; there is no physical request to report.
+        const failedModel = failed && this.getPhysicalModel(failed.provider, failed.model);
+        const route = await virtual.route({
+            ...request,
+            model,
+            previous: previousModel && { model: previousModel, thinkingLevel: latest?.thinkingLevel },
+            failed: failedModel && failed && { model: failedModel, thinkingLevel: failed.thinkingLevel, message: failed },
+            messages,
+        });
+        const target = this.getPhysicalModel(route.model.provider, route.model.id);
+        const routed = `${name} routed to ${route.model.provider}/${route.model.id}`;
+        if (!target)
+            throw new Error(`${routed}, which is not a physical model.`);
+        if (!this.hasConfiguredAuth(target.provider))
+            throw new Error(`${routed}, which has no credentials.`);
+        return { model: target, thinkingLevel: clampThinkingLevel(target, route.thinkingLevel), state: route.state };
+    }
+    /** A catalog chat model that is not virtual. */
+    getPhysicalModel(providerId, modelId) {
+        const model = this.models.getModel(providerId, modelId);
+        return model && !isVirtualModel(model) ? model : undefined;
+    }
 }