@aws/nx-plugin 1.0.0-rc.72 → 1.0.0-rc.74

package/src/py/agent/__snapshots__/generator.frameworks.spec.ts.snap

@@ -618,14 +618,12 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse, StreamingResponse
 from proj_agent_connection import get_current_session_id, session_id_context
-from starlette.middleware.base import BaseHTTPMiddleware
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SESSION_ID_HEADER, SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -638,15 +636,6 @@ async def lifespan(app: FastAPI):
     yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="SnapshotAgent", lifespan=lifespan)
 # Allow browser-based AG-UI clients (e.g. a connected React website) to call
 # this agent cross-origin, including the CORS preflight.
@@ -657,7 +646,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.post("/invocations")
@@ -712,20 +701,20 @@ name = "proj.test_project"
 version = "0.1.0"
 dependencies = [
   "proj-agent-connection",
-  "aws-lambda-powertools==3.31.1",
+  "aws-lambda-powertools==3.34.0",
   "aws-opentelemetry-distro==0.19.0",
   "bedrock-agentcore==1.21.0",
-  "boto3==1.43.67",
+  "boto3==1.43.72",
   "fastapi==0.141.1",
   "mcp==1.28.1",
-  "langchain==1.3.14",
-  "langchain-aws==1.7.0",
-  "langgraph==1.2.10",
+  "langchain==1.3.15",
+  "langchain-aws==1.7.1",
+  "langgraph==1.2.11",
   "langgraph-checkpoint-sqlite==3.1.1",
   "aiosqlite==0.22.1",
-  "ag-ui-protocol==0.1.19",
-  "ag-ui-langgraph==0.0.42",
-  "uvicorn==0.52.1"
+  "ag-ui-protocol==0.1.20",
+  "ag-ui-langgraph==0.0.43",
+  "uvicorn==0.52.3"
 ]
 
 [dependency-groups]

package/src/py/agent/__snapshots__/generator.protocols.spec.ts.snap

