@aws/nx-plugin 1.0.0-rc.12 → 1.0.0-rc.13

package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -782,7 +782,7 @@ exports[`ts#mcp-server generator > should match snapshot for generated files > u
   },
   "dependencies": {
     "@aws-lambda-powertools/parameters": "2.33.1",
-    "@aws-sdk/client-appconfigdata": "3.1063.0",
+    "@aws-sdk/client-appconfigdata": "3.1068.0",
     "@modelcontextprotocol/sdk": "1.29.0",
     "express": "5.2.1",
     "zod": "4.4.3"

package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap

@@ -7,6 +7,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   root: import.meta.dirname,
@@ -25,11 +27,13 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
     tailwindcss(),
   ],
   // Uncomment this if you are using workers.
   // worker: {
-  //  plugins: [],
+  //   plugins: () => [ nxViteTsPaths() ],
   // },
   build: {
     outDir: '../dist/test-app',
@@ -48,7 +52,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
   },
@@ -64,6 +68,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   root: import.meta.dirname,
@@ -82,10 +88,12 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
   ],
   // Uncomment this if you are using workers.
   // worker: {
-  //  plugins: [],
+  //   plugins: () => [ nxViteTsPaths() ],
   // },
   build: {
     outDir: '../dist/test-app',
@@ -104,7 +112,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
   },
@@ -932,7 +940,18 @@ vitest.config.*.timestamp*
 runtime-config.json"
 `;
 
-exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > .prettierrc 1`] = `"{"singleQuote":true}"`;
+exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > .prettierignore 1`] = `
+"# Add files here to ignore them from prettier formatting
+/dist
+/coverage
+/.nx/cache
+/.nx/workspace-data"
+`;
+
+exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > .prettierrc 1`] = `
+"{ "singleQuote": true }
+"
+`;
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > biome.json 1`] = `
 "{
@@ -1076,10 +1095,10 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.189",
-    "@cloudscape-design/components": "3.0.1308",
-    "@cloudscape-design/global-styles": "1.0.59",
-    "aws-cdk-lib": "2.258.0",
+    "@cloudscape-design/board-components": "3.0.190",
+    "@cloudscape-design/components": "3.0.1310",
+    "@cloudscape-design/global-styles": "1.0.60",
+    "aws-cdk-lib": "2.259.0",
     "constructs": "10.6.0",
     "react": "19.2.7",
     "react-dom": "19.2.7",
@@ -1097,7 +1116,7 @@ exports[`react-website generator > Tanstack router integration > should generate
     "@tailwindcss/vite": "4.2.2",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.3.0",
-    "@types/node": "25.9.2",
+    "@types/node": "25.9.3",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@vitejs/plugin-react": "^6.0.0",
@@ -1105,6 +1124,7 @@ exports[`react-website generator > Tanstack router integration > should generate
     "@vitest/ui": "4.1.8",
     "jiti": "2.4.2",
     "jsdom": "~22.1.0",
+    "prettier": "~3.6.2",
     "typescript": "~5.9.2",
     "vite": "8.0.16",
     "vitest": "4.1.8"
@@ -1948,9 +1968,9 @@ export default defineConfig(() => ({
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > pnpm-workspace.yaml 1`] = `
 "packages:
-  - "packages/*"
-  - "test-app"
-  - "packages/common/*"
+  - 'packages/*'
+  - 'test-app'
+  - 'packages/common/*'
 "
 `;
 
@@ -2005,7 +2025,7 @@ In order to integrate with cognito or trpc backends, you need to have a \`runtim
 `;
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > test-app/index.html 1`] = `
-"<!DOCTYPE html>
+"<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -2406,9 +2426,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > test-app/tsconfig.spec.json 1`] = `
 "{
