@aws/agentcore 1.0.0-preview.2 → 1.0.0-preview.4

package/dist/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap

@@ -110,8 +110,8 @@ async function main() {
     memoryName?: string;
     containerUri?: string;
     hasDockerfile?: boolean;
-    dockerfileName?: string;
-    harnessDir?: string;
+    dockerfile?: string;
+    codeLocation?: string;
     tools?: { type: string; name: string }[];
     apiKeyArn?: string;
   }[] = [];
@@ -126,8 +126,8 @@ async function main() {
         memoryName: harnessSpec.memory?.name,
         containerUri: harnessSpec.containerUri,
         hasDockerfile: !!harnessSpec.dockerfile,
-        dockerfileName: harnessSpec.dockerfile,
-        harnessDir,
+        dockerfile: harnessSpec.dockerfile,
+        codeLocation: harnessSpec.dockerfile ? harnessDir : undefined,
         tools: harnessSpec.tools,
         apiKeyArn: harnessSpec.model?.apiKeyArn,
       });
@@ -301,10 +301,6 @@ exports[`Assets Directory Snapshots > CDK assets > cdk/cdk/lib/cdk-stack.ts shou
   AgentCoreMcp,
   type AgentCoreProjectSpec,
   type AgentCoreMcpSpec,
-  ContainerSourceAssetFromPath,
-  AgentEcrRepository,
-  ContainerBuildProject,
-  ContainerImageBuilder,
 } from '@aws/agentcore-cdk';
 import { CfnOutput, Stack, type StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
@@ -315,8 +311,8 @@ export interface HarnessConfig {
   memoryName?: string;
   containerUri?: string;
   hasDockerfile?: boolean;
-  dockerfileName?: string;
-  harnessDir?: string;
+  dockerfile?: string;
+  codeLocation?: string;
   tools?: { type: string; name: string }[];
   apiKeyArn?: string;
 }
@@ -336,6 +332,10 @@ export interface AgentCoreStackProps extends StackProps {
   credentials?: Record<string, { credentialProviderArn: string; clientSecretArn?: string }>;
   /**
    * Harness role configurations. Each entry creates an IAM execution role for a harness.
+   *
+   * When \`hasDockerfile\` is true and \`codeLocation\` is provided (without an explicit
+   * \`containerUri\`), the L3 construct builds and pushes a container image via CodeBuild
+   * and emits its URI as a stack output for the post-CDK harness deployer.
    */
   harnesses?: HarnessConfig[];
 }
@@ -355,46 +355,10 @@ export class AgentCoreStack extends Stack {
 
     const { spec, mcpSpec, credentials, harnesses } = props;
 
-    // Build container images for harnesses that specify a dockerfile (no containerUri).
-    // Produces CDK outputs consumed by the imperative harness deployer.
-    const harnessesForCdk = harnesses ? [...harnesses] : [];
-    if (harnesses) {
-      for (let i = 0; i < harnesses.length; i++) {
-        const h = harnesses[i]!;
-        if (h.hasDockerfile && !h.containerUri && h.harnessDir) {
-          const pascalName = h.name.replace(/(^|_)([a-z])/g, (_: string, __: string, c: string) => c.toUpperCase());
-          const sourceAsset = new ContainerSourceAssetFromPath(this, \`Harness\${pascalName}SourceAsset\`, {
-            sourcePath: h.harnessDir,
-          });
-          const ecrRepo = new AgentEcrRepository(this, \`Harness\${pascalName}EcrRepo\`, {
-            projectName: spec.name,
-            agentName: \`harness-\${h.name}\`,
-          });
-          const buildProject = ContainerBuildProject.getOrCreate(this);
-          buildProject.grantPushTo(ecrRepo.repository);
-          sourceAsset.asset.grantRead(buildProject.role);
-
-          const builder = new ContainerImageBuilder(this, \`Harness\${pascalName}ContainerBuild\`, {
-            buildProject,
-            sourceAsset,
-            repository: ecrRepo,
-            dockerfile: h.dockerfileName ?? 'Dockerfile',
-          });
-
-          new CfnOutput(this, \`Harness\${pascalName}ContainerUriOutput\`, {
-            value: builder.containerUri,
-          });
-
-          // Pass the built containerUri to the harness role construct so it gets ECR pull permissions
-          harnessesForCdk[i] = { ...h, containerUri: builder.containerUri };
-        }
-      }
-    }
-
     // Create AgentCoreApplication with all agents and harness roles
     this.application = new AgentCoreApplication(this, 'Application', {
       spec,
-      harnesses: harnessesForCdk.length > 0 ? harnessesForCdk : undefined,
+      harnesses: harnesses?.length ? harnesses : undefined,
     });
 
     // Create AgentCoreMcp if there are gateways configured
@@ -1987,6 +1951,7 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/a2
 
 exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/capabilities/memory/session.py should match snapshot 1`] = `
 "import os
+import uuid
 from typing import Optional
 
 from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
@@ -1995,10 +1960,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
 MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
 REGION = os.getenv("AWS_REGION")
 
-def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
+def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
     if not MEMORY_ID:
         return None
 
+    # AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
+    # without a runtime session header, so synthesize one when absent.
+    session_id = session_id or uuid.uuid4().hex
+
 {{#if memoryProviders.[0].strategies.length}}
     retrieval_config = {
 {{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
@@ -2822,6 +2791,7 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/ag
 
 exports[`Assets Directory Snapshots > Python framework assets > python/python/agui/strands/capabilities/memory/session.py should match snapshot 1`] = `
 "import os
