@aws/nx-plugin 1.0.0-rc.7 → 1.0.0-rc.71

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

@@ -1,24 +1,42 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pyAgentMcpConnectionGenerator = exports.PY_AGENT_MCP_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 agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
-const ast_1 = require("../../../utils/ast");
-const format_1 = require("../../../utils/format");
-const metrics_1 = require("../../../utils/metrics");
-const names_1 = require("../../../utils/names");
-const nx_1 = require("../../../utils/nx");
-const py_1 = require("../../../utils/py");
-/** Prefix a GritQL pattern with `language python` */
-const py = (pattern) => `language python\n${pattern}`;
-exports.PY_AGENT_MCP_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const pyAgentMcpConnectionGenerator = 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 { addPyDependencies } from "../../../utils/add-dependencies.js";
+import { AGENT_CONNECTION_PY_DEPENDENCIES, addPythonCoreClient, addPythonReExport, ensurePythonAgentConnectionProject, getPythonAgentConnectionModuleName, getPythonAgentConnectionProject, getPythonAgentConnectionProjectDir, PY_MCP_FAMILY_CONNECTIONS, resolveAgentFramework } from "../../../utils/agent-connection/agent-connection.js";
+import { addPythonDestructuredImport } from "../../../utils/ast.js";
+import { declareDependencies, ownedElsewhere } from "../../../utils/declared-dependencies.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 { addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { toProjectRelativePath } from "../../../utils/paths.js";
+import { addWorkspaceDependencyToPyProject } from "../../../utils/py.js";
+// The framework picks the MCP client's extra deps, so it names its branch here.
+export const DEPENDENCIES = declareDependencies()({
+    py: [
+        {
+            name: 'boto3'
+        },
+        {
+            name: 'httpx'
+        },
+        {
+            name: 'mcp'
+        },
+        // Backs the LangChain client; it must not pull Strands in.
+        {
+            name: 'langchain-mcp-adapters',
+            when: (m)=>m.framework === 'langchain'
+        },
+        ...ownedElsewhere(AGENT_CONNECTION_PY_DEPENDENCIES)
+    ]
+});
+export const PY_AGENT_MCP_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const pyAgentMcpConnectionGenerator = async (tree, options)=>{
+    const sourceProject = readProjectConfigurationUnqualified(tree, options.sourceProject);
+    const targetProject = readProjectConfigurationUnqualified(tree, options.targetProject);
     const agentComponent = options.sourceComponent;
     const mcpComponent = options.targetComponent;
     if (!agentComponent || !mcpComponent) {
@@ -29,137 +47,92 @@ const pyAgentMcpConnectionGenerator = async (tree, options) => {
     }
     const mcpComponentName = mcpComponent.name ?? 'mcp-server';
     const mcpServerClassName = mcpComponent.rc;
-    const mcpServerSnakeCase = (0, names_1.snakeCase)(mcpServerClassName);
+    const mcpServerSnakeCase = snakeCase(mcpServerClassName);
     const mcpServerPort = mcpComponent.port ?? 8000;
+    // The source agent's framework selects the client shape, dependencies and the
+    // agent.py transform — see PY_MCP_FAMILY_CONNECTIONS (keyed by framework, not a
+    // boolean, so a third framework is an additive entry there).
+    const framework = resolveAgentFramework(agentComponent.framework);
+    const connection = PY_MCP_FAMILY_CONNECTIONS[framework];
+    // Recorded below and read by the declaration's predicates, so the packages
+    // added here are exactly the ones the version sync will own.
+    const metadata = {
+        framework
+    };
     // 1. Ensure the shared Python agent-connection project exists + has the
-    //    MCP 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, 'mcp');
-    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 MCP core client + shared auth helper.
-    (0, py_1.addDependenciesToPyProjectToml)(tree, agentConnectionProjectDir, [
-        'boto3',
-        'httpx',
-        'mcp',
-        'strands-agents',
-    ]);
+    //    MCP core client (framework Layer-2) and its shared SigV4 auth helper.
+    await ensurePythonAgentConnectionProject(tree, DEPENDENCIES);
+    await addPythonCoreClient(tree, 'mcp', DEPENDENCIES, framework);
+    const agentConnectionProjectDir = getPythonAgentConnectionProjectDir(tree);
+    const agentConnectionModuleName = getPythonAgentConnectionModuleName(tree);
+    // Shared MCP transport + signed httpx auth deps, plus whatever extra deps the
+    // framework's MCP client needs (e.g. langchain-mcp-adapters for LangChain).
+    // These belong to the shared agent-connection project, which holds the client.
+    addPyDependencies(tree, DEPENDENCIES, {
+        metadata,
+        projectRoot: agentConnectionProjectDir
+    });
     // 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', connection.appTemplateSubdir), appDir, {
         mcpServerSnakeCase,
         mcpServerClassName,
         mcpServerPort,
-        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.${mcpServerSnakeCase}_client`, `${mcpServerClassName}Client`);
+    const moduleInitPath = joinPathFragments(agentConnectionProjectDir, agentConnectionModuleName, '__init__.py');
+    await addPythonReExport(tree, moduleInitPath, `.app.${mcpServerSnakeCase}_client_${connection.clientModuleSuffix}`, `${mcpServerClassName}Client${connection.clientClassSuffix}`);
     // 3. Transform agent.py to add MCP client import and usage
-    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 = `${mcpServerClassName}Client`;
+        const clientClassName = `${mcpServerClassName}Client${connection.clientClassSuffix}`;
         const clientVarName = mcpServerSnakeCase;
-        await addImportToAgentFile(tree, agentFilePath, agentConnectionModuleName, clientClassName);
-        await addMcpToolsToAgent(tree, agentFilePath, clientVarName);
-        await addMcpClientToGetAgent(tree, agentFilePath, clientClassName, clientVarName);
+        await addPythonDestructuredImport(tree, agentFilePath, [
+            clientClassName
+        ], agentConnectionModuleName);
+        await connection.wireClientIntoAgent(tree, agentFilePath, clientClassName, clientVarName);
     }
     // 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
+    addWorkspaceDependencyToPyProject(tree, sourceProject, getPythonAgentConnectionProject(tree));
+    // 5. Set up dev target dependencies
     const agentName = agentComponent.name ?? 'agent';
-    const serveLocalTargetName = `${agentName}-serve-local`;
-    const mcpServeLocalTargetName = `${mcpComponentName}-serve-local`;
-    if (sourceProject.targets?.[serveLocalTargetName]) {
-        (0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, serveLocalTargetName, {
-            projects: [targetProject.name],
-            target: mcpServeLocalTargetName,
+    const devTargetName = `${agentName}-dev`;
+    const mcpDevTargetName = `${mcpComponentName}-dev`;
+    if (sourceProject.targets?.[devTargetName]) {
+        addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {
+            projects: [
+                targetProject.name
+            ],
+            target: mcpDevTargetName
         });
-        (0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
+        updateProjectConfiguration(tree, sourceProject.name, sourceProject);
     }
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.PY_AGENT_MCP_CONNECTION_GENERATOR_INFO,
+    // Recorded so the version sync knows this connection's dependencies are ours.
+    addComponentGeneratorMetadata(tree, sourceProject.name, PY_AGENT_MCP_CONNECTION_GENERATOR_INFO, toProjectRelativePath(sourceProject, agentFilePath), mcpServerClassName, // `sourcePath` names the source component this connection is made from, so
+    // the pair is identifiable rather than just the two projects.
+    {
+        ...metadata,
+        sourcePath: options.sourceComponent?.path
+    });
+    await addGeneratorMetricsIfApplicable(tree, [
+        PY_AGENT_MCP_CONNECTION_GENERATOR_INFO
     ]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
-};
-exports.pyAgentMcpConnectionGenerator = pyAgentMcpConnectionGenerator;
-/**
- * Add an import for the MCP client class to agent.py.
- *
- * Delegates to the shared `addPythonDestructuredImport` helper which either
- * appends to an existing `from <module> import ...` line or prepends a new
- * import statement (ruff sorts imports on the next format pass).
- */
-const addImportToAgentFile = async (tree, filePath, agentConnectionModuleName, clientClassName) => {
-    await (0, ast_1.addPythonDestructuredImport)(tree, filePath, [clientClassName], agentConnectionModuleName);
-};
-/**
- * Add MCP tools to the Agent's tools array using GritQL.
- * Appends `*<clientVarName>.list_tools_sync()` to the tools list.
- * Handles both empty and non-empty arrays using if/else.
- */
-const addMcpToolsToAgent = async (tree, filePath, clientVarName) => {
-    if (await (0, ast_1.matchGritQL)(tree, filePath, `\`${clientVarName}.list_tools_sync()\``)) {
-        return;
-    }
-    await (0, ast_1.applyGritQL)(tree, filePath, py(`\`tools=$old\` where {
-  $old <: not contains \`${clientVarName}\`,
-  if ($old <: \`[]\`) {
-    $old => \`[*${clientVarName}.list_tools_sync()]\`
-  } else {
-    $old <: \`[$items]\` where { $items += \`, *${clientVarName}.list_tools_sync()\` }
-  }
-}`));
-};
-/**
- * Add MCP client creation and with-block wrapping to the get_agent function
- * using GritQL transforms.
- *
- * First connection: Rewrites `def get_agent` to wrap $body in a with block.
- * Subsequent connections: Uses += to add to existing with items and creation lines.
- */
-const addMcpClientToGetAgent = async (tree, filePath, clientClassName, clientVarName) => {
-    if (await (0, ast_1.matchGritQL)(tree, filePath, `\`${clientClassName}.create($_)\``)) {
-        return;
-    }
-    // Try the "add to existing with block" pattern first.
-    // If it succeeds, there was already a with block from a previous connection.
-    const addedToWith = await (0, ast_1.applyGritQL)(tree, filePath, py(`\`with ($items,): $body\` where {
-  $items <: not contains \`${clientVarName}\`,
-  $items += \`, ${clientVarName}\`
-}`));
-    if (addedToWith) {
-        // Subsequent connection — also add creation line after the existing one
-        await (0, ast_1.applyGritQL)(tree, filePath, py(`\`$var = $cls.create()\` as $stmt where {
-  $program <: not contains \`${clientClassName}.create\`,
-  $stmt += \`\n${clientVarName} = ${clientClassName}.create()\`
-}`));
-        return;
-    }
-    // First connection — rewrite the function body to include client creation
-    // and wrap $body in a with block. GritQL handles indentation correctly
-    // when the replacement is structured as a proper Python function body.
-    await (0, ast_1.applyGritQL)(tree, filePath, py(`\`def get_agent($params):
-    $body\` where {
-  $body <: contains \`yield Agent($_)\`,
-  $body <: not contains \`with ($_, ): $_\`
-} => \`def get_agent($params):
-    ${clientVarName} = ${clientClassName}.create()
-    with (
-        ${clientVarName},
-    ):
-        $body\``));
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.default = exports.pyAgentMcpConnectionGenerator;
+export default pyAgentMcpConnectionGenerator;
+
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/agent/mcp-connection/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/agent/mcp-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 { addPyDependencies } from '../../../utils/add-dependencies';\nimport {\n  AGENT_CONNECTION_PY_DEPENDENCIES,\n  type AgentFramework,\n  addPythonCoreClient,\n  addPythonReExport,\n  ensurePythonAgentConnectionProject,\n  getPythonAgentConnectionModuleName,\n  getPythonAgentConnectionProject,\n  getPythonAgentConnectionProjectDir,\n  PY_MCP_FAMILY_CONNECTIONS,\n  resolveAgentFramework,\n} from '../../../utils/agent-connection/agent-connection';\nimport { addPythonDestructuredImport } from '../../../utils/ast';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../../utils/declared-dependencies';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { snakeCase } from '../../../utils/names';\nimport {\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { toProjectRelativePath } from '../../../utils/paths';\nimport { addWorkspaceDependencyToPyProject } from '../../../utils/py';\nimport type { PyAgentMcpConnectionGeneratorSchema } from './schema';\n\n/** The metadata this generator records, which its predicates read. */\nexport interface PyAgentMcpConnectionMetadata {\n  readonly framework: AgentFramework;\n}\n\n// The framework picks the MCP client's extra deps, so it names its branch here.\nexport const DEPENDENCIES = declareDependencies<PyAgentMcpConnectionMetadata>()(\n  {\n    py: [\n      { name: 'boto3' },\n      { name: 'httpx' },\n      { name: 'mcp' },\n      // Backs the LangChain client; it must not pull Strands in.\n      {\n        name: 'langchain-mcp-adapters',\n        when: (m) => m.framework === 'langchain',\n      },\n      ...ownedElsewhere(AGENT_CONNECTION_PY_DEPENDENCIES),\n    ],\n  },\n);\n\nexport const PY_AGENT_MCP_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyAgentMcpConnectionGenerator = async (\n  tree: Tree,\n  options: PyAgentMcpConnectionGeneratorSchema,\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 mcpComponent = options.targetComponent;\n\n  if (!agentComponent || !mcpComponent) {\n    throw new Error(\n      'Both sourceComponent and targetComponent must be provided for py#agent -> mcp connections',\n    );\n  }\n\n  if (mcpComponent.auth && mcpComponent.auth.toLowerCase() !== 'iam') {\n    throw new Error(\n      `MCP server connection currently only supports IAM authentication, but '${mcpComponent.name}' uses '${mcpComponent.auth}' authentication.`,\n    );\n  }\n\n  const mcpComponentName = mcpComponent.name ?? 'mcp-server';\n  const mcpServerClassName = mcpComponent.rc as string;\n  const mcpServerSnakeCase = snakeCase(mcpServerClassName);\n  const mcpServerPort = mcpComponent.port ?? 8000;\n\n  // The source agent's framework selects the client shape, dependencies and the\n  // agent.py transform — see PY_MCP_FAMILY_CONNECTIONS (keyed by framework, not a\n  // boolean, so a third framework is an additive entry there).\n  const framework = resolveAgentFramework(agentComponent.framework);\n  const connection = PY_MCP_FAMILY_CONNECTIONS[framework];\n\n  // Recorded below and read by the declaration's predicates, so the packages\n  // added here are exactly the ones the version sync will own.\n  const metadata: PyAgentMcpConnectionMetadata = { framework };\n\n  // 1. Ensure the shared Python agent-connection project exists + has the\n  //    MCP core client (framework Layer-2) and its shared SigV4 auth helper.\n  await ensurePythonAgentConnectionProject(tree, DEPENDENCIES);\n  await addPythonCoreClient(tree, 'mcp', DEPENDENCIES, framework);\n\n  const agentConnectionProjectDir = getPythonAgentConnectionProjectDir(tree);\n  const agentConnectionModuleName = getPythonAgentConnectionModuleName(tree);\n\n  // Shared MCP transport + signed httpx auth deps, plus whatever extra deps the\n  // framework's MCP client needs (e.g. langchain-mcp-adapters for LangChain).\n  // These belong to the shared agent-connection project, which holds the client.\n  addPyDependencies(tree, DEPENDENCIES, {\n    metadata,\n    projectRoot: agentConnectionProjectDir,\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(\n      import.meta.dirname,\n      'files',\n      connection.appTemplateSubdir,\n    ),\n    appDir,\n    {\n      mcpServerSnakeCase,\n      mcpServerClassName,\n      mcpServerPort,\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.${mcpServerSnakeCase}_client_${connection.clientModuleSuffix}`,\n    `${mcpServerClassName}Client${connection.clientClassSuffix}`,\n  );\n\n  // 3. Transform agent.py to add MCP client import and usage\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 = `${mcpServerClassName}Client${connection.clientClassSuffix}`;\n    const clientVarName = mcpServerSnakeCase;\n\n    await addPythonDestructuredImport(\n      tree,\n      agentFilePath,\n      [clientClassName],\n      agentConnectionModuleName,\n    );\n    await connection.wireClientIntoAgent(\n      tree,\n      agentFilePath,\n      clientClassName,\n      clientVarName,\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\n  const agentName = agentComponent.name ?? 'agent';\n  const devTargetName = `${agentName}-dev`;\n  const mcpDevTargetName = `${mcpComponentName}-dev`;\n\n  if (sourceProject.targets?.[devTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {\n      projects: [targetProject.name],\n      target: mcpDevTargetName,\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  // Recorded so the version sync knows this connection's dependencies are ours.\n  addComponentGeneratorMetadata(\n    tree,\n    sourceProject.name,\n    PY_AGENT_MCP_CONNECTION_GENERATOR_INFO,\n    toProjectRelativePath(sourceProject, agentFilePath),\n    mcpServerClassName,\n    // `sourcePath` names the source component this connection is made from, so\n    // the pair is identifiable rather than just the two projects.\n    { ...metadata, sourcePath: options.sourceComponent?.path },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    PY_AGENT_MCP_CONNECTION_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default pyAgentMcpConnectionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","addPyDependencies","AGENT_CONNECTION_PY_DEPENDENCIES","addPythonCoreClient","addPythonReExport","ensurePythonAgentConnectionProject","getPythonAgentConnectionModuleName","getPythonAgentConnectionProject","getPythonAgentConnectionProjectDir","PY_MCP_FAMILY_CONNECTIONS","resolveAgentFramework","addPythonDestructuredImport","declareDependencies","ownedElsewhere","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","snakeCase","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","toProjectRelativePath","addWorkspaceDependencyToPyProject","DEPENDENCIES","py","name","when","m","framework","PY_AGENT_MCP_CONNECTION_GENERATOR_INFO","filename","pyAgentMcpConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","mcpComponent","targetComponent","Error","auth","toLowerCase","mcpComponentName","mcpServerClassName","rc","mcpServerSnakeCase","mcpServerPort","port","connection","metadata","agentConnectionProjectDir","agentConnectionModuleName","projectRoot","appDir","dirname","appTemplateSubdir","overwriteStrategy","KeepExisting","appInitPath","exists","write","moduleInitPath","clientModuleSuffix","clientClassSuffix","agentSourceDir","root","path","agentFilePath","clientClassName","clientVarName","wireClientIntoAgent","agentName","devTargetName","mcpDevTargetName","targets","projects","target","sourcePath","preferInstallDependencies","languages"],"mappings":"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"}

package/src/py/agent/mcp-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/mcp-connection/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/agent/mcp-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 PyAgentMcpConnectionGeneratorSchema {\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/mcp-connection/schema.d.ts

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

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

@@ -20,6 +20,11 @@
     "targetComponent": {
       "type": "string",
       "description": "The MCP server 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"]

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

@@ -1,11 +1,12 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`py strands agent react connection generator > should generate OpenAPI spec script scoped to the agent > agent_openapi.py 1`] = `
-"from agent_project.agent.main import app
-import json
+"import json
 import os
 import sys
 
+from agent_project.agent.main import app
+
 os.makedirs(os.path.dirname(sys.argv[1]), exist_ok=True)
 with open(sys.argv[1], "w") as f:
     json.dump(app.openapi(), f)
@@ -38,6 +39,8 @@ export const TestAgentClientContext = createContext<TestAgent | undefined>(
 const useCreateTestAgentClient = (): TestAgent => {
   const runtimeConfig = useRuntimeConfig();
   const agentRuntimeValue = runtimeConfig.agentRuntimes.TestAgent;
+  // A local-dev override is a plain URL; otherwise it's the agent's runtime
+  // ARN, so build the invocation URL from it.
   const apiUrl = agentRuntimeValue.startsWith('arn:')
     ? buildAgentCoreHttpUrl(agentRuntimeValue)
     : agentRuntimeValue;
@@ -98,6 +101,8 @@ export const TestAgentClientContext = createContext<TestAgent | undefined>(
 const useCreateTestAgentClient = (): TestAgent => {
   const runtimeConfig = useRuntimeConfig();
   const agentRuntimeValue = runtimeConfig.agentRuntimes.TestAgent;
+  // A local-dev override is a plain URL; otherwise it's the agent's runtime
+  // ARN, so build the invocation URL from it.
   const apiUrl = agentRuntimeValue.startsWith('arn:')
     ? buildAgentCoreHttpUrl(agentRuntimeValue)
     : agentRuntimeValue;
@@ -105,7 +110,7 @@ const useCreateTestAgentClient = (): TestAgent => {
   const user = auth?.user;
   const cognitoClient: typeof fetch = (url, init) => {
     const headers = new Headers(init?.headers);
-    headers.set('Authorization', \`Bearer \${user?.id_token}\`);
+    headers.set('Authorization', \`Bearer \${user?.access_token}\`);
     return fetch(url, { ...init, headers });
   };
   return useMemo(
@@ -164,6 +169,8 @@ export const TestAgentClientContext = createContext<TestAgent | undefined>(
 const useCreateTestAgentClient = (): TestAgent => {
   const runtimeConfig = useRuntimeConfig();
   const agentRuntimeValue = runtimeConfig.agentRuntimes.TestAgent;
+  // A local-dev override is a plain URL; otherwise it's the agent's runtime
+  // ARN, so build the invocation URL from it.
   const apiUrl = agentRuntimeValue.startsWith('arn:')
     ? buildAgentCoreHttpUrl(agentRuntimeValue)
     : agentRuntimeValue;
@@ -257,7 +264,6 @@ export default AguiProvider;
 exports[`py strands agent react connection generator - AG-UI protocol > should generate a shared AguiProvider and a per-agent hook for AG-UI agents > useAguiTestAgent.tsx 1`] = `
 "import { HttpAgent } from '@ag-ui/client';
 import type { AbstractAgent, RunAgentInput } from '@ag-ui/client';
-import { Observable } from 'rxjs';
 import { useMemo } from 'react';
 import { useRuntimeConfig } from './useRuntimeConfig';
 import { useSigV4, type SigV4Client } from './useSigV4';
@@ -279,7 +285,13 @@ class SigV4HttpAgent extends HttpAgent {
     config: ConstructorParameters<typeof HttpAgent>[0],
     sigV4Client: SigV4Client,
   ) {
-    super(config);
+    super({
+      ...config,
+      fetch: sigV4Client.fetch as (
+        url: string,
+        init: RequestInit,
+      ) => Promise<Response>,
+    });
     this.sigV4Client = sigV4Client;
   }
 
@@ -292,20 +304,6 @@ class SigV4HttpAgent extends HttpAgent {
     return init;
   }
 
-  // Remove this override once https://github.com/ag-ui-protocol/ag-ui/issues/1316 is fixed.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  override run(input: RunAgentInput): any {
-    const sigV4Fetch = this.sigV4Client.fetch as typeof window.fetch;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return new Observable<any>((subscriber) => {
-      const originalFetch = window.fetch;
-      window.fetch = sigV4Fetch;
-      const sub = super.run(input).subscribe(subscriber);
-      window.fetch = originalFetch;
-      return () => sub.unsubscribe();
-    });
-  }
-
   override clone(): SigV4HttpAgent {
     const cloned = super.clone() as SigV4HttpAgent;
     cloned.sigV4Client = this.sigV4Client;

package/src/py/agent/react-connection/generator.d.ts

@@ -4,7 +4,156 @@
  */
 import { type Tree } from '@nx/devkit';
 import type { ResolvedConnectionOptions } from '../../../connection/generator';
+import type { AgentGatewayRoute } from '../../../ts/agent/react-connection/generator';
 import { type NxGeneratorInfo } from '../../../utils/nx';
+/** The metadata this generator records, which its predicates read. */
+export interface PyAgentReactConnectionMetadata {
+    readonly protocol: string;
+    readonly auth: string;
+    /** The AG-UI theme module, which the website's `ux` selects. */
+    readonly theme: string;
+}
+export declare const DEPENDENCIES: import("../../../utils/declared-dependencies").DependencyDeclaration<readonly [Omit<{
+    readonly name: "oidc-client-ts";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "react-oidc-context";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@aws-sdk/credential-provider-cognito-identity";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "aws4fetch";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@tanstack/react-query";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@tanstack/react-query-devtools";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@smithy/types";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@copilotkit/react-core";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@ag-ui/client";
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@cloudscape-design/chat-components";
+    readonly when: (m: import("../../../ts/react-website/agui/generator").AgUiMetadata) => boolean;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "lucide-react";
+    readonly when: (m: import("../../../ts/react-website/agui/generator").AgUiMetadata) => boolean;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "oidc-client-ts";
+    readonly when: (m: import("../../../ts/react-website/agui/generator").AgUiMetadata) => boolean;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "aws4fetch";
+    readonly when: (m: import("../../../ts/react-website/agui/generator").AgUiMetadata) => boolean;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@aws-sdk/credential-provider-cognito-identity";
+    readonly when: (m: import("../../../ts/react-website/agui/generator").AgUiMetadata) => boolean;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "react-oidc-context";
+    readonly when: (m: import("../../../ts/react-website/agui/generator").AgUiMetadata) => boolean;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@smithy/types";
+    readonly when: (m: import("../../../ts/react-website/agui/generator").AgUiMetadata) => boolean;
+    readonly dev: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "react";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "react-dom";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "class-variance-authority";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "clsx";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "tailwind-merge";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "lucide-react";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "tw-animate-css";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "radix-ui";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "vite";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "vitest";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}, Omit<{
+    readonly name: "@vitest/coverage-v8";
+} & {
+    versionOnly: true;
+}, "when"> & {
+    when: (m: PyAgentReactConnectionMetadata) => boolean;
+}], readonly import("../../../utils/declared-dependencies").DeclaredPyDependency<"a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aws-lambda-powertools" | "aws-lambda-powertools[tracer]" | "aws-lambda-powertools[parser]" | "aws-opentelemetry-distro" | "bedrock-agentcore" | "boto3" | "checkov" | "fastapi" | "fastapi[standard]" | "httpx" | "langchain" | "langchain-aws" | "langchain-mcp-adapters" | "langgraph" | "mcp" | "pip-check-updates" | "pip-licenses" | "ruff" | "strands-agents" | "strands-agents[a2a]" | "strands-agents-tools" | "ty" | "pynamodb" | "uvicorn" | "sqlmodel" | "alembic" | "aiomysql" | "asyncpg" | "greenlet", PyAgentReactConnectionMetadata>[]>;
 export declare const PY_AGENT_REACT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
-export declare const pyAgentReactConnectionGenerator: (tree: Tree, options: ResolvedConnectionOptions) => Promise<() => void>;
+export declare const pyAgentReactConnectionGenerator: (tree: Tree, options: ResolvedConnectionOptions & {
+    gatewayRoute?: AgentGatewayRoute;
+}) => Promise<() => Promise<void>>;
 export default pyAgentReactConnectionGenerator;