-  "extends": "../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
+    "outDir": "../dist/out-tsc",
     "types": [
       "vitest/globals",
       "vitest/importMeta",
@@ -2448,6 +2468,8 @@ exports[`react-website generator > Tanstack router integration > should generate
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   root: import.meta.dirname,
@@ -2460,10 +2482,15 @@ export default defineConfig(() => ({
     port: 4300,
     host: 'localhost',
   },
-  plugins: [react(), tailwindcss()],
+  plugins: [
+    react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
+    tailwindcss(),
+  ],
   // Uncomment this if you are using workers.
   // worker: {
-  //  plugins: [],
+  //   plugins: () => [ nxViteTsPaths() ],
   // },
   build: {
     outDir: '../dist/test-app',
@@ -2482,7 +2509,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
   },
@@ -2535,7 +2562,18 @@ vitest.config.*.timestamp*
 runtime-config.json"
 `;
 
-exports[`react-website generator > Tanstack router integration > should generate website with router correctly > .prettierrc 1`] = `"{"singleQuote":true}"`;
+exports[`react-website generator > Tanstack router integration > should generate website with router correctly > .prettierignore 1`] = `
+"# Add files here to ignore them from prettier formatting
+/dist
+/coverage
+/.nx/cache
+/.nx/workspace-data"
+`;
+
+exports[`react-website generator > Tanstack router integration > should generate website with router correctly > .prettierrc 1`] = `
+"{ "singleQuote": true }
+"
+`;
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > biome.json 1`] = `
 "{
@@ -2679,11 +2717,11 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.189",
-    "@cloudscape-design/components": "3.0.1308",
-    "@cloudscape-design/global-styles": "1.0.59",
+    "@cloudscape-design/board-components": "3.0.190",
+    "@cloudscape-design/components": "3.0.1310",
+    "@cloudscape-design/global-styles": "1.0.60",
     "@tanstack/react-router": "1.170.15",
-    "aws-cdk-lib": "2.258.0",
+    "aws-cdk-lib": "2.259.0",
     "constructs": "10.6.0",
     "react": "19.2.7",
     "react-dom": "19.2.7",
@@ -2705,7 +2743,7 @@ exports[`react-website generator > Tanstack router integration > should generate
     "@tanstack/virtual-file-routes": "1.162.0",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.3.0",
-    "@types/node": "25.9.2",
+    "@types/node": "25.9.3",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@vitejs/plugin-react": "^6.0.0",
@@ -2713,6 +2751,7 @@ exports[`react-website generator > Tanstack router integration > should generate
     "@vitest/ui": "4.1.8",
     "jiti": "2.4.2",
     "jsdom": "~22.1.0",
+    "prettier": "~3.6.2",
     "typescript": "~5.9.2",
     "vite": "8.0.16",
     "vitest": "4.1.8"
@@ -3556,9 +3595,9 @@ export default defineConfig(() => ({
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > pnpm-workspace.yaml 1`] = `
 "packages:
-  - "packages/*"
-  - "test-app"
-  - "packages/common/*"
+  - 'packages/*'
+  - 'test-app'
+  - 'packages/common/*'
 "
 `;
 
@@ -3613,7 +3652,7 @@ In order to integrate with cognito or trpc backends, you need to have a \`runtim
 `;
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > test-app/index.html 1`] = `
-"<!DOCTYPE html>
+"<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -4198,9 +4237,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > test-app/tsconfig.spec.json 1`] = `
 "{
-  "extends": "../tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
+    "outDir": "../dist/out-tsc",
     "types": [
       "vitest/globals",
       "vitest/importMeta",
@@ -4242,6 +4281,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   root: import.meta.dirname,
@@ -4260,11 +4301,13 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
     tailwindcss(),
   ],
   // Uncomment this if you are using workers.
   // worker: {
-  //  plugins: [],
+  //   plugins: () => [ nxViteTsPaths() ],
   // },
   build: {
     outDir: '../dist/test-app',
@@ -4283,7 +4326,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
   },
@@ -4355,6 +4398,8 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite';
 /// <reference types='vitest' />
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
   root: import.meta.dirname,
@@ -4373,11 +4418,13 @@ export default defineConfig(() => ({
       generatedRouteTree: resolve(__dirname, 'src/routeTree.gen.ts'),
     }),
     react(),
+    nxViteTsPaths(),
+    nxCopyAssetsPlugin(['*.md']),
     tailwindcss(),
   ],
   // Uncomment this if you are using workers.
   // worker: {
-  //  plugins: [],
+  //   plugins: () => [ nxViteTsPaths() ],
   // },
   build: {
     outDir: '../dist/test-app',
@@ -4396,7 +4443,7 @@ export default defineConfig(() => ({
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     reporters: ['default'],
     coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
+      reportsDirectory: '../coverage/test-app',
       provider: 'v8' as const,
     },
   },
@@ -5011,11 +5058,11 @@ root &&
 
 exports[`react-website generator > should handle npm scope prefix correctly > scoped-dependencies 1`] = `
 {
-  "@cloudscape-design/board-components": "3.0.189",
-  "@cloudscape-design/components": "3.0.1308",
-  "@cloudscape-design/global-styles": "1.0.59",
+  "@cloudscape-design/board-components": "3.0.190",
+  "@cloudscape-design/components": "3.0.1310",
+  "@cloudscape-design/global-styles": "1.0.60",
   "@tanstack/react-router": "1.170.15",
-  "aws-cdk-lib": "2.258.0",
+  "aws-cdk-lib": "2.259.0",
   "constructs": "10.6.0",
   "react": "19.2.7",
   "react-dom": "19.2.7",

package/src/utils/agent-chat/agent-chat.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Tree } from '@nx/devkit';
+export type AgentChatProtocol = 'http' | 'a2a' | 'ag-ui';
+export type AgentChatAuth = 'iam' | 'cognito';
+export interface AddAgentChatScriptsOptions {
+    /** Absolute (tree) directory to emit the chat scripts into. */
+    scriptsDir: string;
+    protocol: AgentChatProtocol;
+    /** Agent server language. Only affects the HTTP chat adapter. */
+    language: 'ts' | 'py';
+    /** Construct class name — the runtime-config key for the deployed agent. */
+    agentNameClassName: string;
+    /** Authentication used by the deployed agent. */
+    auth: AgentChatAuth;
+    /**
+     * Import path to the agent's `client.ts` (TypeScript HTTP agents only),
+     * relative to the chat script.
+     */
+    relativeAgentImport?: string;
+}
+/**
+ * Emit the chat CLI scripts for an agent. Every protocol gets a small
+ * `chat.ts` that connects to the local `serve-local` server by default, and
+ * to the deployed agent on Bedrock AgentCore (resolved from runtime config)
+ * when `RUNTIME_CONFIG_APP_ID` is set. The shared `agentcore.ts` helper
+ * handles ARN resolution and request authentication.
+ */
+export declare const addAgentChatScripts: (tree: Tree, options: AddAgentChatScriptsOptions) => void;

package/src/utils/agent-chat/agent-chat.js

@@ -0,0 +1,30 @@
+"use strict";
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAgentChatScripts = void 0;
+const devkit_1 = require("@nx/devkit");
+/**
+ * Emit the chat CLI scripts for an agent. Every protocol gets a small
+ * `chat.ts` that connects to the local `serve-local` server by default, and
+ * to the deployed agent on Bedrock AgentCore (resolved from runtime config)
+ * when `RUNTIME_CONFIG_APP_ID` is set. The shared `agentcore.ts` helper
+ * handles ARN resolution and request authentication.
+ */
+const addAgentChatScripts = (tree, options) => {
+    const templateContext = {
+        agentNameClassName: options.agentNameClassName,
+        auth: options.auth,
+        relativeAgentImport: options.relativeAgentImport ?? '',
+    };
+    // Shared remote-resolution + auth helper, used by every protocol.
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common'), options.scriptsDir, templateContext, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    // Protocol-specific chat adapter. HTTP differs by server language; A2A and
+    // AG-UI speak standard protocols so the same script serves both languages.
+    const protocolDir = options.protocol === 'http' ? `http-${options.language}` : options.protocol;
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', protocolDir), options.scriptsDir, templateContext, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+};
+exports.addAgentChatScripts = addAgentChatScripts;
+//# sourceMappingURL=agent-chat.js.map

package/src/utils/agent-chat/agent-chat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-chat.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-chat/agent-chat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,uCAIoB;AAsBpB;;;;;;GAMG;AACI,MAAM,mBAAmB,GAAG,CACjC,IAAU,EACV,OAAmC,EAC7B,EAAE;IACR,MAAM,eAAe,GAAG;QACtB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,EAAE;KACvD,CAAC;IAEF,kEAAkE;IAClE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC/C,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,2EAA2E;IAC3E,2EAA2E;IAC3E,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC9E,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,EAClD,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,mBAAmB,uBA8B9B"}

package/src/utils/agent-chat/files/a2a/chat.ts.template

@@ -0,0 +1,33 @@
+// Chat CLI for <%- agentNameClassName %> (A2A protocol). Connects to the local
+// `serve-local` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
+import {
+  ClientFactory,
+  ClientFactoryOptions,
+  DefaultAgentCardResolver,
+  JsonRpcTransportFactory,
+} from '@a2a-js/sdk/client';
+import { A2AChatAdapter, chatLoop } from 'agent-chat-cli';
+import { createAgentCoreFetch, resolveRemoteAgent } from './agentcore.js';
+
+const remote = await resolveRemoteAgent();
+
+const url = remote
+  ? `https://bedrock-agentcore.${remote.region}.amazonaws.com/runtimes/${encodeURIComponent(remote.arn)}/invocations/`
+  : process.env.URL!;
+
+// Remote requests are authenticated via a custom fetch; locally the default client talks plain HTTP.
+const clientFactory = remote
+  ? new ClientFactory({
+      ...ClientFactoryOptions.default,
+      transports: [
+        new JsonRpcTransportFactory({
+          fetchImpl: createAgentCoreFetch(<%- auth === 'iam' ? 'remote.region' : '' %>),
+        }),
+      ],
+      cardResolver: new DefaultAgentCardResolver({
+        fetchImpl: createAgentCoreFetch(<%- auth === 'iam' ? 'remote.region' : '' %>),
+      }),
+    })
+  : undefined;
+
+await chatLoop(new A2AChatAdapter({ clientFactory }), url);

package/src/utils/agent-chat/files/ag-ui/chat.ts.template

@@ -0,0 +1,17 @@
+// Chat CLI for <%- agentNameClassName %> (AG-UI protocol). Connects to the local
+// `serve-local` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
+import { AGUIChatAdapter, chatLoop } from 'agent-chat-cli';
+import { createAgentCoreFetch, resolveRemoteAgent } from './agentcore.js';
+
+const remote = await resolveRemoteAgent();
+
+const url = remote
+  ? `https://bedrock-agentcore.${remote.region}.amazonaws.com/runtimes/${encodeURIComponent(remote.arn)}/invocations?qualifier=DEFAULT`
+  : process.env.URL!;
+
+// Remote requests are authenticated via a custom fetch; locally the default agent talks plain HTTP.
+const fetchImpl = remote
+  ? createAgentCoreFetch(<%- auth === 'iam' ? 'remote.region' : '' %>)
+  : undefined;
+
+await chatLoop(new AGUIChatAdapter({ fetch: fetchImpl }), url);

package/src/utils/agent-chat/files/common/agentcore.ts.template

@@ -0,0 +1,81 @@
+// Resolves the deployed <%- agentNameClassName %> agent from runtime config and authenticates requests to it.
+import { randomUUID } from 'node:crypto';
+import { getAppConfig } from '@aws-lambda-powertools/parameters/appconfig';
+<%_ if (auth === 'iam') { _%>
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { AwsClient } from 'aws4fetch';
+<%_ } _%>
+
+const SESSION_HEADER = 'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id';
+
+// AgentCore session ids must be at least 33 characters.
+export const SESSION_ID = randomUUID().replaceAll('-', '').padEnd(33, '0');
+
+export interface RemoteAgent {
+  /** ARN of the deployed Bedrock AgentCore runtime. */
+  arn: string;
+  /** AWS region parsed from the runtime ARN. */
+  region: string;
+}
+
+// Returns the deployed agent when `RUNTIME_CONFIG_APP_ID` is set, otherwise `undefined` to chat locally.
+export const resolveRemoteAgent = async (): Promise<
+  RemoteAgent | undefined
+> => {
+  const application = process.env.RUNTIME_CONFIG_APP_ID;
+  if (!application) {
+    return undefined;
+  }
+  const config = (await getAppConfig('agentcore', {
+    application,
+    environment: 'default',
+    transform: 'json',
+  })) as { agentRuntimes?: Record<string, string> };
+  const arn = config?.agentRuntimes?.['<%- agentNameClassName %>'];
+  if (!arn) {
+    throw new Error(
+      `No deployed agent named '<%- agentNameClassName %>' found in runtime configuration (application ${application}).`,
+    );
+  }
+  return { arn, region: arn.split(':')[3] };
+};
+
+<%_ if (auth === 'cognito') { _%>
+/** The Cognito access token used to authenticate with the deployed agent. */
+export const getAccessToken = (): string => {
+  const accessToken = process.env.AGENT_ACCESS_TOKEN;
+  if (!accessToken) {
+    throw new Error(
+      'AGENT_ACCESS_TOKEN is not set. Provide a Cognito access token to chat with the deployed agent.',
+    );
+  }
+  return accessToken;
+};
+<%_ } _%>
+
+// A `fetch` that authenticates requests to the deployed agent and forwards the session id.
+<%_ if (auth === 'iam') { _%>
+export const createAgentCoreFetch = (region: string): typeof fetch => {
+  const credentialProvider = fromNodeProviderChain();
+  return async (input, init) => {
+    const headers = new Headers(init?.headers);
+    headers.set(SESSION_HEADER, SESSION_ID);
+    const client = new AwsClient({
+      ...(await credentialProvider()),
+      service: 'bedrock-agentcore',
+      region,
+    });
+    return client.fetch(input, { ...init, headers });
+  };
+};
+<%_ } else { _%>
+export const createAgentCoreFetch = (): typeof fetch => {
+  const accessToken = getAccessToken();
+  return (input, init) => {
+    const headers = new Headers(init?.headers);
+    headers.set(SESSION_HEADER, SESSION_ID);
+    headers.set('Authorization', `Bearer ${accessToken}`);
+    return fetch(input, { ...init, headers });
+  };
+};
+<%_ } _%>

package/src/utils/agent-chat/files/http-py/chat.ts.template

@@ -0,0 +1,43 @@
+// Chat CLI for <%- agentNameClassName %> (Python FastAPI / JSONL streaming), using the
+// generated client. Connects to the local `serve-local` server, or the deployed
+// agent when `RUNTIME_CONFIG_APP_ID` is set.
+import { chatLoop, type ChatAdapter } from 'agent-chat-cli';
+import { <%- agentNameClassName %> } from './generated/client.gen.js';
+import {
+  createAgentCoreFetch,
+  resolveRemoteAgent,
+  SESSION_ID,
+} from './agentcore.js';
+
+const SESSION_ID_HEADER = 'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id';
+
+const remote = await resolveRemoteAgent();
+
+class <%- agentNameClassName %>Adapter implements ChatAdapter {
+  private client!: <%- agentNameClassName %>;
+
+  async connect(url: string) {
+    this.client = remote
+      ? new <%- agentNameClassName %>({
+          url: `https://bedrock-agentcore.${remote.region}.amazonaws.com/runtimes/${encodeURIComponent(remote.arn)}`,
+          fetch: createAgentCoreFetch(<%- auth === 'iam' ? 'remote.region' : '' %>),
+        })
+      : new <%- agentNameClassName %>({
+          url,
+          fetch: (input, init) => {
+            const headers = new Headers(init?.headers);
+            headers.set(SESSION_ID_HEADER, SESSION_ID);
+            return fetch(input, { ...init, headers });
+          },
+        });
+    return { agentName: '<%- agentNameClassName %>' };
+  }
+
+  async *sendMessage(text: string): AsyncIterable<string> {
+    for await (const chunk of this.client.invoke({ message: text })) {
+      if (typeof chunk.content === 'string') yield chunk.content;
+    }
+  }
+}
+
+await chatLoop(new <%- agentNameClassName %>Adapter(), process.env.URL ?? '');

package/src/utils/agent-chat/files/http-ts/chat.ts.template

@@ -0,0 +1,54 @@
+// Chat CLI for <%- agentNameClassName %> (HTTP / tRPC WebSocket). Connects to the local
+// `serve-local` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
+import { chatLoop, type ChatAdapter } from 'agent-chat-cli';
+import { <%- agentNameClassName %>Client } from '<%- relativeAgentImport %>/client.js';
+import {
+  resolveRemoteAgent,
+  SESSION_ID,
+<%_ if (auth === 'cognito') { _%>
+  getAccessToken,
+<%_ } _%>
+} from './agentcore.js';
+
+const remote = await resolveRemoteAgent();
+
+class TrpcWebSocketAdapter implements ChatAdapter {
+  private client!: ReturnType<typeof <%- agentNameClassName %>Client.local>;
+
+  async connect(url: string) {
+    this.client = remote
+<%_ if (auth === 'iam') { _%>
+      ? <%- agentNameClassName %>Client.withIamAuth({
+          agentRuntimeArn: remote.arn,
+          sessionId: SESSION_ID,
+        })
+<%_ } else { _%>
+      ? <%- agentNameClassName %>Client.withJwtAuth({
+          agentRuntimeArn: remote.arn,
+          sessionId: SESSION_ID,
+          accessTokenProvider: async () => getAccessToken(),
+        })
+<%_ } _%>
+      : <%- agentNameClassName %>Client.local({ url, sessionId: SESSION_ID });
+    return { agentName: '<%- agentNameClassName %>' };
+  }
+
+  async *sendMessage(text: string): AsyncIterable<string> {
+    const stream = new ReadableStream<string>({
+      start: (controller) => {
+        this.client.invoke.subscribe(
+          { message: text },
+          {
+            onData: (chunk: string) => controller.enqueue(chunk),
+            onComplete: () => controller.close(),
+            onError: (err: unknown) => controller.error(err),
+          },
+        );
+      },
+    });
+
+    yield* stream as unknown as AsyncIterable<string>;
+  }
+}
+
+await chatLoop(new TrpcWebSocketAdapter(), process.env.URL ?? '');