Merge branch 'main' into namespaceRedesignControlPlane

Author: nborges-aws

.github/workflows/e2e-tests.yml

@@ -5,6 +5,9 @@ on:
       aws_region:
         description: 'AWS region for deployment'
         default: 'us-east-1'
+      cdk_branch:
+        description: 'CDK repo branch to build from (default: main)'
+        default: 'main'
   pull_request_target:
     branches: [main]
 
@@ -78,9 +81,11 @@ jobs:
 
       # Build @aws/agentcore-cdk from source for cross-package testing.
       # Requires secrets: CDK_REPO_NAME (org/repo), CDK_REPO_TOKEN (fine-grained PAT)
-      - name: Build CDK package from main
+      - name: Build CDK package
         run: |
-          git clone --depth 1 "https://x-access-token:${CDK_REPO_TOKEN}@github.com/${CDK_REPO}.git" /tmp/cdk-repo
+          CDK_BRANCH="${{ inputs.cdk_branch || 'main' }}"
+          echo "Building CDK from branch: $CDK_BRANCH"
+          git clone --depth 1 --branch "$CDK_BRANCH" "https://x-access-token:${CDK_REPO_TOKEN}@github.com/${CDK_REPO}.git" /tmp/cdk-repo
           cd /tmp/cdk-repo
           npm ci
           npm run build

.prettierignore

@@ -1,3 +1,6 @@
 CHANGELOG.md
 src/assets/**/*.md
 .github/scripts/prompts/
+src/assets/**/*.ts
+src/assets/**/*.json
+src/assets/**/*.template

AGENTS.md

