store mcp_enabled in chatsession & conversationstate

Author: evanliu048

crates/chat-cli/src/api_client/error.rs

@@ -206,7 +206,7 @@ mod tests {
                 response(),
             )),
             ApiClientError::GetProfileError(SdkError::service_error(
-                ListAvailableModelsError::unhandled("<unhandled>"),
+                GetProfileError::unhandled("<unhandled>"),
                 response(),
             )),
             ApiClientError::ListAvailableModelsError(SdkError::service_error(

crates/chat-cli/src/cli/agent/mod.rs

@@ -408,16 +408,8 @@ impl Agents {
         agent_name: Option<&str>,
         skip_migration: bool,
         output: &mut impl Write,
+        mcp_enabled: bool,
     ) -> (Self, AgentsLoadMetadata) {
-        // Check MCP governance at the very beginning
-        let mcp_enabled = match os.client.is_mcp_enabled().await {
-            Ok(enabled) => enabled,
-            Err(err) => {
-                tracing::warn!(?err, "Failed to check MCP configuration, defaulting to enabled");
-                true
-            },
-        };
-
         if !mcp_enabled {
             let _ = execute!(
                 output,

crates/chat-cli/src/cli/agent/root_command_args.rs

@@ -74,9 +74,16 @@ pub struct AgentArgs {
 impl AgentArgs {
     pub async fn execute(self, os: &mut Os) -> Result<ExitCode> {
         let mut stderr = std::io::stderr();
+        let mcp_enabled = match os.client.is_mcp_enabled().await {
+            Ok(enabled) => enabled,
+            Err(err) => {
+                tracing::warn!(?err, "Failed to check MCP configuration, defaulting to enabled");
+                true
+            },
+        };
         match self.cmd {
             Some(AgentSubcommands::List) | None => {
-                let agents = Agents::load(os, None, true, &mut stderr).await.0;
+                let agents = Agents::load(os, None, true, &mut stderr, mcp_enabled).await.0;
                 let agent_with_path =
                     agents
                         .agents
@@ -101,7 +108,7 @@ impl AgentArgs {
                 writeln!(stderr, "{}", output_str)?;
             },
             Some(AgentSubcommands::Create { name, directory, from }) => {
-                let mut agents = Agents::load(os, None, true, &mut stderr).await.0;
+                let mut agents = Agents::load(os, None, true, &mut stderr, mcp_enabled).await.0;
                 let path_with_file_name = create_agent(os, &mut agents, name.clone(), directory, from).await?;
                 let editor_cmd = std::env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
                 let mut cmd = std::process::Command::new(editor_cmd);
@@ -133,13 +140,6 @@ impl AgentArgs {
             },
             Some(AgentSubcommands::Validate { path }) => {
                 let mut global_mcp_config = None::<McpServerConfig>;
-                let mcp_enabled = match os.client.is_mcp_enabled().await {
-                    Ok(enabled) => enabled,
-                    Err(err) => {
-                        tracing::warn!(?err, "Failed to check MCP configuration, defaulting to enabled");
-                        true
-                    },
-                };
                 let agent = Agent::load(os, path.as_str(), &mut global_mcp_config, mcp_enabled).await;
 
                 'validate: {
@@ -258,7 +258,7 @@ impl AgentArgs {
                 }
             },
             Some(AgentSubcommands::SetDefault { name }) => {
-                let mut agents = Agents::load(os, None, true, &mut stderr).await.0;
+                let mut agents = Agents::load(os, None, true, &mut stderr, mcp_enabled).await.0;
                 match agents.switch(&name) {
                     Ok(agent) => {
                         os.database

crates/chat-cli/src/cli/chat/cli/profile.rs

@@ -132,7 +132,9 @@ impl AgentSubcommand {
                     .map_err(|e| ChatError::Custom(format!("Error printing agent schema: {e}").into()))?;
             },
             Self::Create { name, directory, from } => {
-                let mut agents = Agents::load(os, None, true, &mut session.stderr).await.0;
+                let mut agents = Agents::load(os, None, true, &mut session.stderr, session.conversation.mcp_enabled)
+                    .await
+                    .0;
                 let path_with_file_name = create_agent(os, &mut agents, name.clone(), directory, from)
                     .await
                     .map_err(|e| ChatError::Custom(Cow::Owned(e.to_string())))?;
@@ -144,15 +146,8 @@ impl AgentSubcommand {
                     return Err(ChatError::Custom("Editor process did not exit with success".into()));
                 }
 
-                let mcp_enabled = match os.client.is_mcp_enabled().await {
-                    Ok(enabled) => enabled,
-                    Err(err) => {
-                        tracing::warn!(?err, "Failed to check MCP configuration, defaulting to enabled");
-                        true
-                    },
-                };
-
-                let new_agent = Agent::load(os, &path_with_file_name, &mut None, mcp_enabled).await;
+                let new_agent =
+                    Agent::load(os, &path_with_file_name, &mut None, session.conversation.mcp_enabled).await;
                 match new_agent {
                     Ok(agent) => {
                         session.conversation.agents.agents.insert(agent.name.clone(), agent);

crates/chat-cli/src/cli/chat/conversation.rs

@@ -124,6 +124,8 @@ pub struct ConversationState {
     /// Maps from a file path to [FileLineTracker]
     #[serde(default)]
     pub file_line_tracker: HashMap<String, FileLineTracker>,
+    #[serde(default = "default_true")]
+    pub mcp_enabled: bool,
 }
 
 impl ConversationState {
@@ -134,6 +136,7 @@ impl ConversationState {
         tool_manager: ToolManager,
         current_model_id: Option<String>,
         os: &Os,
+        mcp_enabled: bool,
     ) -> Self {
         let model = if let Some(model_id) = current_model_id {
             match get_model_info(&model_id, os).await {
@@ -180,6 +183,7 @@ impl ConversationState {
             model: None,
             model_info: model,
             file_line_tracker: HashMap::new(),
+            mcp_enabled,
         }
     }
 
@@ -1006,6 +1010,9 @@ fn enforce_tool_use_history_invariants(history: &mut VecDeque<HistoryEntry>, too
     }
 }
 
+fn default_true() -> bool {
+    true
+}
 #[cfg(test)]
 mod tests {
     use super::super::message::AssistantToolUse;
@@ -1124,6 +1131,7 @@ mod tests {
             tool_manager,
             None,
             &os,
+            false,
         )
         .await;
 
@@ -1156,6 +1164,7 @@ mod tests {
             tool_manager.clone(),
             None,
             &os,
+            false,
         )
         .await;
         conversation.set_next_user_message("start".to_string()).await;
@@ -1191,6 +1200,7 @@ mod tests {
             tool_manager.clone(),
             None,
             &os,
+            false,
         )
         .await;
         conversation.set_next_user_message("start".to_string()).await;
@@ -1245,6 +1255,7 @@ mod tests {
             tool_manager,
             None,
             &os,
+            false,
         )
         .await;
 

crates/chat-cli/src/cli/chat/mod.rs

@@ -251,9 +251,19 @@ impl ChatArgs {
         let conversation_id = uuid::Uuid::new_v4().to_string();
         info!(?conversation_id, "Generated new conversation id");
 
+        // Check MCP status once at the beginning of the session
+        let mcp_enabled = match os.client.is_mcp_enabled().await {
+            Ok(enabled) => enabled,
+            Err(err) => {
+                tracing::warn!(?err, "Failed to check MCP configuration, defaulting to enabled");
+                true
+            },
+        };
+
         let agents = {
             let skip_migration = self.no_interactive;
-            let (mut agents, md) = Agents::load(os, self.agent.as_deref(), skip_migration, &mut stderr).await;
+            let (mut agents, md) =
+                Agents::load(os, self.agent.as_deref(), skip_migration, &mut stderr, mcp_enabled).await;
             agents.trust_all_tools = self.trust_all_tools;
 
             os.telemetry
@@ -268,9 +278,11 @@ impl ChatArgs {
                 .map_err(|err| error!(?err, "failed to send agent config init telemetry"))
                 .ok();
 
-            if agents
-                .get_active()
-                .is_some_and(|a| !a.mcp_servers.mcp_servers.is_empty())
+            // Only show MCP safety message if MCP is enabled and has servers
+            if mcp_enabled
+                && agents
+                    .get_active()
+                    .is_some_and(|a| !a.mcp_servers.mcp_servers.is_empty())
             {
                 if !self.no_interactive && !os.database.settings.get_bool(Setting::McpLoadedBefore).unwrap_or(false) {
                     execute!(
@@ -364,6 +376,7 @@ impl ChatArgs {
             model_id,
             tool_config,
             !self.no_interactive,
+            mcp_enabled,
         )
         .await?
         .spawn(os)
@@ -589,6 +602,7 @@ impl ChatSession {
         model_id: Option<String>,
         tool_config: HashMap<String, ToolSpec>,
         interactive: bool,
+        mcp_enabled: bool,
     ) -> Result<Self> {
         // Reload prior conversation
         let mut existing_conversation = false;
@@ -624,11 +638,23 @@ impl ChatSession {
                     }
                 }
                 cs.agents = agents;
+                cs.mcp_enabled = mcp_enabled;
                 cs.update_state(true).await;
                 cs.enforce_tool_use_history_invariants();
                 cs
             },
-            false => ConversationState::new(conversation_id, agents, tool_config, tool_manager, model_id, os).await,
+            false => {
+                ConversationState::new(
+                    conversation_id,
+                    agents,
+                    tool_config,
+                    tool_manager,
+                    model_id,
+                    os,
+                    mcp_enabled,
+                )
+                .await
+            },
         };
 
         // Spawn a task for listening and broadcasting sigints.
@@ -2967,6 +2993,7 @@ mod tests {
             None,
             tool_config,
             true,
+            false,
         )
         .await
         .unwrap()
@@ -3108,6 +3135,7 @@ mod tests {
             None,
             tool_config,
             true,
+            false,
         )
         .await
         .unwrap()
@@ -3204,6 +3232,7 @@ mod tests {
             None,
             tool_config,
             true,
+            false,
         )
         .await
         .unwrap()
@@ -3278,6 +3307,7 @@ mod tests {
             None,
             tool_config,
             true,
+            false,
         )
         .await
         .unwrap()
@@ -3328,6 +3358,7 @@ mod tests {
             None,
             tool_config,
             true,
+            false,
         )
         .await
         .unwrap()

crates/chat-cli/src/cli/mcp.rs

@@ -416,7 +416,14 @@ impl StatusArgs {
 async fn get_mcp_server_configs(os: &mut Os) -> Result<BTreeMap<Scope, Vec<(String, Option<McpServerConfig>, bool)>>> {
     let mut results = BTreeMap::new();
     let mut stderr = std::io::stderr();
-    let agents = Agents::load(os, None, true, &mut stderr).await.0;
+    let mcp_enabled = match os.client.is_mcp_enabled().await {
+        Ok(enabled) => enabled,
+        Err(err) => {
+            tracing::warn!(?err, "Failed to check MCP configuration, defaulting to enabled");
+            true
+        },
+    };
+    let agents = Agents::load(os, None, true, &mut stderr, mcp_enabled).await.0;
     let global_path = directories::chat_global_agent_path(os)?;
     for (_, agent) in agents.agents {
         let scope = if agent