@aws/nx-plugin 0.75.0 → 0.77.0

package/src/infra/app/generator.js

@@ -12,6 +12,8 @@ const generator_1 = tslib_1.__importStar(require("../../ts/lib/generator"));
 const versions_1 = require("../../utils/versions");
 const npm_scope_1 = require("../../utils/npm-scope");
 const shared_constructs_1 = require("../../utils/shared-constructs");
+const shared_infra_config_1 = require("../../utils/shared-infra-config");
+const shared_scripts_1 = require("../../utils/shared-scripts");
 const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
 const path_1 = tslib_1.__importDefault(require("path"));
 const format_1 = require("../../utils/format");
@@ -23,6 +25,7 @@ const py_1 = require("../../utils/py");
 exports.INFRA_APP_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 function tsInfraGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
         const lib = (0, generator_1.getTsLibDetails)(tree, schema);
         yield (0, generator_1.default)(tree, schema);
         (0, nx_1.addGeneratorMetadata)(tree, lib.fullyQualifiedName, exports.INFRA_APP_GENERATOR_INFO);
@@ -30,6 +33,13 @@ function tsInfraGenerator(tree, schema) {
         yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
             iacProvider: 'CDK',
         });
+        // Shared infra-config and infra-scripts packages (lazy creation, only when enabled)
+        const enableStageConfig = (_a = schema.enableStageConfig) !== null && _a !== void 0 ? _a : false;
+        if (enableStageConfig) {
+            yield (0, shared_infra_config_1.sharedInfraConfigGenerator)(tree);
+            yield (0, shared_scripts_1.sharedScriptsGenerator)(tree);
+        }
+        const synthDirFromRoot = `/dist/${lib.dir}/cdk.out`;
         const synthDirFromProject = lib.dir
             .split('/')
             .map(() => '..')
@@ -46,7 +56,7 @@ function tsInfraGenerator(tree, schema) {
         tree.delete((0, devkit_1.joinPathFragments)(libraryRoot, 'src'));
         (0, devkit_1.generateFiles)(tree, // the virtual file system
         (0, devkit_1.joinPathFragments)(__dirname, './files/app'), // path to the file templates
-        libraryRoot, Object.assign({ synthDir: synthDirFromProject, scopeAlias: scopeAlias, namespace: (0, names_1.kebabCase)(fullyQualifiedName), fullyQualifiedName, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec, dir: lib.dir }, schema), {
+        libraryRoot, Object.assign({ synthDir: synthDirFromProject, scopeAlias: scopeAlias, namespace: (0, names_1.kebabCase)(fullyQualifiedName), fullyQualifiedName, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec, dir: lib.dir, enableStageConfig }, schema), {
             overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
         });
         (0, devkit_1.updateJson)(tree, `${libraryRoot}/project.json`, (config) => {
@@ -84,10 +94,14 @@ function tsInfraGenerator(tree, schema) {
             config.targets.deploy = {
                 executor: 'nx:run-commands',
                 dependsOn: ['^build', 'compile'],
-                options: {
-                    cwd: '{projectRoot}',
-                    command: `cdk deploy --require-approval=never`,
-                },
+                options: enableStageConfig
+                    ? {
+                        command: `tsx packages/common/scripts/src/infra-deploy.ts ${libraryRoot}`,
+                    }
+                    : {
+                        cwd: '{projectRoot}',
+                        command: 'cdk deploy --require-approval=never',
+                    },
             };
             config.targets['deploy-ci'] = {
                 executor: 'nx:run-commands',
@@ -99,10 +113,14 @@ function tsInfraGenerator(tree, schema) {
             config.targets.destroy = {
                 executor: 'nx:run-commands',
                 dependsOn: ['^build', 'compile'],
-                options: {
-                    cwd: '{projectRoot}',
-                    command: `cdk destroy --require-approval=never`,
-                },
+                options: enableStageConfig
+                    ? {
+                        command: `tsx packages/common/scripts/src/infra-destroy.ts ${libraryRoot}`,
+                    }
+                    : {
+                        cwd: '{projectRoot}',
+                        command: 'cdk destroy --require-approval=never',
+                    },
             };
             config.targets['destroy-ci'] = {
                 executor: 'nx:run-commands',
@@ -140,6 +158,13 @@ function tsInfraGenerator(tree, schema) {
                 {
                     path: `${path_1.default.relative(libraryRoot, `${tree.root}/${shared_constructs_constants_1.PACKAGES_DIR}`)}/${shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR}/tsconfig.lib.json`,
                 },
+                ...(enableStageConfig
+                    ? [
+                        {
+                            path: `${path_1.default.relative(libraryRoot, `${tree.root}/${shared_constructs_constants_1.PACKAGES_DIR}`)}/${shared_constructs_constants_1.SHARED_INFRA_CONFIG_DIR}/tsconfig.json`,
+                        },
+                    ]
+                    : []),
             ] })));
         yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.INFRA_APP_GENERATOR_INFO]);
         yield (0, format_1.formatFilesInSubtree)(tree);

package/src/infra/app/generator.js.map

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

package/src/infra/app/schema.d.ts

@@ -8,4 +8,5 @@ export interface TsInfraGeneratorSchema {
   //   unitTestRunner?: 'jest' | 'vitest' | 'none';
   //   linter?: Linter;
   skipInstall?: boolean;
+  enableStageConfig?: boolean;
 }

package/src/infra/app/schema.json

@@ -21,6 +21,12 @@
       "x-priority": "important",
       "default": "packages",
       "x-prompt": "What directory would you like to store your application in?"
+    },
+    "enableStageConfig": {
+      "description": "Enable centralized stage configuration (credentials, account, region) for multi-environment CDK deployments.",
+      "type": "boolean",
+      "default": false,
+      "x-prompt": "Would you like to enable centralized stage credential configuration?"
     }
   },
   "required": ["name"]

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

