@go-to-k/cdkd 0.284.29 → 0.284.30

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as endCommandInterruptScope, $t as createAssetRedirectResolver, A as MULTI_REGION_RECREATE_BLOCKED_TYPES, An as resolveUseCdkBootstrapAssets, At as maskSecretsInText, B as collectDeclaredOutputNames, Bn as canonicalizeRegion, Bt as INTRINSIC_KEYS, C as ccRoutedFinalSnapshotError, Cn as getLegacyStateBucketName, Ct as STATE_SOURCED_READBACK_RULES, D as unsupportedFinalSnapshotError, Dn as resolveSkipPrefix, Dt as errorCauseChain, E as refusesFinalSnapshot, En as resolveCaptureObservedState, Et as dynamicReferenceTokens, F as cyan, Fn as MIGRATE_TMP_PREFIX, Ft as s3BucketDualStackDomainName, G as stateKeySecretExposure, Gn as resolveBucketRegion, Gt as LockManager, H as exportAliasCollisionScrubWarning, Hn as AssemblyReader, Ht as withRetry, I as gray, In as findLargeInlineResources, It as s3BucketRegionalDomainName, J as clearOnUpdateRemoval, Jn as resetAwsClients, Jt as shouldRetainResource, K as IAMRoleProvider, Kn as AwsClients, Kt as S3StateBackend, L as green, Ln as uploadCfnTemplate, Lt as s3BucketWebsiteUrl, M as renderStatefulReason, Mn as warnDeprecatedNoPrefixCliFlag, Mt as scrubResourceRecord, N as formatResourceLine, Nn as CFN_TEMPLATE_BODY_LIMIT, Nt as s3BucketArn, O as makeCanonicalizePropertiesFn, On as resolveStateBucketWithDefault, Ot as isSingleDynamicReferenceToken, P as bold, Pn as CFN_TEMPLATE_URL_LIMIT, Pt as s3BucketDomainName, Q as beginCommandInterruptScope, Qt as buildAssetRedirectMap, R as red, Rn as expectedOwnerParam, Rt as applyRoleArnIfSet, S as buildFinalSnapshotIdentifier, Sn as getDefaultStateBucketName, Sr as markNonRetryable, St as STATE_SOURCED_CROSS_GENERATION_RULES, T as isFinalSnapshotError, Tn as resolveAutoAssetStorage, Tt as createSecretMasker, U as isExportAliasCollision, Un as processStackMessages, Ut as DagBuilder, V as collectPublishedOutputNames, Vn as derivePartitionAndUrlSuffix, Vt as describeTypeWithThrottleRetry, W as secretBearingStateKeyWarning, Wt as TemplateParser, X as findActionableSilentDrops, Xt as stringifyValue, Y as ProviderRegistry, Yn as setAwsClients, Yt as AssetPublisher, Z as findSilentDropProperties, Zn as CdkdError, Zt as WorkGraph, _ as maskingRetryLogger, _n as runDockerStreaming, _r as normalizeAwsError, _t as readConfigString, a as DeploymentEventsStore, an as BOOTSTRAP_MARKER_PREFIX, ar as MissingCdkCliError, at as isTerminationProtectionPropagationError, b as ATOMIC_FINAL_SNAPSHOT_TYPES, bn as Synthesizer, br as isRetryableTransientError, bt as requireConfigObject, c as planRollback, cn as parseBootstrapMarker, cr as ProvisioningError, ct as getAccountInfo, d as replayRollback, dn as validateContainerRepoName, dr as StackHasActiveImportsError, dt as normalizeAwsTagsToCfn, en as loadPublishableAssetManifest, er as DeployCancelledError, et as isInterruptedWaitError, f as updatePartialMessage, fn as buildDenyExternalAccessPolicy, fr as StackTerminationProtectionError, ft as resolveExplicitPhysicalId, g as withResourceDeadline, gn as runDockerForeground, gt as configStringRefusal, h as deleteSkipReason, hn as getDockerCmd, ht as configBooleanRefusal, i as DeploymentEventsReader, in as AssetModeResolver, it as disableInstanceApiTermination, j as isStatefulRecreateTargetSync, jn as stateBucketExistenceConfirmed, jt as redactSecretsForState, k as extractDeploymentEventError, kn as resolveStateBucketWithDefaultAndSource, kt as maskSecretsInError, l as producerRegionsFromState, ln as readBootstrapMarkerBody, lr as ResourceTimeoutError, lt as refStateLookupFromResource, m as UNSPECIFIED_SKIP_REASON, mn as formatDockerLoginError, mt as coerceCfnBoolean, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nn as escapeRegExp, nr as LocalMigrateError, nt as CloudControlProvider, o as classifyReplaySecretRegion, on as ensureAssetStorage, or as NestedStackChildDirectDestroyError, ot as IntrinsicFunctionResolver, p as updatePartialReason, pn as buildDockerImage, pt as assertRegionMatch, q as collectInlinePolicyNamesManagedBySiblings, qn as getAwsClients, qt as rebuildClientForBucketRegion, r as DeployEngine, rn as stripControlChars, rr as LocalStartServiceError, rt as slowCcOperationTimeoutMs, s as planFailedOps, sn as getBootstrapMarkerKey, sr as PartialFailureError, st as cfnRefValueFromPhysicalId, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as rewriteTemplateAssetReferences, tr as LocalInvokeBuildError$1, tt as startInterruptWatch, u as replayFailedOperations, un as validateAssetBucketName, ur as ResourceUpdateNotSupportedError, ut as WAFv2WebACLProvider, v as IMPLICIT_DELETE_DEPENDENCIES, vn as AssetManifestLoader, vr as withErrorHandling, vt as replayWarn, w as createPreDeleteFinalSnapshot, wn as resolveApp, wt as TEMPLATE_SOURCED_RULES, x as PRE_DELETE_SNAPSHOT_TYPES, xn as synthesisStatusMessage, xr as isThrottlingError, xt as requireConfigString, y as computeImplicitDeleteEdges, yn as getDockerImageBySourceHash, yr as isMarkedNonRetryable, yt as requireConfigArray, z as yellow, zn as PARTITION_TABLE, zt as DiffCalculator } from "./deploy-engine-CE-tOz2d.js";
+import { $ as endCommandInterruptScope, $t as createAssetRedirectResolver, A as MULTI_REGION_RECREATE_BLOCKED_TYPES, An as resolveUseCdkBootstrapAssets, At as maskSecretsInText, B as collectDeclaredOutputNames, Bn as canonicalizeRegion, Bt as INTRINSIC_KEYS, C as ccRoutedFinalSnapshotError, Cn as getLegacyStateBucketName, Ct as STATE_SOURCED_READBACK_RULES, D as unsupportedFinalSnapshotError, Dn as resolveSkipPrefix, Dt as errorCauseChain, E as refusesFinalSnapshot, En as resolveCaptureObservedState, Et as dynamicReferenceTokens, F as cyan, Fn as MIGRATE_TMP_PREFIX, Ft as s3BucketDualStackDomainName, G as stateKeySecretExposure, Gn as resolveBucketRegion, Gt as LockManager, H as exportAliasCollisionScrubWarning, Hn as AssemblyReader, Ht as withRetry, I as gray, In as findLargeInlineResources, It as s3BucketRegionalDomainName, J as clearOnUpdateRemoval, Jn as resetAwsClients, Jt as shouldRetainResource, K as IAMRoleProvider, Kn as AwsClients, Kt as S3StateBackend, L as green, Ln as uploadCfnTemplate, Lt as s3BucketWebsiteUrl, M as renderStatefulReason, Mn as warnDeprecatedNoPrefixCliFlag, Mt as scrubResourceRecord, N as formatResourceLine, Nn as CFN_TEMPLATE_BODY_LIMIT, Nt as s3BucketArn, O as makeCanonicalizePropertiesFn, On as resolveStateBucketWithDefault, Ot as isSingleDynamicReferenceToken, P as bold, Pn as CFN_TEMPLATE_URL_LIMIT, Pt as s3BucketDomainName, Q as beginCommandInterruptScope, Qt as buildAssetRedirectMap, R as red, Rn as expectedOwnerParam, Rt as applyRoleArnIfSet, S as buildFinalSnapshotIdentifier, Sn as getDefaultStateBucketName, Sr as markNonRetryable, St as STATE_SOURCED_CROSS_GENERATION_RULES, T as isFinalSnapshotError, Tn as resolveAutoAssetStorage, Tt as createSecretMasker, U as isExportAliasCollision, Un as processStackMessages, Ut as DagBuilder, V as collectPublishedOutputNames, Vn as derivePartitionAndUrlSuffix, Vt as describeTypeWithThrottleRetry, W as secretBearingStateKeyWarning, Wt as TemplateParser, X as findActionableSilentDrops, Xt as stringifyValue, Y as ProviderRegistry, Yn as setAwsClients, Yt as AssetPublisher, Z as findSilentDropProperties, Zn as CdkdError, Zt as WorkGraph, _ as maskingRetryLogger, _n as runDockerStreaming, _r as normalizeAwsError, _t as readConfigString, a as DeploymentEventsStore, an as BOOTSTRAP_MARKER_PREFIX, ar as MissingCdkCliError, at as isTerminationProtectionPropagationError, b as ATOMIC_FINAL_SNAPSHOT_TYPES, bn as Synthesizer, br as isRetryableTransientError, bt as requireConfigObject, c as planRollback, cn as parseBootstrapMarker, cr as ProvisioningError, ct as getAccountInfo, d as replayRollback, dn as validateContainerRepoName, dr as StackHasActiveImportsError, dt as normalizeAwsTagsToCfn, en as loadPublishableAssetManifest, er as DeployCancelledError, et as isInterruptedWaitError, f as updatePartialMessage, fn as buildDenyExternalAccessPolicy, fr as StackTerminationProtectionError, ft as resolveExplicitPhysicalId, g as withResourceDeadline, gn as runDockerForeground, gt as configStringRefusal, h as deleteSkipReason, hn as getDockerCmd, ht as configBooleanRefusal, i as DeploymentEventsReader, in as AssetModeResolver, it as disableInstanceApiTermination, j as isStatefulRecreateTargetSync, jn as stateBucketExistenceConfirmed, jt as redactSecretsForState, k as extractDeploymentEventError, kn as resolveStateBucketWithDefaultAndSource, kt as maskSecretsInError, l as producerRegionsFromState, ln as readBootstrapMarkerBody, lr as ResourceTimeoutError, lt as refStateLookupFromResource, m as UNSPECIFIED_SKIP_REASON, mn as formatDockerLoginError, mt as coerceCfnBoolean, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nn as escapeRegExp, nr as LocalMigrateError, nt as CloudControlProvider, o as classifyReplaySecretRegion, on as ensureAssetStorage, or as NestedStackChildDirectDestroyError, ot as IntrinsicFunctionResolver, p as updatePartialReason, pn as buildDockerImage, pt as assertRegionMatch, q as collectInlinePolicyNamesManagedBySiblings, qn as getAwsClients, qt as rebuildClientForBucketRegion, r as DeployEngine, rn as stripControlChars, rr as LocalStartServiceError, rt as slowCcOperationTimeoutMs, s as planFailedOps, sn as getBootstrapMarkerKey, sr as PartialFailureError, st as cfnRefValueFromPhysicalId, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as rewriteTemplateAssetReferences, tr as LocalInvokeBuildError$1, tt as startInterruptWatch, u as replayFailedOperations, un as validateAssetBucketName, ur as ResourceUpdateNotSupportedError, ut as WAFv2WebACLProvider, v as IMPLICIT_DELETE_DEPENDENCIES, vn as AssetManifestLoader, vr as withErrorHandling, vt as replayWarn, w as createPreDeleteFinalSnapshot, wn as resolveApp, wt as TEMPLATE_SOURCED_RULES, x as PRE_DELETE_SNAPSHOT_TYPES, xn as synthesisStatusMessage, xr as isThrottlingError, xt as requireConfigString, y as computeImplicitDeleteEdges, yn as getDockerImageBySourceHash, yr as isMarkedNonRetryable, yt as requireConfigArray, z as yellow, zn as PARTITION_TABLE, zt as DiffCalculator } from "./deploy-engine-BFgi0RJr.js";
 import { a as getLiveRenderer, c as PATTERN_B_RESOURCE_TYPES, d as generateResourceNameWithFallback, f as getCurrentStackName, h as withStackName, i as runStackBuffered, m as withSkipPrefix, n as getLogger, o as PATTERN_B_NAME_OPTIONS, s as PATTERN_B_NAME_PROPERTIES, u as generateResourceName } from "./logger-zRrlbaQt.js";
