@aws-blocks/core 0.3.0 → 0.5.0

package/src/scripts/generate-spec.test.ts

@@ -16,6 +16,7 @@ import { join, dirname } from 'path';
 import { tmpdir } from 'os';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { generateSpec } from './generate-spec.js';
+import { ApiNamespace } from '../api.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 // `import.meta.url` lives in dist/scripts/, so `..` is dist/ and the built
@@ -97,3 +98,103 @@ describe('generateSpec — @blocksSkipCodegen', () => {
 		}
 	});
 });
+
+describe('generateSpec — namespaces sharing a method name (regression: #445)', () => {
+	it('emits each namespace its OWN schema for a same-named method', async () => {
+		const dir = join(tmpdir(), `blocks-spec-test-${Date.now()}-collision`);
+		mkdirSync(dir, { recursive: true });
+		writeTsconfig(dir);
+
+		// Typed foundation for the TS type extractor. `create` has DIFFERENT params
+		// in each namespace; binding names (widgets/subscriptions) match the runtime
+		// module's export names below.
+		writeFileSync(join(dir, 'index.ts'), `
+			interface ApiNamespaceConstructor { new <T>(scope: any, name: string, handler: (ctx: any) => T): T; }
+			const ApiNamespace: ApiNamespaceConstructor = class {} as any;
+
+			export const widgets = new ApiNamespace(null, 'widgets', () => ({
+				async create(label: string): Promise<{ widgetId: string }> { return { widgetId: 'w' }; },
+			}));
+			export const subscriptions = new ApiNamespace(null, 'subscriptions', () => ({
+				async create(topicCount: number): Promise<{ subId: number }> { return { subId: 1 }; },
+			}));
+		`);
+
+		// Runtime module for namespace discovery (types come from the .ts above via
+		// the extractor). Use the real ApiNamespace so the marker symbol matches.
+		const widgets = new ApiNamespace(null as any, 'widgets', () => ({ async create(_label: string) { return { widgetId: 'w' }; } }));
+		const subscriptions = new ApiNamespace(null as any, 'subscriptions', () => ({ async create(_topicCount: number) { return { subId: 1 }; } }));
+		const loader = async () => ({ widgets, subscriptions }) as Record<string, unknown>;
+
+		try {
+			const doc = await generateSpec(join(dir, 'index.ts'), loader);
+			const byName = new Map(doc.methods.map((m) => [m.name, m]));
+
+			const w = byName.get('widgets.create');
+			const s = byName.get('subscriptions.create');
+			assert.ok(w && s, 'both namespace-qualified methods should be present');
+
+			// Each keeps its OWN param — no cross-assignment.
+			assert.strictEqual(w!.params[0]?.name, 'label');
+			assert.strictEqual((w!.params[0] as any)?.schema?.type, 'string');
+			assert.strictEqual(s!.params[0]?.name, 'topicCount');
+			assert.strictEqual((s!.params[0] as any)?.schema?.type, 'number');
+		} finally {
+			rmSync(dir, { recursive: true, force: true });
+		}
+	});
+});
+
+describe('generateSpec — namespace returned by a factory, then destructured (regression: #444)', () => {
+	it('emits real schemas (not unknown) for a factory/destructured namespace', async () => {
+		const dir = join(tmpdir(), `blocks-spec-test-${Date.now()}-factory`);
+		mkdirSync(dir, { recursive: true });
+		writeTsconfig(dir);
+
+		// Typed foundation: one directly-exported namespace and one built inside a
+		// factory, returned as a property, destructured, and re-exported. Both use
+		// `create` with DIFFERENT params so a regression would cross-assign or emit
+		// unknown.
+		writeFileSync(join(dir, 'index.ts'), `
+			interface ApiNamespaceConstructor { new <T>(scope: any, name: string, handler: (ctx: any) => T): T; }
+			const ApiNamespace: ApiNamespaceConstructor = class {} as any;
+			class Scope { constructor(id: string) {} }
+
+			class Factory {
+				constructor(private readonly scope: Scope) {}
+				build() {
+					return {
+						subscriptions: new ApiNamespace(this.scope, 'subscriptions', () => ({
+							async create(topicCount: number): Promise<{ subId: number }> { return { subId: 1 }; },
+						})),
+					};
+				}
+			}
+
+			const scope = new Scope('app');
+			export const widgets = new ApiNamespace(scope, 'widgets', () => ({
+				async create(label: string): Promise<{ widgetId: string }> { return { widgetId: 'w' }; },
+			}));
+			const { subscriptions } = new Factory(scope).build();
+			export { subscriptions };
+		`);
+
+		const widgets = new ApiNamespace(null as any, 'widgets', () => ({ async create(_label: string) { return { widgetId: 'w' }; } }));
+		const subscriptions = new ApiNamespace(null as any, 'subscriptions', () => ({ async create(_topicCount: number) { return { subId: 1 }; } }));
+		const loader = async () => ({ widgets, subscriptions }) as Record<string, unknown>;
+
+		try {
+			const doc = await generateSpec(join(dir, 'index.ts'), loader);
+			const byName = new Map(doc.methods.map((m) => [m.name, m]));
+			const w = byName.get('widgets.create');
+			const s = byName.get('subscriptions.create');
+			assert.ok(w && s, 'both qualified methods present');
+			// The factory-returned namespace keeps its own param, not `unknown` and
+			// not the direct namespace's `string`.
+			assert.strictEqual((s!.params[0] as any)?.schema?.type, 'number');
+			assert.strictEqual((w!.params[0] as any)?.schema?.type, 'string');
+		} finally {
+			rmSync(dir, { recursive: true, force: true });
+		}
+	});
+});

