fix

Author: maekawataiki

packages/cdk/lambda/agentBuilder/router.ts

@@ -61,28 +61,6 @@ export async function routeRequest(
       }
     }
 
-    // Public agents route
-    if (resource === '/agents/public' && httpMethod === 'GET') {
-      return await handleListPublicAgents(userId, exclusiveStartKey, limit);
-    }
-
-    // Import agent route
-    if (resource === '/agents/clone' && httpMethod === 'POST') {
-      const parseResult = validateAndParseRequestBody(body);
-      if (!parseResult.isValid) {
-        return handleError(new Error(parseResult.error!));
-      }
-      return await handleCloneAgent(
-        userId,
-        parseResult.data as CloneAgentRequest
-      );
-    }
-
-    // Favorite agents route
-    if (resource === '/agents/favorites' && httpMethod === 'GET') {
-      return await handleListFavoriteAgents(userId, exclusiveStartKey, limit);
-    }
-
     // Individual agent routes and sub-routes
     if (resource === '/agents/{proxy+}') {
       const pathParts = (pathParameters?.proxy || '').split('/');
@@ -105,6 +83,17 @@ export async function routeRequest(
         return await handleListFavoriteAgents(userId, exclusiveStartKey, limit);
       }
 
+      if (agentId === 'clone' && httpMethod === 'POST') {
+        const parseResult = validateAndParseRequestBody(body);
+        if (!parseResult.isValid) {
+          return handleError(new Error(parseResult.error!));
+        }
+        return await handleCloneAgent(
+          userId,
+          parseResult.data as CloneAgentRequest
+        );
+      }
+
       if (agentId === 'import' && httpMethod === 'POST') {
         const parseResult = validateAndParseRequestBody(body);
         if (!parseResult.isValid) {

packages/cdk/lib/construct/generic-agent-core.ts

@@ -112,12 +112,8 @@ export class GenericAgentCore extends Construct {
       this._sharedAgentCoreRuntimeRole = this.createAgentCoreRuntimeRole();
 
       // Deploy runtimes based on flags
-      if (createGenericRuntime) {
-        this.deployGenericRuntime();
-      }
-      if (createAgentBuilderRuntime) {
-        this.deployAgentBuilderRuntime();
-      }
+      this.deployGenericRuntime();
+      this.deployAgentBuilderRuntime();
     }
   }
 

packages/cdk/lib/construct/use-case-builder.ts

@@ -21,13 +21,13 @@ export interface UseCaseBuilderProps {
   readonly api: RestApi;
   readonly vpc?: IVpc;
   readonly securityGroups?: ISecurityGroup[];
-  readonly createGenericAgentCoreRuntime?: boolean;
+  readonly agentBuilderRuntimeArn?: string;
 }
 export class UseCaseBuilder extends Construct {
   constructor(scope: Construct, id: string, props: UseCaseBuilderProps) {
     super(scope, id);
 
-    const { userPool, api, createGenericAgentCoreRuntime } = props;
+    const { userPool, api, agentBuilderRuntimeArn } = props;
 
     const useCaseIdIndexName = 'UseCaseIdIndexName';
     const useCaseBuilderTable = new ddb.Table(this, 'UseCaseBuilderTable', {
@@ -243,7 +243,7 @@ export class UseCaseBuilder extends Construct {
       commonAuthorizerProps
     );
 
-    if (createGenericAgentCoreRuntime) {
+    if (agentBuilderRuntimeArn) {
       // Add Agent Builder related APIs
       const agentBuilderFunction = new NodejsFunction(this, 'AgentBuilder', {
         ...commonProperty,
@@ -276,30 +276,24 @@ export class UseCaseBuilder extends Construct {
       });
       agentBuilderFunction.role?.addToPrincipalPolicy(cognitoPolicyForAgent);
 
-      // Agent Builder API endpoints
+      // Agent Builder API endpoints - all routes handled by proxy+ integration
       const agentsResource = api.root.addResource('agents');
 
-      // GET: /agents
+      // Handle root /agents requests
       agentsResource.addMethod(
-        'GET',
-        new LambdaIntegration(agentBuilderFunction),
-        commonAuthorizerProps
-      );
-
-      // POST: /agents
-      agentsResource.addMethod(
-        'POST',
+        'ANY',
         new LambdaIntegration(agentBuilderFunction),
         commonAuthorizerProps
       );
 
       // All agent sub-routes handled by proxy+ integration
-      const agentResource = agentsResource.addResource('{proxy+}');
-      agentResource.addMethod(
-        'ANY',
-        new LambdaIntegration(agentBuilderFunction),
-        commonAuthorizerProps
-      );
+      agentsResource
+        .addResource('{proxy+}')
+        .addMethod(
+          'ANY',
+          new LambdaIntegration(agentBuilderFunction),
+          commonAuthorizerProps
+        );
     }
   }
 }

packages/cdk/lib/construct/web.ts

@@ -66,6 +66,7 @@ export interface WebProps {
   readonly cognitoIdentityPoolProxyEndpoint?: string;
   readonly agentCoreEnabled: boolean;
   readonly agentCoreGenericRuntime?: AgentCoreConfiguration;
+  readonly agentBuilderEnabled: boolean;
   readonly agentCoreAgentBuilderRuntime?: AgentCoreConfiguration;
   readonly agentCoreExternalRuntimes: AgentCoreConfiguration[];
   readonly agentCoreRegion?: string;
@@ -298,6 +299,8 @@ export class Web extends Construct {
         VITE_APP_AGENT_CORE_GENERIC_RUNTIME: JSON.stringify(
           props.agentCoreGenericRuntime
         ),
+        VITE_APP_AGENT_CORE_AGENT_BUILDER_ENABLED:
+          props.agentBuilderEnabled.toString(),
         VITE_APP_AGENT_CORE_AGENT_BUILDER_RUNTIME: JSON.stringify(
           props.agentCoreAgentBuilderRuntime
         ),

packages/cdk/lib/create-stacks.ts

@@ -231,8 +231,9 @@ export const createStacks = (app: cdk.App, params: ProcessedStackInput) => {
       // Agent
       agents: agentStack?.agents,
       // Agent Core
-      agentCoreStack: agentCoreStack || undefined,
       createGenericAgentCoreRuntime: params.createGenericAgentCoreRuntime,
+      agentBuilderEnabled: params.agentBuilderEnabled,
+      agentCoreStack: agentCoreStack || undefined,
       // Video Generation
       videoBucketRegionMap,
       // Guardrail

packages/cdk/lib/generative-ai-use-cases-stack.ts

@@ -40,6 +40,7 @@ export interface GenerativeAiUseCasesStackProps extends StackProps {
   readonly agents?: Agent[];
   // Agent Core
   readonly createGenericAgentCoreRuntime?: boolean;
+  readonly agentBuilderEnabled?: boolean;
   readonly agentCoreStack?: AgentCoreStack;
   // Video Generation
   readonly videoBucketRegionMap: Record<string, string>;
@@ -257,6 +258,7 @@ export class GenerativeAiUseCasesStack extends Stack {
             description: 'Generic Agent Core Runtime for custom agents',
           }
         : undefined,
+      agentBuilderEnabled: params.agentBuilderEnabled,
       agentCoreAgentBuilderRuntime: agentBuilderRuntimeArn
         ? {
             name: agentBuilderRuntimeName || 'AgentBuilderAgentCoreRuntime',
@@ -353,7 +355,7 @@ export class GenerativeAiUseCasesStack extends Stack {
         api: api.api,
         vpc: props.vpc,
         securityGroups,
-        createGenericAgentCoreRuntime: props.createGenericAgentCoreRuntime,
+        agentBuilderRuntimeArn,
       });
     }
 
@@ -505,6 +507,10 @@ export class GenerativeAiUseCasesStack extends Stack {
         : 'null',
     });
 
+    new CfnOutput(this, 'AgentCoreAgentBuilderEnabled', {
+      value: params.agentBuilderEnabled.toString(),
+    });
+
     new CfnOutput(this, 'AgentCoreAgentBuilderRuntime', {
       value: agentBuilderRuntimeArn
         ? JSON.stringify({