@aws/nx-plugin 0.112.0 → 0.113.0

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

@@ -87,6 +87,11 @@ async function ensureTypeScriptAgentConnectionProject(tree) {
     // Shared core helpers — emitted regardless of which per-protocol core
     // client the caller needs, so both MCP and A2A clients can import from them.
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'core-runtime-config'), (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'core'), {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    // Re-export session-context helpers so strands-agent server entry points
+    // can set the current session on each inbound request without pulling in
+    // the agent-connection internals.
+    await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/session-context.js');
+    await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/with-session-id.js');
 }
 /**
  * Emit one of the TypeScript core client templates (mcp or a2a) into the
@@ -127,6 +132,13 @@ async function ensurePythonAgentConnectionProject(tree) {
     // Shared core helpers — emitted regardless of which per-protocol core
     // client the caller needs, so both MCP and A2A clients can import them.
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'py-core-runtime-config'), coreDir, {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    // Re-export session-context helpers so strands-agent server entry points
+    // can set the current session on each inbound request without importing
+    // the agent-connection internals directly.
+    const moduleInitPath = (0, devkit_1.joinPathFragments)(moduleDir, '__init__.py');
+    await addPythonReExport(tree, moduleInitPath, '.core.session_context', 'get_current_session_id');
+    await addPythonReExport(tree, moduleInitPath, '.core.session_context', 'session_id_context');
+    await addPythonReExport(tree, moduleInitPath, '.core.with_session_id', 'with_session_id');
     // Shared core helpers depend on aws-lambda-powertools for AppConfig access.
     (0, py_1.addDependenciesToPyProjectToml)(tree, projectDir, ['aws-lambda-powertools']);
 }
@@ -153,6 +165,16 @@ async function addPythonReExport(tree, initFilePath, fromModule, importName) {
     }
     const importLine = `from ${fromModule} import ${importName}`;
     const allEntry = `"${importName}"`;
+    // If there's already an import from the same module, merge into its name list
+    // (ruff I001 rejects two `from X import ...` lines for the same module).
+    const mergedImport = await (0, ast_1.applyGritQL)(tree, initFilePath, py(`\`from ${fromModule} import $names\` where {
+  $names <: not contains \`${importName}\`,
+  $names += \`, ${importName}\`
+}`));
+    if (mergedImport) {
+        await (0, ast_1.applyGritQL)(tree, initFilePath, py(`\`__all__ = [$items]\` where { $items += \`, ${allEntry}\` }`));
+        return;
+    }
     // Try to append import after existing import using +=
     const appendedImport = await (0, ast_1.applyGritQL)(tree, initFilePath, py(`\`from $mod import $name\` as $stmt where {
   $program <: not contains \`${importName}\`,

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

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

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

@@ -7,60 +7,53 @@ import {
 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
+ * Common options for creating an AgentCore A2A client.
  */
 export interface AgentCoreA2aClientOptions {
-  /**
-   * The ARN of the Bedrock AgentCore Runtime to connect to
-   */
+  /** The ARN of the Bedrock AgentCore Runtime to connect to. */
   agentRuntimeArn: string;
-  /**
-   * Session ID to include in request headers.
-   */
-  sessionId?: string;
-  /**
-   * Optional description for the remote agent.
-   */
+  /** Optional description for the remote agent. */
   description?: string;
-  /**
-   * Optional friendly name for the remote agent.
-   */
+  /** Optional friendly name for the remote agent. */
   name?: string;
 }
 
