aws-cdk 2.1142.0 → 2.1143.0

package/lib/index.js

@@ -485,7 +485,7 @@ var require_helpers = __commonJS({
       this.base = base;
       this.schemas = schemas;
     }, "SchemaContext");
-    SchemaContext.prototype.resolve = /* @__PURE__ */ __name(function resolve16(target) {
+    SchemaContext.prototype.resolve = /* @__PURE__ */ __name(function resolve17(target) {
       return (() => resolveUrl(this.base, target))();
     }, "resolve");
     SchemaContext.prototype.makeChild = /* @__PURE__ */ __name(function makeChild(schema, propertyName) {
@@ -1604,7 +1604,7 @@ var require_validator = __commonJS({
       }
       return schema;
     }, "superResolve");
-    Validator2.prototype.resolve = /* @__PURE__ */ __name(function resolve16(schema, switchSchema, ctx) {
+    Validator2.prototype.resolve = /* @__PURE__ */ __name(function resolve17(schema, switchSchema, ctx) {
       switchSchema = ctx.resolve(switchSchema);
       if (ctx.schemas[switchSchema]) {
         return { subschema: ctx.schemas[switchSchema], switchSchema };
@@ -3695,7 +3695,7 @@ var require_semver2 = __commonJS({
 // ../@aws-cdk/cloud-assembly-schema/cli-version.json
 var require_cli_version = __commonJS({
   "../@aws-cdk/cloud-assembly-schema/cli-version.json"(exports2, module2) {
-    module2.exports = { version: "2.1142.0" };
+    module2.exports = { version: "2.1143.0" };
   }
 });
 
@@ -8383,8 +8383,8 @@ var require_universalify = __commonJS({
       return Object.defineProperty(function(...args) {
         if (typeof args[args.length - 1] === "function") fn.apply(this, args);
         else {
-          return new Promise((resolve16, reject) => {
-            args.push((err, res) => err != null ? reject(err) : resolve16(res));
+          return new Promise((resolve17, reject) => {
+            args.push((err, res) => err != null ? reject(err) : resolve17(res));
             fn.apply(this, args);
           });
         }
@@ -9279,18 +9279,18 @@ var require_fs = __commonJS({
       if (typeof callback === "function") {
         return fs58.exists(filename, callback);
       }
-      return new Promise((resolve16) => {
-        return fs58.exists(filename, resolve16);
+      return new Promise((resolve17) => {
+        return fs58.exists(filename, resolve17);
       });
     };
     exports2.read = function(fd, buffer, offset, length, position, callback) {
       if (typeof callback === "function") {
         return fs58.read(fd, buffer, offset, length, position, callback);
       }
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         fs58.read(fd, buffer, offset, length, position, (err, bytesRead, buffer2) => {
           if (err) return reject(err);
-          resolve16({ bytesRead, buffer: buffer2 });
+          resolve17({ bytesRead, buffer: buffer2 });
         });
       });
     };
@@ -9298,10 +9298,10 @@ var require_fs = __commonJS({
       if (typeof args[args.length - 1] === "function") {
         return fs58.write(fd, buffer, ...args);
       }
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         fs58.write(fd, buffer, ...args, (err, bytesWritten, buffer2) => {
           if (err) return reject(err);
-          resolve16({ bytesWritten, buffer: buffer2 });
+          resolve17({ bytesWritten, buffer: buffer2 });
         });
       });
     };
@@ -9309,10 +9309,10 @@ var require_fs = __commonJS({
       if (typeof args[args.length - 1] === "function") {
         return fs58.readv(fd, buffers, ...args);
       }
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         fs58.readv(fd, buffers, ...args, (err, bytesRead, buffers2) => {
           if (err) return reject(err);
-          resolve16({ bytesRead, buffers: buffers2 });
+          resolve17({ bytesRead, buffers: buffers2 });
         });
       });
     };
@@ -9320,10 +9320,10 @@ var require_fs = __commonJS({
       if (typeof args[args.length - 1] === "function") {
         return fs58.writev(fd, buffers, ...args);
       }
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         fs58.writev(fd, buffers, ...args, (err, bytesWritten, buffers2) => {
           if (err) return reject(err);
-          resolve16({ bytesWritten, buffers: buffers2 });
+          resolve17({ bytesWritten, buffers: buffers2 });
         });
       });
     };
@@ -10396,7 +10396,7 @@ var require_jsonfile = __commonJS({
     }
     __name(_readFile, "_readFile");
     var readFile11 = universalify.fromPromise(_readFile);
-    function readFileSync21(file, options = {}) {
+    function readFileSync22(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
       }
@@ -10415,7 +10415,7 @@ var require_jsonfile = __commonJS({
         }
       }
     }
-    __name(readFileSync21, "readFileSync");
+    __name(readFileSync22, "readFileSync");
     async function _writeFile(file, obj, options = {}) {
       const fs58 = options.fs || _fs;
       const str = stringify2(obj, options);
@@ -10431,7 +10431,7 @@ var require_jsonfile = __commonJS({
     __name(writeFileSync6, "writeFileSync");
     module2.exports = {
       readFile: readFile11,
-      readFileSync: readFileSync21,
+      readFileSync: readFileSync22,
       writeFile: writeFile6,
       writeFileSync: writeFileSync6
     };
@@ -10898,12 +10898,12 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve16, reject) {
+        return new Promise(function(resolve17, reject) {
           isexe(path54, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
-              resolve16(is);
+              resolve17(is);
             }
           });
         });
@@ -10971,27 +10971,27 @@ var require_which = __commonJS({
         opt = {};
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found2 = [];
-      const step = /* @__PURE__ */ __name((i6) => new Promise((resolve16, reject) => {
+      const step = /* @__PURE__ */ __name((i6) => new Promise((resolve17, reject) => {
         if (i6 === pathEnv.length)
-          return opt.all && found2.length ? resolve16(found2) : reject(getNotFoundError(cmd));
+          return opt.all && found2.length ? resolve17(found2) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i6];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
         const pCmd = path54.join(pathPart, cmd);
         const p3 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve16(subStep(p3, i6, 0));
+        resolve17(subStep(p3, i6, 0));
       }), "step");
-      const subStep = /* @__PURE__ */ __name((p3, i6, ii) => new Promise((resolve16, reject) => {
+      const subStep = /* @__PURE__ */ __name((p3, i6, ii) => new Promise((resolve17, reject) => {
         if (ii === pathExt.length)
-          return resolve16(step(i6 + 1));
+          return resolve17(step(i6 + 1));
         const ext = pathExt[ii];
         isexe(p3 + ext, { pathExt: pathExtExe }, (er, is) => {
           if (!er && is) {
             if (opt.all)
               found2.push(p3 + ext);
             else
-              return resolve16(p3 + ext);
+              return resolve17(p3 + ext);
           }
-          return resolve16(subStep(p3, i6, ii + 1));
+          return resolve17(subStep(p3, i6, ii + 1));
         });
       }), "subStep");
       return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -11496,7 +11496,7 @@ var require_subprocess = __commonJS({
     }
     __name(spawnOptions, "spawnOptions");
     function monitor(child, displayCommand, options) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const collect = options.collect ?? true;
         const stdout2 = new Array();
         const stderr = new Array();
@@ -11558,7 +11558,7 @@ var require_subprocess = __commonJS({
           lines?.flush();
           settle(() => {
             if (exitCode === 0) {
-              resolve16({ stdout: stdout2.join(""), stderr: stderr.join("") });
+              resolve17({ stdout: stdout2.join(""), stderr: stderr.join("") });
             } else {
               reject(new SubprocessError5({
                 command: displayCommand,
@@ -16258,13 +16258,13 @@ var require_queue = __commonJS({
       queue.drained = drained;
       return queue;
       function push(value2) {
-        var p3 = new Promise(function(resolve16, reject) {
+        var p3 = new Promise(function(resolve17, reject) {
           pushCb(value2, function(err, result2) {
             if (err) {
               reject(err);
               return;
             }
-            resolve16(result2);
+            resolve17(result2);
           });
         });
         p3.catch(noop);
@@ -16272,13 +16272,13 @@ var require_queue = __commonJS({
       }
       __name(push, "push");
       function unshift(value2) {
-        var p3 = new Promise(function(resolve16, reject) {
+        var p3 = new Promise(function(resolve17, reject) {
           unshiftCb(value2, function(err, result2) {
             if (err) {
               reject(err);
               return;
             }
-            resolve16(result2);
+            resolve17(result2);
           });
         });
         p3.catch(noop);
@@ -16286,15 +16286,15 @@ var require_queue = __commonJS({
       }
       __name(unshift, "unshift");
       function drained() {
-        var p3 = new Promise(function(resolve16) {
+        var p3 = new Promise(function(resolve17) {
           process.nextTick(function() {
             if (queue.idle()) {
-              resolve16();
+              resolve17();
             } else {
               var previousDrain = queue.drain;
               queue.drain = function() {
                 if (typeof previousDrain === "function") previousDrain();
-                resolve16();
+                resolve17();
                 queue.drain = previousDrain;
               };
             }
@@ -16819,9 +16819,9 @@ var require_stream3 = __commonJS({
         });
       }
       _getStat(filepath) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           this._stat(filepath, this._fsStatSettings, (error3, stats) => {
-            return error3 === null ? resolve16(stats) : reject(error3);
+            return error3 === null ? resolve17(stats) : reject(error3);
           });
         });
       }
@@ -16848,10 +16848,10 @@ var require_async6 = __commonJS({
         this._readerStream = new stream_1.default(this._settings);
       }
       dynamic(root6, options) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           this._walkAsync(root6, options, (error3, entries) => {
             if (error3 === null) {
-              resolve16(entries);
+              resolve17(entries);
             } else {
               reject(error3);
             }
@@ -16861,10 +16861,10 @@ var require_async6 = __commonJS({
       async static(patterns, options) {
         const entries = [];
         const stream = this._readerStream.static(patterns, options);
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           stream.once("error", reject);
           stream.on("data", (entry) => entries.push(entry));
-          stream.once("end", () => resolve16(entries));
+          stream.once("end", () => resolve17(entries));
         });
       }
     };
@@ -18609,12 +18609,12 @@ var require_zip = __commonJS({
     }
     __name(zipDirectory3, "zipDirectory");
     function zipString2(fileName, rawString) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const buffers = [];
         const zip2 = new yazl_1.ZipFile();
         zip2.outputStream.on("data", (chunk) => buffers.push(chunk));
         zip2.outputStream.on("error", reject);
-        zip2.outputStream.on("end", () => resolve16(Buffer.concat(buffers)));
+        zip2.outputStream.on("end", () => resolve17(Buffer.concat(buffers)));
         zip2.addBuffer(Buffer.from(rawString), fileName, {
           mtime: epoch(),
           // reset date to get the same hash for the same content
@@ -20075,12 +20075,12 @@ function pLimit(concurrency) {
       return;
     }
     if (activeCount < concurrency && queue.length > 0) {
-      const [fac, resolve16, reject] = queue.shift();
+      const [fac, resolve17, reject] = queue.shift();
       activeCount++;
       fac().then(
         (r6) => {
           resumeNext();
-          resolve16(r6);
+          resolve17(r6);
         },
         (e6) => {
           resumeNext();
@@ -20102,12 +20102,12 @@ function pLimit(concurrency) {
   }
   __name(resumeNext, "resumeNext");
   const ret = /* @__PURE__ */ __name((promiseFactory) => {
-    return new Promise((resolve16, reject) => {
+    return new Promise((resolve17, reject) => {
       if (stopped) {
         reject(new Error("Task has been cancelled"));
         return;
       }
-      queue.push([promiseFactory, resolve16, reject]);
+      queue.push([promiseFactory, resolve17, reject]);
       dispatch();
     });
   }, "ret");
@@ -21071,7 +21071,7 @@ var sleep;
 var init_sleep = __esm({
   "../../node_modules/@smithy/core/dist-es/submodules/client/util-waiter/utils/sleep.js"() {
     sleep = /* @__PURE__ */ __name((seconds) => {
-      return new Promise((resolve16) => setTimeout(resolve16, seconds * 1e3));
+      return new Promise((resolve17) => setTimeout(resolve17, seconds * 1e3));
     }, "sleep");
   }
 });
@@ -21236,8 +21236,8 @@ var init_createWaiter = __esm({
     init_waiter();
     abortTimeout = /* @__PURE__ */ __name((abortSignal) => {
       let onAbort;
-      const promise = new Promise((resolve16) => {
-        onAbort = /* @__PURE__ */ __name(() => resolve16({ state: WaiterState.ABORTED }), "onAbort");
+      const promise = new Promise((resolve17) => {
+        onAbort = /* @__PURE__ */ __name(() => resolve17({ state: WaiterState.ABORTED }), "onAbort");
         if (typeof abortSignal.addEventListener === "function") {
           abortSignal.addEventListener("abort", onAbort);
         } else {
@@ -24761,7 +24761,7 @@ var init_getInstanceMetadataRegion = __esm({
     }, "resolveImdsEndpoint");
     imdsRequest = /* @__PURE__ */ __name(async (options) => {
       const { request: request4 } = await import("node:http");
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const req = request4({
           hostname: options.hostname,
           port: options.port,
@@ -24789,7 +24789,7 @@ var init_getInstanceMetadataRegion = __esm({
           const chunks2 = [];
           res.on("data", (chunk) => chunks2.push(chunk));
           res.on("end", () => {
-            resolve16(Buffer.concat(chunks2));
+            resolve17(Buffer.concat(chunks2));
             req.destroy();
           });
         });
@@ -27050,7 +27050,7 @@ var init_headStream = __esm({
       if (isReadableStream(stream)) {
         return headStream(stream, bytes);
       }
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const collector = new Collector();
         collector.limit = bytes;
         stream.pipe(collector);
@@ -27061,7 +27061,7 @@ var init_headStream = __esm({
         collector.on("error", reject);
         collector.on("finish", function() {
           const bytes2 = concatBytes(this.buffers);
-          resolve16(bytes2);
+          resolve17(bytes2);
         });
       });
     }, "headStream");
@@ -27218,7 +27218,7 @@ var init_stream_collector = __esm({
       if (isReadableStream(stream)) {
         return collectReadableStream(stream);
       }
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const collector = new Collector2();
         const nodeStream = stream;
         nodeStream.pipe(collector);
@@ -27229,7 +27229,7 @@ var init_stream_collector = __esm({
         collector.on("error", reject);
         collector.on("finish", function() {
           const bytes = concatBytes(this.bufferedBytes);
-          resolve16(bytes);
+          resolve17(bytes);
         });
       });
     }, "streamCollector");
@@ -27573,7 +27573,7 @@ var init_fileStreamHasher = __esm({
   "../../node_modules/@smithy/core/dist-es/submodules/checksum/hash-stream-node/fileStreamHasher.js"() {
     import_node_fs2 = require("node:fs");
     init_HashCalculator();
-    fileStreamHasher = /* @__PURE__ */ __name((hashCtor, fileStream) => new Promise((resolve16, reject) => {
+    fileStreamHasher = /* @__PURE__ */ __name((hashCtor, fileStream) => new Promise((resolve17, reject) => {
       if (!isReadStream(fileStream)) {
         reject(new Error("Unable to calculate hash for non-file streams."));
         return;
@@ -27591,7 +27591,7 @@ var init_fileStreamHasher = __esm({
       });
       hashCalculator.on("error", reject);
       hashCalculator.on("finish", function() {
-        hash.digest().then(resolve16).catch(reject);
+        hash.digest().then(resolve17).catch(reject);
       });
     }), "fileStreamHasher");
     isReadStream = /* @__PURE__ */ __name((stream) => typeof stream.path === "string", "isReadStream");
@@ -27610,14 +27610,14 @@ var init_readableStreamHasher = __esm({
       const hash = new hashCtor();
       const hashCalculator = new HashCalculator(hash);
       readableStream.pipe(hashCalculator);
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         readableStream.on("error", (err) => {
           hashCalculator.end();
           reject(err);
         });
         hashCalculator.on("error", reject);
         hashCalculator.on("finish", () => {
-          hash.digest().then(resolve16).catch(reject);
+          hash.digest().then(resolve17).catch(reject);
         });
       });
     }, "readableStreamHasher");
@@ -28916,7 +28916,7 @@ async function* readableToIterable(readStream) {
     streamEnded = true;
   });
   while (!generationEnded) {
-    const value2 = await new Promise((resolve16) => setTimeout(() => resolve16(records.shift()), 0));
+    const value2 = await new Promise((resolve17) => setTimeout(() => resolve17(records.shift()), 0));
     if (value2) {
       yield value2;
     }
@@ -30750,7 +30750,7 @@ var init_retryMiddleware = __esm({
     init_parseRetryAfterHeader();
     init_util2();
     __name(bindRetryMiddleware, "bindRetryMiddleware");
-    cooldown = /* @__PURE__ */ __name((ms) => new Promise((resolve16) => setTimeout(resolve16, ms)), "cooldown");
+    cooldown = /* @__PURE__ */ __name((ms) => new Promise((resolve17) => setTimeout(resolve17, ms)), "cooldown");
     isRetryStrategyV2 = /* @__PURE__ */ __name((retryStrategy) => typeof retryStrategy.acquireInitialRetryToken !== "undefined" && typeof retryStrategy.refreshRetryTokenForRetry !== "undefined" && typeof retryStrategy.recordSuccess !== "undefined", "isRetryStrategyV2");
     getRetryErrorInfo = /* @__PURE__ */ __name((error3, logger2) => {
       const errorInfo = {
@@ -30852,7 +30852,7 @@ var init_DefaultRateLimiter = __esm({
         this.refillTokenBucket();
         while (amount > this.availableTokens) {
           const delay = (amount - this.availableTokens) / this.fillRate * 1e3;
-          await new Promise((resolve16) => _DefaultRateLimiter.setTimeoutFn(resolve16, delay));
+          await new Promise((resolve17) => _DefaultRateLimiter.setTimeoutFn(resolve17, delay));
           this.refillTokenBucket();
         }
         this.availableTokens = this.availableTokens - amount;
@@ -31311,7 +31311,7 @@ var init_StandardRetryStrategy2 = __esm({
               const delayFromResponse = getDelayFromRetryAfterHeader(err.$response);
               const delay = Math.max(delayFromResponse || 0, delayFromDecider);
               totalDelay += delay;
-              await new Promise((resolve16) => setTimeout(resolve16, delay));
+              await new Promise((resolve17) => setTimeout(resolve17, delay));
               continue;
             }
             if (!err.$metadata) {
@@ -35233,7 +35233,7 @@ var require_dist_cjs4 = __commonJS({
     var DEFAULT_MAX_RETRIES = 0;
     var providerConfigFromInit = /* @__PURE__ */ __name(({ maxRetries = DEFAULT_MAX_RETRIES, timeout = DEFAULT_TIMEOUT2 }) => ({ maxRetries, timeout }), "providerConfigFromInit");
     function httpRequest(options) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const req = node_http.request({
           method: "GET",
           ...options,
@@ -35258,7 +35258,7 @@ var require_dist_cjs4 = __commonJS({
             chunks2.push(chunk);
           });
           res.on("end", () => {
-            resolve16(Buffer.concat(chunks2));
+            resolve17(Buffer.concat(chunks2));
             req.destroy();
           });
         });
@@ -35707,21 +35707,21 @@ var require_dist_cjs5 = __commonJS({
       let sendBody = true;
       if (!externalAgent && expect === "100-continue") {
         sendBody = await Promise.race([
-          new Promise((resolve16) => {
-            timeoutId = Number(timing.setTimeout(() => resolve16(true), Math.max(MIN_WAIT_TIME, maxContinueTimeoutMs)));
+          new Promise((resolve17) => {
+            timeoutId = Number(timing.setTimeout(() => resolve17(true), Math.max(MIN_WAIT_TIME, maxContinueTimeoutMs)));
           }),
-          new Promise((resolve16) => {
+          new Promise((resolve17) => {
             httpRequest.on("continue", () => {
               timing.clearTimeout(timeoutId);
-              resolve16(true);
+              resolve17(true);
             });
             httpRequest.on("response", () => {
               timing.clearTimeout(timeoutId);
-              resolve16(false);
+              resolve17(false);
             });
             httpRequest.on("error", () => {
               timing.clearTimeout(timeoutId);
-              resolve16(false);
+              resolve17(false);
             });
           })
         ]);
@@ -35802,13 +35802,13 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
         return socketWarningTimestamp;
       }
       constructor(options) {
-        this.configProvider = new Promise((resolve16, reject) => {
+        this.configProvider = new Promise((resolve17, reject) => {
           if (typeof options === "function") {
             options().then((_options) => {
-              resolve16(this.resolveDefaultConfig(_options));
+              resolve17(this.resolveDefaultConfig(_options));
             }).catch(reject);
           } else {
-            resolve16(this.resolveDefaultConfig(options));
+            resolve17(this.resolveDefaultConfig(options));
           }
         });
       }
@@ -35840,7 +35840,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
             timing.clearTimeout(socketTimeoutId);
             timing.clearTimeout(keepAliveTimeoutId);
           }, "clearTimeouts");
-          const resolve16 = /* @__PURE__ */ __name(async (arg) => {
+          const resolve17 = /* @__PURE__ */ __name(async (arg) => {
             await writeRequestBodyPromise;
             clearTimeouts();
             _resolve(arg);
@@ -35904,7 +35904,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
               headers: getTransformedHeaders(res.headers),
               body: res
             });
-            resolve16({ response: httpResponse });
+            resolve17({ response: httpResponse });
           });
           req.on("error", (err) => {
             if (NODEJS_TIMEOUT_ERROR_CODES2.includes(err.code)) {
@@ -36244,13 +36244,13 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
         return new _NodeHttp2Handler(instanceOrOptions);
       }
       constructor(options) {
-        this.configProvider = new Promise((resolve16, reject) => {
+        this.configProvider = new Promise((resolve17, reject) => {
           if (typeof options === "function") {
             options().then((opts) => {
-              resolve16(opts || {});
+              resolve17(opts || {});
             }).catch(reject);
           } else {
-            resolve16(options || {});
+            resolve17(options || {});
           }
         });
       }
@@ -36275,7 +36275,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
         return new Promise((_resolve, _reject) => {
           let fulfilled = false;
           let writeRequestBodyPromise = void 0;
-          const resolve16 = /* @__PURE__ */ __name(async (arg) => {
+          const resolve17 = /* @__PURE__ */ __name(async (arg) => {
             await writeRequestBodyPromise;
             _resolve(arg);
           }, "resolve");
@@ -36360,7 +36360,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
               body: clientHttp2Stream
             });
             fulfilled = true;
-            resolve16({ response: httpResponse });
+            resolve17({ response: httpResponse });
             if (useIsolatedSession) {
               session.close();
             }
@@ -36487,7 +36487,7 @@ var require_dist_cjs6 = __commonJS({
           try {
             return await toRetry();
           } catch (e6) {
-            await new Promise((resolve16) => setTimeout(resolve16, delayMs));
+            await new Promise((resolve17) => setTimeout(resolve17, delayMs));
           }
         }
         return await toRetry();
@@ -46150,7 +46150,7 @@ var require_dist_cjs11 = __commonJS({
     var { createHash: createHash8, createPrivateKey, createPublicKey, sign: sign3 } = require("node:crypto");
     var { promises: promises8 } = require("node:fs");
     var { homedir: homedir8 } = require("node:os");
-    var { dirname: dirname17, join: join54 } = require("node:path");
+    var { dirname: dirname17, join: join53 } = require("node:path");
     var LoginCredentialsFetcher = class _LoginCredentialsFetcher {
       static {
         __name(this, "LoginCredentialsFetcher");
@@ -46317,10 +46317,10 @@ var require_dist_cjs11 = __commonJS({
         await promises8.writeFile(tokenFilePath, JSON.stringify(token, null, 2), "utf8");
       }
       getTokenFilePath() {
-        const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join54(homedir8(), ".aws", "login", "cache");
+        const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join53(homedir8(), ".aws", "login", "cache");
         const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
         const loginSessionSha256 = createHash8("sha256").update(loginSessionBytes).digest("hex");
-        return join54(directory, `${loginSessionSha256}.json`);
+        return join53(directory, `${loginSessionSha256}.json`);
       }
       derToRawSignature(derSignature) {
         let offset = 2;
@@ -46508,7 +46508,7 @@ var require_dist_cjs13 = __commonJS({
   "../../node_modules/@aws-sdk/credential-provider-web-identity/dist-cjs/index.js"(exports2) {
     var { setCredentialFeature: setCredentialFeature2 } = (init_client3(), __toCommonJS(client_exports2));
     var { CredentialsProviderError: CredentialsProviderError2, externalDataInterceptor: externalDataInterceptor2 } = (init_config2(), __toCommonJS(config_exports));
-    var { readFileSync: readFileSync21 } = require("node:fs");
+    var { readFileSync: readFileSync22 } = require("node:fs");
     var fromWebToken = /* @__PURE__ */ __name((init) => async (awsIdentityProperties) => {
       init.logger?.debug("@aws-sdk/credential-provider-web-identity - fromWebToken");
       const { roleArn, roleSessionName, webIdentityToken, providerId, policyArns, policy, durationSeconds } = init;
@@ -46549,7 +46549,7 @@ var require_dist_cjs13 = __commonJS({
       }
       const credentials = await fromWebToken({
         ...init,
-        webIdentityToken: externalDataInterceptor2?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync21(webIdentityTokenFile, { encoding: "ascii" }),
+        webIdentityToken: externalDataInterceptor2?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync22(webIdentityTokenFile, { encoding: "ascii" }),
         roleArn,
         roleSessionName
       })(awsIdentityProperties);
@@ -69159,35 +69159,35 @@ var require_dist_cjs20 = __commonJS({
       getItem(key) {
         return this.withObjectStore("readonly", (store) => {
           const req = store.get(key);
-          return new Promise((resolve16) => {
-            req.onerror = () => resolve16(null);
-            req.onsuccess = () => resolve16(req.result ? req.result.value : null);
+          return new Promise((resolve17) => {
+            req.onerror = () => resolve17(null);
+            req.onsuccess = () => resolve17(req.result ? req.result.value : null);
           });
         }).catch(() => null);
       }
       removeItem(key) {
         return this.withObjectStore("readwrite", (store) => {
           const req = store.delete(key);
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve17, reject) => {
             req.onerror = () => reject(req.error);
-            req.onsuccess = () => resolve16();
+            req.onsuccess = () => resolve17();
           });
         });
       }
       setItem(id, value2) {
         return this.withObjectStore("readwrite", (store) => {
           const req = store.put({ id, value: value2 });
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve17, reject) => {
             req.onerror = () => reject(req.error);
-            req.onsuccess = () => resolve16();
+            req.onsuccess = () => resolve17();
           });
         });
       }
       getDb() {
         const openDbRequest = self.indexedDB.open(this.dbName, 1);
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           openDbRequest.onsuccess = () => {
-            resolve16(openDbRequest.result);
+            resolve17(openDbRequest.result);
           };
           openDbRequest.onerror = () => {
             reject(openDbRequest.error);
@@ -69208,9 +69208,9 @@ var require_dist_cjs20 = __commonJS({
         return this.getDb().then((db) => {
           const tx = db.transaction(STORE_NAME, mode);
           tx.oncomplete = () => db.close();
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve17, reject) => {
             tx.onerror = () => reject(tx.error);
-            resolve16(action(tx.objectStore(STORE_NAME)));
+            resolve17(action(tx.objectStore(STORE_NAME)));
           }).catch((err) => {
             db.close();
             throw err;
@@ -70044,7 +70044,7 @@ to input.params.ContentLength in bytes.
         }
       }
       async __abortTimeout(abortSignal) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           abortSignal.onabort = () => {
             const abortError = new Error("Upload aborted.");
             abortError.name = "AbortError";
@@ -71653,14 +71653,14 @@ var require_templates = __commonJS({
       return results;
     }
     __name(parseStyle, "parseStyle");
-    function buildStyle(chalk42, styles) {
+    function buildStyle(chalk43, 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 = chalk42;
+      let current = chalk43;
       for (const [styleName, styles2] of Object.entries(enabled)) {
         if (!Array.isArray(styles2)) {
           continue;
@@ -71673,7 +71673,7 @@ var require_templates = __commonJS({
       return current;
     }
     __name(buildStyle, "buildStyle");
-    module2.exports = (chalk42, temporary) => {
+    module2.exports = (chalk43, temporary) => {
       const styles = [];
       const chunks2 = [];
       let chunk = [];
@@ -71683,13 +71683,13 @@ var require_templates = __commonJS({
         } else if (style) {
           const string = chunk.join("");
           chunk = [];
-          chunks2.push(styles.length === 0 ? string : buildStyle(chalk42, styles)(string));
+          chunks2.push(styles.length === 0 ? string : buildStyle(chalk43, 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(chalk42, styles)(chunk.join("")));
+          chunks2.push(buildStyle(chalk43, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -71740,16 +71740,16 @@ var require_source = __commonJS({
       }
     };
     var chalkFactory = /* @__PURE__ */ __name((options) => {
-      const chalk43 = {};
-      applyOptions(chalk43, options);
-      chalk43.template = (...arguments_) => chalkTag(chalk43.template, ...arguments_);
-      Object.setPrototypeOf(chalk43, Chalk.prototype);
-      Object.setPrototypeOf(chalk43.template, chalk43);
-      chalk43.template.constructor = () => {
+      const chalk44 = {};
+      applyOptions(chalk44, options);
+      chalk44.template = (...arguments_) => chalkTag(chalk44.template, ...arguments_);
+      Object.setPrototypeOf(chalk44, Chalk.prototype);
+      Object.setPrototypeOf(chalk44.template, chalk44);
+      chalk44.template.constructor = () => {
         throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.");
       };
-      chalk43.template.Instance = ChalkClass;
-      return chalk43.template;
+      chalk44.template.Instance = ChalkClass;
+      return chalk44.template;
     }, "chalkFactory");
     function Chalk(options) {
       return chalkFactory(options);
@@ -71861,7 +71861,7 @@ var require_source = __commonJS({
       return openAll + string + closeAll;
     }, "applyStyle");
     var template;
-    var chalkTag = /* @__PURE__ */ __name((chalk43, ...strings) => {
+    var chalkTag = /* @__PURE__ */ __name((chalk44, ...strings) => {
       const [firstString] = strings;
       if (!isArray2(firstString) || !isArray2(firstString.raw)) {
         return strings.join(" ");
@@ -71877,14 +71877,14 @@ var require_source = __commonJS({
       if (template === void 0) {
         template = require_templates();
       }
-      return template(chalk43, parts.join(""));
+      return template(chalk44, parts.join(""));
     }, "chalkTag");
     Object.defineProperties(Chalk.prototype, styles);
-    var chalk42 = Chalk();
-    chalk42.supportsColor = stdoutColor;
-    chalk42.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
-    chalk42.stderr.supportsColor = stderrColor;
-    module2.exports = chalk42;
+    var chalk43 = Chalk();
+    chalk43.supportsColor = stdoutColor;
+    chalk43.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
+    chalk43.stderr.supportsColor = stderrColor;
+    module2.exports = chalk43;
   }
 });
 
@@ -77747,12 +77747,12 @@ ${ctx.indent}`;
       for (const {
         format: format31,
         test,
-        resolve: resolve16
+        resolve: resolve17
       } of tags) {
         if (test) {
           const match = str.match(test);
           if (match) {
-            let res = resolve16.apply(null, match);
+            let res = resolve17.apply(null, match);
             if (!(res instanceof Scalar2)) res = new Scalar2(res);
             if (format31) res.format = format31;
             return res;
@@ -84096,12 +84096,12 @@ var init_asset_publishing = __esm({
 
 // ../@aws-cdk/toolkit-lib/lib/util/promises.ts
 function promiseWithResolvers() {
-  let resolve16, reject;
+  let resolve17, reject;
   const promise = new Promise((res, rej) => {
-    resolve16 = res;
+    resolve17 = res;
     reject = rej;
   });
-  return { promise, resolve: resolve16, reject };
+  return { promise, resolve: resolve17, reject };
 }
 async function waitFor(valueProvider, timeout = 5e3) {
   while (true) {
@@ -92203,6 +92203,13 @@ function assertEvaluatesToString(intrinsic, value2) {
     throw new CfnEvaluationException(`${intrinsic}: expected a string, got ${JSON.stringify(value2)}`);
   }
 }
+function topLevelPropertyName(property) {
+  if (typeof property !== "string" || !property.startsWith("/properties/")) {
+    return void 0;
+  }
+  const [first] = property.slice("/properties/".length).split("/");
+  return first?.replace(/~1/g, "/").replace(/~0/g, "~") || void 0;
+}
 function iamArnFmt(parts) {
   return `arn:${parts.partition}:${parts.service}::${parts.account}:${parts.resourceType}/${parts.resourceName}`;
 }
@@ -92319,6 +92326,7 @@ var init_evaluate_cloudformation_template = __esm({
     };
     __name(assertEvaluatesToArray, "assertEvaluatesToArray");
     __name(assertEvaluatesToString, "assertEvaluatesToString");
+    __name(topLevelPropertyName, "topLevelPropertyName");
     EvaluateCloudFormationTemplate = class _EvaluateCloudFormationTemplate {
       static {
         __name(this, "EvaluateCloudFormationTemplate");
@@ -92336,6 +92344,7 @@ var init_evaluate_cloudformation_template = __esm({
       lookupExport;
       cachedUrlSuffix;
       _cloudControl;
+      createOnlyPropertiesCache = /* @__PURE__ */ new Map();
       constructor(props) {
         this.stackArtifact = props.stackArtifact;
         this.stackName = props.stackName ?? props.stackArtifact.stackName;
@@ -92531,6 +92540,49 @@ var init_evaluate_cloudformation_template = __esm({
         }
         return physicalId;
       }
+      /**
+       * Best-effort lookup of the top-level property names the resource type
+       * declares as create-only (e.g. `QueueName` for `AWS::SQS::Queue`).
+       *
+       * Read from the registry schema via `cloudformation:DescribeType` and
+       * cached per resource type. Returns an empty set when the schema cannot be
+       * retrieved, so callers keep their previous behavior instead of failing
+       * on the lookup itself.
+       */
+      async getCreateOnlyProperties(resourceType) {
+        const cached3 = this.createOnlyPropertiesCache.get(resourceType);
+        if (cached3) {
+          return cached3;
+        }
+        const createOnly = await this.fetchCreateOnlyProperties(resourceType);
+        this.createOnlyPropertiesCache.set(resourceType, createOnly);
+        return createOnly;
+      }
+      async fetchCreateOnlyProperties(resourceType) {
+        try {
+          const response = await this.sdk.cloudFormation().describeType({
+            Type: "RESOURCE",
+            TypeName: resourceType
+          });
+          if (!response.Schema) {
+            return /* @__PURE__ */ new Set();
+          }
+          const schema = JSON.parse(response.Schema);
+          if (!Array.isArray(schema.createOnlyProperties)) {
+            return /* @__PURE__ */ new Set();
+          }
+          const names = /* @__PURE__ */ new Set();
+          for (const property of schema.createOnlyProperties) {
+            const topLevel = topLevelPropertyName(property);
+            if (topLevel) {
+              names.add(topLevel);
+            }
+          }
+          return names;
+        } catch {
+          return /* @__PURE__ */ new Set();
+        }
+      }
       getResourceProperty(logicalId, propertyName) {
         return this.template.Resources?.[logicalId]?.Properties?.[propertyName];
       }
@@ -96002,15 +96054,16 @@ __export(cfn_api_exports, {
 });
 async function createDiffChangeSet(ioHelper, options) {
   try {
-    const { cfn, bodyParameter, exists, executionRoleArn, diagnoser } = await prepareChangeSetEnv(ioHelper, options);
+    const { cfn, bodyParameter, exists, stackExistedBefore, executionRoleArn, diagnoser } = await prepareChangeSetEnv(ioHelper, options);
     await ioHelper.defaults.info(
       "Hold on while we create a read-only change set to get a diff with accurate replacement information (use --method=template to use a less accurate but faster template-only diff)\n"
     );
     return await createChangeSetAndCleanup(ioHelper, {
       cfn,
-      changeSetName: "cdk-diff-change-set",
+      changeSetName: options.changeSetName ?? `cdk-diff-change-set-${options.uuid}`,
       stack: options.stack,
       exists,
+      stackExistedBefore,
       uuid: options.uuid,
       bodyParameter,
       parameters: options.parameters,
@@ -96130,6 +96183,9 @@ async function createChangeSetAndCleanup(ioHelper, options) {
         StackName: stackId,
         ClientRequestToken: (0, import_node_crypto9.randomUUID)()
       });
+      if (!options.stackExistedBefore) {
+        await waitForStackDelete(options.cfn, ioHelper, stackId);
+      }
     }
   }
 }
@@ -96167,6 +96223,7 @@ async function createValidationChangeSet(ioHelper, options) {
         StackName: changeSet.StackId ?? options.stack.stackName,
         ClientRequestToken: (0, import_node_crypto9.randomUUID)()
       }).catch((e6) => ioHelper.defaults.warn(`Failed to clean up REVIEW_IN_PROGRESS stack: ${e6}`));
+      await waitForStackDelete(cfn, ioHelper, changeSet.StackId ?? options.stack.stackName).catch((e6) => ioHelper.defaults.warn(`Failed to wait for REVIEW_IN_PROGRESS stack cleanup: ${e6}`));
     }
   }
 }
@@ -108379,11 +108436,12 @@ var init_ecs_services = __esm({
 });
 
 // ../@aws-cdk/toolkit-lib/lib/api/hotswap/hotswap-template-cache.ts
-function cachePath(assemblyDir, stackName) {
-  return path19.join(assemblyDir, CACHE_DIR, `${stackName}.json`);
+function cachePath(assemblyDir, stackName, environment) {
+  const environmentKey = environment.replace(/[^a-zA-Z0-9_-]/g, "_");
+  return path19.join(assemblyDir, CACHE_DIR, `${stackName}.${environmentKey}.json`);
 }
-async function readHotswapTemplateCache(assemblyDir, stackName, newRootTemplate) {
-  const cachedPath = cachePath(assemblyDir, stackName);
+async function readHotswapTemplateCache(assemblyDir, stackName, newRootTemplate, environment) {
+  const cachedPath = cachePath(assemblyDir, stackName, environment);
   try {
     const cached3 = await fs19.readJson(cachedPath);
     return {
@@ -108394,17 +108452,17 @@ async function readHotswapTemplateCache(assemblyDir, stackName, newRootTemplate)
     return void 0;
   }
 }
-async function writeHotswapTemplateCache(assemblyDir, stackName, rootTemplate, nestedStacks) {
+async function writeHotswapTemplateCache(assemblyDir, stackName, rootTemplate, nestedStacks, environment) {
   const state2 = {
     deployedRootTemplate: rootTemplate,
     nestedStacks: toCachedNestedStacks(nestedStacks)
   };
-  const cachedPath = cachePath(assemblyDir, stackName);
+  const cachedPath = cachePath(assemblyDir, stackName, environment);
   await fs19.ensureDir(path19.dirname(cachedPath));
   await fs19.writeJson(cachedPath, state2, { spaces: 2 });
 }
-async function invalidateHotswapTemplateCache(assemblyDir, stackName) {
-  await fs19.rm(cachePath(assemblyDir, stackName), { force: true });
+async function invalidateHotswapTemplateCache(assemblyDir, stackName, environment) {
+  await fs19.rm(cachePath(assemblyDir, stackName, environment), { force: true });
 }
 function toCachedNestedStacks(nestedStacks) {
   const result2 = {};
@@ -108805,12 +108863,16 @@ async function isHotswappableCloudControlChange(logicalId, change, evaluateCfnTe
   if (changedPropNames.length === 0) {
     return ret;
   }
-  const classifiedChanges = classifyChanges(change, changedPropNames);
+  const resourceType = change.newValue.Type;
+  const createOnlyProps = await evaluateCfnTemplate.getCreateOnlyProperties(resourceType);
+  const classifiedChanges = classifyChanges(
+    change,
+    changedPropNames.filter((name) => !createOnlyProps.has(name))
+  );
   classifiedChanges.reportNonHotswappablePropertyChanges(ret);
   if (classifiedChanges.namesOfHotswappableProps.length === 0) {
     return ret;
   }
-  const resourceType = change.newValue.Type;
   const identifier = await resolveCloudControlIdentifier(logicalId, resourceType, evaluateCfnTemplate);
   if (!identifier) {
     ret.push(nonHotswappableChange(
@@ -109087,18 +109149,18 @@ var require_p_limit = __commonJS({
           queue.dequeue()();
         }
       }, "next");
-      const run5 = /* @__PURE__ */ __name(async (fn, resolve16, ...args) => {
+      const run5 = /* @__PURE__ */ __name(async (fn, resolve17, ...args) => {
         activeCount++;
         const result2 = (async () => fn(...args))();
-        resolve16(result2);
+        resolve17(result2);
         try {
           await result2;
         } catch {
         }
         next();
       }, "run");
-      const enqueue = /* @__PURE__ */ __name((fn, resolve16, ...args) => {
-        queue.enqueue(run5.bind(null, fn, resolve16, ...args));
+      const enqueue = /* @__PURE__ */ __name((fn, resolve17, ...args) => {
+        queue.enqueue(run5.bind(null, fn, resolve17, ...args));
         (async () => {
           await Promise.resolve();
           if (activeCount < concurrency && queue.size > 0) {
@@ -109106,8 +109168,8 @@ var require_p_limit = __commonJS({
           }
         })();
       }, "enqueue");
-      const generator = /* @__PURE__ */ __name((fn, ...args) => new Promise((resolve16) => {
-        enqueue(fn, resolve16, ...args);
+      const generator = /* @__PURE__ */ __name((fn, ...args) => new Promise((resolve17) => {
+        enqueue(fn, resolve17, ...args);
       }), "generator");
       Object.defineProperties(generator, {
         activeCount: {
@@ -109161,7 +109223,8 @@ async function tryHotswapDeployment(sdkProvider, ioHelper, assetParams, cloudFor
 async function hotswapDeployment(sdkProvider, ioSpan, assetParams, stack, hotswapMode, hotswapPropertyOverrides) {
   const resolvedEnv = await sdkProvider.resolveEnvironment(stack.environment);
   const sdk = (await sdkProvider.forEnvironment(resolvedEnv, 1 /* ForWriting */)).sdk;
-  const hotswapCache = await readHotswapTemplateCache(stack.assembly.directory, stack.stackName, stack.template);
+  const environmentKey = `${resolvedEnv.account}/${resolvedEnv.region}`;
+  const hotswapCache = await readHotswapTemplateCache(stack.assembly.directory, stack.stackName, stack.template, environmentKey);
   const currentTemplate = hotswapCache ?? await loadCurrentTemplateWithNestedStacks(stack, sdk);
   const evaluateCfnTemplate = new EvaluateCloudFormationTemplate({
     stackArtifact: stack,
@@ -109204,7 +109267,7 @@ async function hotswapDeployment(sdkProvider, ioSpan, assetParams, stack, hotswa
   let error3;
   try {
     await applyAllHotswapOperations(sdk, ioSpan, hotswappable);
-    await writeHotswapTemplateCache(stack.assembly.directory, stack.stackName, stack.template, currentTemplate.nestedStacks);
+    await writeHotswapTemplateCache(stack.assembly.directory, stack.stackName, stack.template, currentTemplate.nestedStacks, environmentKey);
   } catch (e6) {
     error3 = e6;
   }
@@ -109845,10 +109908,12 @@ async function canSkipDeploy(deployStackOptions, cloudFormationStack, parameterC
     await ioHelper.defaults.debug(`${deployName}: stack is in a failure state`);
     return false;
   }
+  const hotswapCacheEnv = deployStackOptions.resolvedEnvironment;
   const hotswapCache = await readHotswapTemplateCache(
     deployStackOptions.stack.assembly.directory,
     deployStackOptions.stack.stackName,
-    deployStackOptions.stack.template
+    deployStackOptions.stack.template,
+    `${hotswapCacheEnv.account}/${hotswapCacheEnv.region}`
   );
   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`);
@@ -109940,7 +110005,12 @@ var init_deploy_stack = __esm({
       uuid;
       async performDeployment() {
         const deploymentMethod = this.deploymentMethod ?? { method: "change-set" };
-        await invalidateHotswapTemplateCache(this.stackArtifact.assembly.directory, this.stackArtifact.stackName);
+        const deploymentEnv = this.options.resolvedEnvironment;
+        await invalidateHotswapTemplateCache(
+          this.stackArtifact.assembly.directory,
+          this.stackArtifact.stackName,
+          `${deploymentEnv.account}/${deploymentEnv.region}`
+        );
         if (deploymentMethod.method === "direct" && this.options.resourcesToImport) {
           throw new ToolkitError("ImportRequiresChangeSet", "Importing resources requires a changeset deployment");
         }
@@ -110650,18 +110720,18 @@ var init_network_detector = __esm({
           agent,
           timeout: this.TIMEOUT
         };
-        return new Promise((resolve16) => {
+        return new Promise((resolve17) => {
           const req = https.request(
             _NetworkDetector.URL,
             options,
             (res) => {
-              resolve16(res.statusCode !== void 0 && res.statusCode < 500);
+              resolve17(res.statusCode !== void 0 && res.statusCode < 500);
             }
           );
-          req.on("error", () => resolve16(false));
+          req.on("error", () => resolve17(false));
           req.on("timeout", () => {
             req.destroy();
-            resolve16(false);
+            resolve17(false);
           });
           req.end();
         });
@@ -110703,7 +110773,7 @@ var init_web_data_source = __esm({
         const options = {
           agent: this.agent
         };
-        const notices = await new Promise((resolve16, reject) => {
+        const notices = await new Promise((resolve17, reject) => {
           let req;
           let timer = setTimeout(() => {
             if (req) {
@@ -110728,7 +110798,7 @@ var init_web_data_source = __esm({
                       if (!data) {
                         throw new ToolkitError("MissingNoticesKey", "'notices' key is missing from received data");
                       }
-                      resolve16(data ?? []);
+                      resolve17(data ?? []);
                     } catch (e6) {
                       reject(ToolkitError.withCause("NoticesParseError", `Parse error: ${formatErrorMessage(e6)}`, e6));
                     }
@@ -112006,10 +112076,11 @@ function bootstrapVersionFromTemplate(template) {
 function bootstrapVariantFromTemplate(template) {
   return template.Parameters?.[BOOTSTRAP_VARIANT_PARAMETER]?.Default ?? DEFAULT_BOOTSTRAP_VARIANT;
 }
-var os6, path23, import_cloud_assembly_api6, import_cloud_assembly_schema5, fs23, BootstrapStack;
+var import_node_crypto12, os6, path23, import_cloud_assembly_api6, import_cloud_assembly_schema5, fs23, BootstrapStack;
 var init_deploy_bootstrap = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/bootstrap/deploy-bootstrap.ts"() {
     "use strict";
+    import_node_crypto12 = require("node:crypto");
     os6 = __toESM(require("os"));
     path23 = __toESM(require("path"));
     import_cloud_assembly_api6 = __toESM(require_lib3());
@@ -112119,6 +112190,11 @@ var init_deploy_bootstrap = __esm({
             deploymentMethod: {
               method: "change-set",
               execute: options.execute,
+              // A unique name when executing, so parallel bootstraps don't collide.
+              // With --no-execute the change set is left in review for the user, so
+              // keep the stable default name: re-running replaces the pending change
+              // set instead of accumulating one per run.
+              changeSetName: options.execute ?? true ? `cdk-bootstrap-change-set-${(0, import_node_crypto12.randomUUID)()}` : void 0,
               importExistingResources: options.importExistingResources ?? true
             },
             parameters,
@@ -112987,6 +113063,20 @@ async function writeFileAtomic(filename, contents) {
   await import_fs3.promises.writeFile(tmpFile, contents, { encoding: "utf-8" });
   await import_fs3.promises.rename(tmpFile, filename);
 }
+async function writeLockFile(filename, contents) {
+  await writeFileAtomic(filename, contents);
+  ownedLockFiles.add(filename);
+}
+async function deleteLockFile(filename) {
+  ownedLockFiles.delete(filename);
+  await deleteFile(filename);
+}
+function isStale(filename, pid) {
+  if (pid === process.pid) {
+    return !ownedLockFiles.has(filename);
+  }
+  return !processExists(pid);
+}
 async function deleteFile(filename) {
   try {
     await import_fs3.promises.unlink(filename);
@@ -113005,18 +113095,20 @@ function processExists(pid) {
     return false;
   }
 }
-var import_fs3, path26, RWLock, tmpCounter;
+var import_fs3, path26, ownedLockFiles, readCounter, RWLock, tmpCounter;
 var init_rwlock = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/rwlock.ts"() {
     "use strict";
     import_fs3 = require("fs");
     path26 = __toESM(require("path"));
     init_toolkit_error();
+    ownedLockFiles = /* @__PURE__ */ new Set();
+    readCounter = 0;
     RWLock = class {
       constructor(directory) {
         this.directory = directory;
         this.pidString = `${process.pid}`;
-        this.writerFile = path26.join(this.directory, "synth.lock");
+        this.writerFile = path26.resolve(this.directory, "synth.lock");
       }
       directory;
       static {
@@ -113024,7 +113116,6 @@ var init_rwlock = __esm({
       }
       pidString;
       writerFile;
-      readCounter = 0;
       /**
        * Acquire a writer lock.
        *
@@ -113036,18 +113127,18 @@ var init_rwlock = __esm({
         if (readers.length > 0) {
           throw new LockError("ConcurrentReadLock", `Other CLIs (PID=${readers}) are currently reading from ${this.directory}. Invoke the CLI in sequence, or use '--output' to synth into different directories.`);
         }
-        await writeFileAtomic(this.writerFile, this.pidString);
+        await writeLockFile(this.writerFile, this.pidString);
         let released = false;
         return {
           release: /* @__PURE__ */ __name(async () => {
             if (!released) {
-              await deleteFile(this.writerFile);
+              await deleteLockFile(this.writerFile);
               released = true;
             }
           }, "release"),
           convertToReaderLock: /* @__PURE__ */ __name(async () => {
             const ret = await this.doAcquireRead();
-            await deleteFile(this.writerFile);
+            await deleteLockFile(this.writerFile);
             return ret;
           }, "convertToReaderLock")
         };
@@ -113069,19 +113160,19 @@ var init_rwlock = __esm({
        * is incremented "atomically" from the point of view of this PID.).
        */
       readerFile() {
-        return path26.join(this.directory, `read.${this.pidString}.${++this.readCounter}.lock`);
+        return path26.resolve(this.directory, `read.${this.pidString}.${++readCounter}.lock`);
       }
       /**
        * Do the actual acquiring of a read lock.
        */
       async doAcquireRead() {
         const readerFile = this.readerFile();
-        await writeFileAtomic(readerFile, this.pidString);
+        await writeLockFile(readerFile, this.pidString);
         let released = false;
         return {
           release: /* @__PURE__ */ __name(async () => {
             if (!released) {
-              await deleteFile(readerFile);
+              await deleteLockFile(readerFile);
               released = true;
             }
           }, "release")
@@ -113106,7 +113197,7 @@ var init_rwlock = __esm({
           return void 0;
         }
         const pid = parseInt(contents, 10);
-        if (!processExists(pid)) {
+        if (isStale(this.writerFile, pid)) {
           await deleteFile(this.writerFile);
           return void 0;
         }
@@ -113135,10 +113226,11 @@ var init_rwlock = __esm({
           const m4 = fname.match(re);
           if (m4) {
             const pid = parseInt(m4[1], 10);
-            if (processExists(pid)) {
-              ret.push(pid);
+            const file = path26.resolve(this.directory, fname);
+            if (isStale(file, pid)) {
+              await deleteFile(file);
             } else {
-              await deleteFile(path26.join(this.directory, fname));
+              ret.push(pid);
             }
           }
         }
@@ -113148,6 +113240,9 @@ var init_rwlock = __esm({
     __name(readFileIfExists, "readFileIfExists");
     tmpCounter = 0;
     __name(writeFileAtomic, "writeFileAtomic");
+    __name(writeLockFile, "writeLockFile");
+    __name(deleteLockFile, "deleteLockFile");
+    __name(isStale, "isStale");
     __name(deleteFile, "deleteFile");
     __name(processExists, "processExists");
   }
@@ -285229,7 +285324,7 @@ var require_dist_cjs45 = __commonJS({
         return (numFailures) => Math.pow(1.2, numFailures);
       }
       sleep(ms) {
-        return new Promise((resolve16) => setTimeout(resolve16, ms));
+        return new Promise((resolve17) => setTimeout(resolve17, ms));
       }
       async retryWithBackoff(operation2) {
         let lastError;
@@ -285712,7 +285807,7 @@ async function v3ProviderFromPlugin(producer) {
   } else if (isV2Credentials(initial)) {
     return v3ProviderFromV2Credentials(initial);
   } else {
-    throw new AuthenticationError("InvalidPluginCredentials", `Plugin returned a value that doesn't resemble AWS credentials: ${(0, import_util45.inspect)(initial)}`);
+    throw new AuthenticationError("InvalidPluginCredentials", `Plugin returned a value that doesn't resemble AWS credentials (got ${describeShape(initial)})`);
   }
 }
 function v3ProviderFromV2Credentials(x) {
@@ -285731,7 +285826,7 @@ function refreshFromPluginProvider(current, producer) {
     if (credentialsAboutToExpire(current)) {
       const newCreds = await producer();
       if (!isV3Credentials(newCreds)) {
-        throw new AuthenticationError("PluginCredentialTypeMismatch", `Plugin initially returned static V3 credentials but now returned something else: ${(0, import_util45.inspect)(newCreds)}`);
+        throw new AuthenticationError("PluginCredentialTypeMismatch", `Plugin initially returned static V3 credentials but now returned something else (got ${describeShape(newCreds)})`);
       }
       current = newCreds;
     }
@@ -285741,17 +285836,22 @@ function refreshFromPluginProvider(current, producer) {
 function isV3Provider(x) {
   return typeof x === "function";
 }
+function describeShape(x) {
+  if (x && typeof x === "object") {
+    return `an object with keys [${Object.keys(x).join(", ")}]`;
+  }
+  return x === null ? "null" : `a value of type ${typeof x}`;
+}
 function isV2Credentials(x) {
   return !!(x && typeof x === "object" && x.getPromise);
 }
 function isV3Credentials(x) {
   return !!(x && typeof x === "object" && x.accessKeyId && !isV2Credentials(x));
 }
-var import_util45, CredentialPlugins;
+var CredentialPlugins;
 var init_credential_plugins = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/aws-auth/credential-plugins.ts"() {
     "use strict";
-    import_util45 = require("util");
     init_provider_caching();
     init_toolkit_error();
     init_util4();
@@ -285817,6 +285917,7 @@ var init_credential_plugins = __esm({
     __name(v3ProviderFromV2Credentials, "v3ProviderFromV2Credentials");
     __name(refreshFromPluginProvider, "refreshFromPluginProvider");
     __name(isV3Provider, "isV3Provider");
+    __name(describeShape, "describeShape");
     __name(isV2Credentials, "isV2Credentials");
     __name(isV3Credentials, "isV3Credentials");
   }
@@ -286150,7 +286251,7 @@ function formatSdkLoggerContent(content) {
       return apiFmt;
     }
   }
-  return content.map((x) => typeof x === "string" ? x : (0, import_util48.inspect)(x)).join("");
+  return content.map((x) => typeof x === "string" ? x : (0, import_util47.inspect)(x)).join("");
 }
 function formatApiCall(content) {
   if (!isSdkApiCallSuccess(content) && !isSdkApiCallError(content)) {
@@ -286176,11 +286277,11 @@ function isSdkApiCallSuccess(x) {
 function isSdkApiCallError(x) {
   return x && typeof x === "object" && x.commandName && x.error;
 }
-var import_util48, IoHostSdkLogger;
+var import_util47, IoHostSdkLogger;
 var init_sdk_logger = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/aws-auth/sdk-logger.ts"() {
     "use strict";
-    import_util48 = require("util");
+    import_util47 = require("util");
     init_util4();
     init_private();
     IoHostSdkLogger = class {
@@ -286192,7 +286293,7 @@ var init_sdk_logger = __esm({
         this.ioHelper = ioHelper;
       }
       notify(level, ...content) {
-        void this.ioHelper.notify(IO.CDK_SDK_I0100.msg((0, import_util48.format)("[SDK %s] %s", level, formatSdkLoggerContent(content)), {
+        void this.ioHelper.notify(IO.CDK_SDK_I0100.msg((0, import_util47.format)("[SDK %s] %s", level, formatSdkLoggerContent(content)), {
           sdkLevel: level,
           content
         }));
@@ -288689,7 +288790,7 @@ var require_placeholders = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.EnvironmentPlaceholders = void 0;
-    var EnvironmentPlaceholders6 = class _EnvironmentPlaceholders {
+    var EnvironmentPlaceholders5 = class _EnvironmentPlaceholders {
       static {
         __name(this, "EnvironmentPlaceholders");
       }
@@ -288753,10 +288854,10 @@ var require_placeholders = __commonJS({
         return ret;
       }
     };
-    exports2.EnvironmentPlaceholders = EnvironmentPlaceholders6;
-    EnvironmentPlaceholders6.CURRENT_REGION = "${AWS::Region}";
-    EnvironmentPlaceholders6.CURRENT_ACCOUNT = "${AWS::AccountId}";
-    EnvironmentPlaceholders6.CURRENT_PARTITION = "${AWS::Partition}";
+    exports2.EnvironmentPlaceholders = EnvironmentPlaceholders5;
+    EnvironmentPlaceholders5.CURRENT_REGION = "${AWS::Region}";
+    EnvironmentPlaceholders5.CURRENT_ACCOUNT = "${AWS::AccountId}";
+    EnvironmentPlaceholders5.CURRENT_PARTITION = "${AWS::Partition}";
     function replaceAll2(s2, search, replace) {
       return s2.split(search).join(replace);
     }
@@ -291276,12 +291377,12 @@ var init_readable_assembly = __esm({
 });
 
 // ../@aws-cdk/toolkit-lib/lib/api/cloud-assembly/source-builder.ts
-var path31, import_util53, cxapi6, fs31, CloudAssemblySourceBuilder;
+var path31, import_util52, cxapi6, fs31, CloudAssemblySourceBuilder;
 var init_source_builder = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/cloud-assembly/source-builder.ts"() {
     "use strict";
     path31 = __toESM(require("path"));
-    import_util53 = require("util");
+    import_util52 = require("util");
     cxapi6 = __toESM(require_lib3());
     fs31 = __toESM(require_lib4());
     init_context_store();
@@ -291347,7 +291448,7 @@ var init_source_builder = __esm({
                   ...await contextStore.read(),
                   ...synthParams.context
                 };
-                await services.ioHelper.defaults.debug((0, import_util53.format)("context:", fullContext));
+                await services.ioHelper.defaults.debug((0, import_util52.format)("context:", fullContext));
                 const env3 = noUndefined({
                   // Versioning, outdir, default account and region
                   ...await execution.defaultEnvVars(),
@@ -291393,6 +291494,14 @@ var init_source_builder = __esm({
        * the CloudAssembly is being used, no CDK app synthesis can take place into
        * that directory.
        *
+       * @remarks
+       * A Cloud Assembly is a trust boundary. Do not deploy Cloud Assemblies
+       * from sources you do not trust. Building assets from an external directory
+       * can run external code. The author who synthesized the Cloud Assembly, or
+       * anyone who can modify it between synthesis and deployment, can affect what
+       * code runs on your shell environment, as well as what resources are deployed
+       * using your AWS credentials.
+       *
        * @param directory - directory the directory of a already produced Cloud Assembly.
        * @returns the CloudAssembly source
        */
@@ -291486,7 +291595,7 @@ var init_source_builder = __esm({
                   ...await contextStore.read(),
                   ...synthParams.context
                 };
-                await services.ioHelper.defaults.debug((0, import_util53.format)("context:", fullContext));
+                await services.ioHelper.defaults.debug((0, import_util52.format)("context:", fullContext));
                 const env3 = noUndefined({
                   // Need to start with full env of `writeContextToEnv` will not be able to do the size
                   // calculation correctly.
@@ -292506,14 +292615,13 @@ var init_io = __esm({
 });
 
 // ../@aws-cdk/toolkit-lib/lib/api/logs-monitor/logs-monitor.ts
-var import_node_crypto12, util7, import_chalk16, CloudWatchLogEventMonitor;
+var import_node_crypto13, util7, import_chalk16, CloudWatchLogEventMonitor;
 var init_logs_monitor2 = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/logs-monitor/logs-monitor.ts"() {
     "use strict";
-    import_node_crypto12 = require("node:crypto");
+    import_node_crypto13 = require("node:crypto");
     util7 = __toESM(require("node:util"));
     import_chalk16 = __toESM(require_source());
-    init_util4();
     init_private();
     CloudWatchLogEventMonitor = class {
       static {
@@ -292546,7 +292654,7 @@ var init_logs_monitor2 = __esm({
        * resume reading/printing events
        */
       async activate() {
-        this.monitorId = (0, import_node_crypto12.randomUUID)();
+        this.monitorId = (0, import_node_crypto13.randomUUID)();
         await this.ioHelper.notify(IO.CDK_TOOLKIT_I5032.msg("Start monitoring log groups", {
           monitor: this.monitorId,
           logGroupNames: this.logGroupNames()
@@ -292611,27 +292719,44 @@ var init_logs_monitor2 = __esm({
           return;
         }
         try {
-          const events = flatten2(await this.readNewEvents());
-          for (const event of events) {
-            await this.print(event);
+          for (const result2 of await this.readNewEvents()) {
+            if ("error" in result2) {
+              await this.reportError(result2.error);
+              continue;
+            }
+            for (const event of result2.events) {
+              await this.print(event);
+            }
           }
           if (!this.monitorId) {
             return;
           }
         } catch (e6) {
-          await this.ioHelper.notify(IO.CDK_TOOLKIT_E5035.msg(`Error occurred while monitoring logs: ${String(e6)}`, { error: e6 }));
+          await this.reportError(e6);
         }
         this.scheduleNextTick();
       }
+      async reportError(e6) {
+        if (e6?.name === "ThrottlingException") {
+          await this.ioHelper.defaults.debug(`Throttled while monitoring logs, will retry: ${String(e6)}`);
+          return;
+        }
+        await this.ioHelper.notify(IO.CDK_TOOLKIT_E5035.msg(`Error occurred while monitoring logs: ${String(e6)}`, { error: e6 }));
+      }
       /**
        * Reads all new log events from a set of CloudWatch Log Groups
        * in parallel
+       *
+       * A failure for one log group does not discard the events of the other log groups.
        */
       async readNewEvents() {
         const promises8 = [];
         for (const settings of this.envsLogGroupsAccessSettings.values()) {
           for (const group4 of Object.keys(settings.logGroupsStartTimes)) {
-            promises8.push(this.readEventsFromLogGroup(settings, group4));
+            promises8.push(this.readEventsFromLogGroup(settings, group4).then(
+              (events) => ({ events }),
+              (error3) => ({ error: error3 })
+            ));
           }
         }
         return Promise.all(promises8);
@@ -292813,11 +292938,11 @@ function removeNonImportResources(stack) {
   delete template.Outputs;
   return template;
 }
-var import_util57, cfnDiff, import_chalk17, fs32, ResourceImporter;
+var import_util55, cfnDiff, import_chalk17, fs32, ResourceImporter;
 var init_importer = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/resource-import/importer.ts"() {
     "use strict";
-    import_util57 = require("util");
+    import_util55 = require("util");
     cfnDiff = __toESM(require_lib9());
     import_chalk17 = __toESM(require_source());
     fs32 = __toESM(require_lib4());
@@ -292881,12 +293006,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_util57.format)("%s: importing using %s", import_chalk17.default.blue(descr), import_chalk17.default.blue(fmtdict(idProps))));
+            await this.ioHelper.defaults.info((0, import_util55.format)("%s: importing using %s", import_chalk17.default.blue(descr), import_chalk17.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_util57.format)("%s: skipping", import_chalk17.default.blue(descr)));
+            await this.ioHelper.defaults.info((0, import_util55.format)("%s: skipping", import_chalk17.default.blue(descr)));
           }
         }
         const unknown = Object.keys(remaining);
@@ -292930,9 +293055,9 @@ var init_importer = __esm({
           });
           assertIsSuccessfulDeployStackResult(result2);
           const message2 = result2.noOp ? "\u2705  %s (no changes)" : "\u2705  %s";
-          await this.ioHelper.defaults.info("\n" + import_chalk17.default.green((0, import_util57.format)(message2, this.stack.displayName)));
+          await this.ioHelper.defaults.info("\n" + import_chalk17.default.green((0, import_util55.format)(message2, this.stack.displayName)));
         } catch (e6) {
-          await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0, import_util57.format)("\n \u274C  %s failed: %s", import_chalk17.default.bold(this.stack.displayName), e6), { error: e6 }));
+          await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0, import_util55.format)("\n \u274C  %s failed: %s", import_chalk17.default.bold(this.stack.displayName), e6), { error: e6 }));
           throw e6;
         }
       }
@@ -293062,7 +293187,7 @@ var init_importer = __esm({
           for (const idProp of idProps) {
             const defaultValue2 = resourceProps[idProp] ?? "";
             const response = await this.ioHelper.requestResponse(IO.CDK_TOOLKIT_I3110.req(
-              (0, import_util57.format)(promptPattern, import_chalk17.default.blue(idProp)),
+              (0, import_util55.format)(promptPattern, import_chalk17.default.blue(idProp)),
               {
                 resource: {
                   name: resourceName,
@@ -293344,10 +293469,11 @@ var init_private4 = __esm({
 });
 
 // ../@aws-cdk/toolkit-lib/lib/api/orphan/orphaner.ts
-var ResourceOrphaner;
+var import_node_crypto14, ResourceOrphaner;
 var init_orphaner = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/orphan/orphaner.ts"() {
     "use strict";
+    import_node_crypto14 = require("node:crypto");
     init_private4();
     init_toolkit_error();
     ResourceOrphaner = class {
@@ -293402,6 +293528,7 @@ var init_orphaner = __esm({
       async execute(stack, logicalIds, currentTemplate) {
         const env3 = await this.deployments.envs.accessStackForReadOnlyStackOperations(stack);
         const cfn = env3.sdk.cloudFormation();
+        const operationId = (0, import_node_crypto14.randomUUID)();
         const stackResources = await cfn.listStackResources({ StackName: stack.stackName });
         const physicalIds = /* @__PURE__ */ new Map();
         for (const res of stackResources) {
@@ -293410,7 +293537,7 @@ var init_orphaner = __esm({
           }
         }
         await this.ioHelper.defaults.info("Step 1/3: Resolving attribute values...");
-        const resolvedValues = await this.resolveGetAttValues(stack, cfn, logicalIds, currentTemplate, physicalIds);
+        const resolvedValues = await this.resolveGetAttValues(stack, cfn, logicalIds, currentTemplate, physicalIds, operationId);
         await this.ioHelper.defaults.info("Step 2/3: Decoupling resources...");
         const decoupledTemplate = JSON.parse(JSON.stringify(currentTemplate));
         for (const id of logicalIds) {
@@ -293419,7 +293546,7 @@ var init_orphaner = __esm({
           decoupledTemplate.Resources[id].DeletionPolicy = "Retain";
           decoupledTemplate.Resources[id].UpdateReplacePolicy = "Retain";
         }
-        const step2Result = await this.deployStack(stack, decoupledTemplate, "cdk-orphan-step2");
+        const step2Result = await this.deployStack(stack, decoupledTemplate, `cdk-orphan-step2-${operationId}`);
         assertDeploySucceeded(step2Result, "Step 2");
         await this.ioHelper.defaults.info("Step 3/3: Removing resources from stack...");
         const removalTemplate = JSON.parse(JSON.stringify(decoupledTemplate));
@@ -293427,7 +293554,7 @@ var init_orphaner = __esm({
           delete removalTemplate.Resources[id];
         }
         ensureNonEmptyResources(removalTemplate);
-        const step3Result = await this.deployStack(stack, removalTemplate, "cdk-orphan-step3");
+        const step3Result = await this.deployStack(stack, removalTemplate, `cdk-orphan-step3-${operationId}`);
         assertDeploySucceeded(step3Result, "Step 3");
         if (step3Result.noOp) {
           throw new ToolkitError(
@@ -293463,7 +293590,7 @@ var init_orphaner = __esm({
        *
        * Returns a complete map of resolved values (Ref + attrs) for each logical ID.
        */
-      async resolveGetAttValues(stack, cfn, logicalIds, currentTemplate, physicalIds) {
+      async resolveGetAttValues(stack, cfn, logicalIds, currentTemplate, physicalIds, operationId) {
         const values = /* @__PURE__ */ new Map();
         for (const id of logicalIds) {
           const physicalId = physicalIds.get(id);
@@ -293485,7 +293612,7 @@ var init_orphaner = __esm({
             Value: { "Fn::GetAtt": [ref.logicalId, ref.attr] }
           };
         }
-        const step1Result = await this.deployStack(stack, resolveTemplate, "cdk-orphan-step1");
+        const step1Result = await this.deployStack(stack, resolveTemplate, `cdk-orphan-step1-${operationId}`);
         assertDeploySucceeded(step1Result, "Step 1");
         const stackDesc = await cfn.describeStacks({ StackName: stack.stackName });
         for (const output of stackDesc.Stacks?.[0]?.Outputs ?? []) {
@@ -294436,10 +294563,10 @@ var init_stack_refresh = __esm({
         if (this.lastRefreshTime >= horizon) {
           return Promise.resolve();
         }
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           const onRefresh = /* @__PURE__ */ __name(() => {
             clearTimeout(timeoutHandle);
-            resolve16(void 0);
+            resolve17(void 0);
           }, "onRefresh");
           this.queuedPromises.push(onRefresh);
           const timeoutHandle = setTimeout(() => {
@@ -296068,7 +296195,7 @@ var init_handler = __esm({
             this._addToNodeFs(path54, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           if (!stream)
             return reject();
           stream.once(STR_END, () => {
@@ -296077,7 +296204,7 @@ var init_handler = __esm({
               return;
             }
             const wasThrottled = throttler ? throttler.clear() : false;
-            resolve16(void 0);
+            resolve17(void 0);
             previous.getChildren().filter((item) => {
               return item !== directory && !current.has(item);
             }).forEach((item) => {
@@ -298620,7 +298747,7 @@ function partitionByAmbiguity(overrides, moves) {
       nonAmbiguous.push(move);
     } else {
       for (const override of overrides) {
-        const resolvedMove = resolve16(override, move);
+        const resolvedMove = resolve17(override, move);
         if (resolvedMove != null) {
           nonAmbiguous.push(resolvedMove);
           move = remove2(override, move);
@@ -298633,13 +298760,13 @@ function partitionByAmbiguity(overrides, moves) {
       }
     }
   }
-  function resolve16(override, move) {
+  function resolve17(override, move) {
     const [pre, post] = move;
     const source = pre.find((loc) => loc.equalTo(override.source));
     const destination = post.find((loc) => loc.equalTo(override.destination));
     return source && destination ? [[source], [destination]] : void 0;
   }
-  __name(resolve16, "resolve");
+  __name(resolve17, "resolve");
   function remove2(override, move) {
     const [pre, post] = move;
     return [
@@ -298650,41 +298777,17 @@ function partitionByAmbiguity(overrides, moves) {
   __name(remove2, "remove");
   return [nonAmbiguous, ambiguous];
 }
-async function replaceAwsPlaceholders2(object, aws) {
-  let partition4 = /* @__PURE__ */ __name(async () => {
-    const p3 = await aws.discoverPartition();
-    partition4 = /* @__PURE__ */ __name(() => Promise.resolve(p3), "partition");
-    return p3;
-  }, "partition");
-  let account = /* @__PURE__ */ __name(async () => {
-    const a6 = await aws.discoverCurrentAccount();
-    account = /* @__PURE__ */ __name(() => Promise.resolve(a6), "account");
-    return a6;
-  }, "account");
-  return import_cloud_assembly_api13.EnvironmentPlaceholders.replaceAsync(object, {
-    async region() {
-      return object.region ?? aws.discoverDefaultRegion();
-    },
-    async accountId() {
-      return (await account()).accountId;
-    },
-    async partition() {
-      return partition4();
-    }
-  });
-}
-var import_cdk_assets_lib5, import_cloud_assembly_api13, RefactoringContext;
+var RefactoringContext;
 var init_context3 = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/refactoring/context.ts"() {
     "use strict";
-    import_cdk_assets_lib5 = __toESM(require_lib5());
-    import_cloud_assembly_api13 = __toESM(require_lib3());
     init_cloudformation4();
     init_digest();
     init_toolkit_error();
     init_sets();
     init_cfn_api();
     init_environment2();
+    init_placeholders3();
     init_plugin2();
     RefactoringContext = class {
       static {
@@ -298785,8 +298888,8 @@ var init_context3 = __esm({
         const arn = Array.from(roleArns)[0];
         if (arn != null) {
           const resolvedEnv = await sdkProvider.resolveEnvironment(env3);
-          const region = resolvedEnv.region;
-          return (await replaceAwsPlaceholders2({ region, assumeRoleArn: arn }, new import_cdk_assets_lib5.DefaultAwsClient())).assumeRoleArn;
+          const { assumeRoleArn } = await replaceEnvPlaceholders({ assumeRoleArn: arn }, resolvedEnv, sdkProvider);
+          return assumeRoleArn;
         }
         return void 0;
       }
@@ -298800,7 +298903,6 @@ var init_context3 = __esm({
     __name(isAmbiguousMove, "isAmbiguousMove");
     __name(resourceMappings, "resourceMappings");
     __name(partitionByAmbiguity, "partitionByAmbiguity");
-    __name(replaceAwsPlaceholders2, "replaceAwsPlaceholders");
   }
 });
 
@@ -299005,7 +299107,8 @@ async function cfnDiff2(ioHelper, stacks, deployments, options, sdkProvider, inc
       parameters: methodOptions.parameters ?? {},
       failOnError: !(methodOptions.fallbackToTemplate ?? true),
       importExistingResources: methodOptions.importExistingResources,
-      uuid: (0, import_node_crypto13.randomUUID)()
+      changeSetName: methodOptions.changeSetName,
+      uuid: (0, import_node_crypto15.randomUUID)()
     }))?.changeSet : void 0;
     if (changeSet) {
       await attachNestedChangeSetData(ioHelper, deployments, stack, changeSet, nestedStacks);
@@ -299058,11 +299161,11 @@ function appendObject(obj1, obj2) {
   }
   return obj1;
 }
-var import_node_crypto13, fs34;
+var import_node_crypto15, fs34;
 var init_helpers5 = __esm({
   "../@aws-cdk/toolkit-lib/lib/actions/diff/private/helpers.ts"() {
     "use strict";
-    import_node_crypto13 = require("node:crypto");
+    import_node_crypto15 = require("node:crypto");
     fs34 = __toESM(require_lib4());
     init_diff4();
     init_change_sets();
@@ -299092,8 +299195,8 @@ function countAssemblyResults(span, assembly) {
   const stacksRecursively = assembly.stacksRecursively;
   span.incCounter("stacks", stacksRecursively.length);
   span.incCounter("assemblies", asmCount(assembly));
-  span.incCounter("errorAnns", sum3(stacksRecursively.map((s2) => s2.messages.filter((m4) => m4.level === import_cloud_assembly_api14.SynthesisMessageLevel.ERROR).length)));
-  span.incCounter("warnings", sum3(stacksRecursively.map((s2) => s2.messages.filter((m4) => m4.level === import_cloud_assembly_api14.SynthesisMessageLevel.WARNING).length)));
+  span.incCounter("errorAnns", sum3(stacksRecursively.map((s2) => s2.messages.filter((m4) => m4.level === import_cloud_assembly_api13.SynthesisMessageLevel.ERROR).length)));
+  span.incCounter("warnings", sum3(stacksRecursively.map((s2) => s2.messages.filter((m4) => m4.level === import_cloud_assembly_api13.SynthesisMessageLevel.WARNING).length)));
   const annotationErrorCodes = stacksRecursively.flatMap((s2) => Object.values(s2.metadata ?? {}).flatMap((ms) => ms.filter((m4) => m4.type === ANNOTATION_ERROR_CODE_TYPE)));
   for (const annotationErrorCode of annotationErrorCodes) {
     span.incCounter(`errorAnn:${annotationErrorCode.data}`);
@@ -299106,11 +299209,11 @@ function countAssemblyResults(span, assembly) {
 function sum3(xs) {
   return xs.reduce((a6, b6) => a6 + b6, 0);
 }
-var import_cloud_assembly_api14, ANNOTATION_ERROR_CODE_TYPE;
+var import_cloud_assembly_api13, ANNOTATION_ERROR_CODE_TYPE;
 var init_count_assembly_results = __esm({
   "../@aws-cdk/toolkit-lib/lib/toolkit/private/count-assembly-results.ts"() {
     "use strict";
-    import_cloud_assembly_api14 = __toESM(require_lib3());
+    import_cloud_assembly_api13 = __toESM(require_lib3());
     __name(countAssemblyResults, "countAssemblyResults");
     __name(sum3, "sum");
     ANNOTATION_ERROR_CODE_TYPE = "aws:cdk:error-code";
@@ -299438,7 +299541,7 @@ async function waitForDriftDetection(cfn, ioHelper, driftDetectionId) {
       await ioHelper.defaults.trace("Waiting for drift detection to complete...");
       checkIn = Date.now() + timeBetweenOutputs;
     }
-    await new Promise((resolve16) => setTimeout(resolve16, timeBetweenApiCalls));
+    await new Promise((resolve17) => setTimeout(resolve17, timeBetweenApiCalls));
   }
 }
 var import_node_util8;
@@ -299955,27 +300058,25 @@ function hasWarnings(reports) {
   return reports.some((r6) => r6.violations.some((v) => v.severity === "warning"));
 }
 function filterReportsByStacks(reports, selectedStackIds) {
-  return reports.map((report) => {
-    const filteredViolations = report.violations.filter((violation) => {
-      if (violation.violatingConstructs.length === 0) return true;
-      return violation.violatingConstructs.some(
-        (c6) => selectedStackIds.has(c6.constructPath?.split("/")[0] ?? "")
-      );
-    }).map((violation) => {
-      if (violation.violatingConstructs.length === 0) return violation;
-      return {
-        ...violation,
-        violatingConstructs: violation.violatingConstructs.filter(
-          (c6) => selectedStackIds.has(c6.constructPath?.split("/")[0] ?? "")
-        )
-      };
-    });
+  const stackIds = Array.from(selectedStackIds);
+  return reports.map(filterReport);
+  function filterReport(report) {
+    const violationsWithoutConstructs = new Set(report.violations.flatMap((v, i6) => v.violatingConstructs.length === 0 ? [i6] : []));
+    const filteredViolations = report.violations.map((v) => ({
+      ...v,
+      violatingConstructs: v.violatingConstructs.filter(constructMatches)
+    })).filter((v, i6) => v.violatingConstructs.length > 0 || violationsWithoutConstructs.has(i6));
     return {
       ...report,
       violations: filteredViolations,
       conclusion: filteredViolations.length > 0 ? report.conclusion : "success"
     };
-  });
+  }
+  __name(filterReport, "filterReport");
+  function constructMatches(c6) {
+    return !c6.constructPath || stackIds.some((stackId) => c6.constructPath === stackId || c6.constructPath?.startsWith(`${stackId}/`));
+  }
+  __name(constructMatches, "constructMatches");
 }
 var path34, import_cloud_assembly_schema6, fs35, VALIDATION_REPORT_FILE2, CONSTRUCT_ANNOTATIONS_PLUGINNAME;
 var init_validation_report = __esm({
@@ -300019,12 +300120,12 @@ async function synthAndMeasure(ioHelper, cx, selectStacks) {
 function zeroTime() {
   return { asMs: 0, asSec: 0 };
 }
-var import_dispose_polyfill7, import_node_crypto14, path35, cxapi11, import_cloud_assembly_schema7, import_chalk29, fs36, FILE_EVENTS, Toolkit;
+var import_dispose_polyfill7, import_node_crypto16, path35, cxapi11, import_cloud_assembly_schema7, import_chalk29, fs36, FILE_EVENTS, Toolkit;
 var init_toolkit = __esm({
   "../@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts"() {
     "use strict";
     import_dispose_polyfill7 = __toESM(require_dispose_polyfill());
-    import_node_crypto14 = require("node:crypto");
+    import_node_crypto16 = require("node:crypto");
     path35 = __toESM(require("node:path"));
     cxapi11 = __toESM(require_lib3());
     import_cloud_assembly_schema7 = __toESM(require_lib2());
@@ -300586,7 +300687,7 @@ var init_toolkit = __esm({
               deployments,
               stack,
               parameters: {},
-              uuid: (0, import_node_crypto14.randomUUID)(),
+              uuid: (0, import_node_crypto16.randomUUID)(),
               failOnError: true
             });
             const diagnosis = report.diagnosis.result;
@@ -302588,7 +302689,7 @@ async function getOrCreateInstallationId(ioHelper) {
         return cachedId;
       }
     }
-    const newId = (0, import_node_crypto15.randomUUID)();
+    const newId = (0, import_node_crypto17.randomUUID)();
     try {
       await ensureCacheDir();
       fs37.writeFileSync(installationIdPath, newId);
@@ -302598,17 +302699,17 @@ async function getOrCreateInstallationId(ioHelper) {
     return newId;
   } catch (e6) {
     await ioHelper.defaults.trace(`Error getting installation ID: ${e6}`);
-    return (0, import_node_crypto15.randomUUID)();
+    return (0, import_node_crypto17.randomUUID)();
   }
 }
 async function ensureCacheDir() {
   await fs37.promises.mkdir(cdkCacheDir(), { recursive: true });
 }
-var import_node_crypto15, fs37, path36;
+var import_node_crypto17, fs37, path36;
 var init_installation_id = __esm({
   "lib/cli/telemetry/installation-id.ts"() {
     "use strict";
-    import_node_crypto15 = require("node:crypto");
+    import_node_crypto17 = require("node:crypto");
     fs37 = __toESM(require("node:fs"));
     path36 = __toESM(require("node:path"));
     init_util9();
@@ -302830,7 +302931,7 @@ var require_cli_type_registry = __commonJS({
         "debug-cli": {
           type: "boolean",
           default: false,
-          desc: "Debug the CDK CLI itself."
+          desc: "Debug the CDK CLI itself. Reports what is keeping the CLI process alive if it fails to exit, and raises the CLI log level to show that report. Will slow down execution."
         },
         profile: {
           type: "string",
@@ -303704,6 +303805,10 @@ var require_cli_type_registry = __commonJS({
               default: true,
               deprecated: "use --method instead"
             },
+            "change-set-name": {
+              type: "string",
+              desc: "Name of the CloudFormation change set to create (only if method is not template)"
+            },
             method: {
               alias: "m",
               type: "string",
@@ -304317,11 +304422,11 @@ async function tryDetectAmznPackage() {
   }
   return void 0;
 }
-var import_node_crypto16, fs41, os11, pathlib, import_toolkit_lib3, ABORTED_ERROR_MESSAGE, VALID_USER_AGENTS, TelemetrySession;
+var import_node_crypto18, fs41, os11, pathlib, import_toolkit_lib3, ABORTED_ERROR_MESSAGE, VALID_USER_AGENTS, TelemetrySession;
 var init_session = __esm({
   "lib/cli/telemetry/session.ts"() {
     "use strict";
-    import_node_crypto16 = require("node:crypto");
+    import_node_crypto18 = require("node:crypto");
     fs41 = __toESM(require("node:fs/promises"));
     os11 = __toESM(require("os"));
     pathlib = __toESM(require("path"));
@@ -304371,7 +304476,7 @@ var init_session = __esm({
         this._sessionInfo = {
           identifiers: {
             installationId: await getOrCreateInstallationId(this.ioHost.asIoHelper()),
-            sessionId: (0, import_node_crypto16.randomUUID)(),
+            sessionId: (0, import_node_crypto18.randomUUID)(),
             telemetryVersion: "2.0",
             cdkCliVersion: versionNumber2(),
             cdkLibraryVersion: await getLibraryVersion(this.ioHost.asIoHelper()),
@@ -306126,7 +306231,7 @@ async function dotnetAddProject(ioHelper, targetDirectory, context, ext = "cspro
       if (attempt === MAX_ATTEMPTS) {
         throw new import_toolkit_lib10.ToolkitError("DotnetSlnAddFailed", `Could not add project ${pname}.${ext} to solution ${pname}.sln. ${formatErrorMessage(e6)}`);
       }
-      await new Promise((resolve16) => setTimeout(resolve16, 1e3));
+      await new Promise((resolve17) => setTimeout(resolve17, 1e3));
     }
   }
 }
@@ -307179,8 +307284,8 @@ function chunks(list2, chunkSize) {
 }
 function setEnvironment(account, region) {
   return {
-    account: account ?? import_cloud_assembly_api15.UNKNOWN_ACCOUNT,
-    region: region ?? import_cloud_assembly_api15.UNKNOWN_REGION,
+    account: account ?? import_cloud_assembly_api14.UNKNOWN_ACCOUNT,
+    region: region ?? import_cloud_assembly_api14.UNKNOWN_REGION,
     name: "cdk-migrate-env"
   };
 }
@@ -307226,7 +307331,7 @@ async function scanProgressBar(ioHelper, scanId, cfn) {
     curScan = await cfn.describeResourceScan(scanId);
     curProgress = curScan.PercentageCompleted ?? curProgress;
     printBar(30, curProgress);
-    await new Promise((resolve16) => setTimeout(resolve16, 2e3));
+    await new Promise((resolve17) => setTimeout(resolve17, 2e3));
   }
   await ioHelper.defaults.info("\n\u2705 Scan Complete!");
 }
@@ -307248,13 +307353,13 @@ function printBar(width, progress) {
 async function printDots(message2, timeoutx4) {
   if (!process.env.MIGRATE_INTEG_TEST) {
     rewriteLine(message2 + " .");
-    await new Promise((resolve16) => setTimeout(resolve16, timeoutx4));
+    await new Promise((resolve17) => setTimeout(resolve17, timeoutx4));
     rewriteLine(message2 + " ..");
-    await new Promise((resolve16) => setTimeout(resolve16, timeoutx4));
+    await new Promise((resolve17) => setTimeout(resolve17, timeoutx4));
     rewriteLine(message2 + " ...");
-    await new Promise((resolve16) => setTimeout(resolve16, timeoutx4));
+    await new Promise((resolve17) => setTimeout(resolve17, timeoutx4));
     rewriteLine(message2);
-    await new Promise((resolve16) => setTimeout(resolve16, timeoutx4));
+    await new Promise((resolve17) => setTimeout(resolve17, timeoutx4));
   }
 }
 function rewriteLine(message2) {
@@ -307363,13 +307468,13 @@ function deduplicateResources(resources) {
   }
   return Object.values(uniqueResources);
 }
-var fs45, path43, import_cloud_assembly_api15, import_toolkit_lib12, cdk_from_cfn, import_chalk33, camelCase2, decamelize2, MIGRATE_SUPPORTED_LANGUAGES, FilterType, CfnTemplateGeneratorProvider;
+var fs45, path43, import_cloud_assembly_api14, import_toolkit_lib12, cdk_from_cfn, import_chalk33, camelCase2, decamelize2, MIGRATE_SUPPORTED_LANGUAGES, FilterType, CfnTemplateGeneratorProvider;
 var init_migrate = __esm({
   "lib/commands/migrate.ts"() {
     "use strict";
     fs45 = __toESM(require("fs"));
     path43 = __toESM(require("path"));
-    import_cloud_assembly_api15 = __toESM(require_lib3());
+    import_cloud_assembly_api14 = __toESM(require_lib3());
     import_toolkit_lib12 = __toESM(require_lib12());
     cdk_from_cfn = __toESM(require_cdk_from_cfn());
     import_chalk33 = __toESM(require_source());
@@ -309635,7 +309740,7 @@ async function execProgram(aws, ioHelper, config2) {
     ...config2.context.all,
     ...params.context
   };
-  await debugFn((0, import_util75.format)("context:", context));
+  await debugFn((0, import_util73.format)("context:", context));
   if (params.env.CDK_DEBUG === "true") {
     await ioHelper.defaults.info("\u{1F50D} Synthesizing with debug information. This may take a bit longer.");
   }
@@ -309685,7 +309790,7 @@ async function execProgram(aws, ioHelper, config2) {
   const perfCountersFile = path44.join(outdir, "performance-counters.json");
   await fs47.promises.rm(perfCountersFile, { force: true });
   env3.CDK_PERF_COUNTERS_FILE = perfCountersFile;
-  await debugFn((0, import_util75.format)("env:", env3));
+  await debugFn((0, import_util73.format)("env:", env3));
   const cleanupTemp = writeContextToEnv(env3, context, "add-process-env-later");
   try {
     await exec2(commandLine);
@@ -309723,7 +309828,7 @@ async function execProgram(aws, ioHelper, config2) {
 }
 function createAssembly(appDir) {
   try {
-    return new import_cloud_assembly_api16.CloudAssembly(appDir, {
+    return new import_cloud_assembly_api15.CloudAssembly(appDir, {
       // We sort as we deploy
       topoSort: false
     });
@@ -309738,13 +309843,13 @@ function createAssembly(appDir) {
 function noUndefined2(xs) {
   return Object.fromEntries(Object.entries(xs).filter(([_, v]) => v !== void 0));
 }
-var path44, import_util75, import_cloud_assembly_api16, cxschema11, cxapi12, import_toolkit_lib15, fs47;
+var path44, import_util73, import_cloud_assembly_api15, cxschema11, cxapi12, import_toolkit_lib15, fs47;
 var init_exec2 = __esm({
   "lib/cxapp/exec.ts"() {
     "use strict";
     path44 = __toESM(require("path"));
-    import_util75 = require("util");
-    import_cloud_assembly_api16 = __toESM(require_lib3());
+    import_util73 = require("util");
+    import_cloud_assembly_api15 = __toESM(require_lib3());
     cxschema11 = __toESM(require_lib2());
     cxapi12 = __toESM(require_lib11());
     import_toolkit_lib15 = __toESM(require_lib12());
@@ -309944,11 +310049,11 @@ var require_p_finally = __commonJS({
       onFinally = onFinally || (() => {
       });
       return promise.then(
-        (val) => new Promise((resolve16) => {
-          resolve16(onFinally());
+        (val) => new Promise((resolve17) => {
+          resolve17(onFinally());
         }).then(() => val),
-        (err) => new Promise((resolve16) => {
-          resolve16(onFinally());
+        (err) => new Promise((resolve17) => {
+          resolve17(onFinally());
         }).then(() => {
           throw err;
         })
@@ -309971,18 +310076,18 @@ var require_p_timeout = __commonJS({
         this.name = "TimeoutError";
       }
     };
-    var pTimeout = /* @__PURE__ */ __name((promise, milliseconds, fallback2) => new Promise((resolve16, reject) => {
+    var pTimeout = /* @__PURE__ */ __name((promise, milliseconds, fallback2) => new Promise((resolve17, reject) => {
       if (typeof milliseconds !== "number" || milliseconds < 0) {
         throw new TypeError("Expected `milliseconds` to be a positive number");
       }
       if (milliseconds === Infinity) {
-        resolve16(promise);
+        resolve17(promise);
         return;
       }
       const timer = setTimeout(() => {
         if (typeof fallback2 === "function") {
           try {
-            resolve16(fallback2());
+            resolve17(fallback2());
           } catch (error3) {
             reject(error3);
           }
@@ -309997,7 +310102,7 @@ var require_p_timeout = __commonJS({
       }, milliseconds);
       pFinally(
         // eslint-disable-next-line promise/prefer-await-to-then
-        promise.then(resolve16, reject),
+        promise.then(resolve17, reject),
         () => {
           clearTimeout(timer);
         }
@@ -310222,7 +310327,7 @@ var require_dist3 = __commonJS({
       Adds a sync or async task to the queue. Always returns a promise.
       */
       async add(fn, options = {}) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           const run5 = /* @__PURE__ */ __name(async () => {
             this._pendingCount++;
             this._intervalCount++;
@@ -310233,7 +310338,7 @@ var require_dist3 = __commonJS({
                 }
                 return void 0;
               });
-              resolve16(await operation2);
+              resolve17(await operation2);
             } catch (error3) {
               reject(error3);
             }
@@ -310284,11 +310389,11 @@ var require_dist3 = __commonJS({
         if (this._queue.size === 0) {
           return;
         }
-        return new Promise((resolve16) => {
+        return new Promise((resolve17) => {
           const existingResolve = this._resolveEmpty;
           this._resolveEmpty = () => {
             existingResolve();
-            resolve16();
+            resolve17();
           };
         });
       }
@@ -310301,11 +310406,11 @@ var require_dist3 = __commonJS({
         if (this._pendingCount === 0 && this._queue.size === 0) {
           return;
         }
-        return new Promise((resolve16) => {
+        return new Promise((resolve17) => {
           const existingResolve = this._resolveIdle;
           this._resolveIdle = () => {
             existingResolve();
-            resolve16();
+            resolve17();
           };
         });
       }
@@ -310861,11 +310966,11 @@ async function displayFlagsMessage(ioHost, toolkit, cloudExecutable) {
 function requiresApproval(requireApproval, permissionChangeType) {
   return requireApproval === import_cloud_assembly_schema9.RequireApproval.ANYCHANGE || requireApproval === import_cloud_assembly_schema9.RequireApproval.BROADENING && permissionChangeType === import_toolkit_lib17.PermissionChangeType.BROADENING;
 }
-var import_node_crypto17, path46, import_node_util9, cxapi13, import_cloud_assembly_schema9, import_toolkit_lib17, import_chalk35, fs49, pLimit5, FILE_EVENTS2, InternalToolkit, CdkToolkit, WorkGraphDeploymentActions;
+var import_node_crypto19, path46, import_node_util9, cxapi13, import_cloud_assembly_schema9, import_toolkit_lib17, import_chalk35, fs49, pLimit5, FILE_EVENTS2, InternalToolkit, CdkToolkit, WorkGraphDeploymentActions;
 var init_cdk_toolkit = __esm({
   "lib/cli/cdk-toolkit.ts"() {
     "use strict";
-    import_node_crypto17 = require("node:crypto");
+    import_node_crypto19 = require("node:crypto");
     path46 = __toESM(require("node:path"));
     import_node_util9 = require("node:util");
     cxapi13 = __toESM(require_lib3());
@@ -311118,12 +311223,13 @@ var init_cdk_toolkit = __esm({
         }
         return cfn_api_exports.createDiffChangeSet(asIoHelper(this.ioHost, "diff"), {
           stack,
-          uuid: (0, import_node_crypto17.randomUUID)(),
+          uuid: (0, import_node_crypto19.randomUUID)(),
           deployments: this.props.deployments,
           sdkProvider: this.props.sdkProvider,
           parameters: Object.assign({}, parameterMap["*"], parameterMap[stack.stackName]),
           resourcesToImport,
           importExistingResources: options.importExistingResources,
+          changeSetName: options.changeSetName,
           failOnError: options.method === "change-set"
         });
       }
@@ -311521,10 +311627,8 @@ Do you wish to deploy these changes?`;
           }
         }
         await this.ioHost.asIoHelper().defaults.info("%s: importing resources into stack...", import_chalk35.default.bold(stack.displayName));
-        const tags = tagsForStack(stack);
         await resourceImporter.importResourcesFromMap(actualImport, {
           roleArn: options.roleArn,
-          tags,
           deploymentMethod: options.deploymentMethod,
           usePreviousParameters: true,
           rollback: options.rollback,
@@ -312281,6 +312385,248 @@ Do you wish to deploy these changes?`;
   }
 });
 
+// lib/cli/debug-handles.ts
+function describeLeak(leak, sources) {
+  const frames = actionableFrames(leak.creationStack);
+  const lines = ["", import_chalk36.default.bold(`# ${leak.type} (${TRACKED_TYPES[leak.type]})`)];
+  if (frames.length === 0) {
+    lines.push("  (opened entirely inside Node internals, no CLI frames to show)");
+    return lines;
+  }
+  const [origin] = frames;
+  if (origin.func && origin.func !== "<anonymous>") {
+    lines.push(`  created in ${origin.func}()`);
+  }
+  lines.push("  call stack:");
+  for (const frame of frames) {
+    lines.push(`    ${frame.func} (${frame.file}:${frame.line}:${frame.column})`);
+    const snippet = sources.snippetAt(frame);
+    if (snippet) {
+      lines.push(`      ${import_chalk36.default.dim(snippet)}`);
+    }
+  }
+  return lines;
+}
+function captureCreationStack() {
+  const carrier = {};
+  const previous = Error.prepareStackTrace;
+  const previousLimit = Error.stackTraceLimit;
+  Error.stackTraceLimit = STACK_CAPTURE_DEPTH;
+  Error.prepareStackTrace = (_error, callSites) => callSites.map((site) => {
+    const file = site.getFileName() ?? "";
+    return {
+      func: site.getFunctionName() ?? "<anonymous>",
+      file: file.startsWith("file://") ? (0, import_node_url.fileURLToPath)(file) : file,
+      line: site.getLineNumber() ?? 0,
+      column: site.getColumnNumber() ?? 0
+    };
+  });
+  try {
+    Error.captureStackTrace(carrier, captureCreationStack);
+    return carrier.stack?.slice(1) ?? [];
+  } finally {
+    Error.prepareStackTrace = previous;
+    Error.stackTraceLimit = previousLimit;
+  }
+}
+function activeResourceSummary() {
+  const counts = /* @__PURE__ */ new Map();
+  for (const type of process.getActiveResourcesInfo()) {
+    counts.set(type, (counts.get(type) ?? 0) + 1);
+  }
+  if (counts.size === 0) {
+    return "(none)";
+  }
+  return [...counts].map(([type, count]) => `${count}x ${type}`).join(", ");
+}
+function actionableFrames(frames) {
+  return frames.filter((frame) => frame.file && !frame.file.startsWith("node:"));
+}
+function readLines(file) {
+  try {
+    return (0, import_node_fs5.readFileSync)(file, "utf-8").split(/\r?\n/);
+  } catch {
+    return void 0;
+  }
+}
+function trackLeakedHandles() {
+  const tracker = new LeakedHandleTracker();
+  tracker.start();
+  return tracker;
+}
+var import_node_async_hooks, import_node_fs5, import_node_url, import_chalk36, TRACKED_TYPES, STACK_CAPTURE_DEPTH, HANDLE_DUMP_GRACE_MS, MAX_TRACKED_HANDLES, SOURCE_SNIPPET_CHARS, LeakedHandleTracker, SourceCache;
+var init_debug_handles = __esm({
+  "lib/cli/debug-handles.ts"() {
+    "use strict";
+    import_node_async_hooks = require("node:async_hooks");
+    import_node_fs5 = require("node:fs");
+    import_node_url = require("node:url");
+    import_chalk36 = __toESM(require_source());
+    TRACKED_TYPES = {
+      TCPWRAP: "open network connection",
+      TCPSERVERWRAP: "listening TCP server",
+      PIPEWRAP: "open pipe",
+      PIPESERVERWRAP: "listening pipe server",
+      UDPWRAP: "open UDP socket",
+      TTYWRAP: "open terminal stream",
+      Timeout: "timer from setTimeout or setInterval",
+      Immediate: "pending setImmediate callback",
+      PROCESSWRAP: "spawned child process still running",
+      FSEVENTWRAP: "file-system watcher",
+      STATWATCHER: "file-system stat watcher",
+      SIGNALWRAP: "OS signal handler still registered",
+      WORKER: "worker thread still running",
+      MESSAGEPORT: "open worker-thread message channel"
+    };
+    STACK_CAPTURE_DEPTH = 60;
+    HANDLE_DUMP_GRACE_MS = 1e3;
+    MAX_TRACKED_HANDLES = 1e4;
+    SOURCE_SNIPPET_CHARS = 200;
+    LeakedHandleTracker = class {
+      static {
+        __name(this, "LeakedHandleTracker");
+      }
+      watched = /* @__PURE__ */ new Map();
+      /**
+       * Whether we stopped recording because {@link MAX_TRACKED_HANDLES} was reached.
+       * Reported, so a short list is never mistaken for a complete one.
+       */
+      atCapacity = false;
+      hook = (0, import_node_async_hooks.createHook)({
+        init: /* @__PURE__ */ __name((asyncId, type, _triggerAsyncId, resource) => {
+          if (!(type in TRACKED_TYPES)) {
+            return;
+          }
+          if (this.watched.size >= MAX_TRACKED_HANDLES) {
+            this.atCapacity = true;
+            return;
+          }
+          try {
+            this.watched.set(asyncId, {
+              type,
+              handleRef: new WeakRef(resource),
+              creationStack: captureCreationStack()
+            });
+          } catch {
+            this.watched.delete(asyncId);
+          }
+        }, "init"),
+        destroy: /* @__PURE__ */ __name((asyncId) => {
+          this.watched.delete(asyncId);
+        }, "destroy")
+      });
+      /**
+       * Begin watching async resources. Must run before the resources we care about
+       * are created, and only when the user opted in, since the hook adds a small
+       * per-resource cost.
+       */
+      start() {
+        this.hook.enable();
+      }
+      /**
+       * Stop watching and discard all tracked state.
+       */
+      stop() {
+        this.hook.disable();
+        this.watched.clear();
+      }
+      /**
+       * Report the leaked handles once the grace period has passed. The timer is
+       * unref'd, so it never fires if the process exits cleanly within the window and
+       * never holds the process open itself.
+       */
+      scheduleReport(ioHelper) {
+        setTimeout(() => {
+          this.report(ioHelper).catch(() => void 0);
+        }, HANDLE_DUMP_GRACE_MS).unref();
+      }
+      /**
+       * Report every resource still holding the event loop open, each with the source
+       * location where it was created. Call at the very end of execution, by which
+       * point only genuinely leaked handles should remain.
+       *
+       * Emitted as one message, so unrelated output cannot interleave into the middle
+       * of a stack trace, and at DEBUG, which is the level `--debug-cli` raises the
+       * CLI to.
+       */
+      async report(ioHelper) {
+        this.hook.disable();
+        const leaks = [...this.watched.values()].filter((r6) => {
+          const handle = r6.handleRef.deref();
+          if (handle === void 0) {
+            return false;
+          }
+          if (handle._destroyed === true) {
+            return false;
+          }
+          return typeof handle.hasRef === "function" && handle.hasRef();
+        });
+        this.watched.clear();
+        await ioHelper.defaults.debug(this.renderReport(leaks).join("\n"));
+      }
+      renderReport(leaks) {
+        if (leaks.length === 0) {
+          return [
+            "The CLI process is still alive, but no tracked handle explains it.",
+            `Node reports these resources still active: ${activeResourceSummary()}`,
+            "The cause may be a handle opened before tracking started, or a type this build does not track."
+          ];
+        }
+        const lines = [`${leaks.length} ${leaks.length === 1 ? "handle" : "handles"} still keeping the CLI process alive:`];
+        if (this.atCapacity) {
+          lines.push(`Stopped recording after ${MAX_TRACKED_HANDLES} handles, so this list may be incomplete.`);
+        }
+        const sources = new SourceCache();
+        for (const leak of leaks) {
+          lines.push(...describeLeak(leak, sources));
+        }
+        if (sources.sawMinifiedLine) {
+          lines.push("");
+          lines.push("Locations above are positions in the bundled CLI, not in the original source files.");
+        }
+        return lines;
+      }
+    };
+    __name(describeLeak, "describeLeak");
+    __name(captureCreationStack, "captureCreationStack");
+    __name(activeResourceSummary, "activeResourceSummary");
+    __name(actionableFrames, "actionableFrames");
+    SourceCache = class {
+      static {
+        __name(this, "SourceCache");
+      }
+      /**
+       * Whether any line we read was long enough to be minified rather than
+       * hand-written. Used to warn that the printed locations are bundle-relative.
+       */
+      sawMinifiedLine = false;
+      files = /* @__PURE__ */ new Map();
+      snippetAt(frame) {
+        const line = this.linesOf(frame.file)?.[frame.line - 1];
+        if (line === void 0) {
+          return void 0;
+        }
+        if (line.length <= SOURCE_SNIPPET_CHARS) {
+          return line.trim() || void 0;
+        }
+        this.sawMinifiedLine = true;
+        const start = Math.max(0, frame.column - 1 - Math.floor(SOURCE_SNIPPET_CHARS / 2));
+        const end2 = Math.min(line.length, start + SOURCE_SNIPPET_CHARS);
+        const window2 = line.slice(start, end2).trim();
+        return `${start > 0 ? "\u2026" : ""}${window2}${end2 < line.length ? "\u2026" : ""}`;
+      }
+      linesOf(file) {
+        if (!this.files.has(file)) {
+          this.files.set(file, readLines(file));
+        }
+        return this.files.get(file);
+      }
+    };
+    __name(readLines, "readLines");
+    __name(trackLeakedHandles, "trackLeakedHandles");
+  }
+});
+
 // lib/cli/util/console-formatters.ts
 function formatAsBanner(msgs) {
   const printLen = /* @__PURE__ */ __name((str) => stripAnsi(str).length, "printLen");
@@ -312329,7 +312675,7 @@ function getJson(url, agent, options = {}) {
     agent,
     headers: { Accept: "application/json" }
   };
-  return new Promise((resolve16, reject) => {
+  return new Promise((resolve17, reject) => {
     let req;
     const timer = setTimeout(() => {
       if (req) {
@@ -312340,7 +312686,7 @@ function getJson(url, agent, options = {}) {
     req = https3.get(url, requestOptions, (res) => {
       if (res.statusCode === 404 && options.allowNotFound) {
         res.resume();
-        resolve16(void 0);
+        resolve17(void 0);
         return;
       }
       if (res.statusCode !== 200) {
@@ -312355,7 +312701,7 @@ function getJson(url, agent, options = {}) {
       });
       res.on("end", () => {
         try {
-          resolve16(JSON.parse(rawData));
+          resolve17(JSON.parse(rawData));
         } catch (e6) {
           reject(import_toolkit_lib18.ToolkitError.withCause("NpmRegistryParseError", `could not parse response from ${url}: ${e6.message}`, e6));
         }
@@ -312392,10 +312738,10 @@ async function getVersionMessages(currentVersion, cacheFile, agent) {
   await cacheFile.update(JSON.stringify(packageInfo));
   const versionMessages = [];
   if (packageInfo.deprecated) {
-    versionMessages.push(import_chalk36.default.red(packageInfo.deprecated));
+    versionMessages.push(import_chalk37.default.red(packageInfo.deprecated));
   }
   if (semver4.gt(latestVersion, currentVersion)) {
-    versionMessages.push(`Newer version of CDK is available [${import_chalk36.default.green(latestVersion)}]`);
+    versionMessages.push(`Newer version of CDK is available [${import_chalk37.default.green(latestVersion)}]`);
     const majorUpgradeMessage = getMajorVersionUpgradeMessage(currentVersion);
     if (majorUpgradeMessage) {
       versionMessages.push(majorUpgradeMessage);
@@ -312426,13 +312772,13 @@ async function displayVersionMessage(ioHelper, options = {}) {
     await ioHelper.defaults.debug(`Could not run version check - ${err.message}`);
   }
 }
-var path47, import_toolkit_lib19, import_chalk36, fs50, semver4, ONE_DAY_IN_SECONDS, UPGRADE_DOCUMENTATION_LINKS, VersionCheckTTL;
+var path47, import_toolkit_lib19, import_chalk37, fs50, semver4, ONE_DAY_IN_SECONDS, UPGRADE_DOCUMENTATION_LINKS, VersionCheckTTL;
 var init_display_version = __esm({
   "lib/cli/display-version.ts"() {
     "use strict";
     path47 = __toESM(require("path"));
     import_toolkit_lib19 = __toESM(require_lib12());
-    import_chalk36 = __toESM(require_source());
+    import_chalk37 = __toESM(require_source());
     fs50 = __toESM(require_lib4());
     semver4 = __toESM(require_semver4());
     init_util9();
@@ -312769,8 +313115,8 @@ var require_require_directory = __commonJS({
   "../../node_modules/require-directory/index.js"(exports2, module2) {
     "use strict";
     var fs58 = require("fs");
-    var join54 = require("path").join;
-    var resolve16 = require("path").resolve;
+    var join53 = require("path").join;
+    var resolve17 = require("path").resolve;
     var dirname17 = require("path").dirname;
     var defaultOptions2 = {
       extensions: ["js", "json", "coffee"],
@@ -312805,9 +313151,9 @@ var require_require_directory = __commonJS({
           options[prop] = defaultOptions2[prop];
         }
       }
-      path54 = !path54 ? dirname17(m4.filename) : resolve16(dirname17(m4.filename), path54);
+      path54 = !path54 ? dirname17(m4.filename) : resolve17(dirname17(m4.filename), path54);
       fs58.readdirSync(path54).forEach(function(filename) {
-        var joined = join54(path54, filename), files, key, obj;
+        var joined = join53(path54, filename), files, key, obj;
         if (fs58.statSync(joined).isDirectory() && options.recurse) {
           files = requireDirectory(m4, joined, options);
           if (Object.keys(files).length) {
@@ -315843,8 +316189,8 @@ var require_y18n = __commonJS({
 var require_p_try = __commonJS({
   "../../node_modules/p-try/index.js"(exports2, module2) {
     "use strict";
-    var pTry = /* @__PURE__ */ __name((fn, ...arguments_) => new Promise((resolve16) => {
-      resolve16(fn(...arguments_));
+    var pTry = /* @__PURE__ */ __name((fn, ...arguments_) => new Promise((resolve17) => {
+      resolve17(fn(...arguments_));
     }), "pTry");
     module2.exports = pTry;
     module2.exports.default = pTry;
@@ -315868,20 +316214,20 @@ var require_p_limit2 = __commonJS({
           queue.shift()();
         }
       }, "next");
-      const run5 = /* @__PURE__ */ __name((fn, resolve16, ...args) => {
+      const run5 = /* @__PURE__ */ __name((fn, resolve17, ...args) => {
         activeCount++;
         const result2 = pTry(fn, ...args);
-        resolve16(result2);
+        resolve17(result2);
         result2.then(next, next);
       }, "run");
-      const enqueue = /* @__PURE__ */ __name((fn, resolve16, ...args) => {
+      const enqueue = /* @__PURE__ */ __name((fn, resolve17, ...args) => {
         if (activeCount < concurrency) {
-          run5(fn, resolve16, ...args);
+          run5(fn, resolve17, ...args);
         } else {
-          queue.push(run5.bind(null, fn, resolve16, ...args));
+          queue.push(run5.bind(null, fn, resolve17, ...args));
         }
       }, "enqueue");
-      const generator = /* @__PURE__ */ __name((fn, ...args) => new Promise((resolve16) => enqueue(fn, resolve16, ...args)), "generator");
+      const generator = /* @__PURE__ */ __name((fn, ...args) => new Promise((resolve17) => enqueue(fn, resolve17, ...args)), "generator");
       Object.defineProperties(generator, {
         activeCount: {
           get: /* @__PURE__ */ __name(() => activeCount, "get")
@@ -317359,7 +317705,7 @@ function parseCommandLineArguments(args) {
   }).option("debug-cli", {
     default: false,
     type: "boolean",
-    desc: "Debug the CDK CLI itself."
+    desc: "Debug the CDK CLI itself. Reports what is keeping the CLI process alive if it fails to exit, and raises the CLI log level to show that report. Will slow down execution."
   }).option("profile", {
     default: void 0,
     type: "string",
@@ -318094,6 +318440,10 @@ function parseCommandLineArguments(args) {
       alias: "changeset",
       desc: "Whether to create a change set to analyze resource replacements. In this mode, diff will use the deploy role instead of the lookup role.",
       deprecated: "use --method instead"
+    }).option("change-set-name", {
+      default: void 0,
+      type: "string",
+      desc: "Name of the CloudFormation change set to create (only if method is not template)"
     }).option("method", {
       default: "auto",
       alias: "m",
@@ -318374,7 +318724,7 @@ var init_platform_warnings = __esm({
 // lib/cli/pretty-print-error.ts
 function prettyPrintError(error3, options = { soft: false, debug: false }) {
   const err = ensureError(error3);
-  const errorPaint = options.soft ? import_chalk37.default.yellow : import_chalk37.default.red;
+  const errorPaint = options.soft ? import_chalk38.default.yellow : import_chalk38.default.red;
   console.error(errorPaint(err.message));
   printCauses(err, options);
   if (options.debug) {
@@ -318384,13 +318734,13 @@ function prettyPrintError(error3, options = { soft: false, debug: false }) {
 function printCauses(err, options) {
   if (err.cause && !options.soft) {
     const cause = ensureError(err.cause);
-    console.error(import_chalk37.default.yellow(`\u2023 ${cause.name}: ${cause.message}`));
+    console.error(import_chalk38.default.yellow(`\u2023 ${cause.name}: ${cause.message}`));
     printCauses(cause, options);
   }
 }
 function printTraces(err) {
   if (err.stack) {
-    console.debug(import_chalk37.default.gray(err.stack));
+    console.debug(import_chalk38.default.gray(err.stack));
   }
   if (err.cause) {
     printTraces(ensureError(err.cause));
@@ -318406,11 +318756,11 @@ function ensureError(value2) {
   const error3 = new Error(`An unexpected error was thrown: ${stringified}`);
   return error3;
 }
-var import_chalk37;
+var import_chalk38;
 var init_pretty_print_error = __esm({
   "lib/cli/pretty-print-error.ts"() {
     "use strict";
-    import_chalk37 = __toESM(require_source());
+    import_chalk38 = __toESM(require_source());
     __name(prettyPrintError, "prettyPrintError");
     __name(printCauses, "printCauses");
     __name(printTraces, "printTraces");
@@ -319258,8 +319608,8 @@ var require_lru_cache = __commonJS({
             }
             return stale ? v.__staleWhileFetching : v.__returned = v;
           }
-          const isStale = this.isStale(index);
-          if (!forceRefresh && !isStale) {
+          const isStale2 = this.isStale(index);
+          if (!forceRefresh && !isStale2) {
             if (status) status.fetch = "hit";
             this.moveToTail(index);
             if (updateAgeOnGet) {
@@ -319272,8 +319622,8 @@ var require_lru_cache = __commonJS({
           const hasStale = p3.__staleWhileFetching !== void 0;
           const staleVal = hasStale && allowStale;
           if (status) {
-            status.fetch = hasStale && isStale ? "stale" : "refresh";
-            if (staleVal && isStale) status.returnedStale = true;
+            status.fetch = hasStale && isStale2 ? "stale" : "refresh";
+            if (staleVal && isStale2) status.returnedStale = true;
           }
           return staleVal ? p3.__staleWhileFetching : p3.__returned = p3;
         }
@@ -319495,8 +319845,8 @@ var require_helpers2 = __commonJS({
     function req(url, opts = {}) {
       const href = typeof url === "string" ? url : url.href;
       const req2 = (href.startsWith("https:") ? https4 : http).request(url, opts);
-      const promise = new Promise((resolve16, reject) => {
-        req2.once("response", resolve16).once("error", reject).end();
+      const promise = new Promise((resolve17, reject) => {
+        req2.once("response", resolve17).once("error", reject).end();
       });
       req2.then = promise.then.bind(promise);
       return req2;
@@ -320559,7 +320909,7 @@ var require_parse_proxy_response = __commonJS({
     var debug_1 = __importDefault2(require_src2());
     var debug2 = (0, debug_1.default)("https-proxy-agent:parse-proxy-response");
     function parseProxyResponse(socket) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         let buffersLength = 0;
         const buffers = [];
         function read() {
@@ -320629,7 +320979,7 @@ var require_parse_proxy_response = __commonJS({
           }
           debug2("got proxy server response: %o %o", firstLine, headers);
           cleanup();
-          resolve16({
+          resolve17({
             connect: {
               statusCode,
               statusText,
@@ -324438,12 +324788,12 @@ var require_socksclient = __commonJS({
     "use strict";
     var __awaiter2 = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value2) {
-        return value2 instanceof P ? value2 : new P(function(resolve16) {
-          resolve16(value2);
+        return value2 instanceof P ? value2 : new P(function(resolve17) {
+          resolve17(value2);
         });
       }
       __name(adopt, "adopt");
-      return new (P || (P = Promise))(function(resolve16, reject) {
+      return new (P || (P = Promise))(function(resolve17, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -324461,7 +324811,7 @@ var require_socksclient = __commonJS({
         }
         __name(rejected, "rejected");
         function step(result2) {
-          result2.done ? resolve16(result2.value) : adopt(result2.value).then(fulfilled, rejected);
+          result2.done ? resolve17(result2.value) : adopt(result2.value).then(fulfilled, rejected);
         }
         __name(step, "step");
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -324499,13 +324849,13 @@ var require_socksclient = __commonJS({
        * @returns { Promise }
        */
       static createConnection(options, callback) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           try {
             (0, helpers_1.validateSocksClientOptions)(options, ["connect"]);
           } catch (err) {
             if (typeof callback === "function") {
               callback(err);
-              return resolve16(err);
+              return resolve17(err);
             } else {
               return reject(err);
             }
@@ -324516,16 +324866,16 @@ var require_socksclient = __commonJS({
             client.removeAllListeners();
             if (typeof callback === "function") {
               callback(null, info2);
-              resolve16(info2);
+              resolve17(info2);
             } else {
-              resolve16(info2);
+              resolve17(info2);
             }
           });
           client.once("error", (err) => {
             client.removeAllListeners();
             if (typeof callback === "function") {
               callback(err);
-              resolve16(err);
+              resolve17(err);
             } else {
               reject(err);
             }
@@ -324542,13 +324892,13 @@ var require_socksclient = __commonJS({
        * @returns { Promise }
        */
       static createConnectionChain(options, callback) {
-        return new Promise((resolve16, reject) => __awaiter2(this, void 0, void 0, function* () {
+        return new Promise((resolve17, reject) => __awaiter2(this, void 0, void 0, function* () {
           try {
             (0, helpers_1.validateSocksClientChainOptions)(options);
           } catch (err) {
             if (typeof callback === "function") {
               callback(err);
-              return resolve16(err);
+              return resolve17(err);
             } else {
               return reject(err);
             }
@@ -324574,14 +324924,14 @@ var require_socksclient = __commonJS({
             }
             if (typeof callback === "function") {
               callback(null, { socket: sock });
-              resolve16({ socket: sock });
+              resolve17({ socket: sock });
             } else {
-              resolve16({ socket: sock });
+              resolve17({ socket: sock });
             }
           } catch (err) {
             if (typeof callback === "function") {
               callback(err);
-              resolve16(err);
+              resolve17(err);
             } else {
               reject(err);
             }
@@ -325269,12 +325619,12 @@ var require_dist7 = __commonJS({
         let { host } = opts;
         const { port, lookup: lookupFn = dns.lookup } = opts;
         if (shouldLookup) {
-          host = await new Promise((resolve16, reject) => {
+          host = await new Promise((resolve17, reject) => {
             lookupFn(host, {}, (err, res) => {
               if (err) {
                 reject(err);
               } else {
-                resolve16(res);
+                resolve17(res);
               }
             });
           });
@@ -325968,7 +326318,7 @@ var require_netUtils = __commonJS({
     }
     __name(describeAddress, "describeAddress");
     function upgradeSocket(socket, options) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const tlsOptions = Object.assign({}, options, {
           socket
         });
@@ -325978,7 +326328,7 @@ var require_netUtils = __commonJS({
             reject(tlsSocket.authorizationError);
           } else {
             tlsSocket.removeAllListeners("error");
-            resolve16(tlsSocket);
+            resolve17(tlsSocket);
           }
         }).once("error", (error3) => {
           reject(error3);
@@ -326643,7 +326993,7 @@ var require_transfer = __commonJS({
     }
     __name(parsePasvResponse, "parsePasvResponse");
     function connectForPassiveTransfer(host, port, ftp) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         let socket = ftp._newSocket();
         const handleConnErr = /* @__PURE__ */ __name(function(err) {
           err.message = "Can't open data connection in passive mode: " + err.message;
@@ -326671,7 +327021,7 @@ var require_transfer = __commonJS({
           socket.removeListener("error", handleConnErr);
           socket.removeListener("timeout", handleTimeout);
           ftp.dataSocket = socket;
-          resolve16();
+          resolve17();
         });
       });
     }
@@ -329139,7 +329489,7 @@ var require_util3 = __commonJS({
     }
     __name(normalize3, "normalize");
     exports2.normalize = normalize3;
-    function join54(aRoot, aPath) {
+    function join53(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -329171,8 +329521,8 @@ var require_util3 = __commonJS({
       }
       return joined;
     }
-    __name(join54, "join");
-    exports2.join = join54;
+    __name(join53, "join");
+    exports2.join = join53;
     exports2.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
@@ -329355,7 +329705,7 @@ var require_util3 = __commonJS({
             parsed.path = parsed.path.substring(0, index + 1);
           }
         }
-        sourceURL = join54(urlGenerate(parsed), sourceURL);
+        sourceURL = join53(urlGenerate(parsed), sourceURL);
       }
       return normalize3(sourceURL);
     }
@@ -331192,7 +331542,7 @@ var require_escodegen = __commonJS({
         return space ? space : " ";
       }
       __name(noEmptySpace, "noEmptySpace");
-      function join54(left, right) {
+      function join53(left, right) {
         var leftSource, rightSource, leftCharCode, rightCharCode;
         leftSource = toSourceNodeWhenNeeded(left).toString();
         if (leftSource.length === 0) {
@@ -331211,7 +331561,7 @@ var require_escodegen = __commonJS({
         }
         return [left, space, right];
       }
-      __name(join54, "join");
+      __name(join53, "join");
       function addIndent(stmt) {
         return [base, stmt];
       }
@@ -331539,8 +331889,8 @@ var require_escodegen = __commonJS({
           } else {
             result2.push(that.generateExpression(stmt.left, Precedence.Call, E_TTT));
           }
-          result2 = join54(result2, operator);
-          result2 = [join54(
+          result2 = join53(result2, operator);
+          result2 = [join53(
             result2,
             that.generateExpression(stmt.right, Precedence.Assignment, E_TTT)
           ), ")"];
@@ -331683,11 +332033,11 @@ var require_escodegen = __commonJS({
           var result2, fragment;
           result2 = ["class"];
           if (stmt.id) {
-            result2 = join54(result2, this.generateExpression(stmt.id, Precedence.Sequence, E_TTT));
+            result2 = join53(result2, this.generateExpression(stmt.id, Precedence.Sequence, E_TTT));
           }
           if (stmt.superClass) {
-            fragment = join54("extends", this.generateExpression(stmt.superClass, Precedence.Unary, E_TTT));
-            result2 = join54(result2, fragment);
+            fragment = join53("extends", this.generateExpression(stmt.superClass, Precedence.Unary, E_TTT));
+            result2 = join53(result2, fragment);
           }
           result2.push(space);
           result2.push(this.generateStatement(stmt.body, S_TFFT));
@@ -331700,9 +332050,9 @@ var require_escodegen = __commonJS({
           return escapeDirective(stmt.directive) + this.semicolon(flags);
         }, "DirectiveStatement"),
         DoWhileStatement: /* @__PURE__ */ __name(function(stmt, flags) {
-          var result2 = join54("do", this.maybeBlock(stmt.body, S_TFFF));
+          var result2 = join53("do", this.maybeBlock(stmt.body, S_TFFF));
           result2 = this.maybeBlockSuffix(stmt.body, result2);
-          return join54(result2, [
+          return join53(result2, [
             "while" + space + "(",
             this.generateExpression(stmt.test, Precedence.Sequence, E_TTT),
             ")" + this.semicolon(flags)
@@ -331738,11 +332088,11 @@ var require_escodegen = __commonJS({
         ExportDefaultDeclaration: /* @__PURE__ */ __name(function(stmt, flags) {
           var result2 = ["export"], bodyFlags;
           bodyFlags = flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF;
-          result2 = join54(result2, "default");
+          result2 = join53(result2, "default");
           if (isStatement(stmt.declaration)) {
-            result2 = join54(result2, this.generateStatement(stmt.declaration, bodyFlags));
+            result2 = join53(result2, this.generateStatement(stmt.declaration, bodyFlags));
           } else {
-            result2 = join54(result2, this.generateExpression(stmt.declaration, Precedence.Assignment, E_TTT) + this.semicolon(flags));
+            result2 = join53(result2, this.generateExpression(stmt.declaration, Precedence.Assignment, E_TTT) + this.semicolon(flags));
           }
           return result2;
         }, "ExportDefaultDeclaration"),
@@ -331750,15 +332100,15 @@ var require_escodegen = __commonJS({
           var result2 = ["export"], bodyFlags, that = this;
           bodyFlags = flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF;
           if (stmt.declaration) {
-            return join54(result2, this.generateStatement(stmt.declaration, bodyFlags));
+            return join53(result2, this.generateStatement(stmt.declaration, bodyFlags));
           }
           if (stmt.specifiers) {
             if (stmt.specifiers.length === 0) {
-              result2 = join54(result2, "{" + space + "}");
+              result2 = join53(result2, "{" + space + "}");
             } else if (stmt.specifiers[0].type === Syntax.ExportBatchSpecifier) {
-              result2 = join54(result2, this.generateExpression(stmt.specifiers[0], Precedence.Sequence, E_TTT));
+              result2 = join53(result2, this.generateExpression(stmt.specifiers[0], Precedence.Sequence, E_TTT));
             } else {
-              result2 = join54(result2, "{");
+              result2 = join53(result2, "{");
               withIndent(function(indent2) {
                 var i6, iz;
                 result2.push(newline);
@@ -331776,7 +332126,7 @@ var require_escodegen = __commonJS({
               result2.push(base + "}");
             }
             if (stmt.source) {
-              result2 = join54(result2, [
+              result2 = join53(result2, [
                 "from" + space,
                 // ModuleSpecifier
                 this.generateExpression(stmt.source, Precedence.Sequence, E_TTT),
@@ -331867,7 +332217,7 @@ var require_escodegen = __commonJS({
           ];
           cursor2 = 0;
           if (stmt.specifiers[cursor2].type === Syntax.ImportDefaultSpecifier) {
-            result2 = join54(result2, [
+            result2 = join53(result2, [
               this.generateExpression(stmt.specifiers[cursor2], Precedence.Sequence, E_TTT)
             ]);
             ++cursor2;
@@ -331877,7 +332227,7 @@ var require_escodegen = __commonJS({
               result2.push(",");
             }
             if (stmt.specifiers[cursor2].type === Syntax.ImportNamespaceSpecifier) {
-              result2 = join54(result2, [
+              result2 = join53(result2, [
                 space,
                 this.generateExpression(stmt.specifiers[cursor2], Precedence.Sequence, E_TTT)
               ]);
@@ -331906,7 +332256,7 @@ var require_escodegen = __commonJS({
               }
             }
           }
-          result2 = join54(result2, [
+          result2 = join53(result2, [
             "from" + space,
             // ModuleSpecifier
             this.generateExpression(stmt.source, Precedence.Sequence, E_TTT),
@@ -331961,7 +332311,7 @@ var require_escodegen = __commonJS({
           return result2;
         }, "VariableDeclaration"),
         ThrowStatement: /* @__PURE__ */ __name(function(stmt, flags) {
-          return [join54(
+          return [join53(
             "throw",
             this.generateExpression(stmt.argument, Precedence.Sequence, E_TTT)
           ), this.semicolon(flags)];
@@ -331972,7 +332322,7 @@ var require_escodegen = __commonJS({
           result2 = this.maybeBlockSuffix(stmt.block, result2);
           if (stmt.handlers) {
             for (i6 = 0, iz = stmt.handlers.length; i6 < iz; ++i6) {
-              result2 = join54(result2, this.generateStatement(stmt.handlers[i6], S_TFFF));
+              result2 = join53(result2, this.generateStatement(stmt.handlers[i6], S_TFFF));
               if (stmt.finalizer || i6 + 1 !== iz) {
                 result2 = this.maybeBlockSuffix(stmt.handlers[i6].body, result2);
               }
@@ -331980,7 +332330,7 @@ var require_escodegen = __commonJS({
           } else {
             guardedHandlers = stmt.guardedHandlers || [];
             for (i6 = 0, iz = guardedHandlers.length; i6 < iz; ++i6) {
-              result2 = join54(result2, this.generateStatement(guardedHandlers[i6], S_TFFF));
+              result2 = join53(result2, this.generateStatement(guardedHandlers[i6], S_TFFF));
               if (stmt.finalizer || i6 + 1 !== iz) {
                 result2 = this.maybeBlockSuffix(guardedHandlers[i6].body, result2);
               }
@@ -331988,13 +332338,13 @@ var require_escodegen = __commonJS({
             if (stmt.handler) {
               if (Array.isArray(stmt.handler)) {
                 for (i6 = 0, iz = stmt.handler.length; i6 < iz; ++i6) {
-                  result2 = join54(result2, this.generateStatement(stmt.handler[i6], S_TFFF));
+                  result2 = join53(result2, this.generateStatement(stmt.handler[i6], S_TFFF));
                   if (stmt.finalizer || i6 + 1 !== iz) {
                     result2 = this.maybeBlockSuffix(stmt.handler[i6].body, result2);
                   }
                 }
               } else {
-                result2 = join54(result2, this.generateStatement(stmt.handler, S_TFFF));
+                result2 = join53(result2, this.generateStatement(stmt.handler, S_TFFF));
                 if (stmt.finalizer) {
                   result2 = this.maybeBlockSuffix(stmt.handler.body, result2);
                 }
@@ -332002,7 +332352,7 @@ var require_escodegen = __commonJS({
             }
           }
           if (stmt.finalizer) {
-            result2 = join54(result2, ["finally", this.maybeBlock(stmt.finalizer, S_TFFF)]);
+            result2 = join53(result2, ["finally", this.maybeBlock(stmt.finalizer, S_TFFF)]);
           }
           return result2;
         }, "TryStatement"),
@@ -332036,7 +332386,7 @@ var require_escodegen = __commonJS({
           withIndent(function() {
             if (stmt.test) {
               result2 = [
-                join54("case", that.generateExpression(stmt.test, Precedence.Sequence, E_TTT)),
+                join53("case", that.generateExpression(stmt.test, Precedence.Sequence, E_TTT)),
                 ":"
               ];
             } else {
@@ -332084,9 +332434,9 @@ var require_escodegen = __commonJS({
             result2.push(this.maybeBlock(stmt.consequent, S_TFFF));
             result2 = this.maybeBlockSuffix(stmt.consequent, result2);
             if (stmt.alternate.type === Syntax.IfStatement) {
-              result2 = join54(result2, ["else ", this.generateStatement(stmt.alternate, bodyFlags)]);
+              result2 = join53(result2, ["else ", this.generateStatement(stmt.alternate, bodyFlags)]);
             } else {
-              result2 = join54(result2, join54("else", this.maybeBlock(stmt.alternate, bodyFlags)));
+              result2 = join53(result2, join53("else", this.maybeBlock(stmt.alternate, bodyFlags)));
             }
           } else {
             result2.push(this.maybeBlock(stmt.consequent, bodyFlags));
@@ -332187,7 +332537,7 @@ var require_escodegen = __commonJS({
         }, "FunctionDeclaration"),
         ReturnStatement: /* @__PURE__ */ __name(function(stmt, flags) {
           if (stmt.argument) {
-            return [join54(
+            return [join53(
               "return",
               this.generateExpression(stmt.argument, Precedence.Sequence, E_TTT)
             ), this.semicolon(flags)];
@@ -332276,14 +332626,14 @@ var require_escodegen = __commonJS({
           if (leftSource.charCodeAt(leftSource.length - 1) === 47 && esutils.code.isIdentifierPartES5(expr.operator.charCodeAt(0))) {
             result2 = [fragment, noEmptySpace(), expr.operator];
           } else {
-            result2 = join54(fragment, expr.operator);
+            result2 = join53(fragment, expr.operator);
           }
           fragment = this.generateExpression(expr.right, rightPrecedence, flags);
           if (expr.operator === "/" && fragment.toString().charAt(0) === "/" || expr.operator.slice(-1) === "<" && fragment.toString().slice(0, 3) === "!--") {
             result2.push(noEmptySpace());
             result2.push(fragment);
           } else {
-            result2 = join54(result2, fragment);
+            result2 = join53(result2, fragment);
           }
           if (expr.operator === "in" && !(flags & F_ALLOW_IN)) {
             return ["(", result2, ")"];
@@ -332323,7 +332673,7 @@ var require_escodegen = __commonJS({
           var result2, length, i6, iz, itemFlags;
           length = expr["arguments"].length;
           itemFlags = flags & F_ALLOW_UNPARATH_NEW && !parentheses && length === 0 ? E_TFT : E_TFF;
-          result2 = join54(
+          result2 = join53(
             "new",
             this.generateExpression(expr.callee, Precedence.New, itemFlags)
           );
@@ -332373,11 +332723,11 @@ var require_escodegen = __commonJS({
           var result2, fragment, rightCharCode, leftSource, leftCharCode;
           fragment = this.generateExpression(expr.argument, Precedence.Unary, E_TTT);
           if (space === "") {
-            result2 = join54(expr.operator, fragment);
+            result2 = join53(expr.operator, fragment);
           } else {
             result2 = [expr.operator];
             if (expr.operator.length > 2) {
-              result2 = join54(result2, fragment);
+              result2 = join53(result2, fragment);
             } else {
               leftSource = toSourceNodeWhenNeeded(result2).toString();
               leftCharCode = leftSource.charCodeAt(leftSource.length - 1);
@@ -332400,7 +332750,7 @@ var require_escodegen = __commonJS({
             result2 = "yield";
           }
           if (expr.argument) {
-            result2 = join54(
+            result2 = join53(
               result2,
               this.generateExpression(expr.argument, Precedence.Yield, E_TTT)
             );
@@ -332408,7 +332758,7 @@ var require_escodegen = __commonJS({
           return parenthesize(result2, Precedence.Yield, precedence);
         }, "YieldExpression"),
         AwaitExpression: /* @__PURE__ */ __name(function(expr, precedence, flags) {
-          var result2 = join54(
+          var result2 = join53(
             expr.all ? "await*" : "await",
             this.generateExpression(expr.argument, Precedence.Await, E_TTT)
           );
@@ -332491,11 +332841,11 @@ var require_escodegen = __commonJS({
           var result2, fragment;
           result2 = ["class"];
           if (expr.id) {
-            result2 = join54(result2, this.generateExpression(expr.id, Precedence.Sequence, E_TTT));
+            result2 = join53(result2, this.generateExpression(expr.id, Precedence.Sequence, E_TTT));
           }
           if (expr.superClass) {
-            fragment = join54("extends", this.generateExpression(expr.superClass, Precedence.Unary, E_TTT));
-            result2 = join54(result2, fragment);
+            fragment = join53("extends", this.generateExpression(expr.superClass, Precedence.Unary, E_TTT));
+            result2 = join53(result2, fragment);
           }
           result2.push(space);
           result2.push(this.generateStatement(expr.body, S_TFFT));
@@ -332510,7 +332860,7 @@ var require_escodegen = __commonJS({
           }
           if (expr.kind === "get" || expr.kind === "set") {
             fragment = [
-              join54(expr.kind, this.generatePropertyKey(expr.key, expr.computed)),
+              join53(expr.kind, this.generatePropertyKey(expr.key, expr.computed)),
               this.generateFunctionBody(expr.value)
             ];
           } else {
@@ -332520,7 +332870,7 @@ var require_escodegen = __commonJS({
               this.generateFunctionBody(expr.value)
             ];
           }
-          return join54(result2, fragment);
+          return join53(result2, fragment);
         }, "MethodDefinition"),
         Property: /* @__PURE__ */ __name(function(expr, precedence, flags) {
           if (expr.kind === "get" || expr.kind === "set") {
@@ -332715,7 +333065,7 @@ var require_escodegen = __commonJS({
               for (i6 = 0, iz = expr.blocks.length; i6 < iz; ++i6) {
                 fragment = that.generateExpression(expr.blocks[i6], Precedence.Sequence, E_TTT);
                 if (i6 > 0 || extra.moz.comprehensionExpressionStartsWithAssignment) {
-                  result2 = join54(result2, fragment);
+                  result2 = join53(result2, fragment);
                 } else {
                   result2.push(fragment);
                 }
@@ -332723,13 +333073,13 @@ var require_escodegen = __commonJS({
             });
           }
           if (expr.filter) {
-            result2 = join54(result2, "if" + space);
+            result2 = join53(result2, "if" + space);
             fragment = this.generateExpression(expr.filter, Precedence.Sequence, E_TTT);
-            result2 = join54(result2, ["(", fragment, ")"]);
+            result2 = join53(result2, ["(", fragment, ")"]);
           }
           if (!extra.moz.comprehensionExpressionStartsWithAssignment) {
             fragment = this.generateExpression(expr.body, Precedence.Assignment, E_TTT);
-            result2 = join54(result2, fragment);
+            result2 = join53(result2, fragment);
           }
           result2.push(expr.type === Syntax.GeneratorExpression ? ")" : "]");
           return result2;
@@ -332745,8 +333095,8 @@ var require_escodegen = __commonJS({
           } else {
             fragment = this.generateExpression(expr.left, Precedence.Call, E_TTT);
           }
-          fragment = join54(fragment, expr.of ? "of" : "in");
-          fragment = join54(fragment, this.generateExpression(expr.right, Precedence.Sequence, E_TTT));
+          fragment = join53(fragment, expr.of ? "of" : "in");
+          fragment = join53(fragment, this.generateExpression(expr.right, Precedence.Sequence, E_TTT));
           return ["for" + space + "(", fragment, ")"];
         }, "ComprehensionBlock"),
         SpreadElement: /* @__PURE__ */ __name(function(expr, precedence, flags) {
@@ -339380,12 +339730,12 @@ function __metadata(metadataKey, metadataValue) {
 }
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value2) {
-    return value2 instanceof P ? value2 : new P(function(resolve16) {
-      resolve16(value2);
+    return value2 instanceof P ? value2 : new P(function(resolve17) {
+      resolve17(value2);
     });
   }
   __name(adopt, "adopt");
-  return new (P || (P = Promise))(function(resolve16, reject) {
+  return new (P || (P = Promise))(function(resolve17, reject) {
     function fulfilled(value2) {
       try {
         step(generator.next(value2));
@@ -339403,7 +339753,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
     }
     __name(rejected, "rejected");
     function step(result2) {
-      result2.done ? resolve16(result2.value) : adopt(result2.value).then(fulfilled, rejected);
+      result2.done ? resolve17(result2.value) : adopt(result2.value).then(fulfilled, rejected);
     }
     __name(step, "step");
     step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -339605,15 +339955,15 @@ function __asyncValues(o3) {
   }, i6);
   function verb(n3) {
     i6[n3] = o3[n3] && function(v) {
-      return new Promise(function(resolve16, reject) {
-        v = o3[n3](v), settle(resolve16, reject, v.done, v.value);
+      return new Promise(function(resolve17, reject) {
+        v = o3[n3](v), settle(resolve17, reject, v.done, v.value);
       });
     };
   }
   __name(verb, "verb");
-  function settle(resolve16, reject, d6, v) {
+  function settle(resolve17, reject, d6, v) {
     Promise.resolve(v).then(function(v2) {
-      resolve16({ value: v2, done: d6 });
+      resolve17({ value: v2, done: d6 });
     }, reject);
   }
   __name(settle, "settle");
@@ -343284,12 +343634,12 @@ var require_util4 = __commonJS({
     exports2.isGMT = exports2.dnsLookup = void 0;
     var dns_1 = require("dns");
     function dnsLookup(host, opts) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         (0, dns_1.lookup)(host, opts, (err, res) => {
           if (err) {
             reject(err);
           } else {
-            resolve16(res);
+            resolve17(res);
           }
         });
       });
@@ -343917,10 +344267,10 @@ var require_myIpAddress = __commonJS({
     var ip_1 = require_ip();
     var net_1 = __importDefault2(require("net"));
     async function myIpAddress() {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const socket = net_1.default.connect({ host: "8.8.8.8", port: 53 });
         const onError = /* @__PURE__ */ __name(() => {
-          resolve16(ip_1.ip.address());
+          resolve17(ip_1.ip.address());
         }, "onError");
         socket.once("error", onError);
         socket.once("connect", () => {
@@ -343928,9 +344278,9 @@ var require_myIpAddress = __commonJS({
           const addr = socket.address();
           socket.destroy();
           if (typeof addr === "string") {
-            resolve16(addr);
+            resolve17(addr);
           } else if (addr.address) {
-            resolve16(addr.address);
+            resolve17(addr.address);
           } else {
             reject(new Error("Expected a `string`"));
           }
@@ -344569,8 +344919,8 @@ var require_deferred_promise = __commonJS({
         this.context = args.context;
         this.owner = args.context.runtime;
         this.handle = args.promiseHandle;
-        this.settled = new Promise((resolve16) => {
-          this.onSettled = resolve16;
+        this.settled = new Promise((resolve17) => {
+          this.onSettled = resolve17;
         });
         this.resolveHandle = args.resolveHandle;
         this.rejectHandle = args.rejectHandle;
@@ -345103,13 +345453,13 @@ var require_context = __commonJS({
         if (vmResolveResult.error) {
           return Promise.resolve(vmResolveResult);
         }
-        return new Promise((resolve16) => {
+        return new Promise((resolve17) => {
           lifetime_1.Scope.withScope((scope) => {
             const resolveHandle = scope.manage(this.newFunction("resolve", (value2) => {
-              resolve16({ value: value2 && value2.dup() });
+              resolve17({ value: value2 && value2.dup() });
             }));
             const rejectHandle = scope.manage(this.newFunction("reject", (error3) => {
-              resolve16({ error: error3 && error3.dup() });
+              resolve17({ error: error3 && error3.dup() });
             }));
             const promiseHandle = scope.manage(vmResolveResult.value);
             const promiseThenHandle = scope.manage(this.getProp(promiseHandle, "then"));
@@ -347229,7 +347579,7 @@ var require_parse_proxy_response2 = __commonJS({
     var debug_1 = __importDefault2(require_src2());
     var debug2 = (0, debug_1.default)("https-proxy-agent:parse-proxy-response");
     function parseProxyResponse(socket) {
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         let buffersLength = 0;
         const buffers = [];
         function read() {
@@ -347299,7 +347649,7 @@ var require_parse_proxy_response2 = __commonJS({
           }
           debug2("got proxy server response: %o %o", firstLine, headers);
           cleanup();
-          resolve16({
+          resolve17({
             connect: {
               statusCode,
               statusText,
@@ -347947,19 +348297,19 @@ async function listContext(ioHelper, context, sourceFiles) {
     await ioHelper.defaults.info("SSM parameters, and so on.");
     return;
   }
-  const data_out = [[import_chalk38.default.green("#"), import_chalk38.default.green("Key"), import_chalk38.default.green("Value")]];
+  const data_out = [[import_chalk39.default.green("#"), import_chalk39.default.green("Key"), import_chalk39.default.green("Value")]];
   for (const [i6, key] of keys) {
     const jsonWithoutNewlines = JSON.stringify(context.all[key], void 0, 2).replace(/\s+/g, " ");
     data_out.push([i6, key, jsonWithoutNewlines]);
   }
   if (sourceFiles.length > 0) {
-    await ioHelper.defaults.info("Context found in %s:", sourceFiles.map((f6) => import_chalk38.default.blue(f6)).join(", "));
+    await ioHelper.defaults.info("Context found in %s:", sourceFiles.map((f6) => import_chalk39.default.blue(f6)).join(", "));
   } else {
     await ioHelper.defaults.info("Context found:");
   }
   await ioHelper.defaults.info("");
   await ioHelper.defaults.info(renderTable(data_out, process.stdout.columns));
-  await ioHelper.defaults.info(`Run ${import_chalk38.default.blue("cdk context --reset KEY_OR_NUMBER")} to remove a context key. It will be refreshed on the next CDK synthesis run.`);
+  await ioHelper.defaults.info(`Run ${import_chalk39.default.blue("cdk context --reset KEY_OR_NUMBER")} to remove a context key. It will be refreshed on the next CDK synthesis run.`);
 }
 async function invalidateContext(ioHelper, context, key, force) {
   const i6 = parseInt(key, 10);
@@ -347969,10 +348319,10 @@ async function invalidateContext(ioHelper, context, key, force) {
   if (context.has(key)) {
     context.unset(key);
     if (!context.has(key)) {
-      await ioHelper.defaults.info("Context value %s reset. It will be refreshed on next synthesis", import_chalk38.default.blue(key));
+      await ioHelper.defaults.info("Context value %s reset. It will be refreshed on next synthesis", import_chalk39.default.blue(key));
       return;
     }
-    await ioHelper.defaults.error("Only context values specified in %s can be reset through the CLI", import_chalk38.default.blue(PROJECT_CONTEXT));
+    await ioHelper.defaults.error("Only context values specified in %s can be reset through the CLI", import_chalk39.default.blue(PROJECT_CONTEXT));
     if (!force) {
       throw new import_toolkit_lib21.ToolkitError("ReadonlyContextKey", `Cannot reset readonly context value with key: ${key}`);
     }
@@ -348008,7 +348358,7 @@ async function printReadonly(ioHelper, readonly) {
     await ioHelper.defaults.info("  %s", match);
   }
   await ioHelper.defaults.info("");
-  await ioHelper.defaults.info("This usually means they are configured in %s or %s", import_chalk38.default.blue(PROJECT_CONFIG), import_chalk38.default.blue(USER_DEFAULTS));
+  await ioHelper.defaults.info("This usually means they are configured in %s or %s", import_chalk39.default.blue(PROJECT_CONFIG), import_chalk39.default.blue(USER_DEFAULTS));
 }
 function keysByExpression(context, expression) {
   const matchesExpression = picomatch4(expression);
@@ -348046,12 +348396,12 @@ function enumerate1(xs) {
   }
   return ret;
 }
-var import_toolkit_lib21, import_chalk38, picomatch4;
+var import_toolkit_lib21, import_chalk39, picomatch4;
 var init_context5 = __esm({
   "lib/commands/context.ts"() {
     "use strict";
     import_toolkit_lib21 = __toESM(require_lib12());
-    import_chalk38 = __toESM(require_source());
+    import_chalk39 = __toESM(require_source());
     init_tables();
     init_user_configuration();
     picomatch4 = require_picomatch6();
@@ -348072,9 +348422,9 @@ var init_context5 = __esm({
 async function docs(options) {
   const ioHelper = options.ioHelper;
   const url = "https://docs.aws.amazon.com/cdk/api/v2/";
-  await ioHelper.defaults.info(import_chalk39.default.green(url));
+  await ioHelper.defaults.info(import_chalk40.default.green(url));
   const browserCommand = options.browser.replace(/%u/g, url);
-  await ioHelper.defaults.debug(`Opening documentation ${import_chalk39.default.green(browserCommand)}`);
+  await ioHelper.defaults.debug(`Opening documentation ${import_chalk40.default.green(browserCommand)}`);
   try {
     const { stdout: stdout2, stderr } = await (0, tools_exports3.runUserCommandLine)(browserCommand);
     if (stdout2) {
@@ -348089,11 +348439,11 @@ async function docs(options) {
   }
   return 0;
 }
-var import_chalk39;
+var import_chalk40;
 var init_docs = __esm({
   "lib/commands/docs.ts"() {
     "use strict";
-    import_chalk39 = __toESM(require_source());
+    import_chalk40 = __toESM(require_source());
     init_tools3();
     __name(docs, "docs");
   }
@@ -348121,13 +348471,13 @@ async function displayCliConfiguration(ioHelper, settings) {
     debug2.push("CLI");
   }
   const debugging = debug2.length ? `debugging ${debug2.join(" & ")}` : "no debugging";
-  await ioHelper.defaults.info(import_chalk40.default.gray.italic(
+  await ioHelper.defaults.info(import_chalk41.default.gray.italic(
     `${verbose}, ${debugging}`
   ));
   return true;
 }
 async function displayVersionInformation(ioHelper) {
-  await ioHelper.defaults.info(`\u2139\uFE0F CDK CLI Version: ${import_chalk40.default.green(versionWithBuild())}`);
+  await ioHelper.defaults.info(`\u2139\uFE0F CDK CLI Version: ${import_chalk41.default.green(versionWithBuild())}`);
   return true;
 }
 async function displayAwsEnvironmentVariables(ioHelper) {
@@ -348138,7 +348488,7 @@ async function displayAwsEnvironmentVariables(ioHelper) {
   }
   await ioHelper.defaults.info("\u2139\uFE0F AWS environment variables:");
   for (const key of keys) {
-    await ioHelper.defaults.info(`  - ${import_chalk40.default.blue(key)} = ${import_chalk40.default.green(anonymizeAwsVariable(key, process2.env[key]))}`);
+    await ioHelper.defaults.info(`  - ${import_chalk41.default.blue(key)} = ${import_chalk41.default.green(anonymizeAwsVariable(key, process2.env[key]))}`);
   }
   return true;
 }
@@ -348152,10 +348502,10 @@ async function displayCdkEnvironmentVariables(ioHelper) {
   let healthy = true;
   for (const key of keys.sort()) {
     if (key === cxapi14.CONTEXT_ENV || key === cxapi14.CONTEXT_OVERFLOW_LOCATION_ENV || key === cxapi14.OUTDIR_ENV) {
-      await ioHelper.defaults.info(`  - ${import_chalk40.default.red(key)} = ${import_chalk40.default.green(process2.env[key])} (\u26A0\uFE0F reserved for use by the CDK toolkit)`);
+      await ioHelper.defaults.info(`  - ${import_chalk41.default.red(key)} = ${import_chalk41.default.green(process2.env[key])} (\u26A0\uFE0F reserved for use by the CDK toolkit)`);
       healthy = false;
     } else {
-      await ioHelper.defaults.info(`  - ${import_chalk40.default.blue(key)} = ${import_chalk40.default.green(process2.env[key])}`);
+      await ioHelper.defaults.info(`  - ${import_chalk41.default.blue(key)} = ${import_chalk41.default.green(process2.env[key])}`);
     }
   }
   return healthy;
@@ -348169,13 +348519,13 @@ function anonymizeAwsVariable(name, value2) {
   }
   return value2;
 }
-var process2, cxapi14, import_chalk40, verifications;
+var process2, cxapi14, import_chalk41, verifications;
 var init_doctor = __esm({
   "lib/commands/doctor.ts"() {
     "use strict";
     process2 = __toESM(require("process"));
     cxapi14 = __toESM(require_lib11());
-    import_chalk40 = __toESM(require_source());
+    import_chalk41 = __toESM(require_source());
     init_display_version();
     init_version();
     __name(doctor, "doctor");
@@ -349606,8 +349956,8 @@ var require_prompt2 = __commonJS({
         throw new Error("expected prompt to have a custom render method");
       }
       run() {
-        return new Promise(async (resolve16, reject) => {
-          this.once("submit", resolve16);
+        return new Promise(async (resolve17, reject) => {
+          this.once("submit", resolve17);
           this.once("cancel", reject);
           if (await this.skip()) {
             this.render = () => {
@@ -350133,14 +350483,14 @@ var require_array3 = __commonJS({
           return this.render();
         }, "number");
         clearTimeout(this.numberTimeout);
-        return new Promise((resolve16) => {
+        return new Promise((resolve17) => {
           let len = this.choices.length;
           let num = this.num;
           let handle = /* @__PURE__ */ __name((val = false, res) => {
             clearTimeout(this.numberTimeout);
             if (val) res = number(num);
             this.num = "";
-            resolve16(res);
+            resolve17(res);
           }, "handle");
           if (num === "0" || num.length === 1 && Number(num + "0") > len) {
             return handle(true);
@@ -353341,7 +353691,7 @@ function normalizePath2(url, type) {
   }
   url.path = path54;
 }
-function resolve13(input, base) {
+function resolve14(input, base) {
   if (!input && !base)
     return "";
   const url = parseUrl2(input);
@@ -353412,7 +353762,7 @@ var init_resolve_uri = __esm({
     __name(stripPathFilename, "stripPathFilename");
     __name(mergePaths, "mergePaths");
     __name(normalizePath2, "normalizePath");
-    __name(resolve13, "resolve");
+    __name(resolve14, "resolve");
   }
 });
 
@@ -353425,7 +353775,7 @@ function stripFilename(path54) {
 function resolver(mapUrl, sourceRoot) {
   const from = stripFilename(mapUrl);
   const prefix = sourceRoot ? sourceRoot + "/" : "";
-  return (source) => resolve13(prefix + (source || ""), from);
+  return (source) => resolve14(prefix + (source || ""), from);
 }
 function maybeSort(mappings, owned) {
   const unsortedIndex = nextUnsortedSegmentLine(mappings, 0);
@@ -353603,8 +353953,8 @@ var init_trace_mapping = __esm({
         this.sources = sources;
         this.sourcesContent = sourcesContent;
         this.ignoreList = parsed.ignoreList || parsed.x_google_ignoreList || void 0;
-        const resolve16 = resolver(mapUrl, sourceRoot);
-        this.resolvedSources = sources.map(resolve16);
+        const resolve17 = resolver(mapUrl, sourceRoot);
+        this.resolvedSources = sources.map(resolve17);
         const { mappings } = parsed;
         if (typeof mappings === "string") {
           this._encoded = mappings;
@@ -353975,15 +354325,15 @@ __export(assembly_reader_exports, {
   readAssembly: () => readAssembly
 });
 async function readAssembly(assemblyDir) {
-  const manifestPath = path49.join(assemblyDir, import_cloud_assembly_api17.MANIFEST_FILE);
+  const manifestPath = path49.join(assemblyDir, import_cloud_assembly_api16.MANIFEST_FILE);
   if (!fs54.existsSync(manifestPath)) {
     return { status: "not-found" };
   }
   try {
-    const assembly = new import_cloud_assembly_api17.CloudAssembly(assemblyDir);
+    const assembly = new import_cloud_assembly_api16.CloudAssembly(assemblyDir);
     const projectRoot = path49.dirname(assemblyDir);
     const sourceResolver = new SourceMapResolver(projectRoot);
-    const tree = await (0, import_cloud_assembly_api17.buildConstructTreeAsync)(assembly, async (fields, stack, constructPath) => ({
+    const tree = await (0, import_cloud_assembly_api16.buildConstructTreeAsync)(assembly, async (fields, stack, constructPath) => ({
       ...fields,
       // templateFile comes from the manifest / a nested stack's aws:asset:path,
       // both attacker-influenceable if cdk.out is tampered with. Drop any that
@@ -354012,13 +354362,13 @@ function loadViolations(assemblyDir) {
   if (!fs54.existsSync(reportPath)) return void 0;
   return JSON.parse(fs54.readFileSync(reportPath, "utf-8"));
 }
-var fs54, path49, import_cloud_assembly_api17, import_cloud_assembly_schema10;
+var fs54, path49, import_cloud_assembly_api16, import_cloud_assembly_schema10;
 var init_assembly_reader = __esm({
   "../@aws-cdk/cdk-explorer/lib/core/assembly-reader.ts"() {
     "use strict";
     fs54 = __toESM(require("fs"));
     path49 = __toESM(require("path"));
-    import_cloud_assembly_api17 = __toESM(require_lib3());
+    import_cloud_assembly_api16 = __toESM(require_lib3());
     import_cloud_assembly_schema10 = __toESM(require_lib2());
     init_api_private2();
     init_source_resolver();
@@ -355187,8 +355537,8 @@ var require_semaphore = __commonJS({
         this._waiting = [];
       }
       lock(thunk) {
-        return new Promise((resolve16, reject) => {
-          this._waiting.push({ thunk, resolve: resolve16, reject });
+        return new Promise((resolve17, reject) => {
+          this._waiting.push({ thunk, resolve: resolve17, reject });
           this.runNext();
         });
       }
@@ -356753,9 +357103,9 @@ ${JSON.stringify(message2, null, 4)}`);
           if (typeof cancellationStrategy.sender.enableCancellation === "function") {
             cancellationStrategy.sender.enableCancellation(requestMessage);
           }
-          return new Promise(async (resolve16, reject) => {
+          return new Promise(async (resolve17, reject) => {
             const resolveWithCleanup = /* @__PURE__ */ __name((r6) => {
-              resolve16(r6);
+              resolve17(r6);
               cancellationStrategy.sender.cleanup(id);
               disposable?.dispose();
             }, "resolveWithCleanup");
@@ -357177,10 +357527,10 @@ var require_ril = __commonJS({
         return api_1.Disposable.create(() => this.stream.off("end", listener));
       }
       write(data, encoding) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           const callback = /* @__PURE__ */ __name((error3) => {
             if (error3 === void 0 || error3 === null) {
-              resolve16();
+              resolve17();
             } else {
               reject(error3);
             }
@@ -357459,10 +357809,10 @@ var require_main2 = __commonJS({
     exports2.generateRandomPipeName = generateRandomPipeName;
     function createClientPipeTransport(pipeName, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve16, _reject) => {
-        connectResolve = resolve16;
+      const connected = new Promise((resolve17, _reject) => {
+        connectResolve = resolve17;
       });
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         let server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -357473,7 +357823,7 @@ var require_main2 = __commonJS({
         server.on("error", reject);
         server.listen(pipeName, () => {
           server.removeListener("error", reject);
-          resolve16({
+          resolve17({
             onConnected: /* @__PURE__ */ __name(() => {
               return connected;
             }, "onConnected")
@@ -357494,10 +357844,10 @@ var require_main2 = __commonJS({
     exports2.createServerPipeTransport = createServerPipeTransport;
     function createClientSocketTransport(port, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve16, _reject) => {
-        connectResolve = resolve16;
+      const connected = new Promise((resolve17, _reject) => {
+        connectResolve = resolve17;
       });
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -357508,7 +357858,7 @@ var require_main2 = __commonJS({
         server.on("error", reject);
         server.listen(port, "127.0.0.1", () => {
           server.removeListener("error", reject);
-          resolve16({
+          resolve17({
             onConnected: /* @__PURE__ */ __name(() => {
               return connected;
             }, "onConnected")
@@ -358738,8 +359088,8 @@ var require_semaphore2 = __commonJS({
         this._waiting = [];
       }
       lock(thunk) {
-        return new Promise((resolve16, reject) => {
-          this._waiting.push({ thunk, resolve: resolve16, reject });
+        return new Promise((resolve17, reject) => {
+          this._waiting.push({ thunk, resolve: resolve17, reject });
           this.runNext();
         });
       }
@@ -360304,9 +360654,9 @@ ${JSON.stringify(message2, null, 4)}`);
           if (typeof cancellationStrategy.sender.enableCancellation === "function") {
             cancellationStrategy.sender.enableCancellation(requestMessage);
           }
-          return new Promise(async (resolve16, reject) => {
+          return new Promise(async (resolve17, reject) => {
             const resolveWithCleanup = /* @__PURE__ */ __name((r6) => {
-              resolve16(r6);
+              resolve17(r6);
               cancellationStrategy.sender.cleanup(id);
               disposable?.dispose();
             }, "resolveWithCleanup");
@@ -360727,10 +361077,10 @@ var require_ril2 = __commonJS({
         return api_1.Disposable.create(() => this.stream.off("end", listener));
       }
       write(data, encoding) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve17, reject) => {
           const callback = /* @__PURE__ */ __name((error3) => {
             if (error3 === void 0 || error3 === null) {
-              resolve16();
+              resolve17();
             } else {
               reject(error3);
             }
@@ -361009,10 +361359,10 @@ var require_main3 = __commonJS({
     exports2.generateRandomPipeName = generateRandomPipeName;
     function createClientPipeTransport(pipeName, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve16, _reject) => {
-        connectResolve = resolve16;
+      const connected = new Promise((resolve17, _reject) => {
+        connectResolve = resolve17;
       });
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         let server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -361023,7 +361373,7 @@ var require_main3 = __commonJS({
         server.on("error", reject);
         server.listen(pipeName, () => {
           server.removeListener("error", reject);
-          resolve16({
+          resolve17({
             onConnected: /* @__PURE__ */ __name(() => {
               return connected;
             }, "onConnected")
@@ -361044,10 +361394,10 @@ var require_main3 = __commonJS({
     exports2.createServerPipeTransport = createServerPipeTransport;
     function createClientSocketTransport(port, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve16, _reject) => {
-        connectResolve = resolve16;
+      const connected = new Promise((resolve17, _reject) => {
+        connectResolve = resolve17;
       });
-      return new Promise((resolve16, reject) => {
+      return new Promise((resolve17, reject) => {
         const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -361058,7 +361408,7 @@ var require_main3 = __commonJS({
         server.on("error", reject);
         server.listen(port, "127.0.0.1", () => {
           server.removeListener("error", reject);
-          resolve16({
+          resolve17({
             onConnected: /* @__PURE__ */ __name(() => {
               return connected;
             }, "onConnected")
@@ -366112,8 +366462,8 @@ var require_server = __commonJS({
         if (value2 instanceof Promise) {
           return value2;
         } else if (Is.thenable(value2)) {
-          return new Promise((resolve16, reject) => {
-            value2.then((resolved) => resolve16(resolved), (error3) => reject(error3));
+          return new Promise((resolve17, reject) => {
+            value2.then((resolved) => resolve17(resolved), (error3) => reject(error3));
           });
         } else {
           return Promise.resolve(value2);
@@ -366387,7 +366737,7 @@ var require_files = __commonJS({
       return process.platform === "win32";
     }
     __name(isWindows2, "isWindows");
-    function resolve16(moduleName, nodePath, cwd, tracer) {
+    function resolve17(moduleName, nodePath, cwd, tracer) {
       const nodePathKey = "NODE_PATH";
       const app = [
         "var p = process;",
@@ -366406,7 +366756,7 @@ var require_files = __commonJS({
         "}",
         "});"
       ].join("");
-      return new Promise((resolve17, reject) => {
+      return new Promise((resolve18, reject) => {
         let env3 = process.env;
         let newEnv = /* @__PURE__ */ Object.create(null);
         Object.keys(env3).forEach((key) => newEnv[key] = env3[key]);
@@ -366438,7 +366788,7 @@ var require_files = __commonJS({
             if (message3.c === "r") {
               cp.send({ c: "e" });
               if (message3.s) {
-                resolve17(message3.r);
+                resolve18(message3.r);
               } else {
                 reject(new Error(`Failed to resolve module: ${moduleName}`));
               }
@@ -366454,8 +366804,8 @@ var require_files = __commonJS({
         }
       });
     }
-    __name(resolve16, "resolve");
-    exports2.resolve = resolve16;
+    __name(resolve17, "resolve");
+    exports2.resolve = resolve17;
     function resolveGlobalNodePath(tracer) {
       let npmCommand = "npm";
       const env3 = /* @__PURE__ */ Object.create(null);
@@ -366574,17 +366924,17 @@ var require_files = __commonJS({
         if (!path54.isAbsolute(nodePath)) {
           nodePath = path54.join(workspaceRoot, nodePath);
         }
-        return resolve16(moduleName, nodePath, nodePath, tracer).then((value2) => {
+        return resolve17(moduleName, nodePath, nodePath, tracer).then((value2) => {
           if (FileSystem.isParent(nodePath, value2)) {
             return value2;
           } else {
             return Promise.reject(new Error(`Failed to load ${moduleName} from node path location.`));
           }
         }).then(void 0, (_error) => {
-          return resolve16(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+          return resolve17(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
         });
       } else {
-        return resolve16(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+        return resolve17(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
       }
     }
     __name(resolveModulePath, "resolveModulePath");
@@ -367286,7 +367636,7 @@ async function resourceTarget(node) {
   } catch {
     return void 0;
   }
-  const block = (0, import_cloud_assembly_api18.resolveResourceRange)(templateText, node.logicalId);
+  const block = (0, import_cloud_assembly_api17.resolveResourceRange)(templateText, node.logicalId);
   if (block === void 0) {
     return void 0;
   }
@@ -367296,7 +367646,7 @@ async function resourceTarget(node) {
   };
 }
 function sourceTargetAtTemplateOffset(index, templateFile, templateText, offset) {
-  const logicalId = (0, import_cloud_assembly_api18.resolveLogicalIdAtOffset)(templateText, offset);
+  const logicalId = (0, import_cloud_assembly_api17.resolveLogicalIdAtOffset)(templateText, offset);
   if (logicalId === void 0) {
     return void 0;
   }
@@ -367310,13 +367660,13 @@ function sourceTargetAtTemplateOffset(index, templateFile, templateText, offset)
     range: { start: position, end: position }
   };
 }
-var fs55, import_url2, import_cloud_assembly_api18;
+var fs55, import_url2, import_cloud_assembly_api17;
 var init_template_locator = __esm({
   "../@aws-cdk/cdk-explorer/lib/lsp/template-locator.ts"() {
     "use strict";
     fs55 = __toESM(require("fs"));
     import_url2 = require("url");
-    import_cloud_assembly_api18 = __toESM(require_lib3());
+    import_cloud_assembly_api17 = __toESM(require_lib3());
     init_positions();
     __name(resourceTarget, "resourceTarget");
     __name(sourceTargetAtTemplateOffset, "sourceTargetAtTemplateOffset");
@@ -367558,7 +367908,7 @@ async function resolveHoverLinks(nodes6, primary, readTemplate) {
   const resolveOnce = /* @__PURE__ */ __name(async (file) => {
     if (!templates.has(file)) {
       const text = await readTemplate(file);
-      const ranges = text === void 0 ? void 0 : (0, import_cloud_assembly_api19.indexTemplateRanges)(text);
+      const ranges = text === void 0 ? void 0 : (0, import_cloud_assembly_api18.indexTemplateRanges)(text);
       templates.set(file, text !== void 0 && ranges !== void 0 ? { text, ranges } : void 0);
     }
     return templates.get(file);
@@ -367714,12 +368064,12 @@ function histogram(nodes6) {
 function truncate(text, max) {
   return text.length <= max ? text : `${text.slice(0, max - 1)}\u2026`;
 }
-var import_url5, import_cloud_assembly_api19, import_node2, MAX_PROPERTIES, MAX_LINKED_AUX, MAX_STRING_LENGTH, MAX_OBJECT_KEYS, MAX_HISTOGRAM_TYPES;
+var import_url5, import_cloud_assembly_api18, import_node2, MAX_PROPERTIES, MAX_LINKED_AUX, MAX_STRING_LENGTH, MAX_OBJECT_KEYS, MAX_HISTOGRAM_TYPES;
 var init_hover = __esm({
   "../@aws-cdk/cdk-explorer/lib/lsp/hover.ts"() {
     "use strict";
     import_url5 = require("url");
-    import_cloud_assembly_api19 = __toESM(require_lib3());
+    import_cloud_assembly_api18 = __toESM(require_lib3());
     import_node2 = __toESM(require_node6());
     init_codelens();
     init_positions();
@@ -367846,17 +368196,17 @@ function startAssemblyWatcher(options) {
     }
   };
 }
-var path51, import_cloud_assembly_api20, import_cloud_assembly_schema11, TREE_FILE, ASSEMBLY_SIGNAL_FILES, DEBOUNCE_MS;
+var path51, import_cloud_assembly_api19, import_cloud_assembly_schema11, TREE_FILE, ASSEMBLY_SIGNAL_FILES, DEBOUNCE_MS;
 var init_assembly_watcher = __esm({
   "../@aws-cdk/cdk-explorer/lib/core/assembly-watcher.ts"() {
     "use strict";
     path51 = __toESM(require("path"));
-    import_cloud_assembly_api20 = __toESM(require_lib3());
+    import_cloud_assembly_api19 = __toESM(require_lib3());
     import_cloud_assembly_schema11 = __toESM(require_lib2());
     init_esm2();
     TREE_FILE = "tree.json";
     ASSEMBLY_SIGNAL_FILES = /* @__PURE__ */ new Set([
-      import_cloud_assembly_api20.MANIFEST_FILE,
+      import_cloud_assembly_api19.MANIFEST_FILE,
       TREE_FILE,
       import_cloud_assembly_schema11.VALIDATION_REPORT_FILE
     ]);
@@ -367873,7 +368223,7 @@ __export(server_exports, {
   startServer: () => startServer
 });
 async function sleep3(ms) {
-  return new Promise((resolve16) => setTimeout(resolve16, ms));
+  return new Promise((resolve17) => setTimeout(resolve17, ms));
 }
 function handleSynthOnSave(result2, log) {
   switch (result2.status) {
@@ -367914,7 +368264,7 @@ function createLspHandlers(options) {
   let autoSynthEnabled = false;
   let shouldIgnore = /* @__PURE__ */ __name(() => false, "shouldIgnore");
   let assemblyWatcher;
-  let cachedIndex = import_cloud_assembly_api21.ConstructIndex.fromTree([]);
+  let cachedIndex = import_cloud_assembly_api20.ConstructIndex.fromTree([]);
   let cachedTree = [];
   let cachedWarnings = [];
   let cachedAssemblyDir;
@@ -367960,7 +368310,7 @@ function createLspHandlers(options) {
     for (const warning2 of warnings) {
       log.warn(warning2);
     }
-    cachedIndex = import_cloud_assembly_api21.ConstructIndex.fromTree(tree);
+    cachedIndex = import_cloud_assembly_api20.ConstructIndex.fromTree(tree);
     cachedTree = tree;
     cachedWarnings = warnings;
     cachedAssemblyDir = assemblyDir;
@@ -368148,7 +368498,7 @@ function createLspHandlers(options) {
       const templateRangesFor = /* @__PURE__ */ __name((templateFile) => {
         if (!rangesByTemplate.has(templateFile)) {
           try {
-            rangesByTemplate.set(templateFile, (0, import_cloud_assembly_api21.indexTemplateRanges)(fs56.readFileSync(templateFile, "utf-8")));
+            rangesByTemplate.set(templateFile, (0, import_cloud_assembly_api20.indexTemplateRanges)(fs56.readFileSync(templateFile, "utf-8")));
           } catch {
             rangesByTemplate.set(templateFile, void 0);
           }
@@ -368242,14 +368592,14 @@ function startServer(options) {
   connection.onExit(() => process.exit(0));
   connection.listen();
 }
-var fs56, path52, import_url7, import_cloud_assembly_api21, import_toolkit_lib22, import_node4, import_node5, REFRESH_LOCK_RETRIES, REFRESH_LOCK_RETRY_MS, SYNTH_LOCK_RETRY_BASE_MS, SYNTH_LOCK_RETRY_MAX_MS, NOOP_LOGGER;
+var fs56, path52, import_url7, import_cloud_assembly_api20, import_toolkit_lib22, import_node4, import_node5, REFRESH_LOCK_RETRIES, REFRESH_LOCK_RETRY_MS, SYNTH_LOCK_RETRY_BASE_MS, SYNTH_LOCK_RETRY_MAX_MS, NOOP_LOGGER;
 var init_server = __esm({
   "../@aws-cdk/cdk-explorer/lib/lsp/server.ts"() {
     "use strict";
     fs56 = __toESM(require("fs"));
     path52 = __toESM(require("path"));
     import_url7 = require("url");
-    import_cloud_assembly_api21 = __toESM(require_lib3());
+    import_cloud_assembly_api20 = __toESM(require_lib3());
     import_toolkit_lib22 = __toESM(require_lib12());
     import_node4 = __toESM(require_node3());
     import_node5 = __toESM(require_node6());
@@ -368338,7 +368688,7 @@ async function runSynth(options) {
   } catch (err) {
     return classify(err);
   }
-  await new Promise((resolve16) => setTimeout(resolve16, READER_HANDOFF_DELAY_MS));
+  await new Promise((resolve17) => setTimeout(resolve17, READER_HANDOFF_DELAY_MS));
   try {
     await cached3.dispose();
   } catch (err) {
@@ -368453,8 +368803,8 @@ async function lsp(options = {}) {
     return 0;
   }
   (0, import_cdk_explorer.startLspServer)(versionNumber2());
-  await new Promise((resolve16) => {
-    const done = /* @__PURE__ */ __name(() => resolve16(), "done");
+  await new Promise((resolve17) => {
+    const done = /* @__PURE__ */ __name(() => resolve17(), "done");
     process3.stdin.once("end", done);
     process3.stdin.once("close", done);
   });
@@ -368601,6 +368951,7 @@ __export(cli_exports, {
 async function exec(args, synthesizer) {
   const libraryLoadTime = performance.now();
   const argv = await parseCommandLineArguments(args);
+  handleTracker = argv.debugCli ? trackLeakedHandles() : void 0;
   argv.language = getLanguageFromAlias(argv.language) ?? argv.language;
   if (argv.noColor) {
     process.env.FORCE_COLOR = "0";
@@ -368610,18 +368961,7 @@ async function exec(args, synthesizer) {
     process.env.FORCE_COLOR = "0";
   }
   const cmd = argv._[0];
-  let ioMessageLevel = "info";
-  if (argv.verbose) {
-    switch (argv.verbose) {
-      case 1:
-        ioMessageLevel = "debug";
-        break;
-      case 2:
-      default:
-        ioMessageLevel = "trace";
-        break;
-    }
-  }
+  const ioMessageLevel = determineIoMessageLevel(argv);
   const ioHost = CliIoHost.instance({
     logLevel: ioMessageLevel,
     isTTY: process.stdout.isTTY,
@@ -368764,7 +369104,7 @@ async function exec(args, synthesizer) {
   async function main(command6, args2) {
     ioHost.currentAction = command6;
     const toolkitStackName = ToolkitInfo.determineName(configuration.settings.get(["toolkitStackName"]));
-    await ioHost.defaults.debug(`Toolkit stack: ${import_chalk41.default.bold(toolkitStackName)}`);
+    await ioHost.defaults.debug(`Toolkit stack: ${import_chalk42.default.bold(toolkitStackName)}`);
     const cloudFormation = new Deployments({
       sdkProvider,
       toolkitStackName,
@@ -368827,6 +369167,12 @@ async function exec(args, synthesizer) {
       case "diff":
         ioHost.currentAction = "diff";
         const enableDiffNoFail = isFeatureEnabled(configuration, cxapi15.ENABLE_DIFF_NO_FAIL_CONTEXT);
+        const diffMethod = determineDiffMethod(args2);
+        if (diffMethod === "template") {
+          rejectIncompatibleOptions(args2, "--method=template", {
+            changeSetName: "--change-set-name"
+          });
+        }
         return cli2.diff({
           stackNames: args2.STACKS,
           exclusively: args2.exclusively,
@@ -368837,7 +369183,8 @@ async function exec(args, synthesizer) {
           fail: args2.fail != null ? args2.fail : !enableDiffNoFail,
           compareAgainstProcessedTemplate: args2.processed,
           quiet: args2.quiet,
-          method: determineDiffMethod(args2),
+          method: diffMethod,
+          changeSetName: args2.changeSetName,
           toolkitStackName,
           importExistingResources: args2.importExistingResources,
           includeMoves: args2["include-moves"]
@@ -369136,6 +369483,12 @@ async function exec(args, synthesizer) {
   }
   __name(main, "main");
 }
+function determineIoMessageLevel(argv) {
+  if (argv.verbose) {
+    return argv.verbose === 1 ? "debug" : "trace";
+  }
+  return argv.debugCli ? "debug" : "info";
+}
 async function determineBootstrapVersion(ioHost, args) {
   let source;
   if (args.template) {
@@ -369331,18 +369684,23 @@ function cli(args = process.argv.slice(2)) {
     } catch (e6) {
       await CliIoHost.get()?.asIoHelper().defaults.trace(`Ending Telemetry failed: ${e6.message}`);
     }
+    const ioHelper = CliIoHost.get()?.asIoHelper();
+    if (ioHelper) {
+      handleTracker?.scheduleReport(ioHelper);
+    }
   });
 }
-var cxapi15, import_toolkit_lib25, import_chalk41;
+var cxapi15, import_toolkit_lib25, import_chalk42, handleTracker;
 var init_cli = __esm({
   "lib/cli/cli.ts"() {
     "use strict";
     cxapi15 = __toESM(require_lib11());
     import_toolkit_lib25 = __toESM(require_lib12());
-    import_chalk41 = __toESM(require_source());
+    import_chalk42 = __toESM(require_source());
     init_util9();
     init_cdk_toolkit();
     init_ci_systems();
+    init_debug_handles();
     init_display_version();
     init_io_host2();
     init_parse_command_line_arguments();
@@ -369374,6 +369732,7 @@ var init_cli = __esm({
     init_ci();
     init_guess_agent();
     __name(exec, "exec");
+    __name(determineIoMessageLevel, "determineIoMessageLevel");
     __name(determineBootstrapVersion, "determineBootstrapVersion");
     __name(isFeatureEnabled, "isFeatureEnabled");
     __name(specificStacksOrAllRecursively, "specificStacksOrAllRecursively");