diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue index cecde644b1..849b314977 100644 --- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue +++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue @@ -3907,12 +3907,6 @@ function aiDeleteConfig(id: string) { async function aiConfirmDeleteConfig() { if (aiDeleteConfigId.value) { - if (settingsStore.activeModel?.configId === aiDeleteConfigId.value) { - toast(t("ai.cannotDeleteActiveConfig"), 5000); - aiDeleteConfirmOpen.value = false; - aiDeleteConfigId.value = null; - return; - } try { await settingsStore.deleteAiConfig(aiDeleteConfigId.value); } catch (e: any) { @@ -7089,7 +7083,7 @@ onUnmounted(() => { - diff --git a/apps/desktop/src/lib/ai/__tests__/aiConfigOrdering.spec.ts b/apps/desktop/src/lib/ai/__tests__/aiConfigOrdering.spec.ts index aa7ed97690..fb09eba7da 100644 --- a/apps/desktop/src/lib/ai/__tests__/aiConfigOrdering.spec.ts +++ b/apps/desktop/src/lib/ai/__tests__/aiConfigOrdering.spec.ts @@ -16,6 +16,7 @@ describe("orderAiConfigsForDisplay", () => { { id: "openai", provider: "openai" }, { id: "gemini", provider: "gemini" }, { id: "deepseek", provider: "deepseek" }, + { id: "kimi", provider: "kimi" }, { id: "qwen", provider: "qwen" }, { id: "minimax", provider: "minimax" }, { id: "ollama", provider: "ollama" }, @@ -30,7 +31,27 @@ describe("orderAiConfigsForDisplay", () => { { id: "custom", provider: "custom" }, ]; - expect(orderAiConfigsForDisplay(configs).map((config) => config.id)).toEqual(["claude", "openai", "gemini", "deepseek", "qwen", "minimax", "ollama", "anthropic-compatible", "openai-compatible", "claude-code-1", "codex", "opencode", "cursor", "codebuddy", "qoder", "grok", "pi", "custom"]); + expect(orderAiConfigsForDisplay(configs).map((config) => config.id)).toEqual([ + "claude", + "openai", + "gemini", + "deepseek", + "kimi", + "qwen", + "minimax", + "ollama", + "anthropic-compatible", + "openai-compatible", + "claude-code-1", + "codex", + "opencode", + "cursor", + "codebuddy", + "qoder", + "grok", + "pi", + "custom", + ]); }); it("preserves creation order for configs from the same provider", () => { diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts index c7a57f2061..9ebb6a9214 100644 --- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts +++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts @@ -1,7 +1,18 @@ import { createPinia, setActivePinia } from "pinia"; import { beforeEach, describe, expect, it, vi } from "vitest"; import { isProxy } from "vue"; -import { DEFAULT_EDITOR_SETTINGS, EXECUTE_MODE_CURRENT_DEFAULT_VERSION, enforceRightSidebarPanelExclusivity, normalizeAiConfig, normalizeDesktopSettings, normalizeEditorSettings, normalizeMcpGlobalPolicy, type RightSidebarPanelState, transitionRightSidebarPanels } from "@/stores/settingsStore"; +import { + AI_PROVIDER_PRESETS, + DEFAULT_EDITOR_SETTINGS, + EXECUTE_MODE_CURRENT_DEFAULT_VERSION, + enforceRightSidebarPanelExclusivity, + normalizeAiConfig, + normalizeDesktopSettings, + normalizeEditorSettings, + normalizeMcpGlobalPolicy, + type RightSidebarPanelState, + transitionRightSidebarPanels, +} from "@/stores/settingsStore"; import type { AiConfigItem } from "@/types/ai"; describe("normalizeEditorSettings", () => { @@ -608,6 +619,17 @@ describe("settingsStore AI API key normalization", () => { expect(normalizeAiConfig({ provider: "openai", apiKey: " secret " }).apiKey).toBe("secret"); }); + it("provides Kimi defaults and recognizes legacy Kimi configurations", () => { + expect(AI_PROVIDER_PRESETS.kimi).toMatchObject({ + provider: "kimi", + endpoint: "https://api.moonshot.cn/v1", + apiStyle: "completions", + authMethod: "bearer", + requiresApiKey: true, + }); + expect(normalizeAiConfig({ endpoint: "https://api.moonshot.cn/v1", model: "kimi-k2.5" }).provider).toBe("kimi"); + }); + it("normalizes OpenCode CLI path and environment settings", () => { expect( normalizeAiConfig({ @@ -1423,6 +1445,24 @@ describe("settingsStore activeModel lifecycle", () => { expect(store.activeEffort).toBeNull(); }); + it("deletes the active default config and clears the active selection when it was the last config", async () => { + const deleteAiConfig = vi.fn().mockResolvedValue(undefined); + const saveAiChatSelection = vi.fn().mockResolvedValue(undefined); + vi.doMock("@/lib/backend/api", () => ({ deleteAiConfig, saveAiChatSelection })); + + const { useSettingsStore } = await import("@/stores/settingsStore"); + const store = useSettingsStore(); + store.aiConfigs = [makeTestConfig({ id: "c1", model: "model-a", isDefault: true })]; + store.updateActiveModel({ configId: "c1", modelId: "model-a" }); + + await store.deleteAiConfig("c1"); + + expect(deleteAiConfig).toHaveBeenCalledWith("c1"); + expect(store.aiConfigs).toEqual([]); + expect(store.activeModel).toBeNull(); + await vi.waitFor(() => expect(saveAiChatSelection).toHaveBeenCalledWith(expect.objectContaining({ active: undefined }))); + }); + it("preserves the active model and effort when connection details change within the same provider", async () => { const saveAiConfigItem = vi.fn().mockResolvedValue(undefined); const saveAiChatSelection = vi.fn().mockResolvedValue(undefined); diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts index 731cb4aa73..eb513678de 100644 --- a/apps/desktop/src/stores/settingsStore.ts +++ b/apps/desktop/src/stores/settingsStore.ts @@ -224,6 +224,15 @@ export const AI_PROVIDER_PRESETS: Record = { authMethod: "bearer", requiresApiKey: true, }, + kimi: { + label: "Kimi", + provider: "kimi", + endpoint: "https://api.moonshot.cn/v1", + model: "", + apiStyle: "completions", + authMethod: "bearer", + requiresApiKey: true, + }, qwen: { label: "Qwen", iconSlug: "alibabacloud", @@ -490,6 +499,7 @@ function inferAiProviderFromConfig(config: Partial | null | undefined) const endpoint = config?.endpoint?.toLowerCase() ?? ""; const model = config?.model?.toLowerCase() ?? ""; if (endpoint.includes("deepseek") || model.includes("deepseek")) return "deepseek"; + if (endpoint.includes("moonshot") || endpoint.includes("kimi.com") || model.includes("kimi")) return "kimi"; if (endpoint.includes("dashscope") || endpoint.includes("aliyuncs") || model.includes("qwen")) return "qwen"; if (endpoint.includes("generativelanguage.googleapis.com") || model.includes("gemini")) return "gemini"; if (endpoint.includes("minimax.io") || endpoint.includes("minimaxi.com") || model.includes("minimax")) return "minimax"; diff --git a/apps/desktop/src/types/ai.ts b/apps/desktop/src/types/ai.ts index faab9ce2b9..6a2010172f 100644 --- a/apps/desktop/src/types/ai.ts +++ b/apps/desktop/src/types/ai.ts @@ -1,4 +1,4 @@ -export type AiProvider = "claude" | "openai" | "gemini" | "deepseek" | "qwen" | "minimax" | "ollama" | "anthropic-compatible" | "openai-compatible" | "claude-code-cli" | "pi-agent-cli" | "codex-cli" | "opencode-cli" | "cursor-cli" | "grok-cli" | "codebuddy-cli" | "qoder-cli" | "custom"; +export type AiProvider = "claude" | "openai" | "gemini" | "deepseek" | "kimi" | "qwen" | "minimax" | "ollama" | "anthropic-compatible" | "openai-compatible" | "claude-code-cli" | "pi-agent-cli" | "codex-cli" | "opencode-cli" | "cursor-cli" | "grok-cli" | "codebuddy-cli" | "qoder-cli" | "custom"; export type AiApiStyle = "completions" | "responses" | "anthropic-messages"; export type AiAuthMethod = "api-key" | "bearer"; export type AiEffortLevel = "low" | "medium" | "high" | "xhigh" | "max"; diff --git a/crates/dbx-core/src/ai.rs b/crates/dbx-core/src/ai.rs index 5b059b8204..c17c833a7d 100644 --- a/crates/dbx-core/src/ai.rs +++ b/crates/dbx-core/src/ai.rs @@ -68,6 +68,7 @@ pub enum AiProvider { Openai, Gemini, Deepseek, + Kimi, Qwen, MiniMax, Ollama, @@ -100,6 +101,7 @@ impl AiProvider { AiProvider::Openai => "openai", AiProvider::Gemini => "gemini", AiProvider::Deepseek => "deepseek", + AiProvider::Kimi => "kimi", AiProvider::Qwen => "qwen", AiProvider::MiniMax => "minimax", AiProvider::Ollama => "ollama", @@ -794,6 +796,7 @@ pub fn resolve_endpoint(config: &AiConfig) -> String { match config.provider { AiProvider::Openai | AiProvider::Deepseek + | AiProvider::Kimi | AiProvider::Qwen | AiProvider::MiniMax | AiProvider::Ollama @@ -1548,6 +1551,7 @@ fn provider_requires_api_key(provider: &AiProvider) -> bool { | AiProvider::Openai | AiProvider::Gemini | AiProvider::Deepseek + | AiProvider::Kimi | AiProvider::Qwen | AiProvider::MiniMax ) @@ -2022,6 +2026,7 @@ pub async fn list_models_core(config: &AiConfig) -> Result, Str } AiProvider::Openai | AiProvider::Deepseek + | AiProvider::Kimi | AiProvider::Qwen | AiProvider::MiniMax | AiProvider::OpenaiCompatible => list_openai_compatible_models(&client, config).await?, @@ -3057,6 +3062,7 @@ pub async fn complete(request: &AiCompletionRequest) -> Result { } AiProvider::Openai | AiProvider::Deepseek + | AiProvider::Kimi | AiProvider::Qwen | AiProvider::MiniMax | AiProvider::Ollama @@ -3118,6 +3124,7 @@ pub async fn stream( } AiProvider::Openai | AiProvider::Deepseek + | AiProvider::Kimi | AiProvider::Qwen | AiProvider::MiniMax | AiProvider::Ollama @@ -5954,6 +5961,30 @@ mod tests { assert!(matches!(serde_json::from_str::(&provider_json).unwrap(), AiProvider::MiniMax)); } + #[test] + fn kimi_provider_uses_openai_compatible_endpoints_and_requires_an_api_key() { + let config = AiConfig { + provider: AiProvider::Kimi, + api_key: "key".to_string(), + auth_method: AiAuthMethod::Bearer, + endpoint: "https://api.moonshot.cn/v1".to_string(), + model: "kimi-k2.5".to_string(), + ..test_config(AiProvider::Kimi) + }; + + assert_eq!(resolve_endpoint(&config), "https://api.moonshot.cn/v1/chat/completions"); + assert_eq!(resolve_model_list_endpoint(&config).unwrap(), "https://api.moonshot.cn/v1/models"); + assert!(provider_requires_api_key(&config.provider)); + assert_eq!( + validate_config(&AiConfig { api_key: String::new(), ..config.clone() }).unwrap_err(), + "API key is required" + ); + + let provider_json = serde_json::to_string(&AiProvider::Kimi).unwrap(); + assert_eq!(provider_json, r#""kimi""#); + assert!(matches!(serde_json::from_str::(&provider_json).unwrap(), AiProvider::Kimi)); + } + #[test] fn auto_adds_v1_to_openai_compatible_endpoints() { // Endpoint without /v1 — auto add @@ -8112,6 +8143,7 @@ mod tests { AiProvider::Custom, AiProvider::Gemini, AiProvider::Deepseek, + AiProvider::Kimi, AiProvider::Qwen, AiProvider::Ollama, AiProvider::MiniMax, diff --git a/crates/dbx-core/src/ai_effort.rs b/crates/dbx-core/src/ai_effort.rs index 8a03a6fbe9..94b7d67276 100644 --- a/crates/dbx-core/src/ai_effort.rs +++ b/crates/dbx-core/src/ai_effort.rs @@ -75,6 +75,7 @@ pub fn static_effort_capability(config: &AiConfig, model_id: &str) -> Option openai_capability(&model, source), AiProvider::Gemini => gemini_capability(&model, source), AiProvider::Deepseek => deepseek_capability(&model, source), + AiProvider::Kimi => None, AiProvider::Qwen => qwen_capability(&model, source), AiProvider::Ollama => ollama_capability(&model, source), AiProvider::MiniMax if matches_family(&model, "minimax-m3") => Some(boolean_capability(source)), @@ -186,6 +187,7 @@ pub fn registry_source_url(provider: &AiProvider) -> Option<&'static str> { AiProvider::Openai => Some(OPENAI_REASONING_DOCS), AiProvider::Gemini => Some(GEMINI_THINKING_DOCS), AiProvider::Deepseek => Some(DEEPSEEK_THINKING_DOCS), + AiProvider::Kimi => None, AiProvider::Qwen => Some(QWEN_THINKING_DOCS), AiProvider::Ollama => Some(OLLAMA_THINKING_DOCS), AiProvider::MiniMax => Some(MINIMAX_THINKING_DOCS), @@ -264,6 +266,7 @@ pub fn apply_runtime_effort(body: &mut Value, config: &AiConfig) { AiProvider::Claude | AiProvider::AnthropicCompatible => apply_claude_effort(object, selection), AiProvider::Gemini => apply_gemini_effort(object, &config.model, selection), AiProvider::Deepseek => apply_deepseek_effort(object, selection), + AiProvider::Kimi => apply_openai_effort(object, &config.api_style, selection), AiProvider::Qwen => apply_qwen_effort(object, selection), AiProvider::Ollama => apply_openai_effort(object, &config.api_style, selection), AiProvider::MiniMax => apply_minimax_effort(object, selection), diff --git a/crates/dbx-core/src/ai_model_filter.rs b/crates/dbx-core/src/ai_model_filter.rs index 8479a87ef3..94f5bde2cb 100644 --- a/crates/dbx-core/src/ai_model_filter.rs +++ b/crates/dbx-core/src/ai_model_filter.rs @@ -91,6 +91,7 @@ pub(crate) fn model_is_assistant_compatible(provider: &AiProvider, model_id: &st AiProvider::Claude | AiProvider::AnthropicCompatible | AiProvider::Deepseek + | AiProvider::Kimi | AiProvider::Ollama | AiProvider::OpenaiCompatible | AiProvider::CodexCli