@go-to-k/cdkd 0.220.5 → 0.221.1

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { A as withErrorHandling, B as generateResourceNameWithFallback, C as StackHasActiveImportsError, F as getLiveRenderer, H as withStackName, I as PATTERN_B_NAME_PROPERTIES, L as PATTERN_B_RESOURCE_TYPES, M as getLogger, P as runStackBuffered, S as ResourceUpdateNotSupportedError, V as withSkipPrefix, _ as MissingCdkCliError, a as assertRegionMatch, b as ProvisioningError, f as LocalInvokeBuildError$1, i as resolveExplicitPhysicalId, k as normalizeAwsError, l as CdkdError, m as LocalStartServiceError, n as matchesCdkPath, o as disableInstanceApiTermination, p as LocalMigrateError, r as normalizeAwsTagsToCfn, s as isTerminationProtectionPropagationError, t as CDK_PATH_TAG, v as NestedStackChildDirectDestroyError, w as StackTerminationProtectionError, x as ResourceTimeoutError, y as PartialFailureError, z as generateResourceName } from "./import-helpers-wLipXr5g.js";
 import { a as setAwsClients, i as resetAwsClients, r as getAwsClients, t as AwsClients } from "./aws-clients-pjPwZz1r.js";
-import { $ as resolveBucketRegion, A as stringifyValue, B as resolveApp, C as DiffCalculator, D as S3StateBackend, E as LockManager, F as runDockerForeground, G as warnDeprecatedNoPrefixCliFlag, H as resolveSkipPrefix, I as runDockerStreaming, J as MIGRATE_TMP_PREFIX, K as CFN_TEMPLATE_BODY_LIMIT, L as Synthesizer, M as buildDockerImage, N as formatDockerLoginError, O as shouldRetainResource, P as getDockerCmd, R as getDefaultStateBucketName, S as applyRoleArnIfSet, T as TemplateParser, U as resolveStateBucketWithDefault, V as resolveCaptureObservedState, W as resolveStateBucketWithDefaultAndSource, X as uploadCfnTemplate, Y as findLargeInlineResources, Z as AssemblyReader, _ as collectInlinePolicyNamesManagedBySiblings, a as withRetry, b as CloudControlProvider, c as extractDeploymentEventError, d as cyan, f as gray, g as IAMRoleProvider, h as yellow, i as withResourceDeadline, j as WorkGraph, k as AssetPublisher, l as formatResourceLine, m as red, n as DEFAULT_RESOURCE_WARN_AFTER_MS, o as isRetryableTransientError, p as green, q as CFN_TEMPLATE_URL_LIMIT, r as DeployEngine, s as IMPLICIT_DELETE_DEPENDENCIES, t as DEFAULT_RESOURCE_TIMEOUT_MS, u as bold, v as ProviderRegistry, w as DagBuilder, x as IntrinsicFunctionResolver, y as findActionableSilentDrops, z as getLegacyStateBucketName } from "./deploy-engine-xlz3wc4W.js";
+import { A as AssetPublisher, B as getLegacyStateBucketName, C as DiffCalculator, D as S3StateBackend, E as LockManager, F as getDockerCmd, G as resolveStateBucketWithDefaultAndSource, H as resolveCaptureObservedState, I as runDockerForeground, J as CFN_TEMPLATE_URL_LIMIT, K as warnDeprecatedNoPrefixCliFlag, L as runDockerStreaming, M as WorkGraph, N as buildDockerImage, O as rebuildClientForBucketRegion, P as formatDockerLoginError, Q as AssemblyReader, R as Synthesizer, S as applyRoleArnIfSet, T as TemplateParser, U as resolveSkipPrefix, V as resolveApp, W as resolveStateBucketWithDefault, X as findLargeInlineResources, Y as MIGRATE_TMP_PREFIX, Z as uploadCfnTemplate, _ as collectInlinePolicyNamesManagedBySiblings, a as withRetry, b as CloudControlProvider, c as extractDeploymentEventError, d as cyan, et as resolveBucketRegion, f as gray, g as IAMRoleProvider, h as yellow, i as withResourceDeadline, j as stringifyValue, k as shouldRetainResource, l as formatResourceLine, m as red, n as DEFAULT_RESOURCE_WARN_AFTER_MS, o as isRetryableTransientError, p as green, q as CFN_TEMPLATE_BODY_LIMIT, r as DeployEngine, s as IMPLICIT_DELETE_DEPENDENCIES, t as DEFAULT_RESOURCE_TIMEOUT_MS, u as bold, v as ProviderRegistry, w as DagBuilder, x as IntrinsicFunctionResolver, y as findActionableSilentDrops, z as getDefaultStateBucketName } from "./deploy-engine-OWyYqmlc.js";
 import { t as ASGProvider } from "./asg-provider-B_hrCxRx.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomBytes, randomUUID } from "node:crypto";
