@go-to-k/cdkd 0.289.7 → 0.289.9

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as isVersionOnlyInvocation, t as getCdkdVersion } from "./version-DJGTB4Rm.js";
+import { n as isVersionOnlyInvocation, t as getCdkdVersion } from "./version-DIRhHTEG.js";
 
 //#region src/cli/pipe-close-handler.ts
 /**
@@ -74,7 +74,7 @@ async function main() {
 		console.log(getCdkdVersion());
 		return;
 	}
-	const { buildProgram } = await import("./program-Ca0PiFL-.js");
+	const { buildProgram } = await import("./program-gLF8ioT_.js");
 	const program = buildProgram();
 	const args = reorderArgs(process.argv);
 	await program.parseAsync(args);

package/dist/{deploy-engine-DrTOY3f-.js → deploy-engine-BwZFYWGI.js}

@@ -1,6 +1,6 @@
 import { b as displaySafe, d as applyDefaultNameForFallback, f as explicitNamePropertyFor, g as looksLikeCdkdGeneratedName, h as getCurrentStackName, m as generateResourceNameWithFallback, n as getLogger, p as generateResourceName, r as isStdoutReservedForPayload, s as getLiveRenderer, v as withStackName, y as UNRENDERABLE } from "./logger-DTEUzYP_.js";
 import { t as awsClientDefaults } from "./aws-client-defaults-D-iYiIJ6.js";
-import { t as getCdkdVersion } from "./version-DJGTB4Rm.js";
+import { t as getCdkdVersion } from "./version-DIRhHTEG.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash, randomUUID } from "node:crypto";
 import { CreateBucketCommand, DeleteObjectCommand, DeleteObjectsCommand, GetBucketLocationCommand, GetBucketReplicationCommand, GetObjectCommand, HeadBucketCommand, HeadObjectCommand, ListObjectVersionsCommand, ListObjectsV2Command, NoSuchKey, PutBucketEncryptionCommand, PutBucketPolicyCommand, PutObjectCommand, PutPublicAccessBlockCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
@@ -1082,8 +1082,8 @@ var ResourceTimeoutError = class ResourceTimeoutError extends CdkdError {
 	operation;
 	timeoutMs;
 	constructor(logicalId, resourceType, region, elapsedMs, operation, timeoutMs) {
-		const elapsedLabel = formatDuration(elapsedMs);
-		const timeoutLabel = formatDuration(timeoutMs);
+		const elapsedLabel = formatDuration$1(elapsedMs);
+		const timeoutLabel = formatDuration$1(timeoutMs);
 		super(`Resource ${logicalId} (${resourceType}) in ${region} timed out after ${timeoutLabel} during ${operation} (elapsed ${elapsedLabel}).\nThis may indicate a stuck Cloud Control polling loop, hung Custom Resource, or
 slow ENI provisioning. Re-run with --resource-timeout ${resourceType}=<DURATION>\nto bump the budget for this resource type only, or --verbose to see the
 underlying provider activity.`, "RESOURCE_TIMEOUT");
@@ -1102,7 +1102,7 @@ underlying provider activity.`, "RESOURCE_TIMEOUT");
 * (`30m`, `1h30m`, `45s`). Used by {@link ResourceTimeoutError} so the
 * error message stays compact.
 */
