Agent Builder

docs/en/DEPLOY_OPTION.md

@@ -689,6 +689,8 @@ Enabling `createGenericAgentCoreRuntime` will deploy the default AgentCore Runti
 By default, it is deployed to the `modelRegion`, but you can override this by specifying `agentCoreRegion`.
 
 The default agents available in AgentCore can utilize MCP servers defined in [mcp.json](https://github.com/aws-samples/generative-ai-use-cases/blob/main/packages/cdk/lambda-python/generic-agent-core-runtime/mcp.json).
+This default agent is available in Agent Builder, and users can create any agent from MCPs that administrators have permitted.
+
 The MCP servers defined by default are AWS-related MCP servers and MCP servers related to current time.
 For details, please refer to the documentation [here](https://awslabs.github.io/mcp/).
 When adding MCP servers, please add them to the aforementioned `mcp.json`.

docs/ja/DEPLOY_OPTION.md

@@ -704,6 +704,8 @@ AgentCore で作成したエージェントと連携するユースケースで
 デフォルトでは `modelRegion` にデプロイされますが、`agentCoreRegion` を指定し上書きすることが可能です。
 
 AgentCore で使用できるデフォルトのエージェントは、[mcp.json](https://github.com/aws-samples/generative-ai-use-cases/blob/main/packages/cdk/lambda-python/generic-agent-core-runtime/mcp.json) で定義する MCP サーバーを利用することができます。
+このデフォルトのエージェントは Agent Builder で利用でき、ユーザーは管理者が許可した MCP から任意のエージェントを作成することができます。
+
 デフォルトで定義されている MCP サーバーは、AWS に関連する MCP サーバー及び、現在時刻に関連する MCP サーバーです。
 詳細は[こちら](https://awslabs.github.io/mcp/)のドキュメントをご参照ください。
 MCP サーバーを追加する場合は上述の `mcp.json` に追記してください。

docs/overrides/home_en.html

@@ -188,6 +188,23 @@ <h3 class="mb-2 text-xl font-semibold">Agent Chat</h3>
             </p>
           </div>
         </div>
+        <div class="swiper-slide">
+          <div class="rounded-lg bg-white p-6 shadow-lg">
+            <img
+              src="../assets/images/usecase_agentbuilder.gif"
+              alt="Agent Builder"
+              class="mb-4 w-full rounded-lg" />
+            <h3 class="mb-2 text-xl font-semibold">Agent Builder</h3>
+            <p class="text-sm text-gray-600">
+              Agent Builder is a comprehensive platform for creating, managing,
+              and deploying custom AI agents within GenU. Build agents with
+              specialized capabilities using MCP servers, and custom system
+              prompts. Organize your agents with tags and share them in
+              organization, or integrate external Bedrock Agents and AgentCore
+              runtimes for enhanced functionality.
+            </p>
+          </div>
+        </div>
         <div class="swiper-slide">
           <div class="rounded-lg bg-white p-6 shadow-lg">
             <img

docs/overrides/home_ja.html

@@ -178,6 +178,20 @@ <h3 class="mb-2 text-xl font-semibold">Agent チャット</h3>
             </p>
           </div>
         </div>
+        <div class="swiper-slide">
+          <div class="rounded-lg bg-white p-6 shadow-lg">
+            <img
+              src="../assets/images/usecase_agentbuilder.gif"
+              alt="Agent Builder"
+              class="mb-4 w-full rounded-lg" />
+            <h3 class="mb-2 text-xl font-semibold">Agent Builder</h3>
+            <p class="text-sm text-gray-600">
+              Agent
+              Builderは、GenU内でカスタムAIエージェントを作成、管理、デプロイするための包括的なプラットフォームです。MCPサーバーとカスタムシステムプロンプトを使用して、専門的な機能を持つエージェントを構築できます。タグでエージェントを整理し、公開にして共有したり、外部のBedrock
+              AgentsやAgentCoreランタイムを統合して機能を拡張したりできます。
+            </p>
+          </div>
+        </div>
         <div class="swiper-slide">
           <div class="rounded-lg bg-white p-6 shadow-lg">
             <img

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

@@ -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/cdk.json

@@ -64,7 +64,9 @@
     "inlineAgents": false,
     "mcpEnabled": false,
     "flows": [],
+    "agentBuilderEnabled": false,
     "createGenericAgentCoreRuntime": false,
+    "agentCoreRegion": null,
     "agentCoreExternalRuntimes": [],
     "allowedIpV4AddressRanges": null,
     "allowedIpV6AddressRanges": null,