-/**
- * Options for creating an AgentCore A2A client with IAM authentication
- */
+/** Options for an IAM-authenticated A2A client. */
 export interface AgentCoreA2aClientIamOptions
   extends AgentCoreA2aClientOptions {
-  /**
-   * 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 A2A client with JWT authentication
- */
+/** Options for a JWT-authenticated A2A client. */
 export interface AgentCoreA2aClientJwtOptions
   extends AgentCoreA2aClientOptions {
-  /**
-   * A function which returns the JWT access token used to authenticate
-   */
   accessTokenProvider: () => Promise<string>;
 }
 
-/**
- * Factory for clients to call A2A agents hosted on Bedrock AgentCore Runtime
- */
+/** 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.
-   * ARN format: arn:partition:service:region:account-id:resource
-   * A2A on AgentCore is mounted at `/invocations/` (trailing slash matters).
+   * 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;
@@ -71,21 +64,22 @@ export class AgentCoreA2aClient {
     return { region, url };
   }
 
-  /**
-   * Build a Strands `A2AAgent` for a URL plus a fetch that is already
-   * authenticated (SigV4-signing or Bearer-adding).
-   */
   private static build(
     url: string,
     authFetch: typeof fetch,
-    options: Pick<AgentCoreA2aClientOptions, 'name' | 'description'>,
+    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: authFetch })],
-      cardResolver: new DefaultAgentCardResolver({ fetchImpl: authFetch }),
+      transports: [new JsonRpcTransportFactory({ fetchImpl: sessionFetch })],
+      cardResolver: new DefaultAgentCardResolver({ fetchImpl: sessionFetch }),
     });
-
     return new A2AAgent({
       url,
       clientFactory,
@@ -94,41 +88,36 @@ export class AgentCoreA2aClient {
     });
   }
 
-  /**
-   * Create an `A2AAgent` with IAM (SigV4) authentication.
-   */
   static withIamAuth(options: AgentCoreA2aClientIamOptions): A2AAgent {
+    const { region, url } = AgentCoreA2aClient.buildUrl(options.agentRuntimeArn);
     const credentialProvider =
       options.credentialProvider ?? fromNodeProviderChain();
-    const { region, url } = AgentCoreA2aClient.buildUrl(options.agentRuntimeArn);
-
     const sigv4Fetch: typeof fetch = async (...args) => {
-      const credentials = await credentialProvider();
       const client = new AwsClient({
-        ...credentials,
+        ...(await credentialProvider()),
         service: 'bedrock-agentcore',
         region,
       });
       return client.fetch(...args);
     };
-
     return AgentCoreA2aClient.build(url, sigv4Fetch, options);
   }
 
