Fix child startup readiness and ordered provider tools

Wait for shell bootstrap before dispatching child prompts, serialize provider preprocessing, and make permission callbacks idempotent. Restrict task lists to concrete multistep plans and stop inferring completion from tool activity. Update regression fixtures and resolve existing lint and test-layout failures. Verified formatting, both presubmit Clippy commands, and 354 targeted nextest tests.
2026-09-09 13:55:34 -05:00
parent 4b703c019f
commit 1845b9e20e
41 changed files with 1097 additions and 895 deletions
@@ -270,121 +270,5 @@ pub(crate) enum AcpRuntimeModelEvent {
 impl SingletonEntity for AcpRuntimeModel {}

 #[cfg(test)]
-mod tests {
-    use galaxy_acp::{SessionConfigOption, SessionConfigOptionCategory, SessionConfigSelectOption};
-
-    use super::{AcpDiscoveryState, AcpRuntimeModel};
-    use crate::settings::{AcpAgentSettings, AcpConfigOptionSettings};
-
-    #[test]
-    fn normalize_config_options_preserves_values_and_order() {
-        let options = vec![
-            SessionConfigOption::select(
-                "model",
-                "Model",
-                "fast",
-                vec![
-                    SessionConfigSelectOption::new("fast", "Fast"),
-                    SessionConfigSelectOption::new("accurate", "Accurate"),
-                ],
-            )
-            .category(SessionConfigOptionCategory::Model),
-            SessionConfigOption::boolean("thinking", "Thinking", true),
-        ];
-
-        let normalized = AcpRuntimeModel::normalize_config_options(options);
-
-        assert_eq!(normalized.len(), 2);
-        assert_eq!(normalized[0].kind, "select");
-        assert_eq!(normalized[0].current_value, serde_json::json!("fast"));
-        assert_eq!(normalized[0].options[0].value, serde_json::json!("fast"));
-        assert_eq!(
-            normalized[0].options[1].value,
-            serde_json::json!("accurate")
-        );
-        assert_eq!(normalized[1].kind, "boolean");
-        assert_eq!(normalized[1].current_value, serde_json::json!(true));
-    }
-
-    #[test]
-    fn normalize_config_options_preserves_unknown_categories() {
-        let option = SessionConfigOption::select(
-            "custom",
-            "Custom",
-            "one",
-            Vec::<SessionConfigSelectOption>::new(),
-        )
-        .category(SessionConfigOptionCategory::Other("_custom".to_owned()));
-
-        let normalized = AcpRuntimeModel::normalize_config_options(vec![option]);
-
-        assert_eq!(normalized[0].category.as_deref(), Some("_custom"));
-    }
-
-    #[test]
-    fn selection_replaces_model_and_preserves_other_current_values() {
-        let options = vec![
-            AcpConfigOptionSettings {
-                id: "model".to_owned(),
-                name: "Model".to_owned(),
-                description: None,
-                category: Some("model".to_owned()),
-                kind: "select".to_owned(),
-                current_value: serde_json::json!("fast"),
-                options: Vec::new(),
-            },
-            AcpConfigOptionSettings {
-                id: "thinking".to_owned(),
-                name: "Thinking".to_owned(),
-                description: None,
-                category: None,
-                kind: "boolean".to_owned(),
-                current_value: serde_json::json!(true),
-                options: Vec::new(),
-            },
-        ];
-
-        assert_eq!(
-            AcpRuntimeModel::selection_values_for_model(
-                &options,
-                "model",
-                &serde_json::json!("accurate")
-            ),
-            std::collections::BTreeMap::from([
-                ("model".to_owned(), serde_json::json!("accurate")),
-                ("thinking".to_owned(), serde_json::json!(true)),
-            ])
-        );
-    }
-
-    #[test]
-    fn discovery_state_has_explicit_running_success_and_failure_values() {
-        assert_eq!(AcpDiscoveryState::default(), AcpDiscoveryState::Idle);
-        assert_eq!(
-            AcpDiscoveryState::Succeeded { option_count: 2 },
-            AcpDiscoveryState::Succeeded { option_count: 2 }
-        );
-        assert_eq!(
-            AcpDiscoveryState::Failed {
-                message: "timeout".to_owned()
-            },
-            AcpDiscoveryState::Failed {
-                message: "timeout".to_owned()
-            }
-        );
-    }
-
-    #[test]
-    fn discovery_metadata_fields_are_optional_for_legacy_settings() {
-        let json = serde_json::json!({
-            "id": "codex",
-            "name": "Codex",
-            "config_options": []
-        });
-        let agent: AcpAgentSettings = serde_json::from_value(json).unwrap();
-
-        assert!(agent.discovery_timestamp.is_none());
-        assert!(agent.discovery_source.is_none());
-        assert!(agent.discovery_error.is_none());
-    }
-}
+#[path = "runtime_model_tests.rs"]
+mod tests;
@@ -0,0 +1,116 @@
+use galaxy_acp::{SessionConfigOption, SessionConfigOptionCategory, SessionConfigSelectOption};
+
+use super::{AcpDiscoveryState, AcpRuntimeModel};
+use crate::settings::{AcpAgentSettings, AcpConfigOptionSettings};
+
+#[test]
+fn normalize_config_options_preserves_values_and_order() {
+    let options = vec![
+        SessionConfigOption::select(
+            "model",
+            "Model",
+            "fast",
+            vec![
+                SessionConfigSelectOption::new("fast", "Fast"),
+                SessionConfigSelectOption::new("accurate", "Accurate"),
+            ],
+        )
+        .category(SessionConfigOptionCategory::Model),
+        SessionConfigOption::boolean("thinking", "Thinking", true),
+    ];
+
+    let normalized = AcpRuntimeModel::normalize_config_options(options);
+
+    assert_eq!(normalized.len(), 2);
+    assert_eq!(normalized[0].kind, "select");
+    assert_eq!(normalized[0].current_value, serde_json::json!("fast"));
+    assert_eq!(normalized[0].options[0].value, serde_json::json!("fast"));
+    assert_eq!(
+        normalized[0].options[1].value,
+        serde_json::json!("accurate")
+    );
+    assert_eq!(normalized[1].kind, "boolean");
+    assert_eq!(normalized[1].current_value, serde_json::json!(true));
+}
+
+#[test]
+fn normalize_config_options_preserves_unknown_categories() {
+    let option = SessionConfigOption::select(
+        "custom",
+        "Custom",
+        "one",
+        Vec::<SessionConfigSelectOption>::new(),
+    )
+    .category(SessionConfigOptionCategory::Other("_custom".to_owned()));
+
+    let normalized = AcpRuntimeModel::normalize_config_options(vec![option]);
+
+    assert_eq!(normalized[0].category.as_deref(), Some("_custom"));
+}
+
+#[test]
+fn selection_replaces_model_and_preserves_other_current_values() {
+    let options = vec![
+        AcpConfigOptionSettings {
+            id: "model".to_owned(),
+            name: "Model".to_owned(),
+            description: None,
+            category: Some("model".to_owned()),
+            kind: "select".to_owned(),
+            current_value: serde_json::json!("fast"),
+            options: Vec::new(),
+        },
+        AcpConfigOptionSettings {
+            id: "thinking".to_owned(),
+            name: "Thinking".to_owned(),
+            description: None,
+            category: None,
+            kind: "boolean".to_owned(),
+            current_value: serde_json::json!(true),
+            options: Vec::new(),
+        },
+    ];
+
+    assert_eq!(
+        AcpRuntimeModel::selection_values_for_model(
+            &options,
+            "model",
+            &serde_json::json!("accurate")
+        ),
+        std::collections::BTreeMap::from([
+            ("model".to_owned(), serde_json::json!("accurate")),
+            ("thinking".to_owned(), serde_json::json!(true)),
+        ])
+    );
+}
+
+#[test]
+fn discovery_state_has_explicit_running_success_and_failure_values() {
+    assert_eq!(AcpDiscoveryState::default(), AcpDiscoveryState::Idle);
+    assert_eq!(
+        AcpDiscoveryState::Succeeded { option_count: 2 },
+        AcpDiscoveryState::Succeeded { option_count: 2 }
+    );
+    assert_eq!(
+        AcpDiscoveryState::Failed {
+            message: "timeout".to_owned()
+        },
+        AcpDiscoveryState::Failed {
+            message: "timeout".to_owned()
+        }
+    );
+}
+
+#[test]
+fn discovery_metadata_fields_are_optional_for_legacy_settings() {
+    let json = serde_json::json!({
+        "id": "codex",
+        "name": "Codex",
+        "config_options": []
+    });
+    let agent: AcpAgentSettings = serde_json::from_value(json).unwrap();
+
+    assert!(agent.discovery_timestamp.is_none());
+    assert!(agent.discovery_source.is_none());
+    assert!(agent.discovery_error.is_none());
+}
@@ -228,7 +228,6 @@ fn response_translator(
        max_context_tokens: None,
        capabilities: RuntimeCapabilities::session_runtime(),
        empty_output_message: Some("> ACP agent completed without a text response.".to_owned()),
-        todo_items: None,
    })
 }