revert agentcore usecase

Author: maekawataiki

packages/cdk/lambda-python/generic-agent-core-runtime/mcp.json renamed to packages/cdk/assets/mcp-configs/agent-builder.json

@@ -0,0 +1,79 @@
+{
+  "_comment": "MCP Server Configuration",
+  "_metadata_info": {
+    "description": "Each server can include a 'metadata' object with 'category' and 'description' fields",
+    "category_examples": [
+      "AWS",
+      "AI/ML",
+      "Utility",
+      "Search",
+      "Development",
+      "Other"
+    ]
+  },
+  "mcpServers": {
+    "time": {
+      "command": "uvx",
+      "args": ["mcp-server-time"],
+      "metadata": {
+        "category": "Utility",
+        "description": "Provides current time and date functionality"
+      }
+    },
+    "aws-knowledge-mcp-server": {
+      "command": "npx",
+      "args": ["mcp-remote", "https://knowledge-mcp.global.api.aws"],
+      "metadata": {
+        "category": "AWS",
+        "description": "AWS Knowledge Base MCP server for enterprise knowledge access"
+      }
+    },
+    "awslabs.aws-documentation-mcp-server": {
+      "command": "uvx",
+      "args": ["awslabs.aws-documentation-mcp-server@latest"],
+      "metadata": {
+        "category": "AWS",
+        "description": "Access AWS documentation and guides"
+      }
+    },
+    "awslabs.cdk-mcp-server": {
+      "command": "uvx",
+      "args": ["awslabs.cdk-mcp-server@latest"],
+      "metadata": {
+        "category": "AWS",
+        "description": "AWS CDK code generation and assistance"
+      }
+    },
+    "awslabs.aws-diagram-mcp-server": {
+      "command": "uvx",
+      "args": ["awslabs.aws-diagram-mcp-server@latest"],
+      "metadata": {
+        "category": "AWS",
+        "description": "Generate AWS architecture diagrams"
+      }
+    },
+    "awslabs.nova-canvas-mcp-server": {
+      "command": "uvx",
+      "args": ["awslabs.nova-canvas-mcp-server@latest"],
+      "env": {
+        "AWS_REGION": "us-east-1"
+      },
+      "metadata": {
+        "category": "AI/ML",
+        "description": "Amazon Nova Canvas image generation"
+      }
+    },
+    "tavily-search": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "mcp-remote",
+        "https://mcp.tavily.com/mcp/?tavilyApiKey=<key>"
+      ],
+      "metadata": {
+        "category": "Search",
+        "description": "Web search and research capabilities powered by Tavily"
+      }
+    }
+  }
+}

packages/cdk/assets/mcp-configs/generic.json

@@ -63,6 +63,7 @@
     "inlineAgents": false,
     "mcpEnabled": false,
     "flows": [],
+    "agentBuilderEnabled": false,
     "createGenericAgentCoreRuntime": false,
     "agentCoreExternalRuntimes": [],
     "allowedIpV4AddressRanges": null,

packages/cdk/cdk.json

@@ -21,7 +21,7 @@ COPY pyproject.toml .python-version uv.lock ./
 RUN uv sync
 
 # Copy application files
-COPY app.py mcp.json ./
+COPY app.py ./
 COPY src/ ./src/
 
 # Expose port 8080 as required by AgentCore

packages/cdk/lambda-python/generic-agent-core-runtime/Dockerfile

@@ -21,13 +21,6 @@ services:
       - PYTHONUNBUFFERED=1
       - LOG_LEVEL=INFO
 
-      # Code Interpreter settings (optional)
-      - CODE_INTERPRETER_REGION=${AWS_REGION:-us-east-1}
-
-      # Browser tool settings (optional)
-      - STRANDS_BROWSER_HEADLESS=true
-      - STRANDS_BROWSER_WIDTH=1280
-      - STRANDS_BROWSER_HEIGHT=800
       - DISPLAY=:99
       - CHROMIUM_PATH=/usr/bin/chromium
     volumes:
@@ -45,19 +38,3 @@ services:
       retries: 3
       start_period: 40s
     restart: unless-stopped
-
-  # Optional: Add a simple test client
-  test-client:
-    image: curlimages/curl:latest
-    depends_on:
-      - generic-agent-core-runtime
-    command: >
-      sh -c "
-        echo 'Waiting for service to be ready...' &&
-        sleep 10 &&
-        echo 'Testing health endpoint...' &&
-        curl -f http://generic-agent-core-runtime:8080/ping &&
-        echo 'Health check passed!'
-      "
-    profiles:
-      - test

packages/cdk/lambda-python/generic-agent-core-runtime/docker-compose.yml

@@ -40,22 +40,29 @@ def set_session_info(self, session_id: str, trace_id: str):
         self.trace_id = trace_id
 
     def load_mcp_tools(self) -> list[Any]:
-        """Load MCP tools from mcp.json"""
+        """Load MCP tools from environment variable or mcp.json file"""
         if self.mcp_tools is not None:
             return self.mcp_tools
 
         try:
-            # Load MCP configuration from mcp.json file
-            mcp_config_path = "mcp.json"
-            if not os.path.exists(mcp_config_path):
-                logger.warning(f"MCP configuration file not found at {mcp_config_path}")
-                self.mcp_tools = []
-                return self.mcp_tools
+            # First try to load from environment variable
+            mcp_servers_env = os.environ.get("MCP_SERVERS")
+            if mcp_servers_env:
+                logger.info("Loading MCP configuration from environment variable")
+                mcp_servers = json.loads(mcp_servers_env)
+            else:
+                # Fallback to mcp.json file
+                logger.info("Loading MCP configuration from mcp.json file")
+                mcp_config_path = "mcp.json"
+                if not os.path.exists(mcp_config_path):
+                    logger.warning(f"MCP configuration file not found at {mcp_config_path}")
+                    self.mcp_tools = []
+                    return self.mcp_tools
+
+                with open(mcp_config_path) as f:
+                    mcp_config = json.load(f)
+                mcp_servers = mcp_config.get("mcpServers", {})
 
-            with open(mcp_config_path) as f:
-                mcp_config = json.load(f)
-
-            mcp_servers = mcp_config.get("mcpServers", {})
             mcp_clients = []
             uv_env = get_uv_environment()
 
@@ -86,27 +93,32 @@ def load_mcp_tools(self) -> list[Any]:
             return self.mcp_tools
 
     def load_mcp_tools_by_names(self, server_names: list[str]) -> list[Any]:
-        """Load MCP tools from environment variable by server names"""
+        """Load MCP tools from environment variable or mcp.json by server names"""
         if not server_names:
             return []
 
         try:
-            # Load MCP configuration from mcp.json file
-            # Try multiple possible paths
-            mcp_config_path = "mcp.json"
-
-            logger.info(f"Loading MCP configuration from: {mcp_config_path}")
-            with open(mcp_config_path) as f:
-                mcp_config = json.load(f)
+            # First try to load from environment variable
+            mcp_servers_env = os.environ.get("MCP_SERVERS")
+            if mcp_servers_env:
+                logger.info("Loading MCP configuration from environment variable")
+                available_servers = json.loads(mcp_servers_env)
+            else:
+                # Fallback to mcp.json file
+                logger.info("Loading MCP configuration from mcp.json file")
+                mcp_config_path = "mcp.json"
+                logger.info(f"Loading MCP configuration from: {mcp_config_path}")
+                with open(mcp_config_path) as f:
+                    mcp_config = json.load(f)
+                available_servers = mcp_config.get("mcpServers", {})
 
-            available_servers = mcp_config.get("mcpServers", {})
             logger.info(f"Found {len(available_servers)} available MCP servers")
             mcp_clients = []
             uv_env = get_uv_environment()
 
             for server_name in server_names:
                 if server_name not in available_servers:
-                    logger.warning(f"MCP server '{server_name}' not found in mcp.json")
+                    logger.warning(f"MCP server '{server_name}' not found in configuration")
                     continue
 
                 server_config = available_servers[server_name]

packages/cdk/lambda-python/generic-agent-core-runtime/src/tools.py

@@ -16,22 +16,39 @@ export class AgentCoreStack extends Stack {
 
     const params = props.params;
 
-    // Deploy Generic AgentCore Runtime if enabled
-    if (params.createGenericAgentCoreRuntime) {
+    // Deploy Generic AgentCore Runtime if either generic or agentBuilder is enabled
+    if (params.createGenericAgentCoreRuntime || params.agentBuilderEnabled) {
       this.genericAgentCore = new GenericAgentCore(this, 'GenericAgentCore', {
         env: params.env,
+        createGenericRuntime: params.createGenericAgentCoreRuntime,
+        createAgentBuilderRuntime: params.agentBuilderEnabled,
       });
 
-      // Output the runtime ARN for cross-stack reference
-      new CfnOutput(this, 'GenericAgentCoreRuntimeArn', {
-        value: this.genericAgentCore.deployedGenericRuntimeArn || '',
-        exportName: `${this.stackName}-GenericAgentCoreRuntimeArn`,
-      });
+      // Output the generic runtime ARN for cross-stack reference
+      if (params.createGenericAgentCoreRuntime) {
+        new CfnOutput(this, 'GenericAgentCoreRuntimeArn', {
+          value: this.genericAgentCore.deployedGenericRuntimeArn || '',
+          exportName: `${this.stackName}-GenericAgentCoreRuntimeArn`,
+        });
 
-      new CfnOutput(this, 'GenericAgentCoreRuntimeName', {
-        value: this.genericAgentCore.getGenericRuntimeConfig().name,
-        exportName: `${this.stackName}-GenericAgentCoreRuntimeName`,
-      });
+        new CfnOutput(this, 'GenericAgentCoreRuntimeName', {
+          value: this.genericAgentCore.getGenericRuntimeConfig().name,
+          exportName: `${this.stackName}-GenericAgentCoreRuntimeName`,
+        });
+      }
+
+      // Output the AgentBuilder runtime ARN for cross-stack reference
+      if (params.agentBuilderEnabled) {
+        new CfnOutput(this, 'AgentBuilderAgentCoreRuntimeArn', {
+          value: this.genericAgentCore.deployedAgentBuilderRuntimeArn || '',
+          exportName: `${this.stackName}-AgentBuilderAgentCoreRuntimeArn`,
+        });
+
+        new CfnOutput(this, 'AgentBuilderAgentCoreRuntimeName', {
+          value: this.genericAgentCore.getAgentBuilderRuntimeConfig().name,
+          exportName: `${this.stackName}-AgentBuilderAgentCoreRuntimeName`,
+        });
+      }
     }
   }
 
@@ -42,13 +59,27 @@ export class AgentCoreStack extends Stack {
     return this.genericAgentCore?.deployedGenericRuntimeArn;
   }
 
+  /**
+   * Get the deployed AgentBuilder runtime ARN
+   */
+  public get deployedAgentBuilderRuntimeArn(): string | undefined {
+    return this.genericAgentCore?.deployedAgentBuilderRuntimeArn;
+  }
+
   /**
    * Get the generic runtime configuration
    */
   public getGenericRuntimeConfig() {
     return this.genericAgentCore?.getGenericRuntimeConfig();
   }
 
+  /**
+   * Get the AgentBuilder runtime configuration
+   */
+  public getAgentBuilderRuntimeConfig() {
+    return this.genericAgentCore?.getAgentBuilderRuntimeConfig();
+  }
+
   /**
    * Get the file bucket for Agent Core Runtime
    */