@aws/nx-plugin 1.0.0-rc.5 → 1.0.0-rc.51

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

@@ -0,0 +1,189 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`py#agent#a2a-connection generator > should match snapshot for agent-connection core files > agentcore_a2a_client_config.py 1`] = `
+"from collections.abc import Callable
+
+import boto3
+import httpx
+from a2a.client import ClientConfig
+
+from .agentcore_endpoints import a2a_url_from_arn, region_from_arn
+from .auth.session import jwt_auth, plain_auth, sigv4_auth
+
+
+def _config(url: str, auth: httpx.Auth) -> tuple[str, ClientConfig]:
+    httpx_client = httpx.AsyncClient(auth=auth, timeout=120)
+    return url, ClientConfig(httpx_client=httpx_client, streaming=False)
+
+
+class AgentCoreA2aClientConfig:
+    """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."""
+
+    @staticmethod
+    def with_iam_auth(agent_runtime_arn: str) -> tuple[str, ClientConfig]:
+        """SigV4-authenticated A2A client config for a Bedrock AgentCore runtime."""
+        region = region_from_arn(agent_runtime_arn)
+        credentials = boto3.Session(region_name=region).get_credentials()
+        return _config(a2a_url_from_arn(agent_runtime_arn), sigv4_auth(credentials, region))
+
+    @staticmethod
+    def with_jwt_auth(agent_runtime_arn: str, access_token_provider: Callable[[], str]) -> tuple[str, ClientConfig]:
+        """Bearer-authenticated A2A client config for a Bedrock AgentCore runtime."""
+        return _config(a2a_url_from_arn(agent_runtime_arn), jwt_auth(access_token_provider))
+
+    @staticmethod
+    def without_auth(url: str) -> tuple[str, ClientConfig]:
+        """Plain-HTTP A2A client config — for local dev."""
+        return _config(url, plain_auth())
+"
+`;
+
+exports[`py#agent#a2a-connection generator > should match snapshot for agent-connection core files > agentcore_a2a_client_strands.py 1`] = `
+"from collections.abc import Callable
+
+from strands.agent.a2a_agent import A2AAgent
+
+from .agentcore_a2a_client_config import AgentCoreA2aClientConfig
+
+
+def _build(config: tuple, *, name: str | None, description: str | None) -> A2AAgent:
+    url, client_config = config
+    kwargs: dict = {"endpoint": url, "client_config": client_config}
+    if name:
+        kwargs["name"] = name
+    if description:
+        kwargs["description"] = description
+    return A2AAgent(**kwargs)
+
+
+class AgentCoreA2aClientStrands:
+    """Factory for Strands A2A clients that connect to an AgentCore runtime."""
+
+    @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."""
+        return _build(
+            AgentCoreA2aClientConfig.with_iam_auth(agent_runtime_arn),
+            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."""
+        return _build(
+            AgentCoreA2aClientConfig.with_jwt_auth(agent_runtime_arn, 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 _build(
+            AgentCoreA2aClientConfig.without_auth(url),
+            name=name,
+            description=description,
+        )
+"
+`;
+
+exports[`py#agent#a2a-connection generator > should match snapshot for agent-connection core files > remote_client_strands.py 1`] = `
+"import os
+
+from strands.agent.a2a_agent import A2AAgent
+
+from test_agent_connection.core.agentcore_a2a_client_strands import (
+    AgentCoreA2aClientStrands,
+)
+from test_agent_connection.core.runtime_config import (
+    get_agentcore_runtime_config,
+)
+
+
+class RemoteClientStrands:
+    """Strands client for the Remote A2A agent."""
+
+    @staticmethod
+    def create() -> A2AAgent:
+        if os.environ.get("LOCAL_DEV") == "true":
+            return AgentCoreA2aClientStrands.without_auth("http://localhost:9001/")
+        config = get_agentcore_runtime_config()
+        agent_runtime_arn = config.get("agentRuntimes", {}).get("Remote")
+        if not agent_runtime_arn:
+            raise RuntimeError("No connected agent runtime named 'Remote' found in runtime configuration.")
+        return AgentCoreA2aClientStrands.with_iam_auth(agent_runtime_arn)
+"
+`;
+
+exports[`py#agent#a2a-connection generator > should match snapshot for agent-connection core files > session.py 1`] = `
+"from collections.abc import Callable
+
+import httpx
+
+from ..session_context import get_current_session_id
+from .sigv4 import SigV4HTTPXAuth
+
+SESSION_HEADER = "X-Amzn-Bedrock-AgentCore-Runtime-Session-Id"
+
+
+class SessionHeaderAuth(httpx.Auth):
+    """Stamps the AgentCore session header from the current async context,
+    then delegates to an optional inner auth (e.g. SigV4)."""
+
+    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)
+
+
+def sigv4_auth(credentials, region: str, service: str = "bedrock-agentcore") -> httpx.Auth:
+    """Session-forwarding SigV4 auth (per-request, body-aware)."""
+    return SessionHeaderAuth(SigV4HTTPXAuth(credentials, service, region))
+
+
+def jwt_auth(access_token_provider: Callable[[], str]) -> httpx.Auth:
+    """Session-forwarding bearer-token auth."""
+
+    class _Bearer(httpx.Auth):
+        def auth_flow(self, request: httpx.Request):
+            request.headers["Authorization"] = f"Bearer {access_token_provider()}"
+            yield request
+
+    return SessionHeaderAuth(_Bearer())
+
+
+def plain_auth() -> httpx.Auth:
+    """Session-forwarding plain auth — for local dev."""
+    return SessionHeaderAuth()
+"
+`;

package/src/py/agent/a2a-connection/files/agent-connection/app/__targetAgentSnakeCase___client_strands.py.template