@@ -676,7 +676,7 @@ exports[`py#agent generator > should match snapshot for Terraform generated file
     }
     null = {
       source  = "hashicorp/null"
-      version = "3.3.0"
+      version = "3.3.1"
     }
     random = {
       source  = "hashicorp/random"
@@ -1088,7 +1088,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.67 python -c "
+      uv run --with boto3==1.43.72 python -c "
 import boto3
 import json
 import os

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

@@ -4,7 +4,7 @@
  */ 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_CLIENT_NAMING, resolveAgentFramework } from "../../../utils/agent-connection/agent-connection.js";
-import { addPythonDestructuredImport, applyGritQL, matchGritQL } from "../../../utils/ast.js";
+import { addPythonDestructuredImport, appendToArrayViaGritQL, applyGritQL, matchGritQL } from "../../../utils/ast.js";
 import { declareDependencies, ownedElsewhere } from "../../../utils/declared-dependencies.js";
 import { formatFilesInSubtree } from "../../../utils/format.js";
 import { installDependencies } from "../../../utils/install.js";
@@ -169,16 +169,10 @@ export const pyAgentA2aConnectionGenerator = async (tree, options)=>{
  * 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}]\`
-  } else {
-    $old <: \`[$items]\` where { $items += \`, ${toolName}\` }
-  }
-}`));
+    await appendToArrayViaGritQL(tree, filePath, 'tools=', toolName, {
+        scope: AGENT_CONSTRUCTOR[framework],
+        language: 'py'
+    });
 };
 /**
  * Wrap the get_agent body so the remote A2A client is created and exposed

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

@@ -1 +1 @@
-{"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 { 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_CLIENT_NAMING,\n  resolveAgentFramework,\n} from '../../../utils/agent-connection/agent-connection';\nimport {\n  addPythonDestructuredImport,\n  applyGritQL,\n  matchGritQL,\n} 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 { 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/** The metadata this generator records, which its predicates read. */\nexport interface PyAgentA2aConnectionMetadata {\n  readonly framework: AgentFramework;\n}\n\n// Each framework's Layer-2 client needs its own A2A transport: Strands wraps\n// strands' `A2AAgent` (strands-agents[a2a]); LangChain drives the a2a SDK\n// directly (a2a-sdk) and must not pull Strands in.\nexport const DEPENDENCIES = declareDependencies<PyAgentA2aConnectionMetadata>()(\n  {\n    py: [\n      { name: 'boto3' },\n      { name: 'httpx' },\n      { name: 'strands-agents[a2a]', when: (m) => m.framework === 'strands' },\n      { name: 'a2a-sdk', when: (m) => m.framework === 'langchain' },\n      ...ownedElsewhere(AGENT_CONNECTION_PY_DEPENDENCIES),\n    ],\n  },\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 DEPENDENCIES), 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  // 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: PyAgentA2aConnectionMetadata = { 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, DEPENDENCIES);\n  await addPythonCoreClient(tree, 'a2a', DEPENDENCIES, 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. These belong to the shared agent-connection project, which\n  // 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(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  // Recorded so the version sync knows this connection's dependencies are ours.\n  addComponentGeneratorMetadata(\n    tree,\n    sourceProject.name,\n    PY_AGENT_A2A_CONNECTION_GENERATOR_INFO,\n    toProjectRelativePath(sourceProject, agentFilePath),\n    targetAgentClassName,\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_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","addPyDependencies","AGENT_CONNECTION_PY_DEPENDENCIES","addPythonCoreClient","addPythonReExport","ensurePythonAgentConnectionProject","getPythonAgentConnectionModuleName","getPythonAgentConnectionProject","getPythonAgentConnectionProjectDir","PY_CLIENT_NAMING","resolveAgentFramework","addPythonDestructuredImport","applyGritQL","matchGritQL","declareDependencies","ownedElsewhere","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","snakeCase","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","toProjectRelativePath","addWorkspaceDependencyToPyProject","py","pattern","TOOL_IMPORT_MODULE","strands","langchain","AGENT_CONSTRUCTOR","DEPENDENCIES","name","when","m","framework","PY_AGENT_A2A_CONNECTION_GENERATOR_INFO","filename","pyAgentA2aConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","targetAgentComponent","targetComponent","Error","protocol","toLowerCase","auth","targetAgentComponentName","targetAgentClassName","rc","targetAgentSnakeCase","targetAgentPort","port","naming","metadata","agentConnectionProjectDir","agentConnectionModuleName","projectRoot","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","sourcePath","preferInstallDependencies","languages","filePath","scope","toolBlock","anchor"],"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 { 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_CLIENT_NAMING,\n  resolveAgentFramework,\n} from '../../../utils/agent-connection/agent-connection';\nimport {\n  addPythonDestructuredImport,\n  appendToArrayViaGritQL,\n  applyGritQL,\n  matchGritQL,\n} 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 { 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/** The metadata this generator records, which its predicates read. */\nexport interface PyAgentA2aConnectionMetadata {\n  readonly framework: AgentFramework;\n}\n\n// Each framework's Layer-2 client needs its own A2A transport: Strands wraps\n// strands' `A2AAgent` (strands-agents[a2a]); LangChain drives the a2a SDK\n// directly (a2a-sdk) and must not pull Strands in.\nexport const DEPENDENCIES = declareDependencies<PyAgentA2aConnectionMetadata>()(\n  {\n    py: [\n      { name: 'boto3' },\n      { name: 'httpx' },\n      { name: 'strands-agents[a2a]', when: (m) => m.framework === 'strands' },\n      { name: 'a2a-sdk', when: (m) => m.framework === 'langchain' },\n      ...ownedElsewhere(AGENT_CONNECTION_PY_DEPENDENCIES),\n    ],\n  },\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 DEPENDENCIES), 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  // 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: PyAgentA2aConnectionMetadata = { 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, DEPENDENCIES);\n  await addPythonCoreClient(tree, 'a2a', DEPENDENCIES, 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. These belong to the shared agent-connection project, which\n  // 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(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  // Recorded so the version sync knows this connection's dependencies are ours.\n  addComponentGeneratorMetadata(\n    tree,\n    sourceProject.name,\n    PY_AGENT_A2A_CONNECTION_GENERATOR_INFO,\n    toProjectRelativePath(sourceProject, agentFilePath),\n    targetAgentClassName,\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_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  await appendToArrayViaGritQL(tree, filePath, 'tools=', toolName, {\n    scope: AGENT_CONSTRUCTOR[framework],\n    language: 'py',\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","addPyDependencies","AGENT_CONNECTION_PY_DEPENDENCIES","addPythonCoreClient","addPythonReExport","ensurePythonAgentConnectionProject","getPythonAgentConnectionModuleName","getPythonAgentConnectionProject","getPythonAgentConnectionProjectDir","PY_CLIENT_NAMING","resolveAgentFramework","addPythonDestructuredImport","appendToArrayViaGritQL","applyGritQL","matchGritQL","declareDependencies","ownedElsewhere","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","snakeCase","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","toProjectRelativePath","addWorkspaceDependencyToPyProject","py","pattern","TOOL_IMPORT_MODULE","strands","langchain","AGENT_CONSTRUCTOR","DEPENDENCIES","name","when","m","framework","PY_AGENT_A2A_CONNECTION_GENERATOR_INFO","filename","pyAgentA2aConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","targetAgentComponent","targetComponent","Error","protocol","toLowerCase","auth","targetAgentComponentName","targetAgentClassName","rc","targetAgentSnakeCase","targetAgentPort","port","naming","metadata","agentConnectionProjectDir","agentConnectionModuleName","projectRoot","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","sourcePath","preferInstallDependencies","languages","filePath","scope","language","toolBlock","anchor"],"mappings":"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"}