-import { t as ASGProvider } from "./asg-provider-DzbiUvJi.js";
+import { t as ASGProvider } from "./asg-provider-qMgJEhCM.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { CopyObjectCommand, CreateBucketCommand, DeleteBucketAnalyticsConfigurationCommand, DeleteBucketCommand, DeleteBucketCorsCommand, DeleteBucketEncryptionCommand, DeleteBucketIntelligentTieringConfigurationCommand, DeleteBucketInventoryConfigurationCommand, DeleteBucketLifecycleCommand, DeleteBucketMetricsConfigurationCommand, DeleteBucketOwnershipControlsCommand, DeleteBucketPolicyCommand, DeleteBucketReplicationCommand, DeleteBucketTaggingCommand, DeleteBucketWebsiteCommand, DeleteObjectsCommand, GetBucketAccelerateConfigurationCommand, GetBucketCorsCommand, GetBucketEncryptionCommand, GetBucketLifecycleConfigurationCommand, GetBucketLocationCommand, GetBucketLoggingCommand, GetBucketNotificationConfigurationCommand, GetBucketOwnershipControlsCommand, GetBucketPolicyCommand, GetBucketReplicationCommand, GetBucketTaggingCommand, GetBucketVersioningCommand, GetBucketWebsiteCommand, GetObjectCommand, GetObjectLockConfigurationCommand, GetPublicAccessBlockCommand, HeadBucketCommand, ListBucketAnalyticsConfigurationsCommand, ListBucketIntelligentTieringConfigurationsCommand, ListBucketInventoryConfigurationsCommand, ListBucketMetricsConfigurationsCommand, ListObjectVersionsCommand, ListObjectsV2Command, NoSuchBucket, PutBucketAccelerateConfigurationCommand, PutBucketAnalyticsConfigurationCommand, PutBucketCorsCommand, PutBucketEncryptionCommand, PutBucketIntelligentTieringConfigurationCommand, PutBucketInventoryConfigurationCommand, PutBucketLifecycleConfigurationCommand, PutBucketLoggingCommand, PutBucketMetricsConfigurationCommand, PutBucketNotificationConfigurationCommand, PutBucketOwnershipControlsCommand, PutBucketPolicyCommand, PutBucketReplicationCommand, PutBucketTaggingCommand, PutBucketVersioningCommand, PutBucketWebsiteCommand, PutObjectCommand, PutObjectLockConfigurationCommand, PutPublicAccessBlockCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
@@ -64081,6 +64081,30 @@ function stripWalk(value) {
 //#endregion
 //#region src/cli/commands/drift.ts
 /**
+* Route one outcome to the handler for its variant.
+*
+* The mechanism issue [#2135](https://github.com/go-to-k/cdkd/issues/2135) asks
+* for, and the reason every consumer in this file goes through it rather than
+* filtering on `o.kind === '...'`: `handlers` is a MAPPED TYPE over
+* `DriftOutcome['kind']`, so it must name EVERY variant. Adding a member to the
+* union turns every call site that has not been updated into a compile error
+* ("property '<kind>' is missing"), instead of leaving it to fall through to
+* whatever it happened to do before. A `.filter()` predicate cannot do that —
+* it keeps compiling and silently stops matching the new state.
+*
+* A handler that deliberately does nothing with a variant still has to be
+* written out, which is the point: the author of the next variant has to decide,
+* per consumer, what it means there.
+*
+* Exported, with {@link DriftOutcome} and {@link NotComparedCause}, so
+* `tests/unit/cli/drift-outcome.test-d.ts` can fence the mapped type itself:
+* relaxing it to a `Partial` record would silently un-fence every consumer in
+* this file while changing no runtime behaviour, so no runtime test can see it.
+*/
+function matchOutcome(outcome, handlers) {
+	return handlers[outcome.kind](outcome);
+}
+/**
 * Distinguish "drift detected" (exit 1) from "command crashed" (exit 1
 * via the default handler) so the drift command can fail fast and the
 * top-level handler doesn't add a stack trace for the expected case.
@@ -64105,18 +64129,19 @@ var DriftDetectedError = class DriftDetectedError extends CdkdError {
 * `{{resolve:ssm-secure:...}}` token — a pre-existing population cdkd resolves
 * for nobody, which can never clear on a re-run, and which this change did not
 * create. Exiting non-zero for them would break `cdkd drift` in CI forever over
-* an unrelated defect, so the exit reads `comparisonRefused` and the report
-* reads `referencesUnresolved`. See that field's note.
+* an unrelated defect, so the exit reads the `refused` cause alone while the
+* report covers both. See `NotComparedCause` and `outcomeExitSignal`.
 *
 * WHY A NON-ZERO EXIT, and why it is a PRESERVATION rather than a new signal.
 * Pre-#2108 that population resolved the reference in the WRONG region, the
 * baseline could never equal what AWS held, and the resource was reported
 * `drifted` -- so `cdkd drift` exited 1 and every CI gate keyed on the exit code
 * fired. #2108 correctly stopped comparing against a foreign region's plaintext,
-* which made the same population report `clean`; without this the command would
-* exit 0 and print `no drift detected` for a stack whose secret-bearing
-* properties were never looked at. Round 1 of that change surfaced the refusal
-* in `--json` (`notCompared`) and in the human report, but the exit code -- the
+* which made the same population report `notCompared`; without this the
+* command would exit 0 and print `no drift detected` for a stack whose
+* secret-bearing properties were never looked at. Round 1 of that change
+* surfaced the refusal in `--json` (`notCompared`) and in the human report,
+* but the exit code -- the
 * signal most CI gates actually read -- still said "pass".
 *
 * WHY EXIT 2 RATHER THAN 1. `2` is this repo's established "work completed but
@@ -64153,32 +64178,56 @@ var DriftComparisonRefusedError = class DriftComparisonRefusedError extends Cdkd
 	}
 };
 /**
-* Every outcome on one report that was only PARTIALLY compared -- `drifted` or
-* `clean`, carrying `referencesUnresolved` (issue #2108).
+* Every outcome on one report that was only PARTIALLY compared -- the
+* `notCompared` variant, plus a `drifted` one whose `notComparedCause` is set
+* (issues #2108 / #2135).
+*
+* ONE spelling, because TWO renderings must agree about the same run: the
+* `--json` `notCompared` roll-up and the human report's `PARTIALLY compared`
+* block (whose count is also what the `N of M fully checked` line subtracts).
+* A roll-up spelled per reader is how the payload and the human summary come to
+* disagree.
 *
-* ONE spelling, because there are now THREE readers that must agree: the
-* `--json` `notCompared` roll-up, the human report's `PARTIALLY compared` block,
-* and the EXIT CODE. A predicate spelled per reader is how the payload and the
-* exit code come to disagree about the same run.
+* The EXIT CODE deliberately does NOT read this — see {@link outcomeExitSignal}
+* and {@link NotComparedCause} for why it is scoped to refusals alone.
 */
 function notComparedOutcomes(report) {
-	return report.outcomes.filter((o) => (o.kind === "drifted" || o.kind === "clean") && o.referencesUnresolved);
+	return report.outcomes.flatMap((o) => matchOutcome(o, {
+		drifted: (d) => d.notComparedCause === void 0 ? [] : [d],
+		notCompared: (n) => [n],
+		clean: () => [],
+		unsupported: () => [],
+		skipped: () => []
+	}));
 }
 /**
-* Every outcome whose comparison cdkd DELIBERATELY REFUSED (issue #2108) — the
-* strict subset of {@link notComparedOutcomes} that drives the EXIT CODE.
-*
-* Deliberately NOT the same predicate, and the asymmetry is the point: the
-* REPORT covers everything that was not compared, because as information both
-* populations matter equally, while the exit code covers only the population
-* this change created. Driving it off `referencesUnresolved` would exit
-* non-zero forever for every stack holding an `{{resolve:ssm-secure:...}}`
-* reference — permanent, unclearable, and unrelated to this issue. See the
-* `comparisonRefused` field note, and issue
-* [#2135](https://github.com/go-to-k/cdkd/issues/2135) for the structural fix.
-*/
-function refusedComparisonOutcomes(report) {
-	return report.outcomes.filter((o) => (o.kind === "drifted" || o.kind === "clean") && o.comparisonRefused);
+* What one outcome contributes to the run's EXIT CODE (issues #2108 / #2135).
+*
+* The exit-code CONSUMER, kept as an exhaustive `matchOutcome` so a new outcome
+* variant cannot inherit `none` by omission — reporting a resource cdkd never
+* compared as a pass is precisely the round-2 defect #2135 exists to make
+* impossible.
+*
+* `refused` is a STRICT SUBSET of what {@link notComparedOutcomes} rolls up, and
+* the asymmetry is the point: the REPORT covers everything that was not
+* compared, because as information both causes matter equally, while the exit
+* code covers only the population #2108 created. Exiting non-zero on
+* `unresolvedToken` would break `cdkd drift` in CI forever for every stack
+* holding an `{{resolve:ssm-secure:...}}` reference — permanent, unclearable,
+* and unrelated. See {@link NotComparedCause}.
+*
+* A `drifted` outcome reports `drifted` even when its own comparison was
+* refused: drift is the stronger, actionable signal and the caller ranks it
+* first, so a consumer gating on `1` loses nothing it gets today.
+*/
+function outcomeExitSignal(outcome) {
+	return matchOutcome(outcome, {
+		drifted: () => "drifted",
+		notCompared: (n) => n.notComparedCause === "refused" ? "refused" : "none",
+		clean: () => "none",
+		unsupported: () => "none",
+		skipped: () => "none"
+	});
 }
 /**
 * `cdkd drift [<stack>...]` command implementation.
@@ -64248,8 +64297,9 @@ async function driftCommand(stacks, options) {
 		}
 		if (options.json) writeJsonReport(reports);
 		else writeHumanReport(reports);
-		const drifted = reports.some((r) => r.outcomes.some((o) => o.kind === "drifted"));
-		const anyRefused = reports.some((r) => refusedComparisonOutcomes(r).length > 0);
+		const signals = reports.flatMap((r) => r.outcomes.map(outcomeExitSignal));
+		const drifted = signals.includes("drifted");
+		const anyRefused = signals.includes("refused");
 		if (!options.accept && !options.revert) {
 			if (drifted) throw new DriftDetectedError();
 			if (anyRefused) throw new DriftComparisonRefusedError();
@@ -64953,14 +65003,17 @@ async function runDriftForStack(stackName, region, stateBackend, providerRegistr
 				unionWalkObjects: useObserved,
 				unorderedPaths
 			}), secrets, secretResolutionFailed ? seededSecretPaths : secretPaths);
-			const referencesUnresolved = secretResolutionFailed || unresolvedTokens.size > 0;
-			const comparisonRefused = secretResolutionFailed;
-			if (reported.changes.length === 0) outcomes.push({
-				kind: "clean",
+			const notComparedCause = secretResolutionFailed ? "refused" : unresolvedTokens.size > 0 ? "unresolvedToken" : void 0;
+			if (reported.changes.length === 0) if (notComparedCause !== void 0) outcomes.push({
+				kind: "notCompared",
 				logicalId,
 				resourceType: resource.resourceType,
-				referencesUnresolved,
-				comparisonRefused
+				notComparedCause
+			});
+			else outcomes.push({
+				kind: "clean",
+				logicalId,
+				resourceType: resource.resourceType
 			});
 			else outcomes.push({
 				kind: "drifted",
@@ -64969,8 +65022,7 @@ async function runDriftForStack(stackName, region, stateBackend, providerRegistr
 				...reported,
 				awsProperties: aws,
 				secrets,
-				referencesUnresolved,
-				comparisonRefused
+				notComparedCause
 			});
 		}
 		return {
@@ -65067,7 +65119,13 @@ async function runAccept(reports, stateBackend, stateConfig, awsClients, options
 	const lockManager = new LockManager(awsClients.s3, stateConfig);
 	const owner = `${process.env["USER"] || "unknown"}@${process.env["HOSTNAME"] || "host"}:${process.pid}`;
 	for (const report of reports) {
-		const driftedOutcomes = report.outcomes.filter((o) => o.kind === "drifted");
+		const driftedOutcomes = report.outcomes.flatMap((o) => matchOutcome(o, {
+			drifted: (d) => [d],
+			clean: () => [],
+			notCompared: () => [],
+			unsupported: () => [],
+			skipped: () => []
+		}));
 		if (driftedOutcomes.length === 0) continue;
 		await lockManager.acquireLock(report.stackName, report.region, owner, "drift-accept");
 		try {
@@ -65685,7 +65743,13 @@ async function runRevert(reports, providerRegistry, stateBackend, stateConfig, a
 	let totalSucceeded = 0;
 	let totalUnresolvable = 0;
 	for (const report of reports) {
-		const driftedOutcomes = report.outcomes.filter((o) => o.kind === "drifted");
+		const driftedOutcomes = report.outcomes.flatMap((o) => matchOutcome(o, {
+			drifted: (d) => [d],
+			clean: () => [],
+			notCompared: () => [],
+			unsupported: () => [],
+			skipped: () => []
+		}));
 		if (driftedOutcomes.length === 0) continue;
 		await lockManager.acquireLock(report.stackName, report.region, owner, "drift-revert");
 		const narrowedByLogicalId = /* @__PURE__ */ new Map();
@@ -65836,7 +65900,13 @@ async function runRevert(reports, providerRegistry, stateBackend, stateConfig, a
 */
 function printAcceptPlan(reports) {
 	for (const report of reports) {
-		const drifted = report.outcomes.filter((o) => o.kind === "drifted");
+		const drifted = report.outcomes.flatMap((o) => matchOutcome(o, {
+			drifted: (d) => [d],
+			clean: () => [],
+			notCompared: () => [],
+			unsupported: () => [],
+			skipped: () => []
+		}));
 		if (drifted.length === 0) continue;
 		process.stdout.write(`\nPlan (--accept): update cdkd state for ${report.stackName} (${report.region}):\n`);
 		for (const o of drifted) {
@@ -65859,7 +65929,13 @@ function printAcceptPlan(reports) {
 */
 function printRevertPlan(reports) {
 	for (const report of reports) {
-		const drifted = report.outcomes.filter((o) => o.kind === "drifted");
+		const drifted = report.outcomes.flatMap((o) => matchOutcome(o, {
+			drifted: (d) => [d],
+			clean: () => [],
+			notCompared: () => [],
+			unsupported: () => [],
+			skipped: () => []
+		}));
 		if (drifted.length === 0) continue;
 		process.stdout.write(`\nPlan (--revert): push cdkd state values back into AWS for ${report.stackName} (${report.region}):\n`);
 		for (const o of drifted) {
@@ -65869,7 +65945,7 @@ function printRevertPlan(reports) {
 			const stateResource = report.state.resources[o.logicalId];
 			if (stateResource) {
 				const preserved = findRevertPreservedTagKeys(o.changes, stateResource.observedProperties ?? stateResource.properties ?? {}, o.awsProperties);
-				const cannotMaskKeys = o.referencesUnresolved;
+				const cannotMaskKeys = o.notComparedCause !== void 0;
 				if (cannotMaskKeys && preserved.length > 0) process.stdout.write(`    ! ${preserved.length} AWS-authored tag(s) will be preserved, but cdkd could not resolve this resource's dynamic reference(s), so their names are withheld — they come from the live readback and cannot be checked for secrets without them.\n`);
 				if (!cannotMaskKeys && preserved.length > 0) {
 					const tagWord = preserved.length === 1 ? "tag" : "tags";
@@ -65881,7 +65957,7 @@ function printRevertPlan(reports) {
 			}
 			if (stateResource && stateResource.observedProperties === void 0) {
 				const unbaselined = findRevertUnbaselinedAwsKeys(o.changes, stateResource.properties ?? {}, o.awsProperties);
-				if (o.referencesUnresolved && unbaselined.length > 0) process.stdout.write(`    ! ${unbaselined.length} AWS-authored value(s) will be left untouched, but cdkd could not resolve this resource's dynamic reference(s), so their paths are withheld — they come from the live readback and cannot be checked for secrets without them.\n`);
+				if (o.notComparedCause !== void 0 && unbaselined.length > 0) process.stdout.write(`    ! ${unbaselined.length} AWS-authored value(s) will be left untouched, but cdkd could not resolve this resource's dynamic reference(s), so their paths are withheld — they come from the live readback and cannot be checked for secrets without them.\n`);
 				else if (unbaselined.length > 0) {
 					const word = unbaselined.length === 1 ? "value" : "values";
 					process.stdout.write(`    ! this resource has no observed-capture baseline, so the revert pushes the raw TEMPLATE and LEAVES ${unbaselined.length} AWS-authored ${word} untouched:\n`);
@@ -65923,28 +65999,44 @@ async function confirmPrompt$5(prompt) {
 }
 function writeJsonReport(reports) {
 	const payload = reports.map((r) => {
-		const drifted = r.outcomes.filter((o) => o.kind === "drifted").map((o) => ({
-			logicalId: o.logicalId,
-			type: o.resourceType,
-			changes: o.changes,
-			referencesUnresolved: o.referencesUnresolved
-		}));
-		const clean = r.outcomes.filter((o) => o.kind === "clean").map((o) => ({
-			logicalId: o.logicalId,
-			type: o.resourceType,
-			referencesUnresolved: o.referencesUnresolved
-		}));
+		const drifted = [];
+		const clean = [];
+		const notSupported = [];
+		const skipped = [];
+		for (const o of r.outcomes) matchOutcome(o, {
+			drifted: (d) => {
+				drifted.push({
+					logicalId: d.logicalId,
+					type: d.resourceType,
+					changes: d.changes,
+					referencesUnresolved: d.notComparedCause !== void 0
+				});
+			},
+			clean: (c) => {
+				clean.push({
+					logicalId: c.logicalId,
+					type: c.resourceType,
+					referencesUnresolved: false
+				});
+			},
+			notCompared: () => {},
+			unsupported: (u) => {
+				notSupported.push({
+					logicalId: u.logicalId,
+					type: u.resourceType
+				});
+			},
+			skipped: (sk) => {
+				skipped.push({
+					logicalId: sk.logicalId,
+					type: sk.resourceType
+				});
+			}
+		});
 		const notCompared = notComparedOutcomes(r).map((o) => ({
 			logicalId: o.logicalId,
-			type: o.resourceType
-		}));
-		const notSupported = r.outcomes.filter((o) => o.kind === "unsupported").map((o) => ({
-			logicalId: o.logicalId,
-			type: o.resourceType
-		}));
-		const skipped = r.outcomes.filter((o) => o.kind === "skipped").map((o) => ({
-			logicalId: o.logicalId,
-			type: o.resourceType
+			type: o.resourceType,
+			referencesUnresolved: true
 		}));
 		return {
 			stack: r.stackName,
@@ -65960,10 +66052,27 @@ function writeJsonReport(reports) {
 }
 function writeHumanReport(reports) {
 	for (const report of reports) {
-		const drifted = report.outcomes.filter((o) => o.kind === "drifted");
-		const unsupported = report.outcomes.filter((o) => o.kind === "unsupported");
-		const skippedCount = report.outcomes.filter((o) => o.kind === "skipped").length;
-		const inspected = report.outcomes.length - skippedCount;
+		const drifted = [];
+		const unsupported = [];
+		let inspectedCount = 0;
+		for (const o of report.outcomes) matchOutcome(o, {
+			drifted: (d) => {
+				drifted.push(d);
+				inspectedCount += 1;
+			},
+			unsupported: (u) => {
+				unsupported.push(u);
+				inspectedCount += 1;
+			},
+			skipped: () => {},
+			clean: () => {
+				inspectedCount += 1;
+			},
+			notCompared: () => {
+				inspectedCount += 1;
+			}
+		});
+		const inspected = inspectedCount;
 		const notCompared = notComparedOutcomes(report);
 		const checked = inspected - notCompared.length;
 		if (drifted.length === 0) if (notCompared.length > 0) process.stdout.write(`⚠ ${report.stackName} (${report.region}): no drift detected, but ${checked} of ${inspected} resource${inspected === 1 ? "" : "s"} fully checked (${notCompared.length} only partially compared, ${unsupported.length} unsupported)\n`);
@@ -71646,8 +71755,8 @@ async function rollbackCommand(stackArg, options) {
 		try {
 			await setup.lockManager.acquireLockWithRetry(stackName, region, void 0, "rollback");
 		} catch (error) {
-			unforwardSigterm();
 			process.removeListener("SIGINT", sigintHandler);
+			unforwardSigterm();
 			throw error;
 		}
 		try {
@@ -71792,11 +71901,14 @@ async function rollbackCommand(stackArg, options) {
 			if (totalWarnings > 0) throw new PartialFailureError(`Rollback completed with ${totalWarnings} skipped/unrecoverable operation(s) (see warnings above).`);
 			logger.info(`\nRollback of '${stackName}' (${region}) complete.`);
 		} finally {
-			unforwardSigterm();
-			process.removeListener("SIGINT", sigintHandler);
-			await setup.lockManager.releaseLock(stackName, region).catch((err) => {
-				logger.warn(`Failed to release lock for '${stackName}' (${region}): ${err instanceof Error ? err.message : String(err)}`);
-			});
+			try {
+				await setup.lockManager.releaseLock(stackName, region).catch((err) => {
+					logger.warn(`Failed to release lock for '${stackName}' (${region}): ${err instanceof Error ? err.message : String(err)}`);
+				});
+			} finally {
+				process.removeListener("SIGINT", sigintHandler);
+				unforwardSigterm();
+			}
 		}
 	} finally {
 		if (stackAwsClients) {
@@ -84995,7 +85107,7 @@ function createMigrateCommand() {
 */
 function buildProgram() {
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.284.29");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.284.30");
 	program.hook("preAction", (_thisCommand, actionCommand) => {
 		const { profile } = actionCommand.optsWithGlobals();
 		if (profile !== void 0) process.env["AWS_PROFILE"] = profile;