feat(DATAGO-118768): Support remote MCP server configuration in sam add agent --gui (#735)

* feat: new ui

* fix: config file formatting bugs

* fix: remove oauth2 configuration, alter headers

* fix: remove duplicate env variables input

* fix: remove blocking deletion, description

* fix: copilot requests

* fix: remove redundant deletion logic

* chore: log message

* Cleanup of orginal change.

* Updated help text

* revert help text back to original

---------

Co-authored-by: Robert Zuchniak <[email protected]>

Author: solace-pjones

cli/commands/add_cmd/agent_cmd.py

@@ -5,7 +5,11 @@
 import click
 import yaml
 
-from config_portal.backend.common import AGENT_DEFAULTS, USE_DEFAULT_SHARED_ARTIFACT, USE_DEFAULT_SHARED_SESSION
+from config_portal.backend.common import (
+    AGENT_DEFAULTS,
+    USE_DEFAULT_SHARED_ARTIFACT,
+    USE_DEFAULT_SHARED_SESSION,
+)
 
 from ...utils import (
     ask_if_not_provided,
@@ -143,6 +147,7 @@ def _write_agent_yaml_from_data(
             Dumper=yaml.SafeDumper,
             default_flow_style=False,
             indent=2,
+            sort_keys=False,
         ).strip()
 
         if "\n" in tools_replacement_value:

config_portal/frontend/app/components/AddAgentFlow.tsx

@@ -111,9 +111,17 @@ const AgentReviewSubmitStep: React.FC<StepProps> = ({
       if (Array.isArray(processedConfig.tools)) {
         processedConfig.tools = processedConfig.tools
           .map((toolInstance) => {
-            const cleanTool: Partial<Tool> = {};
-            if (toolInstance.tool_type)
-              cleanTool.tool_type = toolInstance.tool_type;
+            if (!toolInstance.tool_type) {
+              console.error("Tool is missing tool_type:", toolInstance);
+              return null;
+            }
+
+            // Build tool with explicit field ordering - tool_type MUST be first
+            const cleanTool: Record<string, any> = {
+              tool_type: toolInstance.tool_type,
+            };
+
+            // Add other fields in a specific order after tool_type
             if (toolInstance.tool_name)
               cleanTool.tool_name = toolInstance.tool_name;
             if (toolInstance.tool_description)
@@ -139,10 +147,6 @@ const AgentReviewSubmitStep: React.FC<StepProps> = ({
             if (toolInstance.tool_config)
               cleanTool.tool_config = toolInstance.tool_config;
 
-            if (!cleanTool.tool_type) {
-              console.error("Tool is missing tool_type:", toolInstance);
-              return null;
-            }
             return cleanTool as Tool;
           })
           .filter((tool) => tool !== null) as Tool[];