-  /**
-   * Create an `A2AAgent` with JWT authentication.
-   */
   static withJwtAuth(options: AgentCoreA2aClientJwtOptions): A2AAgent {
-    const { accessTokenProvider } = options;
     const { url } = AgentCoreA2aClient.buildUrl(options.agentRuntimeArn);
-
     const bearerFetch: typeof fetch = async (input, init) => {
-      const token = await accessTokenProvider();
       const headers = new Headers(init?.headers);
-      headers.set('Authorization', `Bearer ${token}`);
+      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,26 +1,23 @@
-import { randomUUID } from 'node:crypto';
 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
+ * Common options for creating an AgentCore MCP client.
  */
 export interface AgentCoreMcpClientOptions {
   /**
-   * The ARN of the Bedrock AgentCore Runtime to connect to
+   * The ARN of the Bedrock AgentCore Runtime to connect to.
    */
   agentRuntimeArn: string;
-  /**
-   * Session ID to include in request headers.
-   * Defaults to a random UUID if not provided.
-   */
-  sessionId?: string;
 }
 
 /**
- * Options for creating an AgentCore MCP client with IAM authentication
+ * Options for creating an AgentCore MCP client with IAM authentication.
  */
 export interface AgentCoreMcpClientIamOptions
   extends AgentCoreMcpClientOptions {
@@ -32,33 +29,35 @@ export interface AgentCoreMcpClientIamOptions
 }
 
 /**
- * Options for creating an AgentCore MCP client with JWT authentication
+ * 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
+   * A function which returns the JWT access token used to authenticate.
    */
   accessTokenProvider: () => Promise<string>;
 }
 
 /**
- * Internal options for creating an AgentCore MCP client
+ * 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;
-  sessionId?: string;
   buildHeaders?: () => Promise<Record<string, string>>;
   fetch?: typeof fetch;
 }
 
-/**
- * Factory for clients to call MCP servers hosted on Bedrock AgentCore Runtime
- */
+/** 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
+   * 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;
@@ -69,76 +68,61 @@ export class AgentCoreMcpClient {
     return { region, url };
   }
 
-  /**
-   * Internal method to create an MCP client
-   */
   private static create(options: CreateOptions): McpClient {
     const {
       url,
-      sessionId = randomUUID(),
       buildHeaders = async (): Promise<Record<string, string>> => ({}),
       fetch: customFetch,
     } = options;
-
-    // Create a custom fetch that adds required headers
     const fetchWithHeaders: typeof fetch = async (input, init) => {
       const headers = new Headers(init?.headers);
-      headers.set('X-Amzn-Bedrock-AgentCore-Runtime-Session-Id', sessionId);
-      for (const [k, v] of Object.entries(await buildHeaders())) {
-        headers.set(k, v);
+      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 });
+      return (customFetch ?? fetch)(input, { ...init, headers });
     };
-
-    // Create the transport
     const transport = new StreamableHTTPClientTransport(new URL(url), {
       fetch: fetchWithHeaders,
     });
-
-    // Create and return the MCP client
     return new McpClient({ transport });
   }
 
   /**
-   * Create an MCP client with IAM (SigV4) authentication
+   * SigV4-authenticated client for a Bedrock AgentCore runtime.
    */
   static withIamAuth(options: AgentCoreMcpClientIamOptions): McpClient {
-    const { agentRuntimeArn, sessionId } = options;
+    const { region, url } = AgentCoreMcpClient.buildUrl(options.agentRuntimeArn);
     const credentialProvider =
       options.credentialProvider ?? fromNodeProviderChain();
-    const { region, url } = AgentCoreMcpClient.buildUrl(agentRuntimeArn);
-
-    // Create a SigV4 signing fetch function
     const sigv4Fetch: typeof fetch = async (...args) => {
-      const credentials = await credentialProvider();
       const client = new AwsClient({
-        ...credentials,
+        ...(await credentialProvider()),
         service: 'bedrock-agentcore',
         region,
       });
       return client.fetch(...args);
     };
-
-    return AgentCoreMcpClient.create({
-      url,
-      sessionId,
-      fetch: sigv4Fetch,
-    });
+    return AgentCoreMcpClient.create({ url, fetch: sigv4Fetch });
   }
 
   /**
-   * Create an MCP client with JWT authentication
+   * Bearer-authenticated client for a Bedrock AgentCore runtime.
    */
   static withJwtAuth(options: AgentCoreMcpClientJwtOptions): McpClient {
-    const { agentRuntimeArn, accessTokenProvider, sessionId } = options;
-    const { url } = AgentCoreMcpClient.buildUrl(agentRuntimeArn);
-
+    const { url } = AgentCoreMcpClient.buildUrl(options.agentRuntimeArn);
     return AgentCoreMcpClient.create({
       url,
-      sessionId,
       buildHeaders: async () => ({
-        Authorization: `Bearer ${await accessTokenProvider()}`,
+        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/core-runtime-config/session-context.ts.template

@@ -0,0 +1,21 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+
+const sessionStorage = new AsyncLocalStorage<string>();
+
+/** Run `callback` with `sessionId` as the current session. */
+export const runWithSessionId = <T>(sessionId: string, callback: () => T): T =>
+  sessionStorage.run(sessionId, callback);
+
+/**
+ * Bind `sessionId` onto the current async flow.
+ *
+ * Use from inside async generators (e.g. tRPC subscriptions), where the
+ * generator is iterated outside any `run()` callback.
+ */
+export const enterSessionContext = (sessionId: string): void => {
+  sessionStorage.enterWith(sessionId);
+};
+
+/** The session ID for the current async scope, or `undefined`. */
+export const getCurrentSessionId = (): string | undefined =>
+  sessionStorage.getStore();

package/src/utils/agent-connection/files/core-runtime-config/with-session-id.ts.template

@@ -0,0 +1,27 @@
+import { Agent } from '@strands-agents/sdk';
+import { getCurrentSessionId } from './session-context.js';
+
+/** Wrap an Agent factory so each session gets its own cached Agent. */
+export const withSessionId = (factory: () => Promise<Agent>): Agent => {
+  const agents = new Map<string, Promise<Agent>>();
+  const forSession = (): Promise<Agent> => {
+    const sid = getCurrentSessionId() ?? 'default';
+    let pending = agents.get(sid);
+    if (!pending) {
+      pending = factory();
+      agents.set(sid, pending);
+    }
+    return pending;
+  };
+
+  class SessionRoutingAgent extends Agent {
+    override async invoke(...args: Parameters<Agent['invoke']>) {
+      return (await forSession()).invoke(...args);
+    }
+    override async *stream(...args: Parameters<Agent['stream']>) {
+      return yield* (await forSession()).stream(...args);
+    }
+  }
+
+  return new SessionRoutingAgent();
+};

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

@@ -7,10 +7,32 @@ 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 clients to call A2A agents hosted on Bedrock AgentCore Runtime."""
+    """Factory for A2A clients that forward the current async-context session."""
 
     @staticmethod
     def _build_url(agent_runtime_arn: str) -> tuple[str, str]:
@@ -21,7 +43,10 @@ class AgentCoreA2aClient:
         """
         region = agent_runtime_arn.split(":")[3]
         encoded_arn = quote(agent_runtime_arn, safe="")
-        url = f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/{encoded_arn}/invocations/"
+        url = (
+            f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/"
+            f"{encoded_arn}/invocations/"
+        )
         return region, url
 
     @staticmethod
@@ -34,7 +59,7 @@ class AgentCoreA2aClient:
         description: str | None,
     ) -> A2AAgent:
         httpx_client = httpx.AsyncClient(
-            auth=auth,
+            auth=_SessionHeaderAuth(auth),
             headers=headers or {},
             timeout=120,
         )
@@ -52,18 +77,14 @@ class AgentCoreA2aClient:
         *,
         name: str | None = None,
         description: str | None = None,
-        session_id: str | None = None,
     ) -> A2AAgent:
-        """Create an `A2AAgent` with IAM (SigV4) authentication."""
+        """SigV4-authenticated client for a Bedrock AgentCore runtime."""
         region, url = AgentCoreA2aClient._build_url(agent_runtime_arn)
         credentials = boto3.Session(region_name=region).get_credentials()
-        headers = {}
-        if session_id:
-            headers["X-Amzn-Bedrock-AgentCore-Runtime-Session-Id"] = session_id
         return AgentCoreA2aClient._build(
             url,
             SigV4HTTPXAuth(credentials, "bedrock-agentcore", region),
-            headers,
+            None,
             name=name,
             description=description,
         )
@@ -75,17 +96,25 @@ class AgentCoreA2aClient:
         *,
         name: str | None = None,
         description: str | None = None,
-        session_id: str | None = None,
     ) -> A2AAgent:
-        """Create an `A2AAgent` with JWT Bearer authentication."""
+        """Bearer-authenticated client for a Bedrock AgentCore runtime."""
         _, url = AgentCoreA2aClient._build_url(agent_runtime_arn)
-        headers = {"Authorization": f"Bearer {access_token_provider()}"}
-        if session_id:
-            headers["X-Amzn-Bedrock-AgentCore-Runtime-Session-Id"] = session_id
         return AgentCoreA2aClient._build(
             url,
             None,
-            headers,
+            {"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
+        )