From ca991b32997467e8139139cc5c1ba56ae7a07c42 Mon Sep 17 00:00:00 2001
From: EungjePark <patreot0312@gmail.com>
Date: Sat, 22 Aug 2026 14:31:07 +0900
Subject: [PATCH] fix(desktop): accept ACP config option name labels

Signed-off-by: EungjePark <patreot0312@gmail.com>
---
 .../src-tauri/src/commands/agent_config.rs    |  2 ++
 .../src/commands/agent_config_tests.rs        | 22 ++++++++++++++++
 .../src-tauri/src/commands/agent_models.rs    |  1 +
 .../src/commands/agent_models_tests.rs        | 26 +++++++++++++++++++
 4 files changed, 51 insertions(+)

diff --git a/desktop/src-tauri/src/commands/agent_config.rs b/desktop/src-tauri/src/commands/agent_config.rs
index 4df24e6e9ba..124050fd8e0 100644
--- a/desktop/src-tauri/src/commands/agent_config.rs
+++ b/desktop/src-tauri/src/commands/agent_config.rs
@@ -414,6 +414,7 @@ fn parse_config_options(raw: Option<&serde_json::Value>) -> Vec<AcpConfigOptionE
                     .map(str::to_string),
                 display_name: opt
                     .get("displayName")
+                    .or_else(|| opt.get("name"))
                     .and_then(|v| v.as_str())
                     .map(str::to_string),
                 current_value: opt
@@ -439,6 +440,7 @@ fn parse_option_values(raw: Option<&serde_json::Value>) -> Vec<AcpConfigOptionVa
                 value,
                 display_name: o
                     .get("displayName")
+                    .or_else(|| o.get("name"))
                     .and_then(|v| v.as_str())
                     .map(str::to_string),
             })
diff --git a/desktop/src-tauri/src/commands/agent_config_tests.rs b/desktop/src-tauri/src/commands/agent_config_tests.rs
index 9c9aa58c1fd..2e858d31b14 100644
--- a/desktop/src-tauri/src/commands/agent_config_tests.rs
+++ b/desktop/src-tauri/src/commands/agent_config_tests.rs
@@ -710,3 +710,25 @@ fn live_switch_null_models_parses_to_no_current_model() {
     );
     assert!(available.is_empty());
 }
+
+#[test]
+fn config_options_accept_acp_name_labels() {
+    let raw = serde_json::json!([{
+        "id": "model",
+        "name": "Model",
+        "currentValue": "default[]",
+        "options": [
+            {"value": "default[]", "name": "Auto"},
+            {"value": "legacy", "displayName": "Legacy label", "name": "ACP label"}
+        ]
+    }]);
+
+    let parsed = parse_config_options(Some(&raw));
+
+    assert_eq!(parsed[0].display_name.as_deref(), Some("Model"));
+    assert_eq!(parsed[0].options[0].display_name.as_deref(), Some("Auto"));
+    assert_eq!(
+        parsed[0].options[1].display_name.as_deref(),
+        Some("Legacy label")
+    );
+}
diff --git a/desktop/src-tauri/src/commands/agent_models.rs b/desktop/src-tauri/src/commands/agent_models.rs
index cb809b6c04a..82ecf9aea3f 100644
--- a/desktop/src-tauri/src/commands/agent_models.rs
+++ b/desktop/src-tauri/src/commands/agent_models.rs
@@ -739,6 +739,7 @@ pub(super) fn normalize_agent_models(
                                 id: value.to_string(),
                                 name: o
                                     .get("displayName")
+                                    .or_else(|| o.get("name"))
                                     .and_then(|v| v.as_str())
                                     .map(str::to_string),
                                 description: None,
diff --git a/desktop/src-tauri/src/commands/agent_models_tests.rs b/desktop/src-tauri/src/commands/agent_models_tests.rs
index df3849de4a4..f0358bfd296 100644
--- a/desktop/src-tauri/src/commands/agent_models_tests.rs
+++ b/desktop/src-tauri/src/commands/agent_models_tests.rs
@@ -962,3 +962,29 @@ fn databricks_static_token_error_redacts_echoed_token() {
         "error lost its remediation: {error}"
     );
 }
+
+#[test]
+fn agent_model_normalization_accepts_acp_name_field() {
+    let raw = serde_json::json!({
+        "agent": {"name": "Cursor", "version": "1"},
+        "stable": {
+            "configOptions": [{
+                "category": "model",
+                "options": [
+                    {"value": "default[]", "name": "Auto"},
+                    {"value": "z-ai/glm-5", "displayName": "GLM 5"}
+                ]
+            }]
+        },
+        "unstable": {
+            "currentModelId": "default[]",
+            "availableModels": [{"modelId": "default[]", "name": "Duplicate"}]
+        }
+    });
+
+    let result = normalize_agent_models(&raw, None);
+
+    assert_eq!(result.models.len(), 2);
+    assert_eq!(result.models[0].name.as_deref(), Some("Auto"));
+    assert_eq!(result.models[1].name.as_deref(), Some("GLM 5"));
+}