@aws/agentcore 1.0.0-preview.1 → 1.0.0-preview.3

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

@@ -110,11 +110,14 @@ async function main() {
     memoryName?: string;
     containerUri?: string;
     hasDockerfile?: boolean;
+    dockerfile?: string;
+    codeLocation?: string;
     tools?: { type: string; name: string }[];
     apiKeyArn?: string;
   }[] = [];
   for (const entry of specAny.harnesses ?? []) {
-    const harnessPath = path.resolve(projectRoot, entry.path, 'harness.json');
+    const harnessDir = path.resolve(projectRoot, entry.path);
+    const harnessPath = path.resolve(harnessDir, 'harness.json');
     try {
       const harnessSpec = JSON.parse(fs.readFileSync(harnessPath, 'utf-8'));
       harnessConfigs.push({
@@ -123,6 +126,8 @@ async function main() {
         memoryName: harnessSpec.memory?.name,
         containerUri: harnessSpec.containerUri,
         hasDockerfile: !!harnessSpec.dockerfile,
+        dockerfile: harnessSpec.dockerfile,
+        codeLocation: harnessSpec.dockerfile ? harnessDir : undefined,
         tools: harnessSpec.tools,
         apiKeyArn: harnessSpec.model?.apiKeyArn,
       });
@@ -184,7 +189,7 @@ exports[`Assets Directory Snapshots > CDK assets > cdk/cdk/cdk.json should match
     "@aws-cdk/aws-ecs-patterns:secGroupsDisablesImplicitOpenListener": true,
     "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
     "@aws-cdk/core:checkSecretUsage": true,
-    "@aws-cdk/core:target-partitions": ["aws", "aws-cn"],
+    "@aws-cdk/core:target-partitions": ["aws", "aws-cn", "aws-us-gov"],
     "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
     "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
     "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
@@ -300,6 +305,18 @@ exports[`Assets Directory Snapshots > CDK assets > cdk/cdk/lib/cdk-stack.ts shou
 import { CfnOutput, Stack, type StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
+export interface HarnessConfig {
+  name: string;
+  executionRoleArn?: string;
+  memoryName?: string;
+  containerUri?: string;
+  hasDockerfile?: boolean;
+  dockerfile?: string;
+  codeLocation?: string;
+  tools?: { type: string; name: string }[];
+  apiKeyArn?: string;
+}
+
 export interface AgentCoreStackProps extends StackProps {
   /**
    * The AgentCore project specification containing agents, memories, and credentials.
@@ -315,16 +332,12 @@ 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?: {
-    name: string;
-    executionRoleArn?: string;
-    memoryName?: string;
-    containerUri?: string;
-    hasDockerfile?: boolean;
-    tools?: { type: string; name: string }[];
-    apiKeyArn?: string;
-  }[];
+  harnesses?: HarnessConfig[];
 }
 
 /**
@@ -345,7 +358,7 @@ export class AgentCoreStack extends Stack {
     // Create AgentCoreApplication with all agents and harness roles
     this.application = new AgentCoreApplication(this, 'Application', {
       spec,
-      harnesses,
+      harnesses: harnesses?.length ? harnesses : undefined,
     });
 
     // Create AgentCoreMcp if there are gateways configured
@@ -1938,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}}
@@ -1946,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")}}
@@ -2773,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}}
@@ -2781,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")}}
@@ -5042,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}}
@@ -5050,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/cdk/bin/cdk.ts

@@ -65,11 +65,14 @@ async function main() {
     memoryName?: string;
     containerUri?: string;
     hasDockerfile?: boolean;
+    dockerfile?: string;
+    codeLocation?: string;
     tools?: { type: string; name: string }[];
     apiKeyArn?: string;
   }[] = [];
   for (const entry of specAny.harnesses ?? []) {
-    const harnessPath = path.resolve(projectRoot, entry.path, 'harness.json');
+    const harnessDir = path.resolve(projectRoot, entry.path);
+    const harnessPath = path.resolve(harnessDir, 'harness.json');
     try {
       const harnessSpec = JSON.parse(fs.readFileSync(harnessPath, 'utf-8'));
       harnessConfigs.push({
@@ -78,6 +81,8 @@ async function main() {
         memoryName: harnessSpec.memory?.name,
         containerUri: harnessSpec.containerUri,
         hasDockerfile: !!harnessSpec.dockerfile,
+        dockerfile: harnessSpec.dockerfile,
+        codeLocation: harnessSpec.dockerfile ? harnessDir : undefined,
         tools: harnessSpec.tools,
         apiKeyArn: harnessSpec.model?.apiKeyArn,
       });

package/dist/assets/cdk/cdk.json

@@ -9,7 +9,7 @@
     "@aws-cdk/aws-ecs-patterns:secGroupsDisablesImplicitOpenListener": true,
     "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
     "@aws-cdk/core:checkSecretUsage": true,
-    "@aws-cdk/core:target-partitions": ["aws", "aws-cn"],
+    "@aws-cdk/core:target-partitions": ["aws", "aws-cn", "aws-us-gov"],
     "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
     "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
     "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,

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

@@ -7,6 +7,18 @@ import {
 import { CfnOutput, Stack, type StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
+export interface HarnessConfig {
+  name: string;
+  executionRoleArn?: string;
+  memoryName?: string;
+  containerUri?: string;
+  hasDockerfile?: boolean;
+  dockerfile?: string;
+  codeLocation?: string;
+  tools?: { type: string; name: string }[];
+  apiKeyArn?: string;
+}
+
 export interface AgentCoreStackProps extends StackProps {
   /**
    * The AgentCore project specification containing agents, memories, and credentials.
@@ -22,16 +34,12 @@ 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?: {
-    name: string;
-    executionRoleArn?: string;
-    memoryName?: string;
-    containerUri?: string;
-    hasDockerfile?: boolean;
-    tools?: { type: string; name: string }[];
-    apiKeyArn?: string;
-  }[];
+  harnesses?: HarnessConfig[];
 }
 
 /**
@@ -52,7 +60,7 @@ export class AgentCoreStack extends Stack {
     // Create AgentCoreApplication with all agents and harness roles
     this.application = new AgentCoreApplication(this, 'Application', {
       spec,
-      harnesses,
+      harnesses: harnesses?.length ? harnesses : undefined,
     });
 
     // Create AgentCoreMcp if there are gateways configured

package/dist/assets/evaluators/python-lambda/execution-role-policy.json

@@ -4,7 +4,7 @@
     {
       "Effect": "Allow",
       "Action": ["logs:CreateLogGroup", "logs:CreateLogStream", "logs:PutLogEvents"],
-      "Resource": "arn:aws:logs:*:*:log-group:/aws/lambda/*"
+      "Resource": "arn:*:logs:*:*:log-group:/aws/lambda/*"
     }
   ]
 }

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")}}