@aws/nx-plugin 1.0.0-rc.4 → 1.0.0-rc.41

package/src/ts/dynamodb/files/src/gsi.ts.template

@@ -1,14 +0,0 @@
-// GSIs to synchronize on the local table at startup and provision in infrastructure.
-// ElectroDB names GSI keys gsi{n}pk / gsi{n}sk — add one entry per index defined in your entities.
-export const GLOBAL_SECONDARY_INDEXES = [
-  {
-    indexName: 'gsi1pk-gsi1sk-index',
-    partitionKey: 'gsi1pk',
-    sortKey: 'gsi1sk',
-  },
-  {
-    indexName: 'gsi2pk-gsi2sk-index',
-    partitionKey: 'gsi2pk',
-    sortKey: 'gsi2sk',
-  },
-];

package/src/ts/lib/eslint.d.ts

@@ -1,14 +0,0 @@
-/**
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { Tree } from '@nx/devkit';
-import { ConfigureProjectOptions } from './types';
-export declare const configureEslint: (tree: Tree, options: ConfigureProjectOptions) => Promise<void>;
-/**
- * Adds ignore patterns to the eslint config file
- * @param tree - The file system tree
- * @param eslintConfigPath - Path to the eslint config file
- * @param ignorePatterns - Array of ignore patterns to add
- */
-export declare const addIgnoresToEslintConfig: (tree: Tree, eslintConfigPath: string, ignorePatterns: string[]) => Promise<void>;

package/src/ts/lib/eslint.js

