@aws/nx-plugin 1.0.0-rc.54 → 1.0.0-rc.55

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

@@ -3,14 +3,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
 import { readAgentCoreGatewayMetadata } from "../../../agentcore-gateway/generator.js";
-import { addPythonCoreClient, addPythonReExport, ensurePythonAgentConnectionProject, getPythonAgentConnectionModuleName, getPythonAgentConnectionProject, getPythonAgentConnectionProjectDir, PY_MCP_FAMILY_CONNECTIONS, resolveAgentFramework } from "../../../utils/agent-connection/agent-connection.js";
+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 { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
-import { addDependenciesToPyProjectToml, addWorkspaceDependencyToPyProject } from "../../../utils/py.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_GATEWAY_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
 export const pyAgentGatewayConnectionGenerator = async (tree, options)=>{
     const sourceProject = readProjectConfigurationUnqualified(tree, options.sourceProject);
@@ -40,18 +63,22 @@ export const pyAgentGatewayConnectionGenerator = async (tree, options)=>{
     // its tools over MCP, so it reuses the same wiring as an MCP server connection.
     const framework = resolveAgentFramework(agentComponent.framework);
     const connection = PY_MCP_FAMILY_CONNECTIONS[framework];
-    await ensurePythonAgentConnectionProject(tree);
-    await addPythonCoreClient(tree, 'gateway', 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
+    };
+    await ensurePythonAgentConnectionProject(tree, DEPENDENCIES);
+    await addPythonCoreClient(tree, 'gateway', 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).
-    addDependenciesToPyProjectToml(tree, agentConnectionProjectDir, [
-        'boto3',
-        'httpx',
-        'mcp',
-        ...connection.deps
-    ]);
+    // These belong to the shared agent-connection project, which holds the client.
+    addPyDependencies(tree, DEPENDENCIES, {
+        metadata,
+        projectRoot: agentConnectionProjectDir
+    });
     const appDir = joinPathFragments(agentConnectionProjectDir, agentConnectionModuleName, 'app');
     // Local mode points at the gateway project's local gateway port.
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', connection.appTemplateSubdir), appDir, {
@@ -104,6 +131,13 @@ export const pyAgentGatewayConnectionGenerator = async (tree, options)=>{
     if (projectConfigChanged) {
         updateProjectConfiguration(tree, sourceProject.name, sourceProject);
     }
+    // Recorded so the version sync knows this connection's dependencies are ours.
+    addComponentGeneratorMetadata(tree, sourceProject.name, PY_AGENT_GATEWAY_CONNECTION_GENERATOR_INFO, toProjectRelativePath(sourceProject, agentFilePath), gatewayClassName, // `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_GATEWAY_CONNECTION_GENERATOR_INFO
     ]);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/agent/gateway-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 { readAgentCoreGatewayMetadata } from '../../../agentcore-gateway/generator';\nimport {\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 { 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 { PyAgentGatewayConnectionGeneratorSchema } from './schema';\n\nexport const PY_AGENT_GATEWAY_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyAgentGatewayConnectionGenerator = async (\n  tree: Tree,\n  options: PyAgentGatewayConnectionGeneratorSchema,\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  if (!agentComponent) {\n    throw new Error(\n      'sourceComponent must be provided for py#agent -> agentcore-gateway connections',\n    );\n  }\n  const gateway = readAgentCoreGatewayMetadata(targetProject);\n\n  if (gateway.protocol !== 'mcp') {\n    throw new Error(\n      `Gateway '${gateway.name}' has protocol='${gateway.protocol}'. Only MCP-protocol gateways are supported.`,\n    );\n  }\n  if (gateway.auth !== 'iam') {\n    throw new Error(\n      `Gateway '${gateway.name}' uses auth='${gateway.auth}'. Agent connections currently require the gateway to use IAM authentication.`,\n    );\n  }\n  if (agentComponent.auth && agentComponent.auth !== 'iam') {\n    throw new Error(\n      `Agent '${agentComponent.name}' uses auth='${agentComponent.auth}'. Only IAM-authenticated agents can connect to IAM gateways.`,\n    );\n  }\n\n  const gatewayClassName = gateway.rc;\n  const gatewaySnakeCase = snakeCase(gatewayClassName);\n  // A gateway is its own standalone project, so it exposes plain serve / dev.\n  const gatewayServeTargetName = 'serve';\n  const gatewayDevTargetName = 'dev';\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). A Gateway exposes\n  // its tools over MCP, so it reuses the same wiring as an MCP server connection.\n  const framework = resolveAgentFramework(agentComponent.framework);\n  const connection = PY_MCP_FAMILY_CONNECTIONS[framework];\n\n  await ensurePythonAgentConnectionProject(tree);\n  await addPythonCoreClient(tree, 'gateway', 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  addDependenciesToPyProjectToml(tree, agentConnectionProjectDir, [\n    'boto3',\n    'httpx',\n    'mcp',\n    ...connection.deps,\n  ]);\n\n  const appDir = joinPathFragments(\n    agentConnectionProjectDir,\n    agentConnectionModuleName,\n    'app',\n  );\n  // Local mode points at the gateway project's local gateway port.\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      connection.appTemplateSubdir,\n    ),\n    appDir,\n    {\n      gatewaySnakeCase,\n      gatewayClassName,\n      agentConnectionModuleName,\n      gatewayPort: gateway.port,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  const appInitPath = joinPathFragments(appDir, '__init__.py');\n  if (!tree.exists(appInitPath)) {\n    tree.write(appInitPath, '');\n  }\n\n  const moduleInitPath = joinPathFragments(\n    agentConnectionProjectDir,\n    agentConnectionModuleName,\n    '__init__.py',\n  );\n  await addPythonReExport(\n    tree,\n    moduleInitPath,\n    `.app.${gatewaySnakeCase}_client_${connection.clientModuleSuffix}`,\n    `${gatewayClassName}Client${connection.clientClassSuffix}`,\n  );\n\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 = `${gatewayClassName}Client${connection.clientClassSuffix}`;\n    const clientVarName = gatewaySnakeCase;\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  addWorkspaceDependencyToPyProject(\n    tree,\n    sourceProject,\n    getPythonAgentConnectionProject(tree),\n  );\n\n  const agentName = agentComponent.name ?? 'agent';\n  const serveTargetName = `${agentName}-serve`;\n  const devTargetName = `${agentName}-dev`;\n  let projectConfigChanged = false;\n  if (sourceProject.targets?.[serveTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, serveTargetName, {\n      projects: [targetProject.name],\n      target: gatewayServeTargetName,\n    });\n    projectConfigChanged = true;\n  }\n  if (sourceProject.targets?.[devTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {\n      projects: [targetProject.name],\n      target: gatewayDevTargetName,\n    });\n    projectConfigChanged = true;\n  }\n  if (projectConfigChanged) {\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    PY_AGENT_GATEWAY_CONNECTION_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default pyAgentGatewayConnectionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","readAgentCoreGatewayMetadata","addPythonCoreClient","addPythonReExport","ensurePythonAgentConnectionProject","getPythonAgentConnectionModuleName","getPythonAgentConnectionProject","getPythonAgentConnectionProjectDir","PY_MCP_FAMILY_CONNECTIONS","resolveAgentFramework","addPythonDestructuredImport","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","snakeCase","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","addDependenciesToPyProjectToml","addWorkspaceDependencyToPyProject","PY_AGENT_GATEWAY_CONNECTION_GENERATOR_INFO","filename","pyAgentGatewayConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","Error","gateway","protocol","name","auth","gatewayClassName","rc","gatewaySnakeCase","gatewayServeTargetName","gatewayDevTargetName","framework","connection","agentConnectionProjectDir","agentConnectionModuleName","deps","appDir","dirname","appTemplateSubdir","gatewayPort","port","overwriteStrategy","KeepExisting","appInitPath","exists","write","moduleInitPath","clientModuleSuffix","clientClassSuffix","agentSourceDir","root","path","agentFilePath","clientClassName","clientVarName","wireClientIntoAgent","agentName","serveTargetName","devTargetName","projectConfigChanged","targets","projects","target","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/agent/gateway-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 { readAgentCoreGatewayMetadata } from '../../../agentcore-gateway/generator';\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 { PyAgentGatewayConnectionGeneratorSchema } from './schema';\n\n/** The metadata this generator records, which its predicates read. */\nexport interface PyAgentGatewayConnectionMetadata {\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 =\n  declareDependencies<PyAgentGatewayConnectionMetadata>()({\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\nexport const PY_AGENT_GATEWAY_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyAgentGatewayConnectionGenerator = async (\n  tree: Tree,\n  options: PyAgentGatewayConnectionGeneratorSchema,\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  if (!agentComponent) {\n    throw new Error(\n      'sourceComponent must be provided for py#agent -> agentcore-gateway connections',\n    );\n  }\n  const gateway = readAgentCoreGatewayMetadata(targetProject);\n\n  if (gateway.protocol !== 'mcp') {\n    throw new Error(\n      `Gateway '${gateway.name}' has protocol='${gateway.protocol}'. Only MCP-protocol gateways are supported.`,\n    );\n  }\n  if (gateway.auth !== 'iam') {\n    throw new Error(\n      `Gateway '${gateway.name}' uses auth='${gateway.auth}'. Agent connections currently require the gateway to use IAM authentication.`,\n    );\n  }\n  if (agentComponent.auth && agentComponent.auth !== 'iam') {\n    throw new Error(\n      `Agent '${agentComponent.name}' uses auth='${agentComponent.auth}'. Only IAM-authenticated agents can connect to IAM gateways.`,\n    );\n  }\n\n  const gatewayClassName = gateway.rc;\n  const gatewaySnakeCase = snakeCase(gatewayClassName);\n  // A gateway is its own standalone project, so it exposes plain serve / dev.\n  const gatewayServeTargetName = 'serve';\n  const gatewayDevTargetName = 'dev';\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). A Gateway exposes\n  // its tools over MCP, so it reuses the same wiring as an MCP server connection.\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: PyAgentGatewayConnectionMetadata = { framework };\n\n  await ensurePythonAgentConnectionProject(tree, DEPENDENCIES);\n  await addPythonCoreClient(tree, 'gateway', 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  const appDir = joinPathFragments(\n    agentConnectionProjectDir,\n    agentConnectionModuleName,\n    'app',\n  );\n  // Local mode points at the gateway project's local gateway port.\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      connection.appTemplateSubdir,\n    ),\n    appDir,\n    {\n      gatewaySnakeCase,\n      gatewayClassName,\n      agentConnectionModuleName,\n      gatewayPort: gateway.port,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  const appInitPath = joinPathFragments(appDir, '__init__.py');\n  if (!tree.exists(appInitPath)) {\n    tree.write(appInitPath, '');\n  }\n\n  const moduleInitPath = joinPathFragments(\n    agentConnectionProjectDir,\n    agentConnectionModuleName,\n    '__init__.py',\n  );\n  await addPythonReExport(\n    tree,\n    moduleInitPath,\n    `.app.${gatewaySnakeCase}_client_${connection.clientModuleSuffix}`,\n    `${gatewayClassName}Client${connection.clientClassSuffix}`,\n  );\n\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 = `${gatewayClassName}Client${connection.clientClassSuffix}`;\n    const clientVarName = gatewaySnakeCase;\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  addWorkspaceDependencyToPyProject(\n    tree,\n    sourceProject,\n    getPythonAgentConnectionProject(tree),\n  );\n\n  const agentName = agentComponent.name ?? 'agent';\n  const serveTargetName = `${agentName}-serve`;\n  const devTargetName = `${agentName}-dev`;\n  let projectConfigChanged = false;\n  if (sourceProject.targets?.[serveTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, serveTargetName, {\n      projects: [targetProject.name],\n      target: gatewayServeTargetName,\n    });\n    projectConfigChanged = true;\n  }\n  if (sourceProject.targets?.[devTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {\n      projects: [targetProject.name],\n      target: gatewayDevTargetName,\n    });\n    projectConfigChanged = true;\n  }\n  if (projectConfigChanged) {\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_GATEWAY_CONNECTION_GENERATOR_INFO,\n    toProjectRelativePath(sourceProject, agentFilePath),\n    gatewayClassName,\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_GATEWAY_CONNECTION_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default pyAgentGatewayConnectionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","readAgentCoreGatewayMetadata","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_GATEWAY_CONNECTION_GENERATOR_INFO","filename","pyAgentGatewayConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","Error","gateway","protocol","auth","gatewayClassName","rc","gatewaySnakeCase","gatewayServeTargetName","gatewayDevTargetName","connection","metadata","agentConnectionProjectDir","agentConnectionModuleName","projectRoot","appDir","dirname","appTemplateSubdir","gatewayPort","port","overwriteStrategy","KeepExisting","appInitPath","exists","write","moduleInitPath","clientModuleSuffix","clientClassSuffix","agentSourceDir","root","path","agentFilePath","clientClassName","clientVarName","wireClientIntoAgent","agentName","serveTargetName","devTargetName","projectConfigChanged","targets","projects","target","sourcePath","preferInstallDependencies","languages"],"mappings":"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"}

package/src/py/agent/generator.d.ts

@@ -4,7 +4,152 @@
  */
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../utils/nx';
-import type { PyAgentGeneratorSchema } from './schema';
+import type { IacMetadata } from '../../utils/shared-constructs-constants';
+import type { AgentProtocol, PyAgentFramework, PyAgentGeneratorSchema } from './schema';
+/** The metadata this generator records, which its predicates read. */
+export interface PyAgentMetadata extends IacMetadata {
+    readonly port: number;
+    readonly rc: string;
+    readonly auth: string;
+    readonly protocol: AgentProtocol;
+    /**
+     * The mcp / gateway connection generators dispatch on this field to pick the
+     * Strands vs LangChain Layer-2 client + agent.py transform.
+     */
+    readonly framework: PyAgentFramework;
+}
+export declare const DEPENDENCIES: import("../../utils/declared-dependencies").DependencyDeclaration<readonly [{
+    readonly name: "agent-chat-cli";
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "tsx";
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "@types/node";
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "@aws-lambda-powertools/parameters";
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "@aws-sdk/client-appconfigdata";
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "aws4fetch";
+    readonly when: (m: PyAgentMetadata) => boolean;
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "@aws-sdk/credential-providers";
+    readonly when: (m: PyAgentMetadata) => boolean;
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "@a2a-js/sdk";
+    readonly when: (m: PyAgentMetadata) => boolean;
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "ncp";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rimraf";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "make-dir-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "ncp";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rimraf";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "make-dir-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "constructs";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "aws-cdk-lib";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@types/node";
+} & {
+    versionOnly: true;
+}], readonly [{
+    readonly name: "aws-lambda-powertools";
+}, {
+    readonly name: "aws-opentelemetry-distro";
+}, {
+    readonly name: "bedrock-agentcore";
+}, {
+    readonly name: "boto3";
+}, {
+    readonly name: "fastapi";
+}, {
+    readonly name: "mcp";
+}, {
+    readonly name: "langchain";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "langchain-aws";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "langgraph";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "ag-ui-protocol";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "ag-ui-langgraph";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "a2a-sdk";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "strands-agents[a2a]";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "strands-agents";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "strands-agents-tools";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "ag-ui-protocol";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "ag-ui-strands";
+    readonly when: (m: PyAgentMetadata) => boolean;
+}, {
+    readonly name: "uvicorn";
+}, {
+    readonly name: "fastapi[standard]";
+    readonly group: "dev";
+}, {
+    readonly name: "aws-lambda-powertools";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "strands-agents";
+} & {
+    versionOnly: true;
+}]>;
 export declare const PY_AGENT_GENERATOR_INFO: NxGeneratorInfo;
 export declare const pyAgentGenerator: (tree: Tree, options: PyAgentGeneratorSchema) => Promise<GeneratorCallback>;
 export default pyAgentGenerator;

package/src/py/agent/generator.js

@@ -4,15 +4,16 @@
  */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
 import { ensureLicenseExceptions } from "../../license/config.js";
 import { AG_UI_LANGGRAPH_EXCEPTIONS } from "../../license/known-exceptions.js";
+import { addPyDependencies, addTsDependencies } from "../../utils/add-dependencies.js";
 import { addAgentChatScripts } from "../../utils/agent-chat/agent-chat.js";
-import { addPythonFrameworkBase, ensurePythonAgentConnectionProject, getPythonAgentConnectionModuleName, getPythonAgentConnectionProject } from "../../utils/agent-connection/agent-connection.js";
+import { AGENT_CONNECTION_PY_DEPENDENCIES, addPythonFrameworkBase, ensurePythonAgentConnectionProject, getPythonAgentConnectionModuleName, getPythonAgentConnectionProject } from "../../utils/agent-connection/agent-connection.js";
 import { addAgentInfra } from "../../utils/agent-core-constructs/agent-core-constructs.js";
 import { addPythonBundleTarget } from "../../utils/bundle/bundle.js";
 import { resolveContainers } from "../../utils/containers.js";
-import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
-import { addDockerScanTarget } from "../../utils/docker.js";
+import { declareDependencies, ownedElsewhere } from "../../utils/declared-dependencies.js";
+import { addDockerScanTarget, DOCKER_DEPENDENCIES } from "../../utils/docker.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
-import { FsCommands } from "../../utils/fs.js";
+import { FS_DEPENDENCIES, FsCommands } from "../../utils/fs.js";
 import { updateGitIgnore } from "../../utils/git.js";
 import { resolveIac } from "../../utils/iac.js";
 import { installDependencies } from "../../utils/install.js";
@@ -23,9 +24,145 @@ import { addComponentDevTarget, addComponentGeneratorMetadata, addDependencyToTa
 import { sortObjectKeys } from "../../utils/object.js";
 import { toProjectRelativePath } from "../../utils/paths.js";
 import { assignPort } from "../../utils/port.js";
-import { addDependenciesToDependencyGroupInPyProjectToml, addDependenciesToPyProjectToml, addWorkspaceDependencyToPyProject } from "../../utils/py.js";
-import { sharedConstructsGenerator } from "../../utils/shared-constructs.js";
-import { BASE_IMAGES, withVersions } from "../../utils/versions.js";
+import { addWorkspaceDependencyToPyProject } from "../../utils/py.js";
+import { SHARED_CONSTRUCTS_DEPENDENCIES, sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+import { BASE_IMAGES } from "../../utils/versions.js";
+/** Whether the chat CLI signs its requests, which only IAM auth needs. */ const isIam = (m)=>m.auth === 'iam';
+// Each entry names the framework and protocol branch it belongs to, so the same
+// declaration drives both adding and the version sync.
+export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        // The chat CLI, which runs standalone via tsx for every protocol and
+        // resolves the deployed agent from AppConfig. `agent-chat-cli` transitively
+        // bundles the protocol clients (@a2a-js/sdk, @ag-ui/client).
+        {
+            name: 'agent-chat-cli',
+            dev: true,
+            root: true
+        },
+        {
+            name: 'tsx',
+            dev: true,
+            root: true
+        },
+        {
+            name: '@types/node',
+            dev: true,
+            root: true
+        },
+        {
+            name: '@aws-lambda-powertools/parameters',
+            dev: true,
+            root: true
+        },
+        {
+            name: '@aws-sdk/client-appconfigdata',
+            dev: true,
+            root: true
+        },
+        {
+            name: 'aws4fetch',
+            when: isIam,
+            dev: true,
+            root: true
+        },
+        {
+            name: '@aws-sdk/credential-providers',
+            when: isIam,
+            dev: true,
+            root: true
+        },
+        {
+            name: '@a2a-js/sdk',
+            when: (m)=>m.protocol === 'a2a',
+            dev: true,
+            root: true
+        },
+        // Added by the helpers that own the projects they belong to.
+        ...ownedElsewhere(FS_DEPENDENCIES),
+        ...ownedElsewhere(DOCKER_DEPENDENCIES),
+        ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES)
+    ],
+    py: [
+        {
+            name: 'aws-lambda-powertools'
+        },
+        {
+            name: 'aws-opentelemetry-distro'
+        },
+        {
+            name: 'bedrock-agentcore'
+        },
+        {
+            name: 'boto3'
+        },
+        {
+            name: 'fastapi'
+        },
+        {
+            name: 'mcp'
+        },
+        // langchain pulls no Strands dependencies — the langchain model binding
+        // plus the per-protocol server adapter: ag-ui-langgraph for AG-UI, a2a-sdk
+        // for A2A, nothing extra for HTTP (FastAPI is added for every agent).
+        {
+            name: 'langchain',
+            when: (m)=>m.framework === 'langchain'
+        },
+        {
+            name: 'langchain-aws',
+            when: (m)=>m.framework === 'langchain'
+        },
+        {
+            name: 'langgraph',
+            when: (m)=>m.framework === 'langchain'
+        },
+        {
+            name: 'ag-ui-protocol',
+            when: (m)=>m.framework === 'langchain' && m.protocol === 'ag-ui'
+        },
+        {
+            name: 'ag-ui-langgraph',
+            when: (m)=>m.framework === 'langchain' && m.protocol === 'ag-ui'
+        },
+        {
+            name: 'a2a-sdk',
+            when: (m)=>m.framework === 'langchain' && m.protocol === 'a2a'
+        },
+        {
+            name: 'strands-agents[a2a]',
+            when: (m)=>m.framework !== 'langchain' && m.protocol === 'a2a'
+        },
+        {
+            name: 'strands-agents',
+            when: (m)=>m.framework !== 'langchain' && m.protocol !== 'a2a'
+        },
+        {
+            name: 'strands-agents-tools',
+            when: (m)=>m.framework !== 'langchain'
+        },
+        // Declared again here so a Strands AG-UI agent lists it in the same order
+        // the generated pyproject.toml had before.
+        {
+            name: 'ag-ui-protocol',
+            when: (m)=>m.framework !== 'langchain' && m.protocol === 'ag-ui'
+        },
+        {
+            name: 'ag-ui-strands',
+            when: (m)=>m.framework !== 'langchain' && m.protocol === 'ag-ui'
+        },
+        {
+            name: 'uvicorn'
+        },
+        // `fastapi dev` runs the local server for every protocol.
+        {
+            name: 'fastapi[standard]',
+            group: 'dev'
+        },
+        // The agent-connection helper adds these to its own project.
+        ...ownedElsewhere(AGENT_CONNECTION_PY_DEPENDENCIES)
+    ]
+});
 export const PY_AGENT_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
 export const pyAgentGenerator = async (tree, options)=>{
     const project = readProjectConfigurationUnqualified(tree, options.project);
@@ -48,6 +185,10 @@ export const pyAgentGenerator = async (tree, options)=>{
     const infra = options.infra ?? 'agentcore';
     const protocol = options.protocol ?? 'http';
     const framework = options.framework ?? 'strands';
+    // Recorded in the metadata below so the version sync can tell a CDK
+    // project from a Terraform one; undefined when no infrastructure was
+    // generated, in which case neither provider's packages were added.
+    const iac = infra !== 'none' ? await resolveIac(tree, options.iac) : undefined;
     if (infra === 'none' && options.auth && options.auth !== 'iam') {
         console.warn('Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)');
     }
@@ -56,12 +197,12 @@ export const pyAgentGenerator = async (tree, options)=>{
     // point can import `session_id_context` and propagate the AgentCore
     // session ID to any downstream MCP / A2A clients a later connection
     // generator wires into this agent.
-    await ensurePythonAgentConnectionProject(tree);
+    await ensurePythonAgentConnectionProject(tree, DEPENDENCIES);
     // The agent server imports the framework base helpers (session cache + model
     // error logging) regardless of whether a connection client is wired in. The
     // langchain framework has no base layer (its AG-UI foundation reuses only the
     // framework-agnostic session context), so this is a no-op for langchain.
-    await addPythonFrameworkBase(tree, framework);
+    await addPythonFrameworkBase(tree, DEPENDENCIES, framework);
     const agentConnectionModuleName = getPythonAgentConnectionModuleName(tree);
     addWorkspaceDependencyToPyProject(tree, project, getPythonAgentConnectionProject(tree));
     const templateContext = {
@@ -105,43 +246,6 @@ export const pyAgentGenerator = async (tree, options)=>{
             overwriteStrategy: OverwriteStrategy.KeepExisting
         });
     }
-    addDependenciesToPyProjectToml(tree, project.root, [
-        'aws-lambda-powertools',
-        'aws-opentelemetry-distro',
-        'bedrock-agentcore',
-        'boto3',
-        'fastapi',
-        'mcp',
-        ...framework === 'langchain' ? // (langchain, langchain-aws, langgraph) plus the per-protocol server
-        // adapter: ag-ui-langgraph for AG-UI, a2a-sdk for A2A, nothing extra for
-        // HTTP (FastAPI is added above for every agent).
-        [
-            'langchain',
-            'langchain-aws',
-            'langgraph',
-            ...protocol === 'ag-ui' ? [
-                'ag-ui-protocol',
-                'ag-ui-langgraph'
-            ] : protocol === 'a2a' ? [
-                'a2a-sdk'
-            ] : []
-        ] : protocol === 'a2a' ? [
-            'strands-agents[a2a]',
-            'strands-agents-tools'
-        ] : protocol === 'ag-ui' ? [
-            'strands-agents',
-            'strands-agents-tools',
-            'ag-ui-protocol',
-            'ag-ui-strands'
-        ] : [
-            'strands-agents',
-            'strands-agents-tools'
-        ],
-        'uvicorn'
-    ]);
-    addDependenciesToDependencyGroupInPyProjectToml(tree, project.root, 'dev', [
-        'fastapi[standard]'
-    ]);
     if (infra === 'agentcore') {
         const containers = await resolveContainers(tree, 'inherit');
         const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;
@@ -162,7 +266,7 @@ export const pyAgentGenerator = async (tree, options)=>{
         const dockerOutputDir = joinPathFragments('dist', project.root, 'docker', name);
         const dockerTargetName = `${agentTargetPrefix}-docker`;
         // Add a docker target that prepares the docker context and builds the image
-        const fs = new FsCommands(tree);
+        const fs = new FsCommands(tree, DEPENDENCIES);
         project.targets[dockerTargetName] = {
             cache: true,
             executor: 'nx:run-commands',
@@ -190,12 +294,11 @@ export const pyAgentGenerator = async (tree, options)=>{
             imageTags: [
                 dockerImageTag
             ]
-        });
+        }, DEPENDENCIES);
         // Add shared constructs
-        const iac = await resolveIac(tree, options.iac);
         await sharedConstructsGenerator(tree, {
             iac
-        });
+        }, DEPENDENCIES);
         // Add the construct to deploy the agent.
         // AG-UI uses HTTP as the AgentCore protocol type (AG-UI is HTTP-based with SSE over POST).
         const infraProtocol = protocol === 'ag-ui' ? 'http' : protocol;
@@ -220,6 +323,25 @@ export const pyAgentGenerator = async (tree, options)=>{
             name: agentTargetPrefix
         }
     });
+    // 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 = {
+        port: localDevPort,
+        rc: agentNameClassName,
+        auth,
+        protocol,
+        framework,
+        ...iac ? {
+            iac
+        } : {}
+    };
+    addPyDependencies(tree, DEPENDENCIES, {
+        metadata,
+        projectRoot: project.root
+    });
+    addTsDependencies(tree, DEPENDENCIES, {
+        metadata
+    });
     // All protocols use fastapi dev for hot reload:
     // - HTTP: FastAPI app directly defined in init.py
     // - A2A: A2AServer.to_fastapi_app() creates a FastAPI app in main.py
@@ -256,23 +378,6 @@ export const pyAgentGenerator = async (tree, options)=>{
         agentNameClassName,
         auth
     });
