Merge branch 'main' into mcp_governance

Author: evanliu048

.github/workflows/release-notification.yaml

@@ -0,0 +1,26 @@
+
+name: Release Notification
+
+on:
+  release:
+    types: [published] # Trigger on new releases being published
+
+jobs:
+  slack_notification:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Release Details to Slack
+        uses: slackapi/[email protected] # Or the latest version of this action
+        with:
+          payload: |
+            {
+              "release_name": "${{ github.event.release.name }}",
+              "tag_name": "${{ github.event.release.tag_name }}",
+              "release_url": "${{ github.event.release.html_url }}",
+              "author_name": "${{ github.event.release.author.login }}",
+              "repository_name": "${{ github.event.repository.name }}",
+              "repository_url": "${{ github.event.repository.html_url }}",
+              "release_description": ${{ toJSON(github.event.release.body) }}
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # Use the secret for the webhook URL

Cargo.lock

@@ -54,10 +54,6 @@ pub use wrapper_types::{
     tool_settings_schema,
 };
 
-use super::chat::tools::execute::ExecuteCommand;
-use super::chat::tools::fs_read::FsRead;
-use super::chat::tools::fs_write::FsWrite;
-use super::chat::tools::use_aws::UseAws;
 use super::chat::tools::{
     DEFAULT_APPROVE,
     NATIVE_TOOLS,
@@ -217,8 +213,8 @@ impl Agent {
 
         self.path = Some(path.to_path_buf());
 
-        let mut stderr = std::io::stderr();
         if let (true, Some(legacy_mcp_config)) = (self.use_legacy_mcp_json, legacy_mcp_config) {
+            let mut stderr = std::io::stderr();
             for (name, legacy_server) in &legacy_mcp_config.mcp_servers {
                 if mcp_servers.mcp_servers.contains_key(name) {
                     let _ = queue!(
@@ -242,58 +238,6 @@ impl Agent {
             }
         }
 
-        stderr.flush()?;
-
-        Ok(())
-    }
-
-    pub fn validate_tool_settings(&self, output: &mut impl Write) -> Result<(), AgentConfigError> {
-        let execute_name = if cfg!(windows) { "execute_cmd" } else { "execute_bash" };
-        for allowed_tool in &self.allowed_tools {
-            if let Some(settings) = self.tools_settings.get(allowed_tool.as_str()) {
-                // currently we only have four native tools that offers tool settings
-                match allowed_tool.as_str() {
-                    "fs_read" => {
-                        if let Some(overridden_settings) = FsRead::allowable_field_to_be_overridden(settings) {
-                            queue_permission_override_warning(
-                                allowed_tool.as_str(),
-                                overridden_settings.as_str(),
-                                output,
-                            )?;
-                        }
-                    },
-                    "fs_write" => {
-                        if let Some(overridden_settings) = FsWrite::allowable_field_to_be_overridden(settings) {
-                            queue_permission_override_warning(
-                                allowed_tool.as_str(),
-                                overridden_settings.as_str(),
-                                output,
-                            )?;
-                        }
-                    },
-                    "use_aws" => {
-                        if let Some(overridden_settings) = UseAws::allowable_field_to_be_overridden(settings) {
-                            queue_permission_override_warning(
-                                allowed_tool.as_str(),
-                                overridden_settings.as_str(),
-                                output,
-                            )?;
-                        }
-                    },
-                    name if name == execute_name => {
-                        if let Some(overridden_settings) = ExecuteCommand::allowable_field_to_be_overridden(settings) {
-                            queue_permission_override_warning(
-                                allowed_tool.as_str(),
-                                overridden_settings.as_str(),
-                                output,
-                            )?;
-                        }
-                    },
-                    _ => {},
-                }
-            }
-        }
-
         Ok(())
     }
 
@@ -912,28 +856,6 @@ async fn load_legacy_mcp_config(os: &Os) -> eyre::Result<Option<McpServerConfig>
     })
 }
 
-pub fn queue_permission_override_warning(
-    tool_name: &str,
-    overridden_settings: &str,
-    output: &mut impl Write,
-) -> Result<(), std::io::Error> {
-    Ok(queue!(
-        output,
-        style::SetForegroundColor(Color::Yellow),
-        style::Print("WARN: "),
-        style::ResetColor,
-        style::Print("You have trusted "),
-        style::SetForegroundColor(Color::Green),
-        style::Print(tool_name),
-        style::ResetColor,
-        style::Print(" tool, which overrides the toolsSettings: "),
-        style::SetForegroundColor(Color::Cyan),
-        style::Print(overridden_settings),
-        style::ResetColor,
-        style::Print("\n"),
-    )?)
-}
-
 fn default_schema() -> String {
     "https://raw.githubusercontent.com/aws/amazon-q-developer-cli/refs/heads/main/schemas/agent-v1.json".into()
 }