@@ -1,90 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addIgnoresToEslintConfig = exports.configureEslint = void 0;
-/**
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-const ast_1 = require("../../utils/ast");
-const nx_1 = require("../../utils/nx");
-const configureEslint = async (tree, options) => {
-    // Configure the lint task
-    const projectJson = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.fullyQualifiedName);
-    (0, devkit_1.updateProjectConfiguration)(tree, options.fullyQualifiedName, {
-        ...projectJson,
-        targets: {
-            ...projectJson?.targets,
-            lint: {
-                executor: '@nx/eslint:lint',
-                cache: true,
-                inputs: ['eslint'],
-                configurations: {
-                    fix: {
-                        fix: true,
-                    },
-                    'skip-lint': {
-                        force: true,
-                    },
-                },
-            },
-        },
-    });
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['prettier', 'eslint-plugin-prettier', 'jsonc-eslint-parser']));
-    // Update or create eslint.config.mjs
-    const eslintConfigPath = 'eslint.config.mjs';
-    if (tree.exists(eslintConfigPath)) {
-        // Add import if it doesn't exist
-        await (0, ast_1.addSingleImport)(tree, eslintConfigPath, 'eslintPluginPrettierRecommended', 'eslint-plugin-prettier/recommended');
-        // Prepend eslintPluginPrettierRecommended to the exports array if not present
-        await (0, ast_1.applyGritQL)(tree, eslintConfigPath, 'or { `export default []` => `export default [eslintPluginPrettierRecommended]`, `export default [$items]` => `export default [eslintPluginPrettierRecommended, $items]` where { $items <: not contains `eslintPluginPrettierRecommended` } }');
-        // Add ignore patterns to eslint config
-        await (0, exports.addIgnoresToEslintConfig)(tree, eslintConfigPath, [
-            '**/vite.config.*.timestamp*',
-        ]);
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        (0, devkit_1.updateNxJson)(tree, {
-            ...nxJson,
-            namedInputs: {
-                ...nxJson.namedInputs,
-                eslint: [
-                    'default',
-                    '{workspaceRoot}/eslint.config.mjs',
-                    '{projectRoot}/eslint.config.mjs',
-                ],
-            },
-        });
-    }
-};
-exports.configureEslint = configureEslint;
-/**
- * Adds ignore patterns to the eslint config file
- * @param tree - The file system tree
- * @param eslintConfigPath - Path to the eslint config file
- * @param ignorePatterns - Array of ignore patterns to add
- */
-const addIgnoresToEslintConfig = async (tree, eslintConfigPath, ignorePatterns) => {
-    for (const pattern of ignorePatterns) {
-        const escaped = pattern.replace(/`/g, '\\`');
-        // Single or{} per pattern handles all cases:
-        // 1. No ignores object → add { ignores: ['pattern'] } to the exports array
-        // 2. Empty ignores: [] → rewrite to ignores: ['pattern']
-        // 3. Non-empty ignores: [items] → append 'pattern' to existing items
-        await (0, ast_1.applyGritQL)(tree, eslintConfigPath, `or {
-        \`export default [$items]\` where {
-          $items <: not some \`{ ignores: $_ }\`,
-          $items += \`{ ignores: ['${escaped}'] }\`
-        },
-        \`export default [$items]\` where {
-          $items <: contains \`ignores: []\` => \`ignores: ['${escaped}']\`
-        },
-        \`ignores: [$items]\` => \`ignores: [$items, '${escaped}']\` where {
-          $items <: within \`export default [$_]\`,
-          $items <: not some \`'${escaped}'\`
-        }
-      }`);
-    }
-};
-exports.addIgnoresToEslintConfig = addIgnoresToEslintConfig;
-//# sourceMappingURL=eslint.js.map

package/src/ts/lib/eslint.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/eslint.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAMoB;AACpB,mDAAoD;AACpD,yCAA+D;AAE/D,uCAAqE;AAE9D,MAAM,eAAe,GAAG,KAAK,EAClC,IAAU,EACV,OAAgC,EAChC,EAAE;IACF,0BAA0B;IAC1B,MAAM,WAAW,GAAG,IAAA,wCAAmC,EACrD,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAC3D,GAAG,WAAW;QACd,OAAO,EAAE;YACP,GAAG,WAAW,EAAE,OAAO;YACvB,IAAI,EAAE;gBACJ,QAAQ,EAAE,iBAAiB;gBAC3B,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,CAAC,QAAQ,CAAC;gBAClB,cAAc,EAAE;oBACd,GAAG,EAAE;wBACH,GAAG,EAAE,IAAI;qBACV;oBACD,WAAW,EAAE;wBACX,KAAK,EAAE,IAAI;qBACZ;iBACF;aACF;SACF;KACF,CAAC,CAAC;IAEH,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,IAAA,uBAAY,EAAC,CAAC,UAAU,EAAE,wBAAwB,EAAE,qBAAqB,CAAC,CAAC,CAC5E,CAAC;IAEF,qCAAqC;IACrC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;IAE7C,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,iCAAiC;QACjC,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,gBAAgB,EAChB,iCAAiC,EACjC,oCAAoC,CACrC,CAAC;QAEF,8EAA8E;QAC9E,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB,8OAA8O,CAC/O,CAAC;QAEF,uCAAuC;QACvC,MAAM,IAAA,gCAAwB,EAAC,IAAI,EAAE,gBAAgB,EAAE;YACrD,6BAA6B;SAC9B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAA,qBAAY,EAAC,IAAI,EAAE;YACjB,GAAG,MAAM;YACT,WAAW,EAAE;gBACX,GAAG,MAAM,CAAC,WAAW;gBACrB,MAAM,EAAE;oBACN,SAAS;oBACT,mCAAmC;oBACnC,iCAAiC;iBAClC;aACF;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAxEW,QAAA,eAAe,mBAwE1B;AAEF;;;;;GAKG;AACI,MAAM,wBAAwB,GAAG,KAAK,EAC3C,IAAU,EACV,gBAAwB,EACxB,cAAwB,EACT,EAAE;IACjB,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,6CAA6C;QAC7C,2EAA2E;QAC3E,yDAAyD;QACzD,qEAAqE;QACrE,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB;;;qCAG+B,OAAO;;;+DAGmB,OAAO;;wDAEd,OAAO;;kCAE7B,OAAO;;QAEjC,CACH,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}

