@aws/nx-plugin 1.0.0-rc.2 → 1.0.0-rc.21

package/src/ts/agent/a2a-connection/__snapshots__/generator.spec.ts.snap

@@ -0,0 +1,256 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`ts#agent#a2a-connection generator > should match snapshot for agent-connection src files > agent-connection-index.ts 1`] = `
+"export * from './app/remote-client-strands.js';
+export * from './core/model-errors-strands.js';
+export * from './core/with-session-id-strands.js';
+export * from './core/session-context.js';
+// Export your library code here
+"
+`;
+
+exports[`ts#agent#a2a-connection generator > should match snapshot for agent-connection src files > agentcore-a2a-client-config.ts 1`] = `
+"import {
+  ClientFactory,
+  ClientFactoryOptions,
+  DefaultAgentCardResolver,
+  JsonRpcTransportFactory,
+} from '@a2a-js/sdk/client';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { a2aUrlFromArn, regionFromArn } from './agentcore-endpoints.js';
+import {
+  createJwtFetch,
+  createPlainFetch,
+  createSigV4Fetch,
+} from './agentcore-fetch.js';
+
+/** Common options for resolving an AgentCore A2A endpoint. */
+export interface AgentCoreA2aClientConfigOptions {
+  /** The ARN of the Bedrock AgentCore Runtime to connect to. */
+  agentRuntimeArn: string;
+}
+
+/** Options for an A2A client config with IAM authentication. */
+export interface AgentCoreA2aClientConfigIamOptions
+  extends AgentCoreA2aClientConfigOptions {
+  /** AWS credential provider; defaults to the standard provider chain. */
+  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
+}
+
+/** Options for an A2A client config with JWT authentication. */
+export interface AgentCoreA2aClientConfigJwtOptions
+  extends AgentCoreA2aClientConfigOptions {
+  /** A function which returns the JWT access token used to authenticate. */
+  accessTokenProvider: () => Promise<string>;
+}
+
+/** Options for an A2A client config with no auth (local dev). */
+export interface AgentCoreA2aClientConfigNoAuthOptions {
+  /** Full URL of the local A2A endpoint. */
+  url: string;
+}
+
+/** A resolved A2A endpoint and a configured \`@a2a-js\` client factory. */
+export interface A2aClientConfig {
+  /** The A2A endpoint URL. */
+  url: string;
+  /** A client factory wired with a signed, session-forwarding fetch. */
+  clientFactory: ClientFactory;
+}
+
+const build = (url: string, fetchFn: typeof fetch): A2aClientConfig => {
+  const clientFactory = new ClientFactory({
+    ...ClientFactoryOptions.default,
+    transports: [new JsonRpcTransportFactory({ fetchImpl: fetchFn })],
+    cardResolver: new DefaultAgentCardResolver({ fetchImpl: fetchFn }),
+  });
+  return { url, clientFactory };
+};
+
+/**
+ * Factory for A2A client configs that connect to a Bedrock AgentCore runtime.
+ * Each forwards the current async-context session via the AgentCore session
+ * header. Framework-agnostic — wrap the result in a framework's A2A client.
+ */
+export class AgentCoreA2aClientConfig {
+  /** SigV4-authenticated A2A client config for a Bedrock AgentCore runtime. */
+  static withIamAuth(
+    options: AgentCoreA2aClientConfigIamOptions,
+  ): A2aClientConfig {
+    return build(
+      a2aUrlFromArn(options.agentRuntimeArn),
+      createSigV4Fetch({
+        region: regionFromArn(options.agentRuntimeArn),
+        credentialProvider: options.credentialProvider,
+      }),
+    );
+  }
+
+  /** Bearer-authenticated A2A client config for a Bedrock AgentCore runtime. */
+  static withJwtAuth(
+    options: AgentCoreA2aClientConfigJwtOptions,
+  ): A2aClientConfig {
+    return build(
+      a2aUrlFromArn(options.agentRuntimeArn),
+      createJwtFetch(options.accessTokenProvider),
+    );
+  }
+
+  /** For local dev — plain HTTP, no auth. */
+  static withoutAuth(
+    options: AgentCoreA2aClientConfigNoAuthOptions,
+  ): A2aClientConfig {
+    return build(options.url, createPlainFetch());
+  }
+}
+"
+`;
+
+exports[`ts#agent#a2a-connection generator > should match snapshot for agent-connection src files > agentcore-a2a-client-strands.ts 1`] = `
+"import { A2AAgent } from '@strands-agents/sdk/a2a';
+import {
+  type A2aClientConfig,
+  AgentCoreA2aClientConfig,
+  type AgentCoreA2aClientConfigIamOptions,
+  type AgentCoreA2aClientConfigJwtOptions,
+  type AgentCoreA2aClientConfigNoAuthOptions,
+} from './agentcore-a2a-client-config.js';
+
+/** Optional friendly metadata for the remote agent. */
+export interface StrandsA2aOptions {
+  /** Optional friendly name for the remote agent. */
+  name?: string;
+  /** Optional description for the remote agent. */
+  description?: string;
+}
+
+/** Strands A2A clients for a Bedrock AgentCore runtime. */
+export class AgentCoreA2aClientStrands {
+  private static build(
+    { url, clientFactory }: A2aClientConfig,
+    options: StrandsA2aOptions,
+  ): A2AAgent {
+    return new A2AAgent({
+      url,
+      clientFactory,
+      ...(options.name ? { name: options.name } : {}),
+      ...(options.description ? { description: options.description } : {}),
+    });
+  }
+
+  /** SigV4-authenticated client for a Bedrock AgentCore runtime. */
+  static withIamAuth(
+    options: AgentCoreA2aClientConfigIamOptions & StrandsA2aOptions,
+  ): A2AAgent {
+    return AgentCoreA2aClientStrands.build(
+      AgentCoreA2aClientConfig.withIamAuth(options),
+      options,
+    );
+  }
+
+  /** Bearer-authenticated client for a Bedrock AgentCore runtime. */
+  static withJwtAuth(
+    options: AgentCoreA2aClientConfigJwtOptions & StrandsA2aOptions,
+  ): A2AAgent {
+    return AgentCoreA2aClientStrands.build(
+      AgentCoreA2aClientConfig.withJwtAuth(options),
+      options,
+    );
+  }
+
+  /** For local dev — plain HTTP, no auth. */
+  static withoutAuth(
+    options: AgentCoreA2aClientConfigNoAuthOptions & StrandsA2aOptions,
+  ): A2AAgent {
+    return AgentCoreA2aClientStrands.build(
+      AgentCoreA2aClientConfig.withoutAuth(options),
+      options,
+    );
+  }
+}
+"
+`;
+
+exports[`ts#agent#a2a-connection generator > should match snapshot for agent-connection src files > agentcore-fetch.ts 1`] = `
+"import { AwsClient } from 'aws4fetch';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { getCurrentSessionId } from './session-context.js';
+
+const SESSION_HEADER = 'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id';
+
+/** Wrap a fetch so each request carries the current async-context session id. */
+const withSessionHeader =
+  (inner: typeof fetch): typeof fetch =>
+  async (input, init) => {
+    const headers = new Headers(init?.headers);
+    const sessionId = getCurrentSessionId();
+    if (sessionId) headers.set(SESSION_HEADER, sessionId);
+    return inner(input, { ...init, headers });
+  };
+
+/** Options for a SigV4-signing fetch. */
+export interface SigV4FetchOptions {
+  /** AWS region to sign for. */
+  region: string;
+  /** AWS service to sign for. Defaults to \`bedrock-agentcore\`. */
+  service?: string;
+  /** AWS credential provider; defaults to the standard provider chain. */
+  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
+}
+
+/** A fetch that signs every request with AWS SigV4 (per-request, body-aware). */
+export const createSigV4Fetch = (options: SigV4FetchOptions): typeof fetch => {
+  const { region, service = 'bedrock-agentcore' } = options;
+  const credentialProvider =
+    options.credentialProvider ?? fromNodeProviderChain();
+  const signedFetch: typeof fetch = async (...args) => {
+    const client = new AwsClient({
+      ...(await credentialProvider()),
+      service,
+      region,
+    });
+    return client.fetch(...args);
+  };
+  return withSessionHeader(signedFetch);
+};
+
+/** A fetch that adds a bearer token from the given async provider. */
+export const createJwtFetch = (
+  accessTokenProvider: () => Promise<string>,
+): typeof fetch =>
+  withSessionHeader(async (input, init) => {
+    const headers = new Headers(init?.headers);
+    headers.set('Authorization', \`Bearer \${await accessTokenProvider()}\`);
+    return fetch(input, { ...init, headers });
+  });
+
+/** A plain fetch (local dev) that still forwards the session id. */
+export const createPlainFetch = (): typeof fetch => withSessionHeader(fetch);
+"
+`;
+
+exports[`ts#agent#a2a-connection generator > should match snapshot for agent-connection src files > remote-client-strands.ts 1`] = `
+"import { A2AAgent } from '@strands-agents/sdk/a2a';
+import { AgentCoreA2aClientStrands } from '../core/agentcore-a2a-client-strands.js';
+import { getAgentCoreRuntimeConfig } from '../core/runtime-config.js';
+
+/** Strands client for the Remote A2A agent. */
+export class RemoteClientStrands {
+  static async create(): Promise<A2AAgent> {
+    if (process.env.SERVE_LOCAL === 'true') {
+      return AgentCoreA2aClientStrands.withoutAuth({
+        url: 'http://localhost:9000/',
+      });
+    }
+    const config = await getAgentCoreRuntimeConfig();
+    const agentRuntimeArn = config.agentRuntimes?.['Remote'];
+    if (!agentRuntimeArn) {
+      throw new Error(
+        \`No connected agent runtime named 'Remote' found in runtime configuration.\`,
+      );
+    }
+    return AgentCoreA2aClientStrands.withIamAuth({ agentRuntimeArn });
+  }
+}
+"
+`;

