Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

feat(connections): per-provider model lists and a connectors.models op (#6173)

ddupont19762088609e
diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/ProviderRegistry.generated.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/ProviderRegistry.generated.swift
index ec07b4d920..b0a3d2fe17 100644
--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/ProviderRegistry.generated.swift
+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/ProviderRegistry.generated.swift
@@ -37,6 +37,17 @@ public enum ProviderRegistry {
"custom",
]
+ /// The model ids each visible provider lists, in the order the app core lists them.
+ public static let models: [String: [String]] = [
+ "anthropic": ["claude-haiku-4-5", "claude-sonnet-5", "claude-opus-5-5"],
+ "openai": ["gpt-5.5"],
+ "openrouter": ["anthropic/claude-sonnet-5"],
+ "google": ["gemini-3.8-flash"],
+ "xai": ["grok-4.6"],
+ "deepseek": ["deepseek-flash"],
+ "kimi": ["kimi-k3"],
+ ]
+
public static let methodKinds: [String] = [
"api_key",
"import_login",
diff --git a/apps/cua-spaces-web/src/bridge/__tests__/provider-registry.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/provider-registry.test.ts
index 3cda0282c0..0aa799df4b 100644
--- a/apps/cua-spaces-web/src/bridge/__tests__/provider-registry.test.ts
+++ b/apps/cua-spaces-web/src/bridge/__tests__/provider-registry.test.ts
@@ -7,7 +7,7 @@
import { describe, expect, it } from "vitest";
-import { connectorsInputOf, providerPicker, providerSheet } from "../connectors";
+import { connectorsInputOf, modelsView, providerPicker, providerSheet } from "../connectors";
import { METHOD_KINDS, PROVIDER_REGISTRY } from "../generated/providers";
import { agentKeysFromWire, tauriAgentKeysOps, webkitAgentKeysOps } from "../ops/agent-keys";
import { testCore, wasmBuilt } from "./testCore";
@@ -33,6 +33,32 @@ describe.skipIf(!wasmBuilt)("the registry in the web app", () => {
});
});
+describe.skipIf(!wasmBuilt)("the model menu in the web app", () => {
+ const key = (provider: string, env: string, extra: Record<string, unknown> = {}) => ({ provider, env, last4: "1234", addedMs: 1, ...extra });
+
+ it("lists only connected providers, the core's models equal the generated registry's, and the first fast one is the default", async () => {
+ const core = await testCore();
+ expect(modelsView(core, connectorsInputOf([], { keys: [] }))).toMatchObject({ groups: [], default: null, empty: "Connect a provider to pick a model." });
+ const view = modelsView(core, connectorsInputOf([], { keys: [key("anthropic", "ANTHROPIC_API_KEY"), key("openai", "OPENAI_API_KEY")] } as never))!;
+ expect(view.groups.map((g) => g.provider)).toEqual(["anthropic", "openai"]);
+ for (const g of view.groups) {
+ const reg = PROVIDER_REGISTRY.find((p) => p.id === g.provider)!;
+ expect(g.models.map((m) => m.id)).toEqual(reg.models.map((m) => m.id));
+ expect(g.harness).toBeNull();
+ }
+ expect(view.default).toEqual({ provider: "anthropic", model: "claude-haiku-4-5" });
+ });
+
+ it("marks a sign-in as its own app's and an expired one as needing a reconnect, listed last", async () => {
+ const core = await testCore();
+ const view = modelsView(core, connectorsInputOf([], { keys: [key("anthropic", "CLAUDE_CODE_OAUTH_TOKEN", { expired: true }), key("openai", "CODEX_AUTH_JSON")] } as never))!;
+ expect(view.groups.map((g) => [g.provider, g.state, g.harness])).toEqual([
+ ["openai", "connected", "openai-codex"],
+ ["anthropic", "needs-reconnect", null],
+ ]);
+ });
+});
+
describe("agent key operations for connections", () => {
const WIRE = {
keys: [
diff --git a/apps/cua-spaces-web/src/bridge/connectors.ts b/apps/cua-spaces-web/src/bridge/connectors.ts
index ec8983b3ec..1ba998fa3a 100644
--- a/apps/cua-spaces-web/src/bridge/connectors.ts
+++ b/apps/cua-spaces-web/src/bridge/connectors.ts
@@ -321,6 +321,38 @@ export const importSheet = (core: CoreClient, os: HostOs = hostOs()): ImportShee
export const providerPicker = (core: CoreClient, input: ConnectorsInput, forApp: string | null = null, query = "", expanded = false): ProviderPickerView | null =>
core.tryCall<ProviderPickerView>("connectors.providerPicker", { input: input as unknown as Json, forApp, query, expanded }) ?? null;
+/** One model row of the prompt box's model menu. */
+export interface ModelChoice {
+ id: string;
+ label: string;
+ /** A quick, cheap model (tagged "Fast"). */
+ fast: boolean;
+ /** The provider's own default. */
+ default: boolean;
+}
+
+export interface ModelGroup {
+ provider: string;
+ label: string;
+ icon: string;
+ state: "connected" | "needs-reconnect";
+ /** The coding app that must run these models (only its own sign-in is saved); null: the general agent. */
+ harness: string | null;
+ models: ModelChoice[];
+}
+
+/** The models of the connected providers (`connectors.models`). */
+export interface ModelsView {
+ groups: ModelGroup[];
+ /** What a new prompt starts with. */
+ default: { provider: string; model: string } | null;
+ connectLabel: string;
+ empty: string | null;
+}
+
+export const modelsView = (core: CoreClient, input: ConnectorsInput): ModelsView | null =>
+ core.tryCall<ModelsView>("connectors.models", { input: input as unknown as Json }) ?? null;
+
export const appDetail = (core: CoreClient, input: ConnectorsInput, agent: string): AppDetailView | null =>
core.tryCall<AppDetailView | null>("connectors.appDetail", { input: input as unknown as Json, agent }) ?? null;
diff --git a/apps/cua-spaces-web/src/bridge/generated/providers.ts b/apps/cua-spaces-web/src/bridge/generated/providers.ts
index a9d892f945..f0177a991c 100644
--- a/apps/cua-spaces-web/src/bridge/generated/providers.ts
+++ b/apps/cua-spaces-web/src/bridge/generated/providers.ts
@@ -12,38 +12,41 @@ export interface ProviderEntry {
aliases: string[];
/** The variable a key for it is saved as. */
keyEnv: string;
+ defaultModel: string;
+ /** The models a person can pick (empty: only the default, when it has one). */
+ models: { id: string; name: string; fast: boolean }[];
}
/** The providers a person can see, in rank order. */
export const PROVIDER_REGISTRY: ProviderEntry[] = [
- { id: "anthropic", name: "Anthropic", icon: "anthropic", tier: "top", aliases: [], keyEnv: "ANTHROPIC_API_KEY" },
- { id: "openai", name: "OpenAI", icon: "openai", tier: "top", aliases: [], keyEnv: "OPENAI_API_KEY" },
- { id: "openrouter", name: "OpenRouter", icon: "openrouter", tier: "top", aliases: [], keyEnv: "OPENROUTER_API_KEY" },
- { id: "google", name: "Google AI Studio", icon: "google", tier: "top", aliases: ["gemini", "google ai", "aistudio"], keyEnv: "GEMINI_API_KEY" },
- { id: "xai", name: "xAI", icon: "xai", tier: "top", aliases: ["grok"], keyEnv: "XAI_API_KEY" },
- { id: "deepseek", name: "DeepSeek", icon: "deepseek", tier: "top", aliases: [], keyEnv: "DEEPSEEK_API_KEY" },
- { id: "kimi", name: "Kimi (Moonshot)", icon: "kimi", tier: "top", aliases: ["moonshot", "kimi code"], keyEnv: "KIMI_API_KEY" },
- { id: "github", name: "GitHub Copilot", icon: "github", tier: "more", aliases: ["copilot", "github copilot cli"], keyEnv: "COPILOT_GITHUB_TOKEN" },
- { id: "huggingface", name: "Hugging Face", icon: "huggingface", tier: "more", aliases: ["hf"], keyEnv: "HF_TOKEN" },
- { id: "zai", name: "Z.AI (GLM)", icon: "zai", tier: "more", aliases: ["glm", "zhipu", "z.ai"], keyEnv: "GLM_API_KEY" },
- { id: "fireworks", name: "Fireworks AI", icon: "fireworks", tier: "more", aliases: ["fw"], keyEnv: "FIREWORKS_API_KEY" },
- { id: "nvidia", name: "NVIDIA NIM", icon: "nvidia", tier: "more", aliases: ["nim", "nemotron", "build.nvidia.com"], keyEnv: "NVIDIA_API_KEY" },
- { id: "ollama-cloud", name: "Ollama Cloud", icon: "ollama-cloud", tier: "more", aliases: ["ollama"], keyEnv: "OLLAMA_API_KEY" },
- { id: "deepinfra", name: "DeepInfra", icon: "deepinfra", tier: "more", aliases: ["deep infra"], keyEnv: "DEEPINFRA_API_KEY" },
- { id: "novita", name: "Novita AI", icon: "novita", tier: "more", aliases: ["novitaai"], keyEnv: "NOVITA_API_KEY" },
- { id: "nebius-token-factory", name: "Nebius Token Factory", icon: "nebius-token-factory", tier: "more", aliases: ["nebius"], keyEnv: "NEBIUS_API_KEY" },
- { id: "gmi", name: "GMI Cloud", icon: "gmi", tier: "more", aliases: ["gmicloud"], keyEnv: "GMI_API_KEY" },
- { id: "upstage", name: "Upstage Solar", icon: "upstage", tier: "more", aliases: ["solar"], keyEnv: "UPSTAGE_API_KEY" },
- { id: "arcee", name: "Arcee AI", icon: "arcee", tier: "more", aliases: ["trinity"], keyEnv: "ARCEEAI_API_KEY" },
- { id: "ai-gateway", name: "Vercel AI Gateway", icon: "ai-gateway", tier: "more", aliases: ["vercel"], keyEnv: "AI_GATEWAY_API_KEY" },
- { id: "opencode-zen", name: "OpenCode Zen", icon: "opencode-zen", tier: "more", aliases: ["zen"], keyEnv: "OPENCODE_ZEN_API_KEY" },
- { id: "opencode-go", name: "OpenCode Go", icon: "opencode-go", tier: "more", aliases: ["go"], keyEnv: "OPENCODE_GO_API_KEY" },
- { id: "kilocode", name: "Kilo Code", icon: "kilocode", tier: "more", aliases: ["kilo"], keyEnv: "KILOCODE_API_KEY" },
- { id: "xiaomi", name: "Xiaomi MiMo", icon: "xiaomi", tier: "more", aliases: ["mimo"], keyEnv: "XIAOMI_API_KEY" },
- { id: "stepfun", name: "StepFun", icon: "stepfun", tier: "more", aliases: ["step"], keyEnv: "STEPFUN_API_KEY" },
- { id: "minimax", name: "MiniMax", icon: "minimax", tier: "more", aliases: ["mini-max"], keyEnv: "MINIMAX_API_KEY" },
- { id: "alibaba", name: "Qwen Cloud (Alibaba)", icon: "alibaba", tier: "more", aliases: ["qwen", "dashscope", "alibaba cloud"], keyEnv: "DASHSCOPE_API_KEY" },
- { id: "custom", name: "Custom endpoint", icon: "custom", tier: "top", aliases: ["openai compatible", "lm studio", "ollama", "vllm", "llama.cpp", "litellm", "local server", "gateway", "proxy"], keyEnv: "CUSTOM_ENDPOINT_API_KEY" },
+ { id: "anthropic", name: "Anthropic", icon: "anthropic", tier: "top", aliases: [], keyEnv: "ANTHROPIC_API_KEY", defaultModel: "claude-sonnet-5", models: [{ id: "claude-haiku-4-5", name: "Claude Haiku 4.5", fast: true }, { id: "claude-sonnet-5", name: "Claude Sonnet 5", fast: false }, { id: "claude-opus-5-5", name: "Claude Opus 5.5", fast: false }] },
+ { id: "openai", name: "OpenAI", icon: "openai", tier: "top", aliases: [], keyEnv: "OPENAI_API_KEY", defaultModel: "gpt-5.5", models: [{ id: "gpt-5.5", name: "GPT-5.5", fast: false }] },
+ { id: "openrouter", name: "OpenRouter", icon: "openrouter", tier: "top", aliases: [], keyEnv: "OPENROUTER_API_KEY", defaultModel: "anthropic/claude-sonnet-5", models: [{ id: "anthropic/claude-sonnet-5", name: "Claude Sonnet 5", fast: false }] },
+ { id: "google", name: "Google AI Studio", icon: "google", tier: "top", aliases: ["gemini", "google ai", "aistudio"], keyEnv: "GEMINI_API_KEY", defaultModel: "gemini-3.8-flash", models: [{ id: "gemini-3.8-flash", name: "Gemini 3.8 Flash", fast: true }] },
+ { id: "xai", name: "xAI", icon: "xai", tier: "top", aliases: ["grok"], keyEnv: "XAI_API_KEY", defaultModel: "grok-4.6", models: [{ id: "grok-4.6", name: "Grok 4.6", fast: false }] },
+ { id: "deepseek", name: "DeepSeek", icon: "deepseek", tier: "top", aliases: [], keyEnv: "DEEPSEEK_API_KEY", defaultModel: "deepseek-flash", models: [{ id: "deepseek-flash", name: "DeepSeek Flash", fast: true }] },
+ { id: "kimi", name: "Kimi (Moonshot)", icon: "kimi", tier: "top", aliases: ["moonshot", "kimi code"], keyEnv: "KIMI_API_KEY", defaultModel: "kimi-k3", models: [{ id: "kimi-k3", name: "Kimi K3", fast: false }] },
+ { id: "github", name: "GitHub Copilot", icon: "github", tier: "more", aliases: ["copilot", "github copilot cli"], keyEnv: "COPILOT_GITHUB_TOKEN", defaultModel: "", models: [] },
+ { id: "huggingface", name: "Hugging Face", icon: "huggingface", tier: "more", aliases: ["hf"], keyEnv: "HF_TOKEN", defaultModel: "moonshotai/Kimi-K2.5", models: [] },
+ { id: "zai", name: "Z.AI (GLM)", icon: "zai", tier: "more", aliases: ["glm", "zhipu", "z.ai"], keyEnv: "GLM_API_KEY", defaultModel: "glm-5.3", models: [] },
+ { id: "fireworks", name: "Fireworks AI", icon: "fireworks", tier: "more", aliases: ["fw"], keyEnv: "FIREWORKS_API_KEY", defaultModel: "accounts/fireworks/models/kimi-k2p6", models: [] },
+ { id: "nvidia", name: "NVIDIA NIM", icon: "nvidia", tier: "more", aliases: ["nim", "nemotron", "build.nvidia.com"], keyEnv: "NVIDIA_API_KEY", defaultModel: "nvidia/nemotron-3-ultra-550b-a55b", models: [] },
+ { id: "ollama-cloud", name: "Ollama Cloud", icon: "ollama-cloud", tier: "more", aliases: ["ollama"], keyEnv: "OLLAMA_API_KEY", defaultModel: "", models: [] },
+ { id: "deepinfra", name: "DeepInfra", icon: "deepinfra", tier: "more", aliases: ["deep infra"], keyEnv: "DEEPINFRA_API_KEY", defaultModel: "", models: [] },
+ { id: "novita", name: "Novita AI", icon: "novita", tier: "more", aliases: ["novitaai"], keyEnv: "NOVITA_API_KEY", defaultModel: "moonshotai/kimi-k2.5", models: [] },
+ { id: "nebius-token-factory", name: "Nebius Token Factory", icon: "nebius-token-factory", tier: "more", aliases: ["nebius"], keyEnv: "NEBIUS_API_KEY", defaultModel: "Qwen/Qwen3.5-397B-A17B-fast", models: [] },
+ { id: "gmi", name: "GMI Cloud", icon: "gmi", tier: "more", aliases: ["gmicloud"], keyEnv: "GMI_API_KEY", defaultModel: "zai-org/GLM-5.1-FP8", models: [] },
+ { id: "upstage", name: "Upstage Solar", icon: "upstage", tier: "more", aliases: ["solar"], keyEnv: "UPSTAGE_API_KEY", defaultModel: "solar-pro3", models: [] },
+ { id: "arcee", name: "Arcee AI", icon: "arcee", tier: "more", aliases: ["trinity"], keyEnv: "ARCEEAI_API_KEY", defaultModel: "trinity-large-thinking", models: [] },
+ { id: "ai-gateway", name: "Vercel AI Gateway", icon: "ai-gateway", tier: "more", aliases: ["vercel"], keyEnv: "AI_GATEWAY_API_KEY", defaultModel: "anthropic/claude-sonnet-5", models: [] },
+ { id: "opencode-zen", name: "OpenCode Zen", icon: "opencode-zen", tier: "more", aliases: ["zen"], keyEnv: "OPENCODE_ZEN_API_KEY", defaultModel: "x-preview-f-free", models: [] },
+ { id: "opencode-go", name: "OpenCode Go", icon: "opencode-go", tier: "more", aliases: ["go"], keyEnv: "OPENCODE_GO_API_KEY", defaultModel: "kimi-k3", models: [] },
+ { id: "kilocode", name: "Kilo Code", icon: "kilocode", tier: "more", aliases: ["kilo"], keyEnv: "KILOCODE_API_KEY", defaultModel: "", models: [] },
+ { id: "xiaomi", name: "Xiaomi MiMo", icon: "xiaomi", tier: "more", aliases: ["mimo"], keyEnv: "XIAOMI_API_KEY", defaultModel: "mimo-v2.5-pro", models: [] },
+ { id: "stepfun", name: "StepFun", icon: "stepfun", tier: "more", aliases: ["step"], keyEnv: "STEPFUN_API_KEY", defaultModel: "step-3.5-flash", models: [] },
+ { id: "minimax", name: "MiniMax", icon: "minimax", tier: "more", aliases: ["mini-max"], keyEnv: "MINIMAX_API_KEY", defaultModel: "MiniMax-M3", models: [] },
+ { id: "alibaba", name: "Qwen Cloud (Alibaba)", icon: "alibaba", tier: "more", aliases: ["qwen", "dashscope", "alibaba cloud"], keyEnv: "DASHSCOPE_API_KEY", defaultModel: "", models: [] },
+ { id: "custom", name: "Custom endpoint", icon: "custom", tier: "top", aliases: ["openai compatible", "lm studio", "ollama", "vllm", "llama.cpp", "litellm", "local server", "gateway", "proxy"], keyEnv: "CUSTOM_ENDPOINT_API_KEY", defaultModel: "", models: [] },
];
/** The kinds of way to connect a provider (a closed set). */
diff --git a/libs/cua/crates/cua-connections/generated/providers.json b/libs/cua/crates/cua-connections/generated/providers.json
index 20e02d8dc6..1ecea56672 100644
--- a/libs/cua/crates/cua-connections/generated/providers.json
+++ b/libs/cua/crates/cua-connections/generated/providers.json
@@ -24,6 +24,7 @@
{
"aliases": [],
"alsoWires": [],
+ "defaultModel": "claude-sonnet-5",
"delivery": {
"claude-code": [
"ANTHROPIC_API_KEY",
@@ -68,6 +69,23 @@
"scope": ""
}
],
+ "models": [
+ {
+ "fast": true,
+ "id": "claude-haiku-4-5",
+ "name": "Claude Haiku 4.5"
+ },
+ {
+ "fast": false,
+ "id": "claude-sonnet-5",
+ "name": "Claude Sonnet 5"
+ },
+ {
+ "fast": false,
+ "id": "claude-opus-5-5",
+ "name": "Claude Opus 5.5"
+ }
+ ],
"name": "Anthropic",
"rank": 10,
"regions": [],
@@ -79,6 +97,7 @@
"alsoWires": [
"openai-chat"
],
+ "defaultModel": "gpt-5.5",
"delivery": {
"goose": [
"OPENAI_API_KEY"
@@ -118,6 +137,13 @@
"scope": ""
}
],
+ "models": [
+ {
+ "fast": false,
+ "id": "gpt-5.5",
+ "name": "GPT-5.5"
+ }
+ ],
"name": "OpenAI",
"rank": 20,
"regions": [],
@@ -127,6 +153,7 @@
{
"aliases": [],
"alsoWires": [],
+ "defaultModel": "anthropic/claude-sonnet-5",
"delivery": {
"goose": [
"OPENROUTER_API_KEY"
@@ -156,6 +183,13 @@
"scope": ""
}
],
+ "models": [
+ {
+ "fast": false,
+ "id": "anthropic/claude-sonnet-5",
+ "name": "Claude Sonnet 5"
+ }
+ ],
"name": "OpenRouter",
"rank": 30,
"regions": [],
@@ -169,6 +203,7 @@
"aistudio"
],
"alsoWires": [],
+ "defaultModel": "gemini-3.8-flash",
"delivery": {
"gemini-cli": [
"GEMINI_API_KEY",
@@ -203,6 +238,13 @@
"scope": ""
}
],
+ "models": [
+ {
+ "fast": true,
+ "id": "gemini-3.8-flash",
+ "name": "Gemini 3.8 Flash"
+ }
+ ],
"name": "Google AI Studio",
"rank": 40,
"regions": [],
@@ -216,6 +258,7 @@
"alsoWires": [
"openai-chat"
],
+ "defaultModel": "grok-4.6",
"delivery": {
"hermes": [
"XAI_API_KEY"
@@ -233,6 +276,13 @@
"scope": ""
}
],
+ "models": [
+ {
+ "fast": false,
+ "id": "grok-4.6",
+ "name": "Grok 4.6"
+ }
+ ],
"name": "xAI",
"rank": 50,
"regions": [],
@@ -242,6 +292,7 @@
{
"aliases": [],
"alsoWires": [],
+ "defaultModel": "deepseek-flash",
"delivery": {
"hermes": [
"DEEPSEEK_API_KEY"
@@ -259,6 +310,13 @@
"scope": ""
}
],
+ "models": [
+ {
+ "fast": true,
+ "id": "deepseek-flash",
+ "name": "DeepSeek Flash"
+ }
+ ],
"name": "DeepSeek",
"rank": 60,
"regions": [],
@@ -271,6 +329,7 @@
"kimi code"
],
"alsoWires": [],
+ "defaultModel": "kimi-k3",
"delivery": {
"hermes": [
"KIMI_API_KEY"
@@ -288,6 +347,13 @@
"scope": ""
}
],
+ "models": [
+ {
+ "fast": false,
+ "id": "kimi-k3",
+ "name": "Kimi K3"
+ }
+ ],
"name": "Kimi (Moonshot)",
"rank": 70,
"regions": [],
@@ -300,6 +366,7 @@
"github copilot cli"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {},
"hermesId": "",
"hidden": false,
@@ -313,6 +380,7 @@
"scope": ""
}
],
+ "models": [],
"name": "GitHub Copilot",
"rank": 80,
"regions": [],
@@ -324,6 +392,7 @@
"hf"
],
"alsoWires": [],
+ "defaultModel": "moonshotai/Kimi-K2.5",
"delivery": {
"hermes": [
"HF_TOKEN"
@@ -341,6 +410,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Hugging Face",
"rank": 100,
"regions": [],
@@ -354,6 +424,7 @@
"z.ai"
],
"alsoWires": [],
+ "defaultModel": "glm-5.3",
"delivery": {
"hermes": [
"GLM_API_KEY"
@@ -371,6 +442,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Z.AI (GLM)",
"rank": 110,
"regions": [
@@ -387,6 +459,7 @@
"fw"
],
"alsoWires": [],
+ "defaultModel": "accounts/fireworks/models/kimi-k2p6",
"delivery": {
"hermes": [
"FIREWORKS_API_KEY"
@@ -404,6 +477,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Fireworks AI",
"rank": 120,
"regions": [],
@@ -417,6 +491,7 @@
"build.nvidia.com"
],
"alsoWires": [],
+ "defaultModel": "nvidia/nemotron-3-ultra-550b-a55b",
"delivery": {
"hermes": [
"NVIDIA_API_KEY"
@@ -434,6 +509,7 @@
"scope": ""
}
],
+ "models": [],
"name": "NVIDIA NIM",
"rank": 130,
"regions": [],
@@ -445,6 +521,7 @@
"ollama"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"OLLAMA_API_KEY"
@@ -462,6 +539,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Ollama Cloud",
"rank": 140,
"regions": [],
@@ -473,6 +551,7 @@
"deep infra"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"DEEPINFRA_API_KEY"
@@ -490,6 +569,7 @@
"scope": ""
}
],
+ "models": [],
"name": "DeepInfra",
"rank": 150,
"regions": [],
@@ -501,6 +581,7 @@
"novitaai"
],
"alsoWires": [],
+ "defaultModel": "moonshotai/kimi-k2.5",
"delivery": {
"hermes": [
"NOVITA_API_KEY"
@@ -518,6 +599,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Novita AI",
"rank": 160,
"regions": [],
@@ -529,6 +611,7 @@
"nebius"
],
"alsoWires": [],
+ "defaultModel": "Qwen/Qwen3.5-397B-A17B-fast",
"delivery": {
"hermes": [
"NEBIUS_API_KEY"
@@ -546,6 +629,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Nebius Token Factory",
"rank": 170,
"regions": [],
@@ -557,6 +641,7 @@
"gmicloud"
],
"alsoWires": [],
+ "defaultModel": "zai-org/GLM-5.1-FP8",
"delivery": {
"hermes": [
"GMI_API_KEY"
@@ -574,6 +659,7 @@
"scope": ""
}
],
+ "models": [],
"name": "GMI Cloud",
"rank": 180,
"regions": [],
@@ -585,6 +671,7 @@
"solar"
],
"alsoWires": [],
+ "defaultModel": "solar-pro3",
"delivery": {
"hermes": [
"UPSTAGE_API_KEY"
@@ -602,6 +689,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Upstage Solar",
"rank": 190,
"regions": [],
@@ -613,6 +701,7 @@
"trinity"
],
"alsoWires": [],
+ "defaultModel": "trinity-large-thinking",
"delivery": {
"hermes": [
"ARCEEAI_API_KEY"
@@ -630,6 +719,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Arcee AI",
"rank": 200,
"regions": [],
@@ -641,6 +731,7 @@
"vercel"
],
"alsoWires": [],
+ "defaultModel": "anthropic/claude-sonnet-5",
"delivery": {
"hermes": [
"AI_GATEWAY_API_KEY"
@@ -658,6 +749,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Vercel AI Gateway",
"rank": 210,
"regions": [],
@@ -669,6 +761,7 @@
"zen"
],
"alsoWires": [],
+ "defaultModel": "x-preview-f-free",
"delivery": {
"hermes": [
"OPENCODE_ZEN_API_KEY"
@@ -686,6 +779,7 @@
"scope": ""
}
],
+ "models": [],
"name": "OpenCode Zen",
"rank": 220,
"regions": [],
@@ -697,6 +791,7 @@
"go"
],
"alsoWires": [],
+ "defaultModel": "kimi-k3",
"delivery": {
"hermes": [
"OPENCODE_GO_API_KEY"
@@ -714,6 +809,7 @@
"scope": ""
}
],
+ "models": [],
"name": "OpenCode Go",
"rank": 230,
"regions": [],
@@ -725,6 +821,7 @@
"kilo"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"KILOCODE_API_KEY"
@@ -742,6 +839,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Kilo Code",
"rank": 240,
"regions": [],
@@ -753,6 +851,7 @@
"mimo"
],
"alsoWires": [],
+ "defaultModel": "mimo-v2.5-pro",
"delivery": {
"hermes": [
"XIAOMI_API_KEY"
@@ -770,6 +869,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Xiaomi MiMo",
"rank": 250,
"regions": [],
@@ -781,6 +881,7 @@
"step"
],
"alsoWires": [],
+ "defaultModel": "step-3.5-flash",
"delivery": {
"hermes": [
"STEPFUN_API_KEY"
@@ -798,6 +899,7 @@
"scope": ""
}
],
+ "models": [],
"name": "StepFun",
"rank": 260,
"regions": [],
@@ -809,6 +911,7 @@
"mini-max"
],
"alsoWires": [],
+ "defaultModel": "MiniMax-M3",
"delivery": {
"hermes": [
"MINIMAX_API_KEY"
@@ -826,6 +929,7 @@
"scope": ""
}
],
+ "models": [],
"name": "MiniMax",
"rank": 270,
"regions": [],
@@ -839,6 +943,7 @@
"alibaba cloud"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"DASHSCOPE_API_KEY"
@@ -856,6 +961,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Qwen Cloud (Alibaba)",
"rank": 280,
"regions": [],
@@ -868,6 +974,7 @@
"muse"
],
"alsoWires": [],
+ "defaultModel": "muse-spark-1.2",
"delivery": {
"hermes": [
"MODEL_API_KEY"
@@ -885,6 +992,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Meta Model API",
"rank": 290,
"regions": [],
@@ -896,6 +1004,7 @@
"ramp"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"RAMP_ROUTER_API_KEY"
@@ -913,6 +1022,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Ramp Router",
"rank": 300,
"regions": [],
@@ -922,6 +1032,7 @@
{
"aliases": [],
"alsoWires": [],
+ "defaultModel": "deepseek/deepseek-v4-pro",
"delivery": {
"hermes": [
"COMMANDCODE_API_KEY"
@@ -939,6 +1050,7 @@
"scope": ""
}
],
+ "models": [],
"name": "CommandCode",
"rank": 310,
"regions": [],
@@ -950,6 +1062,7 @@
"aci"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"ACTUAL_API_KEY"
@@ -967,6 +1080,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Actual Computer",
"rank": 320,
"regions": [],
@@ -979,6 +1093,7 @@
"hunyuan"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"TOKENHUB_API_KEY"
@@ -996,6 +1111,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Tencent TokenHub",
"rank": 330,
"regions": [],
@@ -1008,6 +1124,7 @@
"hermes"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {},
"hermesId": "nous",
"hidden": true,
@@ -1015,6 +1132,7 @@
"id": "nous",
"kind": "aggregator",
"methods": [],
+ "models": [],
"name": "Nous Portal",
"rank": 340,
"regions": [],
@@ -1027,6 +1145,7 @@
"qwen code"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {},
"hermesId": "qwen-oauth",
"hidden": true,
@@ -1034,6 +1153,7 @@
"id": "qwen-oauth",
"kind": "hosted",
"methods": [],
+ "models": [],
"name": "Qwen CLI sign-in",
"rank": 350,
"regions": [],
@@ -1045,6 +1165,7 @@
"minimax coding plan"
],
"alsoWires": [],
+ "defaultModel": "MiniMax-M3",
"delivery": {},
"hermesId": "minimax-oauth",
"hidden": true,
@@ -1052,6 +1173,7 @@
"id": "minimax-oauth",
"kind": "hosted",
"methods": [],
+ "models": [],
"name": "MiniMax sign-in",
"rank": 360,
"regions": [],
@@ -1064,6 +1186,7 @@
"grok subscription"
],
"alsoWires": [],
+ "defaultModel": "grok-4.6",
"delivery": {},
"hermesId": "xai-oauth",
"hidden": true,
@@ -1071,6 +1194,7 @@
"id": "xai-oauth",
"kind": "hosted",
"methods": [],
+ "models": [],
"name": "SuperGrok sign-in",
"rank": 370,
"regions": [],
@@ -1083,6 +1207,7 @@
"google cloud"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {},
"hermesId": "vertex",
"hidden": true,
@@ -1096,6 +1221,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Google Vertex AI",
"rank": 380,
"regions": [],
@@ -1108,6 +1234,7 @@
"amazon"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {},
"hermesId": "bedrock",
"hidden": true,
@@ -1121,6 +1248,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Amazon Bedrock",
"rank": 390,
"regions": [],
@@ -1134,6 +1262,7 @@
"microsoft"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {},
"hermesId": "azure-foundry",
"hidden": true,
@@ -1147,6 +1276,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Azure AI Foundry",
"rank": 400,
"regions": [],
@@ -1166,6 +1296,7 @@
"proxy"
],
"alsoWires": [],
+ "defaultModel": "",
"delivery": {
"hermes": [
"CUSTOM_ENDPOINT_API_KEY"
@@ -1183,6 +1314,7 @@
"scope": ""
}
],
+ "models": [],
"name": "Custom endpoint",
"rank": 900,
"regions": [],
diff --git a/libs/cua/crates/cua-connections/providers/anthropic.toml b/libs/cua/crates/cua-connections/providers/anthropic.toml
index d77e61ce1e..ea86e0b0e9 100644
--- a/libs/cua/crates/cua-connections/providers/anthropic.toml
+++ b/libs/cua/crates/cua-connections/providers/anthropic.toml
@@ -38,6 +38,19 @@ kind = "api_key"
env = "ANTHROPIC_API_KEY"
aliases = ["ANTHROPIC_AUTH_TOKEN"]
+[[model]]
+id = "claude-haiku-4-5"
+name = "Claude Haiku 4.5"
+fast = true
+
+[[model]]
+id = "claude-sonnet-5"
+name = "Claude Sonnet 5"
+
+[[model]]
+id = "claude-opus-5-5"
+name = "Claude Opus 5.5"
+
[delivery]
claude-code = ["ANTHROPIC_API_KEY", "CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_AUTH_TOKEN"]
opencode = ["ANTHROPIC_API_KEY"]
diff --git a/libs/cua/crates/cua-connections/providers/deepseek.toml b/libs/cua/crates/cua-connections/providers/deepseek.toml
index 116a7d5562..c281dc3cfc 100644
--- a/libs/cua/crates/cua-connections/providers/deepseek.toml
+++ b/libs/cua/crates/cua-connections/providers/deepseek.toml
@@ -17,5 +17,10 @@ id = "key"
kind = "api_key"
env = "DEEPSEEK_API_KEY"
+[[model]]
+id = "deepseek-flash"
+name = "DeepSeek Flash"
+fast = true
+
[delivery]
hermes = ["DEEPSEEK_API_KEY"]
diff --git a/libs/cua/crates/cua-connections/providers/google.toml b/libs/cua/crates/cua-connections/providers/google.toml
index 618da079d3..12905ca492 100644
--- a/libs/cua/crates/cua-connections/providers/google.toml
+++ b/libs/cua/crates/cua-connections/providers/google.toml
@@ -19,6 +19,11 @@ kind = "api_key"
env = "GEMINI_API_KEY"
aliases = ["GOOGLE_API_KEY"]
+[[model]]
+id = "gemini-3.8-flash"
+name = "Gemini 3.8 Flash"
+fast = true
+
[delivery]
gemini-cli = ["GEMINI_API_KEY", "GOOGLE_API_KEY"]
google-antigravity = ["GEMINI_API_KEY"]
diff --git a/libs/cua/crates/cua-connections/providers/kimi.toml b/libs/cua/crates/cua-connections/providers/kimi.toml
index 1ee11624ca..f00b75a745 100644
--- a/libs/cua/crates/cua-connections/providers/kimi.toml
+++ b/libs/cua/crates/cua-connections/providers/kimi.toml
@@ -19,5 +19,9 @@ kind = "api_key"
env = "KIMI_API_KEY"
aliases = ["KIMI_CODING_API_KEY"]
+[[model]]
+id = "kimi-k3"
+name = "Kimi K3"
+
[delivery]
hermes = ["KIMI_API_KEY"]
diff --git a/libs/cua/crates/cua-connections/providers/openai.toml b/libs/cua/crates/cua-connections/providers/openai.toml
index 69fc57b5bb..dd155e6852 100644
--- a/libs/cua/crates/cua-connections/providers/openai.toml
+++ b/libs/cua/crates/cua-connections/providers/openai.toml
@@ -30,6 +30,10 @@ kind = "api_key"
env = "OPENAI_API_KEY"
aliases = ["CODEX_API_KEY"]
+[[model]]
+id = "gpt-5.5"
+name = "GPT-5.5"
+
[delivery]
openai-codex = ["OPENAI_API_KEY", "CODEX_API_KEY", "CODEX_AUTH_JSON"]
opencode = ["OPENAI_API_KEY"]
diff --git a/libs/cua/crates/cua-connections/providers/openrouter.toml b/libs/cua/crates/cua-connections/providers/openrouter.toml
index 05a9c7d687..9e7c2532da 100644
--- a/libs/cua/crates/cua-connections/providers/openrouter.toml
+++ b/libs/cua/crates/cua-connections/providers/openrouter.toml
@@ -17,6 +17,10 @@ id = "key"
kind = "api_key"
env = "OPENROUTER_API_KEY"
+[[model]]
+id = "anthropic/claude-sonnet-5"
+name = "Claude Sonnet 5"
+
[delivery]
opencode = ["OPENROUTER_API_KEY"]
goose = ["OPENROUTER_API_KEY"]
diff --git a/libs/cua/crates/cua-connections/providers/xai.toml b/libs/cua/crates/cua-connections/providers/xai.toml
index b164cc0139..df98c5188b 100644
--- a/libs/cua/crates/cua-connections/providers/xai.toml
+++ b/libs/cua/crates/cua-connections/providers/xai.toml
@@ -19,5 +19,9 @@ id = "key"
kind = "api_key"
env = "XAI_API_KEY"
+[[model]]
+id = "grok-4.6"
+name = "Grok 4.6"
+
[delivery]
hermes = ["XAI_API_KEY"]
diff --git a/libs/cua/crates/cua-connections/src/generate.rs b/libs/cua/crates/cua-connections/src/generate.rs
index 27c4184dd9..a80463af23 100644
--- a/libs/cua/crates/cua-connections/src/generate.rs
+++ b/libs/cua/crates/cua-connections/src/generate.rs
@@ -77,7 +77,7 @@ fn reads(all: &[ProviderDef], harness: &str) -> Vec<String> {
fn rust(all: &[ProviderDef]) -> String {
let mut o = String::from(RUST_HEADER);
- o.push_str("use crate::{Check, Delivery, Entry, Field, Kind, Method, MethodKind, Provider, Region, Tier};\n\n");
+ o.push_str("use crate::{Check, Delivery, Entry, Field, Kind, Method, MethodKind, Model, Provider, Region, Tier};\n\n");
o.push_str("/// Every provider, in rank order (hidden ones included).\n");
o.push_str("pub static PROVIDERS: &[Provider] = &[\n");
for p in all {
@@ -171,6 +171,15 @@ fn rust(all: &[ProviderDef]) -> String {
s(&r.base_url)
));
}
+ o.push_str(" ],\n models: &[\n");
+ for m in &p.model {
+ o.push_str(&format!(
+ " Model {{ id: {}, name: {}, fast: {} }},\n",
+ s(&m.id),
+ s(&m.name),
+ m.fast
+ ));
+ }
o.push_str(" ],\n delivery: &[\n");
for (h, entries) in &p.delivery {
o.push_str(&format!(
@@ -251,6 +260,10 @@ fn json(all: &[ProviderDef]) -> String {
"alsoWires": p.also_wires,
"hermesId": p.hermes_id,
"regions": p.region.iter().map(|r| r.id.clone()).collect::<Vec<_>>(),
+ "defaultModel": p.default_model,
+ "models": p.model.iter().map(|m| serde_json::json!({
+ "id": m.id, "name": m.name, "fast": m.fast,
+ })).collect::<Vec<_>>(),
"methods": p.method.iter().filter(|m| m.terms != "review").map(|m| serde_json::json!({
"id": m.id, "kind": m.kind, "scope": m.scope,
})).collect::<Vec<_>>(),
@@ -274,7 +287,7 @@ fn ts(all: &[ProviderDef]) -> String {
// Generated by `cargo run -p cua-connections --bin cua-connections-gen` from\n\
// libs/cua/crates/cua-connections/providers/*.toml. Do not edit.\n\n",
);
- o.push_str("export interface ProviderEntry {\n id: string;\n name: string;\n icon: string;\n tier: \"top\" | \"more\";\n aliases: string[];\n /** The variable a key for it is saved as. */\n keyEnv: string;\n}\n\n");
+ o.push_str("export interface ProviderEntry {\n id: string;\n name: string;\n icon: string;\n tier: \"top\" | \"more\";\n aliases: string[];\n /** The variable a key for it is saved as. */\n keyEnv: string;\n defaultModel: string;\n /** The models a person can pick (empty: only the default, when it has one). */\n models: { id: string; name: string; fast: boolean }[];\n}\n\n");
o.push_str("/** The providers a person can see, in rank order. */\nexport const PROVIDER_REGISTRY: ProviderEntry[] = [\n");
for p in all.iter().filter(|p| !p.hidden && !p.terms_review()) {
let icon = if p.icon.is_empty() { &p.id } else { &p.icon };
@@ -284,8 +297,21 @@ fn ts(all: &[ProviderDef]) -> String {
.find(|m| matches!(m.kind.as_str(), "api_key" | "custom_endpoint"))
.map(|m| m.env.as_str())
.unwrap_or_default();
+ let models = format!(
+ "[{}]",
+ p.model
+ .iter()
+ .map(|m| format!(
+ "{{ id: {}, name: {}, fast: {} }}",
+ s(&m.id),
+ s(&m.name),
+ m.fast
+ ))
+ .collect::<Vec<_>>()
+ .join(", ")
+ );
o.push_str(&format!(
- " {{ id: {}, name: {}, icon: {}, tier: {}, aliases: {}, keyEnv: {} }},\n",
+ " {{ id: {}, name: {}, icon: {}, tier: {}, aliases: {}, keyEnv: {}, defaultModel: {}, models: {} }},\n",
s(&p.id),
s(&p.name),
s(icon),
@@ -293,7 +319,9 @@ fn ts(all: &[ProviderDef]) -> String {
serde_json::to_string(&p.aliases)
.expect("json")
.replace(',', ", "),
- s(key_env)
+ s(key_env),
+ s(&p.default_model),
+ models
));
}
o.push_str("];\n\n/** The kinds of way to connect a provider (a closed set). */\nexport const METHOD_KINDS = [");
@@ -319,6 +347,15 @@ fn swift(all: &[ProviderDef]) -> String {
for p in all.iter().filter(|p| !p.hidden && !p.terms_review()) {
o.push_str(&format!(" {},\n", s(&p.id)));
}
+ o.push_str(" ]\n\n /// The model ids each visible provider lists, in the order the app core lists them.\n");
+ o.push_str(" public static let models: [String: [String]] = [\n");
+ for p in all.iter().filter(|p| !p.hidden && !p.terms_review()) {
+ if p.model.is_empty() {
+ continue;
+ }
+ let ids: Vec<String> = p.model.iter().map(|m| s(&m.id)).collect();
+ o.push_str(&format!(" {}: [{}],\n", s(&p.id), ids.join(", ")));
+ }
o.push_str(" ]\n\n public static let methodKinds: [String] = [\n");
for k in MethodKind::ALL {
o.push_str(&format!(" {},\n", s(k.word())));
diff --git a/libs/cua/crates/cua-connections/src/generated.rs b/libs/cua/crates/cua-connections/src/generated.rs
index a0fb75468e..5fdbd770de 100644
--- a/libs/cua/crates/cua-connections/src/generated.rs
+++ b/libs/cua/crates/cua-connections/src/generated.rs
@@ -2,7 +2,7 @@
// providers/*.toml. Do not edit: change a provider file and run the generator.
// `--check` (and tests/generated.rs) fail when this file is stale.
-use crate::{Check, Delivery, Entry, Field, Kind, Method, MethodKind, Provider, Region, Tier};
+use crate::{Check, Delivery, Entry, Field, Kind, Method, MethodKind, Model, Provider, Region, Tier};
/// Every provider, in rank order (hidden ones included).
pub static PROVIDERS: &[Provider] = &[
@@ -76,6 +76,11 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ Model { id: "claude-haiku-4-5", name: "Claude Haiku 4.5", fast: true },
+ Model { id: "claude-sonnet-5", name: "Claude Sonnet 5", fast: false },
+ Model { id: "claude-opus-5-5", name: "Claude Opus 5.5", fast: false },
+ ],
delivery: &[
Delivery { harness: "claude-code", entries: &[Entry { dest: "ANTHROPIC_API_KEY", src: "ANTHROPIC_API_KEY" }, Entry { dest: "CLAUDE_CODE_OAUTH_TOKEN", src: "CLAUDE_CODE_OAUTH_TOKEN" }, Entry { dest: "ANTHROPIC_AUTH_TOKEN", src: "ANTHROPIC_AUTH_TOKEN" }, ] },
Delivery { harness: "goose", entries: &[Entry { dest: "ANTHROPIC_API_KEY", src: "ANTHROPIC_API_KEY" }, ] },
@@ -140,6 +145,9 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ Model { id: "gpt-5.5", name: "GPT-5.5", fast: false },
+ ],
delivery: &[
Delivery { harness: "goose", entries: &[Entry { dest: "OPENAI_API_KEY", src: "OPENAI_API_KEY" }, ] },
Delivery { harness: "hermes", entries: &[Entry { dest: "OPENAI_API_KEY", src: "OPENAI_API_KEY" }, ] },
@@ -189,6 +197,9 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ Model { id: "anthropic/claude-sonnet-5", name: "Claude Sonnet 5", fast: false },
+ ],
delivery: &[
Delivery { harness: "goose", entries: &[Entry { dest: "OPENROUTER_API_KEY", src: "OPENROUTER_API_KEY" }, ] },
Delivery { harness: "hermes", entries: &[Entry { dest: "OPENROUTER_API_KEY", src: "OPENROUTER_API_KEY" }, ] },
@@ -237,6 +248,9 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ Model { id: "gemini-3.8-flash", name: "Gemini 3.8 Flash", fast: true },
+ ],
delivery: &[
Delivery { harness: "gemini-cli", entries: &[Entry { dest: "GEMINI_API_KEY", src: "GEMINI_API_KEY" }, Entry { dest: "GOOGLE_API_KEY", src: "GOOGLE_API_KEY" }, ] },
Delivery { harness: "google-antigravity", entries: &[Entry { dest: "GEMINI_API_KEY", src: "GEMINI_API_KEY" }, ] },
@@ -286,6 +300,9 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ Model { id: "grok-4.6", name: "Grok 4.6", fast: false },
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "XAI_API_KEY", src: "XAI_API_KEY" }, ] },
],
@@ -330,6 +347,9 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ Model { id: "deepseek-flash", name: "DeepSeek Flash", fast: true },
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "DEEPSEEK_API_KEY", src: "DEEPSEEK_API_KEY" }, ] },
],
@@ -374,6 +394,9 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ Model { id: "kimi-k3", name: "Kimi K3", fast: false },
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "KIMI_API_KEY", src: "KIMI_API_KEY" }, ] },
],
@@ -418,6 +441,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -461,6 +486,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "HF_TOKEN", src: "HF_TOKEN" }, ] },
],
@@ -509,6 +536,8 @@ pub static PROVIDERS: &[Provider] = &[
Region { id: "coding-global", name: "Global, Coding Plan", base_url: "https://api.z.ai/api/coding/paas/v4" },
Region { id: "coding-cn", name: "China, Coding Plan", base_url: "https://open.bigmodel.cn/api/coding/paas/v4" },
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "GLM_API_KEY", src: "GLM_API_KEY" }, ] },
],
@@ -553,6 +582,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "FIREWORKS_API_KEY", src: "FIREWORKS_API_KEY" }, ] },
],
@@ -597,6 +628,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "NVIDIA_API_KEY", src: "NVIDIA_API_KEY" }, ] },
],
@@ -641,6 +674,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "OLLAMA_API_KEY", src: "OLLAMA_API_KEY" }, ] },
],
@@ -685,6 +720,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "DEEPINFRA_API_KEY", src: "DEEPINFRA_API_KEY" }, ] },
],
@@ -729,6 +766,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "NOVITA_API_KEY", src: "NOVITA_API_KEY" }, ] },
],
@@ -773,6 +812,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "NEBIUS_API_KEY", src: "NEBIUS_API_KEY" }, ] },
],
@@ -817,6 +858,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "GMI_API_KEY", src: "GMI_API_KEY" }, ] },
],
@@ -861,6 +904,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "UPSTAGE_API_KEY", src: "UPSTAGE_API_KEY" }, ] },
],
@@ -905,6 +950,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "ARCEEAI_API_KEY", src: "ARCEEAI_API_KEY" }, ] },
],
@@ -949,6 +996,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "AI_GATEWAY_API_KEY", src: "AI_GATEWAY_API_KEY" }, ] },
],
@@ -993,6 +1042,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "OPENCODE_ZEN_API_KEY", src: "OPENCODE_ZEN_API_KEY" }, ] },
],
@@ -1037,6 +1088,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "OPENCODE_GO_API_KEY", src: "OPENCODE_GO_API_KEY" }, ] },
],
@@ -1081,6 +1134,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "KILOCODE_API_KEY", src: "KILOCODE_API_KEY" }, ] },
],
@@ -1125,6 +1180,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "XIAOMI_API_KEY", src: "XIAOMI_API_KEY" }, ] },
],
@@ -1169,6 +1226,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "STEPFUN_API_KEY", src: "STEPFUN_API_KEY" }, ] },
],
@@ -1213,6 +1272,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "MINIMAX_API_KEY", src: "MINIMAX_API_KEY" }, ] },
],
@@ -1257,6 +1318,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "DASHSCOPE_API_KEY", src: "DASHSCOPE_API_KEY" }, ] },
],
@@ -1301,6 +1364,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "MODEL_API_KEY", src: "MODEL_API_KEY" }, ] },
],
@@ -1345,6 +1410,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "RAMP_ROUTER_API_KEY", src: "RAMP_ROUTER_API_KEY" }, ] },
],
@@ -1389,6 +1456,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "COMMANDCODE_API_KEY", src: "COMMANDCODE_API_KEY" }, ] },
],
@@ -1433,6 +1502,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "ACTUAL_API_KEY", src: "ACTUAL_API_KEY" }, ] },
],
@@ -1477,6 +1548,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "TOKENHUB_API_KEY", src: "TOKENHUB_API_KEY" }, ] },
],
@@ -1521,6 +1594,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -1564,6 +1639,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -1607,6 +1684,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -1650,6 +1729,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -1693,6 +1774,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -1736,6 +1819,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -1779,6 +1864,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
],
},
@@ -1825,6 +1912,8 @@ pub static PROVIDERS: &[Provider] = &[
],
regions: &[
],
+ models: &[
+ ],
delivery: &[
Delivery { harness: "hermes", entries: &[Entry { dest: "CUSTOM_ENDPOINT_API_KEY", src: "CUSTOM_ENDPOINT_API_KEY" }, ] },
],
diff --git a/libs/cua/crates/cua-connections/src/lib.rs b/libs/cua/crates/cua-connections/src/lib.rs
index 4500ea330f..f1246523fc 100644
--- a/libs/cua/crates/cua-connections/src/lib.rs
+++ b/libs/cua/crates/cua-connections/src/lib.rs
@@ -196,6 +196,15 @@ pub struct Method {
pub fields: &'static [Field],
}
+/// One model a provider serves.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct Model {
+ pub id: &'static str,
+ pub name: &'static str,
+ /// A quick, cheap model (the picker's default is the first of these).
+ pub fast: bool,
+}
+
/// A region (or plan) with its own base URL.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct Region {
@@ -250,6 +259,9 @@ pub struct Provider {
pub apps: &'static [&'static str],
pub methods: &'static [Method],
pub regions: &'static [Region],
+ /// The models a person can pick, best known first (may be empty: then
+ /// `default_model` is the only one).
+ pub models: &'static [Model],
pub delivery: &'static [Delivery],
}
@@ -289,6 +301,21 @@ impl Provider {
.unwrap_or(&[])
}
+ /// The models a person can pick: the listed ones, or the default alone.
+ pub fn model_list(&self) -> Vec<Model> {
+ if !self.models.is_empty() {
+ return self.models.to_vec();
+ }
+ if self.default_model.is_empty() {
+ return vec![];
+ }
+ vec![Model {
+ id: self.default_model,
+ name: self.default_model,
+ fast: false,
+ }]
+ }
+
/// The base URL for `region` (the provider's own when empty or unknown).
pub fn base_url_for(&self, region: Option<&str>) -> &'static str {
region
diff --git a/libs/cua/crates/cua-connections/src/schema.rs b/libs/cua/crates/cua-connections/src/schema.rs
index 5cbd46c39a..365d27f3b0 100644
--- a/libs/cua/crates/cua-connections/src/schema.rs
+++ b/libs/cua/crates/cua-connections/src/schema.rs
@@ -63,6 +63,19 @@ pub struct MethodDef {
pub field: Vec<FieldDef>,
}
+/// One model a provider serves, as a person picks it.
+#[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ModelDef {
+ /// The id the provider's API takes.
+ pub id: String,
+ /// The name a person reads.
+ pub name: String,
+ /// A quick, cheap model: the default of a new prompt picks the first one.
+ #[serde(default)]
+ pub fast: bool,
+}
+
#[derive(Debug, Clone, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct RegionDef {
@@ -111,6 +124,10 @@ pub struct ProviderDef {
pub method: Vec<MethodDef>,
#[serde(default)]
pub region: Vec<RegionDef>,
+ /// The models a person can pick, best known first. Empty: the provider
+ /// has no list here and `default_model` (if any) stands alone.
+ #[serde(default)]
+ pub model: Vec<ModelDef>,
/// Harness id to the names it receives: `NAME`, or `DEST<-SRC`.
#[serde(default)]
pub delivery: BTreeMap<String, Vec<String>>,
@@ -306,6 +323,24 @@ pub fn check(all: &[ProviderDef]) -> Result<(), String> {
return Err(at(&format!("duplicate region {}", r.id)));
}
}
+ let mut model_ids = BTreeSet::new();
+ for m in &p.model {
+ if m.id.trim().is_empty() || m.id.len() > 128 || m.id.chars().any(char::is_whitespace) {
+ return Err(at(&format!("model {:?}: an id has no spaces", m.id)));
+ }
+ if !model_ids.insert(m.id.clone()) {
+ return Err(at(&format!("duplicate model {}", m.id)));
+ }
+ if m.name.trim().is_empty() || m.name.contains('\u{b7}') {
+ return Err(at(&format!("model {}: a name, without a middle dot", m.id)));
+ }
+ }
+ if !p.model.is_empty()
+ && !p.default_model.is_empty()
+ && !model_ids.contains(&p.default_model)
+ {
+ return Err(at("default_model is one of the listed models"));
+ }
if let Some(c) = &p.check {
if !matches!(c.auth.as_str(), "bearer" | "x-api-key" | "x-goog-api-key") {
return Err(at("check.auth is bearer, x-api-key or x-goog-api-key"));
diff --git a/libs/cua/crates/cua-connections/tests/registry.rs b/libs/cua/crates/cua-connections/tests/registry.rs
index 67f98d9c04..e832e4ae30 100644
--- a/libs/cua/crates/cua-connections/tests/registry.rs
+++ b/libs/cua/crates/cua-connections/tests/registry.rs
@@ -556,3 +556,43 @@ fn goose_reads_the_google_key_from_either_saved_name() {
// OpenCode and Pi read GEMINI_API_KEY only.
assert!(deliver("opencode", &saved(&[("GOOGLE_API_KEY", "goog")])).is_empty());
}
+
+#[test]
+fn every_top_provider_with_a_default_model_lists_it_and_the_first_fast_one_is_marked() {
+ for p in visible().filter(|p| p.tier == Tier::Top && !p.default_model.is_empty()) {
+ assert!(
+ p.models.iter().any(|m| m.id == p.default_model),
+ "{}: the default model is in its list",
+ p.id
+ );
+ }
+ // The picker's default for a new prompt is the first fast model.
+ let anthropic = provider("anthropic").unwrap();
+ assert_eq!(
+ anthropic.models.iter().find(|m| m.fast).map(|m| m.id),
+ Some("claude-haiku-4-5")
+ );
+}
+
+#[test]
+fn a_provider_without_a_list_offers_its_default_model_alone() {
+ let zai = provider("zai").unwrap();
+ assert!(zai.models.is_empty());
+ let list = zai.model_list();
+ assert_eq!(list.len(), 1);
+ assert_eq!(list[0].id, zai.default_model);
+ // A provider with neither lists nothing.
+ assert!(provider("github").unwrap().model_list().is_empty());
+}
+
+#[test]
+fn model_ids_are_unique_and_names_are_plain_words() {
+ for p in PROVIDERS {
+ let mut seen = std::collections::BTreeSet::new();
+ for m in p.models {
+ assert!(seen.insert(m.id), "{}: {} twice", p.id, m.id);
+ assert!(!m.name.contains('\u{b7}'), "{}: no middle dot", m.id);
+ assert!(!m.name.trim().is_empty());
+ }
+ }
+}
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/connectors.json b/libs/cua/crates/cua-spaces-app-core/parity/connectors.json
index f7cbc33cc9..eb4eac24df 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/connectors.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/connectors.json
@@ -72,6 +72,21 @@
{ "forApp": "claude-code", "query": "", "expanded": false },
{ "forApp": null, "query": "kimi", "expanded": false }
],
+ "models": [
+ { "step": "nothing connected", "input": { "keys": { "keys": [] } } },
+ { "step": "an Anthropic key, an OpenAI key and a DeepSeek key", "input": { "keys": { "keys": [
+ { "provider": "anthropic", "env": "ANTHROPIC_API_KEY", "last4": "aa11", "addedMs": 1790000100000 },
+ { "provider": "openai", "env": "OPENAI_API_KEY", "last4": "bb22", "addedMs": 1790000200000 },
+ { "provider": "deepseek", "env": "DEEPSEEK_API_KEY", "last4": "cc33", "addedMs": 1790000300000 } ] } } },
+ { "step": "only a Claude sign-in and a ChatGPT sign-in (each is its own app's)", "input": { "keys": { "keys": [
+ { "provider": "anthropic", "env": "CLAUDE_CODE_OAUTH_TOKEN", "last4": "", "addedMs": 1790000100000 },
+ { "provider": "openai", "env": "CODEX_AUTH_JSON", "last4": "", "addedMs": 1790000200000 } ] } } },
+ { "step": "a Claude sign-in that ran out and an OpenAI key", "input": { "keys": { "keys": [
+ { "provider": "anthropic", "env": "CLAUDE_CODE_OAUTH_TOKEN", "last4": "", "addedMs": 1790000100000, "expired": true },
+ { "provider": "openai", "env": "OPENAI_API_KEY", "last4": "bb22", "addedMs": 1790000200000 } ] } } },
+ { "step": "a provider with no list falls back to its default", "input": { "keys": { "keys": [
+ { "provider": "zai", "env": "GLM_API_KEY", "last4": "7d1f", "addedMs": 1790000300000, "region": "coding-global" } ] } } }
+ ],
"plans": ["claude-code", "codex", "hermes", "vscode", "copilot-cli"],
"details": ["claude-code", "vscode"],
"summon": {
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/connectors.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/connectors.json
index c9914fd8e9..090d719274 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/connectors.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/connectors.json
@@ -307,6 +307,48 @@
},
"title": "Connect a provider"
},
+ {
+ "connect": "Connect a provider | Connect a provider to pick a model.",
+ "default": "- | -",
+ "groups": [],
+ "models": "nothing connected"
+ },
+ {
+ "connect": "Connect a provider | -",
+ "default": "anthropic | claude-haiku-4-5",
+ "groups": [
+ "anthropic | Anthropic | connected | - :: claude-haiku-4-5 | Claude Haiku 4.5 | true | false / claude-sonnet-5 | Claude Sonnet 5 | false | true / claude-opus-5-5 | Claude Opus 5.5 | false | false",
+ "openai | OpenAI | connected | - :: gpt-5.5 | GPT-5.5 | false | true",
+ "deepseek | DeepSeek | connected | - :: deepseek-flash | DeepSeek Flash | true | true"
+ ],
+ "models": "an Anthropic key, an OpenAI key and a DeepSeek key"
+ },
+ {
+ "connect": "Connect a provider | -",
+ "default": "anthropic | claude-haiku-4-5",
+ "groups": [
+ "anthropic | Anthropic | connected | claude-code :: claude-haiku-4-5 | Claude Haiku 4.5 | true | false / claude-sonnet-5 | Claude Sonnet 5 | false | true / claude-opus-5-5 | Claude Opus 5.5 | false | false",
+ "openai | OpenAI | connected | openai-codex :: gpt-5.5 | GPT-5.5 | false | true"
+ ],
+ "models": "only a Claude sign-in and a ChatGPT sign-in (each is its own app's)"
+ },
+ {
+ "connect": "Connect a provider | -",
+ "default": "openai | gpt-5.5",
+ "groups": [
+ "openai | OpenAI | connected | - :: gpt-5.5 | GPT-5.5 | false | true",
+ "anthropic | Anthropic | needs-reconnect | - :: claude-haiku-4-5 | Claude Haiku 4.5 | true | false / claude-sonnet-5 | Claude Sonnet 5 | false | true / claude-opus-5-5 | Claude Opus 5.5 | false | false"
+ ],
+ "models": "a Claude sign-in that ran out and an OpenAI key"
+ },
+ {
+ "connect": "Connect a provider | -",
+ "default": "zai | glm-5.3",
+ "groups": [
+ "zai | Z.AI (GLM) | connected | - :: glm-5.3 | glm-5.3 | false | true"
+ ],
+ "models": "a provider with no list falls back to its default"
+ },
{
"buttons": "Use my sign-in | Cancel | Reading your Claude Code sign-in…",
"importSheet": "macos",
diff --git a/libs/cua/crates/cua-spaces-app-core/src/connectors.rs b/libs/cua/crates/cua-spaces-app-core/src/connectors.rs
index 5a735f3b6b..dda0f54f9a 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/connectors.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/connectors.rs
@@ -1535,6 +1535,146 @@ pub fn provider_picker(
}
}
+/// One model row of the prompt box's model menu.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelChoice {
+ /// The id the provider's API takes.
+ pub id: String,
+ pub label: String,
+ /// A quick, cheap model (the menu tags it "Fast").
+ pub fast: bool,
+ /// The provider's own default.
+ pub default: bool,
+}
+
+/// The models of one provider the person has connected (or must reconnect).
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelGroup {
+ pub provider: String,
+ pub label: String,
+ pub icon: String,
+ /// `connected` or `needs-reconnect` (a sign-in that has expired).
+ pub state: String,
+ /// The coding app that must run these models when only its own sign-in is
+ /// saved (a Claude or ChatGPT sign-in is Claude Code's or Codex's);
+ /// `None`: the general agent with an API key.
+ pub harness: Option<String>,
+ pub models: Vec<ModelChoice>,
+}
+
+/// A model picked by provider and id.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelRef {
+ pub provider: String,
+ pub model: String,
+}
+
+/// What the model menu of the prompt box reads (`connectors.models`).
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelsView {
+ /// Connected providers first (in the registry's order), then those that
+ /// need a reconnect.
+ pub groups: Vec<ModelGroup>,
+ /// What a new prompt starts with: the first fast model of the first
+ /// connected provider that has one, else that provider's default.
+ pub default: Option<ModelRef>,
+ /// The line under the list that opens Connections.
+ pub connect_label: String,
+ /// Said when nothing is connected.
+ pub empty: Option<String>,
+}
+
+/// The harness a credential of `p` may only be used by: the coding app that
+/// owns a saved sign-in, when no key that anything can use is saved.
+fn model_harness(input: &ConnectorsInput, p: &reg::Provider) -> Option<String> {
+ let live: Vec<&'static str> = provider_envs(p)
+ .into_iter()
+ .filter(|e| input.key(e).is_some_and(|k| !k.expired))
+ .collect();
+ if live.iter().any(|e| p.scope_of(e).is_none()) {
+ return None;
+ }
+ live.iter()
+ .find_map(|e| p.scope_of(e))
+ .map(|scope| scope.to_string())
+}
+
+/// The models a person can pick, from the providers they have connected.
+pub fn models_view(input: &ConnectorsInput) -> ModelsView {
+ let mut groups: Vec<ModelGroup> = vec![];
+ let mut reconnect: Vec<ModelGroup> = vec![];
+ for p in reg::visible() {
+ let models: Vec<ModelChoice> = p
+ .model_list()
+ .iter()
+ .map(|m| ModelChoice {
+ id: m.id.into(),
+ label: m.name.into(),
+ fast: m.fast,
+ default: m.id == p.default_model,
+ })
+ .collect();
+ if models.is_empty() {
+ continue;
+ }
+ let connected = provider_credential(input, p).is_some();
+ if !connected && !provider_expired(input, p) {
+ continue;
+ }
+ let g = ModelGroup {
+ provider: p.id.into(),
+ label: p.name.into(),
+ icon: p.icon.into(),
+ state: if connected {
+ "connected"
+ } else {
+ "needs-reconnect"
+ }
+ .into(),
+ harness: if connected {
+ model_harness(input, p)
+ } else {
+ None
+ },
+ models,
+ };
+ if connected {
+ groups.push(g);
+ } else {
+ reconnect.push(g);
+ }
+ }
+ let default = groups
+ .iter()
+ .find_map(|g| g.models.iter().find(|m| m.fast).map(|m| (g, m)));
+ let default = default
+ .or_else(|| {
+ groups.first().and_then(|g| {
+ g.models
+ .iter()
+ .find(|m| m.default)
+ .or_else(|| g.models.first())
+ .map(|m| (g, m))
+ })
+ })
+ .map(|(g, m)| ModelRef {
+ provider: g.provider.clone(),
+ model: m.id.clone(),
+ });
+ let none_connected = groups.is_empty();
+ groups.extend(reconnect);
+ ModelsView {
+ groups,
+ default,
+ connect_label: "Connect a provider".into(),
+ empty: none_connected.then(|| "Connect a provider to pick a model.".to_string()),
+ }
+}
+
/// What importing Claude Code's sign-in says before it reads anything, and
/// what it offers when there is nothing to import.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
diff --git a/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs b/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs
index 5f13c71bbf..3bff07bd4f 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs
@@ -200,6 +200,7 @@ pub const METHODS: &[&str] = &[
"connectors.connectPlan",
"connectors.providerSheet",
"connectors.providerPicker",
+ "connectors.models",
"connectors.importSheet",
"connectors.appDetail",
"connectors.setupCard",
@@ -1014,6 +1015,7 @@ pub fn call_value(method: &str, args: Value) -> Result<Value, CoreError> {
&a.get::<Option<String>>("query")?.unwrap_or_default(),
a.get::<Option<bool>>("expanded")?.unwrap_or(false),
)),
+ "connectors.models" => out(connectors::models_view(&a.get("input")?)),
"connectors.importSheet" => out(connectors::import_sheet_on(
a.get::<Option<SpaceOs>>("hostOs")?
.unwrap_or(SpaceOs::Macos),
diff --git a/libs/cua/crates/cua-spaces-app-core/src/parity.rs b/libs/cua/crates/cua-spaces-app-core/src/parity.rs
index 1f28967f52..8a93a1db16 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/parity.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/parity.rs
@@ -5161,6 +5161,33 @@ fn run_connectors(f: &Value, h: &dyn Host) -> Result<Value, String> {
"more": line(&[&v["moreLabel"], &v["moreCount"], &v["empty"]]),
}));
}
+ for step in f["models"].as_array().into_iter().flatten() {
+ let v = c(h, "connectors.models", json!({ "input": step["input"] }))?;
+ let groups: Vec<String> = v["groups"]
+ .as_array()
+ .into_iter()
+ .flatten()
+ .map(|g| {
+ let models: Vec<String> = g["models"]
+ .as_array()
+ .into_iter()
+ .flatten()
+ .map(|m| line(&[&m["id"], &m["label"], &m["fast"], &m["default"]]))
+ .collect();
+ format!(
+ "{} :: {}",
+ line(&[&g["provider"], &g["label"], &g["state"], &g["harness"]]),
+ models.join(" / ")
+ )
+ })
+ .collect();
+ frames.push(json!({
+ "models": step["step"],
+ "groups": groups,
+ "default": line(&[&v["default"]["provider"], &v["default"]["model"]]),
+ "connect": line(&[&v["connectLabel"], &v["empty"]]),
+ }));
+ }
for os in ["macos", "linux"] {
let s = c(h, "connectors.importSheet", json!({ "hostOs": os }))?;
let options: Vec<String> = s["options"]