aws · rix0rrr · Oct 6, 2025 · Aug 8, 2025 · Aug 11, 2025 · Aug 12, 2025
diff --git a/.projenrc.ts b/.projenrc.ts
@@ -1161,6 +1161,7 @@ const cli = configureProject(
       'glob',
       'minimatch',
       'p-limit@^3',
+      'p-queue@^6',
       'promptly',
       'proxy-agent',
       'semver',

diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
@@ -22090,6 +22090,32 @@ SOFTWARE.
 
 
 
+----------------
+
+** [email protected] - https://www.npmjs.com/package/eventemitter3/v/4.0.7 | MIT
+The MIT License (MIT)
+
+Copyright (c) 2014 Arnout Kazemier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ----------------
 
 ** [email protected] - https://www.npmjs.com/package/fast-deep-equal/v/3.1.3 | MIT
@@ -22846,6 +22872,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+----------------
+
+** [email protected] - https://www.npmjs.com/package/p-finally/v/1.0.0 | MIT
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 ----------------
 
 ** [email protected] - https://www.npmjs.com/package/p-limit/v/2.3.0 | MIT
@@ -22888,6 +22940,34 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+----------------
+
+** [email protected] - https://www.npmjs.com/package/p-queue/v/6.6.2 | MIT
+MIT License
+
+Copyright (c) Sindre Sorhus <[email protected]> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+----------------
+
+** [email protected] - https://www.npmjs.com/package/p-timeout/v/3.2.0 | MIT
+MIT License
+
+Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 ----------------
 
 ** [email protected] - https://www.npmjs.com/package/p-try/v/2.2.0 | MIT

diff --git a/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts b/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts
@@ -1393,3 +1393,4 @@ export class Toolkit extends CloudAssemblySourceBuilder {
     }
   }
 }
+
diff --git a/packages/aws-cdk/.projen/deps.json b/packages/aws-cdk/.projen/deps.json
diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES
@@ -21883,6 +21883,32 @@ SOFTWARE.
 
 
 
+----------------
+
+** [email protected] - https://www.npmjs.com/package/eventemitter3/v/4.0.7 | MIT
+The MIT License (MIT)
+
+Copyright (c) 2014 Arnout Kazemier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ----------------
 
 ** [email protected] - https://www.npmjs.com/package/fast-deep-equal/v/3.1.3 | MIT
@@ -22639,6 +22665,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+----------------
+
+** [email protected] - https://www.npmjs.com/package/p-finally/v/1.0.0 | MIT
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 ----------------
 
 ** [email protected] - https://www.npmjs.com/package/p-limit/v/2.3.0 | MIT
@@ -22681,6 +22733,34 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+----------------
+
+** [email protected] - https://www.npmjs.com/package/p-queue/v/6.6.2 | MIT
+MIT License
+
+Copyright (c) Sindre Sorhus <[email protected]> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+----------------
+
+** [email protected] - https://www.npmjs.com/package/p-timeout/v/3.2.0 | MIT
+MIT License
+
+Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 ----------------
 
 ** [email protected] - https://www.npmjs.com/package/p-try/v/2.2.0 | MIT

diff --git a/packages/aws-cdk/lib/cli/cli-config.ts b/packages/aws-cdk/lib/cli/cli-config.ts
@@ -129,7 +129,9 @@ export async function makeConfig(): Promise<CliConfig> {
           unconfigured: { type: 'boolean', desc: 'Modify unconfigured feature flags', requiresArg: false },
           recommended: { type: 'boolean', desc: 'Change flags to recommended states', requiresArg: false },
           default: { type: 'boolean', desc: 'Change flags to default state', requiresArg: false },
-          interactive: { type: 'boolean', alias: ['i'], desc: 'Interactive option for the flags command', requiresArg: false },
+          interactive: { type: 'boolean', alias: ['i'], desc: 'Interactive option for the flags command' },
+          safe: { type: 'boolean', desc: 'Enable all feature flags that do not impact the user\'s application', requiresArg: false },
+          concurrency: { type: 'number', alias: ['n'], desc: 'Maximum number of simultaneous synths to execute.', default: 4, requiresArg: true },
         },
       },
       'deploy': {

diff --git a/packages/aws-cdk/lib/cli/cli-type-registry.json b/packages/aws-cdk/lib/cli/cli-type-registry.json
@@ -383,8 +383,21 @@
           "alias": [
             "i"
           ],
-          "desc": "Interactive option for the flags command",
+          "desc": "Interactive option for the flags command"
+        },
+        "safe": {
+          "type": "boolean",
+          "desc": "Enable all feature flags that do not impact the user's application",
           "requiresArg": false
+        },
+        "concurrency": {
+          "type": "number",
+          "alias": [
+            "n"
+          ],
+          "desc": "Maximum number of simultaneous synths to execute.",
+          "default": 4,
+          "requiresArg": true
         }
       }
     },

diff --git a/packages/aws-cdk/lib/cli/cli.ts b/packages/aws-cdk/lib/cli/cli.ts
@@ -26,7 +26,7 @@ import type { Settings } from '../api/settings';
 import { contextHandler as context } from '../commands/context';
 import { docs } from '../commands/docs';
 import { doctor } from '../commands/doctor';