package/src/ts/agent/a2a-connection/files/agent-connection/app/__targetAgentKebabCase__-client-strands.ts.template

@@ -0,0 +1,23 @@
+import { A2AAgent } from '@strands-agents/sdk/a2a';
+import { AgentCoreA2aClientStrands } from '../core/agentcore-a2a-client-strands.js';
+import { getAgentCoreRuntimeConfig } from '../core/runtime-config.js';
+
+/** Strands client for the <%- targetAgentClassName %> A2A agent. */
+export class <%- targetAgentClassName %>ClientStrands {
+  static async create(): Promise<A2AAgent> {
+    if (process.env.SERVE_LOCAL === 'true') {
+      return AgentCoreA2aClientStrands.withoutAuth({
+        url: 'http://localhost:<%- targetAgentPort %>/',
+      });
+    }
+    const config = await getAgentCoreRuntimeConfig();
+    const agentRuntimeArn =
+      config.agentRuntimes?.['<%- targetAgentClassName %>'];
+    if (!agentRuntimeArn) {
+      throw new Error(
+        `No connected agent runtime named '<%- targetAgentClassName %>' found in runtime configuration.`,
+      );
+    }
+    return AgentCoreA2aClientStrands.withIamAuth({ agentRuntimeArn });
+  }
+}