@@ -498,10 +498,26 @@ output "agent_core_runtime_arn" {
 exports[`py#mcp-server generator > should match snapshot for generated files > mcp-server-__init__.py 1`] = `""`;
 
 exports[`py#mcp-server generator > should match snapshot for generated files > mcp-server-http.py 1`] = `
-"from .server import mcp
+"import contextlib
 
-if __name__ == "__main__":
-    mcp.run(transport="streamable-http")
+from starlette.applications import Starlette
+from starlette.routing import Mount
+
+from .server import mcp
+
+
+@contextlib.asynccontextmanager
+async def lifespan(app: Starlette):
+    async with mcp.session_manager.run():
+        yield
+
+
+app = Starlette(
+    routes=[
+        Mount("/", app=mcp.streamable_http_app()),
+    ],
+    lifespan=lifespan,
+)
 "
 `;
 
@@ -546,7 +562,8 @@ name = "proj.test_project"
 version = "0.1.0"
 dependencies = [
   "mcp==1.26.0",
-  "boto3==1.42.49",
+  "uvicorn==0.41.0",
+  "boto3==1.42.54",
   "aws-opentelemetry-distro==0.15.0"
 ]
 

package/src/py/mcp-server/files/app/http.py.template

@@ -1,4 +1,20 @@
+import contextlib
+
+from starlette.applications import Starlette
+from starlette.routing import Mount
+
 from .server import mcp
 
-if __name__ == "__main__":
-    mcp.run(transport="streamable-http")
+
+@contextlib.asynccontextmanager
+async def lifespan(app: Starlette):
+    async with mcp.session_manager.run():
+        yield
+
+
+app = Starlette(
+    routes=[
+        Mount("/", app=mcp.streamable_http_app()),
+    ],
+    lifespan=lifespan,
+)

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

@@ -11,4 +11,4 @@ ENV PYTHONPATH=/app
 
 # Auto-instrument with AWS Distro for OpenTelemetry
 # https://aws-otel.github.io/docs/getting-started/python-sdk/auto-instr
-CMD ["python", "bin/opentelemetry-instrument", "python", "-m", "<%- moduleName %>.<%- mcpServerNameSnakeCase %>.http"]
+CMD ["python", "bin/opentelemetry-instrument", "python", "-m", "uvicorn", "<%- moduleName %>.<%- mcpServerNameSnakeCase %>.http:app", "--host", "0.0.0.0", "--port", "8000"]

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

@@ -50,6 +50,7 @@ const pyMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
     }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     (0, py_1.addDependenciesToPyProjectToml)(tree, project.root, [
         'mcp',
+        'uvicorn',
         'boto3',
         'aws-opentelemetry-distro',
     ]);
