From e12f4b7a4035563649e3606002ffc613862fd5c3 Mon Sep 17 00:00:00 2001
From: Logan Yang <logancyang@gmail.com>
Date: Fri, 22 Aug 2025 21:38:54 -0700
Subject: [PATCH] Update default chat model and chores (#1741)

---
 src/constants.ts                             | 39 ++++++++++++--------
 src/settings/v2/components/ApiKeyDialog.tsx  |  3 +-
 src/settings/v2/components/BasicSettings.tsx | 22 ++++++++++-
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/constants.ts b/src/constants.ts
index 4e470346..6c99ddba 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -359,6 +359,7 @@ export enum EmbeddingModels {
   AZURE_OPENAI = "azure-openai",
   COHEREAI_EMBED_MULTILINGUAL_LIGHT_V3_0 = "embed-multilingual-light-v3.0",
   GOOGLE_ENG = "text-embedding-004",
+  GOOGLE_GEMINI_EMBEDDING = "gemini-embedding-001",
   COPILOT_PLUS_SMALL = "copilot-plus-small",
   COPILOT_PLUS_LARGE = "copilot-plus-large",
   COPILOT_PLUS_MULTILINGUAL = "copilot-plus-multilingual",
@@ -424,6 +425,14 @@ export const BUILTIN_EMBEDDING_MODELS: CustomModel[] = [
     isBuiltIn: true,
     isEmbeddingModel: true,
   },
+  {
+    name: EmbeddingModels.GOOGLE_GEMINI_EMBEDDING,
+    provider: EmbeddingModelProviders.GOOGLE,
+    enabled: true,
+    isBuiltIn: true,
+    isEmbeddingModel: true,
+    core: true,
+  },
   {
     name: EmbeddingModels.AZURE_OPENAI,
     provider: EmbeddingModelProviders.AZURE_OPENAI,
@@ -457,6 +466,20 @@ export interface ProviderMetadata {
 
 // Unified provider information
 export const ProviderInfo: Record<Provider, ProviderMetadata> = {
+  [ChatModelProviders.OPENROUTERAI]: {
+    label: "OpenRouter",
+    host: "https://openrouter.ai/api/v1/",
+    keyManagementURL: "https://openrouter.ai/keys",
+    listModelURL: "https://openrouter.ai/api/v1/models",
+    testModel: ChatModels.OPENROUTER_GPT_4o,
+  },
+  [ChatModelProviders.GOOGLE]: {
+    label: "Gemini",
+    host: "https://generativelanguage.googleapis.com",
+    keyManagementURL: "https://makersuite.google.com/app/apikey",
+    listModelURL: "https://generativelanguage.googleapis.com/v1beta/models",
+    testModel: ChatModels.GEMINI_FLASH,
+  },
   [ChatModelProviders.OPENAI]: {
     label: "OpenAI",
     host: "https://api.openai.com",
@@ -485,13 +508,6 @@ export const ProviderInfo: Record<Provider, ProviderMetadata> = {
     listModelURL: "https://api.cohere.com/v1/models",
     testModel: ChatModels.COMMAND_R,
   },
-  [ChatModelProviders.GOOGLE]: {
-    label: "Gemini",
-    host: "https://generativelanguage.googleapis.com",
-    keyManagementURL: "https://makersuite.google.com/app/apikey",
-    listModelURL: "https://generativelanguage.googleapis.com/v1beta/models",
-    testModel: ChatModels.GEMINI_FLASH,
-  },
   [ChatModelProviders.XAI]: {
     label: "XAI",
     host: "https://api.x.ai/v1",
@@ -499,13 +515,6 @@ export const ProviderInfo: Record<Provider, ProviderMetadata> = {
     listModelURL: "https://api.x.ai/v1/models",
     testModel: ChatModels.GROK3,
   },
-  [ChatModelProviders.OPENROUTERAI]: {
-    label: "OpenRouter",
-    host: "https://openrouter.ai/api/v1/",
-    keyManagementURL: "https://openrouter.ai/keys",
-    listModelURL: "https://openrouter.ai/api/v1/models",
-    testModel: ChatModels.OPENROUTER_GPT_4o,
-  },
   [ChatModelProviders.GROQ]: {
     label: "Groq",
     host: "https://api.groq.com/openai",
@@ -669,7 +678,7 @@ export const DEFAULT_SETTINGS: CopilotSettings = {
   mistralApiKey: "",
   deepseekApiKey: "",
   defaultChainType: ChainType.LLM_CHAIN,
-  defaultModelKey: ChatModels.GPT_41 + "|" + ChatModelProviders.OPENAI,
+  defaultModelKey: ChatModels.OPENROUTER_GEMINI_2_5_FLASH + "|" + ChatModelProviders.OPENROUTERAI,
   embeddingModelKey: EmbeddingModels.OPENAI_EMBEDDING_SMALL + "|" + EmbeddingModelProviders.OPENAI,
   temperature: DEFAULT_MODEL_SETTING.TEMPERATURE,
   maxTokens: DEFAULT_MODEL_SETTING.MAX_TOKENS,
diff --git a/src/settings/v2/components/ApiKeyDialog.tsx b/src/settings/v2/components/ApiKeyDialog.tsx
index 337fe1a0..f7d99dba 100644
--- a/src/settings/v2/components/ApiKeyDialog.tsx
+++ b/src/settings/v2/components/ApiKeyDialog.tsx
@@ -245,8 +245,7 @@ function ApiKeyModalContent({ onClose }: ApiKeyModalContentProps) {
                       }}
                       disabled={!item.apiKey}
                       variant="secondary"
-                      size="sm"
-                      className="tw-flex tw-w-full tw-items-center tw-justify-center tw-gap-1 tw-whitespace-nowrap tw-p-0.5"
+                      className="tw-flex tw-w-full tw-items-center tw-justify-center tw-gap-2 tw-whitespace-nowrap tw-px-4 tw-py-2"
                     >
                       Add Model
                       {expandedProvider === item.provider ? (
diff --git a/src/settings/v2/components/BasicSettings.tsx b/src/settings/v2/components/BasicSettings.tsx
index b730a0c3..833d610d 100644
--- a/src/settings/v2/components/BasicSettings.tsx
+++ b/src/settings/v2/components/BasicSettings.tsx
@@ -138,7 +138,27 @@ export const BasicSettings: React.FC = () => {
           <SettingItem
             type="select"
             title="Default Chat Model"
-            description="Select the Chat model to use"
+            description={
+              <div className="tw-flex tw-items-center tw-gap-1.5">
+                <span className="tw-leading-none">Select the Chat model to use</span>
+                <TooltipProvider delayDuration={0}>
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <HelpCircle className="tw-size-4" />
+                    </TooltipTrigger>
+                    <TooltipContent className="tw-flex tw-max-w-96 tw-flex-col tw-gap-2 tw-py-4">
+                      <div className="tw-text-sm tw-font-medium tw-text-accent">
+                        Default model is OpenRouter Gemini 2.5 Flash
+                      </div>
+                      <div className="tw-text-xs tw-text-muted">
+                        Set your OpenRouter API key in &apos;API keys&apos; to use this model, or
+                        select a different model from another provider.
+                      </div>
+                    </TooltipContent>
+                  </Tooltip>
+                </TooltipProvider>
+              </div>
+            }
             value={defaultModelActivated ? settings.defaultModelKey : "Select Model"}
             onChange={(value) => {
               const selectedModel = settings.activeModels.find(