package/src/py/agent/files/deploy/Dockerfile.template

@@ -1,5 +1,12 @@
 FROM <%- pythonBaseImage %>
 
+# Apply the distribution's security updates: base image tags lag behind the
+# security suite, so its OS packages carry fixed HIGH/CRITICAL vulnerabilities
+# flagged by the image scan.
+RUN apt-get update && \
+    apt-get upgrade -y --no-install-recommends && \
+    rm -rf /var/lib/apt/lists/*
+
 # Remove the base image's pip: the agent runs from the bundled environment and
 # never needs it at runtime, and pip's vendored packages carry known
 # HIGH/CRITICAL vulnerabilities flagged by the image scan.

package/src/py/agent/files/langchain/a2a/main.py.template

@@ -1,6 +1,5 @@
 import logging
 import os
-import uuid
 from contextlib import asynccontextmanager
 
 from a2a.server.agent_execution import AgentExecutor, RequestContext
@@ -10,18 +9,17 @@ from a2a.server.request_handlers import DefaultRequestHandler
 from a2a.server.tasks import InMemoryTaskStore, TaskUpdater
 from a2a.types import AgentCapabilities, AgentCard, Part, TextPart
 from a2a.utils import new_task
-from fastapi import FastAPI, Request
-from starlette.middleware.base import BaseHTTPMiddleware
+from fastapi import FastAPI
 
-from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
+from <%- agentConnectionModuleName %> import get_current_session_id
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
 PORT = int(os.environ.get("PORT", "9000"))
 RUNTIME_URL = os.environ.get("AGENTCORE_RUNTIME_URL", f"http://localhost:{PORT}/")
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
 DEFAULT_MODES = ["text/plain"]
 
 
@@ -73,17 +71,8 @@ _agent_card = AgentCard(
 a2a_app = A2AStarletteApplication(agent_card=_agent_card, http_handler=_handler).build()
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="<%= agentNameClassName %>", lifespan=lifespan)
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/agent/files/langchain/ag-ui/main.py.template

@@ -10,14 +10,12 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse, StreamingResponse
 from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
-from starlette.middleware.base import BaseHTTPMiddleware
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SESSION_ID_HEADER, SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -30,15 +28,6 @@ async def lifespan(app: FastAPI):
     yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="<%= agentNameClassName %>", lifespan=lifespan)
 # Allow browser-based AG-UI clients (e.g. a connected React website) to call
 # this agent cross-origin, including the CORS preflight.
@@ -49,7 +38,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.post("/invocations")

package/src/py/agent/files/langchain/common/middleware/session_id_middleware.py.template

@@ -0,0 +1,17 @@
+import uuid
+
+from fastapi import Request
+from starlette.middleware.base import BaseHTTPMiddleware
+
+from <%- agentConnectionModuleName %> import session_id_context
+
+SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+
+
+class SessionIdMiddleware(BaseHTTPMiddleware):
+    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
+
+    async def dispatch(self, request: Request, call_next):
+        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
+        with session_id_context(session_id):
+            return await call_next(request)

package/src/py/agent/files/langchain/http/main.py.template

@@ -2,14 +2,11 @@ import uuid
 
 import uvicorn
 from bedrock_agentcore.runtime.models import PingStatus
-from fastapi import Request
 from pydantic import BaseModel, Field
-from starlette.middleware.base import BaseHTTPMiddleware
 from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
 
 from .init import JsonStreamingResponse, app
-
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 
 class InvokeInput(BaseModel):
@@ -59,16 +56,7 @@ async def invoke(input: InvokeInput) -> JsonStreamingResponse:
     return JsonStreamingResponse(handle_invoke(input, session_id))
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/agent/files/strands/a2a/main.py.template

@@ -1,23 +1,21 @@
 import logging
 import os
-import uuid
 from contextlib import asynccontextmanager
 from types import SimpleNamespace
 from typing import cast
 
-from fastapi import FastAPI, Request
-from starlette.middleware.base import BaseHTTPMiddleware
+from fastapi import FastAPI
 from strands import Agent
 from strands.multiagent.a2a import A2AServer
-from <%- agentConnectionModuleName %> import session_id_context, with_session_id
+from <%- agentConnectionModuleName %> import with_session_id
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
 PORT = int(os.environ.get("PORT", "9000"))
 RUNTIME_URL = os.environ.get("AGENTCORE_RUNTIME_URL", f"http://localhost:{PORT}/")
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
 AGENT_NAME = "<%= agentNameClassName %>"
 AGENT_DESCRIPTION = "A Strands Agent exposed via the Agent-to-Agent (A2A) protocol."
 
@@ -41,17 +39,8 @@ async def lifespan(app: FastAPI):
         yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(lifespan=lifespan)
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/agent/files/strands/ag-ui/main.py.template

@@ -9,15 +9,13 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse
 from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
-from starlette.middleware.base import BaseHTTPMiddleware
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SESSION_ID_HEADER, SessionIdMiddleware
 from .session import get_session_manager
 
 logging.basicConfig(level=logging.INFO)
 
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -33,15 +31,6 @@ async def lifespan(app: FastAPI):
         yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="AWS Strands - <%= agentNameClassName %>", lifespan=lifespan)
 app.add_middleware(
     CORSMiddleware,
@@ -50,7 +39,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.post("/invocations")

package/src/py/agent/files/strands/common/middleware/session_id_middleware.py.template

@@ -0,0 +1,17 @@
+import uuid
+
+from fastapi import Request
+from starlette.middleware.base import BaseHTTPMiddleware
+
+from <%- agentConnectionModuleName %> import session_id_context
+
+SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+
+
+class SessionIdMiddleware(BaseHTTPMiddleware):
+    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
+
+    async def dispatch(self, request: Request, call_next):
+        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
+        with session_id_context(session_id):
+            return await call_next(request)

package/src/py/agent/files/strands/http/main.py.template

@@ -1,15 +1,9 @@
-import uuid
-
 import uvicorn
 from bedrock_agentcore.runtime.models import PingStatus
-from fastapi import Request
 from pydantic import BaseModel, Field
-from starlette.middleware.base import BaseHTTPMiddleware
-from <%- agentConnectionModuleName %> import session_id_context
 
 from .init import JsonStreamingResponse, app
-
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 
 class InvokeInput(BaseModel):
@@ -41,16 +35,7 @@ async def invoke(input: InvokeInput) -> JsonStreamingResponse:
     return JsonStreamingResponse(handle_invoke(input))
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -159,7 +159,7 @@ exports[`py#mcp-server generator > should match snapshot for Terraform generated
     }
     null = {
       source  = "hashicorp/null"
-      version = "3.3.0"
+      version = "3.3.1"
     }
     random = {
       source  = "hashicorp/random"
@@ -571,7 +571,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.67 python -c "
+      uv run --with boto3==1.43.72 python -c "
 import boto3
 import json
 import os
@@ -846,10 +846,10 @@ exports[`py#mcp-server generator > should match snapshot for generated files > u
 name = "proj.test_project"
 version = "0.1.0"
 dependencies = [
-  "aws-lambda-powertools==3.31.1",
+  "aws-lambda-powertools==3.34.0",
   "mcp==1.28.1",
-  "uvicorn==0.52.1",
-  "boto3==1.43.67",
+  "uvicorn==0.52.3",
+  "boto3==1.43.72",
   "aws-opentelemetry-distro==0.19.0"
 ]
 

package/src/py/mcp-server/files/deploy/Dockerfile.template

@@ -1,5 +1,12 @@
 FROM <%- pythonBaseImage %>
 
+# Apply the distribution's security updates: base image tags lag behind the
+# security suite, so its OS packages carry fixed HIGH/CRITICAL vulnerabilities
+# flagged by the image scan.
+RUN apt-get update && \
+    apt-get upgrade -y --no-install-recommends && \
+    rm -rf /var/lib/apt/lists/*
+
 # Remove the base image's pip: the server runs from the bundled environment and
 # never needs it at runtime, and pip's vendored packages carry known
 # HIGH/CRITICAL vulnerabilities flagged by the image scan.

package/src/py/mcp-server/generator.js

@@ -2,8 +2,6 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
-import { ensureLicenseExceptions } from "../../license/config.js";
-import { MCP_INSPECTOR_EXCEPTIONS } from "../../license/known-exceptions.js";
 import { addPyDependencies, addTsDependencies } from "../../utils/add-dependencies.js";
 import { addMcpServerInfra } from "../../utils/agent-core-constructs/agent-core-constructs.js";
 import { addPythonBundleTarget } from "../../utils/bundle/bundle.js";
@@ -19,6 +17,7 @@ import { kebabCase, toClassName, toSnakeCase } from "../../utils/names.js";
 import { getNpmScope } from "../../utils/npm-scope.js";
 import { addComponentDevTarget, addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { toProjectRelativePath } from "../../utils/paths.js";
+import { registerPnpmBuiltDependencies } from "../../utils/pnpm-workspace.js";
 import { assignPort } from "../../utils/port.js";
 import { SHARED_CONSTRUCTS_DEPENDENCIES, sharedConstructsGenerator } from "../../utils/shared-constructs.js";
 import { BASE_IMAGES } from "../../utils/versions.js";
@@ -169,6 +168,13 @@ export const pyMcpServerGenerator = async (tree, options)=>{
             iac
         } : {}
     };
+    // The MCP inspector has a postinstall script that cascades installs into its
+    // client packages, which no-ops when the package is installed as a dependency.
+    // Register it as an explicitly-rejected build so pnpm 11's default
+    // `strictDepBuilds=true` skips it instead of failing the install.
+    registerPnpmBuiltDependencies(tree, {
+        '@modelcontextprotocol/inspector': false
+    });
     addPyDependencies(tree, DEPENDENCIES, {
         metadata,
         projectRoot: project.root
@@ -253,7 +259,6 @@ export const pyMcpServerGenerator = async (tree, options)=>{
     await addGeneratorMetricsIfApplicable(tree, [
         PY_MCP_SERVER_GENERATOR_INFO
     ]);
-    await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);
     await formatFilesInSubtree(tree);
     return ()=>installDependencies(tree, options.preferInstallDependencies, {
             languages: [