@@ -78,7 +78,8 @@ Each primitive extends `BasePrimitive` and implements: `add()`, `remove()`, `pre
 
 Current primitives:
 
-- `AgentPrimitive` — agent creation (template + BYO), removal, credential resolution
+- `AgentPrimitive` — agent creation (template + BYO), removal, credential resolution. Template agents: Strands,
+  LangChain_LangGraph, GoogleADK, OpenAIAgents, VercelAI
 - `MemoryPrimitive` — memory creation with strategies, removal
 - `CredentialPrimitive` — credential creation, .env management, removal
 - `EvaluatorPrimitive` — custom evaluator creation/removal with cross-reference validation

README.md

@@ -62,12 +62,12 @@ agentcore invoke
 
 ## Supported Frameworks
 
-| Framework           | Notes                         |
-| ------------------- | ----------------------------- |
-| Strands Agents      | AWS-native, streaming support |
-| LangChain/LangGraph | Graph-based workflows         |
-| Google ADK          | Gemini models only            |
-| OpenAI Agents       | OpenAI models only            |
+| Framework           | Notes                                               |
+| ------------------- | --------------------------------------------------- |
+| Strands Agents      | AWS-native, streaming support (Python + TypeScript) |
+| LangChain/LangGraph | Graph-based workflows                               |
+| Google ADK          | Gemini models only                                  |
+| OpenAI Agents       | OpenAI models only                                  |
 
 ## Supported Model Providers
 

docs/commands.md

@@ -51,6 +51,13 @@ agentcore create \
 # Skip agent creation
 agentcore create --name MyProject --no-agent
 
+# TypeScript (Strands or Vercel AI)
+agentcore create \
+  --name MyTsProject \
+  --language TypeScript \
+  --framework Strands \
+  --model-provider Bedrock
+
 # Preview without creating
 agentcore create --name MyProject --defaults --dry-run
 
@@ -71,8 +78,8 @@ agentcore create \
 | `--defaults`               | Use defaults (Python, Strands, Bedrock, no memory)                                                             |
 | `--no-agent`               | Skip agent creation                                                                                            |
 | `--type <type>`            | `create` (default) or `import`                                                                                 |
-| `--language <lang>`        | `Python` (default)                                                                                             |
-| `--framework <fw>`         | `Strands`, `LangChain_LangGraph`, `GoogleADK`, `OpenAIAgents`                                                  |
+| `--language <lang>`        | `Python` (default) or `TypeScript` (Strands-only; see [Frameworks](frameworks.md#supported-languages))         |
+| `--framework <fw>`         | `Strands`, `LangChain_LangGraph`, `GoogleADK`, `OpenAIAgents`, `VercelAI`                                      |
 | `--model-provider <p>`     | `Bedrock`, `Anthropic`, `OpenAI`, `Gemini`                                                                     |
 | `--build <type>`           | `CodeZip` (default) or `Container` (see [Container Builds](container-builds.md))                               |
 | `--api-key <key>`          | API key for non-Bedrock providers                                                                              |
@@ -202,7 +209,7 @@ agentcore add agent \
 | `--type <type>`             | `create` (default), `byo`, or `import`                                                                                            |
 | `--build <type>`            | `CodeZip` (default) or `Container` (see [Container Builds](container-builds.md))                                                  |
 | `--language <lang>`         | `Python` (create); `Python`, `TypeScript`, `Other` (BYO)                                                                          |
-| `--framework <fw>`          | `Strands`, `LangChain_LangGraph`, `GoogleADK`, `OpenAIAgents`                                                                     |
+| `--framework <fw>`          | `Strands`, `LangChain_LangGraph`, `GoogleADK`, `OpenAIAgents`, `VercelAI`                                                         |
 | `--model-provider <p>`      | `Bedrock`, `Anthropic`, `OpenAI`, `Gemini`                                                                                        |
 | `--api-key <key>`           | API key for non-Bedrock providers                                                                                                 |
 | `--memory <opt>`            | `none`, `shortTerm`, `longAndShortTerm` (create and import; see [Memory Shorthand Mapping](memory.md#--memory-shorthand-mapping)) |

docs/container-builds.md

@@ -39,7 +39,8 @@ app/MyAgent/
 
 ## Generated Dockerfile
 
-The template uses `ghcr.io/astral-sh/uv:python3.12-bookworm-slim` as the base image with these design choices:
+The template uses `public.ecr.aws/docker/library/python:3.12-slim` as the base image (with `uv` installed via
+`pip install uv`) with these design choices:
 
 - **Layer caching**: Dependencies (`pyproject.toml`) are installed before copying application code
 - **Non-root**: Runs as `bedrock_agentcore` (UID 1000)
@@ -48,6 +49,28 @@ The template uses `ghcr.io/astral-sh/uv:python3.12-bookworm-slim` as the base im
 
 You can customize the Dockerfile freely — add system packages, change the base image, or use multi-stage builds.
 
+### TypeScript Dockerfile
+
+For TypeScript agents, the generated `Dockerfile` uses `public.ecr.aws/docker/library/node:22-slim`:
+
+- **Layer caching**: `package.json` (+ `package-lock.json` if present) is copied first, then `npm ci --omit=dev` runs
+  (falls back to `npm install` when no lockfile is present)
+- **Non-root**: Runs as `bedrock_agentcore` (UID 1000), matching the Python image
+- **Entrypoint**: `npx tsx main.ts` — no compile step, so dev and container runtime share the same entry shape
+- **Ports**: Exposes 8080 / 8000 / 9000 to match the HTTP / MCP / A2A contract
+
+Example `agentcore.json` for a TypeScript container agent:
+
+```json
+{
+  "name": "MyTsAgent",
+  "build": "Container",
+  "entrypoint": "main.ts",
+  "codeLocation": "app/MyTsAgent/",
+  "runtimeVersion": "NODE_22"
+}
+```
+
 ## Configuration
 
 In `agentcore.json`, set `"build": "Container"`:

docs/frameworks.md

@@ -3,6 +3,17 @@
 AgentCore CLI supports multiple agent frameworks for template-based agent creation, plus a BYO (Bring Your Own) option
 for existing code.
 
+## Supported Languages
+
+| Language   | Supported Frameworks | Runtime      | Notes                                                                              |
+| ---------- | -------------------- | ------------ | ---------------------------------------------------------------------------------- |
+| Python     | All frameworks       | Python 3.12+ | Default language. Uses `uv` for dependency management.                             |
+| TypeScript | Strands, Vercel AI   | Node 22      | Uses `npm` + `tsx` for the dev loop. Other frameworks are not yet available in TS. |
+
+Pass `--language TypeScript` to `agentcore create` or `agentcore add agent` to scaffold a TypeScript project. The
+framework is restricted to `Strands` or `VercelAI`; other values are rejected. See
+[Local Development](local-development.md#typescript-agents) for the TS dev loop.
+
 ## Available Frameworks
 
 | Framework               | Supported Model Providers          |
@@ -11,6 +22,7 @@ for existing code.
 | **LangChain_LangGraph** | Bedrock, Anthropic, OpenAI, Gemini |
 | **GoogleADK**           | Gemini only                        |
 | **OpenAIAgents**        | OpenAI only                        |
+| **VercelAI**            | Bedrock, Anthropic, OpenAI, Gemini |
 
 ## Framework Selection Guide
 
@@ -26,8 +38,13 @@ AWS's native agent framework designed for Amazon Bedrock.
 
 **Model providers:** Bedrock, Anthropic, OpenAI, Gemini
 
+**Languages:** Python, TypeScript
+
 ```bash
 agentcore create --framework Strands --model-provider Bedrock
