From 174e0f1c2b46b0577972f96c819d522a695b9124 Mon Sep 17 00:00:00 2001 From: Anton Arnaudov Date: Sat, 7 Nov 2026 18:50:58 +0200 Subject: [PATCH] feat(ai): every provider starts on its own default model, and you can change it One table of each provider's default models (engine/ai/providerDefaults) now seeds both products. The desktop's catalog reads its presets from it, and OpenAI connections are back on OpenAI's current defaults (gpt-6-luna, gpt-6.1-terra, gpt-6.1-sol). A connection still on gpt-4o moves to them when OpenAI retires gpt-4o, as it did in 2.9.0. Azure starts on the same models instead of gpt-4o. In the extension, an empty model setting now means the defaults of the provider the base URL points at. Until now the settings defaulted to gpt-4o for every endpoint, so Groq, OpenRouter and local servers were all sent OpenAI's model. If any tier holds a model of your own, it is used and no default is mixed in. Each card in the AI panel starts on its provider's default and lists the models you can switch to. For Ollama and LM Studio, the default becomes a model the server actually has. This replaces the unreleased "you choose the OpenAI model" change, including its one-time migration that pinned 1.24 users to gpt-4o. Co-Authored-By: Claude Opus 5.5 --- apps/desktop/CHANGELOG.md | 11 +- apps/desktop/src/renderer/aiSettings.ts | 11 +- apps/desktop/test/aiBridge.settings.test.ts | 18 +- apps/extension/CHANGELOG.md | 17 +- apps/extension/package.nls.cs.json | 2 +- apps/extension/package.nls.de.json | 2 +- apps/extension/package.nls.es.json | 2 +- apps/extension/package.nls.fr.json | 2 +- apps/extension/package.nls.it.json | 2 +- apps/extension/package.nls.ja.json | 2 +- apps/extension/package.nls.json | 2 +- apps/extension/package.nls.ko.json | 2 +- apps/extension/package.nls.pl.json | 2 +- apps/extension/package.nls.pt-br.json | 2 +- apps/extension/package.nls.ru.json | 2 +- apps/extension/package.nls.tr.json | 2 +- apps/extension/package.nls.zh-cn.json | 2 +- apps/extension/package.nls.zh-tw.json | 2 +- apps/extension/src/ai/aiCommands.ts | 6 +- apps/extension/src/ai/aiFeatures.ts | 58 +---- apps/extension/src/ai/aiSettingsPanel.ts | 46 ++-- apps/extension/src/ai/openAiProvider.ts | 17 ++ apps/extension/src/extension.ts | 7 +- apps/extension/test/aiChooseModel.test.ts | 195 ----------------- .../extension/test/aiProviderDefaults.test.ts | 201 ++++++++++++++++++ apps/extension/test/settingsLayout.test.ts | 2 +- packages/ai/src/catalog.ts | 45 ++-- packages/ai/test/connections.test.ts | 4 +- packages/ai/test/retiredDefaults.test.ts | 19 +- packages/engine/src/ai/providerDefaults.ts | 94 ++++++++ 30 files changed, 421 insertions(+), 358 deletions(-) delete mode 100644 apps/extension/test/aiChooseModel.test.ts create mode 100644 apps/extension/test/aiProviderDefaults.test.ts create mode 100644 packages/engine/src/ai/providerDefaults.ts diff --git a/apps/desktop/CHANGELOG.md b/apps/desktop/CHANGELOG.md index a55271af..f8f3a7fe 100644 --- a/apps/desktop/CHANGELOG.md +++ b/apps/desktop/CHANGELOG.md @@ -19,12 +19,11 @@ but they share the same engine, so most Git behaviour lands in both at once. command to run instead. ### Changed -- **You choose the OpenAI model.** A new OpenAI or Azure OpenAI connection no - longer comes with models filled in; each model field lists what the - provider offers for it, and the connection is ready once you pick. A - connection keeps the model it is on — none is swapped for you when OpenAI - retires one. Adding a Custom connection no longer says "Ready to use" before - it has a model. +- **Change a connection's models from the provider's list.** Each model + field lists what the provider offers for that connection; a new connection + still starts on its provider's defaults. Azure OpenAI now starts on + OpenAI's current models instead of gpt-4o. Adding a Custom connection no + longer says "Ready to use" before it has a model. ## [2.9.0] - 2026-11-07 diff --git a/apps/desktop/src/renderer/aiSettings.ts b/apps/desktop/src/renderer/aiSettings.ts index 2c3d0dd7..907413e0 100644 --- a/apps/desktop/src/renderer/aiSettings.ts +++ b/apps/desktop/src/renderer/aiSettings.ts @@ -206,9 +206,9 @@ function buildEditor(editor: HTMLElement, c: AiConnectionView, refresh: () => Pr // CLI connections have no base URL or API key — they use the local binary's own // login. They just take optional model overrides (mapped to `--model`). const urlF = settingsField(l10n.t("API base URL"), c.baseUrl, "https://api.example.com/v1"); - // An HTTP connection's models are CHOSEN, never seeded for you where the - // preset has none (OpenAI, Azure, Custom): each field offers what the - // provider lists for this connection (ai:models — live, then known ids). + // An HTTP connection starts on its provider's own defaults (Custom has + // none), and they are yours to change: each field offers what the provider + // lists for this connection (ai:models — live, then known ids). const choosePlaceholder = l10n.t("Choose from the list, or type a model ID"); const fastF = settingsField( isCli ? l10n.t("Quick model (optional)") : l10n.t("Fast model"), @@ -391,9 +391,8 @@ async function openGallery(body: HTMLElement, refresh: () => Promise): Pro // one did not, and it is the only way to connect the providers that need no // key at all. Their users could never lift the Assistant's gate. announceAiChanged(); - // What is left to do. A preset that seeds no model (OpenAI, Azure, - // Custom) needs one chosen — "Ready to use" was said of Custom, which - // was not. + // What is left to do. A preset that seeds no model (Custom) needs one + // chosen — "Ready to use" was said of Custom, which was not. const needsModel = p.wire !== "cli" && !p.models.fast && !p.models.mid && !p.models.deep; const todo = p.needsKey ? needsModel diff --git a/apps/desktop/test/aiBridge.settings.test.ts b/apps/desktop/test/aiBridge.settings.test.ts index 4616c05b..f19edab3 100644 --- a/apps/desktop/test/aiBridge.settings.test.ts +++ b/apps/desktop/test/aiBridge.settings.test.ts @@ -117,19 +117,9 @@ test("removing the default connection promotes the next one and deletes its key" assert.equal(v.defaultId, undefined, "nothing left to default to"); }); -/** - * An OpenAI connection with its models picked. The preset seeds none — you - * choose the model — so a test that sends a request picks them first. - */ -async function openAiPicked(bridge: Awaited>["bridge"]): Promise { - const id = (await bridge.addConnection("openai")).connections[0].id; - await bridge.updateConnection({ id, models: { fast: "gpt-6-luna", mid: "gpt-6.1-terra", deep: "gpt-6.1-sol" } }); - return id; -} - test("a key makes a keyed connection usable, and is never shown or written in plain text", async () => { const { bridge } = await makeBridge(); - const id = await openAiPicked(bridge); + const id = (await bridge.addConnection("openai")).connections[0].id; const v = await bridge.setKey(id, " sk-live-1234567890 "); assert.equal(v.connections[0].hasKey, true); assert.equal(v.connections[0].usable, true); @@ -151,7 +141,7 @@ test("a key makes a keyed connection usable, and is never shown or written in pl test("Test: the provider's answer about the connection is a condition; a request it could not read still reports (#28, #29)", async () => { const { bridge } = await makeBridge(); - const id = await openAiPicked(bridge); + const id = (await bridge.addConnection("openai")).connections[0].id; await bridge.setKey(id, "sk-wrong"); // A refused key, a rate limit: the Test button's whole answer. for (const status of [401, 429]) { @@ -426,7 +416,7 @@ test("Test: a reasoning model that spent the whole cap thinking still answered test("Test explains a rejected key in the provider's words", async () => { const { bridge } = await makeBridge(); - const id = await openAiPicked(bridge); + const id = (await bridge.addConnection("openai")).connections[0].id; await bridge.setKey(id, "sk-bad"); model.replies.push(new Response("{}", { status: 401 })); const r = await bridge.test(id); @@ -448,7 +438,7 @@ test("with no connection the model picker is empty", async () => { test("the model picker offers configured models, then live ones, then known ones — once each", async () => { const { bridge } = await makeBridge(); - const id = await openAiPicked(bridge); + const id = (await bridge.addConnection("openai")).connections[0].id; await bridge.setKey(id, "sk-k"); model.models = new Response(JSON.stringify({ data: [{ id: "gpt-6-luna" }, { id: "gpt-live-1" }, { name: "named-model" }, {}] })); const ids = (await bridge.listModels(id)).map((m) => m.id); diff --git a/apps/extension/CHANGELOG.md b/apps/extension/CHANGELOG.md index dc4cf5af..d7de9871 100644 --- a/apps/extension/CHANGELOG.md +++ b/apps/extension/CHANGELOG.md @@ -7,13 +7,16 @@ All notable changes to **GitStudio** are documented here. This project adheres t ## [Unreleased] ### Changed -- **You choose the OpenAI model.** The OpenAI model settings no longer - default to gpt-4o-mini / gpt-4o, and the AI panel's OpenAI card no longer - comes filled in with gpt-4o: the model field lists what your key can use, - and Connect asks for one until you pick it. A detected list is offered, - never picked from (it took the first, alphabetically, for some keys). A - setup already running on the old defaults keeps them as its own settings, - so nothing switches off on update. +- **Every provider starts on its own default model, and you can change it.** + The model settings used to default to OpenAI's gpt-4o-mini / gpt-4o for + every endpoint, so Groq, OpenRouter or a local server was sent OpenAI's + model. Left empty, they now mean the defaults of the provider your base URL + points at — the same ones the desktop app uses (OpenAI's are now + gpt-6-luna / gpt-6.1-terra / gpt-6.1-sol). Each card in the AI panel + starts on its provider's default and lists the models you can switch to. A + detected list no longer replaces a cloud default (it took the first, + alphabetically — "babbage-002" for an OpenAI key); for Ollama or LM Studio + the default becomes a model the server actually has. ### Fixed - **OpenAI's reasoning models work.** The o-series and gpt-5 and later diff --git a/apps/extension/package.nls.cs.json b/apps/extension/package.nls.cs.json index 581dd4eb..14b5b7e2 100644 --- a/apps/extension/package.nls.cs.json +++ b/apps/extension/package.nls.cs.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Rozkazovací předmět plus krátké vysvětlující tělo.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "Základní URL pro koncový bod kompatibilní s OpenAI (přidá se `/chat/completions`). Příklady: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "ID modelu kompatibilního s OpenAI pro volitelné hluboké uvažování.", - "config.gitstudio.ai.openai.modelFast.description": "ID modelu kompatibilního s OpenAI pro rychlé/levné úlohy (zprávy commitů). U místního serveru použijte jeho název modelu, např. llama3.1 nebo qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "ID modelu kompatibilního s OpenAI pro rychlé/levné úlohy (zprávy commitů). Když necháte všechna tři nastavení modelu prázdná, použijí se výchozí modely vašeho poskytovatele. U místního serveru použijte jeho název modelu, např. llama3.1 nebo qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "ID modelu kompatibilního s OpenAI pro úlohy střední úrovně (vysvětlení diffu, shrnutí).", "config.gitstudio.ai.provider.enumDescriptions.0": "Preferovat jazykový model VS Code bez klíče (GitHub Copilot / Cursor), pokud je dostupný; jinak Anthropic (pokud je nastaven klíč), potom koncový bod kompatibilní s OpenAI (pokud je nakonfigurován model).", "config.gitstudio.ai.provider.enumDescriptions.1": "Použít API jazykového modelu VS Code — modely GitHub Copilot nebo Cursor, bez klíče. Konkrétní model vyberte přes „GitStudio: Select AI Model…“.", diff --git a/apps/extension/package.nls.de.json b/apps/extension/package.nls.de.json index cefd824e..9fb94868 100644 --- a/apps/extension/package.nls.de.json +++ b/apps/extension/package.nls.de.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Imperativer Betreff plus ein kurzer erklärender Body.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "Basis-URL für den OpenAI-kompatiblen Endpunkt (`/chat/completions` wird angehängt). Beispiele: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "OpenAI-kompatible Modell-ID für optionales tiefes Reasoning.", - "config.gitstudio.ai.openai.modelFast.description": "OpenAI-kompatible Modell-ID für schnelle/günstige Aufgaben (Commit-Nachrichten). Für einen lokalen Server den Modellnamen verwenden, z. B. llama3.1 oder qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "OpenAI-kompatible Modell-ID für schnelle/günstige Aufgaben (Commit-Nachrichten). Alle drei Modell-Einstellungen leer lassen, um die Standardmodelle deines Anbieters zu verwenden. Für einen lokalen Server den Modellnamen verwenden, z. B. llama3.1 oder qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "OpenAI-kompatible Modell-ID für mittelstufige Aufgaben (Diff erklären, Zusammenfassungen).", "config.gitstudio.ai.provider.enumDescriptions.0": "Bevorzugt das schlüssellose VS Code Language Model (GitHub Copilot / Cursor), falls verfügbar; andernfalls Anthropic (falls ein Schlüssel gesetzt ist), danach ein OpenAI-kompatibler Endpunkt (falls ein Modell konfiguriert ist).", "config.gitstudio.ai.provider.enumDescriptions.1": "Die VS Code Language Model API verwenden — die Modelle von GitHub Copilot oder Cursor, ohne Schlüssel. Ein bestimmtes Modell über „GitStudio: KI-Modell auswählen…“ wählen.", diff --git a/apps/extension/package.nls.es.json b/apps/extension/package.nls.es.json index 6d8fc728..d4b4fd1a 100644 --- a/apps/extension/package.nls.es.json +++ b/apps/extension/package.nls.es.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Asunto en modo imperativo más un breve cuerpo explicativo.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "URL base para el endpoint compatible con OpenAI (se añade `/chat/completions`). Ejemplos: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "ID del modelo compatible con OpenAI para razonamiento profundo opcional.", - "config.gitstudio.ai.openai.modelFast.description": "ID del modelo compatible con OpenAI para tareas rápidas/económicas (mensajes de commit). Para un servidor local usa su nombre de modelo, p. ej. llama3.1 o qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "ID del modelo compatible con OpenAI para tareas rápidas/económicas (mensajes de commit). Deja vacíos los tres ajustes de modelo para usar los modelos predeterminados de tu proveedor. Para un servidor local usa su nombre de modelo, p. ej. llama3.1 o qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "ID del modelo compatible con OpenAI para tareas de nivel medio (explicar diff, resúmenes).", "config.gitstudio.ai.provider.enumDescriptions.0": "Prefiere el Modelo de lenguaje de VS Code sin clave (GitHub Copilot / Cursor) cuando esté disponible; si no, Anthropic (si hay una clave configurada), y luego un endpoint compatible con OpenAI (si hay un modelo configurado).", "config.gitstudio.ai.provider.enumDescriptions.1": "Usa la API del Modelo de lenguaje de VS Code — los modelos de GitHub Copilot o Cursor, sin clave. Elige un modelo específico con “GitStudio: Select AI Model…”.", diff --git a/apps/extension/package.nls.fr.json b/apps/extension/package.nls.fr.json index 1db7d7fb..c4107578 100644 --- a/apps/extension/package.nls.fr.json +++ b/apps/extension/package.nls.fr.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Sujet à l'impératif suivi d'un court corps explicatif.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "URL de base pour le point de terminaison compatible OpenAI (`/chat/completions` est ajouté). Exemples : `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "ID du modèle compatible OpenAI pour le raisonnement approfondi optionnel.", - "config.gitstudio.ai.openai.modelFast.description": "ID du modèle compatible OpenAI pour les tâches rapides et peu coûteuses (messages de commit). Pour un serveur local, utilisez son nom de modèle, par ex. llama3.1 ou qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "ID du modèle compatible OpenAI pour les tâches rapides et peu coûteuses (messages de commit). Laissez les trois paramètres de modèle vides pour utiliser les modèles par défaut de votre fournisseur. Pour un serveur local, utilisez son nom de modèle, par ex. llama3.1 ou qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "ID du modèle compatible OpenAI pour les tâches intermédiaires (explication de diff, résumés).", "config.gitstudio.ai.provider.enumDescriptions.0": "Préférer le modèle de langage intégré à VS Code sans clé (GitHub Copilot / Cursor) s'il est disponible ; sinon Anthropic (si une clé est définie), puis un point de terminaison compatible OpenAI (si un modèle est configuré).", "config.gitstudio.ai.provider.enumDescriptions.1": "Utiliser l'API Language Model de VS Code — les modèles de GitHub Copilot ou de Cursor, sans clé. Choisissez un modèle précis via « GitStudio : Sélectionner un modèle d'IA… ».", diff --git a/apps/extension/package.nls.it.json b/apps/extension/package.nls.it.json index 2efdea44..a3d124e8 100644 --- a/apps/extension/package.nls.it.json +++ b/apps/extension/package.nls.it.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Oggetto imperativo più un breve corpo esplicativo.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "URL di base per l'endpoint compatibile OpenAI (viene aggiunto `/chat/completions`). Esempi: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "ID del modello compatibile OpenAI per il ragionamento approfondito opzionale.", - "config.gitstudio.ai.openai.modelFast.description": "ID del modello compatibile OpenAI per attività rapide/economiche (messaggi di commit). Per un server locale usa il nome del suo modello, ad es. llama3.1 o qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "ID del modello compatibile OpenAI per attività rapide/economiche (messaggi di commit). Lascia vuote tutte e tre le impostazioni del modello per usare i modelli predefiniti del tuo provider. Per un server locale usa il nome del suo modello, ad es. llama3.1 o qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "ID del modello compatibile OpenAI per attività di livello medio (spiegazione diff, riepiloghi).", "config.gitstudio.ai.provider.enumDescriptions.0": "Preferisci il Language Model di VS Code senza chiave (GitHub Copilot / Cursor) quando disponibile; altrimenti Anthropic (se è impostata una chiave), poi un endpoint compatibile OpenAI (se è configurato un modello).", "config.gitstudio.ai.provider.enumDescriptions.1": "Usa l'API Language Model di VS Code — i modelli di GitHub Copilot o Cursor, senza chiave. Scegli un modello specifico tramite “GitStudio: Select AI Model…”.", diff --git a/apps/extension/package.nls.ja.json b/apps/extension/package.nls.ja.json index 6438504a..3231808d 100644 --- a/apps/extension/package.nls.ja.json +++ b/apps/extension/package.nls.ja.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "命令形の件名と短い説明の本文。", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "OpenAI互換エンドポイントのベースURL(`/chat/completions` が付加されます)。例: `https://api.openai.com/v1` (OpenAI)、`https://openrouter.ai/api/v1` (OpenRouter)、`http://localhost:11434/v1` (Ollama)、`http://localhost:1234/v1` (LM Studio)。", "config.gitstudio.ai.openai.modelDeep.description": "オプトインの深い推論用のOpenAI互換モデルID。", - "config.gitstudio.ai.openai.modelFast.description": "高速・低コストなタスク(コミットメッセージ)用のOpenAI互換モデルID。ローカルサーバーの場合は、そのモデル名(例: llama3.1 や qwen2.5-coder)を使用してください。", + "config.gitstudio.ai.openai.modelFast.description": "高速・低コストなタスク(コミットメッセージ)用のOpenAI互換モデルID。3つのモデル設定をすべて空のままにすると、プロバイダーの既定のモデルが使われます。ローカルサーバーの場合は、そのモデル名(例: llama3.1 や qwen2.5-coder)を使用してください。", "config.gitstudio.ai.openai.modelMid.description": "中位タスク(差分の説明、要約)用のOpenAI互換モデルID。", "config.gitstudio.ai.provider.enumDescriptions.0": "利用可能な場合はキー不要のVS Code言語モデル(GitHub Copilot / Cursor)を優先し、なければAnthropic(キーが設定されている場合)、次にOpenAI互換エンドポイント(モデルが設定されている場合)を使用します。", "config.gitstudio.ai.provider.enumDescriptions.1": "VS Code言語モデルAPIを使用します — GitHub CopilotまたはCursorのモデルで、キーは不要です。「GitStudio: AIモデルを選択…」から特定のモデルを選べます。", diff --git a/apps/extension/package.nls.json b/apps/extension/package.nls.json index c7c3bc83..b1c2cd8a 100644 --- a/apps/extension/package.nls.json +++ b/apps/extension/package.nls.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Imperative subject plus a short explanatory body.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "Base URL for the OpenAI-compatible endpoint (`/chat/completions` is appended). Examples: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "OpenAI-compatible model ID for opt-in deep reasoning.", - "config.gitstudio.ai.openai.modelFast.description": "OpenAI-compatible model ID for fast/cheap tasks (commit messages). For a local server use its model name, e.g. llama3.1 or qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "OpenAI-compatible model ID for fast/cheap tasks (commit messages). Leave all three model settings empty to use your provider's default models. For a local server use its model name, e.g. llama3.1 or qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "OpenAI-compatible model ID for mid-tier tasks (explain diff, summaries).", "config.gitstudio.ai.provider.enumDescriptions.0": "Prefer the zero-key VS Code Language Model (GitHub Copilot / Cursor) when available; otherwise Anthropic (if a key is set), then an OpenAI-compatible endpoint (if a model is configured).", "config.gitstudio.ai.provider.enumDescriptions.1": "Use the VS Code Language Model API — GitHub Copilot or Cursor's models, with no key. Pick a specific model via “GitStudio: Select AI Model…”.", diff --git a/apps/extension/package.nls.ko.json b/apps/extension/package.nls.ko.json index 3b134bc9..4097f279 100644 --- a/apps/extension/package.nls.ko.json +++ b/apps/extension/package.nls.ko.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "명령형 제목과 짧은 설명 본문.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "OpenAI 호환 엔드포인트의 기본 URL입니다(`/chat/completions`가 덧붙여집니다). 예: `https://api.openai.com/v1`(OpenAI), `https://openrouter.ai/api/v1`(OpenRouter), `http://localhost:11434/v1`(Ollama), `http://localhost:1234/v1`(LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "선택적 심층 추론용 OpenAI 호환 모델 ID입니다.", - "config.gitstudio.ai.openai.modelFast.description": "빠르고 저렴한 작업(커밋 메시지)용 OpenAI 호환 모델 ID입니다. 로컬 서버라면 모델 이름을 사용하세요(예: llama3.1 또는 qwen2.5-coder).", + "config.gitstudio.ai.openai.modelFast.description": "빠르고 저렴한 작업(커밋 메시지)용 OpenAI 호환 모델 ID입니다. 세 가지 모델 설정을 모두 비워 두면 공급자의 기본 모델을 사용합니다. 로컬 서버라면 모델 이름을 사용하세요(예: llama3.1 또는 qwen2.5-coder).", "config.gitstudio.ai.openai.modelMid.description": "중간 수준 작업(diff 설명, 요약)용 OpenAI 호환 모델 ID입니다.", "config.gitstudio.ai.provider.enumDescriptions.0": "사용 가능하면 키가 필요 없는 VS Code 언어 모델(GitHub Copilot / Cursor)을 우선 사용하고, 그렇지 않으면 Anthropic(키가 설정된 경우), 그다음 OpenAI 호환 엔드포인트(모델이 설정된 경우)를 사용합니다.", "config.gitstudio.ai.provider.enumDescriptions.1": "VS Code 언어 모델 API를 사용합니다 — GitHub Copilot 또는 Cursor의 모델을 키 없이 사용합니다. “GitStudio: AI 모델 선택…”으로 특정 모델을 선택하세요.", diff --git a/apps/extension/package.nls.pl.json b/apps/extension/package.nls.pl.json index 4971e7f5..310b3cc8 100644 --- a/apps/extension/package.nls.pl.json +++ b/apps/extension/package.nls.pl.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Rozkazujący temat plus krótka treść wyjaśniająca.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "Bazowy URL dla punktu końcowego zgodnego z OpenAI (dołączane jest `/chat/completions`). Przykłady: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "ID modelu zgodnego z OpenAI do opcjonalnego głębokiego rozumowania.", - "config.gitstudio.ai.openai.modelFast.description": "ID modelu zgodnego z OpenAI do szybkich/tanich zadań (treści commitów). Dla lokalnego serwera użyj jego nazwy modelu, np. llama3.1 albo qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "ID modelu zgodnego z OpenAI do szybkich/tanich zadań (treści commitów). Zostaw wszystkie trzy ustawienia modelu puste, aby użyć domyślnych modeli dostawcy. Dla lokalnego serwera użyj jego nazwy modelu, np. llama3.1 albo qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "ID modelu zgodnego z OpenAI do zadań średniego poziomu (wyjaśnianie diffów, podsumowania).", "config.gitstudio.ai.provider.enumDescriptions.0": "Preferuj model językowy VS Code bez klucza (GitHub Copilot / Cursor), gdy jest dostępny; w innym przypadku Anthropic (jeśli ustawiono klucz), potem punkt końcowy zgodny z OpenAI (jeśli skonfigurowano model).", "config.gitstudio.ai.provider.enumDescriptions.1": "Użyj API modelu językowego VS Code — modeli GitHub Copilot albo Cursor, bez klucza. Wybierz konkretny model za pomocą „GitStudio: Select AI Model…”.", diff --git a/apps/extension/package.nls.pt-br.json b/apps/extension/package.nls.pt-br.json index 32da3a30..21879570 100644 --- a/apps/extension/package.nls.pt-br.json +++ b/apps/extension/package.nls.pt-br.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Assunto no imperativo mais um corpo explicativo curto.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "URL base para o endpoint compatível com OpenAI (`/chat/completions` é anexado). Exemplos: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "ID do modelo compatível com OpenAI para raciocínio profundo opcional.", - "config.gitstudio.ai.openai.modelFast.description": "ID do modelo compatível com OpenAI para tarefas rápidas/baratas (mensagens de commit). Para um servidor local use o nome do modelo dele, por exemplo llama3.1 ou qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "ID do modelo compatível com OpenAI para tarefas rápidas/baratas (mensagens de commit). Deixe as três configurações de modelo vazias para usar os modelos padrão do seu provedor. Para um servidor local use o nome do modelo dele, por exemplo llama3.1 ou qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "ID do modelo compatível com OpenAI para tarefas de nível intermediário (explicar diff, resumos).", "config.gitstudio.ai.provider.enumDescriptions.0": "Prefere o Modelo de Linguagem do VS Code sem chave (GitHub Copilot / Cursor) quando disponível; senão a Anthropic (se uma chave estiver definida), depois um endpoint compatível com OpenAI (se um modelo estiver configurado).", "config.gitstudio.ai.provider.enumDescriptions.1": "Usa a API de Modelo de Linguagem do VS Code — modelos do GitHub Copilot ou do Cursor, sem chave. Escolha um modelo específico em “GitStudio: Select AI Model…”.", diff --git a/apps/extension/package.nls.ru.json b/apps/extension/package.nls.ru.json index b91345e8..5c94cf7e 100644 --- a/apps/extension/package.nls.ru.json +++ b/apps/extension/package.nls.ru.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Повелительная тема плюс короткое пояснительное тело.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "Базовый URL для совместимой с OpenAI конечной точки (`/chat/completions` добавляется автоматически). Примеры: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "ID совместимой с OpenAI модели для дополнительного глубокого рассуждения.", - "config.gitstudio.ai.openai.modelFast.description": "ID совместимой с OpenAI модели для быстрых/дешёвых задач (сообщения коммитов). Для локального сервера используйте имя его модели, например llama3.1 или qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "ID совместимой с OpenAI модели для быстрых/дешёвых задач (сообщения коммитов). Оставьте все три настройки модели пустыми, чтобы использовать модели вашего провайдера по умолчанию. Для локального сервера используйте имя его модели, например llama3.1 или qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "ID совместимой с OpenAI модели для задач среднего уровня (объяснение различий, резюме).", "config.gitstudio.ai.provider.enumDescriptions.0": "Предпочитать языковую модель VS Code без ключа (GitHub Copilot / Cursor), если доступна; иначе Anthropic (если задан ключ), затем совместимую с OpenAI конечную точку (если настроена модель).", "config.gitstudio.ai.provider.enumDescriptions.1": "Использовать API языковой модели VS Code — модели GitHub Copilot или Cursor, без ключа. Выберите конкретную модель через «GitStudio: Выбрать модель AI…».", diff --git a/apps/extension/package.nls.tr.json b/apps/extension/package.nls.tr.json index 6c16d109..92cc7e70 100644 --- a/apps/extension/package.nls.tr.json +++ b/apps/extension/package.nls.tr.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "Emir kipinde bir konu artı kısa bir açıklayıcı gövde.", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "OpenAI uyumlu uç nokta için temel URL (`/chat/completions` eklenir). Örnekler: `https://api.openai.com/v1` (OpenAI), `https://openrouter.ai/api/v1` (OpenRouter), `http://localhost:11434/v1` (Ollama), `http://localhost:1234/v1` (LM Studio).", "config.gitstudio.ai.openai.modelDeep.description": "İsteğe bağlı derin akıl yürütme için OpenAI uyumlu model kimliği.", - "config.gitstudio.ai.openai.modelFast.description": "Hızlı/ucuz görevler (işleme mesajları) için OpenAI uyumlu model kimliği. Yerel bir sunucu için model adını kullanın, örn. llama3.1 veya qwen2.5-coder.", + "config.gitstudio.ai.openai.modelFast.description": "Hızlı/ucuz görevler (işleme mesajları) için OpenAI uyumlu model kimliği. Sağlayıcınızın varsayılan modellerini kullanmak için üç model ayarını da boş bırakın. Yerel bir sunucu için model adını kullanın, örn. llama3.1 veya qwen2.5-coder.", "config.gitstudio.ai.openai.modelMid.description": "Orta seviye görevler (farkı açıklama, özetler) için OpenAI uyumlu model kimliği.", "config.gitstudio.ai.provider.enumDescriptions.0": "Mevcut olduğunda anahtarsız VS Code Dil Modelini (GitHub Copilot / Cursor) tercih eder; yoksa Anthropic'i (bir anahtar ayarlıysa), sonra OpenAI uyumlu bir uç noktayı (bir model yapılandırılmışsa).", "config.gitstudio.ai.provider.enumDescriptions.1": "VS Code Dil Modeli API'sini kullan — GitHub Copilot veya Cursor'ın modelleri, anahtarsız. “GitStudio: Yapay Zeka Modeli Seç…” ile belirli bir model seçin.", diff --git a/apps/extension/package.nls.zh-cn.json b/apps/extension/package.nls.zh-cn.json index 128c4be0..319b9ce2 100644 --- a/apps/extension/package.nls.zh-cn.json +++ b/apps/extension/package.nls.zh-cn.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "祈使句主题,加上简短说明正文。", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "OpenAI 兼容端点的基础 URL(会追加 `/chat/completions`)。示例:`https://api.openai.com/v1`(OpenAI)、`https://openrouter.ai/api/v1`(OpenRouter)、`http://localhost:11434/v1`(Ollama)、`http://localhost:1234/v1`(LM Studio)。", "config.gitstudio.ai.openai.modelDeep.description": "用于选择性深度推理的 OpenAI 兼容模型 ID。", - "config.gitstudio.ai.openai.modelFast.description": "用于快速/低成本任务(提交信息)的 OpenAI 兼容模型 ID。使用本地服务器时填它的模型名称,例如 llama3.1 或 qwen2.5-coder。", + "config.gitstudio.ai.openai.modelFast.description": "用于快速/低成本任务(提交信息)的 OpenAI 兼容模型 ID。三个模型设置都留空时,使用你的服务商的默认模型。使用本地服务器时填它的模型名称,例如 llama3.1 或 qwen2.5-coder。", "config.gitstudio.ai.openai.modelMid.description": "用于中等复杂度任务(解释差异、总结)的 OpenAI 兼容模型 ID。", "config.gitstudio.ai.provider.enumDescriptions.0": "优先使用免密钥的 VS Code 语言模型(GitHub Copilot / Cursor)(如果可用);否则使用 Anthropic(如果已设置密钥),再否则使用 OpenAI 兼容端点(如果已配置模型)。", "config.gitstudio.ai.provider.enumDescriptions.1": "使用 VS Code 语言模型 API — GitHub Copilot 或 Cursor 的模型,无需密钥。可通过“GitStudio:选择 AI 模型…”指定具体模型。", diff --git a/apps/extension/package.nls.zh-tw.json b/apps/extension/package.nls.zh-tw.json index 97559a77..dcec839e 100644 --- a/apps/extension/package.nls.zh-tw.json +++ b/apps/extension/package.nls.zh-tw.json @@ -154,7 +154,7 @@ "config.gitstudio.ai.commitStyle.enumDescriptions.2": "祈使句主題,加上簡短說明正文。", "config.gitstudio.ai.openai.baseUrl.markdownDescription": "OpenAI 相容端點的基礎 URL(會追加 `/chat/completions`)。示例:`https://api.openai.com/v1`(OpenAI)、`https://openrouter.ai/api/v1`(OpenRouter)、`http://localhost:11434/v1`(Ollama)、`http://localhost:1234/v1`(LM Studio)。", "config.gitstudio.ai.openai.modelDeep.description": "用於選擇性深度推理的 OpenAI 相容模型 ID。", - "config.gitstudio.ai.openai.modelFast.description": "用於快速/低成本任務(提交資訊)的 OpenAI 相容模型 ID。使用本地伺服器時填它的模型名稱,例如 llama3.1 或 qwen2.5-coder。", + "config.gitstudio.ai.openai.modelFast.description": "用於快速/低成本任務(提交資訊)的 OpenAI 相容模型 ID。三個模型設定都留空時,使用你的服務商的預設模型。使用本地伺服器時填它的模型名稱,例如 llama3.1 或 qwen2.5-coder。", "config.gitstudio.ai.openai.modelMid.description": "用於中等複雜度任務(解釋差異、總結)的 OpenAI 相容模型 ID。", "config.gitstudio.ai.provider.enumDescriptions.0": "優先使用免金鑰的 VS Code 語言模型(GitHub Copilot / Cursor)(如果可用);否則使用 Anthropic(如果已設定金鑰),再否則使用 OpenAI 相容端點(如果已配置模型)。", "config.gitstudio.ai.provider.enumDescriptions.1": "使用 VS Code 語言模型 API — GitHub Copilot 或 Cursor 的模型,無需金鑰。可通過“GitStudio:選擇 AI 模型…”指定具體模型。", diff --git a/apps/extension/src/ai/aiCommands.ts b/apps/extension/src/ai/aiCommands.ts index 4b7c0029..c30cc86e 100644 --- a/apps/extension/src/ai/aiCommands.ts +++ b/apps/extension/src/ai/aiCommands.ts @@ -1,4 +1,5 @@ import * as vscode from "vscode"; +import { defaultModelsForEndpoint } from "@gitstudio/engine/ai/providerDefaults"; import { NO_REPOSITORY, notice } from "../ui/notify"; import { promptInput, promptPick, type DialogChoice } from "../ui/dialogs"; import type { RepoManager, RepoEntry } from "../git/repoManager"; @@ -437,7 +438,10 @@ async function configureOpenAi( const model = await promptInput({ title: l10n.t("OpenAI-compatible Model"), hint: l10n.t("Model ID for commit messages and explain — the one your provider lists, e.g. llama3.1 or qwen2.5-coder on a local server."), - value: cfg.get("openai.modelFast", ""), + // Yours, else the default of the provider you just pointed it at. + value: + cfg.get("openai.modelFast", "") || + (defaultModelsForEndpoint(baseUrl.trim() || cfg.get("openai.baseUrl", ""))?.fast ?? ""), confirmLabel: l10n.t("Continue"), }); if (model === undefined) { diff --git a/apps/extension/src/ai/aiFeatures.ts b/apps/extension/src/ai/aiFeatures.ts index 20f3724c..50d41e5b 100644 --- a/apps/extension/src/ai/aiFeatures.ts +++ b/apps/extension/src/ai/aiFeatures.ts @@ -14,7 +14,7 @@ import { notice } from "../ui/notify"; import { AnthropicProvider } from "./anthropicProvider"; import { VsCodeLmProvider, type LmModelInfo } from "./vscodeLmProvider"; import { CliProvider, CLI_SPECS } from "./cliProvider"; -import { OpenAiProvider, type OpenAiConfig } from "./openAiProvider"; +import { OpenAiProvider, withProviderDefaults, type OpenAiConfig } from "./openAiProvider"; // The AI features — the optional, bring-your-own-key AI layer (M10). // @@ -103,18 +103,6 @@ export const ANTHROPIC_KEY_SECRET = "gitstudio.ai.anthropicApiKey"; /** Storage key for the OpenAI-compatible API key (optional). */ export const OPENAI_KEY_SECRET = "gitstudio.ai.openaiApiKey"; -/** - * What the OpenAI model settings defaulted to until they became blank (you - * choose the model now). See AiFeatures.keepFormerOpenAiDefaults. - */ -export const FORMER_OPENAI_DEFAULTS: Readonly> = { - fast: "gpt-4o-mini", - mid: "gpt-4o-mini", - deep: "gpt-4o", -}; -/** globalState key: the former OpenAI defaults were kept for this user. */ -const FORMER_OPENAI_DEFAULTS_KEPT = "gitstudio.ai.formerOpenAiDefaultsKept"; - /** globalState key remembering the user's chosen vscode.lm model id. */ export const LM_MODEL_STATE_KEY = "gitstudio.ai.lmModelId"; @@ -298,55 +286,19 @@ export class AiFeatures implements vscode.Disposable { return overrides; } - /** - * Keep an existing OpenAI setup on the models it was already using. - * - * The OpenAI model settings used to DEFAULT to gpt-4o-mini / gpt-4o, so a - * user who stored a key and never touched them was running on our pick. - * Those defaults are blank now — you choose the model — and without this - * that user's AI would switch off on update. So, once: for each tier they - * never set, the old default is written as their own value. Nothing changes - * for them, and the setting now shows the model they are on, theirs to - * change. Only for someone the defaults were serving: an OpenAI key stored, - * or the provider set to OpenAI. - */ - async keepFormerOpenAiDefaults(): Promise { - const state = this.context.globalState; - if (state.get(FORMER_OPENAI_DEFAULTS_KEPT)) { - return; - } - if (this.secrets.has(OPENAI_KEY_SECRET) || this.providerChoice() === "openai") { - const cfg = this.config(); - for (const [tier, key] of [ - ["fast", "openai.modelFast"], - ["mid", "openai.modelMid"], - ["deep", "openai.modelDeep"], - ] as const) { - const set = cfg.inspect(key); - const unset = - set !== undefined && - set.globalValue === undefined && - set.workspaceValue === undefined && - set.workspaceFolderValue === undefined; - if (unset) { - await cfg.update(key, FORMER_OPENAI_DEFAULTS[tier], vscode.ConfigurationTarget.Global); - } - } - } - await state.update(FORMER_OPENAI_DEFAULTS_KEPT, true); - } - /** Read the OpenAI-compatible base URL + per-tier model IDs from settings. */ private openAiConfig(): OpenAiConfig { const cfg = this.config(); - return { + // No model of your own: the defaults of the provider the base URL points + // at (see withProviderDefaults). + return withProviderDefaults({ baseUrl: cfg.get("openai.baseUrl", "https://api.openai.com/v1"), models: { fast: cfg.get("openai.modelFast", ""), mid: cfg.get("openai.modelMid", ""), deep: cfg.get("openai.modelDeep", ""), }, - }; + }); } /** The remembered vscode.lm model id (from the model picker), if any. */ diff --git a/apps/extension/src/ai/aiSettingsPanel.ts b/apps/extension/src/ai/aiSettingsPanel.ts index 270efe6a..c8aee716 100644 --- a/apps/extension/src/ai/aiSettingsPanel.ts +++ b/apps/extension/src/ai/aiSettingsPanel.ts @@ -7,6 +7,10 @@ import { getNonce } from "../webview/html"; import tokensCss from "../../../../packages/webview-ui/src/styles/tokens.css"; import * as l10n from "@vscode/l10n"; import { l10nWebviewScript } from "@gitstudio/l10n/index"; +import { PROVIDER_DEFAULT_MODELS } from "@gitstudio/engine/ai/providerDefaults"; + +/** A card's model to start on: its provider's own default (the desktop's too). */ +const seed = (id: keyof typeof PROVIDER_DEFAULT_MODELS): string => JSON.stringify(PROVIDER_DEFAULT_MODELS[id].mid); /** The panel's providers that speak /chat/completions, and so need a model. */ const OPENAI_COMPATIBLE_KINDS = new Set(["openai", "openrouter", "groq", "custom", "ollama", "lmstudio"]); @@ -172,9 +176,10 @@ export class AiSettingsPanel { const model = (m.model ?? "").trim(); const key = (m.key ?? "").trim(); const baseUrl = (m.baseUrl ?? "").trim(); - // No model is chosen for you on an OpenAI-compatible connection. The panel - // asks before it sends; this is for any other sender — an empty model - // would blank every tier and leave AI off. + // An OpenAI-compatible connection is made with the model in the field + // (each card starts on its provider's default). The panel asks before it + // sends an empty one; this is for any other sender — on a custom server + // an empty model would leave AI off. if (OPENAI_COMPATIBLE_KINDS.has(kind) && !model) { await this.postResult(false, l10n.t("Choose a model to connect — pick one from the list or type its ID.")); return; @@ -441,17 +446,17 @@ export class AiSettingsPanel { blurb:"Drive the Gemini CLI you're signed into." }, { id:"copilot", icon:"github", name:"Editor AI", badge:"No key", badgeCls:"is-ready", group:"nokey", fields:[], needsCopilot:true, blurb:"Use Copilot / Cursor's built-in models. Nothing to configure." }, - { id:"ollama", icon:"vm", name:"Ollama", badge:"Local", badgeCls:"is-local", group:"nokey", fields:["model"], baseUrl:"http://localhost:11434/v1", model:"llama3.1", + { id:"ollama", icon:"vm", name:"Ollama", badge:"Local", badgeCls:"is-local", group:"nokey", fields:["model"], baseUrl:"http://localhost:11434/v1", model:${seed("ollama")}, blurb:"Run open models on your machine — fully private." }, { id:"lmstudio", icon:"vm", name:"LM Studio", badge:"Local", badgeCls:"is-local", group:"nokey", fields:["model"], baseUrl:"http://localhost:1234/v1", model:"", blurb:"Local model server. Private, no API key." }, - { id:"anthropic", icon:"sparkle", name:"Anthropic", group:"key", fields:["key","model"], model:"claude-sonnet-4-6", keyUrl:"https://console.anthropic.com/settings/keys", + { id:"anthropic", icon:"sparkle", name:"Anthropic", group:"key", fields:["key","model"], model:${seed("anthropic")}, keyUrl:"https://console.anthropic.com/settings/keys", blurb:"Claude models. Bring your own API key." }, - { id:"openai", icon:"sparkle", name:"OpenAI", group:"key", fields:["key","model"], baseUrl:"https://api.openai.com/v1", model:"", keyUrl:"https://platform.openai.com/api-keys", + { id:"openai", icon:"sparkle", name:"OpenAI", group:"key", fields:["key","model"], baseUrl:"https://api.openai.com/v1", model:${seed("openai")}, keyUrl:"https://platform.openai.com/api-keys", blurb:"GPT models. Bring your own API key." }, - { id:"openrouter", icon:"globe", name:"OpenRouter", group:"key", fields:["key","model"], baseUrl:"https://openrouter.ai/api/v1", model:"anthropic/claude-sonnet-4-6", keyUrl:"https://openrouter.ai/keys", + { id:"openrouter", icon:"globe", name:"OpenRouter", group:"key", fields:["key","model"], baseUrl:"https://openrouter.ai/api/v1", model:${seed("openrouter")}, keyUrl:"https://openrouter.ai/keys", blurb:"One key, hundreds of models from every provider." }, - { id:"groq", icon:"zap", name:"Groq", group:"key", fields:["key","model"], baseUrl:"https://api.groq.com/openai/v1", model:"openai/gpt-oss-120b", keyUrl:"https://console.groq.com/keys", + { id:"groq", icon:"zap", name:"Groq", group:"key", fields:["key","model"], baseUrl:"https://api.groq.com/openai/v1", model:${seed("groq")}, keyUrl:"https://console.groq.com/keys", blurb:"Extremely fast inference. Bring your own key." }, { id:"custom", icon:"settings-gear", name:"Custom", group:"key", fields:["baseUrl","key","model"], baseUrl:"", model:"", blurb:"Any OpenAI-compatible endpoint." }, @@ -521,8 +526,8 @@ export class AiSettingsPanel { const actions = el("div", "settings-actions"); const connect = el("button", "btn-primary"); connect.append(glyph("plug"), el("span", null, "Connect")); connect.addEventListener("click", () => { - // No model is chosen FOR you: an OpenAI-compatible connection needs the - // one you pick (Anthropic's blank keeps Claude's per-task defaults). + // A card starts on its provider's default; a field you emptied asks + // (Anthropic's blank keeps Claude's per-task defaults). if (needsModel(p) && inputs.model && !inputs.model.value.trim()) { note = { ok:false, message:"Choose a model to connect — pick one from the list or type its ID." }; renderNote(); inputs.model.focus(); @@ -549,8 +554,9 @@ export class AiSettingsPanel { conn.append(head, editor); return conn; } - /** Whether Connect needs a model typed or picked: every OpenAI-compatible - * provider. Anthropic falls back to Claude's own per-task defaults. */ + /** Whether Connect needs a model in the field: every OpenAI-compatible + * provider (a blank would blank every tier). Anthropic falls back to + * Claude's own per-task defaults. */ function needsModel(p) { return p.fields.includes("model") && p.id !== "anthropic"; } // Model field: an input with a datalist of DISCOVERED models. Detection is // automatic (local servers on open, cloud on key-blur); a plain text link @@ -733,10 +739,18 @@ export class AiSettingsPanel { if (editorInputs && editorInputs._list) { editorInputs._list.replaceChildren(); for (const id of m.list) { const o = document.createElement("option"); o.value = id; editorInputs._list.append(o); } - // Filled in only when there is nothing to choose between — a local - // server with one model loaded. It used to take the FIRST of any - // list: alphabetically, an OpenAI key got "babbage-002". - if (!editorInputs.model.value && m.list.length === 1) editorInputs.model.value = m.list[0]; + // A cloud card keeps its provider's default; the list is there to + // change it. It used to take the FIRST of any list: alphabetically, + // an OpenAI key got "babbage-002". A LOCAL server's default is what + // it has: its first model, unless the one in the field is among them + // (Ollama lists "qwen2.5-coder:latest" for "qwen2.5-coder") — the + // card's seed may never have been pulled. Anything else only when + // there is nothing to choose between. + const cur = editorInputs.model.value.trim(); + const has = (id) => m.list.some((x) => x === id || x === id + ":latest"); + const local = m.kind === "ollama" || m.kind === "lmstudio"; + const seeded = byId(m.kind) && cur === (byId(m.kind).model || ""); + if (m.list.length && (local ? !cur || (seeded && !has(cur)) : !cur && m.list.length === 1)) editorInputs.model.value = m.list[0]; setDetectStatus(m.list.length ? (m.list.length + " model" + (m.list.length === 1 ? "" : "s") + " found — pick one or type.") : "No models found — is the server running / key valid?"); diff --git a/apps/extension/src/ai/openAiProvider.ts b/apps/extension/src/ai/openAiProvider.ts index 950d1ff2..80043a1e 100644 --- a/apps/extension/src/ai/openAiProvider.ts +++ b/apps/extension/src/ai/openAiProvider.ts @@ -5,6 +5,7 @@ import { openAiReasoningEffort, type OpenAiChatResponse, } from "@gitstudio/engine/ai/aiCore"; +import { defaultModelsForEndpoint } from "@gitstudio/engine/ai/providerDefaults"; import type { AiProvider, CompleteRequest, @@ -34,6 +35,22 @@ export interface OpenAiConfig { models: Record; } +/** + * The models to use: yours, or — when you have set none at all — the defaults + * of the provider the base URL points at (OpenAI's for api.openai.com, Groq's + * for api.groq.com, Ollama's for localhost:11434, …), from the table the + * desktop app seeds its connections with. The settings used to default to + * gpt-4o for EVERY endpoint, so someone on Groq or a local server was sent + * OpenAI's model. One tier of your own is kept for every tier (modelFor falls + * back across tiers) rather than mixed with a provider default. An endpoint we + * do not know (a custom server) has no default: its model is yours to name. + */ +export function withProviderDefaults(cfg: OpenAiConfig): OpenAiConfig { + const blank = (["fast", "mid", "deep"] as const).every((t) => !cfg.models[t]?.trim()); + const defaults = blank ? defaultModelsForEndpoint(cfg.baseUrl) : undefined; + return defaults ? { baseUrl: cfg.baseUrl, models: { ...defaults } } : cfg; +} + export interface OpenAiProviderOptions { /** * Injected secret getter — returns the stored key, or undefined when unset. diff --git a/apps/extension/src/extension.ts b/apps/extension/src/extension.ts index b64c762c..d89a6e49 100644 --- a/apps/extension/src/extension.ts +++ b/apps/extension/src/extension.ts @@ -413,12 +413,7 @@ export function activate(context: vscode.ExtensionContext): GitStudioApi { // — and never leaves the host (the commit box only gets the result text). const brain = new AiFeatures(context); context.subscriptions.push(brain); - // Before the first availability probe: an OpenAI setup that ran on the - // former model defaults keeps them as its own (they are blank now). - void brain - .keepFormerOpenAiDefaults() - .catch(() => undefined) - .then(() => brain.refreshEnabled()); + void brain.refreshEnabled(); context.subscriptions.push( vscode.commands.registerCommand("gitstudio.ai.setApiKey", () => setApiKey(context, brain), diff --git a/apps/extension/test/aiChooseModel.test.ts b/apps/extension/test/aiChooseModel.test.ts deleted file mode 100644 index 870807e1..00000000 --- a/apps/extension/test/aiChooseModel.test.ts +++ /dev/null @@ -1,195 +0,0 @@ -// No OpenAI model is chosen for you. The settings defaulted to gpt-4o-mini / -// gpt-4o and the panel's OpenAI card came filled with gpt-4o, so whoever -// connected got our pick — one OpenAI retires on 2027-01-14. Now the model is -// blank until you choose it, from the list your key can use. Pinned here: -// -// · the shipped defaults are blank, and the panel seeds no OpenAI model, -// never fills one in from a list it could choose from, and will not -// Connect without one; -// · a setup that ran on the former defaults keeps them, as its own values, -// so updating does not switch its AI off; -// · the model you pick is spoken to properly: OpenAI's reasoning families -// take `max_completion_tokens` (they answer `max_tokens` with HTTP 400). - -import Module from "node:module"; -import { test, after } from "node:test"; -import assert from "node:assert/strict"; -import { readFileSync } from "node:fs"; -import { fileURLToPath } from "node:url"; -import { OpenAiProvider } from "../src/ai/openAiProvider"; -import { AiSettingsPage, aiStatus } from "./aiSettingsPage"; - -type Resolver = { _resolveFilename: (request: unknown, ...rest: unknown[]) => string }; -const resolver = Module as unknown as Resolver; -const resolve = resolver._resolveFilename; -const STUB = fileURLToPath(new URL("./vscodeStub.cjs", import.meta.url)); -resolver._resolveFilename = function (request: unknown, ...rest: unknown[]) { - return request === "vscode" ? STUB : resolve.call(this, request, ...rest); -}; -/* eslint-disable @typescript-eslint/no-require-imports -- loaded after the stand-in is in place */ -const { AiFeatures, FORMER_OPENAI_DEFAULTS } = require("../src/ai/aiFeatures") as typeof import("../src/ai/aiFeatures"); -/* eslint-enable @typescript-eslint/no-require-imports */ - -const pkg = JSON.parse(readFileSync(fileURLToPath(new URL("../package.json", import.meta.url)), "utf8")) as { - contributes: { configuration: Array<{ properties: Record }> }; -}; -const setting = (id: string) => pkg.contributes.configuration.map((c) => c.properties[id]).find(Boolean); - -test("the OpenAI model settings ship blank", () => { - for (const tier of ["Fast", "Mid", "Deep"]) { - assert.equal(setting(`gitstudio.ai.openai.model${tier}`)?.default, "", tier); - } -}); - -// ── a setup on the former defaults keeps them ────────────────────────────── - -interface Inspected { - globalValue?: string; - workspaceValue?: string; - workspaceFolderValue?: string; -} - -function fakeFeatures(opts: { key: boolean; provider: string; set?: Record }) { - const writes: Record = {}; - const state = new Map(); - const self = { - context: { - globalState: { - get: (k: string) => state.get(k), - update: async (k: string, v: unknown) => void state.set(k, v), - }, - }, - secrets: { has: () => opts.key }, - providerChoice: () => opts.provider, - config: () => ({ - inspect: (key: string) => opts.set?.[key] ?? {}, - update: async (key: string, value: string) => void (writes[key] = value), - }), - }; - const run = () => (AiFeatures.prototype.keepFormerOpenAiDefaults as (this: unknown) => Promise).call(self); - return { run, writes }; -} - -test("an OpenAI key on the former defaults keeps them as its own values, once", async () => { - const f = fakeFeatures({ key: true, provider: "auto", set: { "openai.modelDeep": { globalValue: "my-model" } } }); - await f.run(); - assert.deepEqual(f.writes, { - "openai.modelFast": FORMER_OPENAI_DEFAULTS.fast, - "openai.modelMid": FORMER_OPENAI_DEFAULTS.mid, - }, "a tier the user set is theirs already"); - assert.deepEqual(FORMER_OPENAI_DEFAULTS, { fast: "gpt-4o-mini", mid: "gpt-4o-mini", deep: "gpt-4o" }); - for (const k of Object.keys(f.writes)) delete f.writes[k]; - await f.run(); - assert.deepEqual(f.writes, {}, "only ever once"); -}); - -test("the provider set to OpenAI keeps them too; nobody else gets a model written", async () => { - const chosen = fakeFeatures({ key: false, provider: "openai" }); - await chosen.run(); - assert.equal(Object.keys(chosen.writes).length, 3); - const other = fakeFeatures({ key: false, provider: "auto" }); - await other.run(); - assert.deepEqual(other.writes, {}, "never used OpenAI: it chooses for itself"); - const workspace = fakeFeatures({ - key: true, - provider: "openai", - set: { - "openai.modelFast": { workspaceValue: "w" }, - "openai.modelMid": { workspaceFolderValue: "f" }, - "openai.modelDeep": { globalValue: "g" }, - }, - }); - await workspace.run(); - assert.deepEqual(workspace.writes, {}, "a value at any scope is the user's"); -}); - -// ── the model you pick is spoken to properly ────────────────────────────── - -function capture(model: string, baseUrl = "https://api.openai.com/v1") { - const bodies: Record[] = []; - const p = new OpenAiProvider({ - getKey: async () => "k", - config: () => ({ baseUrl, models: { fast: model, mid: "", deep: "" } }), - fetchImpl: (async (_u: unknown, init: { body: string }) => { - bodies.push(JSON.parse(init.body) as Record); - return new Response(JSON.stringify({ choices: [{ message: { content: "ok" }, finish_reason: "stop" }] })); - }) as unknown as typeof fetch, - }); - return { p, bodies }; -} - -test("a reasoning model gets max_completion_tokens and low effort; others keep max_tokens", async () => { - for (const model of ["gpt-6.1-terra", "gpt-5-mini", "o3"]) { - const { p, bodies } = capture(model); - assert.equal(await p.complete({ prompt: "hi", model: "fast" }), "ok"); - assert.equal(bodies[0]!.max_tokens, undefined, model); - assert.equal(bodies[0]!.max_completion_tokens, 512, model); - assert.equal(bodies[0]!.reasoning_effort, "low", model); - } - for (const model of ["gpt-4o", "llama3.1", "openai/gpt-5"]) { - const { p, bodies } = capture(model, model.includes("/") ? "https://openrouter.ai/api/v1" : "https://api.openai.com/v1"); - await p.complete({ prompt: "hi", model: "fast" }); - assert.equal(bodies[0]!.max_tokens, 512, model); - assert.equal(bodies[0]!.max_completion_tokens, undefined, model); - assert.equal(bodies[0]!.reasoning_effort, undefined, model); - } -}); - -// ── the panel ──────────────────────────────────────────────────────────── - -const chrome = AiSettingsPage.chrome(); -const skip = chrome ? false : "no windowless Chrome on this machine (set GS_CHROME)"; -const opened: AiSettingsPage[] = []; -after(async () => { - for (const p of opened) await p.close(); -}); - -/** Open the panel's editor for the provider card named `name`. */ -async function editorFor(name: string, status: Record = aiStatus()): Promise { - const page = await AiSettingsPage.open("dark"); - opened.push(page); - await page.send({ type: "status", status }); - const clicked = await page.eval(`(function () { - var card = Array.from(document.querySelectorAll(".ai-prov-card")).find(function (c) { - return c.querySelector(".ai-prov-name").textContent.indexOf(${JSON.stringify(name)}) === 0; - }); - if (!card) return false; - card.click(); - return true; - })()`); - assert.ok(clicked, `a ${name} card`); - return page; -} - -const modelValue = (page: AiSettingsPage) => - page.eval(`document.querySelector(".ai-conn-editor input[list=gs-models]").value`); -const connects = (page: AiSettingsPage) => - page.eval(`window.__posted.filter(function (m) { return m.type === "connect"; }).length`); - -test("the OpenAI card seeds no model, and Connect asks for one instead of sending", { skip }, async () => { - const page = await editorFor("OpenAI"); - assert.equal(await modelValue(page), "", "nothing chosen for you"); - await page.eval(`document.querySelector(".ai-conn-editor .btn-primary").click()`); - assert.equal(await connects(page), 0, "nothing was sent"); - const note = await page.eval(`document.getElementById("note").textContent`); - assert.match(note, /Choose a model/); - assert.equal(await page.eval(`document.activeElement === document.querySelector(".ai-conn-editor input[list=gs-models]")`), true); - // Picked: it goes, with the model you picked. - await page.eval(`document.querySelector(".ai-conn-editor input[list=gs-models]").value = "gpt-6.1-terra"`); - await page.eval(`document.querySelector(".ai-conn-editor .btn-primary").click()`); - const sent = await page.eval<{ model: string }>(`window.__posted.filter(function (m) { return m.type === "connect"; })[0]`); - assert.equal(sent.model, "gpt-6.1-terra"); -}); - -test("a detected list is offered, never picked from — unless there is only one", { skip }, async () => { - const page = await editorFor("OpenAI", aiStatus({ hasOpenaiKey: true })); - const asked = await page.eval(`window.__posted.filter(function (m) { return m.type === "detectModels"; }).length`); - assert.ok(asked >= 1, "a stored key lists the models straight away"); - await page.send({ type: "models", kind: "openai", list: ["babbage-002", "gpt-6-luna", "gpt-6.1-terra"] }); - assert.equal(await modelValue(page), "", "the first of a list is not a choice"); - assert.equal(await page.eval(`document.querySelectorAll("#gs-models option").length`), 3); - - const local = await editorFor("LM Studio"); - await local.send({ type: "models", kind: "lmstudio", list: ["qwen2.5-coder"] }); - assert.equal(await modelValue(local), "qwen2.5-coder", "one loaded model: nothing to choose between"); -}); diff --git a/apps/extension/test/aiProviderDefaults.test.ts b/apps/extension/test/aiProviderDefaults.test.ts new file mode 100644 index 00000000..8fbf5164 --- /dev/null +++ b/apps/extension/test/aiProviderDefaults.test.ts @@ -0,0 +1,201 @@ +// Every provider starts on its own default model, and it is yours to change. +// The extension's model settings used to default to gpt-4o-mini / gpt-4o for +// EVERY OpenAI-compatible endpoint, and its OpenAI card came filled with +// gpt-4o — someone on Groq or a local server was sent OpenAI's model, and +// OpenAI retires that one on 2027-01-14. Pinned here: +// +// · the settings ship blank, and blank means the defaults of the provider +// the base URL points at — the table the desktop seeds connections with; +// a model of your own (any tier) is never mixed with a default; +// · each panel card starts on its provider's default and Connect sends what +// is in the field; a local server's default is a model it actually has; +// · the model is spoken to properly: OpenAI's reasoning families take +// `max_completion_tokens` (they answer `max_tokens` with HTTP 400). + +import { test, after } from "node:test"; +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import { fileURLToPath } from "node:url"; +import { OpenAiProvider, withProviderDefaults } from "../src/ai/openAiProvider"; +import { PROVIDER_DEFAULT_MODELS, defaultModelsForEndpoint, providerOfEndpoint } from "@gitstudio/engine/ai/providerDefaults"; +import { AiSettingsPage, aiStatus } from "./aiSettingsPage"; + +const pkg = JSON.parse(readFileSync(fileURLToPath(new URL("../package.json", import.meta.url)), "utf8")) as { + contributes: { configuration: Array<{ properties: Record }> }; +}; +const setting = (id: string) => pkg.contributes.configuration.map((c) => c.properties[id]).find(Boolean); + +test("the model settings ship blank: blank is the provider's own default", () => { + for (const tier of ["Fast", "Mid", "Deep"]) { + assert.equal(setting(`gitstudio.ai.openai.model${tier}`)?.default, "", tier); + } +}); + +const blank = { fast: "", mid: "", deep: "" }; + +test("each endpoint is told apart, and gets its own provider's defaults", () => { + const cases: Array<[string, string | undefined]> = [ + ["https://api.openai.com/v1", "openai"], + ["https://api.groq.com/openai/v1", "groq"], + ["https://openrouter.ai/api/v1/", "openrouter"], + ["https://generativelanguage.googleapis.com/v1beta/openai", "google"], + ["https://my-resource.openai.azure.com/openai/deployments/d", "azure"], + ["http://localhost:11434/v1", "ollama"], + ["http://127.0.0.1:1234/v1", "lmstudio"], + ["http://localhost:8000/v1", undefined], + ["https://api.openai.com.example.net/v1", undefined], + ["https://proxy.example.com/v1", undefined], + ["not a url", undefined], + ]; + for (const [url, provider] of cases) assert.equal(providerOfEndpoint(url), provider, url); + for (const [url, provider] of cases) { + const cfg = withProviderDefaults({ baseUrl: url, models: { ...blank } }); + assert.deepEqual(cfg.models, provider ? { ...PROVIDER_DEFAULT_MODELS[provider as "openai"] } : blank, url); + } + assert.ok(!Object.values(defaultModelsForEndpoint("https://api.openai.com/v1")!).some((m) => /gpt-4o/.test(m))); + assert.equal(defaultModelsForEndpoint("http://localhost:11434/v1")!.mid, "qwen2.5-coder"); +}); + +test("a model of your own, in any tier, is never mixed with a default", () => { + const mine = { fast: "", mid: "my-model", deep: "" }; + assert.deepEqual(withProviderDefaults({ baseUrl: "https://api.openai.com/v1", models: mine }).models, mine); + assert.deepEqual(withProviderDefaults({ baseUrl: "https://api.openai.com/v1", models: { fast: " ", mid: "", deep: "" } }).models.mid, "gpt-6.1-terra", "whitespace is blank"); +}); + +test("with no model of your own the provider's default is what is sent", async () => { + const bodies: Array> = []; + const p = new OpenAiProvider({ + getKey: async () => "k", + config: () => withProviderDefaults({ baseUrl: "https://api.groq.com/openai/v1", models: { ...blank } }), + fetchImpl: (async (_u: unknown, init: { body: string }) => { + bodies.push(JSON.parse(init.body) as Record); + return new Response(JSON.stringify({ choices: [{ message: { content: "ok" }, finish_reason: "stop" }] })); + }) as unknown as typeof fetch, + }); + assert.equal(p.isAvailable(), true); + await p.complete({ prompt: "hi", model: "fast" }); + await p.complete({ prompt: "hi", model: "deep" }); + assert.deepEqual(bodies.map((b) => b.model), ["openai/gpt-oss-20b", "openai/gpt-oss-120b"]); + const custom = new OpenAiProvider({ getKey: async () => undefined, config: () => withProviderDefaults({ baseUrl: "http://localhost:8000/v1", models: { ...blank } }) }); + assert.equal(custom.isAvailable(), false, "a custom server has no default: its model is yours to name"); +}); + +// ── the model you pick is spoken to properly ────────────────────────────── + +function capture(model: string, baseUrl = "https://api.openai.com/v1") { + const bodies: Record[] = []; + const p = new OpenAiProvider({ + getKey: async () => "k", + config: () => ({ baseUrl, models: { fast: model, mid: "", deep: "" } }), + fetchImpl: (async (_u: unknown, init: { body: string }) => { + bodies.push(JSON.parse(init.body) as Record); + return new Response(JSON.stringify({ choices: [{ message: { content: "ok" }, finish_reason: "stop" }] })); + }) as unknown as typeof fetch, + }); + return { p, bodies }; +} + +test("a reasoning model gets max_completion_tokens and low effort; others keep max_tokens", async () => { + for (const model of ["gpt-6.1-terra", "gpt-5-mini", "o3"]) { + const { p, bodies } = capture(model); + assert.equal(await p.complete({ prompt: "hi", model: "fast" }), "ok"); + assert.equal(bodies[0]!.max_tokens, undefined, model); + assert.equal(bodies[0]!.max_completion_tokens, 512, model); + assert.equal(bodies[0]!.reasoning_effort, "low", model); + } + for (const model of ["gpt-4o", "llama3.1", "openai/gpt-5"]) { + const { p, bodies } = capture(model, model.includes("/") ? "https://openrouter.ai/api/v1" : "https://api.openai.com/v1"); + await p.complete({ prompt: "hi", model: "fast" }); + assert.equal(bodies[0]!.max_tokens, 512, model); + assert.equal(bodies[0]!.max_completion_tokens, undefined, model); + assert.equal(bodies[0]!.reasoning_effort, undefined, model); + } +}); + +// ── the panel ──────────────────────────────────────────────────────────── + +const chrome = AiSettingsPage.chrome(); +const skip = chrome ? false : "no windowless Chrome on this machine (set GS_CHROME)"; +const opened: AiSettingsPage[] = []; +after(async () => { + for (const p of opened) await p.close(); +}); + +/** One panel for the whole file: each Chrome launched costs a second. */ +let shared: AiSettingsPage | undefined; + +/** Open the panel's editor for the provider card named `name`, afresh. */ +async function editorFor(name: string, status: Record = aiStatus()): Promise { + if (!shared) { + shared = await AiSettingsPage.open("dark"); + opened.push(shared); + } + const page = shared; + // Close any open editor (Cancel), forget what was posted, then the gallery. + await page.eval(`(function () { + var cancel = Array.from(document.querySelectorAll(".ai-conn-editor .settings-actions .mini-btn")).pop(); + if (cancel) cancel.click(); + window.__posted.length = 0; + })()`); + await page.send({ type: "status", status }); + const clicked = await page.eval(`(function () { + var card = Array.from(document.querySelectorAll(".ai-prov-card")).find(function (c) { + return c.querySelector(".ai-prov-name").textContent.indexOf(${JSON.stringify(name)}) === 0; + }); + if (!card) return false; + card.click(); + return true; + })()`); + assert.ok(clicked, `a ${name} card`); + return page; +} + +const modelValue = (page: AiSettingsPage) => + page.eval(`document.querySelector(".ai-conn-editor input[list=gs-models]").value`); +const connects = (page: AiSettingsPage) => + page.eval(`window.__posted.filter(function (m) { return m.type === "connect"; }).length`); + +test("every card starts on its provider's default, and Connect sends what is in the field", { skip }, async () => { + for (const [name, id] of [["OpenAI", "openai"], ["Groq", "groq"], ["OpenRouter", "openrouter"], ["Anthropic", "anthropic"]] as const) { + const page = await editorFor(name); + assert.equal(await modelValue(page), PROVIDER_DEFAULT_MODELS[id].mid, name); + } + const page = await editorFor("OpenAI"); + assert.equal(await modelValue(page), "gpt-6.1-terra", "never gpt-4o"); + // Changed: what you chose is sent. + await page.eval(`document.querySelector(".ai-conn-editor input[list=gs-models]").value = "gpt-6-astra"`); + await page.eval(`document.querySelector(".ai-conn-editor .btn-primary").click()`); + const sent = await page.eval<{ model: string }>(`window.__posted.filter(function (m) { return m.type === "connect"; })[0]`); + assert.equal(sent.model, "gpt-6-astra"); +}); + +test("an emptied field asks instead of connecting with no model", { skip }, async () => { + const page = await editorFor("Groq"); + await page.eval(`document.querySelector(".ai-conn-editor input[list=gs-models]").value = ""`); + await page.eval(`document.querySelector(".ai-conn-editor .btn-primary").click()`); + assert.equal(await connects(page), 0, "nothing was sent"); + assert.match(await page.eval(`document.getElementById("note").textContent`), /Choose a model/); +}); + +test("a cloud card keeps its default when the list arrives; a local one takes a model it has", { skip }, async () => { + const page = await editorFor("OpenAI", aiStatus({ hasOpenaiKey: true })); + const asked = await page.eval(`window.__posted.filter(function (m) { return m.type === "detectModels"; }).length`); + assert.ok(asked >= 1, "a stored key lists the models straight away"); + await page.send({ type: "models", kind: "openai", list: ["babbage-002", "gpt-6-luna", "gpt-6.1-terra"] }); + assert.equal(await modelValue(page), "gpt-6.1-terra", "the default stays; the list is there to change it"); + assert.equal(await page.eval(`document.querySelectorAll("#gs-models option").length`), 3); + + const pulled = await editorFor("Ollama"); + await pulled.send({ type: "models", kind: "ollama", list: ["llama3.2:latest", "qwen2.5-coder:latest"] }); + assert.equal(await modelValue(pulled), "qwen2.5-coder", "its default is pulled: kept"); + const notPulled = await editorFor("Ollama"); + await notPulled.send({ type: "models", kind: "ollama", list: ["mistral:latest", "phi4:latest"] }); + assert.equal(await modelValue(notPulled), "mistral:latest", "its default was never pulled: one it has"); + const typed = await editorFor("Ollama"); + await typed.eval(`document.querySelector(".ai-conn-editor input[list=gs-models]").value = "my-model"`); + await typed.send({ type: "models", kind: "ollama", list: ["mistral:latest"] }); + assert.equal(await modelValue(typed), "my-model", "one you typed is yours"); + const lm = await editorFor("LM Studio"); + await lm.send({ type: "models", kind: "lmstudio", list: ["qwen3-coder", "gemma-3"] }); + assert.equal(await modelValue(lm), "qwen3-coder", "LM Studio: the model it has loaded"); +}); diff --git a/apps/extension/test/settingsLayout.test.ts b/apps/extension/test/settingsLayout.test.ts index d23c64ec..5d69914c 100644 --- a/apps/extension/test/settingsLayout.test.ts +++ b/apps/extension/test/settingsLayout.test.ts @@ -51,7 +51,7 @@ const SHIPPED: Record = { "gitstudio.worktrees.prefixWithProjectName": false, "gitstudio.ai.provider": "auto", "gitstudio.ai.openai.baseUrl": "https://api.openai.com/v1", - // Blank: no OpenAI model is chosen for you (aiChooseModel.test.ts). + // Blank: the defaults of the provider the base URL points at (aiProviderDefaults.test.ts). "gitstudio.ai.openai.modelFast": "", "gitstudio.ai.openai.modelMid": "", "gitstudio.ai.openai.modelDeep": "", diff --git a/packages/ai/src/catalog.ts b/packages/ai/src/catalog.ts index b21d43c9..ef414d5f 100644 --- a/packages/ai/src/catalog.ts +++ b/packages/ai/src/catalog.ts @@ -8,6 +8,7 @@ // speaks openai-compat (Gemini exposes a compat endpoint; local servers too). import type { ModelTier } from "./types"; +import { PROVIDER_DEFAULT_MODELS } from "@gitstudio/engine/ai/providerDefaults"; import * as l10n from "@vscode/l10n"; /** @@ -57,7 +58,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("Claude Opus, Sonnet & Haiku — strongest for code & agentic work."), wire: "anthropic", baseUrl: "https://api.anthropic.com", - models: { fast: "claude-haiku-4-5", mid: "claude-sonnet-4-6", deep: "claude-opus-4-8" }, + models: PROVIDER_DEFAULT_MODELS.anthropic, needsKey: true, keyUrl: "https://console.anthropic.com/settings/keys", icon: "sparkle", @@ -68,9 +69,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("GPT models via the OpenAI API."), wire: "openai-compat", baseUrl: "https://api.openai.com/v1", - // No model is chosen for you: the editor lists the models your key can - // use (ai:models — live /models, then KNOWN_MODELS) and you pick one. - models: { fast: "", mid: "", deep: "" }, + models: PROVIDER_DEFAULT_MODELS.openai, needsKey: true, keyUrl: "https://platform.openai.com/api-keys", icon: "sparkle", @@ -120,11 +119,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("One key, hundreds of models (Claude, GPT, Llama, Gemini, …)."), wire: "openai-compat", baseUrl: "https://openrouter.ai/api/v1", - models: { - fast: "anthropic/claude-haiku-4-5", - mid: "anthropic/claude-sonnet-4-6", - deep: "anthropic/claude-opus-4-8", - }, + models: PROVIDER_DEFAULT_MODELS.openrouter, needsKey: true, keyUrl: "https://openrouter.ai/keys", icon: "globe", @@ -135,7 +130,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("Gemini Flash models via the OpenAI-compatible endpoint."), wire: "openai-compat", baseUrl: "https://generativelanguage.googleapis.com/v1beta/openai", - models: { fast: "gemini-3.5-flash-lite", mid: "gemini-3.6-flash", deep: "gemini-3.8-flash" }, + models: PROVIDER_DEFAULT_MODELS.google, needsKey: true, keyUrl: "https://aistudio.google.com/apikey", icon: "sparkle", @@ -146,11 +141,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("Open models at very low latency."), wire: "openai-compat", baseUrl: "https://api.groq.com/openai/v1", - models: { - fast: "openai/gpt-oss-20b", - mid: "openai/gpt-oss-120b", - deep: "openai/gpt-oss-120b", - }, + models: PROVIDER_DEFAULT_MODELS.groq, needsKey: true, keyUrl: "https://console.groq.com/keys", icon: "zap", @@ -161,7 +152,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("Mistral & Codestral models."), wire: "openai-compat", baseUrl: "https://api.mistral.ai/v1", - models: { fast: "mistral-small-latest", mid: "mistral-large-latest", deep: "mistral-large-latest" }, + models: PROVIDER_DEFAULT_MODELS.mistral, needsKey: true, keyUrl: "https://console.mistral.ai/api-keys", icon: "sparkle", @@ -172,7 +163,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("Grok models from xAI."), wire: "openai-compat", baseUrl: "https://api.x.ai/v1", - models: { fast: "grok-3-mini", mid: "grok-3", deep: "grok-4" }, + models: PROVIDER_DEFAULT_MODELS.xai, needsKey: true, keyUrl: "https://console.x.ai", icon: "sparkle", @@ -183,7 +174,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("DeepSeek's Flash and Pro models."), wire: "openai-compat", baseUrl: "https://api.deepseek.com", - models: { fast: "deepseek-flash", mid: "deepseek-flash", deep: "deepseek-v4-pro" }, + models: PROVIDER_DEFAULT_MODELS.deepseek, needsKey: true, keyUrl: "https://platform.deepseek.com/api_keys", icon: "sparkle", @@ -194,11 +185,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("A broad catalog of open models."), wire: "openai-compat", baseUrl: "https://api.together.xyz/v1", - models: { - fast: "openai/gpt-oss-120b", - mid: "openai/gpt-oss-120b", - deep: "deepseek-ai/DeepSeek-V4-Pro-0813", - }, + models: PROVIDER_DEFAULT_MODELS.together, needsKey: true, keyUrl: "https://api.together.xyz/settings/api-keys", icon: "globe", @@ -209,7 +196,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("Run models on your own machine — fully private, no key."), wire: "openai-compat", baseUrl: "http://localhost:11434/v1", - models: { fast: "llama3.2", mid: "qwen2.5-coder", deep: "qwen2.5-coder:32b" }, + models: PROVIDER_DEFAULT_MODELS.ollama, needsKey: false, local: true, keyUrl: "https://ollama.com/download", @@ -222,7 +209,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("Local models via LM Studio's server — private, no key."), wire: "openai-compat", baseUrl: "http://localhost:1234/v1", - models: { fast: "local-model", mid: "local-model", deep: "local-model" }, + models: PROVIDER_DEFAULT_MODELS.lmstudio, needsKey: false, local: true, keyUrl: "https://lmstudio.ai", @@ -235,8 +222,7 @@ export const PROVIDER_PRESETS: readonly ProviderPreset[] = [ blurb: l10n.t("OpenAI models hosted in your Azure tenant."), wire: "openai-compat", baseUrl: "https://YOUR-RESOURCE.openai.azure.com/openai/deployments/YOUR-DEPLOYMENT", - // A deployment's model is whatever you deployed: yours to name. - models: { fast: "", mid: "", deep: "" }, + models: PROVIDER_DEFAULT_MODELS.azure, needsKey: true, keyUrl: "https://portal.azure.com", icon: "azure", @@ -296,9 +282,8 @@ export function knownModels(preset: string): string[] { * default for that tier is moved on — an id the user chose is theirs. */ export const RETIRED_DEFAULTS: Record>> = { - // NOT openai: no OpenAI model is chosen for you any more (its preset seeds - // none), so none is chosen for you on a retirement either — a connection - // keeps the model it is on until you pick another. + // Deprecated 2026-10-14, removed 2027-01-14; replacement gpt-6-luna. + openai: [{ fast: "gpt-4o-mini", mid: "gpt-4o", deep: "gpt-4o" }], // Deprecated; no longer served to new users, shut down 2026-12-01. google: [{ fast: "gemini-2.5-flash", mid: "gemini-2.5-flash", deep: "gemini-2.5-pro" }], // Shut down 2026-08-16 for free and developer tiers. diff --git a/packages/ai/test/connections.test.ts b/packages/ai/test/connections.test.ts index 73784188..8dcff078 100644 --- a/packages/ai/test/connections.test.ts +++ b/packages/ai/test/connections.test.ts @@ -37,9 +37,7 @@ test("connectionFromPreset copies preset defaults and the supplied id", () => { }); test("isConnectionUsable requires base URL, a model, and (for remote) a key", () => { - // OpenAI's preset seeds no model (you choose it): pick one first. - const remote: Connection = { ...connectionFromPreset("openai", "1"), models: { fast: "", mid: "gpt-6.1-terra", deep: "" } }; - assert.equal(isConnectionUsable(connectionFromPreset("openai", "0"), true), false, "no model chosen yet"); + const remote = connectionFromPreset("openai", "1"); assert.equal(isConnectionUsable(remote, false), false, "remote needs a key"); assert.equal(isConnectionUsable(remote, true), true, "remote with key ok"); diff --git a/packages/ai/test/retiredDefaults.test.ts b/packages/ai/test/retiredDefaults.test.ts index 6c4d5bc2..ce521293 100644 --- a/packages/ai/test/retiredDefaults.test.ts +++ b/packages/ai/test/retiredDefaults.test.ts @@ -8,6 +8,7 @@ import { test } from "node:test"; import assert from "node:assert/strict"; import { PROVIDER_PRESETS, RETIRED_DEFAULTS, presetById } from "../src/catalog"; +import { PROVIDER_DEFAULT_MODELS } from "@gitstudio/engine/ai/providerDefaults"; import { connectionFromPreset, isUserEdited, migrateRetiredModels, type Connection } from "../src/connections"; test("no preset seeds a model id its provider has retired", () => { @@ -95,12 +96,18 @@ test("isUserEdited: our URL with our model is ours; a changed URL or a typed mod assert.equal(isUserEdited(groq, undefined), false); }); -test("no OpenAI model is chosen for you: its preset (and Azure's) seeds none, and a retirement picks none either", () => { - for (const id of ["openai", "azure"]) { - assert.deepEqual(presetById(id).models, { fast: "", mid: "", deep: "" }, id); +test("every provider with a model of its own seeds its defaults, from the one table both products share", () => { + for (const [id, models] of Object.entries(PROVIDER_DEFAULT_MODELS)) { + assert.deepEqual(presetById(id).models, models, id); + for (const tier of ["fast", "mid", "deep"] as const) assert.ok(models[tier], `${id} ${tier}`); } - assert.equal(RETIRED_DEFAULTS.openai, undefined); + assert.ok(!Object.values(presetById("openai").models).some((m) => /gpt-4o/.test(m)), "never gpt-4o"); + // A connection still on OpenAI's former defaults moves to the current ones. const onFormerDefaults = stored("openai", { models: { fast: "gpt-4o-mini", mid: "gpt-4o", deep: "gpt-4o" } }); - assert.equal(migrateRetiredModels(onFormerDefaults), false); - assert.deepEqual(onFormerDefaults.models, { fast: "gpt-4o-mini", mid: "gpt-4o", deep: "gpt-4o" }, "kept, never blanked"); + assert.equal(migrateRetiredModels(onFormerDefaults), true); + assert.deepEqual(onFormerDefaults.models, { ...PROVIDER_DEFAULT_MODELS.openai }); + // Editing a connection's copy never touches the table. + const conn = connectionFromPreset("openai", "x"); + conn.models.mid = "mine"; + assert.equal(PROVIDER_DEFAULT_MODELS.openai.mid, "gpt-6.1-terra"); }); diff --git a/packages/engine/src/ai/providerDefaults.ts b/packages/engine/src/ai/providerDefaults.ts new file mode 100644 index 00000000..3bd00419 --- /dev/null +++ b/packages/engine/src/ai/providerDefaults.ts @@ -0,0 +1,94 @@ +// Each provider's own default models, per tier — ONE table for both products. +// +// A connection starts on its provider's defaults and they are yours to change: +// the desktop's catalog (packages/ai/src/catalog.ts) seeds a new connection +// with them, and the extension's single OpenAI-compatible endpoint uses the +// defaults of whichever provider its base URL points at when you have set no +// model of your own. Until this table, the extension's model settings +// defaulted to gpt-4o for EVERY endpoint — Groq, OpenRouter, a local Ollama — +// so a user who picked another provider was still sent OpenAI's model. +// +// Pure data, no imports: the engine is shared by every host. + +export type DefaultModels = Readonly<{ fast: string; mid: string; deep: string }>; + +const OPENAI: DefaultModels = { fast: "gpt-6-luna", mid: "gpt-6.1-terra", deep: "gpt-6.1-sol" }; + +/** By catalog preset id. A provider with no fixed model (Custom) is absent. */ +export const PROVIDER_DEFAULT_MODELS = { + anthropic: { fast: "claude-haiku-4-5", mid: "claude-sonnet-4-6", deep: "claude-opus-4-8" }, + openai: OPENAI, + // A deployment runs whatever was deployed to it; OpenAI's current models + // are the likeliest, and the field is yours to change to your deployment's. + azure: OPENAI, + openrouter: { + fast: "anthropic/claude-haiku-4-5", + mid: "anthropic/claude-sonnet-4-6", + deep: "anthropic/claude-opus-4-8", + }, + google: { fast: "gemini-3.5-flash-lite", mid: "gemini-3.6-flash", deep: "gemini-3.8-flash" }, + groq: { fast: "openai/gpt-oss-20b", mid: "openai/gpt-oss-120b", deep: "openai/gpt-oss-120b" }, + mistral: { fast: "mistral-small-latest", mid: "mistral-large-latest", deep: "mistral-large-latest" }, + xai: { fast: "grok-3-mini", mid: "grok-3", deep: "grok-4" }, + deepseek: { fast: "deepseek-flash", mid: "deepseek-flash", deep: "deepseek-v4-pro" }, + together: { + fast: "openai/gpt-oss-120b", + mid: "openai/gpt-oss-120b", + deep: "deepseek-ai/DeepSeek-V4-Pro-0813", + }, + ollama: { fast: "llama3.2", mid: "qwen2.5-coder", deep: "qwen2.5-coder:32b" }, + // LM Studio answers with whichever model is loaded. + lmstudio: { fast: "local-model", mid: "local-model", deep: "local-model" }, +} as const satisfies Record; + +export type DefaultModelsProvider = keyof typeof PROVIDER_DEFAULT_MODELS; + +/** Hosted endpoints by host name (any subdomain of it counts). */ +const HOSTS: ReadonlyArray = [ + ["api.openai.com", "openai"], + ["openai.azure.com", "azure"], + ["openrouter.ai", "openrouter"], + ["generativelanguage.googleapis.com", "google"], + ["api.groq.com", "groq"], + ["api.mistral.ai", "mistral"], + ["api.x.ai", "xai"], + ["api.deepseek.com", "deepseek"], + ["api.together.xyz", "together"], +]; + +/** Local servers by their default port on this machine. */ +const LOCAL_PORTS: Readonly> = { + "11434": "ollama", + "1234": "lmstudio", +}; + +const LOCAL_HOSTS = new Set(["localhost", "127.0.0.1", "[::1]", "::1", "0.0.0.0"]); + +/** + * The provider an OpenAI-compatible base URL belongs to, when it is one we + * know — or undefined (a custom server, an unknown host, not a URL). + */ +export function providerOfEndpoint(baseUrl: string): DefaultModelsProvider | undefined { + let url: URL; + try { + url = new URL(baseUrl.trim()); + } catch { + return undefined; + } + const host = url.hostname.toLowerCase(); + for (const [known, provider] of HOSTS) { + if (host === known || host.endsWith(`.${known}`)) { + return provider; + } + } + if (LOCAL_HOSTS.has(host)) { + return LOCAL_PORTS[url.port]; + } + return undefined; +} + +/** The default models of the provider a base URL points at, if it is known. */ +export function defaultModelsForEndpoint(baseUrl: string): DefaultModels | undefined { + const provider = providerOfEndpoint(baseUrl); + return provider ? PROVIDER_DEFAULT_MODELS[provider] : undefined; +}