+import uuid
 from typing import Optional
 
 from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
@@ -2830,10 +2800,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
 MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
 REGION = os.getenv("AWS_REGION")
 
-def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
+def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
     if not MEMORY_ID:
         return None
 
+    # AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
+    # without a runtime session header, so synthesize one when absent.
+    session_id = session_id or uuid.uuid4().hex
+
 {{#if memoryProviders.[0].strategies.length}}
     retrieval_config = {
 {{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
@@ -5091,6 +5065,7 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/ht
 
 exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/capabilities/memory/session.py should match snapshot 1`] = `
 "import os
+import uuid
 from typing import Optional
 
 from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
@@ -5099,10 +5074,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
 MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
 REGION = os.getenv("AWS_REGION")
 
-def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
+def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
     if not MEMORY_ID:
         return None
 
+    # AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
+    # without a runtime session header, so synthesize one when absent.
+    session_id = session_id or uuid.uuid4().hex
+
 {{#if memoryProviders.[0].strategies.length}}
     retrieval_config = {
 {{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}

package/dist/assets/__tests__/assets.snapshot.test.ts

@@ -87,36 +87,22 @@ describe('Assets Directory Snapshots', () => {
     });
   });
 
-  describe('Static assets', () => {
+  describe.skipIf(assetFiles.filter(f => f.startsWith('static/')).length === 0)('Static assets', () => {
     const staticFiles = assetFiles.filter(f => f.startsWith('static/'));
 
-    if (staticFiles.length > 0) {
-      it.each(staticFiles)('static/%s should match snapshot', file => {
-        const content = readFileContent(path.join(ASSETS_DIR, file));
-        expect(content).toMatchSnapshot();
-      });
-    } else {
-      it('static directory is empty or does not exist', () => {
-        // Static assets may not exist
-        expect(true).toBe(true);
-      });
-    }
+    it.each(staticFiles)('static/%s should match snapshot', file => {
+      const content = readFileContent(path.join(ASSETS_DIR, file));
+      expect(content).toMatchSnapshot();
+    });
   });
 
-  describe('TypeScript assets', () => {
+  describe.skipIf(assetFiles.filter(f => f.startsWith('typescript/')).length === 0)('TypeScript assets', () => {
     const tsFiles = assetFiles.filter(f => f.startsWith('typescript/'));
 
-    if (tsFiles.length > 0) {
-      it.each(tsFiles)('typescript/%s should match snapshot', file => {
-        const content = readFileContent(path.join(ASSETS_DIR, file));
-        expect(content).toMatchSnapshot();
-      });
-    } else {
-      it('typescript directory is empty or contains only placeholder files', () => {
-        // TypeScript assets may not exist yet
-        expect(true).toBe(true);
-      });
-    }
+    it.each(tsFiles)('typescript/%s should match snapshot', file => {
+      const content = readFileContent(path.join(ASSETS_DIR, file));
+      expect(content).toMatchSnapshot();
+    });
   });
 
   describe('Root-level assets', () => {

package/dist/assets/cdk/bin/cdk.ts

@@ -65,8 +65,8 @@ async function main() {
     memoryName?: string;
     containerUri?: string;
     hasDockerfile?: boolean;
-    dockerfileName?: string;
-    harnessDir?: string;
+    dockerfile?: string;
+    codeLocation?: string;
     tools?: { type: string; name: string }[];
     apiKeyArn?: string;
   }[] = [];
@@ -81,8 +81,8 @@ async function main() {
         memoryName: harnessSpec.memory?.name,
         containerUri: harnessSpec.containerUri,
         hasDockerfile: !!harnessSpec.dockerfile,
-        dockerfileName: harnessSpec.dockerfile,
-        harnessDir,
+        dockerfile: harnessSpec.dockerfile,
+        codeLocation: harnessSpec.dockerfile ? harnessDir : undefined,
         tools: harnessSpec.tools,
         apiKeyArn: harnessSpec.model?.apiKeyArn,
       });

package/dist/assets/cdk/lib/cdk-stack.ts

@@ -3,10 +3,6 @@ import {
   AgentCoreMcp,
   type AgentCoreProjectSpec,
   type AgentCoreMcpSpec,
-  ContainerSourceAssetFromPath,
-  AgentEcrRepository,
-  ContainerBuildProject,
-  ContainerImageBuilder,
 } from '@aws/agentcore-cdk';
 import { CfnOutput, Stack, type StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
@@ -17,8 +13,8 @@ export interface HarnessConfig {
   memoryName?: string;
   containerUri?: string;
   hasDockerfile?: boolean;
-  dockerfileName?: string;
-  harnessDir?: string;
+  dockerfile?: string;
+  codeLocation?: string;
   tools?: { type: string; name: string }[];
   apiKeyArn?: string;
 }
@@ -38,6 +34,10 @@ export interface AgentCoreStackProps extends StackProps {
   credentials?: Record<string, { credentialProviderArn: string; clientSecretArn?: string }>;
   /**
    * Harness role configurations. Each entry creates an IAM execution role for a harness.
+   *
+   * When `hasDockerfile` is true and `codeLocation` is provided (without an explicit
+   * `containerUri`), the L3 construct builds and pushes a container image via CodeBuild
+   * and emits its URI as a stack output for the post-CDK harness deployer.
    */
   harnesses?: HarnessConfig[];
 }
@@ -57,46 +57,10 @@ export class AgentCoreStack extends Stack {
 
     const { spec, mcpSpec, credentials, harnesses } = props;
 
-    // Build container images for harnesses that specify a dockerfile (no containerUri).
-    // Produces CDK outputs consumed by the imperative harness deployer.
-    const harnessesForCdk = harnesses ? [...harnesses] : [];
-    if (harnesses) {
-      for (let i = 0; i < harnesses.length; i++) {
-        const h = harnesses[i]!;
-        if (h.hasDockerfile && !h.containerUri && h.harnessDir) {
-          const pascalName = h.name.replace(/(^|_)([a-z])/g, (_: string, __: string, c: string) => c.toUpperCase());
-          const sourceAsset = new ContainerSourceAssetFromPath(this, `Harness${pascalName}SourceAsset`, {
-            sourcePath: h.harnessDir,
-          });
-          const ecrRepo = new AgentEcrRepository(this, `Harness${pascalName}EcrRepo`, {
-            projectName: spec.name,
-            agentName: `harness-${h.name}`,
-          });
-          const buildProject = ContainerBuildProject.getOrCreate(this);
-          buildProject.grantPushTo(ecrRepo.repository);
-          sourceAsset.asset.grantRead(buildProject.role);
-
-          const builder = new ContainerImageBuilder(this, `Harness${pascalName}ContainerBuild`, {
-            buildProject,
-            sourceAsset,
-            repository: ecrRepo,
-            dockerfile: h.dockerfileName ?? 'Dockerfile',
-          });
-
-          new CfnOutput(this, `Harness${pascalName}ContainerUriOutput`, {
-            value: builder.containerUri,
-          });
-
-          // Pass the built containerUri to the harness role construct so it gets ECR pull permissions
-          harnessesForCdk[i] = { ...h, containerUri: builder.containerUri };
-        }
-      }
-    }
-
     // Create AgentCoreApplication with all agents and harness roles
     this.application = new AgentCoreApplication(this, 'Application', {
       spec,
-      harnesses: harnessesForCdk.length > 0 ? harnessesForCdk : undefined,
+      harnesses: harnesses?.length ? harnesses : undefined,
     });
 
     // Create AgentCoreMcp if there are gateways configured

package/dist/assets/python/a2a/strands/capabilities/memory/session.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from typing import Optional
 
 from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
@@ -7,10 +8,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
 MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
 REGION = os.getenv("AWS_REGION")
 
-def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
+def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
     if not MEMORY_ID:
         return None
 
+    # AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
+    # without a runtime session header, so synthesize one when absent.
+    session_id = session_id or uuid.uuid4().hex
+
 {{#if memoryProviders.[0].strategies.length}}
     retrieval_config = {
 {{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}

package/dist/assets/python/agui/strands/capabilities/memory/session.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from typing import Optional
 
 from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
@@ -7,10 +8,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
 MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
 REGION = os.getenv("AWS_REGION")
 
-def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
+def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
     if not MEMORY_ID:
         return None
 
+    # AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
+    # without a runtime session header, so synthesize one when absent.
+    session_id = session_id or uuid.uuid4().hex
+
 {{#if memoryProviders.[0].strategies.length}}
     retrieval_config = {
 {{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}

package/dist/assets/python/http/strands/capabilities/memory/session.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from typing import Optional
 
 from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
@@ -7,10 +8,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
 MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
 REGION = os.getenv("AWS_REGION")
 
-def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
+def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
     if not MEMORY_ID:
         return None
 
+    # AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
+    # without a runtime session header, so synthesize one when absent.
+    session_id = session_id or uuid.uuid4().hex
+
 {{#if memoryProviders.[0].strategies.length}}
     retrieval_config = {
 {{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}