package/src/ts/agent/a2a-connection/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import { TsAgentA2aConnectionGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { TsAgentA2aConnectionGeneratorSchema } from './schema';
 export declare const TS_AGENT_A2A_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsAgentA2aConnectionGenerator: (tree: Tree, options: TsAgentA2aConnectionGeneratorSchema) => Promise<GeneratorCallback>;
 export default tsAgentA2aConnectionGenerator;

package/src/ts/agent/a2a-connection/generator.js

@@ -6,14 +6,14 @@ exports.tsAgentA2aConnectionGenerator = exports.TS_AGENT_A2A_CONNECTION_GENERATO
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../../utils/nx");
-const metrics_1 = require("../../../utils/metrics");
+const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
+const ast_1 = require("../../../utils/ast");
 const format_1 = require("../../../utils/format");
+const metrics_1 = require("../../../utils/metrics");
 const names_1 = require("../../../utils/names");
-const versions_1 = require("../../../utils/versions");
 const npm_scope_1 = require("../../../utils/npm-scope");
-const ast_1 = require("../../../utils/ast");
-const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
+const nx_1 = require("../../../utils/nx");
+const versions_1 = require("../../../utils/versions");
 exports.TS_AGENT_A2A_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const tsAgentA2aConnectionGenerator = async (tree, options) => {
     const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
@@ -37,7 +37,7 @@ const tsAgentA2aConnectionGenerator = async (tree, options) => {
     const npmScope = (0, npm_scope_1.getNpmScope)(tree);
     // 1. Ensure the shared agent-connection project exists + has the A2A core client
     await (0, agent_connection_1.ensureTypeScriptAgentConnectionProject)(tree);
-    (0, agent_connection_1.addTypeScriptCoreClient)(tree, 'a2a');
+    await (0, agent_connection_1.addTypeScriptCoreClient)(tree, 'a2a');
     // 2. Generate the per-connection <Name>Client into app/
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'agent-connection', 'app'), (0, devkit_1.joinPathFragments)(agent_connection_1.AGENT_CONNECTION_PROJECT_DIR, 'src', 'app'), {
         targetAgentKebabCase,
@@ -45,12 +45,12 @@ const tsAgentA2aConnectionGenerator = async (tree, options) => {
         targetAgentPort,
     }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     // Add re-export to index.ts
-    await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(agent_connection_1.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), `./app/${targetAgentKebabCase}-client.js`);
+    await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(agent_connection_1.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), `./app/${targetAgentKebabCase}-client-strands.js`);
     // 3. AST transform agent.ts to add the remote A2A agent as a tool
     const agentSourceDir = (0, devkit_1.joinPathFragments)(sourceProject.root, agentComponent.path ?? 'src');
     const agentFilePath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'agent.ts');
     if (tree.exists(agentFilePath)) {
-        const clientClassName = `${targetAgentClassName}Client`;
+        const clientClassName = `${targetAgentClassName}ClientStrands`;
         const clientVarName = targetAgentClassName.charAt(0).toLowerCase() +
             targetAgentClassName.slice(1);
         const toolName = `ask${targetAgentClassName}`;

package/src/ts/agent/a2a-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/agent/a2a-connection/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/agent/a2a-connection/generator.ts"],"names":[],"mappings":"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"}

package/src/ts/agent/files/common/agent.ts.template

@@ -1,4 +1,5 @@
 import { Agent, tool } from '@strands-agents/sdk';
+import { logModelErrors } from '<%- agentConnectionImport %>';
 import { z } from 'zod';
 
 const multiply = tool({
@@ -11,10 +12,13 @@ const multiply = tool({
   callback: ({ a, b }) => a * b,
 });
 
-export const getAgent = async () =>
-  new Agent({
+export const getAgent = async () => {
+  const agent = new Agent({
     systemPrompt: `You are a mathematical wizard.
   Use your tools for mathematical tasks.
   Refer to tools as your 'spellbook'.`,
     tools: [multiply],
   });
+  logModelErrors(agent);
+  return agent;
+};

package/src/ts/agent/files/http/router.ts.template

@@ -10,7 +10,7 @@ const agent = withSessionId(getAgent);
 
 export const appRouter = router({
   invoke: publicProcedure
-    .input(z.object({ message: z.string() }))
+    .input(z.object({ message: z.string().max(100000) }))
     .output(
       zAsyncIterable({
         yield: z.string(),

package/src/ts/agent/gateway-connection/__snapshots__/generator.spec.ts.snap

@@ -0,0 +1,220 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`ts#agent#gateway-connection generator > should match snapshot for agent-connection src files > agent-connection-index.ts 1`] = `
+"export * from './app/my-gateway-client-strands.js';
+export * from './core/model-errors-strands.js';
+export * from './core/with-session-id-strands.js';
+export * from './core/session-context.js';
+// Export your library code here
+"
+`;
+
+exports[`ts#agent#gateway-connection generator > should match snapshot for agent-connection src files > agentcore-fetch.ts 1`] = `
+"import { AwsClient } from 'aws4fetch';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { getCurrentSessionId } from './session-context.js';
+
+const SESSION_HEADER = 'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id';
+
+/** Wrap a fetch so each request carries the current async-context session id. */
+const withSessionHeader =
+  (inner: typeof fetch): typeof fetch =>
+  async (input, init) => {
+    const headers = new Headers(init?.headers);
+    const sessionId = getCurrentSessionId();
+    if (sessionId) headers.set(SESSION_HEADER, sessionId);
+    return inner(input, { ...init, headers });
+  };
+
+/** Options for a SigV4-signing fetch. */
+export interface SigV4FetchOptions {
+  /** AWS region to sign for. */
+  region: string;
+  /** AWS service to sign for. Defaults to \`bedrock-agentcore\`. */
+  service?: string;
+  /** AWS credential provider; defaults to the standard provider chain. */
+  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
+}
+
+/** A fetch that signs every request with AWS SigV4 (per-request, body-aware). */
+export const createSigV4Fetch = (options: SigV4FetchOptions): typeof fetch => {
+  const { region, service = 'bedrock-agentcore' } = options;
+  const credentialProvider =
+    options.credentialProvider ?? fromNodeProviderChain();
+  const signedFetch: typeof fetch = async (...args) => {
+    const client = new AwsClient({
+      ...(await credentialProvider()),
+      service,
+      region,
+    });
+    return client.fetch(...args);
+  };
+  return withSessionHeader(signedFetch);
+};
+
+/** A fetch that adds a bearer token from the given async provider. */
+export const createJwtFetch = (
+  accessTokenProvider: () => Promise<string>,
+): typeof fetch =>
+  withSessionHeader(async (input, init) => {
+    const headers = new Headers(init?.headers);
+    headers.set('Authorization', \`Bearer \${await accessTokenProvider()}\`);
+    return fetch(input, { ...init, headers });
+  });
+
+/** A plain fetch (local dev) that still forwards the session id. */
+export const createPlainFetch = (): typeof fetch => withSessionHeader(fetch);
+"
+`;
+
+exports[`ts#agent#gateway-connection generator > should match snapshot for agent-connection src files > agentcore-gateway-mcp-client-strands.ts 1`] = `
+"import { McpClient } from '@strands-agents/sdk';
+import {
+  AgentCoreGatewayMcpTransport,
+  type AgentCoreGatewayMcpTransportIamOptions,
+} from './agentcore-gateway-mcp-transport.js';
+
+/**
+ * Strands MCP clients that connect to an AgentCore Gateway.
+ */
+export class AgentCoreGatewayMcpClientStrands {
+  /** Create a gateway MCP client authenticated with IAM SigV4. */
+  static withIamAuth(
+    options: AgentCoreGatewayMcpTransportIamOptions,
+  ): McpClient {
+    return new McpClient({
+      transport: AgentCoreGatewayMcpTransport.withIamAuth(options),
+    });
+  }
+
+  /** Plain-HTTP gateway client, for the local gateway started by serve-local. */
+  static withoutAuth(options: { gatewayUrl: string }): McpClient {
+    return new McpClient({
+      transport: AgentCoreGatewayMcpTransport.withoutAuth(options),
+    });
+  }
+}
+"
+`;
+
+exports[`ts#agent#gateway-connection generator > should match snapshot for agent-connection src files > agentcore-gateway-mcp-transport.ts 1`] = `
+"import type { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { regionFromGatewayUrl } from './agentcore-endpoints.js';
+import { sigV4Transport, noAuthTransport } from './agentcore-transport.js';
+
+export interface AgentCoreGatewayMcpTransportIamOptions {
+  /**
+   * The MCP URL of the AgentCore Gateway, of the form
+   * https://<gatewayId>.gateway.bedrock-agentcore.<region>.amazonaws.com/mcp
+   */
+  gatewayUrl: string;
+  /** AWS region override; by default parsed from \`gatewayUrl\`. */
+  region?: string;
+  /** AWS credential provider; defaults to the standard provider chain. */
+  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
+}
+
+/**
+ * Factory for MCP transports that connect to an AgentCore Gateway. Forwards the
+ * current async-context session via the AgentCore session header, which the
+ * gateway propagates to downstream MCP server targets.
+ */
+export class AgentCoreGatewayMcpTransport {
+  /** Create a gateway MCP transport authenticated with IAM SigV4. */
+  static withIamAuth(
+    options: AgentCoreGatewayMcpTransportIamOptions,
+  ): StreamableHTTPClientTransport {
+    return sigV4Transport({
+      region: options.region ?? regionFromGatewayUrl(options.gatewayUrl),
+      url: options.gatewayUrl,
+      credentialProvider: options.credentialProvider,
+    });
+  }
+
+  /** Plain-HTTP gateway transport, for the local gateway started by serve-local. */
+  static withoutAuth(options: {
+    gatewayUrl: string;
+  }): StreamableHTTPClientTransport {
+    return noAuthTransport({ url: options.gatewayUrl });
+  }
+}
+"
+`;
+
+exports[`ts#agent#gateway-connection generator > should match snapshot for agent-connection src files > agentcore-transport.ts 1`] = `
+"import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import {
+  createSigV4Fetch,
+  createJwtFetch,
+  createPlainFetch,
+} from './agentcore-fetch.js';
+
+const build = (
+  url: string,
+  fetchFn: typeof fetch,
+): StreamableHTTPClientTransport =>
+  new StreamableHTTPClientTransport(new URL(url), { fetch: fetchFn });
+
+/** SigV4-signed transport for a resolved AgentCore endpoint. */
+export const sigV4Transport = (options: {
+  region: string;
+  url: string;
+  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
+}): StreamableHTTPClientTransport =>
+  build(
+    options.url,
+    createSigV4Fetch({
+      region: options.region,
+      credentialProvider: options.credentialProvider,
+    }),
+  );
+
+/** Bearer-token transport for a resolved AgentCore endpoint. */
+export const jwtTransport = (options: {
+  url: string;
+  accessTokenProvider: () => Promise<string>;
+}): StreamableHTTPClientTransport =>
+  build(options.url, createJwtFetch(options.accessTokenProvider));
+
+/** Plain-HTTP transport — for local dev. */
+export const noAuthTransport = (options: {
+  url: string;
+}): StreamableHTTPClientTransport => build(options.url, createPlainFetch());
+"
+`;
+
+exports[`ts#agent#gateway-connection generator > should match snapshot for agent-connection src files > my-gateway-client-strands.ts 1`] = `
+"import { McpClient } from '@strands-agents/sdk';
+import { AgentCoreGatewayMcpClientStrands } from '../core/agentcore-gateway-mcp-client-strands.js';
+import { getAgentCoreRuntimeConfig } from '../core/runtime-config.js';
+
+/**
+ * Strands client for the MyGateway AgentCore Gateway.
+ *
+ * Deployed: a SigV4-signed MCP client pointing at the gateway URL.
+ * Local (\`SERVE_LOCAL=true\`): a plain-HTTP client pointing at the local
+ * gateway started by the gateway project's serve-local target. The local
+ * gateway aggregates every attached MCP server but does not evaluate
+ * Cedar policies.
+ */
+export class MyGatewayClientStrands {
+  static async create(): Promise<McpClient> {
+    if (process.env.SERVE_LOCAL === 'true') {
+      return AgentCoreGatewayMcpClientStrands.withoutAuth({
+        gatewayUrl: 'http://localhost:8100/mcp',
+      });
+    }
+    const config = await getAgentCoreRuntimeConfig();
+    const gatewayUrl = config.gateways?.['MyGateway'];
+    if (!gatewayUrl) {
+      throw new Error(
+        \`No connected gateway named 'MyGateway' found in runtime configuration.\`,
+      );
+    }
+    return AgentCoreGatewayMcpClientStrands.withIamAuth({ gatewayUrl });
+  }
+}
+"
+`;

package/src/ts/agent/gateway-connection/files/agent-connection/app/__gatewayKebabCase__-client-strands.ts.template

@@ -0,0 +1,30 @@
+import { McpClient } from '@strands-agents/sdk';
+import { AgentCoreGatewayMcpClientStrands } from '../core/agentcore-gateway-mcp-client-strands.js';
+import { getAgentCoreRuntimeConfig } from '../core/runtime-config.js';
+
+/**
+ * Strands client for the <%- gatewayClassName %> AgentCore Gateway.
+ *
+ * Deployed: a SigV4-signed MCP client pointing at the gateway URL.
+ * Local (`SERVE_LOCAL=true`): a plain-HTTP client pointing at the local
+ * gateway started by the gateway project's serve-local target. The local
+ * gateway aggregates every attached MCP server but does not evaluate
+ * Cedar policies.
+ */
+export class <%- gatewayClassName %>ClientStrands {
+  static async create(): Promise<McpClient> {
+    if (process.env.SERVE_LOCAL === 'true') {
+      return AgentCoreGatewayMcpClientStrands.withoutAuth({
+        gatewayUrl: 'http://localhost:<%- gatewayPort %>/mcp',
+      });
+    }
+    const config = await getAgentCoreRuntimeConfig();
+    const gatewayUrl = config.gateways?.['<%- gatewayClassName %>'];
+    if (!gatewayUrl) {
+      throw new Error(
+        `No connected gateway named '<%- gatewayClassName %>' found in runtime configuration.`,
+      );
+    }
+    return AgentCoreGatewayMcpClientStrands.withIamAuth({ gatewayUrl });
+  }
+}

package/src/ts/agent/gateway-connection/generator.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { TsAgentGatewayConnectionGeneratorSchema } from './schema';
+export declare const TS_AGENT_GATEWAY_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
+export declare const tsAgentGatewayConnectionGenerator: (tree: Tree, options: TsAgentGatewayConnectionGeneratorSchema) => Promise<GeneratorCallback>;
+export default tsAgentGatewayConnectionGenerator;