-function formatDuration(ms) {
+function formatDuration$1(ms) {
 	if (ms < 6e4) return `${Math.round(ms / 1e3)}s`;
 	const totalMinutes = Math.round(ms / 6e4);
 	if (totalMinutes < 60) return `${totalMinutes}m`;
@@ -9239,13 +9239,39 @@ const CUSTOM_RESOURCE_RESPONSE_PREFIX = "custom-resource-responses";
 * `for nested-stack child`), so a user grepping CI logs for one of them found
 * two of three. `subject` now varies only the noun.
 */
-/** Render `expiresIn` without implying more precision than a clock skew allows. */
-function formatRemaining(ms) {
-	if (!Number.isFinite(ms)) return "at an unknown time";
-	if (ms <= 0) return "already expired";
-	const minutes = Math.round(ms / 6e4);
-	if (minutes < 1) return "in under a minute";
-	return `in ~${minutes}m`;
+/**
+* The ONE rendering of a lock's deadline: `expires in 1m23s` / `expired 45s
+* ago` for a finite `expiresAt`, `expires at an unknown time` otherwise
+* (issue #3085). Consumed by this module's contention refusal, by
+* `LockManager`'s three sites (the expired-lock takeover warning, the acquire
+* retry line, the final `LockError`) and by `cdkd state show`'s lock row, so
+* a record renders the same everywhere it is shown.
+*
+* Takes the RAW `expiresAt`, never a difference: the field is an unchecked
+* cast, and `Number.isFinite` on the raw value is the test `isLockExpired`
+* makes, so what this SAYS agrees with what the expiry check DOES. Subtracting
+* first (the previous `formatRemaining(info.expiresAt - Date.now())`) coerced
+* a numeric string to a real deadline here while the check called it expired
+* — the one input that still split the renderers after issue #3083. `{}`,
+* `"soon"`, an absent field, and the `NaN` that `getLockRecord` substitutes
+* for a coercion that throws (go-to-k/cdkd#2947) all land on the unknown arm.
+*
+* Seconds precision, deliberately: this module used to round to `in ~12m`
+* "without implying more precision than a clock skew allows", but the
+* `LockError` refusal that advises the same force-unlock decision already
+* printed `expires in 4m12s`, so the coarser form was a second spelling of the
+* same fact rather than a guard against skew.
+*/
+function formatLockExpiry(expiresAt) {
+	if (!Number.isFinite(expiresAt)) return "expires at an unknown time";
+	const remainingMs = expiresAt - Date.now();
+	return remainingMs > 0 ? `expires in ${formatDuration(remainingMs)}` : `expired ${formatDuration(-remainingMs)} ago`;
+}
+/** `1m23s` / `45s` from a non-negative millisecond count. */
+function formatDuration(ms) {
+	const seconds = Math.floor(ms / 1e3);
+	if (seconds < 60) return `${seconds}s`;
+	return `${Math.floor(seconds / 60)}m${seconds % 60}s`;
 }
 /**
 * Quote a value for a pasteable shell command.
@@ -9316,10 +9342,10 @@ async function buildLockContentionMessage(args) {
 		const info = await lockManager.getLockInfo(stackName, region);
 		if (info) {
 			const operation = info.operation ? `, operation: ${displaySafe(info.operation)}` : "";
-			const expires = formatRemaining(info.expiresAt - Date.now());
+			const expires = formatLockExpiry(info.expiresAt);
 			const owner = displaySafe(info.owner);
 			const holder = owner ? `held by ${owner}${operation}` : `held by an unnamed holder`;
-			held = `${heldClause ? `${heldClause} — ` : ""}${holder}, expires ${expires}`;
+			held = `${heldClause ? `${heldClause} — ` : ""}${holder}, ${expires}`;
 			if (owner) sawHolder = true;
 		}
 	} catch {}
@@ -10500,25 +10526,6 @@ var LockManager = class {
 		return `${Math.floor(seconds / 60)}m${seconds % 60}s`;
 	}
 	/**
-	* `expires in 1m23s` / `expired 45s ago` for a finite deadline, `expires at
-	* an unknown time` otherwise — the ONE spelling for a lock's expiry in this
-	* module's messages, so the three sites that render one (the expired-lock
-	* takeover warning, the retry line, the final refusal) cannot disagree.
-	*
-	* The non-finite arm is what stops `expired NaNmNaNs ago` (issue #3083):
-	* `expiresAt` is an unchecked cast, and `getLockRecord` deliberately hands
-	* a coercion that THROWS through as `NaN` (go-to-k/cdkd#2947) rather than
-	* inventing a deadline. The wording matches `formatRemaining` in
-	* `lock-contention-message.ts`, which answered the same input this way
-	* first. `isLockExpired` decides what such a value MEANS (expired); this
-	* only decides what it SAYS.
-	*/
-	formatExpiry(expiresAt) {
-		if (!Number.isFinite(expiresAt)) return "expires at an unknown time";
-		const remainingMs = expiresAt - Date.now();
-		return remainingMs > 0 ? `expires in ${this.formatDuration(remainingMs)}` : `expired ${this.formatDuration(-remainingMs)} ago`;
-	}
-	/**
 	* Try to acquire a lock for a stack
 	*
 	* Uses If-None-Match: "*" to ensure atomic lock acquisition.
@@ -10573,7 +10580,7 @@ var LockManager = class {
 						} else throw deleteError;
 					}
 					const why = Number.isFinite(existing.info.expiresAt) ? "A live cdkd process renews its lock well inside the TTL, so this normally means the previous owner crashed or was suspended" : `Its expiresAt is not a finite number, which cdkd treats as already expired`;
-					this.logger.warn(`Took over an EXPIRED lock for stack: ${stackName} (${region}, owner: ${existing.info.owner}, ${this.formatExpiry(existing.info.expiresAt)}). ${why} -- if it is in fact still running, both processes are now writing to the same stack.`);
+					this.logger.warn(`Took over an EXPIRED lock for stack: ${stackName} (${region}, owner: ${existing.info.owner}, ${formatLockExpiry(existing.info.expiresAt)}). ${why} -- if it is in fact still running, both processes are now writing to the same stack.`);
 					try {
 						const retryEtag = await this.putLockObject(key, lockInfo);
 						this.logger.debug(`Lock acquired for stack: ${stackName} (${region}) after expired lock cleanup, owner: ${lockOwner}`);
@@ -11170,14 +11177,14 @@ var LockManager = class {
 			const lockInfo = await this.getLockInfo(stackName, region);
 			if (lockInfo) {
 				if (attempt < maxRetries) {
-					this.logger.info(`Stack '${safeSegment(stackName)}' (${safeSegment(region)}) is locked by ${lockInfo.owner}${lockInfo.operation ? ` (operation: ${lockInfo.operation})` : ""}. Lock ${this.formatExpiry(lockInfo.expiresAt)}. Retrying in ${this.formatDuration(retryDelay)}... (attempt ${attempt + 1}/${maxRetries})`);
+					this.logger.info(`Stack '${safeSegment(stackName)}' (${safeSegment(region)}) is locked by ${lockInfo.owner}${lockInfo.operation ? ` (operation: ${lockInfo.operation})` : ""}. Lock ${formatLockExpiry(lockInfo.expiresAt)}. Retrying in ${this.formatDuration(retryDelay)}... (attempt ${attempt + 1}/${maxRetries})`);
 					await new Promise((resolve) => setTimeout(resolve, retryDelay));
 					continue;
 				}
 			}
 		}
 		const lockInfo = await this.getLockInfo(stackName, region);
-		const expiry = lockInfo ? this.formatExpiry(lockInfo.expiresAt) : void 0;
+		const expiry = lockInfo ? formatLockExpiry(lockInfo.expiresAt) : void 0;
 		const forceUnlockCommand = buildForceUnlockCommand(stackName, region);
 		const recovery = forceUnlockCommand ? `If you are certain no other process is active, run: ${forceUnlockCommand}` : `If you are certain no other process is active, ${UNREPRODUCIBLE_LOCK_CLAUSE.charAt(0).toLowerCase()}${UNREPRODUCIBLE_LOCK_CLAUSE.slice(1)}`;
 		const safeStack = safeSegment(stackName);
@@ -11394,7 +11401,10 @@ const sameGenerationBags = /* @__PURE__ */ new WeakSet();
 *   stored. On the no-change path the newly redacted bag is installed when
 *   the outputs CHANGED, and the previous `persistedOutputs` is kept
 *   otherwise; that previous bag is unmarked, which is the answer that arm
-*   wants.
+*   wants. When an output FAILED there, what is installed is either a fresh
+*   merge of this pass's values with the previous bag's carried ones (issue
+*   #2771), mixed provenance and never marked, or — when that merge refuses —
+*   the previous bag kept whole, unmarked as above.
 * - the update arm's no-change re-check — a marked `{ ...resolvedProps }`
 *   compared against the stored record so a stored token reads as a no-op.
 *   NOT installed; the object the provider is handed is the unmarked original.
@@ -12179,18 +12189,28 @@ const UNFRAMED_SPELLING = Symbol("cdkd.nested-parameter.unframed-spelling");
 * and the same generation the bag was resolved from one statement earlier. That
 * is the identical pairing `redactRollbackRecord` already makes for the record
 * it positions, so the two replay walks now agree about what their source is.
+* Since issue #3090 the `trustAnyExpression` half of that claim no longer
+* changes what THIS recorder writes for a reference the pass resolved:
+* refusal 5 asks the pair table under both rule sets, and a resolved unpinned
+* `ssm` reference has a pair (only its pin is withheld), so either ruleset
+* positions it through the span arm's empty frame. What the constants still
+* decide here is `sourceIsSameGeneration`, which a token-shaped plaintext
+* reaches (fenced by the replay call sites' own file).
 *
 * "No public expressions" carries the carve-out {@link PathSourceRules} states
 * and this note must not restate without it: `cdkd import` warns and persists
 * the RAW template intrinsic, so a public `ssm:` token CAN sit in a record. The
-* replay then CERTIFIES one the deploy default would refuse, at a cost bounded
-* to the issue #1901 class — a spurious UPDATE over a value state should hold
-* resolved, never a disclosure, since an expression is what gets persisted
-* either way. See the replay call sites for why gating on
-* {@link isKnownSecretExpression} is the wrong way to close it.
-*
-* FOUR REFUSALS, each degrading to today's behaviour (the child leaf falls to
-* the plaintext-keyed value scan):
+* replay's POSITION pass then certifies one the deploy default would refuse;
+* since issue #3090 refusal 5 refuses to RECORD it under either ruleset (a
+* token resolved as public is never paired), so the child's leaf falls to the
+* value scan. Before that the cost was bounded to the issue #1901 class — a
+* spurious UPDATE over a value state should hold resolved, never a
+* disclosure, since an expression is what gets persisted either way. See the
+* replay call sites for why gating on {@link isKnownSecretExpression} is the
+* wrong way to close it.
+*
+* FIVE REFUSALS, each degrading to today's behaviour (the child leaf falls to
+* the plaintext-keyed value scan); the fifth is stated at its line:
 *
 * 1. REFUSAL — the resolved parameter value is not a WHOLE recorded plaintext.
 *    A parameter the parent built with an `Fn::Sub` merely EMBEDS the secret,
@@ -12336,9 +12356,11 @@ const UNFRAMED_SPELLING = Symbol("cdkd.nested-parameter.unframed-spelling");
 * the value, which the entry provides -- or the child's OWN resolution of
 * the same plaintext, in which case the association answers with the leaf's
 * own frame, the right reference for it. So a FRAMED association whose value
-* (iii) refused is inert or correct, never wrong -- a claim about this
-* route's pair gate, not about the whole-token walk above, whose refusal 4
-* cannot see a public token (issue #3090). The association's expression is
+* (iii) refused is inert or correct, never wrong -- a claim the whole-token
+* walk's STRING-source half now earns the same way, through refusal 5 (issue
+* #3090); its intrinsic-source half rests on the reader's condition 3, less
+* the skeleton arm's own unpinned-`ssm` residual (stated on that arm).
+* The association's expression is
 * the FRAME, not a token -- the one writer into that table that stores a
 * non-token, said so on {@link storeAssociation}; its readers return it to be
 * persisted, which is exactly what the entry would have written.
@@ -12397,6 +12419,7 @@ function recordNestedStackParameterExpressions(secrets, resourceType, resolvedPr
 		if (expression === resolvedValue) continue;
 		const seenResolvingTo = plaintextIndexOf(secrets).get(expression);
 		if (seenResolvingTo !== void 0 && seenResolvingTo !== resolvedValue) continue;
+		if (typeof sourceLeaf === "string" && resolvedPlaintextOf(secrets, expression) !== resolvedValue) continue;
 		if (table === void 0) {
 			table = /* @__PURE__ */ new Map();
 			nestedStackParameterExpressions.set(secrets, table);
@@ -28407,7 +28430,7 @@ var CloudControlProvider = class {
 		const indeterminateGuard = await this.confirmDeleteTargetIdentity(logicalId, resourceType, physicalId, context);
 		if (context?.removeProtection === true && resourceType === "AWS::AutoScaling::AutoScalingGroup") {
 			this.logger.debug(`Delegating protected AutoScalingGroup ${logicalId} delete to the SDK ASGProvider (Cloud Control cannot force-delete a protected ASG)`);
-			const { ASGProvider } = await import("./asg-provider-D6Zyjgrr.js").then((n) => n.n);
+			const { ASGProvider } = await import("./asg-provider-BNOp-qgj.js").then((n) => n.n);
 			const asgProvider = new ASGProvider();
 			return withIndeterminateGuard(await asgProvider.delete(logicalId, physicalId, resourceType, _properties, context), indeterminateGuard);
 		}
@@ -35065,10 +35088,10 @@ async function createReplicationGroupFinalSnapshot(client, replicationGroupId, l
 *
 * The deploy side (`DeployEngine.handleOutputResolutionFailure`, default arm)
 * warns, stores `undefined` for the key and moves on, so a re-resolved
-* `state.outputs` lacks it (the no-change path keeps the previous bag whole
-* when any output fails, so a key that resolved on an EARLIER deploy can keep
-* its value beside a record — the reader checks absence first and ignores the
-* record then). The diff side resolves outputs with `skipDynamicReferences`, so a
+* `state.outputs` lacks it (the no-change path keeps a failed key's STORED
+* value, go-to-k/cdkd#2771, so a key that resolved on an EARLIER deploy can
+* keep its value beside a record — the reader checks absence first and ignores
+* the record then). The diff side resolves outputs with `skipDynamicReferences`, so a
 * failure that happens INSIDE a secret lookup — a JSON key the secret does not
 * hold, a reference assembled from another secret's value — does not reproduce
 * there: the value assembles into its token, the key is absent from state, and
@@ -35149,10 +35172,10 @@ async function createReplicationGroupFinalSnapshot(client, replicationGroupId, l
 * the writing binary's version is knowable and merely unstored: keeping it
 * beside the digest and un-binding on mismatch would close that one. All four
 * end the same way: the record keeps binding until the next deploy re-resolves
-* the output, and that deploy publishes the key — unless a SIBLING output is
-* still unresolved on a run with no resource change, where the engine keeps
-* the previous outputs bag wholesale and the key stays unpublished for a
-* further run (go-to-k/cdkd#2771, pre-existing and not introduced here).
+* the output, and that deploy publishes the key, a still-unresolved SIBLING
+* included, since the no-change path persists what resolved rather than
+* keeping the previous bag whole (go-to-k/cdkd#2771; the two shapes it still
+* keeps whole are in `src/deployment/no-change-outputs-merge.ts`).
 * Documented as the accepted limitation in `docs/cli-diff.md`; it is narrower
 * than the pre-#2740 behaviour, where the diff was wrong on EVERY run.
 *
@@ -35437,8 +35460,9 @@ function bindingSkippedOutputs(pristineTemplate, record, changedLogicalIds) {
 /**
 * Whether two records — either possibly absent — describe the same skipped
 * set with the same digests. The no-change deploy path persists on a
-* difference here: it is the ONLY save trigger for this field on that path,
-* because a skipped output switches the outputs-changed trigger off.
+* difference here: it is what saves this field when the outputs bag that save
+* would write is unchanged, which is the usual shape — a skipped output that
+* never had a stored value leaves the bag equal.
 */
 function skippedOutputsEqual(a, b) {
 	const aKeys = a === null || a === void 0 ? [] : Object.keys(a);
@@ -35447,6 +35471,95 @@ function skippedOutputsEqual(a, b) {
 	return aKeys.every((k) => Object.prototype.hasOwnProperty.call(b, k) && a?.[k] === b?.[k]);
 }
 
+//#endregion
+//#region src/deployment/no-change-outputs-merge.ts
+/**
+* True when `value` is a string carrying a SECRET-BEARING CloudFormation
+* dynamic reference: `{{resolve:secretsmanager:` or `{{resolve:ssm-secure:`,
+* the two spellings that are secret regardless of what they point at.
+*
+* A plain `{{resolve:ssm:...}}` is deliberately excluded. Per issue #1901 it is
+* classified by the parameter's TYPE, and a `String` / `StringList` parameter is
+* PUBLIC and legitimately persisted RESOLVED. Treating it as a signal would fire
+* on a perfectly ordinary record, and since `cdkd diff`'s legacy verdict is
+* record-WIDE, that would withhold every previous value in the stack and tell
+* the user to run `cdkd scrub`, which would find nothing to fix. The residual is
+* a pre-#1901 SecureString `ssm:` record, a strictly narrower gap than the false
+* positive this exclusion removes.
+*/
+function isSecretBearingReferenceString(value) {
+	if (typeof value !== "string") return false;
+	return value.includes("{{resolve:secretsmanager:") || value.includes("{{resolve:ssm-secure:");
+}
+/**
+* True when any TOP-LEVEL value of `bag` is itself a secret-bearing expression
+* string. Leaf granularity on purpose: a container holding an expression next
+* to a plaintext leaf is exactly the partially redacted residue `cdkd scrub`
+* admits it can leave, and it must not earn the exoneration.
+*/
+function bagHoldsSecretExpression(bag) {
+	if (bag === void 0 || bag === null) return false;
+	return Object.values(bag).some((value) => isSecretBearingReferenceString(value));
+}
+function hasOwn(bag, key) {
+	return Object.prototype.hasOwnProperty.call(bag, key);
+}
+/**
+* Decide the bag the no-change path persists when `resolved` holds at least
+* one unresolved output. See the module doc for the three rules and the two
+* refusals.
+*/
+function mergeNoChangeOutputs(input) {
+	const { persisted, resolved, declaredOutputs, previousExportNames, resolvedExportNames } = input;
+	const failedKeys = Object.keys(resolved).filter((key) => resolved[key] === void 0);
+	const exportNameOf = (outputKey) => declaredOutputs !== void 0 && hasOwn(declaredOutputs, outputKey) ? declaredOutputs[outputKey]?.Export?.Name : void 0;
+	for (const outputKey of failedKeys) {
+		const exportName = exportNameOf(outputKey);
+		if (exportName !== null && typeof exportName === "object" && hasOwn(persisted, outputKey)) return {
+			kind: "kept",
+			reason: "intrinsic-export-name"
+		};
+	}
+	const outputs = Object.create(null);
+	for (const [key, value] of Object.entries(resolved)) if (value !== void 0) outputs[key] = value;
+	const carriedKeys = [];
+	const exportNames = [...resolvedExportNames];
+	const addExport = (name) => {
+		exportNames.push(name);
+	};
+	for (const outputKey of failedKeys) {
+		const exportName = exportNameOf(outputKey);
+		if (hasOwn(persisted, outputKey)) {
+			outputs[outputKey] = persisted[outputKey];
+			carriedKeys.push(outputKey);
+			if (exportName === outputKey && previousExportNames.has(outputKey)) addExport(outputKey);
+		}
+		if (typeof exportName !== "string") continue;
+		if (previousExportNames.has(exportName) && hasOwn(persisted, exportName) && !hasOwn(resolved, exportName) && !hasOwn(outputs, exportName)) {
+			outputs[exportName] = persisted[exportName];
+			carriedKeys.push(exportName);
+			addExport(exportName);
+		}
+	}
+	if (carriedKeys.length > 0 && bagHoldsSecretExpression(outputs) && !bagHoldsSecretExpression(persisted)) return {
+		kind: "kept",
+		reason: "mixed-generation"
+	};
+	return {
+		kind: "merged",
+		outputs,
+		exportNames,
+		carriedKeys
+	};
+}
+/** The sentence the deploy engine appends to its keep-whole warning. */
+function keptWholeReasonText(reason) {
+	switch (reason) {
+		case "intrinsic-export-name": return "An unresolved output declares an intrinsic Export.Name, so the export key it published before cannot be identified and carried.";
+		case "mixed-generation": return "Persisting only the outputs that resolved would put a redacted secret reference beside a carried value in a bag that held none, which would make that value read as redacted.";
+	}
+}
+
 //#endregion
 //#region src/analyzer/implicit-delete-deps.ts
 /**
@@ -38934,14 +39047,32 @@ var DeployEngine = class DeployEngine {
 				let persistedOutputs = currentState.outputs ?? {};
 				if (!this.options.dryRun) {
 					const resolvedOutputs = this.redactOutputs(await withSharedDrainBudget(() => this.resolveOutputs(effectiveTemplate, currentState.resources, stackName, outputsDigestSource, parameterValues, conditions)));
-					const resolutionFailed = Object.values(resolvedOutputs).some((v) => v === void 0);
-					const outputsChanged = !resolutionFailed && !outputMapsEqual(persistedOutputs, resolvedOutputs);
-					const currentEffectiveExports = new Set(importableOutputKeys(currentState));
-					const resolvedExportSet = new Set(this.resolvedExportNames);
-					const exportSetChanged = !resolutionFailed && (currentEffectiveExports.size !== resolvedExportSet.size || [...resolvedExportSet].some((k) => !currentEffectiveExports.has(k)));
-					if (resolutionFailed && !outputMapsEqual(persistedOutputs, resolvedOutputs)) this.logger.warn("Outputs changed but one or more could not be resolved; keeping the previously persisted outputs. A downstream Fn::ImportValue may fail until the next deploy.");
 					const observedRefresh = this.observedCaptureTasks.size > 0;
 					if (observedRefresh) await this.drainObservedCaptures(currentState.resources);
+					const resolutionFailed = Object.values(resolvedOutputs).some((v) => v === void 0);
+					const currentEffectiveExports = new Set(importableOutputKeys(currentState));
+					let merge = resolutionFailed ? mergeNoChangeOutputs({
+						persisted: persistedOutputs,
+						resolved: resolvedOutputs,
+						declaredOutputs: effectiveTemplate.Outputs,
+						previousExportNames: currentEffectiveExports,
+						resolvedExportNames: this.resolvedExportNames
+					}) : void 0;
+					if (merge?.kind === "merged") {
+						for (const key of merge.carriedKeys) Reflect.deleteProperty(this.outputsTemplateSource, key);
+						if (merge.carriedKeys.length > 0 && !bagHoldsSecretExpression(persistedOutputs) && bagHoldsSecretExpression(this.redactOutputs(merge.outputs))) merge = {
+							kind: "kept",
+							reason: "mixed-generation"
+						};
+					}
+					if (merge?.kind === "kept") this.outputsSourceUsable = false;
+					const outputsToPersist = merge === void 0 ? resolvedOutputs : merge.kind === "merged" ? merge.outputs : persistedOutputs;
+					const exportNamesToPersist = merge === void 0 ? this.resolvedExportNames : merge.kind === "merged" ? merge.exportNames : void 0;
+					const outputsChanged = !outputMapsEqual(persistedOutputs, outputsToPersist);
+					const persistExportSet = new Set(exportNamesToPersist ?? []);
+					const exportSetChanged = exportNamesToPersist !== void 0 && (currentEffectiveExports.size !== persistExportSet.size || [...persistExportSet].some((k) => !currentEffectiveExports.has(k)));
+					if (merge?.kind === "kept" && !outputMapsEqual(persistedOutputs, resolvedOutputs)) this.logger.warn(`Outputs changed but one or more could not be resolved; keeping the previously persisted outputs. ${keptWholeReasonText(merge.reason)} A downstream Fn::ImportValue may fail until the next deploy.`);
+					else if (merge?.kind === "merged" && merge.carriedKeys.length > 0) this.logger.debug(`Kept the previously persisted value of ${merge.carriedKeys.length} output key(s) that could not be resolved (no-change path, #2771)`);
 					const skippedOutputsChanged = !skippedOutputsEqual(currentState.skippedOutputs, this.skippedOutputs);
 					if (observedRefresh || outputsChanged || exportSetChanged || skippedOutputsChanged || orphansChanged) try {
 						const refreshedState = {
@@ -38950,8 +39081,8 @@ var DeployEngine = class DeployEngine {
 							stackName: currentState.stackName,
 							resources: currentState.resources,
 							...orphansCarriedFrom(currentState),
-							outputs: outputsChanged ? resolvedOutputs : persistedOutputs,
-							...resolutionFailed ? exportNamesCarriedFrom(currentState) : { exportNames: [...this.resolvedExportNames] },
+							outputs: outputsChanged ? outputsToPersist : persistedOutputs,
+							...exportNamesToPersist === void 0 ? exportNamesCarriedFrom(currentState) : { exportNames: [...exportNamesToPersist] },
 							...this.skippedOutputs && { skippedOutputs: { ...this.skippedOutputs } },
 							...crossStackReadsForPartialSave(currentState, this.recordedImports, this.recordedOutputReads),
 							lastModified: Date.now()
@@ -40853,5 +40984,5 @@ var DeployEngine = class DeployEngine {
 };
 
 //#endregion
-export { collectInlinePolicyNamesManagedBySiblings as $, describeAwsFailure as $n, IntrinsicResolutionRefusalError as $r, describeTypeWithThrottleRetry as $t, isStatefulRecreateTargetForReplace as A, importableOutputKeys as An, MIGRATE_TMP_PREFIX as Ar, coerceCfnBoolean as At, gray as B, loadPublishableAssetManifest as Bn, clearBucketRegionCache as Br, classifyReplaySecretRegion as Bt, refusesFinalSnapshot as C, __exportAll as Ci, buildForceUnlockCommand as Cn, resolveStateBucketWithDefault as Cr, isUnboundTemplateParameter as Ct, makeSiblingClaimReader as D, CUSTOM_RESOURCE_RESPONSE_PREFIX as Dn, warnDeprecatedNoPrefixCliFlag as Dr, normalizeAwsTagsToCfn as Dt, extractDeploymentEventError as E, shellQuote as En, stateBucketExistenceConfirmed as Er, WAFv2WebACLProvider as Et, isWarmThroughputDecrease as F, AssetPublisher as Fn, PARTITION_TABLE as Fr, readConfigString as Ft, collectPublishedOutputNames as G, ensureAssetStorage as Gn, setAwsClients as Gr, s3BucketDualStackDomainName as Gt, red as H, AssetModeResolver as Hn, AwsClients as Hr, withSharedDrainBudget as Ht, toFiniteNumber as I, stringifyValue as In, canonicalizeRegion as Ir, replayWarn as It, secretBearing as J, parseBootstrapMarker as Jn, ConfigError as Jr, applyRoleArnIfSet as Jt, exportAliasCollisionScrubWarning as K, getBootstrapMarkerKey as Kn, AssetError as Kr, s3BucketRegionalDomainName as Kt, formatResourceLine as L, WorkGraph as Ln, derivePartitionAndUrlSuffix as Lr, requireConfigArray as Lt, renderStatefulReason as M, orphansAfterRollback as Mn, uploadCfnTemplate as Mr, configBooleanRefusal as Mt, WARM_THROUGHPUT_MEMBERS as N, orphansCarriedFrom as Nn, CUSTOM_RESOURCE_RESPONSE_OBJECT_DESCRIPTION as Nr, configIntegerRefusal as Nt, planOrphanAdoption as O, DEFAULT_STATE_PREFIX as On, CFN_TEMPLATE_BODY_LIMIT as Or, resolveExplicitPhysicalId as Ot, coerceWarmThroughput as P, shouldRetainResource as Pn, expectedOwnerParam as Pr, configStringRefusal as Pt, IAMRoleProvider as Q, buildDenyExternalAccessPolicy as Qn, DynamicReferenceRegionAmbiguousError as Qr, findSilentDropProperties as Qt, bold as R, buildAssetRedirectMap as Rn, AssemblyReader as Rr, requireConfigObject as Rt, isFinalSnapshotError as S, retryClassificationText as Si, rebuildClientForBucketRegion as Sn, resolveSkipPrefix as Sr, getAccountInfo as St, makeCanonicalizePropertiesFn as T, forceQuitRecoveryClause as Tn, resolveUseCdkBootstrapAssets as Tr, refStateLookupFromResource as Tt, yellow as U, BOOTSTRAP_MARKER_PREFIX as Un, getAwsClients as Ur, s3BucketArn as Ut, green as V, rewriteTemplateAssetReferences as Vn, resolveBucketRegion as Vr, producerRegionsFromState as Vt, collectDeclaredOutputNames as W, assertAssetBucketRegion as Wn, resetAwsClients as Wr, s3BucketDomainName as Wt, secretSafeKeyDisplay as X, validateAssetBucketName as Xn, DependencyError as Xr, INTRINSIC_KEYS as Xt, secretBearingStateKeyWarning as Y, readBootstrapMarkerBody as Yn, CrossAccountSecretRefusalError as Yr, DiffCalculator as Yt, getCurrentResourceSecrets as Z, validateContainerRepoName as Zn, DeployCancelledError as Zr, findActionableSilentDrops as Zt, ATOMIC_FINAL_SNAPSHOT_TYPES as _, isRetryableTransientError as _i, recoverMaskedOutput as _n, getDefaultStateBucketName as _r, isTerminationProtectionPropagationError as _t, DeploymentEventsStore as a, ProvisioningError as ai, STATE_SOURCED_READBACK_RULES as an, formatDockerLoginError as ar, maskerOrIdentity as at, ccRoutedFinalSnapshotError as b, markNonRetryable as bi, LockManager as bn, resolveAutoAssetStorage as br, cfnRefValueFromPhysicalId as bt, replayFailedOperations as c, StackHasActiveImportsError as ci, createSecretMasker as cn, redactDockerArgvValues as cr, interruptWatchListenerCount as ct, updatePartialReason as d, SynthesisError as di, identityKeyFor as dn, escapeRegExp$1 as dr, CloudControlProvider as dt, LocalInvokeBuildError as ei, withRetry as en, buildDockerImage as er, clearOnUpdateRemoval as et, withResourceDeadline as f, formatError as fi, isSingleDynamicReferenceToken as fn, stripControlChars as fr, slowCcOperationTimeoutMs as ft, bindingSkippedOutputs as g, isMarkedNonRetryable as gi, recordMaskOnlyValue as gn, synthesisStatusMessage as gr, disableInstanceApiTermination as gt, computeImplicitDeleteEdges as h, withErrorHandling as hi, maskSecretsInText as hn, Synthesizer as hr, deleteSkipReason as ht, DeploymentEventsReader as i, PartialFailureError as ii, STATE_SOURCED_CROSS_GENERATION_RULES as in, dockerSpawnEnvWithSensitive as ir, maskDeep as it, isStatefulRecreateTargetSync as j, importableOutputs as jn, findLargeInlineResources as jr, coerceCfnInteger as jt, MULTI_REGION_RECREATE_BLOCKED_TYPES as k, exportNamesCarriedFrom as kn, CFN_TEMPLATE_URL_LIMIT as kr, assertRegionMatch as kt, replayRollback as l, StackTerminationProtectionError as li, dynamicReferenceTokens as ln, runDockerForeground as lr, isInterruptedWaitError as lt, IMPLICIT_DELETE_DEPENDENCIES as m, normalizeAwsError as mi, maskSecretsInError as mn, getDockerImageBySourceHash as mr, deleteIndeterminateGuards as mt, DEFAULT_RESOURCE_WARN_AFTER_MS as n, LockError as ni, TemplateParser as nn, describeDockerExecFailure as nr, wouldReturnToSdkProvider as nt, planFailedOps as o, ResourceTimeoutError as oi, TEMPLATE_SOURCED_RULES as on, getDockerCmd as or, beginCommandInterruptScope as ot, maskingRetryLogger as p, isCdkdError as pi, markSameGenerationBag as pn, AssetManifestLoader as pr, UNSPECIFIED_SKIP_REASON as pt, isExportAliasCollision as q, isCrossRegionRedirect as qn, CdkdError as qr, s3BucketWebsiteUrl as qt, DeployEngine as r, NestedStackChildDirectDestroyError as ri, STATE_SOURCED_BASELINE_RULES as rn, describeDockerFailure as rr, createMaskedRetryLogger as rt, planRollback as s, ResourceUpdateNotSupportedError as si, carriesSecretMask as sn, partitionSensitiveEnv as sr, endCommandInterruptScope as st, DEFAULT_RESOURCE_TIMEOUT_MS as t, LocalStartServiceError as ti, DagBuilder as tn, describeDockerCapturedOutput as tr, ProviderRegistry as tt, updatePartialMessage as u, StateError as ui, errorCauseChain as un, runDockerStreaming as ur, startInterruptWatch as ut, PRE_DELETE_SNAPSHOT_TYPES as v, isThrottlingError as vi, redactSecretsForState as vn, getLegacyStateBucketName as vr, IntrinsicFunctionResolver as vt, unsupportedFinalSnapshotError as w, buildLockContentionMessage as wn, resolveStateBucketWithDefaultAndSource as wr, parameterTypeMayLoseSecretIdentity as wt, createPreDeleteFinalSnapshot as x, markRedactedCause as xi, S3StateBackend as xn, resolveCaptureObservedState as xr, coerceParameterTypedValue as xt, buildFinalSnapshotIdentifier as y, isTransientServerError as yi, scrubResourceRecord as yn, resolveApp as yr, carriesDynamicReference as yt, cyan as z, createAssetRedirectResolver as zn, processStackMessages as zr, requireConfigString as zt };
-//# sourceMappingURL=deploy-engine-DrTOY3f-.js.map
+export { getCurrentResourceSecrets as $, validateAssetBucketName as $n, DependencyError as $r, findActionableSilentDrops as $t, planOrphanAdoption as A, CUSTOM_RESOURCE_RESPONSE_PREFIX as An, warnDeprecatedNoPrefixCliFlag as Ar, resolveExplicitPhysicalId as At, bold as B, WorkGraph as Bn, derivePartitionAndUrlSuffix as Br, requireConfigObject as Bt, createPreDeleteFinalSnapshot as C, markNonRetryable as Ci, S3StateBackend as Cn, resolveAutoAssetStorage as Cr, coerceParameterTypedValue as Ct, makeCanonicalizePropertiesFn as D, forceQuitRecoveryClause as Dn, resolveStateBucketWithDefaultAndSource as Dr, refStateLookupFromResource as Dt, unsupportedFinalSnapshotError as E, __exportAll as Ei, buildLockContentionMessage as En, resolveStateBucketWithDefault as Er, parameterTypeMayLoseSecretIdentity as Et, WARM_THROUGHPUT_MEMBERS as F, orphansAfterRollback as Fn, uploadCfnTemplate as Fr, configIntegerRefusal as Ft, yellow as G, AssetModeResolver as Gn, AwsClients as Gr, s3BucketArn as Gt, gray as H, createAssetRedirectResolver as Hn, processStackMessages as Hr, classifyReplaySecretRegion as Ht, coerceWarmThroughput as I, orphansCarriedFrom as In, CUSTOM_RESOURCE_RESPONSE_OBJECT_DESCRIPTION as Ir, configStringRefusal as It, exportAliasCollisionScrubWarning as J, ensureAssetStorage as Jn, setAwsClients as Jr, s3BucketRegionalDomainName as Jt, collectDeclaredOutputNames as K, BOOTSTRAP_MARKER_PREFIX as Kn, getAwsClients as Kr, s3BucketDomainName as Kt, isWarmThroughputDecrease as L, shouldRetainResource as Ln, expectedOwnerParam as Lr, readConfigString as Lt, isStatefulRecreateTargetForReplace as M, exportNamesCarriedFrom as Mn, CFN_TEMPLATE_URL_LIMIT as Mr, coerceCfnBoolean as Mt, isStatefulRecreateTargetSync as N, importableOutputKeys as Nn, MIGRATE_TMP_PREFIX as Nr, coerceCfnInteger as Nt, extractDeploymentEventError as O, formatLockExpiry as On, resolveUseCdkBootstrapAssets as Or, WAFv2WebACLProvider as Ot, renderStatefulReason as P, importableOutputs as Pn, findLargeInlineResources as Pr, configBooleanRefusal as Pt, secretSafeKeyDisplay as Q, readBootstrapMarkerBody as Qn, CrossAccountSecretRefusalError as Qr, INTRINSIC_KEYS as Qt, toFiniteNumber as R, AssetPublisher as Rn, PARTITION_TABLE as Rr, replayWarn as Rt, ccRoutedFinalSnapshotError as S, isTransientServerError as Si, LockManager as Sn, resolveApp as Sr, cfnRefValueFromPhysicalId as St, refusesFinalSnapshot as T, retryClassificationText as Ti, buildForceUnlockCommand as Tn, resolveSkipPrefix as Tr, isUnboundTemplateParameter as Tt, green as U, loadPublishableAssetManifest as Un, clearBucketRegionCache as Ur, producerRegionsFromState as Ut, cyan as V, buildAssetRedirectMap as Vn, AssemblyReader as Vr, requireConfigString as Vt, red as W, rewriteTemplateAssetReferences as Wn, resolveBucketRegion as Wr, withSharedDrainBudget as Wt, secretBearing as X, isCrossRegionRedirect as Xn, CdkdError as Xr, applyRoleArnIfSet as Xt, isExportAliasCollision as Y, getBootstrapMarkerKey as Yn, AssetError as Yr, s3BucketWebsiteUrl as Yt, secretBearingStateKeyWarning as Z, parseBootstrapMarker as Zn, ConfigError as Zr, DiffCalculator as Zt, isSecretBearingReferenceString as _, normalizeAwsError as _i, maskSecretsInText as _n, getDockerImageBySourceHash as _r, deleteSkipReason as _t, DeploymentEventsStore as a, LockError as ai, STATE_SOURCED_BASELINE_RULES as an, describeDockerExecFailure as ar, createMaskedRetryLogger as at, PRE_DELETE_SNAPSHOT_TYPES as b, isRetryableTransientError as bi, redactSecretsForState as bn, getDefaultStateBucketName as br, IntrinsicFunctionResolver as bt, replayFailedOperations as c, ProvisioningError as ci, TEMPLATE_SOURCED_RULES as cn, formatDockerLoginError as cr, beginCommandInterruptScope as ct, updatePartialReason as d, StackHasActiveImportsError as di, dynamicReferenceTokens as dn, redactDockerArgvValues as dr, isInterruptedWaitError as dt, DeployCancelledError as ei, findSilentDropProperties as en, validateContainerRepoName as er, IAMRoleProvider as et, withResourceDeadline as f, StackTerminationProtectionError as fi, errorCauseChain as fn, runDockerForeground as fr, startInterruptWatch as ft, bagHoldsSecretExpression as g, isCdkdError as gi, maskSecretsInError as gn, AssetManifestLoader as gr, deleteIndeterminateGuards as gt, computeImplicitDeleteEdges as h, formatError as hi, markSameGenerationBag as hn, stripControlChars as hr, UNSPECIFIED_SKIP_REASON as ht, DeploymentEventsReader as i, LocalStartServiceError as ii, TemplateParser as in, describeDockerCapturedOutput as ir, wouldReturnToSdkProvider as it, MULTI_REGION_RECREATE_BLOCKED_TYPES as j, DEFAULT_STATE_PREFIX as jn, CFN_TEMPLATE_BODY_LIMIT as jr, assertRegionMatch as jt, makeSiblingClaimReader as k, shellQuote as kn, stateBucketExistenceConfirmed as kr, normalizeAwsTagsToCfn as kt, replayRollback as l, ResourceTimeoutError as li, carriesSecretMask as ln, getDockerCmd as lr, endCommandInterruptScope as lt, IMPLICIT_DELETE_DEPENDENCIES as m, SynthesisError as mi, isSingleDynamicReferenceToken as mn, escapeRegExp$1 as mr, slowCcOperationTimeoutMs as mt, DEFAULT_RESOURCE_WARN_AFTER_MS as n, IntrinsicResolutionRefusalError as ni, withRetry as nn, describeAwsFailure as nr, clearOnUpdateRemoval as nt, planFailedOps as o, NestedStackChildDirectDestroyError as oi, STATE_SOURCED_CROSS_GENERATION_RULES as on, describeDockerFailure as or, maskDeep as ot, maskingRetryLogger as p, StateError as pi, identityKeyFor as pn, runDockerStreaming as pr, CloudControlProvider as pt, collectPublishedOutputNames as q, assertAssetBucketRegion as qn, resetAwsClients as qr, s3BucketDualStackDomainName as qt, DeployEngine as r, LocalInvokeBuildError as ri, DagBuilder as rn, buildDockerImage as rr, ProviderRegistry as rt, planRollback as s, PartialFailureError as si, STATE_SOURCED_READBACK_RULES as sn, dockerSpawnEnvWithSensitive as sr, maskerOrIdentity as st, DEFAULT_RESOURCE_TIMEOUT_MS as t, DynamicReferenceRegionAmbiguousError as ti, describeTypeWithThrottleRetry as tn, buildDenyExternalAccessPolicy as tr, collectInlinePolicyNamesManagedBySiblings as tt, updatePartialMessage as u, ResourceUpdateNotSupportedError as ui, createSecretMasker as un, partitionSensitiveEnv as ur, interruptWatchListenerCount as ut, bindingSkippedOutputs as v, withErrorHandling as vi, recordMaskOnlyValue as vn, Synthesizer as vr, disableInstanceApiTermination as vt, isFinalSnapshotError as w, markRedactedCause as wi, rebuildClientForBucketRegion as wn, resolveCaptureObservedState as wr, getAccountInfo as wt, buildFinalSnapshotIdentifier as x, isThrottlingError as xi, scrubResourceRecord as xn, getLegacyStateBucketName as xr, carriesDynamicReference as xt, ATOMIC_FINAL_SNAPSHOT_TYPES as y, isMarkedNonRetryable as yi, recoverMaskedOutput as yn, synthesisStatusMessage as yr, isTerminationProtectionPropagationError as yt, formatResourceLine as z, stringifyValue as zn, canonicalizeRegion as zr, requireConfigArray as zt };
+//# sourceMappingURL=deploy-engine-BwZFYWGI.js.map