@aws-cdk/integ-runner 2.204.3 → 2.204.5

package/lib/workers/extract/index.js

@@ -4766,7 +4766,7 @@ var require_semver2 = __commonJS({
 // ../cloud-assembly-schema/cli-version.json
 var require_cli_version = __commonJS({
   "../cloud-assembly-schema/cli-version.json"(exports2, module2) {
-    module2.exports = { version: "2.1136.0" };
+    module2.exports = { version: "2.1138.0" };
   }
 });
 
@@ -13382,14 +13382,14 @@ var require_templates = __commonJS({
       return results;
     }
     __name(parseStyle, "parseStyle");
-    function buildStyle(chalk31, styles) {
+    function buildStyle(chalk33, styles) {
       const enabled = {};
       for (const layer of styles) {
         for (const style of layer.styles) {
           enabled[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk31;
+      let current = chalk33;
       for (const [styleName, styles2] of Object.entries(enabled)) {
         if (!Array.isArray(styles2)) {
           continue;
@@ -13402,7 +13402,7 @@ var require_templates = __commonJS({
       return current;
     }
     __name(buildStyle, "buildStyle");
-    module2.exports = (chalk31, temporary) => {
+    module2.exports = (chalk33, temporary) => {
       const styles = [];
       const chunks2 = [];
       let chunk = [];
@@ -13412,13 +13412,13 @@ var require_templates = __commonJS({
         } else if (style) {
           const string = chunk.join("");
           chunk = [];
-          chunks2.push(styles.length === 0 ? string : buildStyle(chalk31, styles)(string));
+          chunks2.push(styles.length === 0 ? string : buildStyle(chalk33, styles)(string));
           styles.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks2.push(buildStyle(chalk31, styles)(chunk.join("")));
+          chunks2.push(buildStyle(chalk33, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -13469,16 +13469,16 @@ var require_source = __commonJS({
       }
     };
     var chalkFactory = /* @__PURE__ */ __name((options) => {
-      const chalk32 = {};
-      applyOptions(chalk32, options);
-      chalk32.template = (...arguments_) => chalkTag(chalk32.template, ...arguments_);
-      Object.setPrototypeOf(chalk32, Chalk.prototype);
-      Object.setPrototypeOf(chalk32.template, chalk32);
-      chalk32.template.constructor = () => {
+      const chalk34 = {};
+      applyOptions(chalk34, options);
+      chalk34.template = (...arguments_) => chalkTag(chalk34.template, ...arguments_);
+      Object.setPrototypeOf(chalk34, Chalk.prototype);
+      Object.setPrototypeOf(chalk34.template, chalk34);
+      chalk34.template.constructor = () => {
         throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.");
       };
-      chalk32.template.Instance = ChalkClass;
-      return chalk32.template;
+      chalk34.template.Instance = ChalkClass;
+      return chalk34.template;
     }, "chalkFactory");
     function Chalk(options) {
       return chalkFactory(options);
@@ -13590,7 +13590,7 @@ var require_source = __commonJS({
       return openAll + string + closeAll;
     }, "applyStyle");
     var template;
-    var chalkTag = /* @__PURE__ */ __name((chalk32, ...strings) => {
+    var chalkTag = /* @__PURE__ */ __name((chalk34, ...strings) => {
       const [firstString] = strings;
       if (!isArray2(firstString) || !isArray2(firstString.raw)) {
         return strings.join(" ");
@@ -13606,14 +13606,14 @@ var require_source = __commonJS({
       if (template === void 0) {
         template = require_templates();
       }
-      return template(chalk32, parts.join(""));
+      return template(chalk34, parts.join(""));
     }, "chalkTag");
     Object.defineProperties(Chalk.prototype, styles);
-    var chalk31 = Chalk();
-    chalk31.supportsColor = stdoutColor;
-    chalk31.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
-    chalk31.stderr.supportsColor = stderrColor;
-    module2.exports = chalk31;
+    var chalk33 = Chalk();
+    chalk33.supportsColor = stdoutColor;
+    chalk33.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
+    chalk33.stderr.supportsColor = stderrColor;
+    module2.exports = chalk33;
   }
 });
 
@@ -21936,12 +21936,44 @@ var require_zip = __commonJS({
   }
 });
 
+// ../private-tools/lib/s3-path-style/index.js
+var require_s3_path_style = __commonJS({
+  "../private-tools/lib/s3-path-style/index.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.forceS3PathStyle = forceS3PathStyle3;
+    function forceS3PathStyle3() {
+      if (process.env.CDK_S3_FORCE_PATH_STYLE) {
+        return true;
+      }
+      const endpoint = process.env.AWS_ENDPOINT_URL_S3 ?? process.env.AWS_ENDPOINT_URL;
+      if (endpoint && isLoopbackEndpoint(endpoint)) {
+        return true;
+      }
+      return void 0;
+    }
+    __name(forceS3PathStyle3, "forceS3PathStyle");
+    function isLoopbackEndpoint(endpoint) {
+      let host;
+      try {
+        host = new URL(endpoint).hostname;
+      } catch {
+        return false;
+      }
+      const normalized = host.replace(/^\[|\]$/g, "").toLowerCase();
+      return normalized === "localhost" || normalized.startsWith("127.") || normalized === "::1";
+    }
+    __name(isLoopbackEndpoint, "isLoopbackEndpoint");
+  }
+});
+
 // ../cdk-assets-lib/lib/private/tools.ts
 var tools_exports = {};
 var init_tools = __esm({
   "../cdk-assets-lib/lib/private/tools.ts"() {
     "use strict";
     __reExport(tools_exports, __toESM(require_zip()));
+    __reExport(tools_exports, __toESM(require_s3_path_style()));
   }
 });
 
@@ -23972,8 +24004,6 @@ var init_ListSchema = __esm({
         __name(this, "ListSchema");
       }
       static symbol = /* @__PURE__ */ Symbol.for("@smithy/lis");
-      name;
-      traits;
       valueSchema;
       symbol = _ListSchema.symbol;
     };
@@ -23996,8 +24026,6 @@ var init_MapSchema = __esm({
         __name(this, "MapSchema");
       }
       static symbol = /* @__PURE__ */ Symbol.for("@smithy/map");
-      name;
-      traits;
       keySchema;
       valueSchema;
       symbol = _MapSchema.symbol;
@@ -24022,8 +24050,6 @@ var init_OperationSchema = __esm({
         __name(this, "OperationSchema");
       }
       static symbol = /* @__PURE__ */ Symbol.for("@smithy/ope");
-      name;
-      traits;
       input;
       output;
       symbol = _OperationSchema.symbol;
@@ -24048,8 +24074,6 @@ var init_StructureSchema = __esm({
         __name(this, "StructureSchema");
       }
       static symbol = /* @__PURE__ */ Symbol.for("@smithy/str");
-      name;
-      traits;
       memberNames;
       memberList;
       symbol = _StructureSchema.symbol;
@@ -24426,9 +24450,7 @@ var init_SimpleSchema = __esm({
         __name(this, "SimpleSchema");
       }
       static symbol = /* @__PURE__ */ Symbol.for("@smithy/sim");
-      name;
       schemaRef;
-      traits;
       symbol = _SimpleSchema.symbol;
     };
     sim = /* @__PURE__ */ __name((namespace, name, schemaRef, traits) => Schema.assign(new SimpleSchema(), {
@@ -32736,24 +32758,27 @@ var getHttpHandlerExtensionConfiguration, resolveHttpHandlerRuntimeConfig;
 var init_httpExtensionConfiguration = __esm({
   "../../../node_modules/@smithy/core/dist-es/submodules/protocols/protocol-http/extensions/httpExtensionConfiguration.js"() {
     getHttpHandlerExtensionConfiguration = /* @__PURE__ */ __name((runtimeConfig) => {
+      if (runtimeConfig.logger && runtimeConfig.logger.constructor?.name !== "NoOpLogger") {
+        runtimeConfig.requestHandler?.updateHttpClientConfig?.(/* @__PURE__ */ Symbol.for("logger"), runtimeConfig.logger);
+      }
       return {
         setHttpHandler(handler) {
-          runtimeConfig.httpHandler = handler;
+          runtimeConfig.requestHandler = handler;
         },
         httpHandler() {
-          return runtimeConfig.httpHandler;
+          return runtimeConfig.requestHandler;
         },
         updateHttpClientConfig(key, value) {
-          runtimeConfig.httpHandler?.updateHttpClientConfig(key, value);
+          runtimeConfig.requestHandler?.updateHttpClientConfig(key, value);
         },
         httpHandlerConfigs() {
-          return runtimeConfig.httpHandler.httpHandlerConfigs();
+          return runtimeConfig.requestHandler.httpHandlerConfigs();
         }
       };
     }, "getHttpHandlerExtensionConfiguration");
     resolveHttpHandlerRuntimeConfig = /* @__PURE__ */ __name((httpHandlerExtensionConfiguration) => {
       return {
-        httpHandler: httpHandlerExtensionConfiguration.httpHandler()
+        requestHandler: httpHandlerExtensionConfiguration.httpHandler()
       };
     }, "resolveHttpHandlerRuntimeConfig");
   }
@@ -39029,7 +39054,7 @@ var init_package = __esm({
   "../../../node_modules/@aws-sdk/nested-clients/package.json"() {
     package_default = {
       name: "@aws-sdk/nested-clients",
-      version: "3.997.41",
+      version: "3.997.43",
       description: "Nested clients for AWS SDK packages.",
       homepage: "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/nested-clients",
       license: "Apache-2.0",
@@ -39129,9 +39154,9 @@ var init_package = __esm({
         "test:watch": "yarn g:vitest watch"
       },
       dependencies: {
-        "@aws-sdk/core": "^3.977.6",
-        "@aws-sdk/signature-v4-multi-region": "^3.996.43",
-        "@aws-sdk/types": "^3.974.2",
+        "@aws-sdk/core": "^3.977.8",
+        "@aws-sdk/signature-v4-multi-region": "^3.996.45",
+        "@aws-sdk/types": "^3.974.4",
         "@smithy/core": "^3.31.1",
         "@smithy/fetch-http-handler": "^5.6.13",
         "@smithy/node-http-handler": "^4.9.13",
@@ -39142,7 +39167,7 @@ var init_package = __esm({
         concurrently: "7.0.0",
         "downlevel-dts": "0.10.1",
         premove: "4.0.0",
-        typescript: "~5.8.3"
+        typescript: "~7.0.2"
       },
       engines: {
         node: ">=20.0.0"
@@ -72504,6 +72529,7 @@ var init_aws2 = __esm({
     import_lib_storage = __toESM(require_dist_cjs22());
     import_config_resolver = __toESM(require_dist_cjs23());
     import_node_config_provider = __toESM(require_dist_cjs24());
+    init_tools();
     USER_AGENT2 = "cdk-assets";
     DefaultAwsClient = class {
       constructor(profile) {
@@ -72528,7 +72554,11 @@ var init_aws2 = __esm({
       config;
       mainCredentials;
       async s3Client(options) {
-        const client = new import_client_s3.S3Client(await this.awsOptions(options));
+        const client = new import_client_s3.S3Client({
+          ...await this.awsOptions(options),
+          // Use path-style addressing for explicit opt-in or loopback endpoints.
+          forcePathStyle: (0, tools_exports.forceS3PathStyle)()
+        });
         return {
           getBucketEncryption: /* @__PURE__ */ __name((input) => client.send(new import_client_s3.GetBucketEncryptionCommand(input)), "getBucketEncryption"),
           getBucketLocation: /* @__PURE__ */ __name((input) => client.send(new import_client_s3.GetBucketLocationCommand(input)), "getBucketLocation"),
@@ -86366,10 +86396,11 @@ var init_private = __esm({
 });
 
 // ../toolkit-lib/lib/private/activity-printer/base.ts
-var ActivityPrinterBase;
+var import_chalk3, ActivityPrinterBase;
 var init_base = __esm({
   "../toolkit-lib/lib/private/activity-printer/base.ts"() {
     "use strict";
+    import_chalk3 = __toESM(require_source());
     init_private();
     init_util4();
     ActivityPrinterBase = class {
@@ -86491,6 +86522,15 @@ var init_base = __esm({
       isProvisionalFailure(activity) {
         return this.isStackUpdate && activity.event.ResourceStatus === "DELETE_FAILED";
       }
+      /**
+       * A warning about resources that failed to delete but were skipped, if there were any.
+       */
+      skippedDeletesWarning() {
+        if (this.failures.some((f6) => this.isProvisionalFailure(f6))) {
+          return import_chalk3.default.yellow("\n \u26A0\uFE0F  Some resources failed to delete but were skipped. These resources may still exist and could incur charges. Clean them up manually.\n");
+        }
+        return void 0;
+      }
     };
   }
 });
@@ -86498,25 +86538,25 @@ var init_base = __esm({
 // ../toolkit-lib/lib/private/activity-printer/history.ts
 function colorFromStatusResult(status) {
   if (!status) {
-    return import_chalk3.default.reset;
+    return import_chalk4.default.reset;
   }
   if (status.indexOf("FAILED") !== -1) {
-    return import_chalk3.default.red;
+    return import_chalk4.default.red;
   }
   if (status.indexOf("ROLLBACK") !== -1) {
-    return import_chalk3.default.yellow;
+    return import_chalk4.default.yellow;
   }
   if (status.indexOf("COMPLETE") !== -1) {
-    return import_chalk3.default.green;
+    return import_chalk4.default.green;
   }
-  return import_chalk3.default.reset;
+  return import_chalk4.default.reset;
 }
-var util4, import_chalk3, HistoryActivityPrinter;
+var util4, import_chalk4, HistoryActivityPrinter;
 var init_history = __esm({
   "../toolkit-lib/lib/private/activity-printer/history.ts"() {
     "use strict";
     util4 = __toESM(require("util"));
-    import_chalk3 = __toESM(require_source());
+    import_chalk4 = __toESM(require_source());
     init_base();
     init_util4();
     HistoryActivityPrinter = class _HistoryActivityPrinter extends ActivityPrinterBase {
@@ -86553,8 +86593,9 @@ var init_history = __esm({
             this.printOne(failure, false);
           }
         }
-        if (this.failures.some((f6) => this.isProvisionalFailure(f6))) {
-          this.stream.write(import_chalk3.default.yellow("\n \u26A0\uFE0F  Some resources failed to delete but were skipped. These resources may still exist and could incur charges. Clean them up manually.\n"));
+        const warning3 = this.skippedDeletesWarning();
+        if (warning3) {
+          this.stream.write(warning3);
         }
       }
       print() {
@@ -86568,8 +86609,8 @@ var init_history = __esm({
       printOne(activity, progress) {
         const event = activity.event;
         const provisional = this.isProvisionalFailure(activity);
-        const color = provisional ? import_chalk3.default.yellow : colorFromStatusResult(event.ResourceStatus);
-        let reasonColor = import_chalk3.default.cyan;
+        const color = provisional ? import_chalk4.default.yellow : colorFromStatusResult(event.ResourceStatus);
+        let reasonColor = import_chalk4.default.cyan;
         let stackTrace = "";
         const metadata = activity.metadata;
         if (!provisional && event.ResourceStatus && event.ResourceStatus.indexOf("FAILED") !== -1) {
@@ -86580,7 +86621,7 @@ var init_history = __esm({
             stackTrace = metadata.entry.trace ? `
 	${metadata.entry.trace.join("\n	\\_ ")}` : "";
           }
-          reasonColor = import_chalk3.default.red;
+          reasonColor = import_chalk4.default.red;
         }
         const resourceName = metadata ? metadata.constructPath : event.LogicalResourceId || "";
         const logicalId = resourceName !== event.LogicalResourceId ? `(${event.LogicalResourceId}) ` : "";
@@ -86593,9 +86634,9 @@ var init_history = __esm({
             new Date(event.Timestamp).toLocaleTimeString(),
             color(padRight(_HistoryActivityPrinter.STATUS_WIDTH, statusText)),
             padRight(this.resourceTypeColumnWidth, event.ResourceType || ""),
-            color(import_chalk3.default.bold(resourceName)),
+            color(import_chalk4.default.bold(resourceName)),
             logicalId,
-            provisional ? "(this will take a few minutes to recover)" : reasonColor(import_chalk3.default.bold(event.ResourceStatusReason ? event.ResourceStatusReason : "")),
+            provisional ? "(this will take a few minutes to recover)" : reasonColor(import_chalk4.default.bold(event.ResourceStatusReason ? event.ResourceStatusReason : "")),
             provisional ? "" : reasonColor(stackTrace)
           )
         );
@@ -86613,7 +86654,7 @@ var init_history = __esm({
             util4.format(
               "%s Currently in progress: %s\n",
               progress,
-              import_chalk3.default.bold(Object.keys(this.resourcesInProgress).join(", "))
+              import_chalk4.default.bold(Object.keys(this.resourcesInProgress).join(", "))
             )
           );
         }
@@ -86896,11 +86937,11 @@ var init_display = __esm({
 });
 
 // ../toolkit-lib/lib/private/activity-printer/current.ts
-var import_chalk4, PROGRESSBAR_EXTRA_SPACE;
+var import_chalk5, PROGRESSBAR_EXTRA_SPACE;
 var init_current = __esm({
   "../toolkit-lib/lib/private/activity-printer/current.ts"() {
     "use strict";
-    import_chalk4 = __toESM(require_source());
+    import_chalk5 = __toESM(require_source());
     init_base();
     init_display();
     init_util4();
@@ -86908,6 +86949,16 @@ var init_current = __esm({
   }
 });
 
+// ../toolkit-lib/lib/private/activity-printer/errors-only.ts
+var import_chalk6;
+var init_errors_only = __esm({
+  "../toolkit-lib/lib/private/activity-printer/errors-only.ts"() {
+    "use strict";
+    import_chalk6 = __toESM(require_source());
+    init_base();
+  }
+});
+
 // ../toolkit-lib/lib/private/activity-printer/index.ts
 var init_activity_printer = __esm({
   "../toolkit-lib/lib/private/activity-printer/index.ts"() {
@@ -86915,6 +86966,7 @@ var init_activity_printer = __esm({
     init_base();
     init_history();
     init_current();
+    init_errors_only();
   }
 });
 
@@ -86941,12 +86993,12 @@ function isStackActivity(msg) {
     "CDK_TOOLKIT_I5503"
   ].includes(msg.code);
 }
-var util5, import_chalk5, NonInteractiveIoHost, styleMap;
+var util5, import_chalk7, NonInteractiveIoHost, styleMap;
 var init_non_interactive_io_host = __esm({
   "../toolkit-lib/lib/toolkit/non-interactive-io-host.ts"() {
     "use strict";
     util5 = __toESM(require("node:util"));
-    import_chalk5 = __toESM(require_source());
+    import_chalk7 = __toESM(require_source());
     init_private();
     init_activity_printer();
     init_shell_env();
@@ -87046,12 +87098,12 @@ var init_non_interactive_io_host = __esm({
       }
     };
     styleMap = {
-      error: import_chalk5.default.red,
-      warn: import_chalk5.default.yellow,
-      result: import_chalk5.default.reset,
-      info: import_chalk5.default.reset,
-      debug: import_chalk5.default.gray,
-      trace: import_chalk5.default.gray
+      error: import_chalk7.default.red,
+      warn: import_chalk7.default.yellow,
+      result: import_chalk7.default.reset,
+      info: import_chalk7.default.reset,
+      debug: import_chalk7.default.gray,
+      trace: import_chalk7.default.gray
     };
     __name(isStackActivity, "isStackActivity");
   }
@@ -267029,6 +267081,16 @@ var init_user_agent = __esm({
   }
 });
 
+// ../toolkit-lib/lib/private/tools.ts
+var tools_exports2 = {};
+var init_tools2 = __esm({
+  "../toolkit-lib/lib/private/tools.ts"() {
+    "use strict";
+    __reExport(tools_exports2, __toESM(require_zip()));
+    __reExport(tools_exports2, __toESM(require_s3_path_style()));
+  }
+});
+
 // ../toolkit-lib/lib/api/aws-auth/sdk.ts
 function makeSdkLoggerSafeByBindingThis(logger3) {
   return {
@@ -267072,6 +267134,7 @@ var init_sdk = __esm({
     init_cached();
     init_tracing();
     init_user_agent();
+    init_tools2();
     init_toolkit_error();
     init_util4();
     SDK = class {
@@ -267394,7 +267457,11 @@ var init_sdk = __esm({
         };
       }
       s3() {
-        const client = new import_client_s32.S3Client(this.config);
+        const client = new import_client_s32.S3Client({
+          ...this.config,
+          // Use path-style addressing for explicit opt-in or loopback endpoints.
+          forcePathStyle: (0, tools_exports2.forceS3PathStyle)()
+        });
         return {
           deleteObjects: /* @__PURE__ */ __name((input) => client.send(new import_client_s32.DeleteObjectsCommand({
             ...input,
@@ -270824,6 +270891,16 @@ var init_resource_metadata2 = __esm({
 });
 
 // ../toolkit-lib/lib/api/cloudformation/evaluate-cloudformation-template.ts
+function assertEvaluatesToArray(intrinsic, value) {
+  if (!Array.isArray(value)) {
+    throw new CfnEvaluationException(`${intrinsic}: expected an array, got ${JSON.stringify(value)}`);
+  }
+}
+function assertEvaluatesToString(intrinsic, value) {
+  if (typeof value !== "string") {
+    throw new CfnEvaluationException(`${intrinsic}: expected a string, got ${JSON.stringify(value)}`);
+  }
+}
 function iamArnFmt(parts) {
   return `arn:${parts.partition}:${parts.service}::${parts.account}:${parts.resourceType}/${parts.resourceName}`;
 }
@@ -270933,6 +271010,8 @@ var init_evaluate_cloudformation_template = __esm({
         __name(this, "CfnEvaluationException");
       }
     };
+    __name(assertEvaluatesToArray, "assertEvaluatesToArray");
+    __name(assertEvaluatesToString, "assertEvaluatesToString");
     EvaluateCloudFormationTemplate = class _EvaluateCloudFormationTemplate {
       static {
         __name(this, "EvaluateCloudFormationTemplate");
@@ -271037,14 +271116,17 @@ var init_evaluate_cloudformation_template = __esm({
           }
           async "Fn::Join"(separator, args) {
             const evaluatedArgs = await self2.evaluateCfnExpression(args);
+            assertEvaluatesToArray("Fn::Join", evaluatedArgs);
             return evaluatedArgs.join(separator);
           }
           async "Fn::Split"(separator, args) {
             const evaluatedArgs = await self2.evaluateCfnExpression(args);
+            assertEvaluatesToString("Fn::Split", evaluatedArgs);
             return evaluatedArgs.split(separator);
           }
           async "Fn::Select"(index, args) {
             const evaluatedArgs = await self2.evaluateCfnExpression(args);
+            assertEvaluatesToArray("Fn::Select", evaluatedArgs);
             return evaluatedArgs[index];
           }
           async Ref(logicalId) {
@@ -271207,7 +271289,7 @@ var init_evaluate_cloudformation_template = __esm({
           const evaluateCfnTemplate = await this.createNestedEvaluateCloudFormationTemplate(
             dependantStack.physicalName,
             dependantStack.generatedTemplate,
-            dependantStack.generatedTemplate.Parameters
+            this.template.Resources?.[logicalId]?.Properties?.Parameters ?? {}
           );
           return evaluateCfnTemplate.evaluateCfnExpression({
             "Fn::GetAtt": attribute.split(/\.(.*)/s)
@@ -271401,7 +271483,7 @@ async function makeBodyParameter(ioHelper, stack, resolvedEnvironment, assetMani
 Run the following command in order to setup an S3 bucket in this environment, and then re-deploy:
 
 `,
-        import_chalk6.default.blue(`	$ cdk bootstrap ${resolvedEnvironment.name}
+        import_chalk8.default.blue(`	$ cdk bootstrap ${resolvedEnvironment.name}
 `)
       )
     );
@@ -271486,7 +271568,7 @@ function setEnv(name, value) {
     delete process.env[name];
   }
 }
-var fs26, path24, util6, import_cloud_assembly_api6, import_client_s33, import_middleware_endpoint2, import_chalk6, LARGE_TEMPLATE_SIZE_KB;
+var fs26, path24, util6, import_cloud_assembly_api6, import_client_s33, import_middleware_endpoint2, import_chalk8, LARGE_TEMPLATE_SIZE_KB;
 var init_template_body_parameter = __esm({
   "../toolkit-lib/lib/api/cloudformation/template-body-parameter.ts"() {
     "use strict";
@@ -271496,7 +271578,7 @@ var init_template_body_parameter = __esm({
     import_cloud_assembly_api6 = __toESM(require_lib3());
     import_client_s33 = __toESM(require_dist_cjs17());
     import_middleware_endpoint2 = __toESM(require_dist_cjs43());
-    import_chalk6 = __toESM(require_source());
+    import_chalk8 = __toESM(require_source());
     init_toolkit_error();
     init_util4();
     LARGE_TEMPLATE_SIZE_KB = 50;
@@ -272445,15 +272527,6 @@ var init_stack_helpers = __esm({
         return new _CloudFormationStack(cfn, stackName, stack);
       }
       _template;
-      /**
-       * Returns the Stack object returned from the CloudFormation service response that this decorating object wraps
-       */
-      get wrapped() {
-        if (!this.stack) {
-          throw new ToolkitError("NoStack", "CloudFormationStack object does not hold a stack");
-        }
-        return this.stack;
-      }
       /**
        * Retrieve the stack's deployed template
        *
@@ -274641,28 +274714,30 @@ async function createChangeSetAndCleanup(ioHelper, options) {
     Capabilities: ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
   });
   await ioHelper.defaults.debug((0, import_node_util3.format)("Initiated creation of changeset: %s; waiting for it to finish creating...", changeSet.Id));
-  const createdChangeSet = await new ChangeSetDescriber({
-    cfn: options.cfn,
-    ioHelper,
-    stackNameOrArn: changeSet.StackId ?? options.stack.stackName,
-    changeSetNameOrArn: changeSet.Id ?? options.changeSetName
-  }).waitAndThrowOnProblem({
-    diagnoser: options.diagnoser
-  });
-  await cleanupOldChangeset(
-    options.cfn,
-    ioHelper,
-    changeSet.Id ?? options.changeSetName,
-    changeSet.StackId ?? options.stack.stackName
-  );
-  if (!options.exists) {
-    await ioHelper.defaults.debug((0, import_node_util3.format)("Deleting empty stack created by diff changeset: %s", changeSet.StackId ?? options.stack.stackName));
-    await options.cfn.deleteStack({
-      StackName: changeSet.StackId ?? options.stack.stackName,
-      ClientRequestToken: (0, import_node_crypto9.randomUUID)()
+  const changeSetId = changeSet.Id ?? options.changeSetName;
+  const stackId = changeSet.StackId ?? options.stack.stackName;
+  try {
+    return await new ChangeSetDescriber({
+      cfn: options.cfn,
+      ioHelper,
+      stackNameOrArn: stackId,
+      changeSetNameOrArn: changeSetId
+    }).waitAndThrowOnProblem({
+      diagnoser: options.diagnoser
     });
+  } catch (e6) {
+    await ioHelper.defaults.warn((0, import_node_util3.format)("Change set %s failed: %s", changeSetId, e6));
+    throw e6;
+  } finally {
+    await cleanupOldChangeset(options.cfn, ioHelper, changeSetId, stackId);
+    if (!options.exists) {
+      await ioHelper.defaults.debug((0, import_node_util3.format)("Deleting empty stack created by diff changeset: %s", stackId));
+      await options.cfn.deleteStack({
+        StackName: stackId,
+        ClientRequestToken: (0, import_node_crypto9.randomUUID)()
+      });
+    }
   }
-  return createdChangeSet;
 }
 async function createValidationChangeSet(ioHelper, options) {
   const { cfn, bodyParameter, exists, stackExistedBefore, executionRoleArn, diagnoser } = await prepareChangeSetEnv(ioHelper, options);
@@ -274717,7 +274792,7 @@ async function cleanupOldChangeset(cfn, ioHelper, changeSetNameOrArn, stackNameO
 }
 async function waitForStackDelete(cfn, ioHelper, stackNameOrArn, stabilizationPollingInterval) {
   const stackDisplayName = stackNameFromArn(stackNameOrArn);
-  const stack = await stabilizeStack(cfn, ioHelper, stackNameOrArn, stabilizationPollingInterval);
+  const stack = await stabilizeStack(cfn, ioHelper, stackNameOrArn, { pollingInterval: stabilizationPollingInterval });
   if (!stack) {
     return void 0;
   }
@@ -274732,42 +274807,65 @@ async function waitForStackDelete(cfn, ioHelper, stackNameOrArn, stabilizationPo
   }
   return stack;
 }
-async function waitForStackDeploy(cfn, ioHelper, stackName, stabilizationPollingInterval) {
-  const stack = await stabilizeStack(cfn, ioHelper, stackName, stabilizationPollingInterval);
+async function waitForStackDeploy(cfn, ioHelper, stackNameOrArn, stabilizationPollingInterval) {
+  const stack = await stabilizeStack(cfn, ioHelper, stackNameOrArn, {
+    pollingInterval: stabilizationPollingInterval,
+    changeSetExecuted: true
+  });
   if (!stack) {
     return void 0;
   }
+  const stackDisplayName = stackNameFromArn(stackNameOrArn);
   const status = stack.stackStatus;
   if (status.isCreationFailure) {
     throw new DeploymentError(
-      `The stack named ${stackName} failed creation, it may need to be manually deleted from the AWS console: ${status}`,
+      `The stack named ${stackDisplayName} failed creation, it may need to be manually deleted from the AWS console: ${status}`,
       "StackCreationFailed"
     );
   } else if (!status.isDeploySuccess) {
-    throw new DeploymentError(`The stack named ${stackName} failed to deploy: ${status}`, "StackDeployFailed");
+    throw new DeploymentError(`The stack named ${stackDisplayName} failed to deploy: ${status}`, "StackDeployFailed");
   }
   return stack;
 }
-async function stabilizeStack(cfn, ioHelper, stackNameOrArn, pollingInterval) {
+async function stabilizeStack(cfn, ioHelper, stackNameOrArn, options = {}) {
+  const { pollingInterval, changeSetExecuted = false } = options;
   const stackDisplayName = stackNameFromArn(stackNameOrArn);
   await ioHelper.defaults.debug((0, import_node_util3.format)("Waiting for stack %s to finish creating or updating...", stackDisplayName));
+  let target = stackNameOrArn;
+  let sawOperationInProgress = false;
+  let leadingReviewReads = 0;
   return waitFor(async () => {
-    const stack = await CloudFormationStack.lookup(cfn, stackNameOrArn);
+    const stack = await CloudFormationStack.lookup(cfn, target);
     if (!stack.exists) {
       await ioHelper.defaults.debug((0, import_node_util3.format)("Stack %s does not exist", stackDisplayName));
       return null;
     }
+    if (stack.stackStatus.isDeleted && stack.stackStatus.name === "DELETE_COMPLETE") {
+      await ioHelper.defaults.debug((0, import_node_util3.format)("Stack %s has been deleted", stackDisplayName));
+      return null;
+    }
+    target = stack.stackId;
     const status = stack.stackStatus;
     if (status.isInProgress) {
+      sawOperationInProgress = true;
       await ioHelper.defaults.debug((0, import_node_util3.format)("Stack %s has an ongoing operation in progress and is not stable (%s)", stackDisplayName, status));
       return void 0;
     } else if (status.isReviewInProgress) {
+      if (changeSetExecuted && sawOperationInProgress) {
+        await ioHelper.defaults.debug((0, import_node_util3.format)("Stack %s reported REVIEW_IN_PROGRESS after an operation was in progress; treating as a stale read and polling again (%s)", stackDisplayName, status));
+        return void 0;
+      }
+      if (changeSetExecuted && leadingReviewReads < STALE_REVIEW_READ_ATTEMPTS) {
+        leadingReviewReads++;
+        await ioHelper.defaults.debug((0, import_node_util3.format)("Stack %s reported REVIEW_IN_PROGRESS, which may be a stale read; polling again (%s)", stackDisplayName, status));
+        return void 0;
+      }
       await ioHelper.defaults.debug((0, import_node_util3.format)("Stack %s is in REVIEW_IN_PROGRESS state. Considering this is a stable status (%s)", stackDisplayName, status));
     }
     return stack;
   }, pollingInterval);
 }
-var import_node_crypto9, import_node_util3, import_cdk_assets_lib3, cxapi2, import_cloud_assembly_api7, TemplateParameters, ParameterValues;
+var import_node_crypto9, import_node_util3, import_cdk_assets_lib3, cxapi2, import_cloud_assembly_api7, STALE_REVIEW_READ_ATTEMPTS, TemplateParameters, ParameterValues;
 var init_cfn_api = __esm({
   "../toolkit-lib/lib/api/deployments/cfn-api.ts"() {
     "use strict";
@@ -274784,6 +274882,7 @@ var init_cfn_api = __esm({
     init_cloudformation2();
     init_stack_diagnoser();
     init_stack_source_tracing();
+    STALE_REVIEW_READ_ATTEMPTS = 3;
     __name(createDiffChangeSet, "createDiffChangeSet");
     __name(templatesFromAssetManifestArtifact, "templatesFromAssetManifestArtifact");
     __name(prepareChangeSetEnv, "prepareChangeSetEnv");
@@ -274890,12 +274989,12 @@ var init_cfn_api = __esm({
 });
 
 // ../toolkit-lib/lib/api/toolkit-info.ts
-var import_util33, import_chalk7, DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo, ExistingToolkitInfo, BootstrapStackNotFoundInfo;
+var import_util33, import_chalk9, DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo, ExistingToolkitInfo, BootstrapStackNotFoundInfo;
 var init_toolkit_info = __esm({
   "../toolkit-lib/lib/api/toolkit-info.ts"() {
     "use strict";
     import_util33 = require("util");
-    import_chalk7 = __toESM(require_source());
+    import_chalk9 = __toESM(require_source());
     init_bootstrap_props();
     init_toolkit_error();
     init_cfn_api();
@@ -274918,7 +275017,7 @@ var init_toolkit_info = __esm({
                 "The environment %s doesn't have the CDK toolkit stack (%s) installed. Use %s to setup your environment for use with the toolkit.",
                 environment.name,
                 stackName,
-                import_chalk7.default.blue(`cdk bootstrap "${environment.name}"`)
+                import_chalk9.default.blue(`cdk bootstrap "${environment.name}"`)
               )
             );
             return _ToolkitInfo.bootstrapStackNotFoundInfo(stackName);
@@ -274929,7 +275028,7 @@ var init_toolkit_info = __esm({
                 "The environment %s has a CDK toolkit stack (%s) that failed to create. Use %s to try provisioning it again.",
                 environment.name,
                 stackName,
-                import_chalk7.default.blue(`cdk bootstrap "${environment.name}"`)
+                import_chalk9.default.blue(`cdk bootstrap "${environment.name}"`)
               )
             );
             return _ToolkitInfo.bootstrapStackNotFoundInfo(stackName);
@@ -279965,7 +280064,7 @@ async function includeDownstreamStacks(ioHelper, selectedStacks, allStacks) {
   do {
     madeProgress = false;
     for (const [id, stack] of allStacks) {
-      if (!selectedStacks.has(id) && (stack.dependencies || []).some((dep) => selectedStacks.has(dep.id))) {
+      if (!selectedStacks.has(id) && (stack.dependencies || []).some((dep) => selectedStacks.has(dep.hierarchicalId))) {
         selectedStacks.set(id, stack);
         added.push(id);
         madeProgress = true;
@@ -279973,7 +280072,7 @@ async function includeDownstreamStacks(ioHelper, selectedStacks, allStacks) {
     }
   } while (madeProgress);
   if (added.length > 0) {
-    await ioHelper.notify(IO.CDK_TOOLKIT_I1003.msg(`Including depending stacks: ${import_chalk8.default.bold(added.join(", "))}`));
+    await ioHelper.notify(IO.CDK_TOOLKIT_I1003.msg(`Including depending stacks: ${import_chalk10.default.bold(added.join(", "))}`));
   }
 }
 async function includeUpstreamStacks(ioHelper, selectedStacks, allStacks) {
@@ -279992,14 +280091,14 @@ async function includeUpstreamStacks(ioHelper, selectedStacks, allStacks) {
     }
   }
   if (added.length > 0) {
-    await ioHelper.notify(IO.CDK_TOOLKIT_I1002.msg(`Including dependency stacks: ${import_chalk8.default.bold(added.join(", "))}`));
+    await ioHelper.notify(IO.CDK_TOOLKIT_I1002.msg(`Including dependency stacks: ${import_chalk10.default.bold(added.join(", "))}`));
   }
 }
-var import_chalk8, import_picomatch, BaseStackAssembly;
+var import_chalk10, import_picomatch, BaseStackAssembly;
 var init_stack_assembly = __esm({
   "../toolkit-lib/lib/api/cloud-assembly/stack-assembly.ts"() {
     "use strict";
-    import_chalk8 = __toESM(require_source());
+    import_chalk10 = __toESM(require_source());
     import_picomatch = __toESM(require_picomatch4());
     init_stack_collection();
     init_util4();
@@ -281699,13 +281798,13 @@ function dependsOnEqual(lvalue, rvalue) {
     if (lvalue.length !== rvalue.length) {
       return false;
     }
-    for (let i6 = 0; i6 < lvalue.length; i6++) {
-      for (let j6 = 0; j6 < lvalue.length; j6++) {
-        if (!deepEqual(lvalue[i6], rvalue[j6]) && j6 === lvalue.length - 1) {
-          return false;
-        }
-        break;
+    const unmatched = rvalue.map((_, i6) => i6);
+    for (const l4 of lvalue) {
+      const at = unmatched.findIndex((i6) => deepEqual(l4, rvalue[i6]));
+      if (at === -1) {
+        return false;
       }
+      unmatched.splice(at, 1);
     }
     return true;
   }
@@ -282365,12 +282464,12 @@ function defaultResource(resource, statements) {
   statements.forEach((s2) => s2.resources.replaceStar(resource));
   return statements;
 }
-var import_service_spec_types, import_chalk9, IamChanges;
+var import_service_spec_types, import_chalk11, IamChanges;
 var init_iam_changes = __esm({
   "../cloudformation-diff/lib/iam/iam-changes.ts"() {
     "use strict";
     import_service_spec_types = __toESM(require_lib9());
-    import_chalk9 = __toESM(require_source());
+    import_chalk11 = __toESM(require_source());
     init_iam_identity_center();
     init_managed_policy();
     init_statement();
@@ -282440,7 +282539,7 @@ var init_iam_changes = __esm({
             renderedStatement.action,
             renderedStatement.principal,
             renderedStatement.condition
-          ].map((s2) => import_chalk9.default.green(s2)));
+          ].map((s2) => import_chalk11.default.green(s2)));
         }
         for (const statement of this.statements.removals) {
           const renderedStatement = statement.render();
@@ -282451,7 +282550,7 @@ var init_iam_changes = __esm({
             renderedStatement.action,
             renderedStatement.principal,
             renderedStatement.condition
-          ].map((s2) => import_chalk9.default.red(s2)));
+          ].map((s2) => import_chalk11.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -282465,14 +282564,14 @@ var init_iam_changes = __esm({
             "+",
             att.identityArn,
             att.managedPolicyArn
-          ].map((s2) => import_chalk9.default.green(s2)));
+          ].map((s2) => import_chalk11.default.green(s2)));
         }
         for (const att of this.managedPolicies.removals) {
           ret.push([
             "-",
             att.identityArn,
             att.managedPolicyArn
-          ].map((s2) => import_chalk9.default.red(s2)));
+          ].map((s2) => import_chalk11.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -282491,7 +282590,7 @@ var init_iam_changes = __esm({
             att.principalType || "",
             att.targetId || "",
             att.targetType || ""
-          ].map((s2) => import_chalk9.default.green(s2)));
+          ].map((s2) => import_chalk11.default.green(s2)));
         }
         for (const att of this.ssoAssignments.removals) {
           ret.push([
@@ -282503,7 +282602,7 @@ var init_iam_changes = __esm({
             att.principalType || "",
             att.targetId || "",
             att.targetType || ""
-          ].map((s2) => import_chalk9.default.red(s2)));
+          ].map((s2) => import_chalk11.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -282522,7 +282621,7 @@ var init_iam_changes = __esm({
             att.cfnLogicalId || "",
             att.ssoInstanceArn || "",
             att.accessControlAttributes?.map(formatAccessControlAttribute).join("\n") || ""
-          ].map((s2) => import_chalk9.default.green(s2)));
+          ].map((s2) => import_chalk11.default.green(s2)));
         }
         for (const att of this.ssoInstanceACAConfigs.removals) {
           ret.push([
@@ -282530,7 +282629,7 @@ var init_iam_changes = __esm({
             att.cfnLogicalId || "",
             att.ssoInstanceArn || "",
             att.accessControlAttributes?.map(formatAccessControlAttribute).join("\n") || ""
-          ].map((s2) => import_chalk9.default.red(s2)));
+          ].map((s2) => import_chalk11.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -282563,7 +282662,7 @@ var init_iam_changes = __esm({
             att.name || "",
             formatSsoPermissionsBoundary(att.ssoPermissionsBoundary),
             att.ssoCustomerManagedPolicyReferences?.map(formatManagedPolicyRef).join("\n") || ""
-          ].map((s2) => import_chalk9.default.green(s2)));
+          ].map((s2) => import_chalk11.default.green(s2)));
         }
         for (const att of this.ssoPermissionSets.removals) {
           ret.push([
@@ -282573,7 +282672,7 @@ var init_iam_changes = __esm({
             att.name || "",
             formatSsoPermissionsBoundary(att.ssoPermissionsBoundary),
             att.ssoCustomerManagedPolicyReferences?.map(formatManagedPolicyRef).join("\n") || ""
-          ].map((s2) => import_chalk9.default.red(s2)));
+          ].map((s2) => import_chalk11.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -282893,11 +282992,11 @@ var init_security_group_rule = __esm({
 });
 
 // ../cloudformation-diff/lib/network/security-group-changes.ts
-var import_chalk10, SecurityGroupChanges;
+var import_chalk12, SecurityGroupChanges;
 var init_security_group_changes = __esm({
   "../cloudformation-diff/lib/network/security-group-changes.ts"() {
     "use strict";
-    import_chalk10 = __toESM(require_source());
+    import_chalk12 = __toESM(require_source());
     init_security_group_rule();
     init_diffable();
     init_render_intrinsics();
@@ -282945,7 +283044,7 @@ var init_security_group_changes = __esm({
           inOut,
           rule.describeProtocol(),
           rule.describePeer()
-        ].map((s2) => plusMin === "+" ? import_chalk10.default.green(s2) : import_chalk10.default.red(s2)), "renderRule");
+        ].map((s2) => plusMin === "+" ? import_chalk12.default.green(s2) : import_chalk12.default.red(s2)), "renderRule");
         ret.push(...this.ingress.additions.map(renderRule("+", inWord)));
         ret.push(...this.egress.additions.map(renderRule("+", outWord)));
         ret.push(...this.ingress.removals.map(renderRule("-", inWord)));
@@ -284220,15 +284319,15 @@ __export(format_foreach_exports, {
 function isForEachKey(logicalId) {
   return logicalId.startsWith("Fn::ForEach::");
 }
-var import_chalk11, ADDITION, UPDATE, REMOVAL, ForEachDiffFormatter;
+var import_chalk13, ADDITION, UPDATE, REMOVAL, ForEachDiffFormatter;
 var init_format_foreach = __esm({
   "../cloudformation-diff/lib/format-foreach.ts"() {
     "use strict";
-    import_chalk11 = __toESM(require_source());
+    import_chalk13 = __toESM(require_source());
     init_util6();
-    ADDITION = import_chalk11.default.green("[+]");
-    UPDATE = import_chalk11.default.yellow("[~]");
-    REMOVAL = import_chalk11.default.red("[-]");
+    ADDITION = import_chalk13.default.green("[+]");
+    UPDATE = import_chalk13.default.yellow("[~]");
+    REMOVAL = import_chalk13.default.red("[-]");
     ForEachDiffFormatter = class {
       static {
         __name(this, "ForEachDiffFormatter");
@@ -284241,24 +284340,24 @@ var init_format_foreach = __esm({
         const changeType = this.getChangeType(oldValue, newValue);
         const value = newValue ?? oldValue;
         if (!Array.isArray(value) || value.length < 2) {
-          lines.push(`${this.changeSymbol(changeType)} ${import_chalk11.default.cyan(key)} (unrecognized ForEach structure)`);
+          lines.push(`${this.changeSymbol(changeType)} ${import_chalk13.default.cyan(key)} (unrecognized ForEach structure)`);
           return lines;
         }
         const loopName = key.replace("Fn::ForEach::", "");
         const [collection, templateObj] = value;
         const entries = Object.entries(templateObj);
         if (entries.length === 0) {
-          lines.push(`${this.changeSymbol(changeType)} ${import_chalk11.default.cyan(key)} (empty ForEach template)`);
+          lines.push(`${this.changeSymbol(changeType)} ${import_chalk13.default.cyan(key)} (empty ForEach template)`);
           return lines;
         }
         const [[templateKey, templateValue]] = entries;
         const count = Array.isArray(collection) ? `${collection.length} resources` : "dynamic count";
         lines.push(
-          `${this.changeSymbol(changeType)} ${import_chalk11.default.cyan(key)} (expands to ${count} at deploy time)`
+          `${this.changeSymbol(changeType)} ${import_chalk13.default.cyan(key)} (expands to ${count} at deploy time)`
         );
-        lines.push(`    Loop variable: ${import_chalk11.default.blue(loopName)}`);
+        lines.push(`    Loop variable: ${import_chalk13.default.blue(loopName)}`);
         lines.push(`    Collection: ${this.formatCollection(collection)}`);
-        lines.push(`    \u2514\u2500\u2500 ${templateKey} ${import_chalk11.default.cyan(templateValue?.Type ?? "Unknown")}`);
+        lines.push(`    \u2514\u2500\u2500 ${templateKey} ${import_chalk13.default.cyan(templateValue?.Type ?? "Unknown")}`);
         if (changeType === "update" && oldValue && newValue) {
           const oldProps = oldValue[1]?.[Object.keys(oldValue[1])[0]]?.Properties ?? {};
           const newProps = newValue[1]?.[Object.keys(newValue[1])[0]]?.Properties ?? {};
@@ -288860,11 +288959,11 @@ function sum(xs) {
   }
   return total;
 }
-var import_chalk12, import_string_width, table, tableColor, TABLE_BORDER_CHARACTERS;
+var import_chalk14, import_string_width, table, tableColor, TABLE_BORDER_CHARACTERS;
 var init_format_table = __esm({
   "../cloudformation-diff/lib/format-table.ts"() {
     "use strict";
-    import_chalk12 = __toESM(require_source());
+    import_chalk14 = __toESM(require_source());
     import_string_width = __toESM(require_string_width());
     table = __toESM(require_src2());
     __name(formatTable, "formatTable");
@@ -288872,7 +288971,7 @@ var init_format_table = __esm({
     __name(buildColumnConfig, "buildColumnConfig");
     __name(calculateColumnWidths, "calculateColumnWidths");
     __name(sum, "sum");
-    tableColor = import_chalk12.default.gray;
+    tableColor = import_chalk14.default.gray;
     TABLE_BORDER_CHARACTERS = {
       topBody: tableColor("\u2500"),
       topJoin: tableColor("\u252C"),
@@ -290959,7 +291058,7 @@ function _diffStrings(oldStr, newStr, context) {
   const patch = structuredPatch(null, null, oldStr, newStr, null, null, { context });
   const result2 = new Array();
   for (const hunk of patch.hunks) {
-    result2.push(import_chalk13.default.magenta(`@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`));
+    result2.push(import_chalk15.default.magenta(`@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`));
     const baseIndent = _findIndent(hunk.lines);
     for (const line of hunk.lines) {
       if (line === "\") {
@@ -290972,10 +291071,10 @@ function _diffStrings(oldStr, newStr, context) {
           result2.push(`${CONTEXT} ${text}`);
           break;
         case "+":
-          result2.push(import_chalk13.default.bold(`${ADDITION2} ${import_chalk13.default.green(text)}`));
+          result2.push(import_chalk15.default.bold(`${ADDITION2} ${import_chalk15.default.green(text)}`));
           break;
         case "-":
-          result2.push(import_chalk13.default.bold(`${REMOVAL2} ${import_chalk13.default.red(text)}`));
+          result2.push(import_chalk15.default.bold(`${REMOVAL2} ${import_chalk15.default.red(text)}`));
           break;
         default:
           throw new Error(`Unexpected diff marker: ${marker} (full line: ${line})`);
@@ -290997,12 +291096,12 @@ function _diffStrings(oldStr, newStr, context) {
   }
   __name(_findIndent, "_findIndent");
 }
-var import_util50, import_chalk13, PATH_METADATA_KEY3, structuredPatch, ADDITION2, CONTEXT, UPDATE2, REMOVAL2, IMPORT, Formatter;
+var import_util50, import_chalk15, PATH_METADATA_KEY3, structuredPatch, ADDITION2, CONTEXT, UPDATE2, REMOVAL2, IMPORT, Formatter;
 var init_format = __esm({
   "../cloudformation-diff/lib/format.ts"() {
     "use strict";
     import_util50 = require("util");
-    import_chalk13 = __toESM(require_source());
+    import_chalk15 = __toESM(require_source());
     init_util6();
     init_diff_template();
     init_format_foreach();
@@ -291012,11 +291111,11 @@ var init_format = __esm({
     __name(formatDifferences, "formatDifferences");
     __name(formatSecurityChanges, "formatSecurityChanges");
     __name(formatSecurityChangesWithBanner, "formatSecurityChangesWithBanner");
-    ADDITION2 = import_chalk13.default.green("[+]");
-    CONTEXT = import_chalk13.default.grey("[ ]");
-    UPDATE2 = import_chalk13.default.yellow("[~]");
-    REMOVAL2 = import_chalk13.default.red("[-]");
-    IMPORT = import_chalk13.default.blue("[\u2190]");
+    ADDITION2 = import_chalk15.default.green("[+]");
+    CONTEXT = import_chalk15.default.grey("[ ]");
+    UPDATE2 = import_chalk15.default.yellow("[~]");
+    REMOVAL2 = import_chalk15.default.red("[-]");
+    IMPORT = import_chalk15.default.blue("[\u2190]");
     Formatter = class {
       constructor(stream, logicalToPathMap, diff, context = 3) {
         this.stream = stream;
@@ -291033,10 +291132,10 @@ var init_format = __esm({
         __name(this, "Formatter");
       }
       print(fmt, ...args) {
-        this.stream.write(import_chalk13.default.reset((0, import_util50.format)(fmt, ...args)) + "\n");
+        this.stream.write(import_chalk15.default.reset((0, import_util50.format)(fmt, ...args)) + "\n");
       }
       warning(fmt, ...args) {
-        this.stream.write(import_chalk13.default.yellow((0, import_util50.format)(fmt, ...args)) + "\n");
+        this.stream.write(import_chalk15.default.yellow((0, import_util50.format)(fmt, ...args)) + "\n");
       }
       formatSection(title, entryType, collection, formatter = this.formatDifference.bind(this)) {
         if (collection.differenceCount === 0) {
@@ -291047,7 +291146,7 @@ var init_format = __esm({
         this.printSectionFooter();
       }
       printSectionHeader(title) {
-        this.print(import_chalk13.default.underline(import_chalk13.default.bold(title)));
+        this.print(import_chalk15.default.underline(import_chalk15.default.bold(title)));
       }
       printSectionFooter() {
         this.print("");
@@ -291063,8 +291162,8 @@ var init_format = __esm({
           return;
         }
         let value;
-        const oldValue = this.formatValue(diff.oldValue, import_chalk13.default.red);
-        const newValue = this.formatValue(diff.newValue, import_chalk13.default.green);
+        const oldValue = this.formatValue(diff.oldValue, import_chalk15.default.red);
+        const newValue = this.formatValue(diff.newValue, import_chalk15.default.green);
         if (diff.isAddition) {
           value = newValue;
         } else if (diff.isUpdate) {
@@ -291072,7 +291171,7 @@ var init_format = __esm({
         } else if (diff.isRemoval) {
           value = oldValue;
         }
-        this.print(`${this.formatPrefix(diff)} ${import_chalk13.default.cyan(type)} ${this.formatLogicalId(logicalId)}: ${value}`);
+        this.print(`${this.formatPrefix(diff)} ${import_chalk15.default.cyan(type)} ${this.formatLogicalId(logicalId)}: ${value}`);
       }
       /**
        * Print a resource difference for a given logical ID.
@@ -291095,7 +291194,7 @@ var init_format = __esm({
         const resourceType = diff.isRemoval ? diff.oldResourceType : diff.newResourceType;
         const message2 = [
           this.formatResourcePrefix(diff),
-          this.formatValue(resourceType, import_chalk13.default.cyan),
+          this.formatValue(resourceType, import_chalk15.default.cyan),
           this.formatLogicalId(logicalId),
           this.formatImpact(diff.changeImpact),
           this.formatMove(diff.move)
@@ -291126,7 +291225,7 @@ var init_format = __esm({
         if (diff.isRemoval) {
           return REMOVAL2;
         }
-        return import_chalk13.default.reset("[?]");
+        return import_chalk15.default.reset("[?]");
       }
       /**
        * @param value - the value to be formatted.
@@ -291150,15 +291249,15 @@ var init_format = __esm({
       formatImpact(impact) {
         switch (impact) {
           case "MAY_REPLACE" /* MAY_REPLACE */:
-            return import_chalk13.default.italic(import_chalk13.default.yellow("may be replaced"));
+            return import_chalk15.default.italic(import_chalk15.default.yellow("may be replaced"));
           case "WILL_REPLACE" /* WILL_REPLACE */:
-            return import_chalk13.default.italic(import_chalk13.default.bold(import_chalk13.default.red("replace")));
+            return import_chalk15.default.italic(import_chalk15.default.bold(import_chalk15.default.red("replace")));
           case "WILL_DESTROY" /* WILL_DESTROY */:
-            return import_chalk13.default.italic(import_chalk13.default.bold(import_chalk13.default.red("destroy")));
+            return import_chalk15.default.italic(import_chalk15.default.bold(import_chalk15.default.red("destroy")));
           case "WILL_ORPHAN" /* WILL_ORPHAN */:
-            return import_chalk13.default.italic(import_chalk13.default.yellow("orphan"));
+            return import_chalk15.default.italic(import_chalk15.default.yellow("orphan"));
           case "WILL_IMPORT" /* WILL_IMPORT */:
-            return import_chalk13.default.italic(import_chalk13.default.blue("import"));
+            return import_chalk15.default.italic(import_chalk15.default.blue("import"));
           case "WILL_UPDATE" /* WILL_UPDATE */:
           case "WILL_CREATE" /* WILL_CREATE */:
           case "NO_CHANGE" /* NO_CHANGE */:
@@ -291166,7 +291265,7 @@ var init_format = __esm({
         }
       }
       formatMove(move) {
-        return !move ? "" : import_chalk13.default.yellow("(OR", import_chalk13.default.italic(import_chalk13.default.bold("move")), `${move.direction} ${move.stackName}.${move.resourceLogicalId} via refactoring)`);
+        return !move ? "" : import_chalk15.default.yellow("(OR", import_chalk15.default.italic(import_chalk15.default.bold("move")), `${move.direction} ${move.stackName}.${move.resourceLogicalId} via refactoring)`);
       }
       /**
        * Renders a tree of differences under a particular name.
@@ -291205,13 +291304,13 @@ var init_format = __esm({
                 this.print("%s   %s %s", linePrefix, i6 === 0 ? "\u2514\u2500" : "  ", diff[i6]);
               }
             } else {
-              this.print("%s   \u251C\u2500 %s %s", linePrefix, REMOVAL2, this.formatValue(oldObject, import_chalk13.default.red));
-              this.print("%s   \u2514\u2500 %s %s", linePrefix, ADDITION2, this.formatValue(newObject, import_chalk13.default.green));
+              this.print("%s   \u251C\u2500 %s %s", linePrefix, REMOVAL2, this.formatValue(oldObject, import_chalk15.default.red));
+              this.print("%s   \u2514\u2500 %s %s", linePrefix, ADDITION2, this.formatValue(newObject, import_chalk15.default.green));
             }
           } else if (oldObject !== void 0) {
-            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(oldObject, import_chalk13.default.red));
+            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(oldObject, import_chalk15.default.red));
           } else {
-            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(newObject, import_chalk13.default.green));
+            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(newObject, import_chalk15.default.green));
           }
           return;
         }
@@ -291224,12 +291323,12 @@ var init_format = __esm({
           const newValue = newObject[key];
           const treePrefix = key === lastKey ? "\u2514" : "\u251C";
           if (oldValue !== void 0 && newValue !== void 0) {
-            this.print("%s   %s\u2500 %s %s:", linePrefix, treePrefix, this.changeTag(oldValue, newValue), import_chalk13.default.blue(`.${key}`));
+            this.print("%s   %s\u2500 %s %s:", linePrefix, treePrefix, this.changeTag(oldValue, newValue), import_chalk15.default.blue(`.${key}`));
             this.formatObjectDiff(oldValue, newValue, `${linePrefix}   ${key === lastKey ? " " : "\u2502"}`);
           } else if (oldValue !== void 0) {
-            this.print("%s   %s\u2500 %s Removed: %s", linePrefix, treePrefix, REMOVAL2, import_chalk13.default.blue(`.${key}`));
+            this.print("%s   %s\u2500 %s Removed: %s", linePrefix, treePrefix, REMOVAL2, import_chalk15.default.blue(`.${key}`));
           } else {
-            this.print("%s   %s\u2500 %s Added: %s", linePrefix, treePrefix, ADDITION2, import_chalk13.default.blue(`.${key}`));
+            this.print("%s   %s\u2500 %s Added: %s", linePrefix, treePrefix, ADDITION2, import_chalk15.default.blue(`.${key}`));
           }
         }
       }
@@ -291273,7 +291372,7 @@ var init_format = __esm({
       formatLogicalId(logicalId) {
         const normalized = this.normalizedLogicalIdPath(logicalId);
         if (normalized) {
-          return `${normalized} ${import_chalk13.default.gray(logicalId)}`;
+          return `${normalized} ${import_chalk15.default.gray(logicalId)}`;
         }
         return logicalId;
       }
@@ -291365,7 +291464,7 @@ function formatTypedMappings(stream, mappings) {
     const rows = mappings.map((m4) => [m4.type, m4.sourcePath, m4.destinationPath]);
     const formatter = new Formatter(stream, {});
     formatter.print("The following resources were moved or renamed:");
-    formatter.print(import_chalk14.default.green(formatTable(header.concat(rows), void 0)));
+    formatter.print(import_chalk16.default.green(formatTable(header.concat(rows), void 0)));
     formatter.print(" ");
   }
 }
@@ -291375,18 +291474,18 @@ function formatAmbiguousMappings(stream, pairs) {
   formatter.print("Detected ambiguities:");
   formatter.print(tables.join("\n\n"));
   formatter.print(" ");
-  formatter.print(import_chalk14.default.yellow("Please provide an override file to resolve these ambiguous mappings."));
+  formatter.print(import_chalk16.default.yellow("Please provide an override file to resolve these ambiguous mappings."));
   formatter.print(" ");
   function renderTable([removed, added]) {
     return formatTable([["", "Resource"], renderRemoval(removed), renderAddition(added)], void 0);
   }
   __name(renderTable, "renderTable");
   function renderRemoval(locations) {
-    return [import_chalk14.default.red("-"), import_chalk14.default.red(renderLocations(locations))];
+    return [import_chalk16.default.red("-"), import_chalk16.default.red(renderLocations(locations))];
   }
   __name(renderRemoval, "renderRemoval");
   function renderAddition(locations) {
-    return [import_chalk14.default.green("+"), import_chalk14.default.green(renderLocations(locations))];
+    return [import_chalk16.default.green("+"), import_chalk16.default.green(renderLocations(locations))];
   }
   __name(renderAddition, "renderAddition");
   function renderLocations(locs) {
@@ -291394,11 +291493,11 @@ function formatAmbiguousMappings(stream, pairs) {
   }
   __name(renderLocations, "renderLocations");
 }
-var import_chalk14;
+var import_chalk16;
 var init_mappings = __esm({
   "../cloudformation-diff/lib/mappings.ts"() {
     "use strict";
-    import_chalk14 = __toESM(require_source());
+    import_chalk16 = __toESM(require_source());
     init_format();
     init_format_table();
     __name(formatEnvironmentSectionHeader, "formatEnvironmentSectionHeader");
@@ -291656,7 +291755,7 @@ async function addMetadataAssetsToManifest(ioHelper, stack, assetManifest, envRe
   }
   const toolkitInfo = await envResources.lookupToolkit();
   if (!toolkitInfo.found) {
-    throw new ToolkitError("BootstrapStackRequired", `This stack uses assets, so the toolkit stack must be deployed to the environment (Run "${import_chalk15.default.blue("cdk bootstrap " + stack.environment.name)}")`);
+    throw new ToolkitError("BootstrapStackRequired", `This stack uses assets, so the toolkit stack must be deployed to the environment (Run "${import_chalk17.default.blue("cdk bootstrap " + stack.environment.name)}")`);
   }
   const params = {};
   for (const asset of assets) {
@@ -291736,14 +291835,14 @@ async function prepareDockerImageAsset(asset, assetManifest, envResources) {
   }
   return { [asset.imageNameParameter]: `${repositoryUri2}:${imageTag}` };
 }
-var path31, cxapi6, cxschema10, import_chalk15;
+var path31, cxapi6, cxschema10, import_chalk17;
 var init_assets3 = __esm({
   "../toolkit-lib/lib/api/deployments/assets.ts"() {
     "use strict";
     path31 = __toESM(require("path"));
     cxapi6 = __toESM(require_lib3());
     cxschema10 = __toESM(require_lib2());
-    import_chalk15 = __toESM(require_source());
+    import_chalk17 = __toESM(require_source());
     init_toolkit_error();
     __name(addMetadataAssetsToManifest, "addMetadataAssetsToManifest");
     __name(prepareAsset, "prepareAsset");
@@ -292579,15 +292678,6 @@ var init_hotswap_template_cache = __esm({
   }
 });
 
-// ../toolkit-lib/lib/private/tools.ts
-var tools_exports2 = {};
-var init_tools2 = __esm({
-  "../toolkit-lib/lib/private/tools.ts"() {
-    "use strict";
-    __reExport(tools_exports2, __toESM(require_zip()));
-  }
-});
-
 // ../toolkit-lib/lib/api/hotswap/lambda-functions.ts
 async function isHotswappableLambdaFunctionChange(logicalId, change, evaluateCfnTemplate) {
   if (change.newValue.Type === "AWS::Lambda::Version") {
@@ -292749,7 +292839,7 @@ async function evaluateLambdaFunctionProps(hotswappablePropChanges, runtime, eva
         );
     }
   }
-  const configurations = description || environment ? { description, environment } : void 0;
+  const configurations = description !== void 0 || environment ? { description, environment } : void 0;
   return code || configurations ? { code, configurations } : void 0;
 }
 async function waitForLambdasPropertiesUpdateToFinish(lambda, functionName) {
@@ -293457,7 +293547,7 @@ async function applyHotswapOperation(sdk, ioSpan, hotswapOperation) {
   sdk.appendCustomUserAgent(customUserAgent);
   const resourceText = /* @__PURE__ */ __name((r6) => r6.description ?? `${r6.resourceType} '${r6.physicalName ?? r6.logicalId}'`, "resourceText");
   await ioSpan.notify(IO.CDK_TOOLKIT_I5402.msg(
-    hotswapOperation.change.resources.map((r6) => (0, import_util56.format)(`   ${ICON} %s`, import_chalk16.default.bold(resourceText(r6)))).join("\n"),
+    hotswapOperation.change.resources.map((r6) => (0, import_util56.format)(`   ${ICON} %s`, import_chalk18.default.bold(resourceText(r6)))).join("\n"),
     hotswapOperation.change
   ));
   try {
@@ -293472,7 +293562,7 @@ async function applyHotswapOperation(sdk, ioSpan, hotswapOperation) {
     throw e6;
   }
   await ioSpan.notify(IO.CDK_TOOLKIT_I5403.msg(
-    hotswapOperation.change.resources.map((r6) => (0, import_util56.format)(`   ${ICON} %s %s`, import_chalk16.default.bold(resourceText(r6)), import_chalk16.default.green("hotswapped!"))).join("\n"),
+    hotswapOperation.change.resources.map((r6) => (0, import_util56.format)(`   ${ICON} %s %s`, import_chalk18.default.bold(resourceText(r6)), import_chalk18.default.green("hotswapped!"))).join("\n"),
     hotswapOperation.change
   ));
   sdk.removeCustomUserAgent(customUserAgent);
@@ -293501,9 +293591,9 @@ async function logRejectedChanges(ioSpan, rejectedChanges, hotswapMode) {
   }
   const messages = [""];
   if (hotswapMode === "hotswap-only") {
-    messages.push((0, import_util56.format)("%s %s", import_chalk16.default.red("\u26A0\uFE0F"), import_chalk16.default.red("The following non-hotswappable changes were found. To reconcile these using CloudFormation, specify --hotswap-fallback")));
+    messages.push((0, import_util56.format)("%s %s", import_chalk18.default.red("\u26A0\uFE0F"), import_chalk18.default.red("The following non-hotswappable changes were found. To reconcile these using CloudFormation, specify --hotswap-fallback")));
   } else {
-    messages.push((0, import_util56.format)("%s %s", import_chalk16.default.red("\u26A0\uFE0F"), import_chalk16.default.red("The following non-hotswappable changes were found:")));
+    messages.push((0, import_util56.format)("%s %s", import_chalk18.default.red("\u26A0\uFE0F"), import_chalk18.default.red("The following non-hotswappable changes were found:")));
   }
   for (const { change } of rejectedChanges) {
     messages.push("    " + nonHotswappableChangeMessage(change));
@@ -293518,8 +293608,8 @@ function nonHotswappableChangeMessage(change) {
     case "Output":
       return (0, import_util56.format)(
         "output: %s, reason: %s",
-        import_chalk16.default.bold(subject.logicalId),
-        import_chalk16.default.red(reason)
+        import_chalk18.default.bold(subject.logicalId),
+        import_chalk18.default.red(reason)
       );
     case "Resource":
       return nonHotswappableResourceMessage(subject, reason);
@@ -293529,26 +293619,26 @@ function nonHotswappableResourceMessage(subject, reason) {
   if (subject.rejectedProperties?.length) {
     return (0, import_util56.format)(
       "resource: %s, type: %s, rejected changes: %s, reason: %s",
-      import_chalk16.default.bold(subject.logicalId),
-      import_chalk16.default.bold(subject.resourceType),
-      import_chalk16.default.bold(subject.rejectedProperties),
-      import_chalk16.default.red(reason)
+      import_chalk18.default.bold(subject.logicalId),
+      import_chalk18.default.bold(subject.resourceType),
+      import_chalk18.default.bold(subject.rejectedProperties),
+      import_chalk18.default.red(reason)
     );
   }
   return (0, import_util56.format)(
     "resource: %s, type: %s, reason: %s",
-    import_chalk16.default.bold(subject.logicalId),
-    import_chalk16.default.bold(subject.resourceType),
-    import_chalk16.default.red(reason)
+    import_chalk18.default.bold(subject.logicalId),
+    import_chalk18.default.bold(subject.resourceType),
+    import_chalk18.default.red(reason)
   );
 }
-var import_util56, cfn_diff, import_chalk16, pLimit2, RESOURCE_DETECTORS;
+var import_util56, cfn_diff, import_chalk18, pLimit2, RESOURCE_DETECTORS;
 var init_hotswap_deployments = __esm({
   "../toolkit-lib/lib/api/hotswap/hotswap-deployments.ts"() {
     "use strict";
     import_util56 = require("util");
     cfn_diff = __toESM(require_lib10());
-    import_chalk16 = __toESM(require_source());
+    import_chalk18 = __toESM(require_source());
     init_payloads();
     init_util4();
     init_cloudformation2();
@@ -293681,7 +293771,7 @@ async function deployStack(options, ioHelper) {
           `
  ${ICON} %s
 `,
-          import_chalk17.default.bold("hotswap deployment skipped - no changes were detected (use --force to override)")
+          import_chalk19.default.bold("hotswap deployment skipped - no changes were detected (use --force to override)")
         )
       );
     }
@@ -293854,6 +293944,15 @@ async function canSkipDeploy(deployStackOptions, cloudFormationStack, parameterC
     await ioHelper.defaults.debug(`${deployName}: stack is in a failure state`);
     return false;
   }
+  const hotswapCache = await readHotswapTemplateCache(
+    deployStackOptions.stack.assembly.directory,
+    deployStackOptions.stack.stackName,
+    deployStackOptions.stack.template
+  );
+  if (hotswapCache && (0, import_cloudformation_diff.diffTemplate)(hotswapCache.deployedRootTemplate, deployStackOptions.stack.template).differenceCount > 0) {
+    await ioHelper.defaults.debug(`${deployName}: template has changed in relation to last successful hotswap deployment`);
+    return false;
+  }
   return true;
 }
 function compareTags(a6, b6) {
@@ -293880,13 +293979,14 @@ function hasReplacement(report) {
     return a6 === "ReplaceAndDelete" || a6 === "ReplaceAndRetain" || a6 === "ReplaceAndSnapshot";
   });
 }
-var import_node_crypto10, import_node_util5, import_chalk17, FullCloudFormationDeployment;
+var import_node_crypto10, import_node_util5, import_cloudformation_diff, import_chalk19, FullCloudFormationDeployment;
 var init_deploy_stack = __esm({
   "../toolkit-lib/lib/api/deployments/deploy-stack.ts"() {
     "use strict";
     import_node_crypto10 = require("node:crypto");
     import_node_util5 = require("node:util");
-    import_chalk17 = __toESM(require_source());
+    import_cloudformation_diff = __toESM(require_lib10());
+    import_chalk19 = __toESM(require_source());
     init_asset_manifest_builder();
     init_asset_publishing();
     init_assets3();
@@ -293990,10 +294090,12 @@ var init_deploy_stack = __esm({
           };
         }
         if (!execute) {
-          await this.ioHelper.defaults.info((0, import_node_util5.format)(
-            "Changeset %s created and waiting in review for manual execution (--no-execute)",
-            changeSetDescription.ChangeSetId
-          ));
+          if (!this.options.willExecuteChangeSet) {
+            await this.ioHelper.defaults.info((0, import_node_util5.format)(
+              "Changeset %s created and waiting in review for manual execution (--no-execute)",
+              changeSetDescription.ChangeSetId
+            ));
+          }
           return {
             type: "did-deploy-stack",
             noOp: false,
@@ -294061,7 +294163,7 @@ var init_deploy_stack = __esm({
       async createChangeSet(changeSetName, importExistingResources, revertDrift) {
         await this.cleanupOldChangeset(changeSetName);
         await this.ioHelper.defaults.debug(`Attempting to create ChangeSet with name ${changeSetName} to ${this.verb} stack ${this.stackName}`);
-        await this.ioHelper.defaults.info((0, import_node_util5.format)("%s: creating CloudFormation changeset...", import_chalk17.default.bold(this.stackName)));
+        await this.ioHelper.defaults.info((0, import_node_util5.format)("%s: creating CloudFormation changeset...", import_chalk19.default.bold(this.stackName)));
         const changeSet = await this.cfn.createChangeSet({
           StackName: this.stackName,
           ChangeSetName: changeSetName,
@@ -294120,7 +294222,7 @@ var init_deploy_stack = __esm({
         }
       }
       async directDeployment() {
-        await this.ioHelper.defaults.info((0, import_node_util5.format)("%s: %s stack...", import_chalk17.default.bold(this.stackName), this.update ? "updating" : "creating"));
+        await this.ioHelper.defaults.info((0, import_node_util5.format)("%s: %s stack...", import_chalk19.default.bold(this.stackName), this.update ? "updating" : "creating"));
         const startTime = /* @__PURE__ */ new Date();
         if (this.update) {
           await this.updateTerminationProtection();
@@ -294173,19 +294275,16 @@ var init_deploy_stack = __esm({
           pollingInterval: this.options.stackEventPollingInterval
         });
         await monitor.start();
-        let finalState = this.cloudFormationStack;
+        let finalState;
         try {
-          const successStack = await waitForStackDeploy(this.cfn, this.ioHelper, this.stackName, this.options.stackEventPollingInterval);
+          const successStack = await waitForStackDeploy(this.cfn, this.ioHelper, stackArn, this.options.stackEventPollingInterval);
           if (!successStack) {
             throw new DeploymentError("Stack deploy failed (the stack disappeared while we were deploying it)", DeploymentErrorCodes.STACK_DISAPPEARED_ERROR_CODE);
           }
           finalState = successStack;
         } catch (e6) {
           if (ToolkitError.isDeploymentError(e6)) {
-            const diagnosis = await this.diagnoser.diagnoseFromErrorCollection(monitor.errors, finalState.wrapped, true, {
-              rollbackEnabled: this.options.rollback !== false
-            });
-            diagnosis.throwOnError();
+            await this.diagnoseDeploymentFailure(stackArn, monitor.errors);
           }
           throw e6;
         } finally {
@@ -294201,6 +294300,25 @@ var init_deploy_stack = __esm({
           stabilizingResources: monitor.stabilizingResources
         };
       }
+      /**
+       * Throw a `DeploymentError` describing why the deployment failed, if we can establish that
+       *
+       * Returns normally when no cause could be established, leaving the caller's original error as the better
+       * one to report.
+       */
+      async diagnoseDeploymentFailure(stackArn, errors) {
+        const deployedState = await this.cfn.describeStacks({ StackName: stackArn }).then((response) => response.Stacks?.[0]).catch(async (e6) => {
+          await this.ioHelper.defaults.debug(`Could not describe ${stackArn} to diagnose the failure: ${formatErrorMessage(e6)}`);
+          return void 0;
+        });
+        if (!deployedState) {
+          return;
+        }
+        const diagnosis = await this.diagnoser.diagnoseFromErrorCollection(errors, deployedState, true, {
+          rollbackEnabled: this.options.rollback !== false
+        });
+        diagnosis.throwOnError();
+      }
       /**
        * Return the options that are shared between CreateStack, UpdateStack and CreateChangeSet
        */
@@ -294242,13 +294360,13 @@ var init_deploy_stack = __esm({
 function suffixWithErrors2(msg, errors) {
   return errors && errors.length > 0 ? `${msg}: ${errors.join(", ")}` : msg;
 }
-var import_node_crypto11, cdk_assets, import_chalk18, BOOTSTRAP_STACK_VERSION_FOR_ROLLBACK, Deployments, ParallelSafeAssetProgress;
+var import_node_crypto11, cdk_assets, import_chalk20, BOOTSTRAP_STACK_VERSION_FOR_ROLLBACK, Deployments, ParallelSafeAssetProgress;
 var init_deployments = __esm({
   "../toolkit-lib/lib/api/deployments/deployments.ts"() {
     "use strict";
     import_node_crypto11 = require("node:crypto");
     cdk_assets = __toESM(require_lib5());
-    import_chalk18 = __toESM(require_source());
+    import_chalk20 = __toESM(require_source());
     init_asset_manifest_builder();
     init_asset_publishing();
     init_cfn_api();
@@ -294367,6 +294485,7 @@ var init_deployments = __esm({
           envResources: env2.resources,
           tags: options.tags,
           deploymentMethod: options.deploymentMethod,
+          willExecuteChangeSet: options.willExecuteChangeSet,
           forceDeployment: options.forceDeployment,
           parameters: options.parameters,
           usePreviousParameters: options.usePreviousParameters,
@@ -294401,7 +294520,7 @@ var init_deployments = __esm({
         if (result2.type !== "did-deploy-stack") {
           return void 0;
         }
-        if (result2.noOp && options.cleanupOnNoOp) {
+        if (result2.noOp && options.willExecuteChangeSet) {
           const changeSetName = options.deploymentMethod.changeSetName ?? DEFAULT_DEPLOY_CHANGE_SET_NAME;
           await this.cleanupChangeSet(options.stack, changeSetName, options.stackEventPollingInterval);
         }
@@ -294523,7 +294642,7 @@ var init_deployments = __esm({
           let stackErrorMessage = void 0;
           let finalStackState = cloudFormationStack;
           try {
-            const successStack = await stabilizeStack(cfn, this.ioHelper, deployName);
+            const successStack = await stabilizeStack(cfn, this.ioHelper, stackArn);
             if (!successStack) {
               throw new ToolkitError("StackDisappeared", "Stack deploy failed (the stack disappeared while we were rolling it back)");
             }
@@ -294642,18 +294761,24 @@ var init_deployments = __esm({
         }
       }
       cachedPublisher(assetManifest, env2, stackName) {
-        const existing = this.publisherCache.get(assetManifest);
+        const envKey = `${env2.account}:${env2.region}`;
+        let byEnv = this.publisherCache.get(assetManifest);
+        if (!byEnv) {
+          byEnv = /* @__PURE__ */ new Map();
+          this.publisherCache.set(assetManifest, byEnv);
+        }
+        const existing = byEnv.get(envKey);
         if (existing) {
           return existing;
         }
-        const prefix = stackName ? `${import_chalk18.default.bold(stackName)}: ` : "";
+        const prefix = stackName ? `${import_chalk20.default.bold(stackName)}: ` : "";
         const publisher = new cdk_assets.AssetPublishing(assetManifest, {
           // The AssetPublishing class takes care of role assuming etc, so it's okay to
           // give it a direct `SdkProvider`.
           aws: new PublishingAws(this.assetSdkProvider, env2),
           progressListener: new ParallelSafeAssetProgress(prefix, this.ioHelper)
         });
-        this.publisherCache.set(assetManifest, publisher);
+        byEnv.set(envKey, publisher);
         return publisher;
       }
     };
@@ -294785,13 +294910,13 @@ function obscureDiff(diff) {
     });
   }
 }
-var import_node_util6, import_cloudformation_diff, import_chalk19, DiffFormatter;
+var import_node_util6, import_cloudformation_diff2, import_chalk21, DiffFormatter;
 var init_diff_formatter = __esm({
   "../toolkit-lib/lib/api/diff/diff-formatter.ts"() {
     "use strict";
     import_node_util6 = require("node:util");
-    import_cloudformation_diff = __toESM(require_lib10());
-    import_chalk19 = __toESM(require_source());
+    import_cloudformation_diff2 = __toESM(require_lib10());
+    import_chalk21 = __toESM(require_source());
     init_payloads();
     init_logical_id_map();
     init_streams();
@@ -294827,7 +294952,7 @@ var init_diff_formatter = __esm({
        */
       computeDiff(stackName, oldTemplate, newTemplate, changeSet, mappings) {
         if (!this.cache.has(stackName)) {
-          const templateDiff = (0, import_cloudformation_diff.fullDiff)(oldTemplate, newTemplate, changeSet, this.isImport);
+          const templateDiff = (0, import_cloudformation_diff2.fullDiff)(oldTemplate, newTemplate, changeSet, this.isImport);
           const setMove = /* @__PURE__ */ __name((change, direction, location) => {
             if (location != null) {
               const [sourceStackName, sourceLogicalId] = location.split(".");
@@ -294873,7 +294998,7 @@ var init_diff_formatter = __esm({
         let filteredChangesCount = 0;
         try {
           if (stackName && (!options.quiet || !diff.isEmpty)) {
-            stream.write((0, import_node_util6.format)(`Stack ${import_chalk19.default.bold(stackName)}
+            stream.write((0, import_node_util6.format)(`Stack ${import_chalk21.default.bold(stackName)}
 `));
           }
           if (!options.quiet && this.isImport) {
@@ -294881,8 +295006,8 @@ var init_diff_formatter = __esm({
           }
           let activeDiff = diff;
           if (diff.differenceCount && !options.strict) {
-            const mangledNewTemplate = JSON.parse((0, import_cloudformation_diff.mangleLikeCloudFormation)(JSON.stringify(newTemplate)));
-            const mangledDiff = (0, import_cloudformation_diff.fullDiff)(oldTemplate, mangledNewTemplate, changeSet);
+            const mangledNewTemplate = JSON.parse((0, import_cloudformation_diff2.mangleLikeCloudFormation)(JSON.stringify(newTemplate)));
+            const mangledDiff = (0, import_cloudformation_diff2.fullDiff)(oldTemplate, mangledNewTemplate, changeSet);
             filteredChangesCount = Math.max(0, diff.differenceCount - mangledDiff.differenceCount);
             if (filteredChangesCount > 0) {
               activeDiff = mangledDiff;
@@ -294895,18 +295020,18 @@ var init_diff_formatter = __esm({
           const metadataWasFiltered = diffWasNonEmpty && activeDiff.isEmpty;
           if (!activeDiff.isEmpty) {
             numStacksWithChanges++;
-            (0, import_cloudformation_diff.formatDifferences)(stream, activeDiff, {
+            (0, import_cloudformation_diff2.formatDifferences)(stream, activeDiff, {
               ...logicalIdMapFromTemplate(oldTemplate),
               ...logicalIdMapFromTemplate(newTemplate),
               ...logicalIdMap
             }, options.contextLines);
           } else if (!options.quiet) {
-            const hint = metadataWasFiltered ? import_chalk19.default.grey(" (CDK metadata changes were hidden, run cdk diff --strict to show)") : "";
-            stream.write(`${import_chalk19.default.green("There were no differences")}${hint}
+            const hint = metadataWasFiltered ? import_chalk21.default.grey(" (CDK metadata changes were hidden, run cdk diff --strict to show)") : "";
+            stream.write(`${import_chalk21.default.green("There were no differences")}${hint}
 `);
           }
           if (filteredChangesCount > 0) {
-            stream.write(import_chalk19.default.yellow(`Omitted ${filteredChangesCount} changes because they are likely mangled non-ASCII characters. Use --strict to print them.
+            stream.write(import_chalk21.default.yellow(`Omitted ${filteredChangesCount} changes because they are likely mangled non-ASCII characters. Use --strict to print them.
 `));
           }
         } finally {
@@ -294948,11 +295073,11 @@ var init_diff_formatter = __esm({
         const permissionChangeType = permissionTypeFromDiff(diff);
         const stream = new StringWriteStream();
         if (!options.quiet || permissionChangeType !== "none" /* NONE */) {
-          stream.write((0, import_node_util6.format)(`Stack ${import_chalk19.default.bold(stackName)}
+          stream.write((0, import_node_util6.format)(`Stack ${import_chalk21.default.bold(stackName)}
 `));
         }
         try {
-          (0, import_cloudformation_diff.formatSecurityChanges)(stream, diff, {
+          (0, import_cloudformation_diff2.formatSecurityChanges)(stream, diff, {
             ...logicalIdMapFromTemplate(newTemplate),
             ...logicalIdMap
           });
@@ -294961,7 +295086,7 @@ var init_diff_formatter = __esm({
         }
         let formattedDiff = stream.toString();
         if (!options.quiet && permissionChangeType === "none" /* NONE */) {
-          formattedDiff += import_chalk19.default.green("There were no security-related changes (limitations: https://github.com/aws/aws-cdk/issues/1299)\n");
+          formattedDiff += import_chalk21.default.green("There were no security-related changes (limitations: https://github.com/aws/aws-cdk/issues/1299)\n");
         }
         let numStacksWithChanges = permissionChangeType !== "none" /* NONE */ ? 1 : 0;
         let escalatedPermissionType = permissionChangeType;
@@ -295017,13 +295142,13 @@ function removeNonImportResources(stack) {
   delete template.Outputs;
   return template;
 }
-var import_util60, cfnDiff, import_chalk20, fs34, ResourceImporter;
+var import_util60, cfnDiff, import_chalk22, fs34, ResourceImporter;
 var init_importer = __esm({
   "../toolkit-lib/lib/api/resource-import/importer.ts"() {
     "use strict";
     import_util60 = require("util");
     cfnDiff = __toESM(require_lib10());
-    import_chalk20 = __toESM(require_source());
+    import_chalk22 = __toESM(require_source());
     fs34 = __toESM(require_lib4());
     init_toolkit_error();
     init_deployments2();
@@ -295085,12 +295210,12 @@ var init_importer = __esm({
           const descr = this.describeResource(resource.logicalId);
           const idProps = remaining[resource.logicalId];
           if (idProps) {
-            await this.ioHelper.defaults.info((0, import_util60.format)("%s: importing using %s", import_chalk20.default.blue(descr), import_chalk20.default.blue(fmtdict(idProps))));
+            await this.ioHelper.defaults.info((0, import_util60.format)("%s: importing using %s", import_chalk22.default.blue(descr), import_chalk22.default.blue(fmtdict(idProps))));
             ret.importResources.push(resource);
             ret.resourceMap[resource.logicalId] = idProps;
             delete remaining[resource.logicalId];
           } else {
-            await this.ioHelper.defaults.info((0, import_util60.format)("%s: skipping", import_chalk20.default.blue(descr)));
+            await this.ioHelper.defaults.info((0, import_util60.format)("%s: skipping", import_chalk22.default.blue(descr)));
           }
         }
         const unknown = Object.keys(remaining);
@@ -295103,7 +295228,7 @@ var init_importer = __esm({
        * Based on the provided resource mapping, prepare CFN structures for import (template,
        * ResourcesToImport structure) and perform the import operation (CloudFormation deployment)
        *
-       * @param importMap - Mapping from CDK construct tree path to physical resource import identifiers
+       * @param importMap - Mapping from CloudFormation logical ID to physical resource import identifiers
        * @param options - Options to pass to CloudFormation deploy operation
        */
       async importResourcesFromMap(importMap, options = {}) {
@@ -295134,9 +295259,9 @@ var init_importer = __esm({
           });
           assertIsSuccessfulDeployStackResult(result2);
           const message2 = result2.noOp ? "\u2705  %s (no changes)" : "\u2705  %s";
-          await this.ioHelper.defaults.info("\n" + import_chalk20.default.green((0, import_util60.format)(message2, this.stack.displayName)));
+          await this.ioHelper.defaults.info("\n" + import_chalk22.default.green((0, import_util60.format)(message2, this.stack.displayName)));
         } catch (e6) {
-          await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0, import_util60.format)("\n \u274C  %s failed: %s", import_chalk20.default.bold(this.stack.displayName), e6), { error: e6 }));
+          await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0, import_util60.format)("\n \u274C  %s failed: %s", import_chalk22.default.bold(this.stack.displayName), e6), { error: e6 }));
           throw e6;
         }
       }
@@ -295240,7 +295365,7 @@ var init_importer = __esm({
         for (const satisfiedPropSet of satisfiedPropSets) {
           const candidateProps = Object.fromEntries(satisfiedPropSet.map((p3) => [p3, resourceProps[p3]]));
           const displayCandidateProps = fmtdict(candidateProps);
-          const importTheResource = await this.ioHelper.requestResponse(IO.CDK_TOOLKIT_I3100.req(`${import_chalk20.default.blue(resourceName)} (${resourceType}): import with ${import_chalk20.default.yellow(displayCandidateProps)}`, {
+          const importTheResource = await this.ioHelper.requestResponse(IO.CDK_TOOLKIT_I3100.req(`${import_chalk22.default.blue(resourceName)} (${resourceType}): import with ${import_chalk22.default.yellow(displayCandidateProps)}`, {
             resource: {
               type: resourceType,
               props: candidateProps,
@@ -295252,13 +295377,13 @@ var init_importer = __esm({
           }
         }
         if (satisfiedPropSets.length > 0) {
-          await this.ioHelper.defaults.info(import_chalk20.default.grey(`Skipping import of ${resourceName}`));
+          await this.ioHelper.defaults.info(import_chalk22.default.grey(`Skipping import of ${resourceName}`));
           return void 0;
         }
-        const prefix = `${import_chalk20.default.blue(resourceName)} (${resourceType})`;
+        const prefix = `${import_chalk22.default.blue(resourceName)} (${resourceType})`;
         const promptPattern = `${prefix}: enter %s`;
         if (idPropSets.length > 1) {
-          const preamble = `${prefix}: enter one of ${idPropSets.map((x) => import_chalk20.default.blue(x.join("+"))).join(", ")} to import (leave all empty to skip)`;
+          const preamble = `${prefix}: enter one of ${idPropSets.map((x) => import_chalk22.default.blue(x.join("+"))).join(", ")} to import (leave all empty to skip)`;
           await this.ioHelper.defaults.info(preamble);
         }
         for (const idProps of idPropSets) {
@@ -295266,7 +295391,7 @@ var init_importer = __esm({
           for (const idProp of idProps) {
             const defaultValue = resourceProps[idProp] ?? "";
             const response = await this.ioHelper.requestResponse(IO.CDK_TOOLKIT_I3110.req(
-              (0, import_util60.format)(promptPattern, import_chalk20.default.blue(idProp)),
+              (0, import_util60.format)(promptPattern, import_chalk22.default.blue(idProp)),
               {
                 resource: {
                   name: resourceName,
@@ -295287,7 +295412,7 @@ var init_importer = __esm({
             return input;
           }
         }
-        await this.ioHelper.defaults.info(import_chalk20.default.grey(`Skipping import of ${resourceName}`));
+        await this.ioHelper.defaults.info(import_chalk22.default.grey(`Skipping import of ${resourceName}`));
         return void 0;
       }
       /**
@@ -295324,11 +295449,11 @@ var init_importer = __esm({
 });
 
 // ../toolkit-lib/lib/api/resource-import/migrator.ts
-var import_chalk21, fs35, ResourceMigrator;
+var import_chalk23, fs35, ResourceMigrator;
 var init_migrator = __esm({
   "../toolkit-lib/lib/api/resource-import/migrator.ts"() {
     "use strict";
-    import_chalk21 = __toESM(require_source());
+    import_chalk23 = __toESM(require_source());
     fs35 = __toESM(require_lib4());
     init_importer();
     init_util4();
@@ -295357,11 +295482,11 @@ var init_migrator = __esm({
         });
         const resourcesToImport = await this.tryGetResources(await migrateDeployment.resolveEnvironment());
         if (resourcesToImport) {
-          await this.ioHelper.defaults.info(`${import_chalk21.default.bold(stack.displayName)}: creating stack for resource migration...`);
-          await this.ioHelper.defaults.info(`${import_chalk21.default.bold(stack.displayName)}: importing resources into stack...`);
+          await this.ioHelper.defaults.info(`${import_chalk23.default.bold(stack.displayName)}: creating stack for resource migration...`);
+          await this.ioHelper.defaults.info(`${import_chalk23.default.bold(stack.displayName)}: importing resources into stack...`);
           await this.performResourceMigration(migrateDeployment, resourcesToImport, options);
           fs35.rmSync("migrate.json");
-          await this.ioHelper.defaults.info(`${import_chalk21.default.bold(stack.displayName)}: applying CDKMetadata and Outputs to stack (if applicable)...`);
+          await this.ioHelper.defaults.info(`${import_chalk23.default.bold(stack.displayName)}: applying CDKMetadata and Outputs to stack (if applicable)...`);
         }
       }
       /**
@@ -295703,9 +295828,8 @@ function stripConstructPath(resource) {
   if (resource?.Metadata?.["aws:cdk:path"] == null) {
     return resource;
   }
-  const copy = JSON.parse(JSON.stringify(resource));
-  delete copy.Metadata["aws:cdk:path"];
-  return copy;
+  const { "aws:cdk:path": _, ...metadata } = resource.Metadata;
+  return { ...resource, Metadata: metadata };
 }
 var crypto3;
 var init_digest = __esm({
@@ -296055,13 +296179,13 @@ async function listStacks(sdkProvider, environment) {
 }
 function formatEnvironmentSectionHeader2(environment) {
   const env2 = `aws://${environment.account}/${environment.region}`;
-  return formatToStream((stream) => (0, import_cloudformation_diff2.formatEnvironmentSectionHeader)(stream, env2));
+  return formatToStream((stream) => (0, import_cloudformation_diff3.formatEnvironmentSectionHeader)(stream, env2));
 }
 function formatTypedMappings2(mappings) {
-  return formatToStream((stream) => (0, import_cloudformation_diff2.formatTypedMappings)(stream, mappings));
+  return formatToStream((stream) => (0, import_cloudformation_diff3.formatTypedMappings)(stream, mappings));
 }
 function formatAmbiguousMappings2(paths) {
-  return formatToStream((stream) => (0, import_cloudformation_diff2.formatAmbiguousMappings)(stream, paths));
+  return formatToStream((stream) => (0, import_cloudformation_diff3.formatAmbiguousMappings)(stream, paths));
 }
 function formatToStream(cb) {
   const stream = new StringWriteStream();
@@ -296096,11 +296220,11 @@ async function groupStacks(sdkProvider, localStacks, additionalStackNames) {
   }
   return groups;
 }
-var import_cloudformation_diff2;
+var import_cloudformation_diff3;
 var init_refactoring = __esm({
   "../toolkit-lib/lib/api/refactoring/index.ts"() {
     "use strict";
-    import_cloudformation_diff2 = __toESM(require_lib10());
+    import_cloudformation_diff3 = __toESM(require_lib10());
     init_util4();
     init_plugin2();
     init_streams();
@@ -297028,11 +297152,11 @@ var init_bootstrap3 = __esm({
 });
 
 // ../toolkit-lib/lib/api/garbage-collection/progress-printer.ts
-var import_chalk22;
+var import_chalk24;
 var init_progress_printer = __esm({
   "../toolkit-lib/lib/api/garbage-collection/progress-printer.ts"() {
     "use strict";
-    import_chalk22 = __toESM(require_source());
+    import_chalk24 = __toESM(require_source());
     init_toolkit_error();
   }
 });
@@ -297046,11 +297170,12 @@ var init_stack_refresh = __esm({
 });
 
 // ../toolkit-lib/lib/api/garbage-collection/garbage-collector.ts
-var import_chalk23, pLimit4, DAY;
+var import_chalk25, pLimit4, DAY;
 var init_garbage_collector = __esm({
   "../toolkit-lib/lib/api/garbage-collection/garbage-collector.ts"() {
     "use strict";
-    import_chalk23 = __toESM(require_source());
+    import_chalk25 = __toESM(require_source());
+    init_util5();
     init_toolkit_info();
     init_progress_printer();
     init_stack_refresh();
@@ -297114,13 +297239,13 @@ var init_io = __esm({
 });
 
 // ../toolkit-lib/lib/api/logs-monitor/logs-monitor.ts
-var import_node_crypto13, util10, import_chalk24, CloudWatchLogEventMonitor;
+var import_node_crypto13, util10, import_chalk26, CloudWatchLogEventMonitor;
 var init_logs_monitor2 = __esm({
   "../toolkit-lib/lib/api/logs-monitor/logs-monitor.ts"() {
     "use strict";
     import_node_crypto13 = require("node:crypto");
     util10 = __toESM(require("node:util"));
-    import_chalk24 = __toESM(require_source());
+    import_chalk26 = __toESM(require_source());
     init_util4();
     init_private();
     CloudWatchLogEventMonitor = class {
@@ -297251,8 +297376,8 @@ var init_logs_monitor2 = __esm({
         await this.ioHelper.notify(IO.CDK_TOOLKIT_I5033.msg(
           util10.format(
             "[%s] %s %s",
-            import_chalk24.default.blue(event.logGroupName),
-            import_chalk24.default.yellow(event.timestamp.toLocaleTimeString()),
+            import_chalk26.default.blue(event.logGroupName),
+            import_chalk26.default.yellow(event.timestamp.toLocaleTimeString()),
             event.message.trim()
           ),
           event
@@ -298053,14 +298178,14 @@ var init_tags2 = __esm({
 });
 
 // ../toolkit-lib/lib/api/drift/drift-formatter.ts
-var import_node_util7, import_cloudformation_diff3, import_client_cloudformation7, import_chalk25, DriftFormatter, ADDITION3, CONTEXT2, UPDATE3, REMOVAL3;
+var import_node_util7, import_cloudformation_diff4, import_client_cloudformation7, import_chalk27, DriftFormatter, ADDITION3, CONTEXT2, UPDATE3, REMOVAL3;
 var init_drift_formatter = __esm({
   "../toolkit-lib/lib/api/drift/drift-formatter.ts"() {
     "use strict";
     import_node_util7 = require("node:util");
-    import_cloudformation_diff3 = __toESM(require_lib10());
+    import_cloudformation_diff4 = __toESM(require_lib10());
     import_client_cloudformation7 = __toESM(require_dist_cjs28());
-    import_chalk25 = __toESM(require_source());
+    import_chalk27 = __toESM(require_source());
     init_logical_id_map();
     DriftFormatter = class {
       static {
@@ -298083,30 +298208,43 @@ var init_drift_formatter = __esm({
           this.allStackResources.set(id, resource.Type);
         });
       }
+      /**
+       * Resources that were not checked for drift: either CloudFormation returned
+       * no drift record for them at all, or it returned one with an UNKNOWN
+       * status (e.g. due to missing permissions or lack of drift-detection
+       * support for that resource type).
+       */
+      getUncheckedResources() {
+        const drifts = this.resourceDriftResults;
+        return Array.from(this.allStackResources.keys()).filter((logicalId) => {
+          const drift = drifts.find((d6) => d6.LogicalResourceId === logicalId);
+          return !drift || drift.StackResourceDriftStatus === import_client_cloudformation7.StackResourceDriftStatus.UNKNOWN;
+        });
+      }
       /**
        * Format the stack drift detection results
        */
       formatStackDrift() {
         const formatterOutput = this.formatStackDriftChanges(buildLogicalToPathMap(this.stack).toPath);
         const actualDrifts = this.resourceDriftResults.filter((d6) => (d6.StackResourceDriftStatus === "MODIFIED" || d6.StackResourceDriftStatus === "DELETED") && d6.ResourceType !== "AWS::CDK::Metadata");
-        const stackHeader = (0, import_node_util7.format)(`Stack ${import_chalk25.default.bold(this.stackName)}
+        const stackHeader = (0, import_node_util7.format)(`Stack ${import_chalk27.default.bold(this.stackName)}
 `);
         if (actualDrifts.length === 0) {
-          const finalResult2 = import_chalk25.default.green("No drift detected\n");
+          const finalResult2 = import_chalk27.default.green("No drift detected\n");
           return {
             numResourcesWithDrift: 0,
-            numResourcesUnchecked: this.allStackResources.size - this.resourceDriftResults.length,
+            numResourcesUnchecked: this.getUncheckedResources().length,
             stackHeader,
             unchecked: formatterOutput.unchecked,
             summary: finalResult2
           };
         }
-        const finalResult = import_chalk25.default.yellow(`
+        const finalResult = import_chalk27.default.yellow(`
 ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualDrifts.length === 1 ? "has" : "have"} drifted from their expected configuration
 `);
         return {
           numResourcesWithDrift: actualDrifts.length,
-          numResourcesUnchecked: this.allStackResources.size - this.resourceDriftResults.length,
+          numResourcesUnchecked: this.getUncheckedResources().length,
           stackHeader,
           unchanged: formatterOutput.unchanged,
           unchecked: formatterOutput.unchecked,
@@ -298134,20 +298272,17 @@ ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualD
           unchanged = this.printSectionHeader("Resources In Sync");
           for (const drift of unchangedResources) {
             if (!drift.LogicalResourceId || !drift.ResourceType) continue;
-            unchanged += `${CONTEXT2} ${import_chalk25.default.cyan(drift.ResourceType)} ${this.formatLogicalId(logicalToPathMap, drift.LogicalResourceId)}
+            unchanged += `${CONTEXT2} ${import_chalk27.default.cyan(drift.ResourceType)} ${this.formatLogicalId(logicalToPathMap, drift.LogicalResourceId)}
 `;
           }
           unchanged += this.printSectionFooter();
         }
-        const uncheckedResources = Array.from(this.allStackResources.keys()).filter((logicalId) => {
-          const drift = drifts.find((d6) => d6.LogicalResourceId === logicalId);
-          return !drift || drift.StackResourceDriftStatus === import_client_cloudformation7.StackResourceDriftStatus.UNKNOWN;
-        });
+        const uncheckedResources = this.getUncheckedResources();
         if (uncheckedResources.length > 0) {
           unchecked = this.printSectionHeader("Unchecked Resources");
           for (const logicalId of uncheckedResources) {
             const resourceType = this.allStackResources.get(logicalId);
-            unchecked += `${CONTEXT2} ${import_chalk25.default.cyan(resourceType)} ${this.formatLogicalId(logicalToPathMap, logicalId)}
+            unchecked += `${CONTEXT2} ${import_chalk27.default.cyan(resourceType)} ${this.formatLogicalId(logicalToPathMap, logicalId)}
 `;
           }
           unchecked += this.printSectionFooter();
@@ -298157,14 +298292,14 @@ ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualD
           modified = this.printSectionHeader("Modified Resources");
           for (const drift of modifiedResources) {
             if (!drift.LogicalResourceId || !drift.ResourceType) continue;
-            modified += `${UPDATE3} ${import_chalk25.default.cyan(drift.ResourceType)} ${this.formatLogicalId(logicalToPathMap, drift.LogicalResourceId)}
+            modified += `${UPDATE3} ${import_chalk27.default.cyan(drift.ResourceType)} ${this.formatLogicalId(logicalToPathMap, drift.LogicalResourceId)}
 `;
             if (drift.PropertyDifferences) {
               const propDiffs = drift.PropertyDifferences;
               for (let i6 = 0; i6 < propDiffs.length; i6++) {
                 const diff = propDiffs[i6];
                 if (!diff.PropertyPath) continue;
-                const difference2 = new import_cloudformation_diff3.Difference(diff.ExpectedValue, diff.ActualValue);
+                const difference2 = new import_cloudformation_diff4.Difference(diff.ExpectedValue, diff.ActualValue);
                 modified += this.formatTreeDiff(diff.PropertyPath, difference2, i6 === propDiffs.length - 1);
               }
             }
@@ -298176,7 +298311,7 @@ ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualD
           deleted = this.printSectionHeader("Deleted Resources");
           for (const drift of deletedResources) {
             if (!drift.LogicalResourceId || !drift.ResourceType) continue;
-            deleted += `${REMOVAL3} ${import_chalk25.default.cyan(drift.ResourceType)} ${this.formatLogicalId(logicalToPathMap, drift.LogicalResourceId)}
+            deleted += `${REMOVAL3} ${import_chalk27.default.cyan(drift.ResourceType)} ${this.formatLogicalId(logicalToPathMap, drift.LogicalResourceId)}
 `;
           }
           deleted += this.printSectionFooter();
@@ -298201,10 +298336,10 @@ ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualD
           }
           normalizedPath = parts.join("/");
         }
-        return `${normalizedPath} ${import_chalk25.default.gray(logicalId)}`;
+        return `${normalizedPath} ${import_chalk27.default.gray(logicalId)}`;
       }
       printSectionHeader(title) {
-        return `${import_chalk25.default.underline(import_chalk25.default.bold(title))}
+        return `${import_chalk27.default.underline(import_chalk27.default.bold(title))}
 `;
       }
       printSectionFooter() {
@@ -298218,16 +298353,16 @@ ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualD
           propertyPath
         );
         if (difference2.isUpdate) {
-          result2 += (0, import_node_util7.format)("     \u251C\u2500 %s %s\n", REMOVAL3, import_chalk25.default.red(difference2.oldValue));
-          result2 += (0, import_node_util7.format)("     \u2514\u2500 %s %s\n", ADDITION3, import_chalk25.default.green(difference2.newValue));
+          result2 += (0, import_node_util7.format)("     \u251C\u2500 %s %s\n", REMOVAL3, import_chalk27.default.red(difference2.oldValue));
+          result2 += (0, import_node_util7.format)("     \u2514\u2500 %s %s\n", ADDITION3, import_chalk27.default.green(difference2.newValue));
         }
         return result2;
       }
     };
-    ADDITION3 = import_chalk25.default.green("[+]");
-    CONTEXT2 = import_chalk25.default.grey("[ ]");
-    UPDATE3 = import_chalk25.default.yellow("[~]");
-    REMOVAL3 = import_chalk25.default.red("[-]");
+    ADDITION3 = import_chalk27.default.green("[+]");
+    CONTEXT2 = import_chalk27.default.grey("[ ]");
+    UPDATE3 = import_chalk27.default.yellow("[~]");
+    REMOVAL3 = import_chalk27.default.red("[-]");
   }
 });
 
@@ -298784,7 +298919,7 @@ async function generateStackDefinitions(mappings, deployedStacks, localStacks, e
 Run the following command in order to setup an S3 bucket in this environment, and then re-refactor:
 
 `,
-        import_chalk26.default.blue(`	$ cdk bootstrap ${environment.name}
+        import_chalk28.default.blue(`	$ cdk bootstrap ${environment.name}
 `)
       )
     );
@@ -298818,12 +298953,12 @@ Run the following command in order to setup an S3 bucket in this environment, an
   }
   return stackDefinitions;
 }
-var util11, import_chalk26, deepEqual4, LARGE_TEMPLATE_SIZE_KB2, LARGE_TEMPLATE_SIZE_BYTES;
+var util11, import_chalk28, deepEqual4, LARGE_TEMPLATE_SIZE_KB2, LARGE_TEMPLATE_SIZE_BYTES;
 var init_stack_definitions = __esm({
   "../toolkit-lib/lib/api/refactoring/stack-definitions.ts"() {
     "use strict";
     util11 = __toESM(require("node:util"));
-    import_chalk26 = __toESM(require_source());
+    import_chalk28 = __toESM(require_source());
     init_toolkit_error();
     init_util4();
     init_environment2();
@@ -298872,7 +299007,7 @@ function formatValidationReports(fileRoot, reports) {
   });
   return [
     ...pluginFailures.map(formatPluginFailure),
-    ...successfullyExecutedPlugins.flatMap((r6) => r6.preamble ? [`${import_chalk27.default.underline(sanitize(r6.pluginName))}: ${sanitize(r6.preamble)}`] : []),
+    ...successfullyExecutedPlugins.flatMap((r6) => r6.preamble ? [`${import_chalk29.default.underline(sanitize(r6.pluginName))}: ${sanitize(r6.preamble)}`] : []),
     ...violations.map((v) => formatViolationBlock(fileRoot, v))
   ];
 }
@@ -298907,14 +299042,14 @@ function formatViolationBlock(fileRoot, v) {
   const lines = [];
   const location = sourceLocation(fileRoot, v.construct.stackTraces);
   if (location) {
-    lines.push(import_chalk27.default.underline(sanitize(location)));
+    lines.push(import_chalk29.default.underline(sanitize(location)));
   }
   const ruleName = v.ruleName.includes("::") ? v.ruleName : `${v.pluginName}::${v.ruleName}`;
   const namespace = ruleName.split("::")[0];
   lines.push([
-    import_chalk27.default.bold(getSeverityColor(v.severity)(sanitize(v.severity))),
-    import_chalk27.default.bold(stripAckTag(sanitize(v.description))),
-    import_chalk27.default.grey(`(${sanitize(namespace)})`)
+    import_chalk29.default.bold(getSeverityColor(v.severity)(sanitize(v.severity))),
+    import_chalk29.default.bold(stripAckTag(sanitize(v.description))),
+    import_chalk29.default.grey(`(${sanitize(namespace)})`)
   ].join(" "));
   const constructInfo = formatConstructInfo(fileRoot, v.construct);
   lines.push(`   ${constructInfo}`);
@@ -298923,26 +299058,26 @@ function formatViolationBlock(fileRoot, v) {
   }
   const ackId = `${sanitize(ruleName)}`.replace(/ /g, "-");
   if (isSuppressibleViolation(v)) {
-    lines.push(`   ${import_chalk27.default.grey(`Acknowledge with '${ackId}'`)}`);
+    lines.push(`   ${import_chalk29.default.grey(`Acknowledge with '${ackId}'`)}`);
   } else {
-    lines.push(`   ${import_chalk27.default.grey(`Rule ${sanitize(ackId)}`)}`);
+    lines.push(`   ${import_chalk29.default.grey(`Rule ${sanitize(ackId)}`)}`);
   }
   return lines.join("\n");
 }
 function getSeverityColor(severity) {
   switch (severity.toLowerCase()) {
     case "fatal":
-      return import_chalk27.default.red;
+      return import_chalk29.default.red;
     case "error":
-      return import_chalk27.default.ansi256(208);
+      return import_chalk29.default.ansi256(208);
     case "warning":
-      return import_chalk27.default.yellow;
+      return import_chalk29.default.yellow;
     default:
-      return import_chalk27.default.blue;
+      return import_chalk29.default.blue;
   }
 }
 function formatPluginFailure(f6) {
-  return `${import_chalk27.default.ansi256(208)("ERROR")} ${sanitize(f6.error)}`;
+  return `${import_chalk29.default.ansi256(208)("ERROR")} ${sanitize(f6.error)}`;
 }
 function formatConstructInfo(fileRoot, construct) {
   const parts = [];
@@ -298955,11 +299090,11 @@ function formatConstructInfo(fileRoot, construct) {
       parts.push(humanFriendlyFilename(fileRoot, sanitize(construct.cloudFormationResource.templatePath)));
     }
     if (logicalId) {
-      parts.push(import_chalk27.default.bold(logicalId));
+      parts.push(import_chalk29.default.bold(logicalId));
     }
   }
   if (construct.constructFqn) {
-    parts.push(import_chalk27.default.grey(sanitize(construct.constructFqn)));
+    parts.push(import_chalk29.default.grey(sanitize(construct.constructFqn)));
   }
   return parts.join(" ");
 }
@@ -299003,12 +299138,12 @@ function isSuppressibleViolation(violation) {
   const isErrorAnnotation = violation.ruleMetadata?.["cdk:annotation"] && violation.severity?.toLowerCase() === "error";
   return !isFatal && !isErrorAnnotation;
 }
-var path35, import_chalk27, CONTROL_CHARS, SEVERITY_ORDER;
+var path35, import_chalk29, CONTROL_CHARS, SEVERITY_ORDER;
 var init_validate_formatting = __esm({
   "../toolkit-lib/lib/api/validate/validate-formatting.ts"() {
     "use strict";
     path35 = __toESM(require("node:path"));
-    import_chalk27 = __toESM(require_source());
+    import_chalk29 = __toESM(require_source());
     init_private();
     __name(hostMessageFromValidation, "hostMessageFromValidation");
     __name(formatValidateResult, "formatValidateResult");
@@ -299229,7 +299364,7 @@ async function synthAndMeasure(ioHelper, cx, selectStacks) {
 function zeroTime() {
   return { asMs: 0, asSec: 0 };
 }
-var import_dispose_polyfill7, import_node_crypto14, path37, cxapi10, import_cloud_assembly_schema10, import_chalk28, fs39, FILE_EVENTS, Toolkit;
+var import_dispose_polyfill7, import_node_crypto14, path37, cxapi10, import_cloud_assembly_schema10, import_chalk30, fs39, FILE_EVENTS, Toolkit;
 var init_toolkit = __esm({
   "../toolkit-lib/lib/toolkit/toolkit.ts"() {
     "use strict";
@@ -299238,7 +299373,7 @@ var init_toolkit = __esm({
     path37 = __toESM(require("node:path"));
     cxapi10 = __toESM(require_lib3());
     import_cloud_assembly_schema10 = __toESM(require_lib2());
-    import_chalk28 = __toESM(require_source());
+    import_chalk30 = __toESM(require_source());
     init_esm2();
     init_handler();
     fs39 = __toESM(require_lib4());
@@ -299376,7 +299511,7 @@ var init_toolkit = __esm({
         const sdkProvider = await this.sdkProvider("bootstrap");
         const limit = pLimit3(20);
         await Promise.all(bootstrapEnvironments.map((environment, currentIdx) => limit(async () => {
-          const bootstrapSpan = await ioHelper.span(SPAN.BOOTSTRAP_SINGLE).begin(`${import_chalk28.default.bold(environment.name)}: bootstrapping...`, {
+          const bootstrapSpan = await ioHelper.span(SPAN.BOOTSTRAP_SINGLE).begin(`${import_chalk30.default.bold(environment.name)}: bootstrapping...`, {
             total: bootstrapEnvironments.length,
             current: currentIdx + 1,
             environment
@@ -299394,7 +299529,7 @@ var init_toolkit = __esm({
               }
             );
             const message2 = bootstrapResult.noOp ? `\u2705  ${environment.name} (no changes)` : `\u2705  ${environment.name}`;
-            await ioHelper.notify(IO.CDK_TOOLKIT_I9900.msg(import_chalk28.default.green("\n" + message2), { environment }));
+            await ioHelper.notify(IO.CDK_TOOLKIT_I9900.msg(import_chalk30.default.green("\n" + message2), { environment }));
             if (options.express) {
               const warning3 = formatExpressStabilizationWarning(bootstrapResult.stabilizingResources, "bootstrap");
               if (warning3) {
@@ -299410,7 +299545,7 @@ var init_toolkit = __esm({
             results.push(result2);
           } catch (e6) {
             await ioHelper.notify(IO.CDK_TOOLKIT_E9900.msg(`
- \u274C  ${import_chalk28.default.bold(environment.name)} failed: ${formatErrorMessage(e6)}`, { error: e6 }));
+ \u274C  ${import_chalk30.default.bold(environment.name)} failed: ${formatErrorMessage(e6)}`, { error: e6 }));
             throw e6;
           }
         })));
@@ -299433,7 +299568,7 @@ var init_toolkit = __esm({
           const stacks = await assembly.value.selectStacksV2(stacksOpt(options));
           const autoValidateStacks = options.validateStacks ? [assembly.value.selectStacksForValidation()] : [];
           await throwIfValidationFailures(assembly.value, stacks.concat(...autoValidateStacks), this.assemblyFailureAt, ioHelper);
-          const message2 = `Successfully synthesized to ${import_chalk28.default.blue(path37.resolve(stacks.assembly.directory))}`;
+          const message2 = `Successfully synthesized to ${import_chalk30.default.blue(path37.resolve(stacks.assembly.directory))}`;
           const assemblyData = {
             assemblyDirectory: stacks.assembly.directory,
             stacksCount: stacks.stackCount,
@@ -299454,8 +299589,8 @@ var init_toolkit = __esm({
               }
             }));
           } else {
-            await ioHelper.notify(IO.CDK_TOOLKIT_I1902.msg(import_chalk28.default.green(message2), assemblyData));
-            await ioHelper.defaults.info(`Supply a stack id (${stacks.stackArtifacts.map((s2) => import_chalk28.default.green(s2.hierarchicalId)).join(", ")}) to display its template.`);
+            await ioHelper.notify(IO.CDK_TOOLKIT_I1902.msg(import_chalk30.default.green(message2), assemblyData));
+            await ioHelper.defaults.info(`Supply a stack id (${stacks.stackArtifacts.map((s2) => import_chalk30.default.green(s2.hierarchicalId)).join(", ")}) to display its template.`);
           }
           return new CachedCloudAssembly(assembly.take());
         } catch (_) {
@@ -299627,7 +299762,7 @@ var init_toolkit = __esm({
           }
           const assetNodes = Object.values(workGraph.nodes).filter((n3) => n3.type === "asset-publish");
           if (assetNodes.length === 0) {
-            await ioHelper.notify(IO.CDK_TOOLKIT_I9400.msg(import_chalk28.default.green("\n\u2728  All assets are already published\n")));
+            await ioHelper.notify(IO.CDK_TOOLKIT_I9400.msg(import_chalk30.default.green("\n\u2728  All assets are already published\n")));
             return {
               publishedAssets: []
             };
@@ -299648,7 +299783,7 @@ var init_toolkit = __esm({
             publishAsset: this.createPublishAssetFunction(ioHelper, deployments, void 0, options.force),
             marker: WorkGraph.NOOP
           });
-          await ioHelper.notify(IO.CDK_TOOLKIT_I9402.msg(import_chalk28.default.green("\n\u2728  Assets published successfully\n"), { assets }));
+          await ioHelper.notify(IO.CDK_TOOLKIT_I9402.msg(import_chalk30.default.green("\n\u2728  Assets published successfully\n"), { assets }));
           return {
             publishedAssets: assets
           };
@@ -299885,7 +300020,7 @@ var init_toolkit = __esm({
         const deployStack2 = /* @__PURE__ */ __name(async (stackNode) => {
           const stack = stackNode.stack;
           if (stackCollection.stackCount !== 1) {
-            await ioHelper.defaults.info(import_chalk28.default.bold(stack.displayName));
+            await ioHelper.defaults.info(import_chalk30.default.bold(stack.displayName));
           }
           if (!stack.environment) {
             throw new ToolkitError(
@@ -299897,9 +300032,9 @@ var init_toolkit = __esm({
           if (resourceCount === 0) {
             const stackExists = await deployments.stackExists({ stack });
             if (!stackExists) {
-              return ioHelper.notify(IO.CDK_TOOLKIT_W5021.msg(`${import_chalk28.default.bold(stack.displayName)}: stack has no resources, skipping deployment.`));
+              return ioHelper.notify(IO.CDK_TOOLKIT_W5021.msg(`${import_chalk30.default.bold(stack.displayName)}: stack has no resources, skipping deployment.`));
             }
-            await ioHelper.notify(IO.CDK_TOOLKIT_W5022.msg(`${import_chalk28.default.bold(stack.displayName)}: stack has no resources, deleting existing stack.`));
+            await ioHelper.notify(IO.CDK_TOOLKIT_W5022.msg(`${import_chalk30.default.bold(stack.displayName)}: stack has no resources, deleting existing stack.`));
             await this._destroy(assembly, "deploy", {
               stacks: { patterns: [stack.hierarchicalId], strategy: "pattern-must-match-single" /* PATTERN_MUST_MATCH_SINGLE */ },
               roleArn: options.roleArn
@@ -299933,7 +300068,7 @@ var init_toolkit = __esm({
           const prepareResult = isChangeSetDeployment(options.deploymentMethod) ? await deployments.prepareStack({
             ...sharedDeployOptions,
             deploymentMethod: options.deploymentMethod,
-            cleanupOnNoOp: isExecutingChangeSetDeployment(options.deploymentMethod)
+            willExecuteChangeSet: isExecutingChangeSetDeployment(options.deploymentMethod)
           }) : void 0;
           if (!prepareResult?.noOp) {
             const diffChangeSet = isExecuteChangeSetDeployment(options.deploymentMethod) ? (await deployments.describeChangeSet(stack, options.deploymentMethod.changeSetName, prepareResult?.stackArn)).changeSet : prepareResult?.changeSet;
@@ -299966,7 +300101,7 @@ ${deployMotivation}. Do you wish to deploy these changes?`;
             }
           }
           const stackIndex = stacks.indexOf(stack) + 1;
-          const deploySpan = await ioHelper.span(SPAN.DEPLOY_STACK).begin(`${import_chalk28.default.bold(stack.displayName)}: deploying... [${stackIndex}/${stackCollection.stackCount}]`, {
+          const deploySpan = await ioHelper.span(SPAN.DEPLOY_STACK).begin(`${import_chalk30.default.bold(stack.displayName)}: deploying... [${stackIndex}/${stackCollection.stackCount}]`, {
             total: stackCollection.stackCount,
             current: stackIndex,
             stack
@@ -300031,7 +300166,7 @@ ${deployMotivation}. Do you wish to deploy these changes?`;
               }
             }
             const message2 = deployResult.noOp ? `\u2705  ${stack.displayName} (no changes)` : `\u2705  ${stack.displayName}`;
-            await ioHelper.notify(IO.CDK_TOOLKIT_I5900.msg(import_chalk28.default.green("\n" + message2), deployResult));
+            await ioHelper.notify(IO.CDK_TOOLKIT_I5900.msg(import_chalk30.default.green("\n" + message2), deployResult));
             deployDuration = await deploySpan.timing(IO.CDK_TOOLKIT_I5000);
             if (options.express) {
               const warning3 = formatExpressStabilizationWarning(deployResult.stabilizingResources, "deploy");
@@ -300044,7 +300179,7 @@ ${deployMotivation}. Do you wish to deploy these changes?`;
               stackOutputs[stack.stackName] = deployResult.outputs;
               for (const name of Object.keys(deployResult.outputs).sort()) {
                 const value = deployResult.outputs[name];
-                buffer.push(`${import_chalk28.default.cyan(stack.id)}.${import_chalk28.default.cyan(name)} = ${import_chalk28.default.underline(import_chalk28.default.cyan(value))}`);
+                buffer.push(`${import_chalk30.default.cyan(stack.id)}.${import_chalk30.default.cyan(name)} = ${import_chalk30.default.underline(import_chalk30.default.cyan(value))}`);
               }
               await ioHelper.notify(IO.CDK_TOOLKIT_I5901.msg(buffer.join("\n")));
             }
@@ -300063,7 +300198,7 @@ ${deployResult.stackArn}`));
             });
           } catch (e6) {
             const code = ToolkitError.isToolkitError(e6) ? e6.name : "DeployStackFailed";
-            const newMessage = [`\u274C  ${import_chalk28.default.bold(stack.stackName)} failed:`, ...e6.name ? [`${e6.name}:`] : [], e6.message].join(" ");
+            const newMessage = [`\u274C  ${import_chalk30.default.bold(stack.stackName)} failed:`, ...e6.name ? [`${e6.name}:`] : [], e6.message].join(" ");
             throw new ToolkitError(code, newMessage);
           } finally {
             if (options.traceLogs) {
@@ -300358,7 +300493,7 @@ ${deployResult.stackArn}`));
         }
         let anyRollbackable = false;
         for (const [index, stack] of stacks.stackArtifacts.entries()) {
-          const rollbackSpan = await ioHelper.span(SPAN.ROLLBACK_STACK).begin(`Rolling back ${import_chalk28.default.bold(stack.displayName)}`, {
+          const rollbackSpan = await ioHelper.span(SPAN.ROLLBACK_STACK).begin(`Rolling back ${import_chalk30.default.bold(stack.displayName)}`, {
             total: stacks.stackCount,
             current: index + 1,
             stack
@@ -300388,7 +300523,7 @@ ${deployResult.stackArn}`));
             });
           } catch (e6) {
             await ioHelper.notify(IO.CDK_TOOLKIT_E6900.msg(`
- \u274C  ${import_chalk28.default.bold(stack.displayName)} failed: ${formatErrorMessage(e6)}`, { error: e6 }));
+ \u274C  ${import_chalk30.default.bold(stack.displayName)} failed: ${formatErrorMessage(e6)}`, { error: e6 }));
             throw ToolkitError.withCause("RollbackFailed", "Rollback failed (use --force to orphan failing resources)", e6);
           }
         }
@@ -300480,7 +300615,7 @@ Next steps:
 `;
             message2 += "Creation of new stacks is not yet supported by the refactor command. ";
             message2 += "Please deploy any new stacks separately before refactoring your stacks.";
-            await ioHelper.defaults.error(import_chalk28.default.red(message2));
+            await ioHelper.defaults.error(import_chalk30.default.red(message2));
             continue;
           }
           try {
@@ -300519,7 +300654,7 @@ Next steps:
               continue;
             }
             if (process.stdout.isTTY && !await confirm2(options.force ?? false)) {
-              await ioHelper.defaults.info(import_chalk28.default.red(`Refactoring canceled for environment aws://${environment.account}/${environment.region}
+              await ioHelper.defaults.info(import_chalk30.default.red(`Refactoring canceled for environment aws://${environment.account}/${environment.region}
 `));
               continue;
             }
@@ -300626,7 +300761,7 @@ Next steps:
           stacks: []
         };
         const motivation = "Destroying stacks is an irreversible action";
-        const question2 = `Are you sure you want to delete: ${import_chalk28.default.red(stacks.hierarchicalIds.join(", "))}`;
+        const question2 = `Are you sure you want to delete: ${import_chalk30.default.red(stacks.hierarchicalIds.join(", "))}`;
         const confirmed = await ioHelper.requestResponse(IO.CDK_TOOLKIT_I7010.req(question2, { motivation }));
         if (!confirmed) {
           await ioHelper.notify(IO.CDK_TOOLKIT_E7010.msg("Aborted by user"));
@@ -300642,7 +300777,7 @@ Next steps:
             const stack = stackNode.stack;
             destroyCount++;
             try {
-              const singleDestroySpan = await ioHelper.span(SPAN.DESTROY_STACK).begin(import_chalk28.default.green(`${import_chalk28.default.blue(stack.displayName)}: destroying... [${destroyCount}/${stacks.stackCount}]`), {
+              const singleDestroySpan = await ioHelper.span(SPAN.DESTROY_STACK).begin(import_chalk30.default.green(`${import_chalk30.default.blue(stack.displayName)}: destroying... [${destroyCount}/${stacks.stackCount}]`), {
                 total: stacks.stackCount,
                 current: destroyCount,
                 stack
@@ -300664,8 +300799,8 @@ Next steps:
                 stackArn: result2.stackArn,
                 stackExisted: result2.stackArn !== void 0
               });
-              await ioHelper.notify(IO.CDK_TOOLKIT_I7900.msg(import_chalk28.default.green(`
-\u2705  ${import_chalk28.default.blue(stack.displayName)}: ${action}ed`), stack));
+              await ioHelper.notify(IO.CDK_TOOLKIT_I7900.msg(import_chalk30.default.green(`
+\u2705  ${import_chalk30.default.blue(stack.displayName)}: ${action}ed`), stack));
               if (options.express) {
                 const warning3 = formatExpressStabilizationWarning(result2.stabilizingResources, "destroy");
                 if (warning3) {
@@ -300675,7 +300810,7 @@ Next steps:
               await singleDestroySpan.end();
             } catch (e6) {
               await ioHelper.notify(IO.CDK_TOOLKIT_E7900.msg(`
- \u274C  ${import_chalk28.default.blue(stack.displayName)}: ${action} failed ${e6}`, { error: e6 }));
+ \u274C  ${import_chalk30.default.blue(stack.displayName)}: ${action} failed ${e6}`, { error: e6 }));
               throw e6;
             }
           }, "destroyStack");
@@ -330406,14 +330541,14 @@ var init_proxy_agent = __esm({
 });
 
 // lib/engines/toolkit-lib.ts
-var path38, import_cloud_assembly_api16, import_toolkit_lib, import_chalk29, fs41, ToolkitLibRunnerEngine, IntegRunnerIoHost, NoopIoHost;
+var path38, import_cloud_assembly_api16, import_toolkit_lib, import_chalk31, fs41, ToolkitLibRunnerEngine, IntegRunnerIoHost, NoopIoHost;
 var init_toolkit_lib = __esm({
   "lib/engines/toolkit-lib.ts"() {
     "use strict";
     path38 = __toESM(require("node:path"));
     import_cloud_assembly_api16 = __toESM(require_lib3());
     import_toolkit_lib = __toESM(require_lib11());
-    import_chalk29 = __toESM(require_source());
+    import_chalk31 = __toESM(require_source());
     fs41 = __toESM(require_lib4());
     init_proxy_agent();
     ToolkitLibRunnerEngine = class {
@@ -330677,13 +330812,13 @@ var init_toolkit_lib = __esm({
         let color;
         switch (msg.level) {
           case "error":
-            color = import_chalk29.default.red;
+            color = import_chalk31.default.red;
             break;
           case "warn":
-            color = import_chalk29.default.yellow;
+            color = import_chalk31.default.yellow;
             break;
           default:
-            color = import_chalk29.default.gray;
+            color = import_chalk31.default.gray;
         }
         return super.notify({
           ...msg,
@@ -331235,7 +331370,7 @@ var init_cdk_test_app = __esm({
 
 // lib/workers/common.ts
 function formatAssertionResults(results) {
-  return Object.entries(results).map(([id, result2]) => (0, import_util71.format)("%s%s", id, result2.status === "success" ? ` - ${result2.status}` : `
+  return Object.entries(results).map(([id, result2]) => (0, import_util72.format)("%s%s", id, result2.status === "success" ? ` - ${result2.status}` : `
 ${result2.message}`)).join("\n      ");
 }
 function formatError(error4) {
@@ -331243,16 +331378,16 @@ function formatError(error4) {
   const message2 = error4.message || String(error4);
   if (error4.cause) {
     return `${name}: ${message2}
-${import_chalk30.default.gray("Cause: " + formatError(error4.cause))}`;
+${import_chalk32.default.gray("Cause: " + formatError(error4.cause))}`;
   }
   return `${name}: ${message2}`;
 }
-var import_util71, import_chalk30;
+var import_util72, import_chalk32;
 var init_common4 = __esm({
   "lib/workers/common.ts"() {
     "use strict";
-    import_util71 = require("util");
-    import_chalk30 = __toESM(require_source());
+    import_util72 = require("util");
+    import_chalk32 = __toESM(require_source());
     init_logger();
     __name(formatAssertionResults, "formatAssertionResults");
     __name(formatError, "formatError");
@@ -331783,14 +331918,14 @@ These resources are no longer managed by CloudFormation but still exist and may
 });
 
 // lib/runner/snapshot-test-runner.ts
-var path42, import_stream, import_string_decoder, import_cloudformation_diff4, IntegSnapshotRunner, StringWritable;
+var path42, import_stream, import_string_decoder, import_cloudformation_diff5, IntegSnapshotRunner, StringWritable;
 var init_snapshot_test_runner = __esm({
   "lib/runner/snapshot-test-runner.ts"() {
     "use strict";
     path42 = __toESM(require("path"));
     import_stream = require("stream");
     import_string_decoder = require("string_decoder");
-    import_cloudformation_diff4 = __toESM(require_lib10());
+    import_cloudformation_diff5 = __toESM(require_lib10());
     init_cdk_test_app();
     init_common4();
     IntegSnapshotRunner = class {
@@ -331915,7 +332050,7 @@ var init_snapshot_test_runner = __esm({
                 actualTemplate = this.canonicalizeTemplate(actualTemplate, actual[stackId].assets);
                 expectedTemplate = this.canonicalizeTemplate(expectedTemplate, expected[stackId].assets);
               }
-              const templateDiff = (0, import_cloudformation_diff4.fullDiff)(expectedTemplate, actualTemplate);
+              const templateDiff = (0, import_cloudformation_diff5.fullDiff)(expectedTemplate, actualTemplate);
               if (!templateDiff.isEmpty) {
                 const allowedDestroyTypes = await this.getAllowedDestroyTypesForStack(actualApp, stackId) ?? [];
                 templateDiff.resources.forEachDifference((logicalId, change) => {
@@ -331925,16 +332060,16 @@ var init_snapshot_test_runner = __esm({
                   }
                   if (change.isRemoval) {
                     destructiveChanges.push({
-                      impact: import_cloudformation_diff4.ResourceImpact.WILL_DESTROY,
+                      impact: import_cloudformation_diff5.ResourceImpact.WILL_DESTROY,
                       logicalId,
                       stackName: templateId
                     });
                   } else {
                     switch (change.changeImpact) {
-                      case import_cloudformation_diff4.ResourceImpact.MAY_REPLACE:
-                      case import_cloudformation_diff4.ResourceImpact.WILL_ORPHAN:
-                      case import_cloudformation_diff4.ResourceImpact.WILL_DESTROY:
-                      case import_cloudformation_diff4.ResourceImpact.WILL_REPLACE:
+                      case import_cloudformation_diff5.ResourceImpact.MAY_REPLACE:
+                      case import_cloudformation_diff5.ResourceImpact.WILL_ORPHAN:
+                      case import_cloudformation_diff5.ResourceImpact.WILL_DESTROY:
+                      case import_cloudformation_diff5.ResourceImpact.WILL_REPLACE:
                         destructiveChanges.push({
                           impact: change.changeImpact,
                           logicalId,
@@ -331945,7 +332080,7 @@ var init_snapshot_test_runner = __esm({
                   }
                 });
                 const writable = new StringWritable({});
-                (0, import_cloudformation_diff4.formatDifferences)(writable, templateDiff);
+                (0, import_cloudformation_diff5.formatDifferences)(writable, templateDiff);
                 failures.push({
                   reason: "SNAPSHOT_FAILED" /* SNAPSHOT_FAILED */,
                   message: writable.data,