From dc1640e738452aaee6c139c9d01ff7ed697fc509 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Thu, 23 Apr 2026 16:00:06 -0400
Subject: [PATCH] drop exec raw cli mcp fallback

---
 lib/crates/fabro-cli/src/commands/exec.rs | 110 +---------------------
 1 file changed, 2 insertions(+), 108 deletions(-)

diff --git a/lib/crates/fabro-cli/src/commands/exec.rs b/lib/crates/fabro-cli/src/commands/exec.rs
index 8c0fcc8b4..ca069da5c 100644
--- a/lib/crates/fabro-cli/src/commands/exec.rs
+++ b/lib/crates/fabro-cli/src/commands/exec.rs
@@ -13,10 +13,9 @@ use fabro_llm::providers::common::{LineReader, parse_retry_after};
 use fabro_llm::types::{
     FinishReason, Message, Request, Response as LlmResponse, StreamEvent, TokenCounts,
 };
-use fabro_mcp::config::{McpServerSettings, McpTransport};
+use fabro_mcp::config::McpServerSettings;
 use fabro_types::settings::InterpString;
 use fabro_types::settings::cli::OutputFormat as SettingsOutputFormat;
-use fabro_types::settings::run::McpEntryLayer;
 use fabro_util::exit::{ErrorExt, ExitClass};
 use futures::stream;
 use serde::Deserialize;
@@ -25,90 +24,6 @@ use crate::args::ExecArgs;
 use crate::command_context::CommandContext;
 use crate::{server_client, user_config};
 
-fn runtime_mcp_server(name: &str, entry: &McpEntryLayer) -> McpServerSettings {
-    let transport = match entry {
-        McpEntryLayer::Stdio {
-            script,
-            command,
-            env,
-            ..
-        } => {
-            let command = if let Some(script) = script {
-                vec!["sh".to_string(), "-c".to_string(), script.as_source()]
-            } else {
-                command
-                    .as_ref()
-                    .map(|command| command.iter().map(InterpString::as_source).collect())
-                    .unwrap_or_default()
-            };
-            McpTransport::Stdio {
-                command,
-                env: env
-                    .iter()
-                    .map(|(key, value)| (key.clone(), value.as_source()))
-                    .collect(),
-            }
-        }
-        McpEntryLayer::Http { url, headers, .. } => McpTransport::Http {
-            url:     url.as_source(),
-            headers: headers
-                .iter()
-                .map(|(key, value)| (key.clone(), value.as_source()))
-                .collect(),
-        },
-        McpEntryLayer::Sandbox {
-            script,
-            command,
-            port,
-            env,
-            ..
-        } => {
-            let command = if let Some(script) = script {
-                vec!["sh".to_string(), "-c".to_string(), script.as_source()]
-            } else {
-                command
-                    .as_ref()
-                    .map(|command| command.iter().map(InterpString::as_source).collect())
-                    .unwrap_or_default()
-            };
-            McpTransport::Sandbox {
-                command,
-                port: *port,
-                env: env
-                    .iter()
-                    .map(|(key, value)| (key.clone(), value.as_source()))
-                    .collect(),
-            }
-        }
-    };
-    let (startup_timeout_secs, tool_timeout_secs) = match entry {
-        McpEntryLayer::Http {
-            startup_timeout,
-            tool_timeout,
-            ..
-        }
-        | McpEntryLayer::Stdio {
-            startup_timeout,
-            tool_timeout,
-            ..
-        }
-        | McpEntryLayer::Sandbox {
-            startup_timeout,
-            tool_timeout,
-            ..
-        } => (
-            startup_timeout.map_or(10, |duration| duration.as_std().as_secs()),
-            tool_timeout.map_or(60, |duration| duration.as_std().as_secs()),
-        ),
-    };
-    McpServerSettings {
-        name: name.to_string(),
-        transport,
-        startup_timeout_secs,
-        tool_timeout_secs,
-    }
-}
-
 struct AuthenticatedFabroServerAdapter {
     client:        server_client::Client,
     base_url:      String,
@@ -392,28 +307,7 @@ pub(crate) async fn execute(mut args: ExecArgs, ctx: &CommandContext) -> AnyResu
     // `run.agent.mcps`. For `fabro exec` we use the cli.exec path, falling
     // back to run.agent.mcps if unset.
     let mcp_servers: Vec<McpServerSettings> = if !cli.exec.agent.mcps.is_empty() {
-        cli.exec
-            .agent
-            .mcps
-            .values()
-            .map(|server| McpServerSettings {
-                name:                 server.name.clone(),
-                transport:            server.transport.clone(),
-                startup_timeout_secs: server.startup_timeout_secs,
-                tool_timeout_secs:    server.tool_timeout_secs,
-            })
-            .collect()
-    } else if let Some(mcps) = raw_settings
-        .cli
-        .as_ref()
-        .and_then(|cli| cli.exec.as_ref())
-        .and_then(|exec| exec.agent.as_ref())
-        .map(|agent| &agent.mcps)
-        .filter(|mcps| !mcps.is_empty())
-    {
-        mcps.iter()
-            .map(|(name, entry)| runtime_mcp_server(name, entry))
-            .collect()
+        cli.exec.agent.mcps.values().cloned().collect()
     } else {
         WorkflowSettingsBuilder::from_layer(&raw_settings)
             .map(|settings| {