package/src/ts/lib/grit/eslint-dependency-checks-warn.grit

@@ -1 +0,0 @@
-`'@nx/dependency-checks': ['error', $rest]` => `'@nx/dependency-checks': ['warn', $rest]`

package/src/ts/rdb/files/scripts/docker-pull.ts.template

@@ -1,15 +0,0 @@
-import { spawnSync } from 'child_process';
-
-const ENGINE = '<%= containers %>';
-const image = process.argv[2];
-
-const inspect = spawnSync(ENGINE, ['image', 'inspect', image], {
-  stdio: 'ignore',
-});
-
-if (inspect.status !== 0) {
-  const pull = spawnSync(ENGINE, ['pull', image], { stdio: 'inherit' });
-  if (pull.status !== 0) {
-    process.exit(pull.status ?? 1);
-  }
-}

package/src/ts/rdb/files/scripts/docker-start.ts.template

@@ -1,84 +0,0 @@
-import { spawn, spawnSync } from 'child_process';
-
-const ENGINE = '<%= containers %>';
-
-<%_ if (engine === 'mysql') { _%>
-const [containerName, image, hostPort, dbName, dbPassword] =
-  process.argv.slice(2);
-<%_ } else { _%>
-const [containerName, image, hostPort, dbName, dbUser, dbPassword] =
-  process.argv.slice(2);
-<%_ } _%>
-
-const containerExists = (): boolean =>
-  spawnSync(ENGINE, ['container', 'inspect', containerName], {
-    stdio: 'ignore',
-  }).status === 0;
-
-const isRunning = (): boolean => {
-  const result = spawnSync(
-    ENGINE,
-    ['container', 'inspect', '-f', '{{.State.Running}}', containerName],
-    { encoding: 'utf-8' },
-  );
-  return result.status === 0 && result.stdout.trim() === 'true';
-};
-
-if (containerExists()) {
-  if (!isRunning()) {
-    const start = spawnSync(ENGINE, ['start', containerName], {
-      stdio: 'inherit',
-    });
-    if (start.status !== 0) process.exit(start.status ?? 1);
-  }
-} else {
-<%_ if (engine === 'mysql') { _%>
-  const runArgs = [
-    'run',
-    '--name', containerName,
-    '-e', `MYSQL_DATABASE=${dbName}`,
-    '-e', `MYSQL_ROOT_PASSWORD=${dbPassword}`,
-    '-p', `${hostPort}:3306`,
-    '-v', `${containerName}-data:/var/lib/mysql`,
-    '-d',
-    image,
-  ];
-<%_ } else { _%>
-  const runArgs = [
-    'run',
-    '--name', containerName,
-    '-e', `POSTGRES_DB=${dbName}`,
-    '-e', `POSTGRES_USER=${dbUser}`,
-    '-e', `POSTGRES_PASSWORD=${dbPassword}`,
-    '-e', `PGDATA=/var/lib/postgresql/17/docker`,
-    '-p', `${hostPort}:5432`,
-    '-v', `${containerName}-data:/var/lib/postgresql`,
-    '-d',
-    image,
-  ];
-<%_ } _%>
-  const create = spawnSync(ENGINE, runArgs, { stdio: 'inherit' });
-  if (create.status !== 0) process.exit(create.status ?? 1);
-}
-
-const logs = spawn(ENGINE, ['logs', '-f', containerName], {
-  stdio: ['ignore', 'inherit', 'inherit'],
-});
-
-let exiting = false;
-
-const cleanup = () => {
-  if (exiting) return;
-  exiting = true;
-  spawnSync(ENGINE, ['stop', containerName], { stdio: 'ignore' });
-  logs.kill();
-  process.exit(0);
-};
-
-process.on('SIGTERM', cleanup);
-process.on('SIGINT', cleanup);
-process.on('SIGHUP', cleanup);
-
-logs.on('exit', (code) => {
-  if (!exiting) process.exit(code ?? 0);
-});

