@go-to-k/cdkd 0.278.35 → 0.278.37

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as describeTypeWithThrottleRetry, $t as AwsClients, A as red, At as Synthesizer, B as isTerminationProtectionPropagationError, Bt as resolveUseCdkBootstrapAssets, C as isStatefulRecreateTargetSync, Ct as buildDockerImage, D as cyan, Dt as runDockerStreaming, E as bold, Et as runDockerForeground, F as ProviderRegistry, Ft as resolveAutoAssetStorage, G as normalizeAwsTagsToCfn, Gt as MIGRATE_TMP_PREFIX, H as cfnRefValueFromPhysicalId, Ht as warnDeprecatedNoPrefixCliFlag, I as findActionableSilentDrops, It as resolveCaptureObservedState, J as readConfigString, Jt as expectedOwnerParam, K as resolveExplicitPhysicalId, Kt as findLargeInlineResources, L as CloudControlProvider, Lt as resolveSkipPrefix, M as IAMRoleProvider, Mt as getDefaultStateBucketName, N as collectInlinePolicyNamesManagedBySiblings, Nt as getLegacyStateBucketName, O as gray, Ot as AssetManifestLoader, P as clearOnUpdateRemoval, Pt as resolveApp, Q as DiffCalculator, Qt as resolveBucketRegion, R as slowCcOperationTimeoutMs, Rt as resolveStateBucketWithDefault, S as MULTI_REGION_RECREATE_BLOCKED_TYPES, St as validateContainerRepoName, T as formatResourceLine, Tn as withErrorHandling, Tt as getDockerCmd, U as refStateLookupFromResource, Ut as CFN_TEMPLATE_BODY_LIMIT, V as IntrinsicFunctionResolver, Vt as stateBucketExistenceConfirmed, W as WAFv2WebACLProvider, Wt as CFN_TEMPLATE_URL_LIMIT, X as requireConfigString, Xt as processStackMessages, Y as requireConfigArray, Yt as AssemblyReader, Z as applyRoleArnIfSet, _ as createPreDeleteFinalSnapshot, _n as ResourceUpdateNotSupportedError, _t as BOOTSTRAP_MARKER_PREFIX, a as DeploymentEventsStore, at as LockManager, b as unsupportedFinalSnapshotError, bt as parseBootstrapMarker, c as replayFailedOperations, cn as LocalInvokeBuildError$1, ct as shouldRetainResource, d as IMPLICIT_DELETE_DEPENDENCIES, dt as WorkGraph, en as getAwsClients, et as withRetry, f as computeImplicitDeleteEdges, fn as MissingCdkCliError, ft as buildAssetRedirectMap, g as ccRoutedFinalSnapshotError, gn as ResourceTimeoutError, gt as AssetModeResolver, h as buildFinalSnapshotIdentifier, hn as ProvisioningError, ht as rewriteTemplateAssetReferences, i as DeploymentEventsReader, in as CdkdError, it as TemplateParser, j as yellow, jt as synthesisStatusMessage, k as green, kt as getDockerImageBySourceHash, l as replayRollback, ln as LocalMigrateError, lt as AssetPublisher, m as PRE_DELETE_SNAPSHOT_TYPES, mn as PartialFailureError, mt as loadPublishableAssetManifest, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nn as setAwsClients, nt as isThrottlingError, o as planFailedOps, ot as S3StateBackend, p as ATOMIC_FINAL_SNAPSHOT_TYPES, pn as NestedStackChildDirectDestroyError, pt as createAssetRedirectResolver, q as assertRegionMatch, qt as uploadCfnTemplate, r as DeployEngine, rt as DagBuilder, s as planRollback, sn as DeployCancelledError, st as rebuildClientForBucketRegion, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as resetAwsClients, tt as isRetryableTransientError, u as withResourceDeadline, un as LocalStartServiceError, ut as stringifyValue, v as isFinalSnapshotError, vn as StackHasActiveImportsError, vt as ensureAssetStorage, w as renderStatefulReason, wn as normalizeAwsError, wt as formatDockerLoginError, x as extractDeploymentEventError, xt as validateAssetBucketName, y as refusesFinalSnapshot, yn as StackTerminationProtectionError, yt as getBootstrapMarkerKey, z as disableInstanceApiTermination, zt as resolveStateBucketWithDefaultAndSource } from "./deploy-engine-CWZlo2Il.js";
+import { $ as describeTypeWithThrottleRetry, $t as AwsClients, A as red, At as Synthesizer, B as isTerminationProtectionPropagationError, Bt as resolveUseCdkBootstrapAssets, C as isStatefulRecreateTargetSync, Ct as buildDockerImage, D as cyan, Dt as runDockerStreaming, E as bold, Et as runDockerForeground, F as ProviderRegistry, Ft as resolveAutoAssetStorage, G as normalizeAwsTagsToCfn, Gt as MIGRATE_TMP_PREFIX, H as cfnRefValueFromPhysicalId, Ht as warnDeprecatedNoPrefixCliFlag, I as findActionableSilentDrops, It as resolveCaptureObservedState, J as readConfigString, Jt as expectedOwnerParam, K as resolveExplicitPhysicalId, Kt as findLargeInlineResources, L as CloudControlProvider, Lt as resolveSkipPrefix, M as IAMRoleProvider, Mt as getDefaultStateBucketName, N as collectInlinePolicyNamesManagedBySiblings, Nt as getLegacyStateBucketName, O as gray, Ot as AssetManifestLoader, P as clearOnUpdateRemoval, Pt as resolveApp, Q as DiffCalculator, Qt as resolveBucketRegion, R as slowCcOperationTimeoutMs, Rt as resolveStateBucketWithDefault, S as MULTI_REGION_RECREATE_BLOCKED_TYPES, St as validateContainerRepoName, T as formatResourceLine, Tn as withErrorHandling, Tt as getDockerCmd, U as refStateLookupFromResource, Ut as CFN_TEMPLATE_BODY_LIMIT, V as IntrinsicFunctionResolver, Vt as stateBucketExistenceConfirmed, W as WAFv2WebACLProvider, Wt as CFN_TEMPLATE_URL_LIMIT, X as requireConfigString, Xt as processStackMessages, Y as requireConfigArray, Yt as AssemblyReader, Z as applyRoleArnIfSet, _ as createPreDeleteFinalSnapshot, _n as ResourceUpdateNotSupportedError, _t as BOOTSTRAP_MARKER_PREFIX, a as DeploymentEventsStore, at as LockManager, b as unsupportedFinalSnapshotError, bt as parseBootstrapMarker, c as replayFailedOperations, cn as LocalInvokeBuildError$1, ct as shouldRetainResource, d as IMPLICIT_DELETE_DEPENDENCIES, dt as WorkGraph, en as getAwsClients, et as withRetry, f as computeImplicitDeleteEdges, fn as MissingCdkCliError, ft as buildAssetRedirectMap, g as ccRoutedFinalSnapshotError, gn as ResourceTimeoutError, gt as AssetModeResolver, h as buildFinalSnapshotIdentifier, hn as ProvisioningError, ht as rewriteTemplateAssetReferences, i as DeploymentEventsReader, in as CdkdError, it as TemplateParser, j as yellow, jt as synthesisStatusMessage, k as green, kt as getDockerImageBySourceHash, l as replayRollback, ln as LocalMigrateError, lt as AssetPublisher, m as PRE_DELETE_SNAPSHOT_TYPES, mn as PartialFailureError, mt as loadPublishableAssetManifest, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nn as setAwsClients, nt as isThrottlingError, o as planFailedOps, ot as S3StateBackend, p as ATOMIC_FINAL_SNAPSHOT_TYPES, pn as NestedStackChildDirectDestroyError, pt as createAssetRedirectResolver, q as assertRegionMatch, qt as uploadCfnTemplate, r as DeployEngine, rt as DagBuilder, s as planRollback, sn as DeployCancelledError, st as rebuildClientForBucketRegion, t as DEFAULT_RESOURCE_TIMEOUT_MS, tn as resetAwsClients, tt as isRetryableTransientError, u as withResourceDeadline, un as LocalStartServiceError, ut as stringifyValue, v as isFinalSnapshotError, vn as StackHasActiveImportsError, vt as ensureAssetStorage, w as renderStatefulReason, wn as normalizeAwsError, wt as formatDockerLoginError, x as extractDeploymentEventError, xt as validateAssetBucketName, y as refusesFinalSnapshot, yn as StackTerminationProtectionError, yt as getBootstrapMarkerKey, z as disableInstanceApiTermination, zt as resolveStateBucketWithDefaultAndSource } from "./deploy-engine-bEhHOGVR.js";
 import { a as getLiveRenderer, c as PATTERN_B_RESOURCE_TYPES, d as generateResourceNameWithFallback, f as withSkipPrefix, i as runStackBuffered, n as getLogger, o as PATTERN_B_NAME_OPTIONS, p as withStackName, s as PATTERN_B_NAME_PROPERTIES, u as generateResourceName } from "./logger-BYMEE-BS.js";
