@agent-native/core 0.202.0 → 0.202.1-nightly-20261007011022

package/dist/agent/actions/list-model-providers.d.ts

@@ -29,6 +29,8 @@ export interface ModelProviderKey {
 export interface ModelProviderEntry {
     provider: AgentProviderId;
     label: string;
+    /** A usable deployment fallback when no saved key at the default-model scope takes precedence. */
+    deploymentConfigured: boolean;
     /** The organization's key, or null when it has none. */
     org: ModelProviderKey | null;
     /** The caller's own key, or null when they have none. */

package/dist/agent/actions/list-model-providers.js

@@ -7,6 +7,8 @@ import { readAppSecrets, } from "../../secrets/storage.js";
 import { readProviderCredentialRejections } from "../../server/credential-provider.js";
 import { isPersonalProviderKeyUseRestricted, readOrgMemberRole, } from "../../server/personal-provider-key-policy.js";
 import { readDefaultAgentEngineSettingDetailed, resolveDefaultAgentEngineAuthority, } from "../default-agent-engine.js";
+import { registerBuiltinEngines } from "../engine/builtin.js";
+import { getAgentEngineEntry, isDeploymentEngineUsableForRequest, } from "../engine/registry.js";
 function providerKeyNames() {
     return AGENT_PROVIDER_CATALOG.map((option) => {
         if (option.id === "ollama") {
@@ -49,8 +51,12 @@ async function readScopeKeys(scope, scopeId, reveal) {
     const sources = storedRowsFor(scope, scopeId);
     const reads = await Promise.all(sources.map((source) => readAppSecrets({ keys, ...source })));
     const found = [];
+    const endpointProviders = new Set();
     for (const entry of names) {
         for (const [index, rows] of reads.entries()) {
+            if (entry.endpoint && firstPresent(rows, [entry.endpoint])) {
+                endpointProviders.add(entry.option.id);
+            }
             const row = firstPresent(rows, entry.primary);
             if (!row)
                 continue;
@@ -98,7 +104,7 @@ async function readScopeKeys(scope, scopeId, reveal) {
             ...(legacy ? { legacyWorkspaceRow: true } : {}),
         });
     }
-    return result;
+    return { keys: result, endpointProviders };
 }
 export default defineAction({
     description: "List the model providers on Settings › Model: for each provider (OpenRouter, Ollama, Anthropic, OpenAI, Google Gemini, Groq, Mistral, Cohere), the organization's key and the caller's personal key, masked, with the endpoint URL saved for Ollama or an OpenAI-compatible gateway and when the provider rejected the key (rejectedAt: chats that use it stop until someone replaces it). Members see only that an organization key exists, not its mask. A key in a legacy workspace row (the organization's, or the caller's pre-organization solo row) lists at the scope chats resolve it as, marked legacyWorkspaceRow; removing the provider at that scope deletes it. Also returns whether the caller can manage organization providers, whether personal API keys are restricted for them (their personal keys are then stored but unused), and the stored default model. Builder.io connections come from the Builder.io status, not here. Never returns a key value. Related: get-provider-models and manage-provider-models (which models each provider shows), manage-agent-engine (the default model), manage-provider-key-policy (Restrict personal API keys), preview-secret-removal (what removing a key stops).",
@@ -112,17 +118,37 @@ export default defineAction({
         const orgId = ctx?.orgId?.trim() || null;
         const role = orgId ? await readOrgMemberRole(orgId, email) : null;
         const manages = orgId ? canManageOrg(role) : false;
-        const [personal, org, restricted, defaultRead, authority] = await Promise.all([
+        registerBuiltinEngines();
+        const [personal, org, restricted, defaultRead, authority, deploymentStates,] = await Promise.all([
             readScopeKeys("user", email, true),
             orgId
                 ? readScopeKeys("org", orgId, manages)
-                : Promise.resolve(new Map()),
+                : Promise.resolve({
+                    keys: new Map(),
+                    endpointProviders: new Set(),
+                }),
             orgId
                 ? isPersonalProviderKeyUseRestricted({ email, orgId, role })
                 : Promise.resolve(false),
             readDefaultAgentEngineSettingDetailed({ userEmail: email, orgId }),
             resolveDefaultAgentEngineAuthority({ userEmail: email, orgId }),
+            Promise.all(AGENT_PROVIDER_CATALOG.map(async (option) => {
+                const engine = getAgentEngineEntry(option.engine);
+                return [
+                    option.id,
+                    engine ? await isDeploymentEngineUsableForRequest(engine) : false,
+                ];
+            })),
         ]);
+        const deploymentConfigured = new Map(deploymentStates.map(([provider, configured]) => {
+            const defaultScope = orgId ? org : personal;
+            return [
+                provider,
+                configured &&
+                    !defaultScope.keys.has(provider) &&
+                    !defaultScope.endpointProviders.has(provider),
+            ];
+        }));
         const stored = defaultRead.value;
         const engine = typeof stored?.engine === "string" && stored.engine.trim()
             ? stored.engine.trim()
@@ -134,8 +160,9 @@ export default defineAction({
             providers: AGENT_PROVIDER_CATALOG.map((option) => ({
                 provider: option.id,
                 label: option.label,
-                org: org.get(option.id) ?? null,
-                personal: personal.get(option.id) ?? null,
+                deploymentConfigured: deploymentConfigured.get(option.id) ?? false,
+                org: org.keys.get(option.id) ?? null,
+                personal: personal.keys.get(option.id) ?? null,
             })),
             hasOrganization: !!orgId,
             canManageOrg: manages,

package/dist/agent/actions/manage-provider-models.d.ts

@@ -8,6 +8,7 @@ declare const _default: import("../../action.js").ActionDefinition<{
     provider: ProviderModelSelectionProvider;
     scope: ProviderModelSelectionScope;
     models: string[] | null;
+    preserveCustomModels?: boolean;
     updatedAt?: number;
     updatedBy?: string;
     recommendedModels: string[];

package/dist/agent/engine/builder-engine.d.ts

@@ -1,7 +1,7 @@
 import { type BuilderGatewayLane } from "../../server/credential-provider.js";
 import type { AgentEngine, EngineCapabilities } from "./types.js";
 export declare const BUILDER_CAPABILITIES: EngineCapabilities;
-export declare const BUILDER_SUPPORTED_MODELS: readonly ["auto", "claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5-5", "gpt-5-4", "gpt-5-5", "gpt-5-4-mini", "gpt-5-1-codex-mini", "gpt-6-sol", "gpt-5-6-terra", "gpt-6-luna", "gemini-3-1-pro", "gemini-3-8-flash", "gemini-3-5-flash-lite", "gemini-3-1-flash-lite", "grok-code-fast", "qwen3-coder", "kimi-k2-5", "deepseek-v4-pro", "deepseek-v3-1", "z-ai-glm-4-5", "z-ai-glm-5-1"];
+export declare const BUILDER_SUPPORTED_MODELS: readonly ["auto", "claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5-5", "gpt-5-4", "gpt-5-5", "gpt-5-4-mini", "gpt-5-1-codex-mini", "gpt-6.1-sol", "gpt-5-6-terra", "gpt-6-luna", "gemini-3-1-pro", "gemini-3-8-flash", "gemini-3-5-flash-lite", "gemini-3-1-flash-lite", "grok-code-fast", "qwen3-coder", "kimi-k2-5", "deepseek-v4-pro", "deepseek-v3-1", "z-ai-glm-4-5", "z-ai-glm-5-1"];
 export declare const BUILDER_MODEL_UNAUTHORIZED_ERROR_CODE = "builder_model_unauthorized";
 /**
  * A truncated stream, not a rejected request: the client continues the partial

package/dist/agent/engine/builtin.js

@@ -30,7 +30,7 @@ const providerLabels = {
 const providerDescriptions = {
     anthropic: "Claude models through the Vercel AI SDK. Supports thinking and caching via AI SDK providerOptions.",
     openai: "OpenAI GPT models via the Vercel AI SDK. Requires OPENAI_API_KEY.",
-    openrouter: "300+ models from Anthropic, OpenAI, Google, Z.ai, and more routed through a single endpoint. Use model IDs like 'anthropic/claude-sonnet-5.5', 'openai/gpt-6-sol', or 'z-ai/glm-5.2'. Requires OPENROUTER_API_KEY.",
+    openrouter: "300+ models from Anthropic, OpenAI, Google, Z.ai, and more routed through a single endpoint. Use model IDs like 'anthropic/claude-sonnet-5.5', 'openai/gpt-6.1-sol', or 'z-ai/glm-5.2'. Requires OPENROUTER_API_KEY.",
     google: "Google Gemini models via the Vercel AI SDK. Requires GOOGLE_GENERATIVE_AI_API_KEY.",
     groq: "Groq LPU inference via the Vercel AI SDK. Requires GROQ_API_KEY.",
     mistral: "Mistral models via the Vercel AI SDK. Requires MISTRAL_API_KEY.",

package/dist/agent/engine/index.d.ts

@@ -1,5 +1,5 @@
 export type { AgentEngine, EngineCapabilities, EngineTool, EngineMessage, EngineContentPart, EngineTextPart, EngineImagePart, EngineToolCallPart, EngineToolResultPart, EngineThinkingPart, EngineEvent, EngineStreamOptions, } from "./types.js";
-export { registerAgentEngine, getAgentEngineEntry, listAgentEngines, resolveEngine, explicitEngineName, getConfiguredEngineNameForRequest, getStoredModelForEngine, normalizeModelForEngine, resolveDelegatedRunModel, resolveEngineAcceptsCustomModels, resolveEnginePreservesCustomModels, type NormalizeModelOptions, detectEngineFromEnv, detectEngineFromEnvForRequest, detectEngineFromUserSecrets, isAgentEngineSettingConfigured, isAgentEnginePackageInstalled, isStoredEngineUsable, isStoredEngineUsableForRequest, isResolvedEngineUsableForRequest, type AgentEngineEntry, type ResolveEngineConfig, } from "./registry.js";
+export { registerAgentEngine, getAgentEngineEntry, listAgentEngines, resolveEngine, explicitEngineName, getConfiguredEngineNameForRequest, getStoredModelForEngine, normalizeModelForEngine, resolveDelegatedRunModel, resolveEngineAcceptsCustomModels, resolveEnginePreservesCustomModels, type NormalizeModelOptions, detectEngineFromEnv, detectEngineFromEnvForRequest, detectEngineFromUserSecrets, isAgentEngineSettingConfigured, isAgentEnginePackageInstalled, isDeploymentEngineUsableForRequest, isStoredEngineUsable, isStoredEngineUsableForRequest, isResolvedEngineUsableForRequest, type AgentEngineEntry, type ResolveEngineConfig, } from "./registry.js";
 export { readDefaultAgentEngineSetting, readDefaultAgentEngineSettingDetailed, type DefaultAgentEngineRead, type DefaultAgentEngineSource, } from "../default-agent-engine.js";
 export { createBuilderEngine, BUILDER_DEFAULT_MODEL, BUILDER_SUPPORTED_MODELS, BUILDER_CAPABILITIES, } from "./builder-engine.js";
 export { createAnthropicEngine, ANTHROPIC_DEFAULT_MODEL, ANTHROPIC_SUPPORTED_MODELS, ANTHROPIC_CAPABILITIES, } from "./anthropic-engine.js";

package/dist/agent/engine/index.js

@@ -1,4 +1,4 @@
-export { registerAgentEngine, getAgentEngineEntry, listAgentEngines, resolveEngine, explicitEngineName, getConfiguredEngineNameForRequest, getStoredModelForEngine, normalizeModelForEngine, resolveDelegatedRunModel, resolveEngineAcceptsCustomModels, resolveEnginePreservesCustomModels, detectEngineFromEnv, detectEngineFromEnvForRequest, detectEngineFromUserSecrets, isAgentEngineSettingConfigured, isAgentEnginePackageInstalled, isStoredEngineUsable, isStoredEngineUsableForRequest, isResolvedEngineUsableForRequest, } from "./registry.js";
+export { registerAgentEngine, getAgentEngineEntry, listAgentEngines, resolveEngine, explicitEngineName, getConfiguredEngineNameForRequest, getStoredModelForEngine, normalizeModelForEngine, resolveDelegatedRunModel, resolveEngineAcceptsCustomModels, resolveEnginePreservesCustomModels, detectEngineFromEnv, detectEngineFromEnvForRequest, detectEngineFromUserSecrets, isAgentEngineSettingConfigured, isAgentEnginePackageInstalled, isDeploymentEngineUsableForRequest, isStoredEngineUsable, isStoredEngineUsableForRequest, isResolvedEngineUsableForRequest, } from "./registry.js";
 export { readDefaultAgentEngineSetting, readDefaultAgentEngineSettingDetailed, } from "../default-agent-engine.js";
 export { createBuilderEngine, BUILDER_DEFAULT_MODEL, BUILDER_SUPPORTED_MODELS, BUILDER_CAPABILITIES, } from "./builder-engine.js";
 export { createAnthropicEngine, ANTHROPIC_DEFAULT_MODEL, ANTHROPIC_SUPPORTED_MODELS, ANTHROPIC_CAPABILITIES, } from "./anthropic-engine.js";

package/dist/agent/engine/registry.d.ts

@@ -42,6 +42,8 @@ export declare function resolveDelegatedRunModel(engine: ModelResolvableEngine,
 export declare function resolveEnginePreservesCustomModels(entry: Pick<AgentEngineEntry, "name">): Promise<boolean>;
 export declare function resolveEngineAcceptsCustomModels(entry: Pick<AgentEngineEntry, "acceptsCustomModels">): Promise<boolean>;
 export declare function detectEngineFromEnv(): AgentEngineEntry | null;
+/** Whether a deployment credential can serve this engine for the current request. */
+export declare function isDeploymentEngineUsableForRequest(entry: AgentEngineEntry): Promise<boolean>;
 export declare function detectEngineFromEnvForRequest(): Promise<AgentEngineEntry | null>;
 /**
  * Detect a usable engine from the current request user's accessible

package/dist/agent/engine/registry.js

@@ -11,6 +11,7 @@ import { getAgentAppModelDefaultForCurrentRequest } from "../app-model-defaults.
 import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "../chatgpt-subscription-contract.js";
 import { readDefaultAgentEngineSetting } from "../default-agent-engine.js";
 import { BUILDER_CLAUDE_SONNET_MODEL_ID, CLAUDE_SONNET_MODEL_ID, } from "../model-config.js";
+import { findLatestSupportedVersionMatch, isNewerVersionedModel, upgradeModelToLatestSupportedVersion, } from "../model-version.js";
 import { createProviderEndpointFetch } from "./ai-sdk-engine.js";
 import { AI_SDK_ANTHROPIC_DEFAULT_BASE_URL, OLLAMA_DEFAULT_BASE_URL, OLLAMA_BASE_URL_ENV_VAR, OPENAI_BASE_URL_ENV_VAR, OPENAI_DEFAULT_BASE_URL, isCustomOpenAiBaseUrl, } from "./openai-compatible-endpoint.js";
 import { isLocalNetworkOllamaEndpoint, validateProviderBaseUrl, } from "./provider-endpoint-validation.js";
@@ -128,50 +129,6 @@ export function isAgentEnginePackageInstalled(entry) {
         .filter((name) => Boolean(name)) ?? [];
     return packageNames.every(canResolvePackage);
 }
-function parseVersionedModelId(model) {
-    const match = /^(?<family>.+?)[-.](?<version>\d+(?:[-.]\d+)*)(?<suffix>(?:[-.][a-z][a-z0-9]*)*)$/i.exec(model.trim().toLowerCase());
-    const groups = match?.groups;
-    if (!groups?.family || !groups.version)
-        return null;
-    const version = groups.version.split(/[-.]/).map((part) => Number(part));
-    if (version.some((part) => !Number.isSafeInteger(part)))
-        return null;
-    return {
-        family: groups.family,
-        version,
-        suffix: groups.suffix ?? "",
-    };
-}
-function compareModelVersions(left, right) {
-    const length = Math.max(left.length, right.length);
-    for (let index = 0; index < length; index += 1) {
-        const delta = (left[index] ?? 0) - (right[index] ?? 0);
-        if (delta !== 0)
-            return delta;
-    }
-    return 0;
-}
-function findLatestSupportedVersionMatch(candidate, supportedModels) {
-    const parsedCandidate = parseVersionedModelId(candidate);
-    if (!parsedCandidate)
-        return undefined;
-    let best;
-    for (const supportedModel of supportedModels) {
-        const parsedSupported = parseVersionedModelId(supportedModel);
-        if (!parsedSupported)
-            continue;
-        if (parsedSupported.family !== parsedCandidate.family)
-            continue;
-        if (parsedSupported.suffix !== parsedCandidate.suffix)
-            continue;
-        if (best &&
-            compareModelVersions(parsedSupported.version, best.version) <= 0) {
-            continue;
-        }
-        best = { model: supportedModel, version: parsedSupported.version };
-    }
-    return best?.model;
-}
 export function normalizeModelForEngine(engine, model, options = {}) {
     const candidate = typeof model === "string" ? model.trim() : "";
     if (!candidate)
@@ -179,9 +136,12 @@ export function normalizeModelForEngine(engine, model, options = {}) {
     if (engine.preserveCustomModels || options.preserveCustomModels) {
         return candidate;
     }
-    if (engine.supportedModels.length === 0)
-        return candidate;
-    if (candidate === "auto" || engine.supportedModels.includes(candidate)) {
+    const upgradedModel = upgradeModelToLatestSupportedVersion(candidate, engine.supportedModels);
+    if (upgradedModel)
+        return upgradedModel;
+    if (candidate === "auto" ||
+        engine.supportedModels.includes(candidate) ||
+        engine.supportedModels.length === 0) {
         return candidate;
     }
     if (engine.acceptsCustomModels || options.acceptsCustomModels) {
@@ -191,6 +151,9 @@ export function normalizeModelForEngine(engine, model, options = {}) {
             : candidate;
     }
     const versionMatch = findLatestSupportedVersionMatch(candidate, engine.supportedModels);
+    if (versionMatch && isNewerVersionedModel(candidate, versionMatch)) {
+        return versionMatch;
+    }
     if (versionMatch)
         return versionMatch;
     return engine.defaultModel;
@@ -336,6 +299,59 @@ async function usableEnvCredentialMatch(entry) {
     }
     return null;
 }
+/** Whether a deployment credential can serve this engine for the current request. */
+export async function isDeploymentEngineUsableForRequest(entry) {
+    if (!isAgentEnginePackageInstalled(entry))
+        return false;
+    if (entry.name === "ai-sdk:ollama") {
+        return isDeploymentProviderEndpointUsable(entry);
+    }
+    for (const set of envCredentialSetsForEntry(entry)) {
+        if (!set.envVars.every((key) => canUseDeployCredentialFallbackForRequest(key) &&
+            !!readDeployCredentialEnv(key))) {
+            continue;
+        }
+        if (await isEnvCredentialSetUsable(set)) {
+            return isDeploymentProviderEndpointUsable(entry);
+        }
+    }
+    return false;
+}
+async function isDeploymentProviderEndpointUsable(entry) {
+    const endpointConfig = entry.name === "ai-sdk:ollama"
+        ? {
+            envVar: OLLAMA_BASE_URL_ENV_VAR,
+            provider: "Ollama",
+            required: true,
+            isOllama: true,
+        }
+        : entry.name === "ai-sdk:openai"
+            ? {
+                envVar: OPENAI_BASE_URL_ENV_VAR,
+                provider: "OpenAI",
+                required: false,
+                isOllama: false,
+            }
+            : undefined;
+    if (!endpointConfig)
+        return true;
+    const endpoint = canUseDeployCredentialFallbackForRequest(endpointConfig.envVar)
+        ? readDeployCredentialEnv(endpointConfig.envVar)
+        : undefined;
+    if (!endpoint)
+        return !endpointConfig.required;
+    try {
+        await validateProviderBaseUrl(endpoint, {
+            allowPrivate: true,
+            isOllama: endpointConfig.isOllama,
+        });
+    }
+    catch (error) {
+        console.warn(`[agent-engine] Invalid deployment ${endpointConfig.provider} endpoint; provider unavailable.`, { error: error instanceof Error ? error.message : String(error) });
+        return false;
+    }
+    return true;
+}
 export async function detectEngineFromEnvForRequest() {
     const preferByo = getAppConfig().agent.preferBringYourOwnKey;
     const matches = [];

package/dist/agent/model-config.d.ts

@@ -21,7 +21,7 @@ export declare const BUILDER_CLAUDE_SONNET_MODEL_LABEL = "Claude Sonnet 5";
 export declare const AGENT_MODEL_CONFIG: {
     readonly builder: {
         readonly defaultModel: "gpt-6-luna";
-        readonly supportedModels: readonly ["auto", "claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5-5", "gpt-5-4", "gpt-5-5", "gpt-5-4-mini", "gpt-5-1-codex-mini", "gpt-6-sol", "gpt-5-6-terra", "gpt-6-luna", "gemini-3-1-pro", "gemini-3-8-flash", "gemini-3-5-flash-lite", "gemini-3-1-flash-lite", "grok-code-fast", "qwen3-coder", "kimi-k2-5", "deepseek-v4-pro", "deepseek-v3-1", "z-ai-glm-4-5", "z-ai-glm-5-1"];
+        readonly supportedModels: readonly ["auto", "claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5-5", "gpt-5-4", "gpt-5-5", "gpt-5-4-mini", "gpt-5-1-codex-mini", "gpt-6.1-sol", "gpt-5-6-terra", "gpt-6-luna", "gemini-3-1-pro", "gemini-3-8-flash", "gemini-3-5-flash-lite", "gemini-3-1-flash-lite", "grok-code-fast", "qwen3-coder", "kimi-k2-5", "deepseek-v4-pro", "deepseek-v3-1", "z-ai-glm-4-5", "z-ai-glm-5-1"];
     };
     readonly anthropic: {
         readonly defaultModel: "claude-sonnet-5-5";
@@ -34,11 +34,11 @@ export declare const AGENT_MODEL_CONFIG: {
         };
         readonly openai: {
             readonly defaultModel: "gpt-6-luna";
-            readonly supportedModels: readonly ["gpt-6-luna", "gpt-5.6-luna", "gpt-5.6-terra", "gpt-5.6-sol", "gpt-6-sol"];
+            readonly supportedModels: readonly ["gpt-6-luna", "gpt-5.6-terra", "gpt-6.1-sol"];
         };
         readonly openrouter: {
             readonly defaultModel: string;
-            readonly supportedModels: readonly ["openai/gpt-6-luna", "openai/gpt-5.6-luna", "openai/gpt-5.6-terra", "openai/gpt-5.6-sol", "openai/gpt-6-sol", "openai/gpt-6-astra", "openai/gpt-6-astra-pro", "anthropic/claude-sonnet-5.5", "anthropic/claude-opus-5.5", "anthropic/claude-opus-4.8", "anthropic/claude-fable-5", "anthropic/claude-fable-5.1", "google/gemini-3.8-flash", "qwen/qwen3.8-max-0902", "meta/muse-spark-1.3", "inception/mercury-2.5", "z-ai/glm-5.2"];
+            readonly supportedModels: readonly ["openai/gpt-6-luna", "openai/gpt-5.6-terra", "openai/gpt-6.1-sol", "openai/gpt-6-astra", "openai/gpt-6-astra-pro", "anthropic/claude-sonnet-5.5", "anthropic/claude-opus-5.5", "anthropic/claude-opus-4.8", "anthropic/claude-fable-5", "anthropic/claude-fable-5.1", "google/gemini-3.8-flash", "qwen/qwen3.8-max-0902", "meta/muse-spark-1.3", "inception/mercury-2.5", "z-ai/glm-5.2"];
         };
         readonly google: {
             readonly defaultModel: "gemini-3.8-flash";
@@ -64,7 +64,7 @@ export declare const AGENT_MODEL_CONFIG: {
 };
 export declare const BUILDER_MODEL_CONFIG: {
     readonly defaultModel: "gpt-6-luna";
-    readonly supportedModels: readonly ["auto", "claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5-5", "gpt-5-4", "gpt-5-5", "gpt-5-4-mini", "gpt-5-1-codex-mini", "gpt-6-sol", "gpt-5-6-terra", "gpt-6-luna", "gemini-3-1-pro", "gemini-3-8-flash", "gemini-3-5-flash-lite", "gemini-3-1-flash-lite", "grok-code-fast", "qwen3-coder", "kimi-k2-5", "deepseek-v4-pro", "deepseek-v3-1", "z-ai-glm-4-5", "z-ai-glm-5-1"];
+    readonly supportedModels: readonly ["auto", "claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5-5", "gpt-5-4", "gpt-5-5", "gpt-5-4-mini", "gpt-5-1-codex-mini", "gpt-6.1-sol", "gpt-5-6-terra", "gpt-6-luna", "gemini-3-1-pro", "gemini-3-8-flash", "gemini-3-5-flash-lite", "gemini-3-1-flash-lite", "grok-code-fast", "qwen3-coder", "kimi-k2-5", "deepseek-v4-pro", "deepseek-v3-1", "z-ai-glm-4-5", "z-ai-glm-5-1"];
 };
 export declare const ANTHROPIC_MODEL_CONFIG: {
     readonly defaultModel: "claude-sonnet-5-5";
@@ -77,11 +77,11 @@ export declare const AI_SDK_MODEL_CONFIG: {
     };
     readonly openai: {
         readonly defaultModel: "gpt-6-luna";
-        readonly supportedModels: readonly ["gpt-6-luna", "gpt-5.6-luna", "gpt-5.6-terra", "gpt-5.6-sol", "gpt-6-sol"];
+        readonly supportedModels: readonly ["gpt-6-luna", "gpt-5.6-terra", "gpt-6.1-sol"];
     };
     readonly openrouter: {
         readonly defaultModel: string;
-        readonly supportedModels: readonly ["openai/gpt-6-luna", "openai/gpt-5.6-luna", "openai/gpt-5.6-terra", "openai/gpt-5.6-sol", "openai/gpt-6-sol", "openai/gpt-6-astra", "openai/gpt-6-astra-pro", "anthropic/claude-sonnet-5.5", "anthropic/claude-opus-5.5", "anthropic/claude-opus-4.8", "anthropic/claude-fable-5", "anthropic/claude-fable-5.1", "google/gemini-3.8-flash", "qwen/qwen3.8-max-0902", "meta/muse-spark-1.3", "inception/mercury-2.5", "z-ai/glm-5.2"];
+        readonly supportedModels: readonly ["openai/gpt-6-luna", "openai/gpt-5.6-terra", "openai/gpt-6.1-sol", "openai/gpt-6-astra", "openai/gpt-6-astra-pro", "anthropic/claude-sonnet-5.5", "anthropic/claude-opus-5.5", "anthropic/claude-opus-4.8", "anthropic/claude-fable-5", "anthropic/claude-fable-5.1", "google/gemini-3.8-flash", "qwen/qwen3.8-max-0902", "meta/muse-spark-1.3", "inception/mercury-2.5", "z-ai/glm-5.2"];
     };
     readonly google: {
         readonly defaultModel: "gemini-3.8-flash";

package/dist/agent/model-config.js

@@ -24,11 +24,13 @@ const MODEL_CONTEXT_WINDOWS = {
     "openai/gpt-5.6-sol": 1_050_000,
     "openai/gpt-5.6-terra": 1_050_000,
     "openai/gpt-5.6-luna": 1_050_000,
+    "openai/gpt-6.1-sol": 1_050_000,
     "openai/gpt-6-sol": 1_050_000,
     "openai/gpt-6-luna": 1_050_000,
     "google/gemini-2.5-flash": 1_048_576,
     "z-ai/glm-5.2": 1_048_576,
     "gpt-6-sol": 1_050_000,
+    "gpt-6.1-sol": 1_050_000,
     "gpt-6-luna": 1_050_000,
     "gpt-5.6-sol": 1_050_000,
     "gpt-5.6-terra": 1_050_000,
@@ -97,9 +99,11 @@ const MODEL_MAX_OUTPUT_TOKENS = {
     "openai/gpt-5.6-sol": 40_000,
     "openai/gpt-5.6-terra": 40_000,
     "openai/gpt-5.6-luna": 128_000,
+    "openai/gpt-6.1-sol": 128_000,
     "openai/gpt-6-sol": 128_000,
     "openai/gpt-6-luna": 128_000,
     "gpt-6-sol": 128_000,
+    "gpt-6.1-sol": 128_000,
     "gpt-6-luna": 128_000,
     "gpt-5.6-sol": 40_000,
     "gpt-5.6-terra": 40_000,
@@ -163,7 +167,7 @@ export const AGENT_MODEL_CONFIG = {
             "gpt-5-5",
             "gpt-5-4-mini",
             "gpt-5-1-codex-mini",
-            "gpt-6-sol",
+            "gpt-6.1-sol",
             "gpt-5-6-terra",
             "gpt-6-luna",
             "gemini-3-1-pro",
@@ -202,22 +206,14 @@ export const AGENT_MODEL_CONFIG = {
         },
         openai: {
             defaultModel: FRAMEWORK_DEFAULT_OPENAI_MODEL,
-            supportedModels: [
-                "gpt-6-luna",
-                "gpt-5.6-luna",
-                "gpt-5.6-terra",
-                "gpt-5.6-sol",
-                "gpt-6-sol",
-            ],
+            supportedModels: ["gpt-6-luna", "gpt-5.6-terra", "gpt-6.1-sol"],
         },
         openrouter: {
             defaultModel: FRAMEWORK_DEFAULT_OPENROUTER_MODEL,
             supportedModels: [
                 "openai/gpt-6-luna",
-                "openai/gpt-5.6-luna",
                 "openai/gpt-5.6-terra",
-                "openai/gpt-5.6-sol",
-                "openai/gpt-6-sol",
+                "openai/gpt-6.1-sol",
                 "openai/gpt-6-astra",
                 "openai/gpt-6-astra-pro",
                 OPENROUTER_CLAUDE_SONNET_MODEL_ID,

package/dist/agent/model-version.d.ts

@@ -0,0 +1,3 @@
+export declare function findLatestSupportedVersionMatch(candidate: string, supportedModels: readonly string[]): string | undefined;
+export declare function isNewerVersionedModel(candidate: string, newerModel: string): boolean;
+export declare function upgradeModelToLatestSupportedVersion(candidate: string, supportedModels: readonly string[]): string | undefined;

package/dist/agent/model-version.js

@@ -0,0 +1,67 @@
+const UPGRADEABLE_GPT_TIERS = new Set(["-sol", "-terra", "-luna"]);
+function parseVersionedModelId(model) {
+    const match = /^(?<family>.+?)[-.](?<version>\d+(?:[-.]\d+)*)(?<suffix>(?:[-.][a-z][a-z0-9]*)*)$/i.exec(model.trim().toLowerCase());
+    const groups = match?.groups;
+    if (!groups?.family || !groups.version)
+        return null;
+    const version = groups.version.split(/[-.]/).map((part) => Number(part));
+    if (version.some((part) => !Number.isSafeInteger(part)))
+        return null;
+    return {
+        family: groups.family,
+        version,
+        suffix: groups.suffix ?? "",
+    };
+}
+function compareModelVersions(left, right) {
+    const length = Math.max(left.length, right.length);
+    for (let index = 0; index < length; index += 1) {
+        const delta = (left[index] ?? 0) - (right[index] ?? 0);
+        if (delta !== 0)
+            return delta;
+    }
+    return 0;
+}
+export function findLatestSupportedVersionMatch(candidate, supportedModels) {
+    const parsedCandidate = parseVersionedModelId(candidate);
+    if (!parsedCandidate)
+        return undefined;
+    let best;
+    for (const supportedModel of supportedModels) {
+        const parsedSupported = parseVersionedModelId(supportedModel);
+        if (!parsedSupported)
+            continue;
+        if (parsedSupported.family !== parsedCandidate.family)
+            continue;
+        if (parsedSupported.suffix !== parsedCandidate.suffix)
+            continue;
+        if (best &&
+            compareModelVersions(parsedSupported.version, best.version) <= 0) {
+            continue;
+        }
+        best = { model: supportedModel, version: parsedSupported.version };
+    }
+    return best?.model;
+}
+export function isNewerVersionedModel(candidate, newerModel) {
+    const current = parseVersionedModelId(candidate);
+    const newer = parseVersionedModelId(newerModel);
+    return (current !== null &&
+        newer !== null &&
+        current.family === newer.family &&
+        current.suffix === newer.suffix &&
+        compareModelVersions(newer.version, current.version) > 0);
+}
+export function upgradeModelToLatestSupportedVersion(candidate, supportedModels) {
+    const parsedCandidate = parseVersionedModelId(candidate);
+    if (!parsedCandidate ||
+        (parsedCandidate.family !== "gpt" &&
+            parsedCandidate.family !== "openai/gpt") ||
+        !UPGRADEABLE_GPT_TIERS.has(parsedCandidate.suffix)) {
+        return undefined;
+    }
+    const latest = findLatestSupportedVersionMatch(candidate, supportedModels);
+    return latest && isNewerVersionedModel(candidate, latest)
+        ? latest
+        : undefined;
+}

package/dist/agent/provider-model-selection.d.ts

@@ -26,6 +26,7 @@ export interface ProviderModelSelectionRow {
     provider: ProviderModelSelectionProvider;
     scope: ProviderModelSelectionScope;
     models: string[] | null;
+    preserveCustomModels?: boolean;
     updatedAt?: number;
     updatedBy?: string;
 }
@@ -37,11 +38,13 @@ export type EffectiveProviderModelSelection = {
     state: "default";
     provider: ProviderModelSelectionProvider;
     scope: ProviderModelSelectionScope;
+    preserveCustomModels?: boolean;
 } | {
     state: "selected";
     provider: ProviderModelSelectionProvider;
     scope: ProviderModelSelectionScope;
     models: string[];
+    preserveCustomModels?: boolean;
 } | {
     state: "unreadable";
     provider: ProviderModelSelectionProvider;
@@ -67,7 +70,9 @@ export declare function recommendedProviderModels(provider: ProviderModelSelecti
  * only routes its own catalog, so ids outside it are refused rather than
  * stored as choices the gateway would silently swap for its default.
  */
-export declare function normalizeSelectedModels(provider: ProviderModelSelectionProvider, models: readonly unknown[]): string[];
+export declare function normalizeSelectedModels(provider: ProviderModelSelectionProvider, models: readonly unknown[], options?: {
+    preserveCustomModels?: boolean;
+}): string[];
 /** Read one scope's row. Throws when the store can't be read. */
 export declare function readProviderModelSelection(ctx: ProviderModelSelectionContext, provider: ProviderModelSelectionProvider, scope: ProviderModelSelectionScope): Promise<ProviderModelSelectionRow>;
 /**