package/src/ts/rdb/files/scripts/wait-for-db.ts.template

@@ -1,55 +0,0 @@
-<%_ if (engine === 'mysql') { _%>
-import { createConnection, Connection } from 'mariadb';
-<%_ } else { _%>
-import { Client } from 'pg';
-<%_ } _%>
-
-const noop = () => undefined;
-
-const [portArg, dbArg, userArg, passwordArg] = process.argv.slice(2);
-const timeoutAt = Date.now() + 60000;
-
-while (Date.now() < timeoutAt) {
-<%_ if (engine === 'mysql') { _%>
-  let conn: Connection | undefined;
-  try {
-    conn = await createConnection({
-      host: 'localhost',
-      port: parseInt(portArg),
-      user: userArg,
-      password: passwordArg,
-      database: dbArg,
-      connectTimeout: 500,
-      allowPublicKeyRetrieval: true,
-    });
-    await conn.end();
-    console.log('Database is ready.');
-    process.exit(0);
-  } catch {
-    console.log('Database is not ready.');
-    await conn?.end().catch(noop);
-  }
-<%_ } else { _%>
-  const client = new Client({
-    host: 'localhost',
-    port: parseInt(portArg),
-    user: userArg,
-    password: passwordArg,
-    database: dbArg,
-    connectionTimeoutMillis: 500,
-  });
-  client.on('error', noop);
-  try {
-    await client.connect();
-    await client.end();
-    console.log('Database is ready.');
-    process.exit(0);
-  } catch {
-    console.log('Database is not ready.');
-    await client.end().catch(noop);
-  }
-<%_ } _%>
-  await new Promise((r) => setTimeout(r, 200));
-}
-
-throw new Error(`Timed out waiting for <%= engine === 'mysql' ? 'mysql' : 'postgres' %> on port ${portArg}`);

package/src/ts/rdb/files/src/constants.ts.template

@@ -1,8 +0,0 @@
-export const DB_PACKAGE_NAME = '<%= runtimeConfigKey %>';
-
-// Local development connection details (used when SERVE_LOCAL=true, see serve-local Nx target)
-export const LOCAL_DB_PORT = <%= localDbPort %>;
-export const LOCAL_DB_HOST = '<%= localDbHost %>';
-export const LOCAL_DB_NAME = '<%= localDbName %>';
-export const LOCAL_DB_USER = '<%= localDbUser %>';
-export const LOCAL_DB_PASSWORD = '<%= localDbPassword %>';

package/src/utils/agent-connection/files/core-a2a/agentcore-a2a-client.ts.template