package/src/scripts/generate-spec.ts

@@ -324,6 +324,16 @@ export async function generateSpec(
 		for (const [methodName, methodFn] of Object.entries(methodMap)) {
 			if (typeof methodFn !== 'function') continue;
 
+			const qualifiedName = `${routingName}.${methodName}`;
+			// Prefer the namespace-qualified TS types; fall back to the bare method
+			// name for entries the extractor couldn't attribute to a namespace.
+			// Qualified keys stop two namespaces that share a method name (e.g.
+			// widgets.create / subscriptions.create) from cross-assigning schemas.
+			// Residual edge: namespaces the extractor can't attribute (default export,
+			// factory-wrapped, or an `export { x as y }` rename) still land on bare
+			// keys and could overwrite each other here — same class as #445, but rare.
+			const tsInfo = tsTypes.get(qualifiedName) ?? tsTypes.get(methodName);
+
 			// `@blocksSkipCodegen` is a JSDoc tag the customer puts on a method
 			// they want callable from the generated TS client (Proxy-based,
 			// doesn't enumerate) but absent from the OpenRPC spec — so native
@@ -334,9 +344,11 @@ export async function generateSpec(
 			// type-resolution errors and silently empty its Map — we always
 			// want the JSDoc tag to be honored, so the AST-only scan acts as
 			// a safety net.
-			if (tsTypes.get(methodName)?.skipCodegen || skipCodegenNames.has(methodName)) continue;
+			// The skip set is namespace-qualified too (with a bare fallback), so a
+			// `@blocksSkipCodegen` tag on one namespace's method doesn't drop another
+			// namespace's same-named method.
+			if (tsInfo?.skipCodegen || skipCodegenNames.has(qualifiedName) || skipCodegenNames.has(methodName)) continue;
 
-			const qualifiedName = `${routingName}.${methodName}`;
 			const resultName = capitalize(methodName) + 'Result';
 			const paramNames = extractParamNames(methodFn);
 			const fnSource = methodFn.toString();
@@ -380,7 +392,6 @@ export async function generateSpec(
 				}));
 			} else {
 				// No Zod schema — fall back to TypeScript AST types
-				const tsInfo = tsTypes.get(methodName);
 				if (tsInfo) {
 					params = tsInfo.params.map((p) => ({
 						name: p.name,
@@ -397,8 +408,7 @@ export async function generateSpec(
 				}
 			}
 
-			// Return type: Zod doesn't cover this yet, so use TS types
-			const tsInfo = tsTypes.get(methodName);
+			// Return type: Zod doesn't cover this yet, so use TS types (tsInfo resolved above)
 			const rawResultSchema = tsInfo?.returnType && tsInfo.returnType.type !== 'unknown'
 				? tsInfo.returnType
 				: { type: 'unknown' };

package/src/scripts/sandbox-empty-buckets.test.ts

@@ -0,0 +1,191 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { describe, it } from 'node:test';
+import assert from 'node:assert';
+import type { CloudFormationClient } from '@aws-sdk/client-cloudformation';
+import type { S3Client } from '@aws-sdk/client-s3';
+
+import { emptyBucket, listStackBucketNames, runDestroyWithRetries, toDeleteObjects } from './sandbox.js';
+
+// The teardown bucket-emptying must delete BOTH live versions and delete
+// markers — a versioned bucket left with either still blocks `cdk destroy`.
+// This is the exact combination that, done wrong, silently no-ops.
+describe('toDeleteObjects', () => {
+	it('combines versions and delete markers', () => {
+		const out = toDeleteObjects({
+			Versions: [
+				{ Key: 'a', VersionId: 'v1' },
+				{ Key: 'b', VersionId: 'v2' },
+			],
+			DeleteMarkers: [{ Key: 'a', VersionId: 'dm1' }],
+		});
+		assert.deepStrictEqual(out, [
+			{ Key: 'a', VersionId: 'v1' },
+			{ Key: 'b', VersionId: 'v2' },
+			{ Key: 'a', VersionId: 'dm1' },
+		]);
+	});
+
+	it('returns [] for an empty bucket (no Versions/DeleteMarkers keys)', () => {
+		assert.deepStrictEqual(toDeleteObjects({}), []);
+	});
+
+	it('tolerates only versions or only delete markers', () => {
+		assert.deepStrictEqual(toDeleteObjects({ Versions: [{ Key: 'x', VersionId: 'v' }] }), [
+			{ Key: 'x', VersionId: 'v' },
+		]);
+		assert.deepStrictEqual(toDeleteObjects({ DeleteMarkers: [{ Key: 'y', VersionId: 'd' }] }), [
+			{ Key: 'y', VersionId: 'd' },
+		]);
+	});
+
+	it('drops entries without a Key rather than emitting a bad DeleteObjects payload', () => {
+		assert.deepStrictEqual(toDeleteObjects({ Versions: [{ VersionId: 'orphan' }] }), []);
+	});
+});
+
+// A fake AWS client: routes on the command class name and returns queued/canned
+// responses. Cast to the real client type — this is test plumbing, not customer code.
+type Send = (cmd: { constructor: { name: string }; input: any }) => Promise<any>;
+
+describe('listStackBucketNames', () => {
+	it('follows NextToken across pages and returns only S3 buckets', async () => {
+		const seen: Array<string | undefined> = [];
+		const send: Send = async (cmd) => {
+			seen.push(cmd.input.NextToken);
+			if (cmd.input.NextToken === undefined) {
+				return {
+					StackResourceSummaries: [
+						{ ResourceType: 'AWS::S3::Bucket', PhysicalResourceId: 'b1' },
+						{ ResourceType: 'AWS::Lambda::Function', PhysicalResourceId: 'fn' },
+					],
+					NextToken: 't2',
+				};
+			}
+			return { StackResourceSummaries: [{ ResourceType: 'AWS::S3::Bucket', PhysicalResourceId: 'b2' }] };
+		};
+		const cfn = { send } as unknown as CloudFormationClient;
+		const buckets = await listStackBucketNames(cfn, 'stack');
+		assert.deepStrictEqual(buckets, ['b1', 'b2']);
+		assert.deepStrictEqual(seen, [undefined, 't2']); // paged exactly twice
+	});
+});
+
+describe('emptyBucket', () => {
+	it('deletes versions + markers, re-lists, and stops when empty', async () => {
+		let lists = 0;
+		const deletePayloads: unknown[] = [];
+		const send: Send = async (cmd) => {
+			if (cmd.constructor.name === 'ListObjectVersionsCommand') {
+				lists++;
+				return lists === 1
+					? { Versions: [{ Key: 'a', VersionId: 'v1' }], DeleteMarkers: [{ Key: 'a', VersionId: 'd1' }] }
+					: {};
+			}
+			if (cmd.constructor.name === 'DeleteObjectsCommand') {
+				deletePayloads.push(cmd.input.Delete.Objects);
+				return {};
+			}
+			throw new Error(`unexpected ${cmd.constructor.name}`);
+		};
+		await emptyBucket({ send } as unknown as S3Client, 'bucket');
+		assert.strictEqual(lists, 2); // listed, deleted, re-listed → empty
+		assert.deepStrictEqual(deletePayloads, [
+			[
+				{ Key: 'a', VersionId: 'v1' },
+				{ Key: 'a', VersionId: 'd1' },
+			],
+		]);
+	});
+
+	it('stops (no infinite loop) when DeleteObjects reports Errors', async () => {
+		let lists = 0;
+		let deletes = 0;
+		const send: Send = async (cmd) => {
+			if (cmd.constructor.name === 'ListObjectVersionsCommand') {
+				lists++;
+				return { Versions: [{ Key: 'locked', VersionId: 'v1' }] };
+			}
+			if (cmd.constructor.name === 'DeleteObjectsCommand') {
+				deletes++;
+				return { Errors: [{ Key: 'locked', Code: 'AccessDenied' }] };
+			}
+			throw new Error(`unexpected ${cmd.constructor.name}`);
+		};
+		await emptyBucket({ send } as unknown as S3Client, 'bucket');
+		assert.strictEqual(lists, 1); // did NOT re-list after Errors
+		assert.strictEqual(deletes, 1);
+	});
+});
+
+// The sev2 fix is the wiring: on a destroy failure, buckets get emptied BEFORE
+// the retry. runDestroyWithRetries takes its side effects as deps so we can
+// exercise that ordering without spawning cdk.
+describe('runDestroyWithRetries', () => {
+	it('empties buckets before retrying a failed destroy', async () => {
+		const events: string[] = [];
+		let attempts = 0;
+		await runDestroyWithRetries({
+			runDestroy: () => {
+				attempts++;
+				events.push(`destroy#${attempts}`);
+				if (attempts === 1) throw new Error('bucket not empty');
+			},
+			listStackNames: () => {
+				events.push('list');
+				return ['stackA', 'stackB'];
+			},
+			emptyBuckets: async (names) => {
+				events.push(`empty:${names.join(',')}`);
+			},
+			sleep: async () => {
+				events.push('sleep');
+			},
+			retryDelays: [1],
+		});
+		assert.strictEqual(attempts, 2);
+		// buckets emptied (with the resolved stack names) before the retry destroy
+		assert.deepStrictEqual(events, ['destroy#1', 'list', 'empty:stackA,stackB', 'sleep', 'destroy#2']);
+	});
+
+	it('does not empty or sleep when the first destroy succeeds', async () => {
+		let emptied = false;
+		let slept = false;
+		let listed = false;
+		await runDestroyWithRetries({
+			runDestroy: () => {},
+			listStackNames: () => {
+				listed = true;
+				return [];
+			},
+			emptyBuckets: async () => {
+				emptied = true;
+			},
+			sleep: async () => {
+				slept = true;
+			},
+		});
+		assert.strictEqual(emptied, false);
+		assert.strictEqual(slept, false);
+		assert.strictEqual(listed, false);
+	});
+
+	it('throws after exhausting retries', async () => {
+		let attempts = 0;
+		await assert.rejects(
+			runDestroyWithRetries({
+				runDestroy: () => {
+					attempts++;
+					throw new Error('still failing');
+				},
+				listStackNames: () => [],
+				emptyBuckets: async () => {},
+				sleep: async () => {},
+				retryDelays: [1, 1],
+			}),
+			/still failing/,
+		);
+		assert.strictEqual(attempts, 3); // initial attempt + 2 retries
+	});
+});

package/src/scripts/sandbox.ts

@@ -14,6 +14,8 @@ import { classifyError } from '../telemetry/trackCommand.js';
 import { getCdkTelemetryEnv } from './cdk-telemetry-env.js';
 import { runSync, spawnCommand } from './run-command.js';
 import { terminateProcessTree } from './process-tree.js';
+import type { CloudFormationClient } from '@aws-sdk/client-cloudformation';
+import type { S3Client } from '@aws-sdk/client-s3';
 
 /**
  * Import the backend definition to populate the Scope BB registry.
@@ -321,6 +323,180 @@ export async function startSandbox(options: SandboxOptions) {
   await new Promise(() => {});
 }
 
+/**
+ * Flatten a ListObjectVersions response into the `{ Key, VersionId }[]` shape
+ * DeleteObjects expects, combining live versions AND delete markers. Exported
+ * for unit testing — getting this combination wrong (e.g. missing the delete
+ * markers) leaves a "versioned" bucket that still can't be deleted.
+ */
+export function toDeleteObjects(listed: {
+	Versions?: Array<{ Key?: string; VersionId?: string }>;
+	DeleteMarkers?: Array<{ Key?: string; VersionId?: string }>;
+}): Array<{ Key: string; VersionId?: string }> {
+	return [...(listed.Versions ?? []), ...(listed.DeleteMarkers ?? [])]
+		.filter((v): v is { Key: string; VersionId?: string } => v.Key !== undefined)
+		.map((v) => ({ Key: v.Key, VersionId: v.VersionId }));
+}
+
+/** Collect a stack's S3 bucket physical names (paginated — a large stack has
+ * >100 resources, so a single page can miss the hosting bucket that blocks the
+ * delete). Returns [] if the stack is already gone / not accessible. */
+export async function listStackBucketNames(cfn: CloudFormationClient, stackName: string): Promise<string[]> {
+	const { ListStackResourcesCommand } = await import('@aws-sdk/client-cloudformation');
+	const buckets: string[] = [];
+	let token: string | undefined;
+	do {
+		const res = await cfn.send(new ListStackResourcesCommand({ StackName: stackName, NextToken: token }));
+		for (const r of res.StackResourceSummaries ?? []) {
+			if (r.ResourceType === 'AWS::S3::Bucket' && r.PhysicalResourceId) buckets.push(r.PhysicalResourceId);
+		}
+		token = res.NextToken;
+	} while (token);
+	return buckets;
+}
+
+/** Empty a versioned bucket: delete every object version + delete marker in
+ * pages of 1000 (the DeleteObjects limit). Stops if a page reports per-key
+ * errors (object-lock / retention) so it can't loop forever. */
+export async function emptyBucket(s3: S3Client, bucket: string): Promise<void> {
+	const { ListObjectVersionsCommand, DeleteObjectsCommand } = await import('@aws-sdk/client-s3');
+	while (true) {
+		const listed = await s3.send(new ListObjectVersionsCommand({ Bucket: bucket, MaxKeys: 1000 }));
+		const objects = toDeleteObjects(listed);
+		if (objects.length === 0) return;
+		const res = await s3.send(new DeleteObjectsCommand({ Bucket: bucket, Delete: { Objects: objects, Quiet: true } }));
+		if (res.Errors && res.Errors.length > 0) {
+			// A bucket we can't fully empty (object-lock / retention / AccessDenied)
+			// will keep blocking `cdk destroy`, so the stack won't tear down until it's
+			// resolved by hand. Log loudly with the first error code — this is the
+			// kind of silent skip that leaks a stack, so make it visible in CI output.
+			const first = res.Errors[0];
+			console.warn(
+				`  ⚠️  ${bucket}: ${res.Errors.length} object(s) could NOT be deleted ` +
+					`(e.g. ${first.Key}: ${first.Code}). This bucket will block stack teardown ` +
+					`until cleared manually.`,
+			);
+			return;
+		}
+	}
+}
+
+/**
+ * Empty every versioned S3 bucket owned by the given stacks. `cdk destroy`
+ * relies on each bucket's `autoDeleteObjects` custom-resource Lambda to empty
+ * it on teardown — but that Lambda never provisions if the CREATE failed (e.g.
+ * a partial/aborted deploy), so the versioned bucket blocks the delete and the
+ * stack (and its IAM roles) leak. Emptying out-of-band before the retry lets
+ * the delete complete. Best-effort: any per-stack/per-bucket error is logged
+ * and skipped so teardown still proceeds.
+ */
+async function emptySandboxBuckets(stackNames: string[]): Promise<void> {
+	try {
+		const { CloudFormationClient } = await import('@aws-sdk/client-cloudformation');
+		const { S3Client } = await import('@aws-sdk/client-s3');
+		const cfn = new CloudFormationClient({});
+		// `followRegionRedirects` makes the client transparently retry against a
+		// bucket's real region on a PermanentRedirect, so a bucket that lives
+		// outside AWS_REGION (e.g. a us-east-1 Lambda@Edge stack's bucket) is still
+		// emptied instead of failing silently — closing the exact no-op this fix
+		// targets. It needs no GetBucketLocation permission.
+		const s3 = new S3Client({ followRegionRedirects: true });
+		for (const stackName of stackNames) {
+			let buckets: string[] = [];
+			try {
+				buckets = await listStackBucketNames(cfn, stackName);
+			} catch {
+				continue; // stack already gone / not accessible
+			}
+			for (const b of buckets) {
+				try {
+					await emptyBucket(s3, b);
+				} catch (e) {
+					console.warn(`  ⚠️  could not empty ${b}: ${(e as Error).message}`);
+				}
+			}
+		}
+	} catch (e) {
+		console.warn(`  ⚠️  bucket-emptying step skipped: ${(e as Error).message}`);
+	}
+}
+
+/** Resolve the sandbox app's stack names via `cdk ls` (best-effort; [] on error). */
+function listSandboxStackNames(backendPath: string, cdkEnv: NodeJS.ProcessEnv): string[] {
+	try {
+		const out = execFileSync(
+			'npm',
+			// Single-quote backendPath: CDK re-runs the --app string through a shell,
+			// so an unquoted path containing a space would split.
+			['exec', 'cdk', '--', 'ls', '--context', 'sandboxMode=true', '--app', `npm exec tsx -- -C cdk '${backendPath}'`],
+			// Capture stderr so a genuine synth/`cdk ls` failure can be logged below
+			// rather than being indistinguishable from "app has zero stacks".
+			{ env: cdkEnv, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] },
+		);
+		return out
+			.split('\n')
+			.map((s) => s.trim())
+			.filter(Boolean);
+	} catch (e) {
+		// Warn (don't stay silent): if this returns [] on a real failure, the retry
+		// skips bucket-emptying — the exact silent-no-op this change exists to avoid.
+		const detail = (e as { stderr?: string; message?: string }).stderr || (e as Error).message;
+		console.warn(`  ⚠️  could not list sandbox stacks via 'cdk ls'; skipping bucket-emptying: ${detail}`);
+		return [];
+	}
+}
+
+/** Injectable dependencies for {@link runDestroyWithRetries} — real ones in
+ * `destroySandbox`, fakes in tests so the retry/empty-before-retry wiring (the
+ * sev2 fix) is exercised without spawning cdk. */
+export interface DestroyRetryDeps {
+	/** Run one `cdk destroy` attempt; throws on failure. */
+	runDestroy: () => void;
+	/** Resolve the app's stack names (for bucket enumeration). */
+	listStackNames: () => string[];
+	/** Empty the given stacks' versioned S3 buckets. */
+	emptyBuckets: (stackNames: string[]) => Promise<void>;
+	/** Sleep (VPC-ENI detach window). */
+	sleep: (ms: number) => Promise<void>;
+	/** Backoff between retries. Default: 1min, then 2min. */
+	retryDelays?: number[];
+}
+
+/**
+ * Retry `cdk destroy`, clearing the two known teardown blockers before each
+ * retry: (1) non-empty versioned S3 buckets — `cdk destroy` relies on each
+ * bucket's autoDeleteObjects Lambda, which never provisioned if the CREATE
+ * failed, so the bucket blocks the delete and the stack (+ its IAM roles) leaks;
+ * we empty them out-of-band — and (2) VPC ENIs that take 60-120s to detach (the
+ * backoff). Stack names are resolved once and reused (topology is stable across
+ * attempts). Factored out with injectable deps so this behavior is unit-testable.
+ */
+export async function runDestroyWithRetries(deps: DestroyRetryDeps): Promise<void> {
+	const retryDelays = deps.retryDelays ?? [60_000, 120_000];
+	let stackNames: string[] | undefined;
+	for (let attempt = 0; ; attempt++) {
+		try {
+			deps.runDestroy();
+			console.log(attempt === 0 ? '\n✅ Sandbox destroyed!' : '\n✅ Sandbox destroyed on retry!');
+			return;
+		} catch (error) {
+			if (attempt < retryDelays.length) {
+				if (stackNames === undefined) stackNames = deps.listStackNames();
+				if (stackNames.length > 0) {
+					console.log('\n🧹 Emptying versioned S3 buckets before retry...');
+					await deps.emptyBuckets(stackNames);
+				}
+				const delaySec = retryDelays[attempt] / 1000;
+				console.log(`\n⏳ Stack deletion failed. Retrying in ${delaySec}s (waiting for resource cleanup)...`);
+				await deps.sleep(retryDelays[attempt]);
+			} else {
+				console.error('\n❌ Destroy failed after retries.');
+				throw error;
+			}
+		}
+	}
+}
+
 export async function destroySandbox(backendPath: string) {
   return trackCommand('sandbox:destroy', async () => {
     console.log("🗑️  Destroying sandbox...");
@@ -334,31 +510,16 @@ export async function destroySandbox(backendPath: string) {
       "exec", "cdk", "--", "destroy",
       "--force",
       "--context", "sandboxMode=true",
-      "--app", `npm exec tsx -- -C cdk ${backendPath}`,
+      // Single-quote backendPath: CDK re-runs the --app string through a shell,
+      // so an unquoted path containing a space would split.
+      "--app", `npm exec tsx -- -C cdk '${backendPath}'`,
     ];
     const cdkEnv = { ...process.env, NODE_OPTIONS: "--conditions=cdk", ...getCdkTelemetryEnv('sandbox') };
-    // Retry with backoff for VPC-dependent resources (e.g. Aurora clusters).
-    // CloudFormation deletes the cluster first, but its ENIs take 60-120s to
-    // detach from the VPC subnets asynchronously. The initial destroy fails
-    // because the subnets still have attached ENIs; retrying after the cleanup
-    // window lets the VPC delete succeed.
-    const retryDelays = [60_000, 120_000]; // 1min, then 2min
-
-    for (let attempt = 0; ; attempt++) {
-      try {
-        runSync("npm", cdkArgs, { stdio: "inherit", env: cdkEnv });
-        console.log(attempt === 0 ? "\n✅ Sandbox destroyed!" : "\n✅ Sandbox destroyed on retry!");
-        return;
-      } catch (error) {
-        if (attempt < retryDelays.length) {
-          const delaySec = retryDelays[attempt] / 1000;
-          console.log(`\n⏳ Stack deletion failed. Retrying in ${delaySec}s (waiting for resource cleanup)...`);
-          await new Promise(r => setTimeout(r, retryDelays[attempt]));
-        } else {
-          console.error("\n❌ Destroy failed after retries.");
-          throw error;
-        }
-      }
-    }
+    await runDestroyWithRetries({
+      runDestroy: () => runSync('npm', cdkArgs, { stdio: 'inherit', env: cdkEnv }),
+      listStackNames: () => listSandboxStackNames(backendPath, cdkEnv),
+      emptyBuckets: emptySandboxBuckets,
+      sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
+    });
   });
 }

package/src/version.ts

@@ -1,2 +1,2 @@
 // Auto-generated by scripts/generate-version.mjs — do not edit manually
-export const CORE_VERSION = '0.3.0';
+export const CORE_VERSION = '0.5.0';