@go-to-k/cdkd 0.264.2 → 0.265.1

package/dist/{deploy-engine-CaquB01e.js → deploy-engine-BO9rVKnc.js}

@@ -11260,7 +11260,7 @@ var CloudControlProvider = class {
 		this.logger.debug(`Deleting resource ${logicalId} (${resourceType}), physical ID: ${physicalId}`);
 		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-Bxida3ei.js").then((n) => n.n);
+			const { ASGProvider } = await import("./asg-provider-DRASZ0qd.js").then((n) => n.n);
 			await new ASGProvider().delete(logicalId, physicalId, resourceType, _properties, context);
 			return;
 		}
@@ -17143,7 +17143,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.264.2";
+	return "0.265.1";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -17981,7 +17981,10 @@ var DeployEngine = class {
 			this.logger.debug(`Loaded current state: ${Object.keys(currentState.resources).length} resources`);
 			try {
 				const journal = await this.stateBackend.loadRollbackJournal(stackName, this.stackRegion);
-				if (journal && journal.segments.length > 0) this.logger.info(`A previous deploy of '${stackName}' failed or was interrupted. Run 'cdkd rollback ${stackName}' to revert it, or continue deploying to fix forward.`);
+				if (journal && journal.segments.length > 0) {
+					const failedOnly = journal.segments.every((s) => s.operations.length === 0) && journal.segments.some((s) => (s.failedOperations?.length ?? 0) > 0);
+					this.logger.info(failedOnly ? `A previous deploy of '${stackName}' failed and was automatically rolled back. The failed resource may be partially applied — run 'cdkd rollback ${stackName} --revert-failed' to revert it, or continue deploying to fix forward (a successful deploy clears this note).` : `A previous deploy of '${stackName}' failed or was interrupted. Run 'cdkd rollback ${stackName}' to revert it, or continue deploying to fix forward.`);
+				}
 			} catch {}
 			this.kickOffAutoRefreshObservedProperties(currentState.resources);
 			this.logger.debug(`Template has ${Object.keys(template.Resources || {}).length} resources`);
@@ -18052,6 +18055,7 @@ var DeployEngine = class {
 						this.logger.warn(`Failed to persist no-change state update: ${saveError instanceof Error ? saveError.message : String(saveError)} — drift baseline / outputs will be re-resolved on next deploy.`);
 					}
 				}
+				if (!this.options.dryRun) await this.deleteRollbackJournalBestEffort(stackName);
 				return {
 					stackName,
 					created: 0,
@@ -18317,7 +18321,7 @@ var DeployEngine = class {
 				};
 				await this.stateBackend.saveState(stackName, this.stackRegion, this.withParentInfo(postRollbackState), { ...currentEtag !== void 0 && { expectedEtag: currentEtag } });
 				this.logger.debug("State saved after deployment failure");
-				if (autoRollbackClean) await this.deleteRollbackJournalBestEffort(stackName);
+				if (autoRollbackClean) await this.settleJournalAfterCleanRollback(stackName, failedOperations, initialDeploy);
 			} catch (saveError) {
 				this.logger.debug(`Retrying state save after rollback (ETag mismatch): ${saveError instanceof Error ? saveError.message : String(saveError)}`);
 				try {
@@ -18334,7 +18338,7 @@ var DeployEngine = class {
 					};
 					await this.stateBackend.saveState(stackName, this.stackRegion, this.withParentInfo(postRollbackState), { ...freshEtag !== void 0 && { expectedEtag: freshEtag } });
 					this.logger.debug("State saved after deployment failure (retry succeeded)");
-					if (autoRollbackClean) await this.deleteRollbackJournalBestEffort(stackName);
+					if (autoRollbackClean) await this.settleJournalAfterCleanRollback(stackName, failedOperations, initialDeploy);
 				} catch (retryError) {
 					this.logger.warn(`Failed to save state after rollback: ${retryError instanceof Error ? retryError.message : String(retryError)}`);
 				}
@@ -18441,6 +18445,45 @@ var DeployEngine = class {
 			this.logger.debug(`Failed to delete rollback journal for ${stackName}: ${err instanceof Error ? err.message : String(err)}`);
 		}
 	}