-    // TypeScript deps for the chat CLI, which runs standalone via tsx for every
-    // protocol and resolves the deployed agent from AppConfig. `agent-chat-cli`
-    // transitively bundles the protocol clients (@a2a-js/sdk, @ag-ui/client).
-    addDependenciesToPackageJson(tree, {}, withVersions([
-        'agent-chat-cli',
-        'tsx',
-        '@types/node',
-        '@aws-lambda-powertools/parameters',
-        '@aws-sdk/client-appconfigdata',
-        ...auth === 'iam' ? [
-            'aws4fetch',
-            '@aws-sdk/credential-providers'
-        ] : [],
-        ...protocol === 'a2a' ? [
-            '@a2a-js/sdk'
-        ] : []
-    ]));
     const chatUrl = protocol === 'ag-ui' ? `http://localhost:${localDevPort}/invocations` : `http://localhost:${localDevPort}`;
     const chatCommand = `tsx ./scripts/${agentTargetPrefix}/chat.ts`;
     const httpOnlyTargets = protocol === 'http' ? {
@@ -367,15 +472,7 @@ export const pyAgentGenerator = async (tree, options)=>{
         ...project,
         targets: sortObjectKeys(agentTargets)
     });
-    addComponentGeneratorMetadata(tree, project.name, PY_AGENT_GENERATOR_INFO, toProjectRelativePath(project, targetSourceDir), agentTargetPrefix, {
-        port: localDevPort,
-        rc: agentNameClassName,
-        auth,
-        protocol,
-        // The mcp / gateway connection generators dispatch on this field to pick
-        // the Strands vs LangChain Layer-2 client + agent.py transform.
-        framework
-    });
+    addComponentGeneratorMetadata(tree, project.name, PY_AGENT_GENERATOR_INFO, toProjectRelativePath(project, targetSourceDir), agentTargetPrefix, metadata);
     await addGeneratorMetricsIfApplicable(tree, [
         PY_AGENT_GENERATOR_INFO
     ]);