@aws/agentcore 1.0.0-rc.1 → 1.0.0-rc.4

package/dist/assets/templates/agent-python-strands/model/load.py

@@ -12,7 +12,7 @@ import os
 from strands.models.anthropic import AnthropicModel
 from bedrock_agentcore.identity.auth import requires_api_key
 
-IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_PROVIDER_NAME = os.environ.get("{{identityProviders.[0].envVarName}}_NAME", "{{identityProviders.[0].name}}")
 IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
 
 
@@ -51,7 +51,7 @@ import os
 from strands.models.openai import OpenAIModel
 from bedrock_agentcore.identity.auth import requires_api_key
 
-IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_PROVIDER_NAME = os.environ.get("{{identityProviders.[0].envVarName}}_NAME", "{{identityProviders.[0].name}}")
 IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
 
 
@@ -89,7 +89,7 @@ import os
 from strands.models.gemini import GeminiModel
 from bedrock_agentcore.identity.auth import requires_api_key
 
-IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_PROVIDER_NAME = os.environ.get("{{identityProviders.[0].envVarName}}_NAME", "{{identityProviders.[0].name}}")
 IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
 
 
@@ -130,7 +130,7 @@ from strands.models.litellm import LiteLLMModel
 {{#if identityProviders.[0].name}}
 from bedrock_agentcore.identity.auth import requires_api_key
 
-IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_PROVIDER_NAME = os.environ.get("{{identityProviders.[0].envVarName}}_NAME", "{{identityProviders.[0].name}}")
 IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
 
 

package/dist/assets/templates/agent-python-strands/parse.py

@@ -0,0 +1,41 @@
+from typing import Any
+
+def _strip_trailing_tool_use(messages: Any) -> list[dict]:
+    """Strip toolUse blocks from the tail until the last message has none."""
+    if not isinstance(messages, list):
+        raise ValueError("messages must be a list")
+
+    messages = list(messages)
+    while messages:
+        last = messages[-1]
+        if not isinstance(last, dict):
+            raise ValueError("each message must be an object")
+        original_content = last.get("content", [])
+        if not isinstance(original_content, list) or not all(isinstance(block, dict) for block in original_content):
+            raise ValueError("each message content value must be a list of content blocks")
+
+        content = [block for block in original_content if "toolUse" not in block]
+        if len(content) == len(original_content):
+            break
+        if content:
+            messages[-1] = {**last, "content": content}
+            break
+        messages.pop()
+
+    return messages
+
+def parse_payload(payload: dict):
+    """Accept a caller-supplied message history or a plain prompt string."""
+    if not isinstance(payload, dict):
+        raise ValueError("payload must be a JSON object")
+    actor_id = payload.get("actorId", "default")
+    if not isinstance(actor_id, str):
+        raise ValueError("actorId must be a string")
+    if not actor_id:
+        actor_id = "default"
+    if "messages" in payload:
+        return _strip_trailing_tool_use(payload["messages"]), actor_id
+    prompt = payload.get("prompt", "")
+    if not isinstance(prompt, str):
+        raise ValueError("prompt must be a string")
+    return prompt, actor_id

package/dist/assets/templates/agent-typescript-strands/README.md

@@ -15,8 +15,23 @@ defines an HTTP server that streams tokens from your chosen Agent framework SDK.
 
 ## Input Validation
 
-The generated Zod request schema keeps plain prompts typed as strings before forwarding them to Strands. Retain this
-validation when extending the request shape, and pass only prompt text to the agent.
+The generated Zod request schema keeps the prompt and actor ID typed as strings before forwarding them to Strands.
+Retain this validation when extending the request shape, and pass only prompt text to the agent.
+
+## Payload
+
+The Runtime accepts a JSON object with:
+
+- `prompt` (string) — a single user message; defaults to `""`.
+- `actorId` (string, optional) — identifies the end user for Memory scoping (for example,
+  `/users/{actorId}/facts`); defaults to `"default"`.
+
+The `sessionId` is not in the body. It comes from the
+`X-Amzn-Bedrock-AgentCore-Runtime-Session-Id` header (`context.sessionId`); reuse it to continue a conversation.
+
+```json
+{ "prompt": "What's the weather?", "actorId": "user-123" }
+```
 
 # Developing locally
 
@@ -27,3 +42,9 @@ If installation was successful, `node_modules/` is already populated with depend
 # Deployment
 
 After providing credentials, `agentcore project deploy` will deploy your project into Amazon Bedrock AgentCore.
+
+Invoke the deployed Runtime with its native payload:
+
+```bash
+agentcore project invoke runtime --payload '{"prompt":"Hello!","actorId":"user-123"}'
+```

package/dist/assets/templates/agent-typescript-strands/main.ts

@@ -1,14 +1,8 @@
 import { BedrockAgentCoreApp } from 'bedrock-agentcore/runtime';
-import { Agent, McpClient, tool, type ToolList } from '@strands-agents/sdk';
+import { Agent, tool, type ToolList } from '@strands-agents/sdk';
 import { z } from 'zod';
 import { loadModel } from './model/load.js';
-import { getStreamableHttpMcpClient } from './mcp_client/client.js';
-import { getActorId, getOrCreateMemoryManager } from './memory/memory.js';
-
-// Define a collection of MCP clients (filter out anything that failed to initialize)
-const mcpClients: McpClient[] = [getStreamableHttpMcpClient()].filter(
-  (client): client is McpClient => Boolean(client)
-);
+import { getOrCreateMemoryManager } from './memory/memory.js';
 
 // Define a collection of tools used by the model
 const tools: ToolList = [];
@@ -25,16 +19,13 @@ const addNumbers = tool({
 });
 tools.push(addNumbers);
 
-// Add MCP clients to tools
-tools.push(...mcpClients);
-
 const SYSTEM_PROMPT = `
 You are a helpful assistant. Use tools when appropriate.
 `;
 
 const requestSchema = z.object({
   prompt: z.string().default(''),
-  userId: z.string().optional(),
+  actorId: z.string().default('default').transform((actorId) => actorId || 'default'),
 });
 
 const agentCache = new Map<string, Agent>();
@@ -60,7 +51,7 @@ const app = new BedrockAgentCoreApp({
     requestSchema,
     async *process(payload, context) {
       const sessionId = context?.sessionId ?? 'default-session';
-      const actorId = getActorId(payload, context);
+      const actorId = payload.actorId;
       const agent = await getOrCreateAgent(sessionId, actorId);
 
       try {

package/dist/assets/templates/agent-typescript-strands/memory/memory.ts

@@ -1,19 +1,8 @@
-import { randomUUID } from 'node:crypto';
 import { MemoryManager } from '@strands-agents/sdk';
 import { createAgentCoreMemoryStores } from 'bedrock-agentcore/experimental/memory/strands';
 
 const MEMORY_ID = process.env.{{memoryEnvVarName}};
 
-const CUSTOM_ACTOR_ID_HEADER = 'x-amzn-bedrock-agentcore-runtime-custom-actor-id';
-
-export function getActorId(payload: any, context: any): string {
-  const raw =
-    context?.headers?.[CUSTOM_ACTOR_ID_HEADER] ||
-    payload?.userId ||
-    context?.sessionId;
-  return typeof raw === 'string' && raw.trim().length > 0 ? raw.trim() : randomUUID();
-}
-
 const memoryManagerCache = new Map<string, MemoryManager>();
 
 export function getOrCreateMemoryManager(sessionId: string, actorId: string): MemoryManager | null {
@@ -31,7 +20,7 @@ export function getOrCreateMemoryManager(sessionId: string, actorId: string): Me
       { namespace: '/users/{actorId}/facts' },
       { namespace: '/users/{actorId}/preferences' },
       { namespace: '/episodes/{actorId}/{sessionId}' },
-      { namespace: '/summaries/{actorId}/{sessionId}' },
+      { namespace: '/summaries/{actorId}' },
     ],
     // readMode defaults to 'per-namespace' (one retrieve call per namespace).
     // Switch to 'subtree' to consolidate to a single hierarchical recall call.

package/dist/assets/templates/agent-typescript-strands/package.json.template

@@ -10,7 +10,6 @@
     "dev": "tsx watch main.ts"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "~1.25.2",
     "@opentelemetry/api": "~1.9.0",
     "@strands-agents/sdk": "~1.5.0",
     "bedrock-agentcore": "~0.3.0",

package/dist/assets/templates/agui-python-strands/README.md

@@ -32,7 +32,7 @@ health at `http://127.0.0.1:8080/ping`.
 runtime with an AG-UI `RunAgentInput` payload:
 
 ```bash
-agentcore project invoke runtime --name agui_python_strands \
+agentcore project invoke runtime --name {{ name }} \
   --payload '{"threadId":"t1","runId":"r1","state":{},"messages":[{"id":"m1","role":"user","content":"Hello!"}],"tools":[],"context":[],"forwardedProps":{}}'
 ```
 

package/dist/assets/templates/agui-python-strands/pyproject.toml

@@ -11,7 +11,7 @@ requires-python = ">=3.12"
 dependencies = [
     "ag-ui-strands >= 0.3.0, < 0.4.0",
     "ag-ui-protocol >= 0.1.19, < 0.2.0",
-    "aws-opentelemetry-distro ~= 0.17.0",
+    "aws-opentelemetry-distro ~= 0.18.0",
     "bedrock-agentcore ~= 1.9.1",
     "botocore[crt] ~= 1.43.0",
     "strands-agents ~= 1.15.0",

package/dist/assets/templates/export-harness-python/model/load.py

@@ -89,7 +89,7 @@ from strands.models.openai import OpenAIModel
 {{/if}}
 from bedrock_agentcore.identity.auth import requires_api_key
 
-IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_PROVIDER_NAME = os.environ.get("{{identityProviders.[0].envVarName}}_NAME", "{{identityProviders.[0].name}}")
 IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
 
 
@@ -138,7 +138,7 @@ import os
 from strands.models.gemini import GeminiModel
 from bedrock_agentcore.identity.auth import requires_api_key
 
-IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_PROVIDER_NAME = os.environ.get("{{identityProviders.[0].envVarName}}_NAME", "{{identityProviders.[0].name}}")
 IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
 
 
@@ -194,7 +194,7 @@ from strands.models.litellm import LiteLLMModel
 {{#if identityProviders.[0].name}}
 from bedrock_agentcore.identity.auth import requires_api_key
 
-IDENTITY_PROVIDER_NAME = "{{identityProviders.[0].name}}"
+IDENTITY_PROVIDER_NAME = os.environ.get("{{identityProviders.[0].envVarName}}_NAME", "{{identityProviders.[0].name}}")
 IDENTITY_ENV_VAR = "{{identityProviders.[0].envVarName}}"
 
 

package/dist/assets/templates/harness/harness.yaml

@@ -0,0 +1,225 @@
+# Harness configuration: https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness.html
+
+{{yaml.name}}
+
+# https://docs.aws.amazon.com/bedrock-agentcore-control/latest/APIReference/API_HarnessModelConfiguration.html
+{{yaml.model}}
+{{#unless model.temperature includeZero=true}}
+  # temperature: 0.2
+{{/unless}}
+{{#unless model.topP includeZero=true}}
+  # topP: 0.9
+{{/unless}}
+{{#if modelMaxTokensExample}}
+  # maxTokens: 4096
+{{/if}}
+{{#if (or (eq model.provider "bedrock") (eq model.provider "open_ai"))}}
+{{#unless model.apiFormat}}
+{{#if (eq model.provider "bedrock")}}
+  # apiFormat: converse_stream
+{{else}}
+  # apiFormat: responses
+{{/if}}
+{{/unless}}
+{{/if}}
+{{#unless model.apiKeyArn}}
+  # apiKeyArn: YOUR_API_KEY_PROVIDER_ARN
+{{/unless}}
+
+# Edit system-prompt.md next to this file, or set inline instructions below to override it.
+# systemPrompt: |
+#   You are a helpful assistant.
+#   Ask for clarification when a request is ambiguous.
+
+# Remove this block or set mode to disabled to turn memory off.
+# For existing memory, set mode to existing and add arn or name (for a memory in this project).
+# https://docs.aws.amazon.com/bedrock-agentcore-control/latest/APIReference/API_HarnessMemoryConfiguration.html
+{{yaml.memory}}
+{{#if (eq memory.mode "managed")}}
+{{#if memoryExamples.strategies}}
+  # strategies: [SEMANTIC, SUMMARIZATION, USER_PREFERENCE, EPISODIC]
+{{/if}}
+{{#if memoryExamples.eventExpiryDuration}}
+  # eventExpiryDuration: 30 # Days.
+{{/if}}
+{{/if}}
+
+# Add tools alongside the harness's built-in shell and file operations.
+# Choose a unique name for each entry.
+# For Remote MCP, Gateway, Browser, Code Interpreter, and other tool configurations, see:
+# https://docs.aws.amazon.com/bedrock-agentcore-control/latest/APIReference/API_HarnessTool.html
+{{#if tools.length}}
+{{yaml.tools}}
+{{else}}
+# tools:
+#   - name: research
+#     type: remote_mcp
+#     config:
+#       remoteMcp:
+#         url: https://mcp.example.com/mcp
+{{/if}}
+
+# Limit which available tools the agent can use. "*" allows all available tools.
+# Restrict with patterns such as "@builtin".
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-tools.html
+{{#if yaml.allowedTools}}
+{{yaml.allowedTools}}
+{{else}}
+allowedTools: ["*"]
+{{/if}}
+
+# Load skills from S3 (s3Uri), Git (gitUrl), container files (path), or bundled AWS skills (awsSkills).
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-skills.html
+{{yaml.skills}}
+
+# Controls how conversation history is kept within the model's context window.
+# https://docs.aws.amazon.com/bedrock-agentcore-control/latest/APIReference/API_HarnessTruncationConfiguration.html
+{{#if yaml.truncation}}
+{{yaml.truncation}}
+{{#if (eq truncation.strategy "sliding_window")}}
+{{#unless truncation.config}}
+  # config:
+  #   slidingWindow:
+  #     messagesCount: 40
+{{/unless}}
+{{/if}}
+{{else}}
+truncation:
+  strategy: sliding_window
+  # config:
+  #   slidingWindow:
+  #     messagesCount: 40
+{{/if}}
+
+# Limits for one invocation, across all model calls.
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-operations.html#harness-limits
+{{#if yaml.maxIterations}}
+{{yaml.maxIterations}}
+{{else}}
+# maxIterations: 15
+{{/if}}
+{{#if yaml.maxTokens}}
+{{yaml.maxTokens}}
+{{else}}
+# maxTokens: 20000
+{{/if}}
+{{#if yaml.timeoutSeconds}}
+{{yaml.timeoutSeconds}}
+{{else}}
+# timeoutSeconds: 300
+{{/if}}
+
+# Values must be strings. Put quotes around numbers and booleans.
+# Environment values are stored in plaintext.
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-environment.html
+{{#if yaml.environmentVariables}}
+{{yaml.environmentVariables}}
+{{else}}
+environmentVariables: {}
+{{/if}}
+
+# Use a local Dockerfile or an ECR image. Omit both to use the service-provided environment.
+# Dockerfile paths are relative to this file's directory.
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-environment.html#harness-custom-container
+{{#if yaml.dockerfile}}
+{{yaml.dockerfile}}
+{{else}}
+# dockerfile: Dockerfile
+{{/if}}
+{{#if yaml.containerUri}}
+{{yaml.containerUri}}
+{{else}}
+# containerUri: 123456789012.dkr.ecr.us-west-2.amazonaws.com/my-harness:latest
+{{/if}}
+
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-security.html#harness-network-config
+{{#unless yaml.networkConfig}}
+# To use the VPC example below, change networkMode to VPC and replace the resource IDs.
+{{/unless}}
+# vpcId is required for Dockerfile builds in VPC mode.
+{{#if yaml.networkMode}}
+{{yaml.networkMode}}
+{{else}}
+networkMode: PUBLIC
+{{/if}}
+{{#if yaml.networkConfig}}
+{{yaml.networkConfig}}
+{{else}}
+# networkConfig:
+#   vpcId: vpc-0123456789abcdef0
+#   subnets: [subnet-0123456789abcdef0]
+#   securityGroups: [sg-0123456789abcdef0]
+{{/if}}
+
+# Caller authentication, separate from the credentials used to call models or tools.
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-security.html
+{{#unless yaml.authorizerConfiguration}}
+# To use JWT, change authorizerType to CUSTOM_JWT and configure your identity provider below.
+{{/unless}}
+{{#if yaml.authorizerType}}
+{{yaml.authorizerType}}
+{{else}}
+authorizerType: AWS_IAM
+{{/if}}
+{{#if yaml.authorizerConfiguration}}
+{{yaml.authorizerConfiguration}}
+{{else}}
+# authorizerConfiguration:
+#   customJwtAuthorizer:
+#     discoveryUrl: https://id.example.com/.well-known/openid-configuration
+#     allowedAudience: [my-harness-app]
+{{/if}}
+
+# Deployment will create an execution role when omitted. Manage permissions yourself for a supplied role.
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-security.html#harness-execution-role-policy
+{{#if yaml.executionRoleArn}}
+{{yaml.executionRoleArn}}
+{{else}}
+# executionRoleArn: arn:aws:iam::123456789012:role/MyHarnessRole
+{{/if}}
+
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-operations.html#harness-limits
+{{#if yaml.lifecycleConfig}}
+{{yaml.lifecycleConfig}}
+{{else}}
+# lifecycleConfig:
+#   idleRuntimeSessionTimeout: 900
+#   maxLifetime: 28800
+{{/if}}
+
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-environment.html
+{{#if yaml.sessionStoragePath}}
+{{yaml.sessionStoragePath}}
+{{else}}
+# sessionStoragePath: /mnt/session
+{{/if}}
+
+# EFS and S3 Files mounts require VPC mode. Each entry contains an accessPointArn and mountPath.
+# Mount paths must be under /mnt and must be unique across all filesystem types.
+{{#if yaml.efsAccessPoints}}
+{{yaml.efsAccessPoints}}
+{{else}}
+efsAccessPoints: []
+{{/if}}
+{{#if yaml.s3AccessPoints}}
+{{yaml.s3AccessPoints}}
+{{else}}
+s3AccessPoints: []
+{{/if}}
+
+{{#if yaml.connections}}
+# Grant access to existing resources and expose their connection details as environment variables.
+# This does not add agent tools; declare those under tools.
+{{yaml.connections}}
+
+{{/if}}
+# https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/harness-operations.html
+{{#if yaml.tags}}
+{{yaml.tags}}
+{{else}}
+tags: {}
+{{/if}}
+{{#each additionalSettings}}
+
+{{this}}
+{{/each}}