+	/**
+	* Settle the rollback journal after a CLEAN automatic rollback (issue
+	* #1208). The completed ops are reverted, but the op that FAILED mid-deploy
+	* may have left its resource half-applied — and its journaled record is the
+	* ONLY input `cdkd rollback --revert-failed` has. So instead of deleting the
+	* journal outright (which made --revert-failed unusable in the DEFAULT
+	* deploy flow), pop this attempt's segment and re-record a failed-only one
+	* (`operations: []` + the failed ops). Older segments from prior
+	* un-reverted attempts are preserved by the pop. The next successful deploy
+	* still deletes the whole journal, bounding the lingering window. With no
+	* failed ops there is nothing left to revert from THIS attempt — but only
+	* this attempt's segment is popped, NOT the whole journal (issue #1215):
+	* the clean rollback reverted only this attempt's ops, so older segments'
+	* completed ops are still live in AWS/state and must keep their revert
+	* records; pop deletes the object itself when the last segment goes, so
+	* the common single-segment case still ends with no journal.
+	*
+	* Best-effort like every journal write: a pop failure warns and leaves the
+	* full segment in place (the pre-#1208 partial-rollback shape — replay is
+	* idempotent, so a later `cdkd rollback` is still safe).
+	*/
+	async settleJournalAfterCleanRollback(stackName, failedOperations, initialDeploy) {
+		if (failedOperations.length === 0) {
+			try {
+				await this.stateBackend.popRollbackJournalSegment(stackName, this.stackRegion);
+			} catch (err) {
+				this.logger.debug(`Failed to pop the rollback journal segment after the clean rollback: ${err instanceof Error ? err.message : String(err)}`);
+			}
+			return;
+		}
+		try {
+			await this.stateBackend.popRollbackJournalSegment(stackName, this.stackRegion);
+		} catch (err) {
+			this.logger.warn(`Failed to settle the rollback journal after the clean rollback: ${err instanceof Error ? err.message : String(err)}. The journal keeps the full segment; a later 'cdkd rollback' replay is idempotent.`);
+			return;
+		}
+		await this.writeRollbackJournalSegment(stackName, [], failedOperations, "auto-rollback-clean", initialDeploy);
+		this.logger.info(`The automatic rollback restored the pre-deploy state. The failed resource's pre-failure record was kept — if it was left partially applied, run 'cdkd rollback ${stackName} --revert-failed' to revert it.`);
+	}
 	/** Build the {@link RollbackExecutorContext} from the engine's fields. */
 	rollbackExecutorContext() {
 		return {
@@ -18706,7 +18749,15 @@ var DeployEngine = class {
 							}
 						}
 						this.logger.info(`  Creating new ${logicalId}...`);
-						createResult = await this.withRetry(() => replaceProvider.create(logicalId, resourceType, replaceProps), logicalId, void 0, void 0, replaceProvider);
+						createResult = await withRetry(() => this.withRetry(() => replaceProvider.create(logicalId, resourceType, replaceProps), logicalId, void 0, void 0, replaceProvider), logicalId, {
+							maxRetries: 8,
+							initialDelayMs: 2e3,
+							maxDelayMs: 1e4,
+							logger: this.logger,
+							isInterrupted: () => this.interrupted,
+							onInterrupted: () => new InterruptedError(this.interruptCause ?? "user"),
+							isRetryable: isRecreateRetryableError
+						});
 					} else {
 						this.logger.info(`  Creating new ${logicalId}...`);
 						let deletedOldFirst = false;
@@ -19080,4 +19131,4 @@ var DeployEngine = class {
 
 //#endregion
 export { createAssetRedirectResolver as $, ResourceTimeoutError as $t, CloudControlProvider as A, MIGRATE_TMP_PREFIX as At, assertRegionMatch as B, setAwsClients as Bt, green as C, resolveSkipPrefix as Ct, collectInlinePolicyNamesManagedBySiblings as D, warnDeprecatedNoPrefixCliFlag as Dt, IAMRoleProvider as E, resolveUseCdkBootstrapAssets as Et, cfnRefValueFromPhysicalId as F, clearBucketRegionCache as Ft, LockManager as G, LocalInvokeBuildError as Gt, DiffCalculator as H, CdkdError as Ht, refStateLookupFromResource as I, resolveBucketRegion as It, shouldRetainResource as J, LockError as Jt, S3StateBackend as K, LocalMigrateError as Kt, WAFv2WebACLProvider as L, AwsClients as Lt, disableInstanceApiTermination as M, uploadCfnTemplate as Mt, isTerminationProtectionPropagationError as N, expectedOwnerParam as Nt, ProviderRegistry as O, CFN_TEMPLATE_BODY_LIMIT as Ot, IntrinsicFunctionResolver as P, AssemblyReader as Pt, buildAssetRedirectMap as Q, ProvisioningError as Qt, normalizeAwsTagsToCfn as R, getAwsClients as Rt, gray as S, resolveCaptureObservedState as St, yellow as T, resolveStateBucketWithDefaultAndSource as Tt, DagBuilder as U, ConfigError as Ut, applyRoleArnIfSet as V, AssetError as Vt, TemplateParser as W, DependencyError as Wt, stringifyValue as X, NestedStackChildDirectDestroyError as Xt, AssetPublisher as Y, MissingCdkCliError as Yt, WorkGraph as Z, PartialFailureError as Zt, isStatefulRecreateTargetSync as _, synthesisStatusMessage as _t, DeploymentEventsStore as a, formatError as an, getBootstrapMarkerKey as at, bold as b, resolveApp as bt, replayFailedOperations as c, withErrorHandling as cn, validateContainerRepoName as ct, withRetry as d, getDockerCmd as dt, ResourceUpdateNotSupportedError as en, loadPublishableAssetManifest as et, isRetryableTransientError as f, runDockerForeground as ft, MULTI_REGION_RECREATE_BLOCKED_TYPES as g, Synthesizer as gt, extractDeploymentEventError as h, getDockerImageBySourceHash as ht, DeploymentEventsReader as i, SynthesisError as in, ensureAssetStorage as it, slowCcOperationTimeoutMs as j, findLargeInlineResources as jt, findActionableSilentDrops as k, CFN_TEMPLATE_URL_LIMIT as kt, replayRollback as l, __exportAll as ln, buildDockerImage as lt, computeImplicitDeleteEdges as m, AssetManifestLoader as mt, DEFAULT_RESOURCE_WARN_AFTER_MS as n, StackTerminationProtectionError as nn, AssetModeResolver as nt, planFailedOps as o, isCdkdError as on, parseBootstrapMarker as ot, IMPLICIT_DELETE_DEPENDENCIES as p, runDockerStreaming as pt, rebuildClientForBucketRegion as q, LocalStartServiceError as qt, DeployEngine as r, StateError as rn, BOOTSTRAP_MARKER_PREFIX as rt, planRollback as s, normalizeAwsError as sn, validateAssetBucketName as st, DEFAULT_RESOURCE_TIMEOUT_MS as t, StackHasActiveImportsError as tn, rewriteTemplateAssetReferences as tt, withResourceDeadline as u, formatDockerLoginError as ut, renderStatefulReason as v, getDefaultStateBucketName as vt, red as w, resolveStateBucketWithDefault as wt, cyan as x, resolveAutoAssetStorage as xt, formatResourceLine as y, getLegacyStateBucketName as yt, resolveExplicitPhysicalId as z, resetAwsClients as zt };
-//# sourceMappingURL=deploy-engine-CaquB01e.js.map
+//# sourceMappingURL=deploy-engine-BO9rVKnc.js.map