delete duplicate api call

Author: evanliu048

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

@@ -421,9 +421,6 @@ impl Agents {
             );
         }
 
-        // // Store MCP status in database for later use
-        // let _ = os.database.settings.set(Setting::McpEnabled, mcp_enabled).await;
-
         // Tracking metadata about the performed load operation.
         let mut load_metadata = AgentsLoadMetadata::default();
 

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

@@ -13,23 +13,14 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
-use crate::os::Os;
 
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
 pub struct McpArgs;
 
 impl McpArgs {
-    pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
-        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 {
+    pub async fn execute(self, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+        if !session.conversation.mcp_enabled {
             queue!(
                 session.stderr,
                 style::SetForegroundColor(Color::Yellow),

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

@@ -120,7 +120,7 @@ impl SlashCommand {
             Self::Knowledge(subcommand) => subcommand.execute(os, session).await,
             Self::PromptEditor(args) => args.execute(session).await,
             Self::Compact(args) => args.execute(os, session).await,
-            Self::Tools(args) => args.execute(os, session).await,
+            Self::Tools(args) => args.execute(session).await,
             Self::Issue(args) => {
                 if let Err(err) = args.execute(os).await {
                     return Err(ChatError::Custom(err.to_string().into()));
@@ -133,7 +133,7 @@ impl SlashCommand {
             Self::Prompts(args) => args.execute(session).await,
             Self::Hooks(args) => args.execute(session).await,
             Self::Usage(args) => args.execute(os, session).await,
-            Self::Mcp(args) => args.execute(os, session).await,
+            Self::Mcp(args) => args.execute(session).await,
             Self::Model(args) => args.execute(os, session).await,
             Self::Subscribe(args) => args.execute(os, session).await,
             Self::Persist(subcommand) => subcommand.execute(os, session).await,

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

@@ -33,7 +33,6 @@ use crate::cli::chat::{
     ChatState,
     TRUST_ALL_TEXT,
 };
-use crate::os::Os;
 use crate::util::consts::MCP_SERVER_TOOL_DELIMITER;
 
 #[deny(missing_docs)]
@@ -44,7 +43,7 @@ pub struct ToolsArgs {
 }
 
 impl ToolsArgs {
-    pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+    pub async fn execute(self, session: &mut ChatSession) -> Result<ChatState, ChatError> {
         if let Some(subcommand) = self.subcommand {
             return subcommand.execute(session).await;
         }
@@ -171,15 +170,7 @@ impl ToolsArgs {
             )?;
         }
 
-        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 {
+        if !session.conversation.mcp_enabled {
             queue!(
                 session.stderr,
                 style::SetForegroundColor(Color::Yellow),