@@ -1,123 +0,0 @@
-import {
-  ClientFactory,
-  ClientFactoryOptions,
-  DefaultAgentCardResolver,
-  JsonRpcTransportFactory,
-} from '@a2a-js/sdk/client';
-import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
-import { A2AAgent } from '@strands-agents/sdk/a2a';
-import { AwsClient } from 'aws4fetch';
-import { getCurrentSessionId } from './session-context.js';
-
-const SESSION_HEADER = 'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id';
-
-/**
- * Common options for creating an AgentCore A2A client.
- */
-export interface AgentCoreA2aClientOptions {
-  /** The ARN of the Bedrock AgentCore Runtime to connect to. */
-  agentRuntimeArn: string;
-  /** Optional description for the remote agent. */
-  description?: string;
-  /** Optional friendly name for the remote agent. */
-  name?: string;
-}
-
-/** Options for an IAM-authenticated A2A client. */
-export interface AgentCoreA2aClientIamOptions
-  extends AgentCoreA2aClientOptions {
-  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
-}
-
-/** Options for a JWT-authenticated A2A client. */
-export interface AgentCoreA2aClientJwtOptions
-  extends AgentCoreA2aClientOptions {
-  accessTokenProvider: () => Promise<string>;
-}
-
-/** Options for a no-auth A2A client (local dev). */
-export interface AgentCoreA2aClientNoAuthOptions {
-  /** Full URL of the local A2A endpoint. */
-  url: string;
-  name?: string;
-  description?: string;
-}
-
-interface BuildOptions {
-  name?: string;
-  description?: string;
-}
-
-/** Factory for A2A clients that forward the current async-context session. */
-export class AgentCoreA2aClient {
-  /**
-   * Construct the A2A invocations URL for an AgentCore runtime ARN and
-   * extract the region. A2A on AgentCore is mounted at `/invocations/`
-   * (trailing slash matters).
-   */
-  private static buildUrl(agentRuntimeArn: string): {
-    region: string;
-    url: string;
-  } {
-    const region = agentRuntimeArn.split(':')[3];
-    const url = `https://bedrock-agentcore.${region}.amazonaws.com/runtimes/${encodeURIComponent(agentRuntimeArn)}/invocations/`;
-    return { region, url };
-  }
-
-  private static build(
-    url: string,
-    authFetch: typeof fetch,
-    options: BuildOptions,
-  ): A2AAgent {
-    const sessionFetch: typeof fetch = (input, init) => {
-      const headers = new Headers(init?.headers);
-      const sessionId = getCurrentSessionId();
-      if (sessionId) headers.set(SESSION_HEADER, sessionId);
-      return authFetch(input, { ...init, headers });
-    };
-    const clientFactory = new ClientFactory({
-      ...ClientFactoryOptions.default,
-      transports: [new JsonRpcTransportFactory({ fetchImpl: sessionFetch })],
-      cardResolver: new DefaultAgentCardResolver({ fetchImpl: sessionFetch }),
-    });
-    return new A2AAgent({
-      url,
-      clientFactory,
-      ...(options.name ? { name: options.name } : {}),
-      ...(options.description ? { description: options.description } : {}),
-    });
-  }
-
-  static withIamAuth(options: AgentCoreA2aClientIamOptions): A2AAgent {
-    const { region, url } = AgentCoreA2aClient.buildUrl(options.agentRuntimeArn);
-    const credentialProvider =
-      options.credentialProvider ?? fromNodeProviderChain();
-    const sigv4Fetch: typeof fetch = async (...args) => {
-      const client = new AwsClient({
-        ...(await credentialProvider()),
-        service: 'bedrock-agentcore',
-        region,
-      });
-      return client.fetch(...args);
-    };
-    return AgentCoreA2aClient.build(url, sigv4Fetch, options);
-  }
-
-  static withJwtAuth(options: AgentCoreA2aClientJwtOptions): A2AAgent {
-    const { url } = AgentCoreA2aClient.buildUrl(options.agentRuntimeArn);
-    const bearerFetch: typeof fetch = async (input, init) => {
-      const headers = new Headers(init?.headers);
-      headers.set(
-        'Authorization',
-        `Bearer ${await options.accessTokenProvider()}`,
-      );
-      return fetch(input, { ...init, headers });
-    };
-    return AgentCoreA2aClient.build(url, bearerFetch, options);
-  }
-
-  /** For local dev — plain HTTP, no auth. */
-  static withoutAuth(options: AgentCoreA2aClientNoAuthOptions): A2AAgent {
-    return AgentCoreA2aClient.build(options.url, fetch, options);
-  }
-}

package/src/utils/agent-connection/files/core-mcp/agentcore-mcp-client.ts.template