-import { t as ASGProvider } from "./asg-provider-8XxBHtzK.js";
+import { t as ASGProvider } from "./asg-provider-BTeSlton.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";
@@ -66,7 +66,8 @@ import { CodeCommitClient, CreateCommitCommand, CreateRepositoryCommand as Creat
 import AdmZip from "adm-zip";
 import { CreateLifecyclePolicyCommand, DLMClient, DeleteLifecyclePolicyCommand as DeleteLifecyclePolicyCommand$1, GetLifecyclePolicyCommand as GetLifecyclePolicyCommand$1, ResourceNotFoundException as ResourceNotFoundException$14, TagResourceCommand as TagResourceCommand$21, UntagResourceCommand as UntagResourceCommand$21, UpdateLifecyclePolicyCommand } from "@aws-sdk/client-dlm";
 import { CreateVectorBucketCommand, DeleteIndexCommand, DeleteVectorBucketCommand, GetVectorBucketCommand, ListIndexesCommand, ListTagsForResourceCommand as ListTagsForResourceCommand$17, S3VectorsClient, TagResourceCommand as TagResourceCommand$22, UntagResourceCommand as UntagResourceCommand$22 } from "@aws-sdk/client-s3vectors";
-import { CreateNamespaceCommand, CreateTableBucketCommand, CreateTableCommand as CreateTableCommand$2, DeleteNamespaceCommand as DeleteNamespaceCommand$1, DeleteTableBucketCommand, DeleteTableCommand as DeleteTableCommand$2, GetTableBucketCommand, GetTableCommand as GetTableCommand$1, ListNamespacesCommand as ListNamespacesCommand$1, ListTableBucketsCommand, ListTablesCommand, ListTagsForResourceCommand as ListTagsForResourceCommand$18, NotFoundException as NotFoundException$6, S3TablesClient, TagResourceCommand as TagResourceCommand$23, UntagResourceCommand as UntagResourceCommand$23 } from "@aws-sdk/client-s3tables";
+import { ListTagsForResourceCommand as ListTagsForResourceCommand$18, S3ControlClient, TagResourceCommand as TagResourceCommand$23, UntagResourceCommand as UntagResourceCommand$23 } from "@aws-sdk/client-s3-control";
+import { CreateNamespaceCommand, CreateTableBucketCommand, CreateTableCommand as CreateTableCommand$2, DeleteNamespaceCommand as DeleteNamespaceCommand$1, DeleteTableBucketCommand, DeleteTableCommand as DeleteTableCommand$2, GetTableBucketCommand, GetTableCommand as GetTableCommand$1, ListNamespacesCommand as ListNamespacesCommand$1, ListTableBucketsCommand, ListTablesCommand, ListTagsForResourceCommand as ListTagsForResourceCommand$19, NotFoundException as NotFoundException$6, S3TablesClient, TagResourceCommand as TagResourceCommand$24, UntagResourceCommand as UntagResourceCommand$24 } from "@aws-sdk/client-s3tables";
 import { Document, Pair, Scalar, YAMLMap, YAMLSeq, parse as parse$1, stringify } from "yaml";
 import { createLocalStartAgentCoreCommand, createLocalStartCloudFrontCommand, createLocalStateProvider, getEmbedConfig, isCfnFlagPresent, listTargets, rejectExplicitCfnStackWithMultipleStacks, resolveCfnFallbackRegion, setEmbedConfig, substituteAgainstState, substituteAgainstStateAsync, substituteEnvVarsFromState, substituteEnvVarsFromStateAsync } from "cdk-local";
 import { A2A_CONTAINER_PORT, A2A_PATH, AGENTCORE_A2A_PROTOCOL, AGENTCORE_AGUI_PROTOCOL, AGENTCORE_MCP_PROTOCOL, ConnectionRegistry, EcsTaskResolutionError, HOST_GATEWAY_MIN_VERSION, LocalInvokeBuildError, MCP_CONTAINER_PORT, MCP_PATH, a2aInvokeOnce, addAlbSpecificOptions, addCommonEcsServiceOptions, addStartServiceSpecificOptions, albStrategy, architectureToPlatform, attachAuthorizers, attachStageContext, availableApiIdentifiers, bufferToBody, buildAgentCoreCodeImage, buildCognitoJwksUrl, buildConnectEvent, buildContainerImage, buildCorsConfigByApiId, buildCorsConfigFromCloudFrontChain, buildDisconnectEvent, buildJwksUrlFromIssuer, buildMessageEvent, buildMgmtEndpointEnvUrl, buildStageMap, classifySourceChange, createAuthorizerCache, createFileWatcher, createFileWatcher as createFileWatcher$1, createJwksCache, createWatchPredicates, defaultCredentialsLoader, derivePseudoParametersFromRegion, discoverRoutes, discoverWebSocketApis, downloadAndExtractS3Bundle, filterRoutesByApiIdentifier, groupRoutesByServer, handleConnectionsRequest, invokeAgentCore, invokeAgentCoreWs, materializeLayerFromArn, mcpInvokeOnce, parseConnectionsPath, parseSelectionExpressionPath, pickAgentCoreCandidateStack, pickAgentCoreCandidateStack as pickAgentCoreCandidateStack$1, probeHostGatewaySupport, readMtlsMaterialsFromDisk, resolveAgentCoreTarget, resolveEnvVars, resolveHostGatewayExtraHosts, resolveRuntimeCodeMountPath, resolveRuntimeFileExtension, resolveRuntimeImage, resolveSingleTarget, resolveWatchConfig, runEcsServiceEmulator, signAgentCoreInvocation, startApiServer, substituteImagePlaceholders, tryResolveImageFnJoin, verifyJwtViaDiscovery, waitForAgentCorePing } from "cdk-local/internal";
@@ -12314,7 +12315,8 @@ var DynamoDBGlobalTableProvider = class {
 			AttributeDefinitions: attributeDefinitions,
 			BillingMode: billingMode
 		};
-		if (billingMode === "PROVISIONED") createParams.ProvisionedThroughput = derivePerCallProvisionedThroughput(properties, currentRegion);
+		const diagnostics = [];
+		if (billingMode === "PROVISIONED") createParams.ProvisionedThroughput = derivePerCallProvisionedThroughput(properties, currentRegion, "min", diagnostics);
 		const streamSpecInput = properties["StreamSpecification"];
 		const needsStream = replicas.some((r) => r["Region"] !== currentRegion) || replicas.length > 1;
 		if (streamSpecInput != null) {
@@ -12335,7 +12337,6 @@ var DynamoDBGlobalTableProvider = class {
 				StreamViewType: "NEW_AND_OLD_IMAGES"
 			};
 		}
-		const diagnostics = [];
 		let sdkIndexes;
 		try {
 			sdkIndexes = toSdkGlobalSecondaryIndexes(properties, currentRegion, billingMode, "min", diagnostics);
@@ -12551,7 +12552,10 @@ var DynamoDBGlobalTableProvider = class {
 			const onDemandCeilingLive = oldBilling === "PAY_PER_REQUEST" && newBilling === "PAY_PER_REQUEST";
 			const diagnostics = [];
 			const desiredCeilings = collectTableOnDemandCeilings(properties, currentRegion, diagnostics);
-			const desiredSdkIndexes = toSdkGlobalSecondaryIndexes(properties, currentRegion, newBilling, "min", diagnostics);
+			const flippingToProvisioned = oldBilling !== newBilling && newBilling === "PROVISIONED";
+			if (flippingToProvisioned) derivePerCallProvisionedThroughput(properties, currentRegion, "seed", diagnostics);
+			const desiredSdkIndexes = toSdkGlobalSecondaryIndexes(properties, currentRegion, newBilling, "min", flippingToProvisioned ? void 0 : diagnostics);
+			if (flippingToProvisioned) toSdkGlobalSecondaryIndexes(properties, currentRegion, newBilling, "seed", diagnostics);
 			for (const replica of properties["Replicas"] ?? []) {
 				const replicaRegion = asRecord$1(replica)?.["Region"];
 				if (typeof replicaRegion !== "string" || replicaRegion === currentRegion) continue;
@@ -13231,9 +13235,11 @@ var DynamoDBGlobalTableProvider = class {
 			const cause = regionErr instanceof Error ? regionErr : void 0;
 			throw new ProvisioningError(`Could not resolve client region for DynamoDB GlobalTable ${logicalId} delete — would risk dropping the local replica`, resourceType, logicalId, physicalId, cause);
 		}
+		let preDeleteIndexes;
 		try {
 			const describe = await this.dynamoDBClient.send(new DescribeTableCommand({ TableName: physicalId }));
 			const replicas = describe.Table?.Replicas ?? [];
+			preDeleteIndexes = describe.Table?.GlobalSecondaryIndexes;
 			const tableIndexNames = (describe.Table?.GlobalSecondaryIndexes ?? []).map((gsi) => gsi.IndexName).filter((name) => typeof name === "string");
 			for (const replica of replicas) {
 				const region = replica.RegionName;
@@ -13264,6 +13270,10 @@ var DynamoDBGlobalTableProvider = class {
 			}
 		}
 		try {
+			if (hasTransitionalIndex(preDeleteIndexes)) {
+				this.logger.debug(`Waiting for indexes on ${physicalId} to settle before DeleteTable (issue #1521)`);
+				await this.waitForIndexesActive(physicalId, logicalId);
+			}
 			await this.dynamoDBClient.send(new DeleteTableCommand({ TableName: physicalId }));
 			await this.waitForTableGone(physicalId, logicalId);
 			this.logger.debug(`Successfully deleted DynamoDB GlobalTable ${logicalId}`);
@@ -13678,34 +13688,78 @@ var DynamoDBGlobalTableProvider = class {
 	* `waitForTableActive`, this tolerates any non-terminal status — the
 	* table may already be ACTIVE on the no-op path (already-disabled
 	* protection) or transition through UPDATING.
+	*
+	* **A table is ACTIVE while one of its INDEXES is still transitioning**, and
+	* the next `UpdateTable` in the serialized sequence is then rejected with
+	* `Attempt to change a resource which is still in use: Index is being
+	* updated` (issue #1521). That is not hypothetical: it broke the
+	* `PAY_PER_REQUEST -> PROVISIONED` flip that also drops a GSI — AWS applies
+	* the flip to every index, and cdkd issued the index DELETE while the index
+	* was still absorbing it. Reproduced on pristine `main`, three runs out of
+	* four on 2026-08-10, and the failed deploy's own `cdkd destroy` then
+	* ORPHANED the table for the same reason.
+	*
+	* So the wait has TWO conditions read off the SAME response (an extra
+	* `DescribeTable` per wait would double this path's API traffic for
+	* something the response already carries) — but they keep DIFFERENT failure
+	* semantics, and conflating them is a real regression rather than a
+	* simplification. A table that never reaches ACTIVE is a hard error: nothing
+	* can proceed. A still-transitioning INDEX is best-effort: `IndexStatus`
+	* stays `CREATING` for the whole BACKFILL of a newly added GSI, which on a
+	* populated table routinely outlives any cap — so throwing there would fail
+	* a deploy whose resources are all correct, and would do it on an unrelated
+	* tag-only edit that merely ran while an earlier index was still building.
+	* Past the cap the index half warns and proceeds, leaving AWS's own
+	* rejection as the backstop, which is the behavior it had before #1521 for
+	* every case except the one the wait exists to fix.
 	*/
 	async waitForTableActiveAfterUpdate(tableName, logicalId, maxAttempts = 600) {
+		let tableReachedActive = false;
 		for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-			if ((await this.dynamoDBClient.send(new DescribeTableCommand({ TableName: tableName }))).Table?.TableStatus === "ACTIVE") return;
+			const response = await this.dynamoDBClient.send(new DescribeTableCommand({ TableName: tableName }));
+			if (response.Table?.TableStatus === "ACTIVE") {
+				tableReachedActive = true;
+				if (!hasTransitionalIndex(response.Table?.GlobalSecondaryIndexes)) return;
+			}
 			await new Promise((resolve) => setTimeout(resolve, 1e3));
 		}
+		if (tableReachedActive) {
+			this.logger.warn(`Indexes on ${tableName} (${logicalId}) were still transitioning after ${maxAttempts}s — a large index backfill can outlive this wait. Proceeding; AWS rejects the next call if it is still too early.`);
+			return;
+		}
 		throw new ProvisioningError(`Table ${tableName} did not reach ACTIVE within ${maxAttempts}s after UpdateTable`, "AWS::DynamoDB::GlobalTable", logicalId, tableName);
 	}
 	/**
 	* Wait until every GSI reports `IndexStatus: ACTIVE` (Issue #1419).
 	*
-	* `waitForTableActiveAfterUpdate` only checks `TableStatus`, and a GSI
-	* added by `UpdateTable` leaves the TABLE ACTIVE while the index itself
-	* is still `CREATING` — application-autoscaling rejects a target whose
-	* resource is not ready, so registering right after the GSI-add loop
+	* A GSI added by `UpdateTable` leaves the TABLE ACTIVE while the index
+	* itself is still `CREATING` — application-autoscaling rejects a target
+	* whose resource is not ready, so registering right after the GSI-add loop
 	* would skip the very index the deploy just introduced.
 	*
+	* Since issue #1521 the same distinction is enforced INSIDE
+	* {@link waitForTableActiveAfterUpdate} (which now reads both conditions off
+	* its own response), so this helper is no longer the only place that knows
+	* it. It remains the explicit wait for the two callers that have no
+	* table-status wait to piggyback on: the autoscaling registration above and
+	* the pre-`DeleteTable` gate, which AWS rejects while an index is
+	* transitioning. An index that is `DELETING` still reports, so the shared
+	* {@link hasTransitionalIndex} predicate covers `CREATING` / `UPDATING` /
+	* `DELETING` alike.
+	*
 	* **Best-effort by design**: on timeout it warns and returns rather than
 	* throwing. A missed registration self-heals on the next deploy (the
 	* reconcile re-asserts anything not already present), whereas throwing
 	* here would fail a deploy whose actual resources are all correct. Index
 	* backfill on a large table can take a long time, hence the 15-minute cap.
+	* The caller that follows it with a mutating call keeps AWS's own error as
+	* the backstop for the case where even that cap is not enough.
 	*/
 	async waitForIndexesActive(tableName, logicalId) {
 		const maxAttempts = 900;
 		for (let attempt = 1; attempt <= maxAttempts; attempt++) {
 			try {
-				if (((await this.dynamoDBClient.send(new DescribeTableCommand({ TableName: tableName }))).Table?.GlobalSecondaryIndexes ?? []).every((gsi) => gsi.IndexStatus === "ACTIVE")) return;
+				if (!hasTransitionalIndex((await this.dynamoDBClient.send(new DescribeTableCommand({ TableName: tableName }))).Table?.GlobalSecondaryIndexes ?? [])) return;
 			} catch (err) {
 				this.logger.debug(`DescribeTable while waiting for indexes on ${tableName}: ${err instanceof Error ? err.message : String(err)}`);
 				return;
@@ -13809,10 +13863,17 @@ function extractLocalDeletionProtection(props, region) {
 *    literal `ReadCapacityUnits`, which is taken before its auto-scaling
 *    members; 5 if absent.
 */
-function derivePerCallProvisionedThroughput(properties, region, source = "min") {
+function derivePerCallProvisionedThroughput(properties, region, source = "min", diagnostics) {
+	const rawReplicas = properties["Replicas"];
+	const rawRead = (Array.isArray(rawReplicas) ? rawReplicas : []).find((r) => asRecord$1(r)?.["Region"] === region)?.["ReadProvisionedThroughputSettings"];
+	const rawWrite = properties["WriteProvisionedThroughputSettings"];
+	const read = deriveReadCapacityUnits(asRecord$1(rawRead), source);
+	const write = deriveWriteCapacityUnits(asRecord$1(rawWrite), source);
+	if (read === void 0) reportUnresolvedProvisionedCapacity(rawRead, "Read", source, { appliedUnits: DEFAULT_CAPACITY_UNITS }, diagnostics, { blockName: "Replicas[local].ReadProvisionedThroughputSettings" });
+	if (write === void 0) reportUnresolvedProvisionedCapacity(rawWrite, "Write", source, { appliedUnits: DEFAULT_CAPACITY_UNITS }, diagnostics, { blockName: "WriteProvisionedThroughputSettings" });
 	return {
-		ReadCapacityUnits: deriveReadCapacityUnits(asRecord$1((properties["Replicas"] ?? []).find((r) => r["Region"] === region)?.["ReadProvisionedThroughputSettings"]), source) ?? DEFAULT_CAPACITY_UNITS,
-		WriteCapacityUnits: deriveWriteCapacityUnits(asRecord$1(properties["WriteProvisionedThroughputSettings"]), source) ?? DEFAULT_CAPACITY_UNITS
+		ReadCapacityUnits: read ?? DEFAULT_CAPACITY_UNITS,
+		WriteCapacityUnits: write ?? DEFAULT_CAPACITY_UNITS
 	};
 }
 /**
@@ -13967,6 +14028,26 @@ function asRecord$1(value) {
 * read-back comparison must therefore expect ABSENCE, not this value.
 */
 const ON_DEMAND_LIMIT_RESET = -1;
+/**
+* The GSI states during which AWS refuses another `UpdateTable` or a
+* `DeleteTable` on the table (issue #1521) — a table is ACTIVE while one of
+* its indexes is still transitioning, which is what made the serialized
+* update sequence race and what left a table ORPHANED when the follow-up
+* destroy hit the same rule.
+*
+* `DELETING` is included because a dropped index keeps reporting until it is
+* actually gone. The test is on the TRANSITIONAL values rather than on
+* `!== 'ACTIVE'`: an absent or unrecognized status must not park the caller
+* for its whole cap on a table that is fine.
+*/
+const INDEX_TRANSITIONAL_STATUSES = /* @__PURE__ */ new Set([
+	"CREATING",
+	"UPDATING",
+	"DELETING"
+]);
+function hasTransitionalIndex(indexes) {
+	return (indexes ?? []).some((gsi) => INDEX_TRANSITIONAL_STATUSES.has(gsi.IndexStatus ?? ""));
+}
 /** Coerce a CFn numeric (CFn is stringly-typed) to a finite number. */
 function toFiniteNumber(value) {
 	if (value === void 0 || value === null || value === "") return void 0;
@@ -14057,6 +14138,94 @@ function reportUnresolvedRawMember(rawValue, diagnostics, context) {
 	});
 }
 /**
+* Which member of a `*ProvisionedThroughputSettings` block to blame when the
+* derivation came back `undefined` (issue #1511).
+*
+* The derivation reports only "no number", so the member is re-derived here in
+* the SAME order {@link deriveWriteCapacityUnits} / {@link deriveReadCapacityUnits}
+* / {@link pickAutoScalingCapacity} consult members — the literal first, then
+* the auto-scaling block's `source`-selected member. Reaching this function at
+* all means every one of them failed, so the first DECLARED one is the value
+* the user was trying to set.
+*
+* `relPath` is relative to the block, `''` meaning the block ITSELF is the
+* unusable value (a string / array / bare unresolved intrinsic, or an object
+* carrying no capacity member at all).
+*
+* Returns `undefined` for an ABSENT block: defaulting there is the documented
+* pre-existing behavior for a template that never asked for a capacity, and
+* warning about it would shout on every deploy of a table that is fine.
+*/
+function blameUnresolvedProvisionedMember(rawSettings, side, source) {
+	if (rawSettings === void 0) return void 0;
+	const settings = asRecord$1(rawSettings);
+	if (!settings || isUnresolvedIntrinsicBlock(settings)) return {
+		relPath: "",
+		value: rawSettings
+	};
+	const literal = settings[`${side}CapacityUnits`];
+	if (literal !== void 0) return {
+		relPath: `${side}CapacityUnits`,
+		value: literal
+	};
+	const autoKey = `${side}CapacityAutoScalingSettings`;
+	const rawAutoScaling = settings[autoKey];
+	if (rawAutoScaling === void 0) return {
+		relPath: "",
+		value: rawSettings
+	};
+	const autoScaling = asRecord$1(rawAutoScaling);
+	if (!autoScaling || isUnresolvedIntrinsicBlock(autoScaling)) return {
+		relPath: autoKey,
+		value: rawAutoScaling
+	};
+	const order = source === "seed" ? ["SeedCapacity", "MinCapacity"] : ["MinCapacity", "SeedCapacity"];
+	for (const member of order) {
+		const value = autoScaling[member];
+		if (value !== void 0) return {
+			relPath: `${autoKey}.${member}`,
+			value
+		};
+	}
+	return {
+		relPath: autoKey,
+		value: rawAutoScaling
+	};
+}
+/**
+* Report a DECLARED provisioned capacity the template could not resolve — the
+* PROVISIONED twin of {@link reportUnresolvedRawMember} (issue #1511).
+*
+* The two sides need different wording because they have different outcomes,
+* which is exactly why #1503 deferred this half. An unreadable ON-DEMAND
+* ceiling is SUPPRESSED (nothing is sent, the live ceiling stands), so its
+* diagnostic says "nothing was sent". A provisioned table cannot suppress —
+* AWS requires `ProvisionedThroughput` on the table and on every GSI of it —
+* so the derivation falls through to {@link DEFAULT_CAPACITY_UNITS} and a
+* table the template explicitly sized is deployed at 5/5. That is a throttling
+* symptom days later rather than an error, which is what makes naming it here
+* worth a warning at all. The one provisioned site that CAN suppress is a
+* replica's `ProvisionedThroughputOverride` (absent = inherit the source
+* table), hence the `suppressed` outcome arm.
+*
+* Caller decides WHEN: only when the derivation returned `undefined` AND no
+* explicit SDK-shaped member is standing in for it, so the warning always
+* describes what actually reached AWS.
+*/
+function reportUnresolvedProvisionedCapacity(rawSettings, side, source, outcome, diagnostics, context) {
+	if (!diagnostics) return;
+	const blame = blameUnresolvedProvisionedMember(rawSettings, side, source);
+	if (!blame) return;
+	const path = blame.relPath ? `${context.blockName}.${blame.relPath}` : context.blockName;
+	const consequence = "appliedUnits" in outcome ? `so cdkd sent ${outcome.appliedUnits} capacity units instead (its default — AWS requires a concrete provisioned capacity here, so there was nothing to suppress)` : outcome.suppressed;
+	diagnostics.push({
+		kind: "unresolved-member",
+		...context.indexName !== void 0 && { indexName: context.indexName },
+		member: blame.relPath ? blame.relPath.slice(blame.relPath.lastIndexOf(".") + 1) : context.blockName.slice(context.blockName.lastIndexOf(".") + 1),
+		message: `${path} is declared but did not resolve to a number (${JSON.stringify(blame.value)?.slice(0, 80)}), ${consequence}. This is usually an unresolved intrinsic; resolve it to a literal to apply the capacity you declared.`
+	});
+}
+/**
 * Derive a single WRITE capacity number from a CFn
 * `WriteProvisionedThroughputSettings` block.
 *
@@ -14187,14 +14356,32 @@ function toSdkGlobalSecondaryIndexes(properties, region, billingMode, source = "
 			member: "OnDemandThroughput",
 			message: "an explicit OnDemandThroughput block was dropped because the table's BillingMode is PROVISIONED; AWS rejects on-demand ceilings on a provisioned table. Remove the block, or set BillingMode: PAY_PER_REQUEST."
 		});
-		if (billingMode === "PROVISIONED") sdk.ProvisionedThroughput = mergeExplicitThroughputBlock(explicitProvisioned, {
-			ReadCapacityUnits: deriveReadCapacityUnits(asRecord$1(localEntry?.["ReadProvisionedThroughputSettings"]), source) ?? deriveReadCapacityUnits(asRecord$1(gsi["ReadProvisionedThroughputSettings"]), source) ?? DEFAULT_CAPACITY_UNITS,
-			WriteCapacityUnits: deriveWriteCapacityUnits(asRecord$1(gsi["WriteProvisionedThroughputSettings"]), source) ?? DEFAULT_CAPACITY_UNITS
-		}, ["ReadCapacityUnits", "WriteCapacityUnits"], diagnostics, {
-			...typeof indexName === "string" && { indexName },
-			blockName: "ProvisionedThroughput"
-		});
-		else {
+		if (billingMode === "PROVISIONED") {
+			const rawLocalRead = localEntry?.["ReadProvisionedThroughputSettings"];
+			const rawGsiRead = gsi["ReadProvisionedThroughputSettings"];
+			const rawWrite = gsi["WriteProvisionedThroughputSettings"];
+			const derivedRead = deriveReadCapacityUnits(asRecord$1(rawLocalRead), source) ?? deriveReadCapacityUnits(asRecord$1(rawGsiRead), source);
+			const derivedWrite = deriveWriteCapacityUnits(asRecord$1(rawWrite), source);
+			const explicitCovers = (member) => explicitProvisioned !== void 0 && toFiniteNumber(explicitProvisioned[member]) !== void 0;
+			if (derivedRead === void 0 && !explicitCovers("ReadCapacityUnits")) {
+				const fromReplica = rawLocalRead !== void 0;
+				reportUnresolvedProvisionedCapacity(fromReplica ? rawLocalRead : rawGsiRead, "Read", source, { appliedUnits: DEFAULT_CAPACITY_UNITS }, diagnostics, {
+					...typeof indexName === "string" && { indexName },
+					blockName: fromReplica ? "Replicas[local].GlobalSecondaryIndexes[].ReadProvisionedThroughputSettings" : "ReadProvisionedThroughputSettings"
+				});
+			}
+			if (derivedWrite === void 0 && !explicitCovers("WriteCapacityUnits")) reportUnresolvedProvisionedCapacity(rawWrite, "Write", source, { appliedUnits: DEFAULT_CAPACITY_UNITS }, diagnostics, {
+				...typeof indexName === "string" && { indexName },
+				blockName: "WriteProvisionedThroughputSettings"
+			});
+			sdk.ProvisionedThroughput = mergeExplicitThroughputBlock(explicitProvisioned, {
+				ReadCapacityUnits: derivedRead ?? DEFAULT_CAPACITY_UNITS,
+				WriteCapacityUnits: derivedWrite ?? DEFAULT_CAPACITY_UNITS
+			}, ["ReadCapacityUnits", "WriteCapacityUnits"], diagnostics, {
+				...typeof indexName === "string" && { indexName },
+				blockName: "ProvisionedThroughput"
+			});
+		} else {
 			const rawWrite = asRecord$1(gsi["WriteOnDemandThroughputSettings"])?.["MaxWriteRequestUnits"];
 			const rawReadLocal = asRecord$1(localEntry?.["ReadOnDemandThroughputSettings"])?.["MaxReadRequestUnits"];
 			const rawReadGsi = asRecord$1(gsi["ReadOnDemandThroughputSettings"])?.["MaxReadRequestUnits"];
@@ -14363,7 +14550,12 @@ function toSdkReplicaThroughputOverrides(cfn, billingMode, diagnostics, context)
 		message: "an explicit OnDemandThroughputOverride was dropped because the table's BillingMode is PROVISIONED; AWS rejects on-demand ceilings on a provisioned table."
 	});
 	if (billingMode === "PROVISIONED") {
-		const readCapacity = deriveReadCapacityUnits(asRecord$1(cfn["ReadProvisionedThroughputSettings"]));
+		const rawRead = cfn["ReadProvisionedThroughputSettings"];
+		const readCapacity = deriveReadCapacityUnits(asRecord$1(rawRead));
+		if (readCapacity === void 0 && toFiniteNumber(explicitProvisioned?.["ReadCapacityUnits"]) === void 0) reportUnresolvedProvisionedCapacity(rawRead, "Read", "min", { suppressed: "so no ProvisionedThroughputOverride was sent and the replica keeps the source table's read capacity" }, diagnostics, {
+			...context,
+			blockName: "ReadProvisionedThroughputSettings"
+		});
 		const merged = mergeExplicitThroughputBlock(explicitProvisioned, readCapacity !== void 0 ? { ReadCapacityUnits: readCapacity } : void 0, ["ReadCapacityUnits"], diagnostics, {
 			...context,
 			blockName: "ProvisionedThroughputOverride"
@@ -43910,9 +44102,11 @@ var S3DirectoryBucketProvider = class {
 	handledProperties = /* @__PURE__ */ new Map([["AWS::S3Express::DirectoryBucket", /* @__PURE__ */ new Set([
 		"DataRedundancy",
 		"LocationName",
-		"BucketName"
+		"BucketName",
+		"Tags"
 	])]]);
 	ec2Client;
+	s3ControlClient;
 	providerRegion = process.env["AWS_REGION"];
 	constructor() {
 		const awsClients = getAwsClients();
@@ -43924,6 +44118,17 @@ var S3DirectoryBucketProvider = class {
 		return this.ec2Client;
 	}
 	/**
+	* Directory-bucket tags live on the S3 control plane: `PutBucketTagging`
+	* is documented "not supported for directory buckets", and the tag CRUD
+	* after create is S3 Control's `TagResource` / `UntagResource` /
+	* `ListTagsForResource` (requiring the `s3express:TagResource` /
+	* `s3express:UntagResource` / `s3express:ListTagsForResource` permissions).
+	*/
+	getS3ControlClient() {
+		if (!this.s3ControlClient) this.s3ControlClient = new S3ControlClient(this.providerRegion ? { region: this.providerRegion } : {});
+		return this.s3ControlClient;
+	}
+	/**
 	* Convert AZ name (us-east-1a) to AZ ID (use1-az1) via EC2 DescribeAvailabilityZones
 	*/
 	async getAzId(azName) {
@@ -43954,7 +44159,16 @@ var S3DirectoryBucketProvider = class {
 	* Build attributes for a directory bucket
 	*/
 	async buildAttributes(bucketName) {
-		return { Arn: `arn:aws:s3express:${await this.getRegion()}:${await this.getAccountId()}:bucket/${bucketName}` };
+		return { Arn: await this.buildBucketArn(bucketName) };
+	}
+	/**
+	* Directory bucket ARN: `arn:aws:s3express:{region}:{account}:bucket/{name}`.
+	* Also the `ResourceArn` for the S3 Control tag operations. Callers that
+	* already resolved the account (for the S3 Control `AccountId` parameter)
+	* pass it in so the STS lookup runs once per operation.
+	*/
+	async buildBucketArn(bucketName, accountId) {
+		return `arn:aws:s3express:${await this.getRegion()}:${accountId ?? await this.getAccountId()}:bucket/${bucketName}`;
 	}
 	/**
 	* Create an S3 Express Directory Bucket
@@ -43969,6 +44183,8 @@ var S3DirectoryBucketProvider = class {
 			maxLength: 64,
 			lowercase: true
 		})}--${azId}--x-s3`;
+		const tags = properties["Tags"];
+		const includeTags = tags != null && !(Array.isArray(tags) && tags.length === 0);
 		try {
 			await this.s3Client.send(new CreateBucketCommand({
 				Bucket: bucketName,
@@ -43980,7 +44196,8 @@ var S3DirectoryBucketProvider = class {
 					Location: {
 						Name: azId,
 						Type: "AvailabilityZone"
-					}
+					},
+					...includeTags ? { Tags: tags } : {}
 				}
 			}));
 			this.logger.debug(`Created S3 Express Directory Bucket: ${bucketName}`);
@@ -43997,28 +44214,60 @@ var S3DirectoryBucketProvider = class {
 	/**
 	* Update an S3 Express Directory Bucket
 	*
-	* Most properties are immutable, so this is a no-op.
+	* `BucketName` / `DataRedundancy` / `LocationName` are create-only (the
+	* registry-schema fallback classifies changes to them as replacement), so
+	* the only in-place mutable property is `Tags` — applied via S3 Control's
+	* `TagResource` / `UntagResource` (the directory-bucket tag CRUD; the
+	* bucket-level `PutBucketTagging` is not supported for directory buckets).
+	* `TagResource` is additive-only, so a tag dropped from the template
+	* (partial removal) — or the entire `Tags` property removed (full removal,
+	* `newTags === undefined`) — would survive on AWS unless the removed keys
+	* are explicitly `UntagResource`d.
 	*/
-	update(logicalId, physicalId, _resourceType, _properties, _previousProperties) {
-		this.logger.debug(`Update for S3 Express Directory Bucket ${logicalId} is a no-op (immutable properties)`);
-		return Promise.resolve({
-			physicalId,
-			wasReplaced: false
-		});
+	async update(logicalId, physicalId, resourceType, properties, previousProperties) {
+		try {
+			const newTags = properties["Tags"];
+			const oldTags = previousProperties["Tags"];
+			const malformedNewTags = newTags != null && !Array.isArray(newTags);
+			const newKeys = new Set((Array.isArray(newTags) ? newTags : []).map((t) => t.Key).filter((k) => !!k));
+			const removedKeys = malformedNewTags ? [] : (Array.isArray(oldTags) ? oldTags : []).map((t) => t.Key).filter((k) => !!k && !newKeys.has(k));
+			const tagsToApply = malformedNewTags || Array.isArray(newTags) && newTags.length > 0 ? newTags : void 0;
+			if (JSON.stringify(newTags) !== JSON.stringify(oldTags) && (removedKeys.length > 0 || tagsToApply !== void 0)) {
+				const accountId = await this.getAccountId();
+				const resourceArn = await this.buildBucketArn(physicalId, accountId);
+				if (removedKeys.length > 0) await this.getS3ControlClient().send(new UntagResourceCommand$23({
+					AccountId: accountId,
+					ResourceArn: resourceArn,
+					TagKeys: removedKeys
+				}));
+				if (tagsToApply) await this.getS3ControlClient().send(new TagResourceCommand$23({
+					AccountId: accountId,
+					ResourceArn: resourceArn,
+					Tags: tagsToApply
+				}));
+				this.logger.debug(`Updated tags for S3 Express Directory Bucket ${physicalId}`);
+			} else this.logger.debug(`Update for S3 Express Directory Bucket ${logicalId} is a no-op (no tag changes; other properties are immutable)`);
+			return {
+				physicalId,
+				wasReplaced: false
+			};
+		} catch (error) {
+			const cause = error instanceof Error ? error : void 0;
+			throw new ProvisioningError(`Failed to update S3 Express Directory Bucket ${logicalId}: ${error instanceof Error ? error.message : String(error)}`, resourceType, logicalId, physicalId, cause);
+		}
 	}
 	/**
 	* Delete an S3 Express Directory Bucket
 	*
 	* CloudFormation-parity data guard (issue #1344, sibling of #1340): a
 	* non-empty directory bucket is only auto-emptied when the user opted in —
-	* the `aws-cdk:auto-delete-objects` tag on the bucket (settable only via
-	* `--allow-unsupported-properties` today, since `Tags` is not yet a
-	* handled property for this type) or the deploy engine's
-	* `--force-stateful-recreation` consent on a replacement delete
-	* (`DeleteContext.forceDataDelete`). Otherwise the not-empty error
-	* surfaces exactly like CloudFormation's DELETE_FAILED (live-A/B-verified
-	* 2026-08-03: CFn fails a non-empty DirectoryBucket delete with "The
-	* bucket you tried to delete is not empty", 409).
+	* the `aws-cdk:auto-delete-objects` tag on the bucket (a first-class
+	* template `Tags` entry now that `Tags` is a handled property, issue #609)
+	* or the deploy engine's `--force-stateful-recreation` consent on a
+	* replacement delete (`DeleteContext.forceDataDelete`). Otherwise the
+	* not-empty error surfaces exactly like CloudFormation's DELETE_FAILED
+	* (live-A/B-verified 2026-08-03: CFn fails a non-empty DirectoryBucket
+	* delete with "The bucket you tried to delete is not empty", 409).
 	*
 	* Directory buckets do not support versioning, so the opted-in auto-empty
 	* only needs to delete current objects.
@@ -44027,15 +44276,8 @@ var S3DirectoryBucketProvider = class {
 		this.logger.debug(`Deleting S3 Express Directory Bucket ${logicalId}: ${physicalId}`);
 		const allowAutoEmpty = context?.forceDataDelete === true || hasCdkAutoDeleteTag(properties, "aws-cdk:auto-delete-objects");
 		try {
-			if (allowAutoEmpty) {
-				this.logger.info(`Emptying directory bucket ${physicalId} before deletion (auto-delete opt-in present)`);
-				await this.emptyBucket(physicalId);
-			}
-			await this.s3Client.send(new DeleteBucketCommand({ Bucket: physicalId }));
-			this.logger.debug(`Successfully deleted S3 Express Directory Bucket ${logicalId}`);
+			await this.deleteBucketWithEmptyRetry(logicalId, physicalId, allowAutoEmpty);
 		} catch (error) {
-			const notEmptyMsg = error instanceof Error ? error.message : String(error);
-			if (!allowAutoEmpty && (notEmptyMsg.includes("not empty") || notEmptyMsg.includes("BucketNotEmpty"))) throw new ProvisioningError(`Failed to delete S3 Express Directory Bucket ${logicalId}: bucket ${physicalId} is not empty. Matching CloudFormation, cdkd does not delete a non-empty directory bucket without an explicit opt-in. Delete all objects first (e.g. aws s3 rm s3://${physicalId} --recursive) and destroy again.`, resourceType, logicalId, physicalId, error instanceof Error ? error : void 0);
 			if (error instanceof Error && (error.name === "NoSuchBucket" || error.name === "BucketNotFound")) {
 				assertRegionMatch(await this.s3Client.config.region(), context?.expectedRegion, resourceType, logicalId, physicalId);
 				this.logger.debug(`Bucket ${physicalId} does not exist, skipping deletion`);
@@ -44046,6 +44288,35 @@ var S3DirectoryBucketProvider = class {
 		}
 	}
 	/**
+	* Delete the bucket, absorbing the write race on an opted-in auto-empty:
+	* an object written between the empty pass and the delete makes AWS reject
+	* the delete as not-empty, so re-empty and retry (bounded) — the same
+	* bounded loop as the standard-bucket sibling, ported per issue #609's
+	* "Tags becomes a handled property" note (the tag opt-in is mainstream
+	* now, so the ~zero-opt-in rationale for skipping the loop in PR #1347 no
+	* longer holds). Without the opt-in, the first not-empty error surfaces
+	* as the CloudFormation-parity guard (issue #1344).
+	*/
+	async deleteBucketWithEmptyRetry(logicalId, bucketName, allowAutoEmpty) {
+		const maxAttempts = 3;
+		for (let attempt = 1; attempt <= maxAttempts; attempt++) try {
+			await this.s3Client.send(new DeleteBucketCommand({ Bucket: bucketName }));
+			this.logger.debug(`Successfully deleted S3 Express Directory Bucket ${logicalId}`);
+			return;
+		} catch (error) {
+			const msg = error instanceof Error ? error.message : String(error);
+			if (msg.includes("not empty") || msg.includes("BucketNotEmpty")) {
+				if (!allowAutoEmpty) throw new Error(`bucket ${bucketName} is not empty. Matching CloudFormation, cdkd does not delete a non-empty directory bucket without an explicit opt-in. Delete all objects first (e.g. aws s3 rm s3://${bucketName} --recursive) and destroy again.`);
+				this.logger.info(`Directory bucket ${bucketName} not empty (attempt ${attempt}/${maxAttempts}), emptying (auto-delete opt-in present)...`);
+				await this.emptyBucket(bucketName);
+				continue;
+			}
+			throw error;
+		}
+		await this.s3Client.send(new DeleteBucketCommand({ Bucket: bucketName }));
+		this.logger.debug(`Successfully deleted S3 Express Directory Bucket ${logicalId}`);
+	}
+	/**
 	* Empty all objects from a directory bucket.
 	* Lists and deletes objects in batches of 1000.
 	*/
@@ -44076,10 +44347,11 @@ var S3DirectoryBucketProvider = class {
 	* CFn-property shape.
 	*
 	* Issues `HeadBucket` to verify existence and surfaces `BucketName`
-	* (the physicalId). `DataRedundancy` and `LocationName` are not exposed
-	* by any cheap S3 Express API — the only way to inspect them is by
-	* parsing the bucket name's `--<az-id>--x-s3` suffix, which is best
-	* effort. We surface them when they are recoverable from the bucket
+	* (the physicalId) plus `Tags` (via S3 Control `ListTagsForResource`,
+	* the directory-bucket tag read). `DataRedundancy` and `LocationName`
+	* are not exposed by any cheap S3 Express API — the only way to inspect
+	* them is by parsing the bucket name's `--<az-id>--x-s3` suffix, which is
+	* best effort. We surface them when they are recoverable from the bucket
 	* name to give the comparator a chance to detect mismatches.
 	*
 	* `--<az-id>--x-s3` suffix parsing: directory bucket names follow the
@@ -44105,8 +44377,17 @@ var S3DirectoryBucketProvider = class {
 		}
 		const result = { BucketName: physicalId };
 		if (physicalId.endsWith("--x-s3")) result["DataRedundancy"] = "SingleAvailabilityZone";
+		result["Tags"] = await this.readTags(physicalId);
 		return result;
 	}
+	async readTags(bucketName) {
+		const accountId = await this.getAccountId();
+		const resourceArn = await this.buildBucketArn(bucketName, accountId);
+		return normalizeAwsTagsToCfn((await this.getS3ControlClient().send(new ListTagsForResourceCommand$18({
+			AccountId: accountId,
+			ResourceArn: resourceArn
+		}))).Tags);
+	}
 	/**
 	* Adopt an existing S3 Express Directory Bucket into cdkd state.
 	*
@@ -44592,7 +44873,7 @@ var S3TablesProvider = class {
 	*/
 	async readTagsBestEffort(resourceArn) {
 		try {
-			const tags = (await this.getClient().send(new ListTagsForResourceCommand$18({ resourceArn }))).tags ?? {};
+			const tags = (await this.getClient().send(new ListTagsForResourceCommand$19({ resourceArn }))).tags ?? {};
 			const out = [];
 			for (const [Key, Value] of Object.entries(tags)) out.push({
 				Key,
@@ -44646,7 +44927,7 @@ var S3TablesProvider = class {
 		const resourceArn = await this.lookupTableArn(tableBucketARN, namespace, name);
 		if (!resourceArn) throw new ProvisioningError(`applyTableTagsDiff: GetTable returned no tableARN for ${physicalId} — table is gone or state is out-of-sync. Refusing to silently drop the tag update (run 'cdkd state orphan ${logicalId}' to clean up if the table was deleted out-of-band).`, resourceType, logicalId, physicalId);
 		if (removedKeys.length > 0) try {
-			await this.getClient().send(new UntagResourceCommand$23({
+			await this.getClient().send(new UntagResourceCommand$24({
 				resourceArn,
 				tagKeys: removedKeys
 			}));
@@ -44655,7 +44936,7 @@ var S3TablesProvider = class {
 			throw new ProvisioningError(`applyTableTagsDiff: UntagResource failed for ${resourceArn} (keys: ${removedKeys.join(", ")}): ${err instanceof Error ? err.message : String(err)}. State has NOT been updated so the next deploy will retry the tag-diff.`, resourceType, logicalId, physicalId, cause);
 		}
 		if (Object.keys(upserts).length > 0) try {
-			await this.getClient().send(new TagResourceCommand$23({
+			await this.getClient().send(new TagResourceCommand$24({
 				resourceArn,
 				tags: upserts
 			}));
@@ -44687,7 +44968,7 @@ var S3TablesProvider = class {
 		if (removedKeys.length === 0 && Object.keys(upserts).length === 0) return;
 		const resourceArn = physicalId;
 		if (removedKeys.length > 0) try {
-			await this.getClient().send(new UntagResourceCommand$23({
+			await this.getClient().send(new UntagResourceCommand$24({
 				resourceArn,
 				tagKeys: removedKeys
 			}));
@@ -44696,7 +44977,7 @@ var S3TablesProvider = class {
 			throw new ProvisioningError(`applyTableBucketTagsDiff: UntagResource failed for ${resourceArn} (keys: ${removedKeys.join(", ")}): ${err instanceof Error ? err.message : String(err)}. State has NOT been updated so the next deploy will retry the tag-diff.`, resourceType, logicalId, physicalId, cause);
 		}
 		if (Object.keys(upserts).length > 0) try {
-			await this.getClient().send(new TagResourceCommand$23({
+			await this.getClient().send(new TagResourceCommand$24({
 				resourceArn,
 				tags: upserts
 			}));
@@ -66616,7 +66897,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.278.35");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.278.37");
 	program.hook("preAction", (_thisCommand, actionCommand) => {
 		const { profile } = actionCommand.optsWithGlobals();
 		if (profile !== void 0) process.env["AWS_PROFILE"] = profile;