-import { handleFlags } from '../commands/flag-operations';
+import { FlagCommandHandler } from '../commands/flags/flags';
 import { cliInit, printAvailableTemplates } from '../commands/init';
 import { getMigrateScanType } from '../commands/migrate';
 import { execProgram, CloudExecutable } from '../cxapp';
@@ -501,7 +501,8 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
           unstableFeatures: configuration.settings.get(['unstable']),
         });
         const flagsData = await toolkit.flags(cloudExecutable);
-        return handleFlags(flagsData, ioHelper, args, toolkit);
+        const handler = new FlagCommandHandler(flagsData, ioHelper, args, toolkit);
+        return handler.processFlagsCommand();
 
       case 'synthesize':
       case 'synth':

diff --git a/packages/aws-cdk/lib/cli/convert-to-user-input.ts b/packages/aws-cdk/lib/cli/convert-to-user-input.ts
@@ -105,6 +105,8 @@ export function convertYargsToUserInput(args: any): UserInput {
         recommended: args.recommended,
         default: args.default,
         interactive: args.interactive,
+        safe: args.safe,
+        concurrency: args.concurrency,
         FLAGNAME: args.FLAGNAME,
       };
       break;
@@ -391,6 +393,8 @@ export function convertConfigToUserInput(config: any): UserInput {
     recommended: config.flags?.recommended,
     default: config.flags?.default,
     interactive: config.flags?.interactive,
+    safe: config.flags?.safe,
+    concurrency: config.flags?.concurrency,
   };
   const deployOptions = {
     all: config.deploy?.all,

diff --git a/packages/aws-cdk/lib/cli/parse-command-line-arguments.ts b/packages/aws-cdk/lib/cli/parse-command-line-arguments.ts
@@ -409,7 +409,19 @@ export function parseCommandLineArguments(args: Array<string>): any {
           type: 'boolean',
           alias: ['i'],
           desc: 'Interactive option for the flags command',
+        })
+        .option('safe', {
+          default: undefined,
+          type: 'boolean',
+          desc: "Enable all feature flags that do not impact the user's application",
           requiresArg: false,
+        })
+        .option('concurrency', {
+          default: 4,
+          type: 'number',
+          alias: ['n'],
+          desc: 'Maximum number of simultaneous synths to execute.',
+          requiresArg: true,
         }),
     )
     .command('deploy [STACKS..]', 'Deploys the stack(s) named STACKS into your AWS account', (yargs: Argv) =>

diff --git a/packages/aws-cdk/lib/cli/user-input.ts b/packages/aws-cdk/lib/cli/user-input.ts
@@ -681,6 +681,22 @@ export interface FlagsOptions {
    */
   readonly interactive?: boolean;
 
+  /**
+   * Enable all feature flags that do not impact the user's application
+   *
+   * @default - undefined
+   */
+  readonly safe?: boolean;
+
+  /**
+   * Maximum number of simultaneous synths to execute.
+   *
+   * aliases: n
+   *
+   * @default - 4
+   */
+  readonly concurrency?: number;
+
   /**
    * Positional argument for flags
    */

diff --git a/packages/aws-cdk/lib/commands/flags/flags.ts b/packages/aws-cdk/lib/commands/flags/flags.ts
@@ -0,0 +1,38 @@
+import type { FeatureFlag, Toolkit } from '@aws-cdk/toolkit-lib';
+import { InteractiveHandler } from './interactive-handler';
+import { FlagOperations } from './operations';
+import { FlagOperationRouter } from './router';
+import type { FlagOperationsParams } from './types';
+import { FlagValidator } from './validator';
+import type { IoHelper } from '../../api-private';
+import { OBSOLETE_FLAGS } from '../../obsolete-flags';
+
+export class FlagCommandHandler {
+  private readonly flags: FeatureFlag[];
+  private readonly router: FlagOperationRouter;
+  private readonly options: FlagOperationsParams;
+  private readonly ioHelper: IoHelper;
+
+  /** Main component that sets up all flag operation components */
+  constructor(flagData: FeatureFlag[], ioHelper: IoHelper, options: FlagOperationsParams, toolkit: Toolkit) {
+    this.flags = flagData.filter(flag => !OBSOLETE_FLAGS.includes(flag.name));
+    this.options = { ...options, concurrency: options.concurrency ?? 4 };
+    this.ioHelper = ioHelper;
+
+    const validator = new FlagValidator(ioHelper);
+    const flagOperations = new FlagOperations(this.flags, toolkit, ioHelper);
+    const interactiveHandler = new InteractiveHandler(this.flags, flagOperations);
+
+    this.router = new FlagOperationRouter(validator, interactiveHandler, flagOperations);
+  }
+
+  /** Main entry point that processes the flags command */
+  async processFlagsCommand(): Promise<void> {
+    if (this.flags.length === 0) {
+      await this.ioHelper.defaults.error('The \'cdk flags\' command is not compatible with the AWS CDK library used by your application. Please upgrade to 2.212.0 or above.');
+      return;
+    }
+
+    await this.router.route(this.options);
+  }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1393,3 +1393,4 @@ export class Toolkit extends CloudAssemblySourceBuilder {
		}
		}
		}