@@ -110,8 +111,9 @@ const pyMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
             }, [`${mcpTargetPrefix}-serve`]: {
                 executor: 'nx:run-commands',
                 options: {
-                    // TODO: consider hot reload
-                    commands: [`uv run -m ${moduleName}.${mcpServerNameSnakeCase}.http`],
+                    commands: [
+                        `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`,
+                    ],
                     cwd: '{projectRoot}',
                     env: {
                         PORT: `${localDevPort}`,

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

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

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

@@ -589,16 +589,16 @@ version = "0.1.0"
 dependencies = [
   "aws-opentelemetry-distro==0.15.0",
   "bedrock-agentcore==0.1.7",
-  "fastapi==0.129.0",
-  "boto3==1.42.49",
+  "fastapi==0.131.0",
+  "boto3==1.42.54",
   "mcp==1.26.0",
-  "strands-agents==1.26.0",
-  "strands-agents-tools==0.2.20",
-  "uvicorn==0.40.0"
+  "strands-agents==1.27.0",
+  "strands-agents-tools==0.2.21",
+  "uvicorn==0.41.0"
 ]
 
 [dependency-groups]
-dev = [ "fastapi[standard]==0.129.0" ]
+dev = [ "fastapi[standard]==0.131.0" ]
 
 [tool.uv]
 dev-dependencies = [ ]

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

@@ -640,7 +640,7 @@ exports[`ts#mcp-server generator > should match snapshot for generated files > u
     "snapshot-server": "./src/snapshot-server/stdio.js"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "1.26.0",
+    "@modelcontextprotocol/sdk": "1.27.0",
     "express": "5.2.1",
     "zod": "4.3.6"
   },

package/src/ts/nx-plugin/__snapshots__/generator.spec.ts.snap

@@ -248,7 +248,7 @@ export const registerCreateWorkspaceCommandTool = (server: McpServer) => {
           text: \`Run the following command to create a workspace:
 
 \\\`\\\`\\\`bash
-npx create-nx-workspace@22.5.0 \${workspaceName} --pm=\${packageManager} --preset=@aws/nx-plugin --ci=skip --aiAgents
+npx create-nx-workspace@22.5.1 \${workspaceName} --pm=\${packageManager} --preset=@aws/nx-plugin --ci=skip --aiAgents
 \\\`\\\`\\\`
 
 This will create a new workspace within the \${workspaceName} directory.

package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap

@@ -1045,11 +1045,11 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.147",
-    "@cloudscape-design/components": "3.0.1200",
+    "@cloudscape-design/board-components": "3.0.149",
+    "@cloudscape-design/components": "3.0.1204",
     "@cloudscape-design/global-styles": "1.0.50",
     "aws-cdk-lib": "2.238.0",
-    "constructs": "10.4.5",
+    "constructs": "10.5.0",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "tailwindcss": "4.1.18"
@@ -2460,12 +2460,12 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.147",
-    "@cloudscape-design/components": "3.0.1200",
+    "@cloudscape-design/board-components": "3.0.149",
+    "@cloudscape-design/components": "3.0.1204",
     "@cloudscape-design/global-styles": "1.0.50",
-    "@tanstack/react-router": "1.159.5",
+    "@tanstack/react-router": "1.160.2",
     "aws-cdk-lib": "2.238.0",
-    "constructs": "10.4.5",
+    "constructs": "10.5.0",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "tailwindcss": "4.1.18"
@@ -2484,8 +2484,8 @@ exports[`react-website generator > Tanstack router integration > should generate
     "@swc/core": "~1.15.5",
     "@swc/helpers": "~0.5.18",
     "@tailwindcss/vite": "4.1.18",
-    "@tanstack/router-generator": "1.159.4",
-    "@tanstack/router-plugin": "1.159.5",
+    "@tanstack/router-generator": "1.160.1",
+    "@tanstack/router-plugin": "1.160.2",
     "@tanstack/router-utils": "1.158.0",
     "@tanstack/virtual-file-routes": "1.154.7",
     "@testing-library/dom": "10.4.0",
@@ -4529,12 +4529,12 @@ root &&
 
 exports[`react-website generator > should handle npm scope prefix correctly > scoped-dependencies 1`] = `
 {
-  "@cloudscape-design/board-components": "3.0.147",
-  "@cloudscape-design/components": "3.0.1200",
+  "@cloudscape-design/board-components": "3.0.149",
+  "@cloudscape-design/components": "3.0.1204",
   "@cloudscape-design/global-styles": "1.0.50",
-  "@tanstack/react-router": "1.159.5",
+  "@tanstack/react-router": "1.160.2",
   "aws-cdk-lib": "2.238.0",
-  "constructs": "10.4.5",
+  "constructs": "10.5.0",
   "react": "19.2.4",
   "react-dom": "19.2.4",
   "tailwindcss": "4.1.18",

package/src/utils/files/common/infra-config/src/index.ts.template

@@ -0,0 +1,3 @@
+export * from './stages.types.js';
+export { default } from './stages.config.js';
+export { resolveStage } from './resolve-stage.js';

package/src/utils/files/common/infra-config/src/resolve-stage.ts.template

@@ -0,0 +1,23 @@
+import type { StageConfig, StagesConfig } from './stages.types.js';
+import stagesConfig from './stages.config.js';
+
+// Widen the narrow `as const` type to StagesConfig for dynamic key access
+const config: StagesConfig = stagesConfig;
+
+/**
+ * Resolves stage config for a given project and stage name.
+ * Project-specific fields take priority over shared ones.
+ *
+ * @param projectPath - Project path relative to workspace root (e.g., 'packages/infra')
+ * @param stageName - CDK stage name (e.g., 'my-app-dev')
+ * @returns Merged StageConfig or undefined if no config exists for this stage
+ */
+export function resolveStage(
+  projectPath: string,
+  stageName: string,
+): StageConfig | undefined {
+  const shared = config.shared?.stages?.[stageName];
+  const project = config.projects?.[projectPath]?.stages?.[stageName];
+  if (!shared && !project) return undefined;
+  return { ...shared, ...project } as StageConfig;
+}

package/src/utils/files/common/infra-config/src/stages.config.ts.template

@@ -0,0 +1,48 @@
+/**
+ * Stage configuration for CDK deployments.
+ *
+ * This file maps CDK stage names to their deployment settings. When you run
+ * `<%= pkgMgrRunNx %> run <project>:deploy <stage-name>/*`, the infra-deploy script
+ * automatically resolves and applies the correct credentials.
+ *
+ * Project keys are the project path relative to the workspace root
+ * (e.g., 'packages/infra').
+ *
+ * Stage names must match the CDK stage identifiers defined in your main.ts —
+ * the first argument to `new ApplicationStage(app, '<stage-name>', ...)`.
+ * For example, if main.ts has `new ApplicationStage(app, 'my-app-dev', ...)`
+ * then the stage name here is 'my-app-dev'.
+ *
+ * We recommend committing this file so the team shares a single source of truth.
+ * If it contains personal profile names, you can add it to .gitignore instead.
+ */
+import type { StagesConfig } from './stages.types.js';
+
+export default {
+  projects: {
+    // Example: map stages for a specific infra project
+    // 'packages/infra': {
+    //   stages: {
+    //     'my-app-dev': {
+    //       credentials: { type: 'profile', profile: 'dev-account' },
+    //       region: 'us-east-1',
+    //       // account is optional — if omitted, CDK infers from the profile
+    //     },
+    //     'my-app-prod': {
+    //       credentials: { type: 'assumeRole', assumeRole: 'arn:aws:iam::123456789012:role/DeployRole' },
+    //       region: 'us-west-2',
+    //       account: '123456789012',
+    //     },
+    //   },
+    // },
+  },
+  shared: {
+    stages: {
+      // Example: shared sandbox stage available to all projects
+      // 'sandbox': {
+      //   credentials: { type: 'profile', profile: 'sandbox-profile' },
+      //   region: 'us-east-1',
+      // },
+    },
+  },
+} as const satisfies StagesConfig;

package/src/utils/files/common/infra-config/src/stages.types.ts.template

@@ -0,0 +1,66 @@
+/**
+ * Type definitions for stage and project configuration.
+ *
+ * These types are used by both stages.config.ts and the infra-deploy/
+ * infra-destroy scripts. They live in a shared package so any
+ * project in the workspace can import them.
+ */
+
+/** Use an AWS CLI profile from ~/.aws/config */
+export type ProfileCredentials = {
+  type: 'profile';
+  /** AWS CLI profile name */
+  profile: string;
+};
+
+/** Assume an IAM role via STS, optionally using a profile as the source credentials */
+export type AssumeRoleCredentials = {
+  type: 'assumeRole';
+  /** IAM Role ARN to assume */
+  assumeRole: string;
+  /** Optional: AWS CLI profile to use as source credentials for the AssumeRole call */
+  profile?: string;
+  /** Optional: External ID required by the role's trust policy */
+  externalId?: string;
+  /** Optional: Session duration in seconds (default: 3600). Increase for long deployments. */
+  sessionDuration?: number;
+};
+
+/**
+ * Credentials for deploying to a specific CDK stage.
+ * The `type` field determines which credential strategy is used.
+ */
+export type StageCredentials = ProfileCredentials | AssumeRoleCredentials;
+
+/**
+ * Configuration for a single CDK stage.
+ * Includes credentials, region, and optionally account.
+ */
+export type StageConfig = {
+  /** How to authenticate when deploying this stage */
+  credentials: StageCredentials;
+  /** AWS region for this stage (e.g., 'us-east-1') */
+  region: string;
+  /** AWS account ID. If omitted, CDK infers it from the active credentials. */
+  account?: string;
+};
+
+/**
+ * Configuration for a single infrastructure project.
+ * The key in the parent map is the project path relative to workspace root
+ * (e.g., 'packages/infra').
+ */
+export type ProjectConfig = {
+  /** Map of CDK stage names to their configuration */
+  stages: { [stageName: string]: StageConfig };
+};
+
+/** Top-level configuration mapping projects and stages to their settings. */
+export type StagesConfig = {
+  /** Project-specific config. Key is the project path relative to workspace root. */
+  projects?: { [projectPath: string]: ProjectConfig };
+  /** Shared stage config available to all projects. */
+  shared?: {
+    stages: { [stageName: string]: StageConfig };
+  };
+};

package/src/utils/files/common/scripts/src/index.ts.template

@@ -0,0 +1 @@
+// Scripts (infra-deploy, infra-destroy) are the public interface of this package.

package/src/utils/files/common/scripts/src/infra-deploy.ts.template

@@ -0,0 +1,2 @@
+import { run } from './stage-credentials/run.js';
+run('deploy');

package/src/utils/files/common/scripts/src/infra-destroy.ts.template

@@ -0,0 +1,2 @@
+import { run } from './stage-credentials/run.js';
+run('destroy');

package/src/utils/files/common/scripts/src/stage-credentials/cdk-command.ts.template

@@ -0,0 +1,18 @@
+/**
+ * Builds the CDK command as an array of arguments for spawnSync.
+ *
+ * Defaults to --require-approval=never (standard for local dev deploys).
+ * If the user explicitly passes --require-approval with any value, we
+ * respect their choice and don't add the default.
+ */
+export function buildCdkCommand(
+  action: string,
+  remainingArgs: string[],
+): string[] {
+  const hasRequireApproval = remainingArgs.some(
+    (a) => a === '--require-approval' || a.startsWith('--require-approval='),
+  );
+  return hasRequireApproval
+    ? ['cdk', action, ...remainingArgs]
+    : ['cdk', action, '--require-approval=never', ...remainingArgs];
+}

package/src/utils/files/common/scripts/src/stage-credentials/credentials.ts.template

@@ -0,0 +1,100 @@
+import type {
+  StageCredentials,
+  StagesConfig,
+} from '<%= scopeAlias %>common-infra-config';
+
+/**
+ * Looks up credentials for a given project + stage combination.
+ *
+ * Lookup order:
+ *   1. Project-specific: config.projects[projectPath].stages[stageName].credentials
+ *   2. Shared:           config.shared.stages[stageName].credentials
+ *   3. No match:         returns undefined — caller falls back to env vars
+ */
+export function lookupCredentials(
+  config: StagesConfig | undefined,
+  projectPath: string,
+  stageName: string,
+): { credentials: StageCredentials | undefined; source: string } {
+  const projectCreds =
+    config?.projects?.[projectPath]?.stages?.[stageName]?.credentials;
+  if (projectCreds) {
+    return { credentials: projectCreds, source: 'project-specific' };
+  }
+
+  const sharedCreds = config?.shared?.stages?.[stageName]?.credentials;
+  if (sharedCreds) {
+    return { credentials: sharedCreds, source: 'shared' };
+  }
+
+  return { credentials: undefined, source: 'environment fallback' };
+}
+
+/**
+ * Builds a child process environment with the resolved credentials overlaid.
+ * Never modifies process.env — returns a new object.
+ */
+export async function buildChildEnv(
+  credentials: StageCredentials,
+  projectPath: string,
+): Promise<Record<string, string | undefined>> {
+  const env = { ...process.env };
+
+  switch (credentials.type) {
+    case 'profile': {
+      env.AWS_PROFILE = credentials.profile;
+      break;
+    }
+    case 'assumeRole': {
+      let STSClient: typeof import('@aws-sdk/client-sts').STSClient;
+      let AssumeRoleCommand: typeof import('@aws-sdk/client-sts').AssumeRoleCommand;
+      try {
+        ({ STSClient, AssumeRoleCommand } =
+          await import('@aws-sdk/client-sts'));
+      } catch {
+        console.error(
+          '[infra-deploy] Error: @aws-sdk/client-sts is required for assumeRole credentials but is not installed.',
+        );
+        console.error('[infra-deploy] Please install @aws-sdk/client-sts');
+        process.exit(1);
+      }
+
+      // If a source profile is specified, configure the STS client to use it
+      const stsClientOptions: Record<string, unknown> = {};
+      if (credentials.profile) {
+        const { fromIni } = await import('@aws-sdk/credential-providers');
+        stsClientOptions.credentials = fromIni({
+          profile: credentials.profile,
+        });
+      }
+
+      const response = await new STSClient(stsClientOptions).send(
+        new AssumeRoleCommand({
+          RoleArn: credentials.assumeRole,
+          RoleSessionName: `infra-deploy-${projectPath.replace(/\//g, '-')}`,
+          ...(credentials.externalId
+            ? { ExternalId: credentials.externalId }
+            : {}),
+          ...(credentials.sessionDuration
+            ? { DurationSeconds: credentials.sessionDuration }
+            : {}),
+        }),
+      );
+
+      env.AWS_ACCESS_KEY_ID = response.Credentials?.AccessKeyId;
+      env.AWS_SECRET_ACCESS_KEY = response.Credentials?.SecretAccessKey;
+      env.AWS_SESSION_TOKEN = response.Credentials?.SessionToken;
+      delete env.AWS_PROFILE;
+      break;
+    }
+  }
+
+  return env;
+}
+
+/** Human-readable description of credentials for logging */
+export function describeCredentials(creds: StageCredentials): string {
+  return creds.type === 'profile'
+    ? `profile '${creds.profile}'`
+    : `role '${creds.assumeRole}'`;
+}