@@ -1553,7 +1553,7 @@ const FLUSH_INTERVAL_MS = 2e3;
 const FLUSH_EVENT_THRESHOLD = 50;
 /** Build-time cdkd version, with a dev fallback for non-built contexts. */
 function getCdkdVersion() {
-	return "0.220.5";
+	return "0.221.1";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -2036,36 +2036,14 @@ var ExportIndexStore = class {
 		if (this.resolveInFlight) return this.resolveInFlight;
 		this.resolveInFlight = (async () => {
 			try {
-				const config = this.s3Client.config;
-				if (!config || typeof config.region !== "function") {
-					this.clientResolved = true;
-					return;
-				}
-				const currentRegion = await config.region();
-				const fallbackRegion = typeof currentRegion === "string" ? currentRegion : void 0;
-				let probeCredentials;
-				try {
-					if (typeof config.credentials === "function") probeCredentials = await config.credentials();
-				} catch {
-					probeCredentials = void 0;
-				}
-				const bucketRegion = await resolveBucketRegion(this.bucket, {
-					...probeCredentials && { credentials: probeCredentials },
-					...fallbackRegion && { fallbackRegion }
+				const replacement = await rebuildClientForBucketRegion(this.s3Client, this.bucket, {
+					reuseClientCredentials: true,
+					tolerateNonStandardClient: true,
+					onRebuild: ({ bucketRegion, currentRegion }) => {
+						this.logger.debug(`State bucket '${this.bucket}' is in '${bucketRegion}' (exports-index client was '${String(currentRegion)}'); building a region-corrected S3 client for index operations.`);
+					}
 				});
-				if (bucketRegion !== currentRegion) {
-					this.logger.debug(`State bucket '${this.bucket}' is in '${bucketRegion}' (exports-index client was '${String(currentRegion)}'); building a region-corrected S3 client for index operations.`);
-					this.s3Client = new S3Client({
-						region: bucketRegion,
-						credentials: this.s3Client.config.credentials,
-						logger: {
-							debug: () => {},
-							info: () => {},
-							warn: () => {},
-							error: () => {}
-						}
-					});
-				}
+				if (replacement) this.s3Client = replacement;
 				this.clientResolved = true;
 			} finally {
 				this.resolveInFlight = null;
@@ -34416,7 +34394,8 @@ async function runDestroyForStack(stackName, state, ctx) {
 		skippedEmpty: false,
 		deletedCount: 0,
 		retainedCount: 0,
-		errorCount: 0
+		errorCount: 0,
+		interrupted: false
 	};
 	const resourceCount = Object.keys(state.resources).length;
 	const regionForState = state.region ?? ctx.baseRegion;
@@ -34509,6 +34488,20 @@ async function runDestroyForStack(stackName, state, ctx) {
 	};
 	const renderer = getLiveRenderer();
 	renderer.start();
+	let draining = false;
+	const sigintHandler = () => {
+		if (draining) {
+			ctx.lockManager.releaseLock(stackName, regionForState).catch(() => {});
+			process.stderr.write(`\nForce-quit: stack lock may not be released. If the next run reports a lock, run: cdkd force-unlock ${stackName}\n`);
+			process.exit(130);
+		}
+		draining = true;
+		renderer.printAbove(() => {
+			process.stderr.write("\nInterrupted — finishing in-flight deletes, then flushing state and releasing the lock (press Ctrl-C again to force-quit)...\n");
+		});
+	};
+	process.setMaxListeners(Math.max(process.getMaxListeners(), 100));
+	process.on("SIGINT", sigintHandler);
 	try {
 		logger.info("Building dependency graph...");
 		const template = {
@@ -34550,11 +34543,16 @@ async function runDestroyForStack(stackName, state, ctx) {
 		const executionLevels = dagBuilder.getExecutionLevels(graph);
 		logger.debug(`Dependency graph: ${executionLevels.length} level(s)`);
 		for (let levelIndex = executionLevels.length - 1; levelIndex >= 0; levelIndex--) {
+			if (draining) {
+				logger.debug("Interrupted (draining) — not scheduling further deletion levels");
+				break;
+			}
 			const level = executionLevels[levelIndex];
 			if (!level) continue;
 			logger.debug(`Deletion level ${executionLevels.length - levelIndex}/${executionLevels.length} (${level.length} resources)`);
 			const stackRegion = state.region ?? ctx.baseRegion;
 			const deletePromises = level.map(async (logicalId) => {
+				if (draining) return;
 				const resource = state.resources[logicalId];
 				if (!resource) {
 					logger.warn(`Resource ${logicalId} not found in state, skipping`);
@@ -34691,8 +34689,10 @@ async function runDestroyForStack(stackName, state, ctx) {
 			});
 			await Promise.all(deletePromises);
 		}
+		result.interrupted = draining;
 		await saveChain;
-		if (result.errorCount === 0) {
+		const preserveState = result.errorCount > 0 || result.interrupted;
+		if (!preserveState) {
 			await ctx.stateBackend.deleteState(stackName, regionForState);
 			logger.debug("State deleted");
 			if (ctx.exportIndexStore) await ctx.exportIndexStore.removeStack(stackName, regionForState);
@@ -34702,12 +34702,15 @@ async function runDestroyForStack(stackName, state, ctx) {
 			} catch (error) {
 				logger.warn(`Failed to persist remaining state after partial destroy: ${error instanceof Error ? error.message : String(error)}. The state file may still list already-deleted resources; a re-run resolves them idempotently.`);
 			}
-			logger.warn(`${result.errorCount} resource(s) failed to delete. State preserved.`);
+			if (result.interrupted) logger.warn(`Destroy interrupted — ${Object.keys(remainingResources).length} resource(s) not deleted. State preserved.`);
+			else logger.warn(`${result.errorCount} resource(s) failed to delete. State preserved.`);
 		}
 		const retainedSuffix = result.retainedCount > 0 ? `, ${result.retainedCount} retained` : "";
-		if (result.errorCount === 0) logger.info(`\n${green("✓")} ${bold(`Stack ${stackName} destroyed`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${result.errorCount} errors)`);
+		if (!preserveState) logger.info(`\n${green("✓")} ${bold(`Stack ${stackName} destroyed`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${result.errorCount} errors)`);
+		else if (result.interrupted && result.errorCount === 0) logger.warn(`\n${yellow("⚠")} ${bold(`Stack ${stackName} destroy interrupted`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${result.errorCount} errors). State preserved — re-run 'cdkd destroy' / 'cdkd state destroy' to finish.`);
 		else logger.warn(`\n${yellow("⚠")} ${bold(`Stack ${stackName} partially destroyed`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${red(result.errorCount)} errors). State preserved — re-run 'cdkd destroy' / 'cdkd state destroy' to clean up.`);
 	} finally {
+		process.removeListener("SIGINT", sigintHandler);
 		renderer.stop();
 		await saveChain;
 		logger.debug("Releasing lock...");
@@ -38322,6 +38325,7 @@ async function destroyCommand(stackArgs, options) {
 		} else throw new Error("Could not determine which stacks belong to this app. Specify stack names explicitly, use --all, or ensure --app / cdk.json is configured.");
 		const stackPatterns = stackArgs.length > 0 ? stackArgs : options.stack ? [options.stack] : [];
 		let totalErrors = 0;
+		let interrupted = false;
 		let stackNames;
 		if (options.all) stackNames = candidateStacks.map((s) => s.stackName);
 		else if (stackPatterns.length > 0) stackNames = matchStacks(candidateStacks, stackPatterns).map((s) => s.stackName);
@@ -38443,6 +38447,7 @@ async function destroyCommand(stackArgs, options) {
 					eventRecorder
 				}));
 				totalErrors += result.errorCount;
+				if (result.interrupted) interrupted = true;
 				destroyRunResult = result.errorCount > 0 ? "FAILED" : "SUCCEEDED";
 				eventRecorder.record({
 					eventType: "RUN_FINISHED",
@@ -38462,8 +38467,10 @@ async function destroyCommand(stackArgs, options) {
 			} finally {
 				await eventRecorder.finalize(destroyRunResult);
 			}
+			if (interrupted) break;
 		}
 		if (totalErrors > 0) throw new PartialFailureError(`Destroy completed with ${totalErrors} resource error(s). State preserved — inspect 'cdkd state show <stack>' and re-run 'cdkd destroy' to retry.`);
+		if (interrupted) throw new PartialFailureError(`Destroy interrupted by Ctrl-C. State preserved — re-run 'cdkd destroy' to finish.`);
 	} finally {
 		awsClients.destroy();
 	}
@@ -42900,6 +42907,7 @@ async function stateDestroyCommand(stackArgs, options) {
 		}
 		logger.info(`Found ${stackNames.length} stack(s) to destroy: ${stackNames.join(", ")}`);
 		let totalErrors = 0;
+		let interrupted = false;
 		for (const stackName of stackNames) {
 			const refs = stateRefs.filter((r) => r.stackName === stackName);
 			let targets;
@@ -42957,9 +42965,13 @@ async function stateDestroyCommand(stackArgs, options) {
 					...options.resourceTimeout?.perTypeMs && { resourceTimeoutByType: options.resourceTimeout.perTypeMs }
 				}));
 				totalErrors += result.errorCount;
+				if (result.interrupted) interrupted = true;
+				if (interrupted) break;
 			}
+			if (interrupted) break;
 		}
 		if (totalErrors > 0) throw new PartialFailureError(`Destroy completed with ${totalErrors} resource error(s). State preserved — inspect 'cdkd state show <stack>' and re-run 'cdkd state destroy' to retry.`);
+		if (interrupted) throw new PartialFailureError(`Destroy interrupted by Ctrl-C. State preserved — re-run 'cdkd state destroy' to finish.`);
 	} finally {
 		setup.dispose();
 	}
@@ -53790,7 +53802,7 @@ function reorderArgs(argv) {
 async function main() {
 	installPipeCloseHandler();
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.220.5");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.221.1");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());