@@ -1,128 +0,0 @@
-import { McpClient } from '@strands-agents/sdk';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-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';
-
-/**
- * Common options for creating an AgentCore MCP client.
- */
-export interface AgentCoreMcpClientOptions {
-  /**
-   * The ARN of the Bedrock AgentCore Runtime to connect to.
-   */
-  agentRuntimeArn: string;
-}
-
-/**
- * Options for creating an AgentCore MCP client with IAM authentication.
- */
-export interface AgentCoreMcpClientIamOptions
-  extends AgentCoreMcpClientOptions {
-  /**
-   * Optional AWS credential provider. If not provided, uses the default
-   * credential provider chain from the AWS SDK.
-   */
-  credentialProvider?: ReturnType<typeof fromNodeProviderChain>;
-}
-
-/**
- * Options for creating an AgentCore MCP client with JWT authentication.
- */
-export interface AgentCoreMcpClientJwtOptions
-  extends AgentCoreMcpClientOptions {
-  /**
-   * A function which returns the JWT access token used to authenticate.
-   */
-  accessTokenProvider: () => Promise<string>;
-}
-
-/**
- * Options for creating an MCP client with no auth (local dev).
- */
-export interface AgentCoreMcpClientNoAuthOptions {
-  /** Full URL of the local MCP endpoint. */
-  url: string;
-}
-
-interface CreateOptions {
-  url: string;
-  buildHeaders?: () => Promise<Record<string, string>>;
-  fetch?: typeof fetch;
-}
-
-/** Factory for MCP clients that forward the current async-context session. */
-export class AgentCoreMcpClient {
-  /**
-   * Construct the invocation URL for an AgentCore runtime ARN and extract
-   * the region. ARN format: arn:partition:service:region:account-id:resource
-   */
-  private static buildUrl(agentRuntimeArn: string): {
-    region: string;
-    url: string;
-  } {
-    const region = agentRuntimeArn.split(':')[3];
-    const url = `https://bedrock-agentcore.${region}.amazonaws.com/runtimes/${encodeURIComponent(agentRuntimeArn)}/invocations?qualifier=DEFAULT`;
-    return { region, url };
-  }
-
-  private static create(options: CreateOptions): McpClient {
-    const {
-      url,
-      buildHeaders = async (): Promise<Record<string, string>> => ({}),
-      fetch: customFetch,
-    } = options;
-    const fetchWithHeaders: typeof fetch = async (input, init) => {
-      const headers = new Headers(init?.headers);
-      const sessionId = getCurrentSessionId();
-      if (sessionId) headers.set(SESSION_HEADER, sessionId);
-      const extra = await buildHeaders();
-      for (const k of Object.keys(extra)) {
-        headers.set(k, extra[k]);
-      }
-      return (customFetch ?? fetch)(input, { ...init, headers });
-    };
-    const transport = new StreamableHTTPClientTransport(new URL(url), {
-      fetch: fetchWithHeaders,
-    });
-    return new McpClient({ transport });
-  }
-
-  /**
-   * SigV4-authenticated client for a Bedrock AgentCore runtime.
-   */
-  static withIamAuth(options: AgentCoreMcpClientIamOptions): McpClient {
-    const { region, url } = AgentCoreMcpClient.buildUrl(options.agentRuntimeArn);
-    const credentialProvider =
-      options.credentialProvider ?? fromNodeProviderChain();
-    const sigv4Fetch: typeof fetch = async (...args) => {
-      const client = new AwsClient({
-        ...(await credentialProvider()),
-        service: 'bedrock-agentcore',
-        region,
-      });
-      return client.fetch(...args);
-    };
-    return AgentCoreMcpClient.create({ url, fetch: sigv4Fetch });
-  }
-
-  /**
-   * Bearer-authenticated client for a Bedrock AgentCore runtime.
-   */
-  static withJwtAuth(options: AgentCoreMcpClientJwtOptions): McpClient {
-    const { url } = AgentCoreMcpClient.buildUrl(options.agentRuntimeArn);
-    return AgentCoreMcpClient.create({
-      url,
-      buildHeaders: async () => ({
-        Authorization: `Bearer ${await options.accessTokenProvider()}`,
-      }),
-    });
-  }
-
-  /** For local dev — plain HTTP, no auth. */
-  static withoutAuth(options: AgentCoreMcpClientNoAuthOptions): McpClient {
-    return AgentCoreMcpClient.create({ url: options.url });
-  }
-}

package/src/utils/agent-connection/files/py-core-a2a/agentcore_a2a_client.py.template