@@ -0,0 +1,30 @@
+import os
+
+from strands.agent.a2a_agent import A2AAgent
+
+from <%- agentConnectionModuleName %>.core.agentcore_a2a_client_strands import (
+    AgentCoreA2aClientStrands,
+)
+from <%- agentConnectionModuleName %>.core.runtime_config import (
+    get_agentcore_runtime_config,
+)
+
+
+class <%- targetAgentClassName %>ClientStrands:
+    """Strands client for the <%- targetAgentClassName %> A2A agent."""
+
+    @staticmethod
+    def create() -> A2AAgent:
+        if os.environ.get("LOCAL_DEV") == "true":
+            return AgentCoreA2aClientStrands.without_auth(
+                "http://localhost:<%- targetAgentPort %>/"
+            )
+        config = get_agentcore_runtime_config()
+        agent_runtime_arn = config.get("agentRuntimes", {}).get(
+            "<%- targetAgentClassName %>"
+        )
+        if not agent_runtime_arn:
+            raise RuntimeError(
+                "No connected agent runtime named '<%- targetAgentClassName %>' found in runtime configuration."
+            )
+        return AgentCoreA2aClientStrands.with_iam_auth(agent_runtime_arn)

package/src/py/agent/a2a-connection/files/langchain/agent-connection/app/__targetAgentSnakeCase___client_langchain.py.template

@@ -0,0 +1,28 @@
+import os
+
+from <%- agentConnectionModuleName %>.core.agentcore_a2a_client_langchain import (
+    AgentCoreA2aClientLangChain,
+)
+from <%- agentConnectionModuleName %>.core.runtime_config import (
+    get_agentcore_runtime_config,
+)
+
+
+class <%- targetAgentClassName %>ClientLangChain:
+    """LangChain client for the <%- targetAgentClassName %> A2A agent."""
+
+    @staticmethod
+    def create():
+        if os.environ.get("LOCAL_DEV") == "true":
+            return AgentCoreA2aClientLangChain.without_auth(
+                "http://localhost:<%- targetAgentPort %>/"
+            )
+        config = get_agentcore_runtime_config()
+        agent_runtime_arn = config.get("agentRuntimes", {}).get(
+            "<%- targetAgentClassName %>"
+        )
+        if not agent_runtime_arn:
+            raise RuntimeError(
+                "No connected agent runtime named '<%- targetAgentClassName %>' found in runtime configuration."
+            )
+        return AgentCoreA2aClientLangChain.with_iam_auth(agent_runtime_arn)

