add notification when /mcp & /tools

Author: evanliu048

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

@@ -336,22 +336,19 @@ impl ApiClient {
     }
 
     pub async fn is_mcp_enabled(&self) -> Result<bool, ApiClientError> {
-        let request = self
-            .client
-            .get_profile()
-            .set_profile_arn(self.profile.as_ref().map(|p| p.arn.clone()));
-
-        let response = request.send().await?;
-        // yifan todo delete print
-        eprintln!("response {:?}", response);
-        tracing::debug!("response is {:?}", response);
-        let mcp_enabled = response
-            .profile()
-            .opt_in_features()
-            .and_then(|features| features.mcp_configuration())
-            .is_none_or(|config| matches!(config.toggle(), OptInFeatureToggle::On));
-        Ok(mcp_enabled)
-        // Ok(true)
+        // let request = self
+        //     .client
+        //     .get_profile()
+        //     .set_profile_arn(self.profile.as_ref().map(|p| p.arn.clone()));
+
+        // let response = request.send().await?;
+        // let mcp_enabled = response
+        //     .profile()
+        //     .opt_in_features()
+        //     .and_then(|features| features.mcp_configuration())
+        //     .is_none_or(|config| matches!(config.toggle(), OptInFeatureToggle::On));
+        // Ok(mcp_enabled)
+        Ok(false)
     }
 
     pub async fn create_subscription_token(&self) -> Result<CreateSubscriptionTokenOutput, ApiClientError> {

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

@@ -470,24 +470,14 @@ impl Agents {
             },
         };
 
-        // Yifan delete log
-        let _ = queue!(
-            output,
-            style::SetForegroundColor(Color::Red),
-            style::Print("MCP status: "),
-            style::ResetColor,
-            style::Print(mcp_enabled),
-            style::Print("\n")
-        );
-
         if !mcp_enabled {
             let _ = execute!(
                 output,
                 style::SetForegroundColor(Color::Yellow),
+                style::Print("\n"),
                 style::Print("⚠️  WARNING: "),
                 style::SetForegroundColor(Color::Reset),
-                style::Print("MCP functionality has been disabled by your administrator.\n"),
-                style::Print("MCP servers will not be loaded for this session.\n\n")
+                style::Print("MCP functionality has been disabled by your administrator.\n\n"),
             );
         }
 

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

@@ -1,9 +1,10 @@
 use std::io::Write;
 
 use clap::Args;
-use crossterm::{
-    queue,
-    style,
+use crossterm::queue;
+use crossterm::style::{
+    self,
+    Color,
 };
 
 use crate::cli::chat::tool_manager::LoadingRecord;
@@ -12,13 +13,37 @@ 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, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+    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 {
+            queue!(
+                session.stderr,
+                style::SetForegroundColor(Color::Yellow),
+                style::Print("\n"),
+                style::Print("⚠️  WARNING: "),
+                style::SetForegroundColor(Color::Reset),
+                style::Print("MCP functionality has been disabled by your administrator.\n\n"),
+            )?;
+            session.stderr.flush()?;
+            return Ok(ChatState::PromptUser {
+                skip_printing_tools: true,
+            });
+        }
+
         let terminal_width = session.terminal_width();
         let still_loading = session
             .conversation

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(session).await,
+            Self::Tools(args) => args.execute(os, 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(session).await,
+            Self::Mcp(args) => args.execute(os, 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,6 +33,7 @@ use crate::cli::chat::{
     ChatState,
     TRUST_ALL_TEXT,
 };
+use crate::os::Os;
 use crate::util::consts::MCP_SERVER_TOOL_DELIMITER;
 
 #[deny(missing_docs)]
@@ -43,7 +44,7 @@ pub struct ToolsArgs {
 }
 
 impl ToolsArgs {
-    pub async fn execute(self, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+    pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
         if let Some(subcommand) = self.subcommand {
             return subcommand.execute(session).await;
         }
@@ -170,6 +171,25 @@ 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 {
+            queue!(
+                session.stderr,
+                style::SetForegroundColor(Color::Yellow),
+                style::Print("\n"),
+                style::Print("⚠️  WARNING: "),
+                style::SetForegroundColor(Color::Reset),
+                style::Print("MCP functionality has been disabled by your administrator.\n\n"),
+            )?;
+        }
+
         Ok(ChatState::default())
     }