@@ -1,120 +0,0 @@
-from collections.abc import Callable
-from urllib.parse import quote
-
-import boto3
-import httpx
-from a2a.client import ClientConfig
-from strands.agent.a2a_agent import A2AAgent
-
-from .auth import SigV4HTTPXAuth
-from .session_context import get_current_session_id
-
-SESSION_HEADER = "X-Amzn-Bedrock-AgentCore-Runtime-Session-Id"
-
-
-class _SessionHeaderAuth(httpx.Auth):
-    """Stamps the AgentCore session header from the current async context."""
-
-    requires_request_body = True
-    requires_response_body = True
-
-    def __init__(self, inner: httpx.Auth | None = None):
-        self._inner = inner
-
-    def auth_flow(self, request: httpx.Request):  # type: ignore[override]
-        sid = get_current_session_id()
-        if sid:
-            request.headers[SESSION_HEADER] = sid
-        if self._inner is None:
-            yield request
-            return
-        yield from self._inner.auth_flow(request)
-
-
-class AgentCoreA2aClient:
-    """Factory for A2A clients that forward the current async-context session."""
-
-    @staticmethod
-    def _build_url(agent_runtime_arn: str) -> tuple[str, str]:
-        """Extract region from ARN and construct the A2A invocations URL.
-
-        ARN format: arn:partition:service:region:account-id:resource
-        A2A on AgentCore is mounted at `/invocations/` (trailing slash matters).
-        """
-        region = agent_runtime_arn.split(":")[3]
-        encoded_arn = quote(agent_runtime_arn, safe="")
-        url = (
-            f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/"
-            f"{encoded_arn}/invocations/"
-        )
-        return region, url
-
-    @staticmethod
-    def _build(
-        url: str,
-        auth: httpx.Auth | None,
-        headers: dict | None,
-        *,
-        name: str | None,
-        description: str | None,
-    ) -> A2AAgent:
-        httpx_client = httpx.AsyncClient(
-            auth=_SessionHeaderAuth(auth),
-            headers=headers or {},
-            timeout=120,
-        )
-        client_config = ClientConfig(httpx_client=httpx_client, streaming=False)
-        kwargs: dict = {"endpoint": url, "client_config": client_config}
-        if name:
-            kwargs["name"] = name
-        if description:
-            kwargs["description"] = description
-        return A2AAgent(**kwargs)
-
-    @staticmethod
-    def with_iam_auth(
-        agent_runtime_arn: str,
-        *,
-        name: str | None = None,
-        description: str | None = None,
-    ) -> A2AAgent:
-        """SigV4-authenticated client for a Bedrock AgentCore runtime."""
-        region, url = AgentCoreA2aClient._build_url(agent_runtime_arn)
-        credentials = boto3.Session(region_name=region).get_credentials()
-        return AgentCoreA2aClient._build(
-            url,
-            SigV4HTTPXAuth(credentials, "bedrock-agentcore", region),
-            None,
-            name=name,
-            description=description,
-        )
-
-    @staticmethod
-    def with_jwt_auth(
-        agent_runtime_arn: str,
-        access_token_provider: Callable[[], str],
-        *,
-        name: str | None = None,
-        description: str | None = None,
-    ) -> A2AAgent:
-        """Bearer-authenticated client for a Bedrock AgentCore runtime."""
-        _, url = AgentCoreA2aClient._build_url(agent_runtime_arn)
-        return AgentCoreA2aClient._build(
-            url,
-            None,
-            {"Authorization": f"Bearer {access_token_provider()}"},
-            name=name,
-            description=description,
-        )
-
-    @staticmethod
-    def without_auth(
-        url: str,
-        *,
-        name: str | None = None,
-        description: str | None = None,
-    ) -> A2AAgent:
-        """Plain-HTTP client — for local dev."""
-        return AgentCoreA2aClient._build(
-            url, None, None, name=name, description=description
-        )