package/src/py/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 { PyAgentA2aConnectionGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { PyAgentA2aConnectionGeneratorSchema } from './schema';
 export declare const PY_AGENT_A2A_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const pyAgentA2aConnectionGenerator: (tree: Tree, options: PyAgentA2aConnectionGeneratorSchema) => Promise<GeneratorCallback>;
 export default pyAgentA2aConnectionGenerator;

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

@@ -1,24 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pyAgentA2aConnectionGenerator = exports.PY_AGENT_A2A_CONNECTION_GENERATOR_INFO = 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 nx_1 = require("../../../utils/nx");
-const metrics_1 = require("../../../utils/metrics");
-const format_1 = require("../../../utils/format");
-const names_1 = require("../../../utils/names");
-const py_1 = require("../../../utils/py");
-const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
-const ast_1 = require("../../../utils/ast");
-/** Prefix a GritQL pattern with `language python` */
-const py = (pattern) => `language python\n${pattern}`;
-exports.PY_AGENT_A2A_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const pyAgentA2aConnectionGenerator = async (tree, options) => {
-    const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
-    const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+import { addPythonCoreClient, addPythonReExport, ensurePythonAgentConnectionProject, getPythonAgentConnectionModuleName, getPythonAgentConnectionProject, getPythonAgentConnectionProjectDir, PY_CLIENT_NAMING, resolveAgentFramework } from "../../../utils/agent-connection/agent-connection.js";
+import { addPythonDestructuredImport, applyGritQL, matchGritQL } from "../../../utils/ast.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { installDependencies } from "../../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { snakeCase } from "../../../utils/names.js";
+import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { addDependenciesToPyProjectToml, addWorkspaceDependencyToPyProject } from "../../../utils/py.js";
+/** Prefix a GritQL pattern with `language python` */ const py = (pattern)=>`language python\n${pattern}`;
+/** The module each framework imports the `tool` decorator from. */ const TOOL_IMPORT_MODULE = {
+    strands: 'strands',
+    langchain: 'langchain_core.tools'
+};
+/** The GritQL pattern matching each framework's agent constructor. */ const AGENT_CONSTRUCTOR = {
+    strands: 'yield Agent($_)',
+    langchain: 'create_agent($_)'
+};
+/**
+ * The A2A transport dependency each framework's Layer-2 client needs. Strands
+ * wraps strands' `A2AAgent` (strands-agents[a2a]); LangChain drives the a2a SDK
+ * directly (a2a-sdk) and must not pull Strands in.
+ */ const A2A_TRANSPORT_DEP = {
+    strands: 'strands-agents[a2a]',
+    langchain: 'a2a-sdk'
+};
+export const PY_AGENT_A2A_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const pyAgentA2aConnectionGenerator = async (tree, options)=>{
+    const sourceProject = readProjectConfigurationUnqualified(tree, options.sourceProject);
+    const targetProject = readProjectConfigurationUnqualified(tree, options.targetProject);
     const agentComponent = options.sourceComponent;
     const targetAgentComponent = options.targetComponent;
     if (!agentComponent || !targetAgentComponent) {
@@ -27,95 +39,110 @@ const pyAgentA2aConnectionGenerator = async (tree, options) => {
     if ((targetAgentComponent.protocol ?? '').toLowerCase() !== 'a2a') {
         throw new Error(`Target agent '${targetAgentComponent.name}' uses the ${targetAgentComponent.protocol ?? 'http'} protocol — only A2A agents can be connected as tools.`);
     }
-    if (targetAgentComponent.auth &&
-        targetAgentComponent.auth.toLowerCase() !== 'iam') {
+    if (targetAgentComponent.auth && targetAgentComponent.auth.toLowerCase() !== 'iam') {
         throw new Error(`A2A agent connection currently only supports IAM authentication, but '${targetAgentComponent.name}' uses '${targetAgentComponent.auth}' authentication.`);
     }
     const targetAgentComponentName = targetAgentComponent.name ?? 'agent';
     const targetAgentClassName = targetAgentComponent.rc;
-    const targetAgentSnakeCase = (0, names_1.snakeCase)(targetAgentClassName);
+    const targetAgentSnakeCase = snakeCase(targetAgentClassName);
     const targetAgentPort = targetAgentComponent.port ?? 9000;
+    // The source agent's framework drives everything that varies: the client
+    // naming + app template (shared with the mcp/gateway generators via
+    // PY_CLIENT_NAMING), the A2A transport dep (see A2A_TRANSPORT_DEP), and the
+    // agent.py transform below. Each framework wraps its own A2A Layer-2 client
+    // (Strands' A2AAgent vs an a2a-sdk-only client) over the shared,
+    // framework-agnostic A2A client config. Keyed on the framework, not a
+    // boolean, so a third framework stays additive.
+    const framework = resolveAgentFramework(agentComponent.framework);
+    const naming = PY_CLIENT_NAMING[framework];
     // 1. Ensure the shared Python agent-connection project exists + has the
-    //    A2A core client and its shared SigV4 auth helper.
-    await (0, agent_connection_1.ensurePythonAgentConnectionProject)(tree);
-    (0, agent_connection_1.addPythonCoreClient)(tree, 'auth');
-    (0, agent_connection_1.addPythonCoreClient)(tree, 'a2a');
-    const agentConnectionProjectDir = (0, agent_connection_1.getPythonAgentConnectionProjectDir)(tree);
-    const agentConnectionModuleName = (0, agent_connection_1.getPythonAgentConnectionModuleName)(tree);
-    const agentConnectionPackageName = (0, agent_connection_1.getPythonAgentConnectionPackageName)(tree);
-    // Python deps required by the A2A core client + shared auth helper.
-    (0, py_1.addDependenciesToPyProjectToml)(tree, agentConnectionProjectDir, [
+    //    A2A core client (framework Layer-2) and its shared SigV4 auth helper.
+    await ensurePythonAgentConnectionProject(tree);
+    await addPythonCoreClient(tree, 'a2a', framework);
+    const agentConnectionProjectDir = getPythonAgentConnectionProjectDir(tree);
+    const agentConnectionModuleName = getPythonAgentConnectionModuleName(tree);
+    // A2A client config + shared auth helper deps, plus the framework's A2A
+    // transport dep (see A2A_TRANSPORT_DEP).
+    addDependenciesToPyProjectToml(tree, agentConnectionProjectDir, [
         'boto3',
         'httpx',
-        'strands-agents[a2a]',
+        A2A_TRANSPORT_DEP[framework]
     ]);
     // 2. Generate the per-connection client into the shared agent-connection project
-    const appDir = (0, devkit_1.joinPathFragments)(agentConnectionProjectDir, agentConnectionModuleName, 'app');
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'agent-connection', 'app'), appDir, {
+    const appDir = joinPathFragments(agentConnectionProjectDir, agentConnectionModuleName, 'app');
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', naming.appTemplateSubdir), appDir, {
         targetAgentSnakeCase,
         targetAgentClassName,
         targetAgentPort,
-        agentConnectionModuleName,
-    }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+        agentConnectionModuleName
+    }, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
     // Ensure app/__init__.py exists
-    const appInitPath = (0, devkit_1.joinPathFragments)(appDir, '__init__.py');
+    const appInitPath = joinPathFragments(appDir, '__init__.py');
     if (!tree.exists(appInitPath)) {
         tree.write(appInitPath, '');
     }
     // Add re-export to module __init__.py
-    const moduleInitPath = (0, devkit_1.joinPathFragments)(agentConnectionProjectDir, agentConnectionModuleName, '__init__.py');
-    await (0, agent_connection_1.addPythonReExport)(tree, moduleInitPath, `.app.${targetAgentSnakeCase}_client`, `${targetAgentClassName}Client`);
+    const moduleInitPath = joinPathFragments(agentConnectionProjectDir, agentConnectionModuleName, '__init__.py');
+    await addPythonReExport(tree, moduleInitPath, `.app.${targetAgentSnakeCase}_client_${naming.clientModuleSuffix}`, `${targetAgentClassName}Client${naming.clientClassSuffix}`);
     // 3. Transform agent.py to add the A2A client import + wrap it as a tool
-    const agentSourceDir = (0, devkit_1.joinPathFragments)(sourceProject.root, agentComponent.path ?? 'src');
-    const agentFilePath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'agent.py');
+    const agentSourceDir = joinPathFragments(sourceProject.root, agentComponent.path ?? 'src');
+    const agentFilePath = joinPathFragments(agentSourceDir, 'agent.py');
     if (tree.exists(agentFilePath)) {
-        const clientClassName = `${targetAgentClassName}Client`;
+        const clientClassName = `${targetAgentClassName}Client${naming.clientClassSuffix}`;
         const clientVarName = targetAgentSnakeCase;
         const toolName = `ask_${targetAgentSnakeCase}`;
-        await addImportToAgentFile(tree, agentFilePath, agentConnectionModuleName, clientClassName);
-        await addToolToAgent(tree, agentFilePath, toolName);
-        await addClientToolToGetAgent(tree, agentFilePath, clientClassName, clientVarName, toolName, targetAgentClassName);
+        await addImportToAgentFile(tree, agentFilePath, agentConnectionModuleName, clientClassName, framework);
+        await addToolToAgent(tree, agentFilePath, toolName, framework);
+        await addClientToolToGetAgent(tree, agentFilePath, clientClassName, clientVarName, toolName, targetAgentClassName, framework);
     }
     // 4. Add workspace dependency from agent project to agent-connection project
-    (0, py_1.addWorkspaceDependencyToPyProject)(tree, sourceProject.root, agentConnectionPackageName);
-    // 5. Set up serve-local target dependencies — chain onto the target agent
+    addWorkspaceDependencyToPyProject(tree, sourceProject, getPythonAgentConnectionProject(tree));
+    // 5. Set up dev target dependencies — chain onto the target agent
     const agentName = agentComponent.name ?? 'agent';
-    const serveLocalTargetName = `${agentName}-serve-local`;
-    const targetServeLocalTargetName = `${targetAgentComponentName}-serve-local`;
-    if (sourceProject.targets?.[serveLocalTargetName]) {
-        (0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, serveLocalTargetName, {
-            projects: [targetProject.name],
-            target: targetServeLocalTargetName,
+    const devTargetName = `${agentName}-dev`;
+    const targetDevTargetName = `${targetAgentComponentName}-dev`;
+    if (sourceProject.targets?.[devTargetName]) {
+        addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {
+            projects: [
+                targetProject.name
+            ],
+            target: targetDevTargetName
         });
-        (0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
+        updateProjectConfiguration(tree, sourceProject.name, sourceProject);
     }
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.PY_AGENT_A2A_CONNECTION_GENERATOR_INFO,
+    await addGeneratorMetricsIfApplicable(tree, [
+        PY_AGENT_A2A_CONNECTION_GENERATOR_INFO
     ]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.pyAgentA2aConnectionGenerator = pyAgentA2aConnectionGenerator;
 /**
  * Add imports to agent.py:
- *  - `tool` from `strands`
+ *  - `tool` (from `strands`, or `langchain_core.tools` for LangChain agents)
  *  - the per-connection client class from the shared agent-connection module
- */
-const addImportToAgentFile = async (tree, filePath, agentConnectionModuleName, clientClassName) => {
-    await (0, ast_1.addPythonDestructuredImport)(tree, filePath, ['tool'], 'strands');
-    await (0, ast_1.addPythonDestructuredImport)(tree, filePath, [clientClassName], agentConnectionModuleName);
+ */ const addImportToAgentFile = async (tree, filePath, agentConnectionModuleName, clientClassName, framework)=>{
+    await addPythonDestructuredImport(tree, filePath, [
+        'tool'
+    ], TOOL_IMPORT_MODULE[framework]);
+    await addPythonDestructuredImport(tree, filePath, [
+        clientClassName
+    ], agentConnectionModuleName);
 };
 /**
  * Add the A2A tool to the Agent's tools array using GritQL.
  *
- * Scoped via `$old <: within \`yield Agent($_)\`` so unrelated `tools=`
- * keyword arguments elsewhere in the file are not touched.
- */
-const addToolToAgent = async (tree, filePath, toolName) => {
-    await (0, ast_1.applyGritQL)(tree, filePath, py(`\`tools=$old\` where {
-  $old <: within \`yield Agent($_)\`,
+ * Scoped to the framework's agent constructor so unrelated `tools=` keyword
+ * arguments elsewhere in the file are not touched.
+ */ const addToolToAgent = async (tree, filePath, toolName, framework)=>{
+    const scope = AGENT_CONSTRUCTOR[framework];
+    await applyGritQL(tree, filePath, py(`\`tools=$old\` where {
+  $old <: within \`${scope}\`,
   $old <: not contains \`${toolName}\`,
   if ($old <: \`[]\`) {
     $old => \`[${toolName}]\`
@@ -126,19 +153,18 @@ const addToolToAgent = async (tree, filePath, toolName) => {
 };
 /**
  * Wrap the get_agent body so the remote A2A client is created and exposed
- * as a `@tool`-decorated closure before yielding the Agent.
+ * as a `@tool`-decorated closure before constructing the Agent.
  *
  * Unlike MCP clients, A2A clients aren't context managers — we don't need
  * a `with` block around them. Creation + tool definition happen at the
- * top of the function body.
- */
-const addClientToolToGetAgent = async (tree, filePath, clientClassName, clientVarName, toolName, targetAgentClassName) => {
-    if (await (0, ast_1.matchGritQL)(tree, filePath, `\`${clientClassName}.create\``)) {
+ * top of the function body, anchored on the framework's agent constructor.
+ */ const addClientToolToGetAgent = async (tree, filePath, clientClassName, clientVarName, toolName, targetAgentClassName, framework)=>{
+    if (await matchGritQL(tree, filePath, py(`\`${clientClassName}.create\``))) {
         return;
     }
-    // The tool function we'll insert. Strands tools in Python are just
-    // @tool-decorated callables, so we define them inline in get_agent.
-    // A2AAgent is directly callable (syncs over invoke_async internally).
+    // Both frameworks' tools are @tool-decorated callables (the decorator's
+    // import differs, handled in addImportToAgentFile), defined inline in
+    // get_agent. The client is directly callable, returning the remote's reply.
     const toolBlock = `${clientVarName} = ${clientClassName}.create()
 
     @tool
@@ -146,16 +172,18 @@ const addClientToolToGetAgent = async (tree, filePath, clientClassName, clientVa
         """Delegate a question to the remote ${targetAgentClassName} A2A agent and return its reply."""
         return str(${clientVarName}(prompt))
 `;
-    // Prepend client creation + tool definition to the function body.
-    // This works whether or not a prior MCP `with` block is present since we
-    // insert before any existing statements.
-    await (0, ast_1.applyGritQL)(tree, filePath, py(`\`def get_agent($params):
+    // Prepend client creation + tool definition to the function body, anchored on
+    // the framework's agent constructor. This works whether or not a prior MCP
+    // block is present since we insert before any existing statements.
+    const anchor = AGENT_CONSTRUCTOR[framework];
+    await applyGritQL(tree, filePath, py(`\`def get_agent($params):
     $body\` where {
-  $body <: contains \`yield Agent($_)\`,
+  $body <: contains \`${anchor}\`,
   $body <: not contains \`${clientClassName}.create\`
 } => \`def get_agent($params):
     ${toolBlock}
     $body\``));
 };
-exports.default = exports.pyAgentA2aConnectionGenerator;
+export default pyAgentA2aConnectionGenerator;
+
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/agent/a2a-connection/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/agent/a2a-connection/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport {\n  type AgentFramework,\n  addPythonCoreClient,\n  addPythonReExport,\n  ensurePythonAgentConnectionProject,\n  getPythonAgentConnectionModuleName,\n  getPythonAgentConnectionProject,\n  getPythonAgentConnectionProjectDir,\n  PY_CLIENT_NAMING,\n  resolveAgentFramework,\n} from '../../../utils/agent-connection/agent-connection';\nimport {\n  addPythonDestructuredImport,\n  applyGritQL,\n  matchGritQL,\n} from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { snakeCase } from '../../../utils/names';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport {\n  addDependenciesToPyProjectToml,\n  addWorkspaceDependencyToPyProject,\n} from '../../../utils/py';\nimport type { IPyDepVersion } from '../../../utils/versions';\nimport type { PyAgentA2aConnectionGeneratorSchema } from './schema';\n\n/** Prefix a GritQL pattern with `language python` */\nconst py = (pattern: string) => `language python\\n${pattern}`;\n\n/** The module each framework imports the `tool` decorator from. */\nconst TOOL_IMPORT_MODULE: Record<AgentFramework, string> = {\n  strands: 'strands',\n  langchain: 'langchain_core.tools',\n};\n\n/** The GritQL pattern matching each framework's agent constructor. */\nconst AGENT_CONSTRUCTOR: Record<AgentFramework, string> = {\n  strands: 'yield Agent($_)',\n  langchain: 'create_agent($_)',\n};\n\n/**\n * The A2A transport dependency each framework's Layer-2 client needs. Strands\n * wraps strands' `A2AAgent` (strands-agents[a2a]); LangChain drives the a2a SDK\n * directly (a2a-sdk) and must not pull Strands in.\n */\nconst A2A_TRANSPORT_DEP: Record<AgentFramework, IPyDepVersion> = {\n  strands: 'strands-agents[a2a]',\n  langchain: 'a2a-sdk',\n};\n\nexport const PY_AGENT_A2A_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyAgentA2aConnectionGenerator = async (\n  tree: Tree,\n  options: PyAgentA2aConnectionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  const agentComponent = options.sourceComponent;\n  const targetAgentComponent = options.targetComponent;\n\n  if (!agentComponent || !targetAgentComponent) {\n    throw new Error(\n      'Both sourceComponent and targetComponent must be provided for py#agent -> a2a connections',\n    );\n  }\n\n  if ((targetAgentComponent.protocol ?? '').toLowerCase() !== 'a2a') {\n    throw new Error(\n      `Target agent '${targetAgentComponent.name}' uses the ${targetAgentComponent.protocol ?? 'http'} protocol — only A2A agents can be connected as tools.`,\n    );\n  }\n\n  if (\n    targetAgentComponent.auth &&\n    targetAgentComponent.auth.toLowerCase() !== 'iam'\n  ) {\n    throw new Error(\n      `A2A agent connection currently only supports IAM authentication, but '${targetAgentComponent.name}' uses '${targetAgentComponent.auth}' authentication.`,\n    );\n  }\n\n  const targetAgentComponentName = targetAgentComponent.name ?? 'agent';\n  const targetAgentClassName = targetAgentComponent.rc as string;\n  const targetAgentSnakeCase = snakeCase(targetAgentClassName);\n  const targetAgentPort = targetAgentComponent.port ?? 9000;\n\n  // The source agent's framework drives everything that varies: the client\n  // naming + app template (shared with the mcp/gateway generators via\n  // PY_CLIENT_NAMING), the A2A transport dep (see A2A_TRANSPORT_DEP), and the\n  // agent.py transform below. Each framework wraps its own A2A Layer-2 client\n  // (Strands' A2AAgent vs an a2a-sdk-only client) over the shared,\n  // framework-agnostic A2A client config. Keyed on the framework, not a\n  // boolean, so a third framework stays additive.\n  const framework = resolveAgentFramework(agentComponent.framework);\n  const naming = PY_CLIENT_NAMING[framework];\n\n  // 1. Ensure the shared Python agent-connection project exists + has the\n  //    A2A core client (framework Layer-2) and its shared SigV4 auth helper.\n  await ensurePythonAgentConnectionProject(tree);\n  await addPythonCoreClient(tree, 'a2a', framework);\n\n  const agentConnectionProjectDir = getPythonAgentConnectionProjectDir(tree);\n  const agentConnectionModuleName = getPythonAgentConnectionModuleName(tree);\n\n  // A2A client config + shared auth helper deps, plus the framework's A2A\n  // transport dep (see A2A_TRANSPORT_DEP).\n  addDependenciesToPyProjectToml(tree, agentConnectionProjectDir, [\n    'boto3',\n    'httpx',\n    A2A_TRANSPORT_DEP[framework],\n  ]);\n\n  // 2. Generate the per-connection client into the shared agent-connection project\n  const appDir = joinPathFragments(\n    agentConnectionProjectDir,\n    agentConnectionModuleName,\n    'app',\n  );\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', naming.appTemplateSubdir),\n    appDir,\n    {\n      targetAgentSnakeCase,\n      targetAgentClassName,\n      targetAgentPort,\n      agentConnectionModuleName,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Ensure app/__init__.py exists\n  const appInitPath = joinPathFragments(appDir, '__init__.py');\n  if (!tree.exists(appInitPath)) {\n    tree.write(appInitPath, '');\n  }\n\n  // Add re-export to module __init__.py\n  const moduleInitPath = joinPathFragments(\n    agentConnectionProjectDir,\n    agentConnectionModuleName,\n    '__init__.py',\n  );\n  await addPythonReExport(\n    tree,\n    moduleInitPath,\n    `.app.${targetAgentSnakeCase}_client_${naming.clientModuleSuffix}`,\n    `${targetAgentClassName}Client${naming.clientClassSuffix}`,\n  );\n\n  // 3. Transform agent.py to add the A2A client import + wrap it as a tool\n  const agentSourceDir = joinPathFragments(\n    sourceProject.root,\n    agentComponent.path ?? 'src',\n  );\n  const agentFilePath = joinPathFragments(agentSourceDir, 'agent.py');\n\n  if (tree.exists(agentFilePath)) {\n    const clientClassName = `${targetAgentClassName}Client${naming.clientClassSuffix}`;\n    const clientVarName = targetAgentSnakeCase;\n    const toolName = `ask_${targetAgentSnakeCase}`;\n\n    await addImportToAgentFile(\n      tree,\n      agentFilePath,\n      agentConnectionModuleName,\n      clientClassName,\n      framework,\n    );\n    await addToolToAgent(tree, agentFilePath, toolName, framework);\n    await addClientToolToGetAgent(\n      tree,\n      agentFilePath,\n      clientClassName,\n      clientVarName,\n      toolName,\n      targetAgentClassName,\n      framework,\n    );\n  }\n\n  // 4. Add workspace dependency from agent project to agent-connection project\n  addWorkspaceDependencyToPyProject(\n    tree,\n    sourceProject,\n    getPythonAgentConnectionProject(tree),\n  );\n\n  // 5. Set up dev target dependencies — chain onto the target agent\n  const agentName = agentComponent.name ?? 'agent';\n  const devTargetName = `${agentName}-dev`;\n  const targetDevTargetName = `${targetAgentComponentName}-dev`;\n\n  if (sourceProject.targets?.[devTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {\n      projects: [targetProject.name],\n      target: targetDevTargetName,\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    PY_AGENT_A2A_CONNECTION_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\n/**\n * Add imports to agent.py:\n *  - `tool` (from `strands`, or `langchain_core.tools` for LangChain agents)\n *  - the per-connection client class from the shared agent-connection module\n */\nconst addImportToAgentFile = async (\n  tree: Tree,\n  filePath: string,\n  agentConnectionModuleName: string,\n  clientClassName: string,\n  framework: AgentFramework,\n): Promise<void> => {\n  await addPythonDestructuredImport(\n    tree,\n    filePath,\n    ['tool'],\n    TOOL_IMPORT_MODULE[framework],\n  );\n  await addPythonDestructuredImport(\n    tree,\n    filePath,\n    [clientClassName],\n    agentConnectionModuleName,\n  );\n};\n\n/**\n * Add the A2A tool to the Agent's tools array using GritQL.\n *\n * Scoped to the framework's agent constructor so unrelated `tools=` keyword\n * arguments elsewhere in the file are not touched.\n */\nconst addToolToAgent = async (\n  tree: Tree,\n  filePath: string,\n  toolName: string,\n  framework: AgentFramework,\n): Promise<void> => {\n  const scope = AGENT_CONSTRUCTOR[framework];\n  await applyGritQL(\n    tree,\n    filePath,\n    py(`\\`tools=$old\\` where {\n  $old <: within \\`${scope}\\`,\n  $old <: not contains \\`${toolName}\\`,\n  if ($old <: \\`[]\\`) {\n    $old => \\`[${toolName}]\\`\n  } else {\n    $old <: \\`[$items]\\` where { $items += \\`, ${toolName}\\` }\n  }\n}`),\n  );\n};\n\n/**\n * Wrap the get_agent body so the remote A2A client is created and exposed\n * as a `@tool`-decorated closure before constructing the Agent.\n *\n * Unlike MCP clients, A2A clients aren't context managers — we don't need\n * a `with` block around them. Creation + tool definition happen at the\n * top of the function body, anchored on the framework's agent constructor.\n */\nconst addClientToolToGetAgent = async (\n  tree: Tree,\n  filePath: string,\n  clientClassName: string,\n  clientVarName: string,\n  toolName: string,\n  targetAgentClassName: string,\n  framework: AgentFramework,\n): Promise<void> => {\n  if (await matchGritQL(tree, filePath, py(`\\`${clientClassName}.create\\``))) {\n    return;\n  }\n\n  // Both frameworks' tools are @tool-decorated callables (the decorator's\n  // import differs, handled in addImportToAgentFile), defined inline in\n  // get_agent. The client is directly callable, returning the remote's reply.\n  const toolBlock = `${clientVarName} = ${clientClassName}.create()\n\n    @tool\n    def ${toolName}(prompt: str) -> str:\n        \"\"\"Delegate a question to the remote ${targetAgentClassName} A2A agent and return its reply.\"\"\"\n        return str(${clientVarName}(prompt))\n`;\n\n  // Prepend client creation + tool definition to the function body, anchored on\n  // the framework's agent constructor. This works whether or not a prior MCP\n  // block is present since we insert before any existing statements.\n  const anchor = AGENT_CONSTRUCTOR[framework];\n  await applyGritQL(\n    tree,\n    filePath,\n    py(`\\`def get_agent($params):\n    $body\\` where {\n  $body <: contains \\`${anchor}\\`,\n  $body <: not contains \\`${clientClassName}.create\\`\n} => \\`def get_agent($params):\n    ${toolBlock}\n    $body\\``),\n  );\n};\n\nexport default pyAgentA2aConnectionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","addPythonCoreClient","addPythonReExport","ensurePythonAgentConnectionProject","getPythonAgentConnectionModuleName","getPythonAgentConnectionProject","getPythonAgentConnectionProjectDir","PY_CLIENT_NAMING","resolveAgentFramework","addPythonDestructuredImport","applyGritQL","matchGritQL","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","snakeCase","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","addDependenciesToPyProjectToml","addWorkspaceDependencyToPyProject","py","pattern","TOOL_IMPORT_MODULE","strands","langchain","AGENT_CONSTRUCTOR","A2A_TRANSPORT_DEP","PY_AGENT_A2A_CONNECTION_GENERATOR_INFO","filename","pyAgentA2aConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","targetAgentComponent","targetComponent","Error","protocol","toLowerCase","name","auth","targetAgentComponentName","targetAgentClassName","rc","targetAgentSnakeCase","targetAgentPort","port","framework","naming","agentConnectionProjectDir","agentConnectionModuleName","appDir","dirname","appTemplateSubdir","overwriteStrategy","KeepExisting","appInitPath","exists","write","moduleInitPath","clientModuleSuffix","clientClassSuffix","agentSourceDir","root","path","agentFilePath","clientClassName","clientVarName","toolName","addImportToAgentFile","addToolToAgent","addClientToolToGetAgent","agentName","devTargetName","targetDevTargetName","targets","projects","target","preferInstallDependencies","languages","filePath","scope","toolBlock","anchor"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,SAEEC,mBAAmB,EACnBC,iBAAiB,EACjBC,kCAAkC,EAClCC,kCAAkC,EAClCC,+BAA+B,EAC/BC,kCAAkC,EAClCC,gBAAgB,EAChBC,qBAAqB,QAChB,sDAAmD;AAC1D,SACEC,2BAA2B,EAC3BC,WAAW,EACXC,WAAW,QACN,wBAAqB;AAC5B,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,SAAS,QAAQ,0BAAuB;AACjD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SACEC,8BAA8B,EAC9BC,iCAAiC,QAC5B,uBAAoB;AAI3B,mDAAmD,GACnD,MAAMC,KAAK,CAACC,UAAoB,CAAC,iBAAiB,EAAEA,SAAS;AAE7D,iEAAiE,GACjE,MAAMC,qBAAqD;IACzDC,SAAS;IACTC,WAAW;AACb;AAEA,oEAAoE,GACpE,MAAMC,oBAAoD;IACxDF,SAAS;IACTC,WAAW;AACb;AAEA;;;;CAIC,GACD,MAAME,oBAA2D;IAC/DH,SAAS;IACTC,WAAW;AACb;AAEA,OAAO,MAAMG,yCACXX,iBAAiB,YAAYY,QAAQ,EAAE;AAEzC,OAAO,MAAMC,gCAAgC,OAC3CC,MACAC;IAEA,MAAMC,gBAAgBf,oCACpBa,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBhB,oCACpBa,MACAC,QAAQE,aAAa;IAGvB,MAAMC,iBAAiBH,QAAQI,eAAe;IAC9C,MAAMC,uBAAuBL,QAAQM,eAAe;IAEpD,IAAI,CAACH,kBAAkB,CAACE,sBAAsB;QAC5C,MAAM,IAAIE,MACR;IAEJ;IAEA,IAAI,AAACF,CAAAA,qBAAqBG,QAAQ,IAAI,EAAC,EAAGC,WAAW,OAAO,OAAO;QACjE,MAAM,IAAIF,MACR,CAAC,cAAc,EAAEF,qBAAqBK,IAAI,CAAC,WAAW,EAAEL,qBAAqBG,QAAQ,IAAI,OAAO,sDAAsD,CAAC;IAE3J;IAEA,IACEH,qBAAqBM,IAAI,IACzBN,qBAAqBM,IAAI,CAACF,WAAW,OAAO,OAC5C;QACA,MAAM,IAAIF,MACR,CAAC,sEAAsE,EAAEF,qBAAqBK,IAAI,CAAC,QAAQ,EAAEL,qBAAqBM,IAAI,CAAC,iBAAiB,CAAC;IAE7J;IAEA,MAAMC,2BAA2BP,qBAAqBK,IAAI,IAAI;IAC9D,MAAMG,uBAAuBR,qBAAqBS,EAAE;IACpD,MAAMC,uBAAuBhC,UAAU8B;IACvC,MAAMG,kBAAkBX,qBAAqBY,IAAI,IAAI;IAErD,yEAAyE;IACzE,oEAAoE;IACpE,4EAA4E;IAC5E,4EAA4E;IAC5E,iEAAiE;IACjE,sEAAsE;IACtE,gDAAgD;IAChD,MAAMC,YAAY1C,sBAAsB2B,eAAee,SAAS;IAChE,MAAMC,SAAS5C,gBAAgB,CAAC2C,UAAU;IAE1C,wEAAwE;IACxE,2EAA2E;IAC3E,MAAM/C,mCAAmC4B;IACzC,MAAM9B,oBAAoB8B,MAAM,OAAOmB;IAEvC,MAAME,4BAA4B9C,mCAAmCyB;IACrE,MAAMsB,4BAA4BjD,mCAAmC2B;IAErE,wEAAwE;IACxE,yCAAyC;IACzCZ,+BAA+BY,MAAMqB,2BAA2B;QAC9D;QACA;QACAzB,iBAAiB,CAACuB,UAAU;KAC7B;IAED,iFAAiF;IACjF,MAAMI,SAASxD,kBACbsD,2BACAC,2BACA;IAEFxD,cACEkC,MACAjC,kBAAkB,YAAYyD,OAAO,EAAE,SAASJ,OAAOK,iBAAiB,GACxEF,QACA;QACEP;QACAF;QACAG;QACAK;IACF,GACA;QAAEI,mBAAmB1D,kBAAkB2D,YAAY;IAAC;IAGtD,gCAAgC;IAChC,MAAMC,cAAc7D,kBAAkBwD,QAAQ;IAC9C,IAAI,CAACvB,KAAK6B,MAAM,CAACD,cAAc;QAC7B5B,KAAK8B,KAAK,CAACF,aAAa;IAC1B;IAEA,sCAAsC;IACtC,MAAMG,iBAAiBhE,kBACrBsD,2BACAC,2BACA;IAEF,MAAMnD,kBACJ6B,MACA+B,gBACA,CAAC,KAAK,EAAEf,qBAAqB,QAAQ,EAAEI,OAAOY,kBAAkB,EAAE,EAClE,GAAGlB,qBAAqB,MAAM,EAAEM,OAAOa,iBAAiB,EAAE;IAG5D,yEAAyE;IACzE,MAAMC,iBAAiBnE,kBACrBmC,cAAciC,IAAI,EAClB/B,eAAegC,IAAI,IAAI;IAEzB,MAAMC,gBAAgBtE,kBAAkBmE,gBAAgB;IAExD,IAAIlC,KAAK6B,MAAM,CAACQ,gBAAgB;QAC9B,MAAMC,kBAAkB,GAAGxB,qBAAqB,MAAM,EAAEM,OAAOa,iBAAiB,EAAE;QAClF,MAAMM,gBAAgBvB;QACtB,MAAMwB,WAAW,CAAC,IAAI,EAAExB,sBAAsB;QAE9C,MAAMyB,qBACJzC,MACAqC,eACAf,2BACAgB,iBACAnB;QAEF,MAAMuB,eAAe1C,MAAMqC,eAAeG,UAAUrB;QACpD,MAAMwB,wBACJ3C,MACAqC,eACAC,iBACAC,eACAC,UACA1B,sBACAK;IAEJ;IAEA,6EAA6E;IAC7E9B,kCACEW,MACAE,eACA5B,gCAAgC0B;IAGlC,kEAAkE;IAClE,MAAM4C,YAAYxC,eAAeO,IAAI,IAAI;IACzC,MAAMkC,gBAAgB,GAAGD,UAAU,IAAI,CAAC;IACxC,MAAME,sBAAsB,GAAGjC,yBAAyB,IAAI,CAAC;IAE7D,IAAIX,cAAc6C,OAAO,EAAE,CAACF,cAAc,EAAE;QAC1C5D,kCAAkCiB,eAAe2C,eAAe;YAC9DG,UAAU;gBAAC7C,cAAcQ,IAAI;aAAC;YAC9BsC,QAAQH;QACV;QACA7E,2BAA2B+B,MAAME,cAAcS,IAAI,EAAET;IACvD;IAEA,MAAMnB,gCAAgCiB,MAAM;QAC1CH;KACD;IAED,MAAMhB,qBAAqBmB;IAC3B,OAAO,IACLlB,oBAAoBkB,MAAMC,QAAQiD,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF;;;;CAIC,GACD,MAAMV,uBAAuB,OAC3BzC,MACAoD,UACA9B,2BACAgB,iBACAnB;IAEA,MAAMzC,4BACJsB,MACAoD,UACA;QAAC;KAAO,EACR5D,kBAAkB,CAAC2B,UAAU;IAE/B,MAAMzC,4BACJsB,MACAoD,UACA;QAACd;KAAgB,EACjBhB;AAEJ;AAEA;;;;;CAKC,GACD,MAAMoB,iBAAiB,OACrB1C,MACAoD,UACAZ,UACArB;IAEA,MAAMkC,QAAQ1D,iBAAiB,CAACwB,UAAU;IAC1C,MAAMxC,YACJqB,MACAoD,UACA9D,GAAG,CAAC;mBACW,EAAE+D,MAAM;yBACF,EAAEb,SAAS;;eAErB,EAAEA,SAAS;;+CAEqB,EAAEA,SAAS;;CAEzD,CAAC;AAEF;AAEA;;;;;;;CAOC,GACD,MAAMG,0BAA0B,OAC9B3C,MACAoD,UACAd,iBACAC,eACAC,UACA1B,sBACAK;IAEA,IAAI,MAAMvC,YAAYoB,MAAMoD,UAAU9D,GAAG,CAAC,EAAE,EAAEgD,gBAAgB,SAAS,CAAC,IAAI;QAC1E;IACF;IAEA,wEAAwE;IACxE,sEAAsE;IACtE,4EAA4E;IAC5E,MAAMgB,YAAY,GAAGf,cAAc,GAAG,EAAED,gBAAgB;;;QAGlD,EAAEE,SAAS;6CAC0B,EAAE1B,qBAAqB;mBACjD,EAAEyB,cAAc;AACnC,CAAC;IAEC,8EAA8E;IAC9E,2EAA2E;IAC3E,mEAAmE;IACnE,MAAMgB,SAAS5D,iBAAiB,CAACwB,UAAU;IAC3C,MAAMxC,YACJqB,MACAoD,UACA9D,GAAG,CAAC;;sBAEc,EAAEiE,OAAO;0BACL,EAAEjB,gBAAgB;;IAExC,EAAEgB,UAAU;WACL,CAAC;AAEZ;AAEA,eAAevD,8BAA8B"}

package/src/py/agent/a2a-connection/schema.d.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ /**
+ * TypeScript types for options defined in schema.json
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/py/agent/a2a-connection/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/agent/a2a-connection/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { ComponentMetadata } from '../../../utils/nx';\n\n/**\n * TypeScript types for options defined in schema.json\n */\nexport interface PyAgentA2aConnectionGeneratorSchema {\n  sourceProject: string;\n  targetProject: string;\n  sourceComponent?: ComponentMetadata;\n  targetComponent?: ComponentMetadata;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAGD;;CAEC,GACD,WAMC"}

package/src/py/agent/a2a-connection/schema.d.ts

@@ -12,4 +12,5 @@ export interface PyAgentA2aConnectionGeneratorSchema {
   targetProject: string;
   sourceComponent?: ComponentMetadata;
   targetComponent?: ComponentMetadata;
+  preferInstallDependencies?: boolean;
 }

package/src/py/agent/a2a-connection/schema.json

@@ -20,6 +20,11 @@
     "targetComponent": {
       "type": "string",
       "description": "The target A2A agent component name"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["sourceProject", "targetProject"]