From c163adc8e5a862a9517f1d73832998455b41d117 Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Wed, 19 Aug 2026 14:03:37 +0000
Subject: [PATCH] revert(ai): remove OrcaRouter built-in provider
---
apps/desktop/public/icons/ai/orcarouter.svg | 1 -
apps/desktop/src/stores/settingsStore.ts | 11 ---
apps/desktop/src/types/ai.ts | 21 +----
crates/dbx-core/src/ai.rs | 88 ++-------------------
crates/dbx-core/src/ai_effort.rs | 10 +--
crates/dbx-core/src/ai_model_filter.rs | 40 +---------
6 files changed, 11 insertions(+), 160 deletions(-)
delete mode 100644 apps/desktop/public/icons/ai/orcarouter.svg
diff --git a/apps/desktop/public/icons/ai/orcarouter.svg b/apps/desktop/public/icons/ai/orcarouter.svg
deleted file mode 100644
index c417ea5db3..0000000000
--- a/apps/desktop/public/icons/ai/orcarouter.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts
index 3e2a822848..61bcc29a20 100644
--- a/apps/desktop/src/stores/settingsStore.ts
+++ b/apps/desktop/src/stores/settingsStore.ts
@@ -221,16 +221,6 @@ export const AI_PROVIDER_PRESETS: Record = {
authMethod: "bearer",
requiresApiKey: false,
},
- orcarouter: {
- label: "OrcaRouter",
- iconSlug: "orcarouter",
- provider: "orcarouter",
- endpoint: "https://api.orcarouter.ai/v1",
- model: "orcarouter/fusion-flash",
- apiStyle: "completions",
- authMethod: "bearer",
- requiresApiKey: true,
- },
"claude-code-cli": {
label: "Claude Code CLI",
iconSlug: "claudecode",
@@ -386,7 +376,6 @@ function normalizeAiConfigItem(config: AiConfigItem): AiConfigItem {
function inferAiProviderFromConfig(config: Partial | null | undefined): AiProvider {
const endpoint = config?.endpoint?.toLowerCase() ?? "";
const model = config?.model?.toLowerCase() ?? "";
- if (endpoint.includes("orcarouter") || model.includes("orcarouter")) return "orcarouter";
if (endpoint.includes("deepseek") || model.includes("deepseek")) return "deepseek";
if (endpoint.includes("dashscope") || endpoint.includes("aliyuncs") || model.includes("qwen")) return "qwen";
if (endpoint.includes("generativelanguage.googleapis.com") || model.includes("gemini")) return "gemini";
diff --git a/apps/desktop/src/types/ai.ts b/apps/desktop/src/types/ai.ts
index adafa675d5..6c9efcf47a 100644
--- a/apps/desktop/src/types/ai.ts
+++ b/apps/desktop/src/types/ai.ts
@@ -1,23 +1,4 @@
-export type AiProvider =
- | "claude"
- | "openai"
- | "gemini"
- | "deepseek"
- | "qwen"
- | "minimax"
- | "ollama"
- | "anthropic-compatible"
- | "openai-compatible"
- | "orcarouter"
- | "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" | "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 33e2aed60c..4a6d32c07e 100644
--- a/crates/dbx-core/src/ai.rs
+++ b/crates/dbx-core/src/ai.rs
@@ -73,7 +73,6 @@ pub enum AiProvider {
Ollama,
#[serde(rename = "openai-compatible")]
OpenaiCompatible,
- OrcaRouter,
#[serde(rename = "codex-cli")]
CodexCli,
#[serde(rename = "claude-code-cli")]
@@ -105,7 +104,6 @@ impl AiProvider {
AiProvider::MiniMax => "minimax",
AiProvider::Ollama => "ollama",
AiProvider::OpenaiCompatible => "openai-compatible",
- AiProvider::OrcaRouter => "orcarouter",
AiProvider::ClaudeCodeCli => "claude-code-cli",
AiProvider::PiAgentCli => "pi-agent-cli",
AiProvider::OpenCodeCli => "opencode-cli",
@@ -671,7 +669,6 @@ pub fn resolve_endpoint(config: &AiConfig) -> String {
| AiProvider::MiniMax
| AiProvider::Ollama
| AiProvider::OpenaiCompatible
- | AiProvider::OrcaRouter
| AiProvider::Custom => {
let base = ensure_openai_version_prefix(ep);
if config.api_style == AiApiStyle::Responses {
@@ -1424,7 +1421,6 @@ fn provider_requires_api_key(provider: &AiProvider) -> bool {
| AiProvider::Deepseek
| AiProvider::Qwen
| AiProvider::MiniMax
- | AiProvider::OrcaRouter
)
}
@@ -1537,18 +1533,12 @@ pub fn build_ai_http_client(config: &AiConfig, timeout_secs: u64) -> Result bool,
-) -> Result, String> {
+fn parse_model_list_response(data: &serde_json::Value) -> Result, String> {
let items = data["data"].as_array().ok_or_else(|| "Invalid model list response".to_string())?;
let mut seen = HashSet::new();
let mut models = Vec::new();
for item in items {
- if !include_item(item) {
- continue;
- }
let Some(id) = item["id"].as_str().filter(|id| !id.trim().is_empty()) else {
continue;
};
@@ -1570,10 +1560,6 @@ fn parse_model_list_response_with_filter(
Ok(models)
}
-fn parse_model_list_response(data: &serde_json::Value) -> Result, String> {
- parse_model_list_response_with_filter(data, |_| true)
-}
-
fn parse_dynamic_effort_capability(
model: &serde_json::Value,
source: AiCapabilitySource,
@@ -1745,13 +1731,7 @@ async fn list_openai_compatible_models(
return Err(extract_error(&data).unwrap_or_else(|| format!("Model list API error: {status}")));
}
- if matches!(config.provider, AiProvider::OrcaRouter) {
- parse_model_list_response_with_filter(&data, |item| {
- crate::ai_model_filter::orcarouter_item_supports_api_style(item, &config.api_style)
- })
- } else {
- parse_model_list_response(&data)
- }
+ parse_model_list_response(&data)
}
fn resolve_ollama_show_endpoint(config: &AiConfig) -> Result {
@@ -1868,8 +1848,7 @@ pub async fn list_models_core(config: &AiConfig) -> Result, Str
| AiProvider::Deepseek
| AiProvider::Qwen
| AiProvider::MiniMax
- | AiProvider::OpenaiCompatible
- | AiProvider::OrcaRouter => list_openai_compatible_models(&client, config).await?,
+ | AiProvider::OpenaiCompatible => list_openai_compatible_models(&client, config).await?,
AiProvider::Custom => {
if uses_anthropic_messages_api(config) {
list_claude_models(&client, config).await?
@@ -2903,8 +2882,7 @@ pub async fn complete(request: &AiCompletionRequest) -> Result {
| AiProvider::Qwen
| AiProvider::MiniMax
| AiProvider::Ollama
- | AiProvider::OpenaiCompatible
- | AiProvider::OrcaRouter => {
+ | AiProvider::OpenaiCompatible => {
if request.config.api_style == AiApiStyle::Responses {
call_responses_api(&client, request).await
} else {
@@ -2965,8 +2943,7 @@ pub async fn stream(
| AiProvider::Qwen
| AiProvider::MiniMax
| AiProvider::Ollama
- | AiProvider::OpenaiCompatible
- | AiProvider::OrcaRouter => {
+ | AiProvider::OpenaiCompatible => {
if request.config.api_style == AiApiStyle::Responses {
stream_responses_api(&client, session_id, request, cancelled, &on_chunk).await
} else {
@@ -4713,16 +4690,6 @@ mod tests {
config
}
- fn orcarouter_test_config(endpoint: impl Into, api_style: AiApiStyle) -> AiConfig {
- let mut config = test_config(AiProvider::OrcaRouter);
- config.api_key = "secret".to_string();
- config.auth_method = AiAuthMethod::Bearer;
- config.endpoint = endpoint.into();
- config.model = "orcarouter/fusion-flash".to_string();
- config.api_style = api_style;
- config
- }
-
fn minimax_test_request(endpoint: impl Into) -> AiCompletionRequest {
AiCompletionRequest {
config: minimax_test_config(endpoint),
@@ -5566,7 +5533,6 @@ mod tests {
AiProvider::Deepseek,
AiProvider::Qwen,
AiProvider::MiniMax,
- AiProvider::OrcaRouter,
] {
let config = AiConfig { provider, ..base.clone() };
assert_eq!(validate_config(&config).unwrap_err(), "API key is required");
@@ -5574,22 +5540,6 @@ mod tests {
}
}
- #[test]
- fn orcarouter_requires_api_key_for_completion_and_model_discovery() {
- let mut config = orcarouter_test_config("https://api.orcarouter.ai/v1", AiApiStyle::Completions);
- config.api_key.clear();
-
- assert!(provider_requires_api_key(&config.provider));
- assert_eq!(validate_config(&config).unwrap_err(), "API key is required");
- assert_eq!(validate_model_list_config(&config).unwrap_err(), "API key is required");
-
- config.api_key = "secret".to_string();
- let headers = maybe_bearer_headers(&config).unwrap();
- assert_eq!(headers.get(AUTHORIZATION).unwrap(), "Bearer secret");
- assert_eq!(resolve_endpoint(&config), "https://api.orcarouter.ai/v1/chat/completions");
- assert_eq!(resolve_model_list_endpoint(&config).unwrap(), "https://api.orcarouter.ai/v1/models");
- }
-
#[test]
fn resolves_model_list_endpoints_from_base_and_completion_urls() {
let openai = AiConfig {
@@ -6622,34 +6572,6 @@ mod tests {
assert!(request.contains("authorization: bearer secret"));
}
- #[tokio::test]
- async fn orcarouter_model_list_matches_configured_openai_api_style() {
- let response_body = r#"{"data":[
- {"id":"deepseek/deepseek-chat","supported_endpoint_types":["openai"]},
- {"id":"openai/gpt-response-only","supported_endpoint_types":["openai-response"]},
- {"id":"orcarouter/fusion-flash","supported_endpoint_types":["openai","openai-response"]},
- {"id":"google/gemini-embedding-001","supported_endpoint_types":["embeddings"]},
- {"id":"openai/gpt-image-1","supported_endpoint_types":["image-generation"]},
- {"id":"kling/kling-v3","supported_endpoint_types":["openai-video"]},
- {"id":"vendor/missing-metadata"}
- ]}"#;
-
- for (api_style, expected_ids) in [
- (AiApiStyle::Completions, vec!["deepseek/deepseek-chat", "orcarouter/fusion-flash"]),
- (AiApiStyle::Responses, vec!["openai/gpt-response-only", "orcarouter/fusion-flash"]),
- ] {
- let (origin, server) = spawn_get_response_server("200 OK", response_body).await;
- let config = orcarouter_test_config(format!("{origin}/v1"), api_style);
-
- let models = list_models_core(&config).await.unwrap();
-
- assert_eq!(models.iter().map(|model| model.id.as_str()).collect::>(), expected_ids);
- let request = server.await.unwrap().to_ascii_lowercase();
- assert!(request.starts_with("get /v1/models "));
- assert!(request.contains("authorization: bearer secret"));
- }
- }
-
#[tokio::test]
async fn anthropic_compatible_model_list_paginates_and_deduplicates() {
let (origin, server) = spawn_paginated_model_server().await;
diff --git a/crates/dbx-core/src/ai_effort.rs b/crates/dbx-core/src/ai_effort.rs
index 8aca63f85b..d1665c99fa 100644
--- a/crates/dbx-core/src/ai_effort.rs
+++ b/crates/dbx-core/src/ai_effort.rs
@@ -79,10 +79,7 @@ pub fn static_effort_capability(config: &AiConfig, model_id: &str) -> Option ollama_capability(&model, source),
AiProvider::MiniMax if matches_family(&model, "minimax-m3") => Some(boolean_capability(source)),
AiProvider::MiniMax => None,
- AiProvider::AnthropicCompatible
- | AiProvider::OpenaiCompatible
- | AiProvider::OrcaRouter
- | AiProvider::Custom => {
+ AiProvider::AnthropicCompatible | AiProvider::OpenaiCompatible | AiProvider::Custom => {
Some(AiEffortCapability::FreeText { placeholder: None, source: AiCapabilitySource::Custom })
}
AiProvider::Claude
@@ -195,7 +192,6 @@ pub fn registry_source_url(provider: &AiProvider) -> Option<&'static str> {
AiProvider::Claude
| AiProvider::AnthropicCompatible
| AiProvider::OpenaiCompatible
- | AiProvider::OrcaRouter
| AiProvider::CodexCli
| AiProvider::ClaudeCodeCli
| AiProvider::PiAgentCli
@@ -271,9 +267,7 @@ pub fn apply_runtime_effort(body: &mut Value, config: &AiConfig) {
AiProvider::Qwen => apply_qwen_effort(object, selection),
AiProvider::Ollama => apply_openai_effort(object, &config.api_style, selection),
AiProvider::MiniMax => apply_minimax_effort(object, selection),
- AiProvider::Openai | AiProvider::OpenaiCompatible | AiProvider::OrcaRouter => {
- apply_openai_effort(object, &config.api_style, selection)
- }
+ AiProvider::Openai | AiProvider::OpenaiCompatible => apply_openai_effort(object, &config.api_style, selection),
AiProvider::Custom => {
if config.api_style == AiApiStyle::AnthropicMessages {
apply_claude_effort(object, selection);
diff --git a/crates/dbx-core/src/ai_model_filter.rs b/crates/dbx-core/src/ai_model_filter.rs
index 6c8d853b54..8479a87ef3 100644
--- a/crates/dbx-core/src/ai_model_filter.rs
+++ b/crates/dbx-core/src/ai_model_filter.rs
@@ -1,4 +1,4 @@
-use crate::ai::{AiApiStyle, AiModelInfo, AiProvider};
+use crate::ai::{AiModelInfo, AiProvider};
use serde_json::Value;
// Provider model-family exclusions last checked against official catalogs on 2026-07-27.
@@ -93,7 +93,6 @@ pub(crate) fn model_is_assistant_compatible(provider: &AiProvider, model_id: &st
| AiProvider::Deepseek
| AiProvider::Ollama
| AiProvider::OpenaiCompatible
- | AiProvider::OrcaRouter
| AiProvider::CodexCli
| AiProvider::ClaudeCodeCli
| AiProvider::PiAgentCli
@@ -131,21 +130,6 @@ pub(crate) fn gemini_item_is_assistant_compatible(item: &Value) -> bool {
})
}
-pub(crate) fn orcarouter_item_supports_api_style(item: &Value, api_style: &AiApiStyle) -> bool {
- let required_endpoint_type = match api_style {
- AiApiStyle::Completions => "openai",
- AiApiStyle::Responses => "openai-response",
- AiApiStyle::AnthropicMessages => return false,
- };
-
- item["supported_endpoint_types"].as_array().is_some_and(|endpoint_types| {
- endpoint_types
- .iter()
- .filter_map(Value::as_str)
- .any(|endpoint_type| endpoint_type.eq_ignore_ascii_case(required_endpoint_type))
- })
-}
-
fn ollama_capability(data: &Value, expected: &str) -> Option {
let capabilities = data["capabilities"].as_array()?;
if capabilities.is_empty() {
@@ -166,9 +150,9 @@ pub(crate) fn ollama_tool_capability(data: &Value) -> Option {
mod tests {
use super::{
gemini_item_is_assistant_compatible, model_is_assistant_compatible, ollama_completion_capability,
- ollama_tool_capability, orcarouter_item_supports_api_style,
+ ollama_tool_capability,
};
- use crate::ai::{AiApiStyle, AiProvider};
+ use crate::ai::AiProvider;
#[test]
fn openai_filter_keeps_assistant_models_and_hides_specialized_endpoints() {
@@ -268,24 +252,6 @@ mod tests {
})));
}
- #[test]
- fn orcarouter_filter_matches_configured_openai_api_style() {
- let chat_model = serde_json::json!({
- "id": "orcarouter/fusion-flash",
- "supported_endpoint_types": ["openai", "openai-response"]
- });
- assert!(orcarouter_item_supports_api_style(&chat_model, &AiApiStyle::Completions));
- assert!(orcarouter_item_supports_api_style(&chat_model, &AiApiStyle::Responses));
- assert!(!orcarouter_item_supports_api_style(&chat_model, &AiApiStyle::AnthropicMessages));
-
- for endpoint_type in ["embeddings", "image-generation", "openai-video"] {
- let specialized_model = serde_json::json!({ "supported_endpoint_types": [endpoint_type] });
- assert!(!orcarouter_item_supports_api_style(&specialized_model, &AiApiStyle::Completions));
- assert!(!orcarouter_item_supports_api_style(&specialized_model, &AiApiStyle::Responses));
- }
- assert!(!orcarouter_item_supports_api_style(&serde_json::json!({}), &AiApiStyle::Completions));
- }
-
#[test]
fn ollama_capabilities_only_exclude_explicit_non_completion_models() {
assert_eq!(