set mcp_enabled value after load

Author: evanliu048

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

@@ -336,19 +336,18 @@ 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?;
-        // 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)
+        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)
     }
 
     pub async fn create_subscription_token(&self) -> Result<CreateSubscriptionTokenOutput, ApiClientError> {

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

@@ -849,7 +849,7 @@ fn default_schema() -> String {
     "https://raw.githubusercontent.com/aws/amazon-q-developer-cli/refs/heads/main/schemas/agent-v1.json".into()
 }
 
-fn is_mcp_ref(s: &str) -> bool {
+pub fn is_mcp_ref(s: &str) -> bool {
     // Any tool reference starting with '@' is considered MCP (e.g., "@git", "@git/git_status").
     s.starts_with('@')
 }

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

@@ -95,6 +95,8 @@ impl PersistSubcommand {
 
                 let mut new_state: ConversationState = tri!(serde_json::from_str(&contents), "import from", &path);
                 std::mem::swap(&mut new_state.tool_manager, &mut session.conversation.tool_manager);
+                std::mem::swap(&mut new_state.mcp_enabled, &mut session.conversation.mcp_enabled);
+                std::mem::swap(&mut new_state.model_info, &mut session.conversation.model_info);
                 std::mem::swap(
                     &mut new_state.context_manager,
                     &mut session.conversation.context_manager,