fix(acp): Align all sample gemini ACP names

Author: CSRessel

codex-rs/acp/docs.md

@@ -112,13 +112,13 @@ Agent callbacks are handled through a channel-based forwarding pattern:
 **Model Registry and Lookup Architecture:**
 
 The ACP registry in `@/codex-rs/acp/src/registry.rs` is **model-centric** rather than provider-centric:
-- `get_agent_config()` accepts model names (e.g., "mock-model", "gemini-flash-2.0") instead of provider names
+- `get_agent_config()` accepts model names (e.g., "mock-model", "gemini-flash-2.5") instead of provider names
 - Called from `@/codex-rs/core/src/client.rs` with `self.config.model` when handling `WireApi::Acp`
 - Returns `AcpAgentConfig` containing three fields:
   - `provider`: Identifies which agent subprocess to spawn (e.g., "mock-acp", "gemini-acp")
   - `command`: Executable path or command name
   - `args`: Arguments to pass to the subprocess
-- Model names are normalized to lowercase for case-insensitive matching (e.g., "Gemini-Flash-2.0" → "gemini-flash-2.0")
+- Model names are normalized to lowercase for case-insensitive matching (e.g., "Gemini-Flash-2.5" → "gemini-flash-2.5")
 - Uses exact matching only (no prefix matching) - each model must be explicitly registered
 - The `provider` field enables future optimization to determine when existing subprocess can be reused vs when new one must be spawned when switching models
 

codex-rs/acp/src/registry.rs

@@ -20,7 +20,7 @@ pub struct AcpAgentConfig {
 /// Get ACP agent configuration for a given model name
 ///
 /// # Arguments
-/// * `model_name` - The model identifier (e.g., "mock-model", "gemini-flash-2.0")
+/// * `model_name` - The model identifier (e.g., "mock-model", "gemini-flash-2.5")
 ///   Names are normalized to lowercase for case-insensitive matching.
 ///
 /// # Returns
@@ -38,14 +38,18 @@ pub fn get_agent_config(model_name: &str) -> Result<AcpAgentConfig> {
             // This handles both debug and release builds
             let exe_path = match std::env::current_exe() {
                 Ok(p) => {
-                    let mock_path = p.parent()
+                    let mock_path = p
+                        .parent()
                         .map(|parent| parent.join("mock_acp_agent"))
                         .unwrap_or_else(|| std::path::PathBuf::from("mock_acp_agent"));
                     tracing::debug!("Mock ACP agent path resolved to: {}", mock_path.display());
                     mock_path
                 }
                 Err(e) => {
-                    tracing::warn!("Failed to get current_exe for mock-model: {}, falling back to 'mock_acp_agent'", e);
+                    tracing::warn!(
+                        "Failed to get current_exe for mock-model: {}, falling back to 'mock_acp_agent'",
+                        e
+                    );
                     std::path::PathBuf::from("mock_acp_agent")
                 }
             };
@@ -56,7 +60,7 @@ pub fn get_agent_config(model_name: &str) -> Result<AcpAgentConfig> {
                 args: vec![],
             })
         }
-        "gemini-flash-2.0" => Ok(AcpAgentConfig {
+        "gemini-2.5-flash" | "gemini-acp" => Ok(AcpAgentConfig {
             provider: "gemini-acp".to_string(),
             command: "npx".to_string(),
             args: vec![
@@ -87,7 +91,8 @@ mod tests {
 
     #[test]
     fn test_get_gemini_model_config() {
-        let config = get_agent_config("gemini-flash-2.0").expect("Should return config for gemini-flash-2.0");
+        let config = get_agent_config("gemini-2.5-flash")
+            .expect("Should return config for gemini-2.5-flash");
 
         assert_eq!(config.provider, "gemini-acp");
         assert_eq!(config.command, "npx");
@@ -110,19 +115,19 @@ mod tests {
     fn test_get_agent_config_normalizes_model_names() {
         // Should work with lowercase model names
         assert!(
-            get_agent_config("gemini-flash-2.0").is_ok(),
-            "Lowercase 'gemini-flash-2.0' should work"
+            get_agent_config("gemini-2.5-flash").is_ok(),
+            "Lowercase 'gemini-2.5-flash' should work"
         );
         assert!(
             get_agent_config("mock-model").is_ok(),
             "Lowercase 'mock-model' should work"
         );
 
         // Should work with mixed case (normalized to lowercase)
-        let gemini_result = get_agent_config("Gemini-Flash-2.0");
+        let gemini_result = get_agent_config("Gemini-2.5-Flash");
         assert!(
             gemini_result.is_ok(),
-            "Mixed case 'Gemini-Flash-2.0' should work"
+            "Mixed case 'Gemini-2.5-Flash' should work"
         );
         assert_eq!(
             gemini_result.unwrap().provider,
@@ -140,10 +145,7 @@ mod tests {
 
         // Should still reject unknown models
         let unknown_result = get_agent_config("unknown-model-xyz");
-        assert!(
-            unknown_result.is_err(),
-            "Unknown model should return error"
-        );
+        assert!(unknown_result.is_err(), "Unknown model should return error");
         let err_msg = unknown_result.unwrap_err().to_string();
         assert!(
             err_msg.contains("unknown-model-xyz"),

codex-rs/common/src/model_presets.rs

@@ -60,8 +60,8 @@ static PRESETS: Lazy<Vec<ModelPreset>> = Lazy::new(|| {
             upgrade: None,
         },
         ModelPreset {
-            id: "gemini-2.0-flash-thinking-exp",
-            model: "gemini-2.0-flash-thinking-exp",
+            id: "gemini-2.5-flash",
+            model: "gemini-2.5-flash",
             display_name: "Gemini 2.0 Flash Thinking",
             description: "Google's experimental thinking model.",
             default_reasoning_effort: ReasoningEffort::Medium,

codex-rs/core/docs.md

@@ -88,7 +88,7 @@ The `client.rs` defines `ModelClient` trait implemented by:
 
 Response streaming uses `ResponseStream` of `ResponseEvent` items.
 
-For ACP providers (`wire_api: WireApi::Acp`), the client looks up subprocess configuration via `codex_acp::get_agent_config(self.config.model)` from `@/codex-rs/acp/src/registry.rs`. The registry is **model-centric**: it maps model names (e.g., "mock-model", "gemini-flash-2.0") to `AcpAgentConfig` structs containing provider identifier, command, and args. This differs from the provider-based approach used for HTTP APIs. ACP providers should not define `env_key` or `env_key_instructions` in their `ModelProviderInfo` entries, as they communicate via subprocess rather than HTTP APIs.
+For ACP providers (`wire_api: WireApi::Acp`), the client looks up subprocess configuration via `codex_acp::get_agent_config(self.config.model)` from `@/codex-rs/acp/src/registry.rs`. The registry is **model-centric**: it maps model names (e.g., "mock-model", "gemini-2.5-flash") to `AcpAgentConfig` structs containing provider identifier, command, and args. This differs from the provider-based approach used for HTTP APIs. ACP providers should not define `env_key` or `env_key_instructions` in their `ModelProviderInfo` entries, as they communicate via subprocess rather than HTTP APIs.
 
 **Session Recording:**