+
+# TypeScript variant
+agentcore create --framework Strands --model-provider Bedrock --language TypeScript
 ```
 
 ### LangChain / LangGraph
@@ -76,6 +93,27 @@ OpenAI's native agent framework.
 agentcore create --framework OpenAIAgents --model-provider OpenAI --api-key sk-...
 ```
 
+### Vercel AI SDK
+
+Vercel's AI SDK for building AI-powered applications.
+
+**Best for:**
+
+- Full-stack AI applications with streaming support
+- Projects using Vercel's ecosystem
+- TypeScript-first agent development
+
+**Model providers:** Bedrock, Anthropic, OpenAI, Gemini
+
+**Languages:** Python, TypeScript
+
+```bash
+agentcore create --framework VercelAI --model-provider Bedrock
+
+# TypeScript variant
+agentcore create --framework VercelAI --model-provider Bedrock --language TypeScript
+```
+
 ## Import from Bedrock Agents
 
 If you have an existing Bedrock Agent, you can import its configuration and translate it into runnable Strands or
@@ -151,19 +189,19 @@ agentcore add agent \
 
 ## Framework Comparison
 
-| Feature                | Strands | LangChain | GoogleADK | OpenAIAgents |
-| ---------------------- | ------- | --------- | --------- | ------------ |
-| Multi-provider support | Yes     | Yes       | No        | No           |
-| AWS Bedrock native     | Yes     | No        | No        | No           |
-| Tool ecosystem         | Growing | Extensive | Moderate  | Moderate     |
-| Memory integration     | Native  | Via libs  | Via libs  | Via libs     |
+| Feature                | Strands | LangChain | GoogleADK | OpenAIAgents | VercelAI |
+| ---------------------- | ------- | --------- | --------- | ------------ | -------- |
+| Multi-provider support | Yes     | Yes       | No        | No           | Yes      |
+| AWS Bedrock native     | Yes     | No        | No        | No           | No       |
+| Tool ecosystem         | Growing | Extensive | Moderate  | Moderate     | Moderate |
+| Memory integration     | Native  | Via libs  | Via libs  | Via libs     | Via libs |
 
 ## Protocol Compatibility
 
 Not all frameworks support all protocol modes. MCP protocol is a standalone tool server with no framework.
 
