e2e testing

app/src/ai/agent/api/impl.rs

@@ -19,11 +19,16 @@ pub async fn generate_multi_agent_output(
     cancellation_rx: futures::channel::oneshot::Receiver<()>,
 ) -> Result<ResponseStream, ConvertToAPITypeError> {
     let supported_tools_override = params.supported_tools_override.take();
-    let supported_tools = supported_tools_override
+    let mut supported_tools = supported_tools_override
         .clone()
         .unwrap_or_else(|| get_supported_tools(&params));
-    let supported_cli_agent_tools =
+    remove_orchestration_tools_if_disabled(&mut supported_tools, params.orchestration_enabled);
+    let mut supported_cli_agent_tools =
         supported_tools_override.unwrap_or_else(|| get_supported_cli_agent_tools(&params));
+    remove_orchestration_tools_if_disabled(
+        &mut supported_cli_agent_tools,
+        params.orchestration_enabled,
+    );
     if params.should_redact_secrets {
         redaction::redact_inputs(&mut params.input);
     }
@@ -254,6 +259,21 @@ pub async fn generate_multi_agent_output(
     }
 }
 
+fn remove_orchestration_tools_if_disabled(
+    supported_tools: &mut Vec<api::ToolType>,
+    orchestration_enabled: bool,
+) {
+    if orchestration_enabled {
+        return;
+    }
+    supported_tools.retain(|tool| {
+        !matches!(
+            tool,
+            api::ToolType::Subagent | api::ToolType::RunAgents | api::ToolType::StartAgentV2
+        )
+    });
+}
+
 fn get_supported_tools(params: &RequestParams) -> Vec<api::ToolType> {
     let mut supported_tools = vec![
         api::ToolType::Grep,
@@ -262,7 +282,6 @@ fn get_supported_tools(params: &RequestParams) -> Vec<api::ToolType> {
         api::ToolType::ReadMcpResource,
         api::ToolType::CallMcpTool,
         api::ToolType::RunShellCommand,
-        api::ToolType::Subagent,
         api::ToolType::WriteToLongRunningShellCommand,
         api::ToolType::ReadShellCommandOutput,
         api::ToolType::ReadDocuments,
@@ -270,6 +289,10 @@ fn get_supported_tools(params: &RequestParams) -> Vec<api::ToolType> {
         api::ToolType::EditDocuments,
     ];
 
+    if params.orchestration_enabled {
+        supported_tools.push(api::ToolType::Subagent);
+    }
+
     if FeatureFlag::ConversationsAsContext.is_enabled() {
         supported_tools.push(api::ToolType::FetchConversation);
     }

app/src/ai/agent/api/impl_tests.rs

@@ -2,7 +2,9 @@ use galaxy_core::features::FeatureFlag;
 use galaxy_core::HostId;
 use warp_multi_agent_api as api;
 
-use super::{get_supported_cli_agent_tools, get_supported_tools};
+use super::{
+    get_supported_cli_agent_tools, get_supported_tools, remove_orchestration_tools_if_disabled,
+};
 use crate::ai::agent::api::RequestParams;
 use crate::ai::blocklist::SessionContext;
 use crate::ai::llms::LLMId;
@@ -77,6 +79,40 @@ fn supported_tools_expose_local_subagents_without_hosted_orchestration_tools() {
     assert!(!supported_tools.contains(&api::ToolType::StartAgentV2));
 }
 
+#[test]
+fn supported_tools_omit_subagents_when_orchestration_is_disabled() {
+    let params = request_params_with_ask_user_question_enabled(false);
+    let supported_tools = get_supported_tools(&params);
+
+    assert!(!supported_tools.contains(&api::ToolType::Subagent));
+}
+
+#[test]
+fn supported_tool_override_cannot_restore_leaf_orchestration_tools() {
+    let mut supported_tools = vec![
+        api::ToolType::Grep,
+        api::ToolType::Subagent,
+        api::ToolType::RunAgents,
+        api::ToolType::StartAgentV2,
+    ];
+
+    remove_orchestration_tools_if_disabled(&mut supported_tools, false);
+
+    assert_eq!(supported_tools, vec![api::ToolType::Grep]);
+}
+
+#[test]
+fn enabled_orchestration_preserves_supported_tool_override() {
+    let mut supported_tools = vec![api::ToolType::Grep, api::ToolType::Subagent];
+
+    remove_orchestration_tools_if_disabled(&mut supported_tools, true);
+
+    assert_eq!(
+        supported_tools,
+        vec![api::ToolType::Grep, api::ToolType::Subagent]
+    );
+}
+
 #[test]
 fn supported_tools_omit_hosted_only_capabilities() {
     let params = request_params_with_ask_user_question_enabled(false);