From 1fa019026e8b97b4cb4b0b99c550c4c81351ae5e Mon Sep 17 00:00:00 2001
From: Jason <farion1231@gmail.com>
Date: Fri, 8 May 2026 19:13:46 +0800
Subject: [PATCH] fix(claude-desktop): match proxy model route without [1M]
 suffix

Claude Desktop strips the [1M] suffix from model IDs when sending
requests, causing route lookup to fail with "model route is not
configured". Fall back to base-name comparison when exact match misses.
---
 src-tauri/src/claude_desktop_config.rs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src-tauri/src/claude_desktop_config.rs b/src-tauri/src/claude_desktop_config.rs
index ca0fdd08b..08a0a9e4d 100644
--- a/src-tauri/src/claude_desktop_config.rs
+++ b/src-tauri/src/claude_desktop_config.rs
@@ -586,7 +586,16 @@ pub fn map_proxy_request_model(mut body: Value, provider: &Provider) -> Result<V
         })?;
 
     let routes = proxy_model_routes(provider)?;
-    let Some(route) = routes.iter().find(|route| route.route_id == requested) else {
+    let route = routes
+        .iter()
+        .find(|r| r.route_id == requested)
+        .or_else(|| {
+            let base = strip_one_m_context_suffix(&requested);
+            routes
+                .iter()
+                .find(|r| strip_one_m_context_suffix(&r.route_id) == base)
+        });
+    let Some(route) = route else {
         return Err(AppError::localized(
             "claude_desktop.provider.route_unknown",
             format!("Claude Desktop 模型路由未配置: {requested}"),
@@ -1179,6 +1188,18 @@ mod tests {
         assert!(err.to_string().contains("claude-opus-4-7"));
     }
 
+    #[test]
+    fn claude_desktop_proxy_maps_route_without_1m_suffix() {
+        let provider = proxy_provider("proxy");
+
+        let mapped = map_proxy_request_model(
+            json!({"model": "claude-sonnet-4-6", "messages": []}),
+            &provider,
+        )
+        .expect("base name should fallback-match the [1M] route");
+        assert_eq!(mapped["model"], json!("kimi-k2 [1M]"));
+    }
+
     #[test]
     fn claude_desktop_one_m_suffix_normalization_is_case_and_space_tolerant() {
         assert!(is_claude_safe_model_id("claude-sonnet-4-6 [1m]"));