Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions desktop/src-tauri/src/commands/agent_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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),
})
Expand Down
22 changes: 22 additions & 0 deletions desktop/src-tauri/src/commands/agent_config_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
);
}
1 change: 1 addition & 0 deletions desktop/src-tauri/src/commands/agent_models.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
26 changes: 26 additions & 0 deletions desktop/src-tauri/src/commands/agent_models_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}