-| Protocol | Supported Frameworks                                  |
-| -------- | ----------------------------------------------------- |
-| **HTTP** | Strands, LangChain_LangGraph, GoogleADK, OpenAIAgents |
-| **MCP**  | None (standalone tool server)                         |
-| **A2A**  | Strands, GoogleADK, LangChain_LangGraph               |
+| Protocol | Supported Frameworks                                            |
+| -------- | --------------------------------------------------------------- |
+| **HTTP** | Strands, LangChain_LangGraph, GoogleADK, OpenAIAgents, VercelAI |
+| **MCP**  | None (standalone tool server)                                   |
+| **A2A**  | Strands, GoogleADK, LangChain_LangGraph                         |

docs/local-development.md

@@ -42,6 +42,16 @@ The dev server automatically:
 2. Runs `uv sync` to install dependencies from `pyproject.toml`
 3. Starts uvicorn with your agent
 
+### TypeScript Agents
+
+TypeScript agents (Strands-only) use Node 22 and `tsx` for the dev loop:
+
+1. Runs `npm install` on first scaffold to populate `node_modules/` from `package.json`
+2. Starts the agent with `npx tsx watch main.ts` — file changes reload automatically
+3. No compile step is required; `tsx` executes `.ts` sources directly
+
+Set `AGENTCORE_SKIP_INSTALL=1` to skip `npm install` if you want to manage dependencies yourself.
+
 ### API Keys
 
 For non-Bedrock providers, add keys to `agentcore/.env.local`:

e2e-tests/e2e-helper.ts

@@ -28,6 +28,10 @@ interface E2EConfig {
   requiredEnvVar?: string;
   build?: string;
   memory?: string;
+  /** Language for the agent project. Defaults to 'Python'. */
+  language?: 'Python' | 'TypeScript';
+  /** Skip logs and traces tests. */
+  skipObservability?: boolean;
   /** Lifecycle configuration to pass via --idle-timeout / --max-lifetime flags. */
   lifecycleConfig?: {
     idleTimeout?: number;
@@ -37,7 +41,8 @@ interface E2EConfig {
 
 export function createE2ESuite(cfg: E2EConfig) {
   const hasApiKey = !cfg.requiredEnvVar || !!process.env[cfg.requiredEnvVar];
-  const canRun = baseCanRun && hasApiKey;
+  const needsUv = cfg.language !== 'TypeScript';
+  const canRun = prereqs.npm && prereqs.git && hasAws && hasApiKey && (!needsUv || prereqs.uv);
 
   describe.sequential(`e2e: ${cfg.framework}/${cfg.modelProvider} — create → deploy → invoke`, () => {
     let testDir: string;
@@ -58,7 +63,7 @@ export function createE2ESuite(cfg: E2EConfig) {
         '--name',
         agentName,
         '--language',
-        'Python',
+        cfg.language ?? 'Python',
         '--framework',
         cfg.framework,
         '--model-provider',
@@ -221,7 +226,7 @@ export function createE2ESuite(cfg: E2EConfig) {
       120000
     );
 
-    it.skipIf(!canRun)(
+    it.skipIf(!canRun || !!cfg.skipObservability)(
       'logs returns entries from the invocation',
       async () => {
         await retry(
@@ -250,7 +255,7 @@ export function createE2ESuite(cfg: E2EConfig) {
       120000
     );
 
-    it.skipIf(!canRun)(
+    it.skipIf(!canRun || !!cfg.skipObservability)(
       'logs supports level filtering',
       async () => {
         // --level error should succeed even if no error-level logs exist
@@ -261,7 +266,7 @@ export function createE2ESuite(cfg: E2EConfig) {
       120000
     );
 
-    it.skipIf(!canRun)(
+    it.skipIf(!canRun || !!cfg.skipObservability)(
       'traces list succeeds after invocation',
       async () => {
         // traces list has no --json flag — verify exit code and non-empty output

e2e-tests/ts-strands-bedrock.test.ts

@@ -0,0 +1,8 @@
+import { createE2ESuite } from './e2e-helper.js';
+
+createE2ESuite({
+  framework: 'Strands',
+  modelProvider: 'Bedrock',
+  language: 'TypeScript',
+  skipObservability: true,
+});