cdk-local 0.168.0 → 0.168.2

package/dist/{local-studio-CAxQV9HT.js → local-studio-D_aFesGK.js}

@@ -16,7 +16,7 @@ import { GetParameterCommand, GetParametersCommand, SSMClient } from "@aws-sdk/c
 import { unzipSync } from "fflate";
 import { MultiSelectPrompt } from "@clack/core";
 import { S_BAR, S_BAR_END, S_BAR_START, S_CHECKBOX_ACTIVE, S_CHECKBOX_INACTIVE, S_CHECKBOX_SELECTED, confirm, isCancel, multiselect, select, spinner, text } from "@clack/prompts";
-import { CloudFormationClient, DescribeStacksCommand, ListExportsCommand, ListStackResourcesCommand } from "@aws-sdk/client-cloudformation";
+import { CloudFormationClient, DescribeStacksCommand, GetTemplateCommand, ListExportsCommand, ListStackResourcesCommand } from "@aws-sdk/client-cloudformation";
 import { GetFunctionConfigurationCommand, LambdaClient } from "@aws-sdk/client-lambda";
 import { BedrockAgentCoreControlClient, GetAgentRuntimeCommand } from "@aws-sdk/client-bedrock-agentcore-control";
 import { mkdir, mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
@@ -5449,6 +5449,319 @@ async function resolveSsmParameters(client, refs, label) {
 	return out;
 }
 
+// src/local/secret-attributes.ts
+const SECRET_ATTRIBUTE_NAME = /secret|password|credential/i;
+const NON_SECRET_ATTRIBUTE_SUFFIX = /(arn|id|name|url|alias|status)$/i;
+const SECRET_VALUED_ATTRIBUTES = /* @__PURE__ */ new Map([
+	["AWS::AppSync::ApiKey", ["ApiKey", "ApiKeyId"]],
+	["AWS::EC2::IpamExternalResourceVerificationToken", ["TokenValue"]],
+	["AWS::IVS::StreamKey", ["Value"]]
+]);
+function isSecretAttributeName(attribute) {
+	return SECRET_ATTRIBUTE_NAME.test(attribute) && !NON_SECRET_ATTRIBUTE_SUFFIX.test(attribute);
+}
+function isSecretValuedAttribute(resourceType, attribute) {
+	if (typeof resourceType !== "string") return false;
+	return SECRET_VALUED_ATTRIBUTES.get(resourceType)?.includes(attribute) === true;
+}
+function isCustomResourceType(resourceType) {
+	return typeof resourceType === "string" && (resourceType.startsWith("Custom::") || resourceType === "AWS::CloudFormation::CustomResource");
+}
+
+// src/local/cfn-producer-secrets.ts
+const SEGMENT_SUBSTRING_FLOOR = 4;
+const NAMED_LEAF_EXACT_FLOOR = 8;
+const NAMED_LEAF_FLOOR = 16;
+const MAX_DEPTH = 32;
+const MAX_STACKS = 256;
+const APPSYNC_ARN = /^arn:[^:]+:appsync:[^:]*:[^:]*:(.+)$/;
+const APPSYNC_APIKEY_PATH = /^apis\/([^/|]+)\/apikeys?\/([^/|]+)$/;
+function secretPhysicalIdSegment(resourceType, physicalId) {
+	if (resourceType !== "AWS::AppSync::ApiKey") return void 0;
+	if (typeof physicalId !== "string" || physicalId === "") return void 0;
+	const parts = physicalId.split("|");
+	if (parts.length === 2 && parts[0] !== "" && parts[1] !== "") return parts[1];
+	const arn = APPSYNC_ARN.exec(physicalId);
+	const path = arn ? APPSYNC_APIKEY_PATH.exec(arn[1]) : null;
+	return path ? path[2] : physicalId;
+}
+function holds(value, needle, floor) {
+	return value === needle || needle.length >= floor && value.includes(needle);
+}
+const isPlaintext = (v) => v !== "" && v !== "***" && !v.includes("{{resolve:");
+const isRecord = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
+var CfnProducerSecretJudge = class CfnProducerSecretJudge {
+	client;
+	listResources;
+	exports;
+	label;
+	resourceReads = /* @__PURE__ */ new Map();
+	outputReads = /* @__PURE__ */ new Map();
+	templateReads = /* @__PURE__ */ new Map();
+	summaries = /* @__PURE__ */ new Map();
+	constructor(client, exports, label, listResources) {
+		this.client = client;
+		this.listResources = listResources;
+		this.exports = exports;
+		this.label = label;
+	}
+	async judgeExport(exportName, served) {
+		let summary = this.summaries.get(exportName);
+		if (summary === void 0) {
+			summary = this.summarize(exportName);
+			this.summaries.set(exportName, summary);
+		}
+		return verdictOf(await summary, served);
+	}
+	async summarize(exportName) {
+		const walk = {
+			summary: {
+				segments: /* @__PURE__ */ new Set(),
+				typed: /* @__PURE__ */ new Set(),
+				named: /* @__PURE__ */ new Set(),
+				opaque: void 0,
+				stale: false
+			},
+			stacks: /* @__PURE__ */ new Set(),
+			exports: /* @__PURE__ */ new Set()
+		};
+		await this.addExport(exportName, walk, 0, true);
+		return walk.summary;
+	}
+	static opaque(walk, why) {
+		walk.summary.opaque ??= why;
+	}
+	async addExport(name, walk, depth, top) {
+		if (walk.exports.has(name)) return;
+		walk.exports.add(name);
+		const shownExport = displayUntrustedValue(name);
+		if (depth > MAX_DEPTH) {
+			CfnProducerSecretJudge.opaque(walk, `the re-exports go past the ${MAX_DEPTH}-level bound`);
+			return;
+		}
+		const entry = (await this.exports())?.get(name);
+		if (entry === void 0) {
+			CfnProducerSecretJudge.opaque(walk, `the producer re-exports ${shownExport}, which ListExports does not list`);
+			return;
+		}
+		const stackId = entry.exportingStackId;
+		if (stackId === void 0 || stackId === "") {
+			CfnProducerSecretJudge.opaque(walk, `ListExports names no exporting stack for ${shownExport}`);
+			return;
+		}
+		const shownStack = displayUntrustedValue(stackId);
+		await this.addTree(stackId, walk, depth);
+		const outputs = await this.readOutputs(stackId);
+		if ("error" in outputs) {
+			CfnProducerSecretJudge.opaque(walk, outputs.error);
+			return;
+		}
+		const output = outputs.ok.find((o) => o.ExportName === name);
+		if (output?.OutputKey === void 0 || output.OutputValue !== entry.value) {
+			if (top) walk.summary.stale = true;
+			else CfnProducerSecretJudge.opaque(walk, `the producer re-exports ${shownExport}, which ${shownStack} no longer declares`);
+			return;
+		}
+		const template = await this.readTemplate(stackId);
+		if ("error" in template) {
+			CfnProducerSecretJudge.opaque(walk, template.error);
+			return;
+		}
+		await this.traceOutput({
+			stackId,
+			template: template.ok
+		}, output.OutputKey, output.OutputValue, walk, depth);
+	}
+	async addTree(stackId, walk, depth) {
+		if (walk.stacks.has(stackId)) return;
+		if (walk.stacks.size >= MAX_STACKS) {
+			CfnProducerSecretJudge.opaque(walk, `the producer tree goes past ${MAX_STACKS} stacks`);
+			return;
+		}
+		walk.stacks.add(stackId);
+		const resources = await this.readResources(stackId);
+		if ("error" in resources) {
+			CfnProducerSecretJudge.opaque(walk, resources.error);
+			return;
+		}
+		for (const r of resources.ok) {
+			const segment = secretPhysicalIdSegment(r.ResourceType, r.PhysicalResourceId);
+			if (segment !== void 0 && isPlaintext(segment)) walk.summary.segments.add(segment);
+			if (r.ResourceType === "AWS::CloudFormation::Stack" && r.PhysicalResourceId) {
+				if (depth + 1 > MAX_DEPTH) {
+					CfnProducerSecretJudge.opaque(walk, `the nested stacks go past the ${MAX_DEPTH}-level bound`);
+					continue;
+				}
+				await this.addTree(r.PhysicalResourceId, walk, depth + 1);
+			}
+		}
+	}
+	async traceOutput(stack, key, value, walk, depth) {
+		const outputs = stack.template["Outputs"];
+		const def = isRecord(outputs) && Object.hasOwn(outputs, key) ? outputs[key] : void 0;
+		if (!isRecord(def) || !Object.hasOwn(def, "Value")) {
+			CfnProducerSecretJudge.opaque(walk, `the template of ${displayUntrustedValue(stack.stackId)} declares no output ${displayUntrustedValue(key)}`);
+			return;
+		}
+		await this.trace(def["Value"], stack, value, walk, depth, /* @__PURE__ */ new Set());
+	}
+	async trace(node, stack, value, walk, depth, shadowed) {
+		if (Array.isArray(node)) {
+			for (const item of node) await this.trace(item, stack, value, walk, depth, shadowed);
+			return;
+		}
+		if (!isRecord(node)) return;
+		for (const [key, child] of Object.entries(node)) {
+			if (key === "Ref" && typeof child === "string") await this.readRef(child, stack, value, walk, depth);
+			else if (key === "Fn::GetAtt") {
+				const att = getAttOf(child);
+				if (att === void 0) CfnProducerSecretJudge.opaque(walk, "an exported Fn::GetAtt is computed");
+				else await this.readGetAtt(att[0], att[1], stack, value, walk, depth);
+			} else if (key === "Fn::Sub") {
+				const template = Array.isArray(child) ? child[0] : child;
+				const vars = Array.isArray(child) && isRecord(child[1]) ? child[1] : {};
+				const inScope = /* @__PURE__ */ new Set([...shadowed, ...Object.keys(vars)]);
+				if (typeof template === "string") for (const m of template.matchAll(/\$\{([^}!][^}]*)\}/g)) {
+					const ref = m[1].trim();
+					if (inScope.has(ref) || ref.startsWith("AWS::")) continue;
+					const dot = ref.indexOf(".");
+					if (dot > 0) await this.readGetAtt(ref.slice(0, dot), ref.slice(dot + 1), stack, value, walk, depth);
+					else await this.readRef(ref, stack, value, walk, depth);
+				}
+				else await this.trace(template, stack, value, walk, depth, shadowed);
+				for (const v of Object.values(vars)) await this.trace(v, stack, value, walk, depth, shadowed);
+				continue;
+			} else if (key === "Fn::ImportValue") {
+				if (typeof child === "string") await this.addExport(child, walk, depth + 1, false);
+				else CfnProducerSecretJudge.opaque(walk, "the producer re-exports an Fn::ImportValue whose name is computed");
+				continue;
+			}
+			await this.trace(child, stack, value, walk, depth, shadowed);
+		}
+	}
+	async readRef(name, stack, value, walk, depth) {
+		const params = stack.template["Parameters"];
+		const param = isRecord(params) && Object.hasOwn(params, name) ? params[name] : void 0;
+		if (!isRecord(param)) return;
+		const noEcho = param["NoEcho"];
+		if ((noEcho === true || noEcho === "true") && isPlaintext(value)) {
+			walk.summary.typed.add(value);
+			return;
+		}
+		const parent = stack.parent;
+		if (parent !== void 0 && Object.hasOwn(parent.bindings, name)) await this.trace(parent.bindings[name], parent.stack, value, walk, depth, /* @__PURE__ */ new Set());
+	}
+	async readGetAtt(logicalId, attribute, stack, value, walk, depth) {
+		const resources = stack.template["Resources"];
+		const res = isRecord(resources) && Object.hasOwn(resources, logicalId) ? resources[logicalId] : void 0;
+		const type = isRecord(res) ? res["Type"] : void 0;
+		if (type === "AWS::CloudFormation::Stack" && attribute.startsWith("Outputs.")) {
+			await this.traceNestedOutput(stack, logicalId, attribute.slice(8), walk, depth);
+			return;
+		}
+		if (!isPlaintext(value)) return;
+		if (isSecretValuedAttribute(type, attribute) || isCustomResourceType(type)) walk.summary.typed.add(value);
+		else if (isSecretAttributeName(attribute) && value.length >= NAMED_LEAF_EXACT_FLOOR) walk.summary.named.add(value);
+	}
+	async traceNestedOutput(stack, logicalId, key, walk, depth) {
+		const shownParent = displayUntrustedValue(stack.stackId);
+		if (depth + 1 > MAX_DEPTH) {
+			CfnProducerSecretJudge.opaque(walk, `the nested stacks go past the ${MAX_DEPTH}-level bound`);
+			return;
+		}
+		const resources = await this.readResources(stack.stackId);
+		if ("error" in resources) {
+			CfnProducerSecretJudge.opaque(walk, resources.error);
+			return;
+		}
+		const nestedId = resources.ok.find((r) => r.LogicalResourceId === logicalId)?.PhysicalResourceId;
+		if (!nestedId) {
+			CfnProducerSecretJudge.opaque(walk, `${shownParent} lists no nested stack ${displayUntrustedValue(logicalId)}`);
+			return;
+		}
+		const outputs = await this.readOutputs(nestedId);
+		if ("error" in outputs) {
+			CfnProducerSecretJudge.opaque(walk, outputs.error);
+			return;
+		}
+		const output = outputs.ok.find((o) => o.OutputKey === key);
+		const template = await this.readTemplate(nestedId);
+		if ("error" in template) {
+			CfnProducerSecretJudge.opaque(walk, template.error);
+			return;
+		}
+		if (output?.OutputValue === void 0) {
+			CfnProducerSecretJudge.opaque(walk, `the nested stack ${displayUntrustedValue(nestedId)} has no output ${displayUntrustedValue(key)}`);
+			return;
+		}
+		const nestedRes = stack.template["Resources"]?.[logicalId];
+		const props = isRecord(nestedRes) ? nestedRes["Properties"] : void 0;
+		const bindings = isRecord(props) && isRecord(props["Parameters"]) ? props["Parameters"] : {};
+		await this.traceOutput({
+			stackId: nestedId,
+			template: template.ok,
+			parent: {
+				stack,
+				bindings
+			}
+		}, key, output.OutputValue, walk, depth + 1);
+	}
+	memo(cache, stackId, operation, read) {
+		let got = cache.get(stackId);
+		if (got === void 0) {
+			got = Promise.resolve().then(read).then((ok) => ({ ok }), (err) => {
+				const why = err instanceof UnjudgeableStackError ? err.message : describeAwsFailureForWarn(err, `${this.label}: CloudFormation ${operation}(${displayUntrustedValue(stackId)})`);
+				return { error: `${operation} of ${displayUntrustedValue(stackId)} failed: ${why}` };
+			});
+			cache.set(stackId, got);
+		}
+		return got;
+	}
+	readResources(stackId) {
+		return this.memo(this.resourceReads, stackId, "ListStackResources", async () => {
+			return this.listResources(this.client, stackId);
+		});
+	}
+	readOutputs(stackId) {
+		return this.memo(this.outputReads, stackId, "DescribeStacks", async () => {
+			const stack = (await this.client.send(new DescribeStacksCommand({ StackName: stackId }))).Stacks?.[0];
+			if (!stack) throw new UnjudgeableStackError("it returned no stack");
+			return stack.Outputs ?? [];
+		});
+	}
+	readTemplate(stackId) {
+		return this.memo(this.templateReads, stackId, "GetTemplate", async () => {
+			const body = (await this.client.send(new GetTemplateCommand({ StackName: stackId }))).TemplateBody;
+			let parsed;
+			try {
+				parsed = typeof body === "string" ? JSON.parse(body) : void 0;
+			} catch {
+				parsed = void 0;
+			}
+			if (!isRecord(parsed)) throw new UnjudgeableStackError("the template is not a JSON object");
+			return parsed;
+		});
+	}
+};
+var UnjudgeableStackError = class extends Error {};
+function getAttOf(node) {
+	if (Array.isArray(node) && typeof node[0] === "string" && typeof node[1] === "string") return [node[0], node[1]];
+	if (typeof node === "string") {
+		const dot = node.indexOf(".");
+		if (dot > 0) return [node.slice(0, dot), node.slice(dot + 1)];
+	}
+}
+function verdictOf(summary, served) {
+	for (const s of summary.segments) if (holds(served, s, SEGMENT_SUBSTRING_FLOOR)) return { verdict: "secret" };
+	for (const t of summary.typed) if (holds(served, t, SEGMENT_SUBSTRING_FLOOR)) return { verdict: "secret" };
+	for (const n of summary.named) if (holds(served, n, NAMED_LEAF_FLOOR)) return { verdict: "secret" };
+	if (summary.opaque !== void 0) return {
+		verdict: "unreadable",
+		detail: summary.opaque
+	};
+	if (summary.stale) return { verdict: "stale" };
+}
+
 // src/local/cfn-local-state-provider.ts
 var CfnLocalStateProvider = class {
 	label;
@@ -5614,20 +5927,33 @@ var CfnLocalStateProvider = class {
 		let exportsPromise;
 		const ensureExports = () => {
 			if (exportsPromise) return exportsPromise;
-			exportsPromise = fetchAllExports(client).catch((err) => {
+			exportsPromise = fetchAllExportEntries(client).catch((err) => {
 				logger.warn(`${label}: ListExports (${region}) failed: ${formatAwsErrorForWarn(err, "CloudFormation ListExports")}. Fn::ImportValue intrinsics will warn-and-drop.`);
 			});
 			return exportsPromise;
 		};
+		const judge = new CfnProducerSecretJudge(client, ensureExports, label, fetchAllStackResources);
+		const resolveImport = async (exportName) => {
+			const map = await ensureExports();
+			if (!map) return void 0;
+			return map.get(exportName)?.value;
+		};
+		const resolveGetStackOutput = async (producerStack, producerRegion, outputName) => {
+			logger.warn(`${label}: Fn::GetStackOutput ${displayUntrustedValue(producerStack)}.${displayUntrustedValue(outputName)} (${displayUntrustedValue(producerRegion)}) has no CloudFormation equivalent and cannot be resolved when reading state from a CloudFormation stack. Use Fn::ImportValue against an exported output instead.`);
+		};
 		return {
-			async resolveImport(exportName) {
-				const map = await ensureExports();
-				if (!map) return void 0;
-				return map.get(exportName);
+			resolveImport,
+			resolveGetStackOutput,
+			async resolveImportJudged(exportName) {
+				const value = await resolveImport(exportName);
+				if (value === void 0) return { value };
+				const judgement = await judge.judgeExport(exportName, value);
+				return judgement === void 0 ? { value } : {
+					value,
+					...judgement
+				};
 			},
-			async resolveGetStackOutput(producerStack, producerRegion, outputName) {
-				logger.warn(`${label}: Fn::GetStackOutput ${displayUntrustedValue(producerStack)}.${displayUntrustedValue(outputName)} (${displayUntrustedValue(producerRegion)}) has no CloudFormation equivalent and cannot be resolved when reading state from a CloudFormation stack. Use Fn::ImportValue against an exported output instead.`);
-			}
+			resolveGetStackOutputJudged: async (producerStack, producerRegion, outputName) => ({ value: await resolveGetStackOutput(producerStack, producerRegion, outputName) })
 		};
 	}
 	dispose() {
@@ -5688,7 +6014,7 @@ async function fetchAllStackResources(client, stackName) {
 	} while (nextToken !== void 0 && nextToken !== "");
 	return out;
 }
-async function fetchAllExports(client) {
+async function fetchAllExportEntries(client) {
 	const out = /* @__PURE__ */ new Map();
 	let nextToken;
 	let pages = 0;
@@ -5696,7 +6022,10 @@ async function fetchAllExports(client) {
 		const resp = await client.send(new ListExportsCommand({ ...nextToken !== void 0 && { NextToken: nextToken } }));
 		for (const exp of resp.Exports ?? []) {
 			if (exp.Name === void 0 || exp.Value === void 0) continue;
-			out.set(exp.Name, exp.Value);
+			out.set(exp.Name, {
+				value: exp.Value,
+				exportingStackId: exp.ExportingStackId
+			});
 		}
 		nextToken = resp.NextToken;
 		pages += 1;
@@ -5715,6 +6044,9 @@ function resolveCfnStackName(fromCfnStack, stackName) {
 	if (typeof fromCfnStack === "string") return fromCfnStack;
 	return stackName;
 }
+function deployedStackName(opts, stackName) {
+	return resolveCfnStackName(opts.fromCfnStack ?? false, stackName);
+}
 function isCfnFlagPresent(opts) {
 	const v = opts.fromCfnStack;
 	return v !== void 0 && v !== false;
@@ -6033,6 +6365,78 @@ function looksLikeAccessDenied(err) {
 	return name === "AccessDeniedException" || code === "AccessDeniedException" || /access denied/i.test(message) || /not authorized/i.test(message);
 }
 
+// src/local/cross-stack-secret-check.ts
+const SECRET_MASK = "***";
+function crossStackSecretCheckOf(resolver) {
+	if (resolver === void 0 || typeof resolver.resolveImportJudged !== "function" || typeof resolver.resolveGetStackOutputJudged !== "function") return;
+	const r = resolver;
+	return {
+		resolveImportJudged: (exportName) => r.resolveImportJudged(exportName),
+		resolveGetStackOutputJudged: (stack, region, output) => r.resolveGetStackOutputJudged(stack, region, output)
+	};
+}
+function strongerJudgement(a, b) {
+	if (a === void 0) return b;
+	if (b === void 0) return a;
+	if (b.verdict === "secret" && a.verdict !== "secret") return b;
+	return a;
+}
+function judgementOf(judged) {
+	const { verdict, detail } = judged;
+	if (verdict === void 0) return void 0;
+	if (verdict === "secret") return { verdict };
+	const known = verdict === "unreadable" || verdict === "stale" ? verdict : "unreadable";
+	return typeof detail === "string" ? {
+		verdict: known,
+		detail
+	} : { verdict: known };
+}
+function judgedClause(judgement) {
+	const bin = getEmbedConfig().binaryName;
+	if (judgement.verdict === "secret") return "holding a secret of the producer stack";
+	if (judgement.verdict === "stale") return `the producer stack no longer exports, so ${bin} could not check it for secrets`;
+	return judgement.detail !== void 0 ? `${bin} could not check for secrets (${judgement.detail})` : `whose producer stack ${bin} could not read to check it for secrets`;
+}
+function crossStackSecretArgvReason(judgement) {
+	return `resolved a cross-stack value ${judgedClause(judgement)}, which ${getEmbedConfig().binaryName} will not put on the docker run command line; pass the value through Environment instead`;
+}
+function crossStackSecretValueFromReason(judgement) {
+	if (judgement.verdict === "secret") return "ValueFrom resolved a cross-stack value holding a secret of the producer stack, rather than naming a Secrets Manager secret or an SSM parameter";
+	return `ValueFrom resolved a cross-stack value ${judgedClause(judgement)}`;
+}
+function watchResolved(context, secrets) {
+	const seen = {
+		masked: false,
+		producerSecret: void 0
+	};
+	const inner = context.crossStackResolver;
+	if (!inner) return {
+		context,
+		seen
+	};
+	const watch = (judged) => {
+		const { value } = judged;
+		if (value === void 0) return value;
+		if (value === SECRET_MASK) seen.masked = true;
+		seen.producerSecret = strongerJudgement(seen.producerSecret, judgementOf(judged));
+		return value;
+	};
+	const resolver = secrets ? {
+		resolveImport: async (exportName) => watch(await secrets.resolveImportJudged(exportName)),
+		resolveGetStackOutput: async (stack, region, output) => watch(await secrets.resolveGetStackOutputJudged(stack, region, output))
+	} : {
+		resolveImport: async (exportName) => watch({ value: await inner.resolveImport(exportName) }),
+		resolveGetStackOutput: async (stack, region, output) => watch({ value: await inner.resolveGetStackOutput(stack, region, output) })
+	};
+	return {
+		context: {
+			...context,
+			crossStackResolver: resolver
+		},
+		seen
+	};
+}
+
 // src/local/state-resolver.ts
 function substituteAgainstState(value, contextOrResources) {
 	const context = isContext(contextOrResources) ? contextOrResources : { resources: contextOrResources };
@@ -6131,9 +6535,15 @@ function resolvePseudoParameter(name, pseudo) {
 				value: pseudo.urlSuffix
 			};
 			break;
+		case "AWS::StackName":
+			if (pseudo.stackName !== void 0) return {
+				kind: "literal",
+				value: pseudo.stackName
+			};
+			break;
 		default: return {
 			kind: "unresolved",
-			reason: `Ref ${displayIdent(name)}: pseudo parameter not supported (supported: AWS::AccountId, AWS::Region, AWS::Partition, AWS::URLSuffix)`
+			reason: `Ref ${displayIdent(name)}: pseudo parameter not supported (supported: AWS::AccountId, AWS::Region, AWS::Partition, AWS::URLSuffix, AWS::StackName)`
 		};
 	}
 	return {
@@ -6632,16 +7042,18 @@ async function substituteEnvVarsFromStateAsync(templateEnv, contextOrResources)
 		audit
 	};
 	const context = isContext(contextOrResources) ? contextOrResources : { resources: contextOrResources };
+	const producerSecrets = crossStackSecretCheckOf(context.crossStackResolver);
 	for (const [key, value] of Object.entries(templateEnv)) {
 		if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
 			defineOwnKey(env, key, value);
 			continue;
 		}
-		const { result, consumedSensitive } = await resolveWithSensitivityAsync(value, context);
+		const watched = watchResolved(context, producerSecrets);
+		const { result, consumedSensitive } = await resolveWithSensitivityAsync(value, watched.context);
 		if (result.kind === "literal") {
 			defineOwnKey(env, key, result.value);
 			audit.resolvedKeys.push(key);
-			if (consumedSensitive) audit.sensitiveKeys.push(key);
+			if (consumedSensitive || watched.seen.producerSecret !== void 0) audit.sensitiveKeys.push(key);
 		} else audit.unresolved.push({
 			key,
 			reason: result.reason
@@ -7285,21 +7697,13 @@ function resolveArgvArray(raw, field, subContext, context, unresolved) {
 	});
 }
 const STATE_SECRET_MASK = "***";
-const SECRET_ATTRIBUTE_NAME = /secret|password|credential/i;
-const NON_SECRET_ATTRIBUTE_SUFFIX = /(arn|id|name|url|alias|status)$/i;
-const SECRET_VALUED_ATTRIBUTES = /* @__PURE__ */ new Map([
-	["AWS::AppSync::ApiKey", ["ApiKey"]],
-	["AWS::EC2::IpamExternalResourceVerificationToken", ["TokenValue"]],
-	["AWS::IVS::StreamKey", ["Value"]]
-]);
 function secretAttributeRead(element, stateResources) {
 	for (const [logicalId, attribute] of getAttReads(element)) {
 		const record = Object.hasOwn(stateResources, logicalId) ? stateResources[logicalId] : void 0;
 		const recorded = record?.attributes;
 		const stored = recorded && Object.hasOwn(recorded, attribute) ? recorded[attribute] : void 0;
 		const type = typeof record?.resourceType === "string" ? record.resourceType : "";
-		const typed = SECRET_VALUED_ATTRIBUTES.get(type);
-		if (SECRET_ATTRIBUTE_NAME.test(attribute) && !NON_SECRET_ATTRIBUTE_SUFFIX.test(attribute) || typed?.includes(attribute) === true || type.startsWith("Custom::") || type === "AWS::CloudFormation::CustomResource" || type === "AWS::CloudFormation::Stack" && attribute.startsWith("Outputs.") || stored === STATE_SECRET_MASK) return `reads ${displayIdent(logicalId)}.${displayIdent(attribute)}, an attribute that is or may be a secret, which ${getEmbedConfig().binaryName} will not put on the docker run command line; pass the value through Environment or Secrets instead`;
+		if (isSecretAttributeName(attribute) || isSecretValuedAttribute(type, attribute) || isCustomResourceType(type) || type === "AWS::CloudFormation::Stack" && attribute.startsWith("Outputs.") || stored === STATE_SECRET_MASK) return `reads ${displayIdent(logicalId)}.${displayIdent(attribute)}, an attribute that is or may be a secret, which ${getEmbedConfig().binaryName} will not put on the docker run command line; pass the value through Environment or Secrets instead`;
 	}
 }
 function getAttReads(node, out = []) {
@@ -7345,20 +7749,17 @@ function computedAttributeRead(node) {
 		if (r !== void 0) return r;
 	}
 }
-function withMaskWatch(context, masked) {
-	const inner = context.crossStackResolver;
-	if (!inner) return context;
-	const watch = (v) => {
-		if (v === STATE_SECRET_MASK) masked.hit = true;
-		return v;
-	};
-	return {
-		...context,
-		crossStackResolver: {
-			resolveImport: async (exportName) => watch(await inner.resolveImport(exportName)),
-			resolveGetStackOutput: async (stack, region, output) => watch(await inner.resolveGetStackOutput(stack, region, output))
-		}
-	};
+const SECRET_POINTER_ARN = /^arn:aws(?:-[a-z]+)*:(?:secretsmanager:[a-z0-9-]+:\d{12}:secret:[A-Za-z0-9/_+=.@!-]+(?::[A-Za-z0-9/_+=.@-]*:[A-Za-z0-9/_+=.@-]*:[A-Za-z0-9/_+=.@-]*)?|ssm:[a-z0-9-]+:\d{12}:parameter\/[A-Za-z0-9/_.-]+)$/;
+function isSecretPointerArn(value) {
+	return SECRET_POINTER_ARN.test(value);
+}
+function redropSecret(task, container, containerName, name, reason) {
+	const own = `Secret ${displayIdent(name)} dropped:`;
+	const line = `${own} ${reason}`;
+	container.warnings = [...container.warnings.filter((w) => !w.startsWith(own)), line];
+	const taskOwn = `Container ${displayIdent(containerName)}: ${own}`;
+	task.warnings = [...task.warnings.filter((w) => !w.startsWith(taskOwn)), `Container ${displayIdent(containerName)}: ${line}`];
+	if (!container.droppedSecretNames?.includes(name)) container.droppedSecretNames = [...container.droppedSecretNames ?? [], name];
 }
 const CROSS_STACK_ARGV_REASON = "a cross-stack reference (Fn::ImportValue / Fn::GetStackOutput): it resolves only from a state source with the producer stack deployed";
 function argvValue(sub, consumedSensitive) {
@@ -7715,6 +8116,7 @@ function withContainerState(context, state) {
 async function applyCrossStackResolverToTask(task, context, containerState) {
 	if (!context.crossStackResolver) return;
 	const { resolveDynamicReferences: _envOnly, ...secretContext } = context;
+	const producerSecrets = crossStackSecretCheckOf(context.crossStackResolver);
 	const rawContainers = (task.resource.Properties ?? {})["ContainerDefinitions"];
 	if (!Array.isArray(rawContainers)) return;
 	for (let idx = 0; idx < task.containers.length; idx += 1) {
@@ -7741,11 +8143,12 @@ async function applyCrossStackResolverToTask(task, context, containerState) {
 			if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") continue;
 			if (Object.hasOwn(container.environment, key)) continue;
 			if (!isCrossStackIntrinsic(value)) continue;
-			const { result: sub, consumedSensitive } = await resolveWithSensitivityAsync(value, containerContext);
+			const watched = watchResolved(containerContext, producerSecrets);
+			const { result: sub, consumedSensitive } = await resolveWithSensitivityAsync(value, watched.context);
 			if (sub.kind === "literal") {
 				defineOwnKey(container.environment, key, String(sub.value));
 				resolvedEnvKeys.add(key);
-				if (consumedSensitive && !container.sensitiveEnvKeys.includes(key)) container.sensitiveEnvKeys.push(key);
+				if ((consumedSensitive || watched.seen.producerSecret !== void 0) && !container.sensitiveEnvKeys.includes(key)) container.sensitiveEnvKeys.push(key);
 			}
 		}
 		if (Array.isArray(c["Secrets"])) for (const entry of c["Secrets"]) {
@@ -7757,7 +8160,12 @@ async function applyCrossStackResolverToTask(task, context, containerState) {
 			if (typeof valueFromRaw === "string" && valueFromRaw.length > 0) continue;
 			if (container.secrets.some((s) => s.name === sName)) continue;
 			if (!isCrossStackIntrinsic(valueFromRaw)) continue;
-			const sub = await substituteAgainstStateAsync(valueFromRaw, ownState ? withContainerState(secretContext, ownState) : secretContext);
+			const watched = watchResolved(ownState ? withContainerState(secretContext, ownState) : secretContext, producerSecrets);
+			const sub = await substituteAgainstStateAsync(valueFromRaw, watched.context);
+			if (watched.seen.producerSecret !== void 0 && !(watched.seen.producerSecret.verdict !== "secret" && sub.kind === "literal" && typeof sub.value === "string" && isSecretPointerArn(sub.value))) {
+				redropSecret(task, container, containerName, sName, crossStackSecretValueFromReason(watched.seen.producerSecret));
+				continue;
+			}
 			if (sub.kind === "literal" && typeof sub.value === "string" && sub.value.length > 0) {
 				container.secrets.push({
 					name: sName,
@@ -7784,9 +8192,9 @@ async function applyCrossStackResolverToTask(task, context, containerState) {
 					});
 					continue;
 				}
-				const masked = { hit: false };
-				const { result: sub, consumedSensitive } = await resolveWithSensitivityAsync(rawElement, withMaskWatch(argvContext, masked));
-				const arg = masked.hit ? { reason: `resolved a cross-stack value recorded as the secret mask (${STATE_SECRET_MASK}), not the deployed value` } : argvValue(sub, consumedSensitive);
+				const watched = watchResolved(argvContext, producerSecrets);
+				const { result: sub, consumedSensitive } = await resolveWithSensitivityAsync(rawElement, watched.context);
+				const arg = watched.seen.masked ? { reason: `resolved a cross-stack value recorded as the secret mask (${STATE_SECRET_MASK}), not the deployed value` } : watched.seen.producerSecret !== void 0 ? { reason: crossStackSecretArgvReason(watched.seen.producerSecret) } : argvValue(sub, consumedSensitive);
 				if ("value" in arg) {
 					target[u.index] = arg.value;
 					continue;
@@ -10871,7 +11279,7 @@ function envHasCrossStackIntrinsic(templateEnv) {
 	if (!templateEnv) return false;
 	return Object.values(templateEnv).some(containsCrossStackIntrinsic);
 }
-async function resolvePseudoParametersForInvoke(stackRegion, options) {
+async function resolvePseudoParametersForInvoke(stackRegion, options, stackName) {
 	const logger = getLogger();
 	const region = options.region ?? namedEnvAwsRegion() ?? process.env["AWS_DEFAULT_REGION"] ?? regionOrAmbientDefault(stackRegion);
 	if (!region) logger.warn(`Resolver references \${AWS::Region} but ${getEmbedConfig().binaryName} could not determine the target region. Pass --region, set AWS_REGION, or declare env.region on the CDK stack.`);
@@ -10898,7 +11306,8 @@ async function resolvePseudoParametersForInvoke(stackRegion, options) {
 		...partitionAndSuffix && {
 			partition: partitionAndSuffix.partition,
 			urlSuffix: partitionAndSuffix.urlSuffix
-		}
+		},
+		...stackName !== void 0 && { stackName: deployedStackName(options, stackName) }
 	};
 	return Object.keys(bag).length === 0 ? void 0 : bag;
 }
@@ -11015,7 +11424,7 @@ async function resolveLambdaContainerEnvWith(lambda, options, profileCredentials
 				})
 			};
 			if (envHasIntrinsicValue$1(templateEnv)) {
-				const pseudo = await resolvePseudoParametersForInvoke(lambda.stack.region, options);
+				const pseudo = await resolvePseudoParametersForInvoke(lambda.stack.region, options, lambda.stack.stackName);
 				if (pseudo) subContext.pseudoParameters = pseudo;
 			}
 			if (envHasIntrinsicValue$1(templateEnv) && stateProvider.resolveTemplateSsmParameters) {
@@ -17731,7 +18140,7 @@ async function loadStackStateBundle(stack, provider, args) {
 			region: loaded.region
 		};
 		if (args.intrinsicEnv) {
-			const pseudo = args.pseudoParameters ?? await resolvePseudoParametersForStartApi(loaded.region, args.options);
+			const pseudo = args.pseudoParameters ?? await resolvePseudoParametersForStartApi(loaded.region, args.options, stack.stackName);
 			if (pseudo) bundle.pseudoParameters = pseudo;
 		}
 		if (provider.resolveDeployedFunctionEnv) {
@@ -17758,7 +18167,7 @@ async function loadStackStateBundle(stack, provider, args) {
 		provider.dispose();
 	}
 }
-async function resolvePseudoParametersForStartApi(stateRegion, options) {
+async function resolvePseudoParametersForStartApi(stateRegion, options, stackName) {
 	const logger = getLogger();
 	const region = options.region ?? namedEnvAwsRegion() ?? process.env["AWS_DEFAULT_REGION"] ?? regionOrAmbientDefault(stateRegion);
 	let accountId;
@@ -17784,7 +18193,8 @@ async function resolvePseudoParametersForStartApi(stateRegion, options) {
 		...partitionAndSuffix && {
 			partition: partitionAndSuffix.partition,
 			urlSuffix: partitionAndSuffix.urlSuffix
-		}
+		},
+		...stackName !== void 0 && { stackName: deployedStackName(options, stackName) }
 	};
 	return Object.keys(bag).length === 0 ? void 0 : bag;
 }
@@ -17938,7 +18348,7 @@ function computeCodeImageTag(sourceDir, runtime, entryPoint, dockerfile) {
 
 // src/local/agentcore-s3-bundle.ts
 async function downloadAndExtractS3Bundle(location, options = {}) {
-	const ref = formatRef(location);
+	const ref = formatRef(location, options.redactBucket);
 	getLogger().info(`Downloading fromS3 code bundle ${ref}...`);
 	const bytes = await (options.fetchObject ?? defaultFetchObject$1(options))(location);
 	let files;
@@ -17973,9 +18383,9 @@ async function downloadAndExtractS3Bundle(location, options = {}) {
 		}).then(() => void 0)
 	};
 }
-function formatRef(location) {
+function formatRef(location, redactBucket = false) {
 	const version = location.versionId ? `?versionId=${flattenToOneLine(location.versionId)}` : "";
-	return `s3://${flattenToOneLine(location.bucket)}/${flattenToOneLine(location.key)}${version}`;
+	return `s3://${redactBucket ? "<cross-stack value withheld>" : flattenToOneLine(location.bucket)}/${flattenToOneLine(location.key)}${version}`;
 }
 function resolveSafeEntryPath(root, entry) {
 	const dest = normalize(join(root, entry));
@@ -18007,11 +18417,11 @@ function defaultFetchObject$1(options) {
 				Key: location.key,
 				...location.versionId && { VersionId: location.versionId }
 			}));
-			if (!res.Body) throw new CdkLocalError(`S3 GetObject for ${formatRef(location)} returned an empty body.`, "LOCAL_INVOKE_AGENTCORE_S3_BUNDLE_EMPTY_BODY");
+			if (!res.Body) throw new CdkLocalError(`S3 GetObject for ${formatRef(location, options.redactBucket)} returned an empty body.`, "LOCAL_INVOKE_AGENTCORE_S3_BUNDLE_EMPTY_BODY");
 			return await res.Body.transformToByteArray();
 		} catch (err) {
 			if (err instanceof CdkLocalError) throw err;
-			throw new CdkLocalError(`S3 GetObject for ${formatRef(location)} failed: ${describeAwsFailureForWarn(err, "S3 GetObject (fromS3 bundle)")}`, "LOCAL_INVOKE_AGENTCORE_S3_BUNDLE_FETCH_FAILED");
+			throw new CdkLocalError(`S3 GetObject for ${formatRef(location, options.redactBucket)} failed: ${describeAwsFailureForWarn(err, "S3 GetObject (fromS3 bundle)")}`, "LOCAL_INVOKE_AGENTCORE_S3_BUNDLE_FETCH_FAILED");
 		} finally {
 			client.destroy();
 		}
@@ -18681,7 +19091,7 @@ async function localInvokeAgentCoreCommand(target, options, extraStateProviders)
 				logger.info(`${resolved.protocol} runtime: invoking the local container's ${pathLabel} directly (vanilla ${resolved.protocol}). An inbound JWT / --bearer-token is an AgentCore managed-plane concern and is not applied locally.`);
 			}
 		} else authorization = await resolveInboundAuthorization(resolved, options);
-		await resolveFromS3BucketIntrinsic(resolved, stateProvider, loadedState, imageContext);
+		await resolveFromS3BucketIntrinsic(resolved, stateProvider, loadedState, imageContext, options);
 		const image = await resolveAgentCoreImage(resolved, options, loadedState, stateProvider);
 		const { env: dockerEnv, sensitiveEnvKeys } = await buildContainerEnv(resolved, options, profileCredentials, profileCredsFile, stateProvider, loadedState, imageContext);
 		const hostPort = await pickFreePort();
@@ -18750,7 +19160,7 @@ async function localInvokeAgentCoreCommand(target, options, extraStateProviders)
 						loaded: void 0
 					};
 					const newResolved = resolveAgentCoreTarget(resolvedTarget, newStacks, newImageContext);
-					await resolveFromS3BucketIntrinsic(newResolved, stateProvider, newLoaded, newImageContext);
+					await resolveFromS3BucketIntrinsic(newResolved, stateProvider, newLoaded, newImageContext, options);
 					const newImage = await resolveAgentCoreImage(newResolved, options, newLoaded, stateProvider);
 					const { env: newEnv, sensitiveEnvKeys: newSensitive } = await buildContainerEnv(newResolved, options, profileCredentials, profileCredsFile, stateProvider, newLoaded, newImageContext);
 					if (signal?.aborted) throw new CdkLocalError("Reload cancelled: shutting down.", "LOCAL_INVOKE_AGENTCORE_WATCH_CANCELLED");
@@ -18992,7 +19402,8 @@ async function resolveAgentCoreCodeImageFromS3(resolved, code, s3Source, options
 		workload: {
 			logicalId: resolved.logicalId,
 			cdkPath: readCdkPathOrUndefined(resolved.resource)
-		}
+		},
+		...s3Source.bucketWithheld === true && { redactBucket: true }
 	});
 	try {
 		return await buildAgentCoreCodeImage({
@@ -19040,8 +19451,10 @@ async function buildContainerEnvWith(resolved, options, profileCredentials, prof
 				consumer: `AgentCore Runtime ${resolved.logicalId} cross-stack env value`
 			})
 		};
-		const pseudo = imageContext?.pseudoParameters ?? derivePseudoParametersFromRegion(loaded.region);
-		if (pseudo) subContext.pseudoParameters = pseudo;
+		subContext.pseudoParameters = imageContext?.pseudoParameters ?? {
+			...derivePseudoParametersFromRegion(loaded.region),
+			stackName: deployedStackName(options, resolved.stack.stackName)
+		};
 		if (imageContext?.stateParameters) subContext.parameters = imageContext.stateParameters;
 		if (imageContext?.stateSensitiveParameters?.length) subContext.sensitiveParameters = new Set(imageContext.stateSensitiveParameters);
 		const resolver = await stateProvider.buildCrossStackResolver(loaded.region);
@@ -19091,7 +19504,7 @@ async function buildContainerEnvWith(resolved, options, profileCredentials, prof
 		sensitiveEnvKeys
 	};
 }
-async function resolveFromS3BucketIntrinsic(resolved, stateProvider, loaded, imageContext) {
+async function resolveFromS3BucketIntrinsic(resolved, stateProvider, loaded, imageContext, options = {}) {
 	const s3Source = resolved.codeArtifact?.s3Source;
 	if (!s3Source || s3Source.bucketIntrinsic === void 0) return;
 	if (s3Source.bucket !== void 0) return;
@@ -19100,15 +19513,20 @@ async function resolveFromS3BucketIntrinsic(resolved, stateProvider, loaded, ima
 		resources: imageContext?.stateResources ?? loaded.resources,
 		consumerRegion: loaded.region
 	};
-	const pseudo = imageContext?.pseudoParameters ?? derivePseudoParametersFromRegion(loaded.region);
-	if (pseudo) subContext.pseudoParameters = pseudo;
+	subContext.pseudoParameters = imageContext?.pseudoParameters ?? {
+		...derivePseudoParametersFromRegion(loaded.region),
+		stackName: deployedStackName(options, resolved.stack.stackName)
+	};
 	const crossStackResolver = await stateProvider.buildCrossStackResolver(loaded.region);
 	if (crossStackResolver) subContext.crossStackResolver = crossStackResolver;
-	const result = await substituteAgainstStateAsync(s3Source.bucketIntrinsic, subContext);
+	const watched = watchResolved(subContext, crossStackSecretCheckOf(subContext.crossStackResolver));
+	const result = await substituteAgainstStateAsync(s3Source.bucketIntrinsic, watched.context);
 	if (result.kind !== "literal") throw new CdkLocalError(`Could not resolve AgentCore Runtime ${displayIdent(resolved.logicalId)} fromS3 Code.S3.Bucket intrinsic (${displayUntrustedValue(describeIntrinsic(s3Source.bucketIntrinsic))}) against the --from-cfn-stack state: ${result.reason}. Confirm the referenced resource / export exists in the deployed stack.`, "LOCAL_INVOKE_AGENTCORE_FROMS3_BUCKET_INTRINSIC_UNRESOLVED");
 	if (typeof result.value !== "string" || result.value.length === 0) throw new CdkLocalError(`AgentCore Runtime ${displayIdent(resolved.logicalId)} fromS3 Code.S3.Bucket intrinsic resolved to a ${typeof result.value} value, not a bucket name string. (${displayUntrustedValue(describeIntrinsic(s3Source.bucketIntrinsic))})`, "LOCAL_INVOKE_AGENTCORE_FROMS3_BUCKET_INTRINSIC_NOT_STRING");
 	s3Source.bucket = result.value;
-	getLogger().info(`Resolved fromS3 Code.S3.Bucket from state: ${describeIntrinsic(s3Source.bucketIntrinsic)} -> ${result.value}`);
+	const withheld = watched.seen.producerSecret !== void 0 || watched.seen.masked;
+	if (withheld) s3Source.bucketWithheld = true;
+	getLogger().info(withheld ? `Resolved fromS3 Code.S3.Bucket from state: ${describeIntrinsic(s3Source.bucketIntrinsic)} (value not shown: a cross-stack value its producer stack says may be a secret)` : `Resolved fromS3 Code.S3.Bucket from state: ${describeIntrinsic(s3Source.bucketIntrinsic)} -> ${result.value}`);
 }
 function describeIntrinsic(value) {
 	if (!value || typeof value !== "object") return String(value);
@@ -19128,8 +19546,10 @@ async function buildAgentCoreImageContext(candidate, stateProvider, options) {
 		logger.warn(`--from-cfn-stack: STS GetCallerIdentity failed: ${describeAwsFailureForWarn(err, "STS GetCallerIdentity")}. A same-stack ECR image URI referencing \${AWS::AccountId} may not resolve.`);
 	}
 	const context = {};
-	const pseudo = derivePseudoParametersFromRegion(region, accountId);
-	if (pseudo) context.pseudoParameters = pseudo;
+	context.pseudoParameters = {
+		...derivePseudoParametersFromRegion(region, accountId),
+		stackName: deployedStackName(options, candidate.stackName)
+	};
 	const loaded = await stateProvider.load(candidate.stackName, candidate.region);
 	if (loaded) {
 		context.stateResources = loaded.resources;
@@ -25287,7 +25707,8 @@ async function buildEcsImageResolutionContext$1(target, stacks, options, statePr
 			...partitionAndSuffix && {
 				partition: partitionAndSuffix.partition,
 				urlSuffix: partitionAndSuffix.urlSuffix
-			}
+			},
+			stackName: deployedStackName(options, candidate.stackName)
 		};
 	}
 	const wantsState = needs.needsStateResources || needs.needsEnvOrSecretSubstitution || wantsStateForTaskRole;
@@ -25784,7 +26205,8 @@ async function buildEcsImageResolutionContext(candidate, stateProvider, options,
 			...partitionAndSuffix && {
 				partition: partitionAndSuffix.partition,
 				urlSuffix: partitionAndSuffix.urlSuffix
-			}
+			},
+			stackName: deployedStackName(options, candidate.stackName)
 		};
 	}
 	const wantsState = needs.needsStateResources || needs.needsEnvOrSecretSubstitution || wantsStateForTaskRole;
@@ -30450,7 +30872,7 @@ async function serveAgentCore(target, options, extraStateProviders, hostSynthesi
 	const sigv4Context = await resolveAgentCoreSigV4Context(options, resolved, loadedState, stateProvider);
 	const authPlan = selectServeInboundAuth(resolved, options, sigv4Context !== void 0);
 	if (authPlan.authCheck && resolved.jwtAuthorizer) logger.info(`Inbound JWT: each request verified per-request against ${resolved.jwtAuthorizer.discoveryUrl}${options.verifyAuth === false ? " (verification DISABLED via --no-verify-auth)" : ""}.`);
-	await resolveFromS3BucketIntrinsic(resolved, stateProvider, loadedState, imageContext);
+	await resolveFromS3BucketIntrinsic(resolved, stateProvider, loadedState, imageContext, options);
 	const image = await resolveAgentCoreImage(resolved, options, loadedState, stateProvider);
 	const { env: dockerEnv, sensitiveEnvKeys } = await buildContainerEnv(resolved, options, profileCredentials, profileCredsFile, stateProvider, loadedState, imageContext);
 	let containerHostPort = await pickFreePort();
@@ -30561,7 +30983,7 @@ async function serveAgentCore(target, options, extraStateProviders, hostSynthesi
 					freshImageContext = ctx.context;
 					freshLoaded = ctx.loaded;
 					freshResolved = resolveAgentCoreTarget(resolvedTarget, freshStacks, freshImageContext);
-					await resolveFromS3BucketIntrinsic(freshResolved, stateProvider, freshLoaded, freshImageContext);
+					await resolveFromS3BucketIntrinsic(freshResolved, stateProvider, freshLoaded, freshImageContext, options);
 					const assetCtx = await loadAgentCoreAssetContext({
 						resolvedTarget,
 						resolved: freshResolved,
@@ -37297,4 +37719,4 @@ function addStudioSpecificOptions(cmd) {
 }
 
 export { postHook as $, AGENTCORE_A2A_PROTOCOL as $a, probeHostGatewaySupport as $i, addImageOverrideOptions as $n, loopbackForwarderPlan as $o, resolveApiTargetSubset as $r, classifyS3Error as $t, microvmFidelityWarnings as A, createLocalStateProvider as Aa, translateLambdaResponse as Ai, stripCloudFrontImport as An, readEnvCallerCredentials as Ao, A2A_CONTAINER_PORT as Ar, readContainerLogTail as At, MICROVM_WS_BASE_PROTOCOL as B, resolveWatchConfig as Ba, ConnectionRegistry as Bi, createLocalStartAlbCommand as Bn, HOST_DEFAULT_CREDENTIALS_MISS_TTL_MS as Bo, AGENTCORE_SESSION_ID_HEADER as Br, parseWebFunctionBuildConfig as Bt, addListSpecificOptions as C, substituteAgainstState as Ca, attachAuthorizers as Ci, WEB_FUNCTION_REVISION_TYPE as Cn, resolveDynamicReferencesInEnv as Co, setShadowReadyTimeoutMs as Cr, parseKvsFileOverrides as Ct, buildMicrovmLambdaView as D, materializeLayerFromArn as Da, isFunctionUrlOacFronted as Di, compileCloudFrontFunction as Dn, SECOND_ASSUME_MESSAGE as Do, createLocalInvokeAgentCoreCommand as Dr, WEB_FUNCTION_CONTAINER_PORT as Dt, addStartMicrovmSpecificOptions as E, substituteEnvVarsFromStateAsync as Ea, buildCorsConfigFromCloudFrontChain as Ei, resolveWebFunctionTarget as En, awsEndpointOptions as Eo, addInvokeAgentCoreSpecificOptions as Er, RecentOutput as Et, microvmImageTag as F, resolveCfnRegion as Fa, pickResponseTemplate as Fi, findFileAssetForObjectKey as Fn, AUTH_OFF_PLACEHOLDER_CREDENTIALS as Fo, MCP_PROTOCOL_VERSION as Fr, buildNodeEntryFileStart as Ft, startMicrovmFrontDoor as G, discoverWebSocketApis as Ga, buildDisconnectEvent as Gi, addStartServiceSpecificOptions as Gn, collectHostEndpointOverrides as Go, SUPPORTED_CODE_RUNTIMES as Gr, readWebFunctionServiceConfig as Gt, PROXY_PORT_HEADER as H, countTargets as Ha, handleConnectionsRequest as Hi, resolveAlbTarget as Hn, applyWorkloadAwsWiringToEnv as Ho, waitForAgentCoreHttpReady as Hr, WEB_FUNCTION_HTTP_ENDPOINT_ENV as Ht, planMicrovmPorts as I, resolveCfnStackName as Ia, selectIntegrationResponse as Ii, isBucketDeploymentResource as In, CA_TRUST_ENV_KEYS as Io, mcpInvokeOnce as Ir, defaultWebFunctionPlatform as It, MICROVM_HOOK_PATH_PREFIX as J, parseSelectionExpressionPath as Ja, createFileWatcher as Ji, addRunTaskSpecificOptions as Jn, getActiveWorkloadAwsWiring as Jo, renderCodeDockerfile as Jr, idFromArn as Jt, stripMicrovmProxyHeaders as K, discoverWebSocketApisOrThrow as Ka, buildMessageEvent as Ki, createLocalStartServiceCommand as Kn, displayEndpointValue as Ko, buildAgentCoreCodeImage as Kr, webFunctionAssumeRole as Kt, readExposedPorts as L, CfnLocalStateProvider as La, tryParseStatus as Li, resolveBucketDeploymentObjectKey as Ln, DEFAULT_AWS_EMULATOR_URL as Lo, parseSseForJsonRpc as Lr, resolveWebFunctionRuntime as Lt, DEFAULT_TERMINATE_HOOK_TIMEOUT_MS as M, isCfnFlagPresent as Ma, buildHttpApiV2Event as Mi, createLocalFileKvsDataSource as Mn, resetWorkloadIdentity as Mo, a2aInvokeOnce as Mr, waitForWebFunctionReady as Mt, LocalMicrovm as N, rejectExplicitCfnStackWithMultipleStacks as Na, buildRestV1Event as Ni, createUnboundCloudFrontModule as Nn, workloadClientConfig as No, MCP_CONTAINER_PORT as Nr, watchContainerExit as Nt, createLocalStartMicrovmCommand as O, LocalStateSourceError as Oa, matchPreflight as Oi, runViewerRequest as On, assumedRoleRecorded as Oo, bridgeAgentCoreWs as Or, containerFailure as Ot, buildMicrovmImage as P, resolveCfnFallbackRegion as Pa, evaluateResponseParameters as Pi, bucketDeploymentSourceObjectKeys as Pn, workloadStsClientConfig as Po, MCP_PATH as Pr, WEB_FUNCTION_RUNTIMES as Pt, pollBuildHook as Q, resolveLambdaArnIntrinsic as Qa, HOST_GATEWAY_MIN_VERSION as Qi, addEcsAssumeRoleOptions as Qn, logMixedModeForWorkload as Qo, createWatchPredicates as Qr, resolveDeployedOriginBucket as Qt, setContainerPaused as R, collectSsmParameterRefs as Ra, VtlEvaluationError as Ri, addAlbSpecificOptions as Rn, EMULATOR_SCRUBBED_ENV_KEYS as Ro, AGENTCORE_SIGV4_SERVICE as Rr, supportedWebFunctionRuntimes as Rt, StudioEventBus as S, containsCrossStackIntrinsic as Sa, invokeTokenAuthorizer as Si, WEB_FUNCTION_ENDPOINT_TYPE as Sn, parseDynamicReference as So, SOFT_RELOAD_COMPLETION_LOG_SUFFIX as Sr, normalizeKvsFileKeys as St, formatTargetListing as T, substituteEnvVarsFromState as Ta, buildCorsConfigByApiId as Ti, WebFunctionResolutionError as Tn, addAwsEndpointOptions as To, attachContainerLogStreamer as Tr, resolveCloudFrontTarget as Tt, rewriteUpgradeResponseHead as U, listTargets as Ua, parseConnectionsPath as Ui, isApplicationLoadBalancer as Un, awsEmulatorEnvName as Uo, waitForAgentCorePing as Ur, buildWebFunctionLambdaView as Ut, MicrovmStateError as V, resolveSingleTarget as Va, buildMgmtEndpointEnvUrl as Vi, parseLbPortOverrides as Vn, activateWorkloadAwsWiring as Vo, invokeAgentCore as Vr, resolveWebFunctionArtifact as Vt, selectTargetPort as W, availableWebSocketApiIdentifiers as Wa, buildConnectEvent as Wi, resolveAlbFrontDoor as Wn, awsEmulatorSqsHostBlocks as Wo, downloadAndExtractS3Bundle as Wr, finalizeWebFunctionEnv as Wt, callRuntimeHook as X, discoverRoutes as Xa, createLocalInvokeCommand as Xi, MAX_TASKS_SUBNET_RANGE_CAP as Xn, getContainerJavaTruststorePath as Xo, addStartApiSpecificOptions as Xr, createDeployedKvsDataSource as Xt, MicrovmHookError as Y, webSocketApiMatchesIdentifier as Ya, addInvokeSpecificOptions as Yi, createLocalRunTaskCommand as Yn, getContainerCaBundlePath as Yo, toCmdArgv as Yr, resolveKvsModulesForDistribution as Yt, generateMicrovmId as Z, pickRefLogicalId as Za, HOST_DOCKER_INTERNAL_GATEWAY as Zi, addCommonEcsServiceOptions as Zn, javaTruststoreToolOptions as Zo, createLocalStartApiCommand as Zr, resolveDeployedKvsArnByName as Zt, filterStudioTargetGroups as _, resolveRuntimeFileExtension as _a, verifyJwtViaDiscovery as _i, pickKvsLogicalIdFromArn as _n, containsDynamicReference as _o, isLocalCdkAssetImage as _r, sqsEmulatorOriginOf as _s, attachAgentCoreWsBridge as _t, createLocalStudioCommand as a, buildLoopbackForwarderDockerArgs as aa, filterRoutesByApiIdentifiers as ai, serveLambdaUrlOrigin as an, pickAgentCoreCandidateStack as ao, resolveSharedSidecarCredentials as ar, resolveAwsEmulatorOption as as, disposeMicrovmCodeArtifact as at, renderStudioHtml as b, assertEcsTaskCommandsResolved as ba, evaluateCachedLambdaPolicy as bi, pickWebFunctionEndpointLogicalIdFromOrigin as bn, keysNotFromTemplate as bo, CloudMapRegistry as br, buildStsClientConfig as bs, addStartCloudFrontSpecificOptions as bt, startStudioProxy as c, ensureForwarderImage as ca, startApiServer as ci, buildEdgeRequestEvent as cn, formatStateRemedy as co, buildImageOverrideTag as cr, setActiveWorkloadAwsWiring as cs, resolveMicrovmImageTarget as ct, createStudioDispatcher as d, buildContainerImage as da, defaultCredentialsLoader as di, httpHeadersToEdge as dn, LocalInvokeBuildError as do, mergeForService as dr, MIXED_MODE_RESIGN_BODY_CAP_BYTES as ds, createLocalStartWebFunctionCommand as dt, resolveHostGatewayExtraHosts as ea, createAuthorizerCache as ei, createS3OriginReader as en, AGENTCORE_AGUI_PROTOCOL as eo, buildEcsImageResolutionContext$1 as er, mergeJavaToolOptions as es, runHookBody as et, filterStudioCustomResources as f, dockerRegistryEnv as fa, buildCognitoJwksUrl as fi, CLOUDFRONT_DISTRIBUTION_TYPE as fn, ambientDefaultRegion as fo, parseImageOverrideFlags as fr, REAL_SQS_QUEUE_URL as fs, addStartAgentCoreSpecificOptions as ft, annotatePinnedEcsTargets as g, resolveRuntimeCodeMountPath as ga, verifyJwtAuthorizer as gi, pickFunctionUrlLogicalIdFromOrigin as gn, DynamicReferenceResolver as go, imageOverrideKeyAliases as gr, rewriteSqsQueueUrlsInEnv as gs, startAgentCoreHttpServer as gt, annotateEcsTaskPinnedTargets as h, stripEcrCredentials as ha, verifyCognitoJwt as hi, isCloudFrontDistribution as hn, DynamicReferenceResolutionError as ho, describePinnedImageUri as hr, repointLocalSqsQueueUrlsInEnv as hs, selectServeInboundAuth as ht, coerceStopRequest as i, awaitLoopbackForwarderStatus as ia, filterRoutesByApiIdentifier as ii, serveFromStaticOrigin as in, AgentCoreResolutionError as io, resolveEcsAssumeRoleOption as ir, readProfileEndpointSettings as is, MicrovmResolutionError as it, readRunHookPayload as j, groupWorkloadsRoutedApart as ja, applyAuthorizerOverlay as ji, createCloudFrontModule as jn, recordAssumedRole as jo, A2A_PATH as jr, startWebFunctionContainer as jt, finalizeMicrovmEnv as k, UNNAMED_WORKLOAD as ka, matchRoute as ki, runViewerResponse as kn, deployAccountStsClientConfig as ko, invokeAgentCoreWs as kr, planWebFunctionContainer as kt, relayServeRequest as l, startLoopbackForwarder as la, resolveSelectionExpression as li, buildEdgeResponseEvent as ln, substituteImagePlaceholders as lo, canonicalizeImageOverrideKeys as lr, takeAwsEmulatorStateSourceHint as ls, s3KeyOfUri as lt, annotateAlbPinnedBackingServices as m, noImplicitEcrPullArgs as ma, createJwksCache as mi, extractKvsAssociations as mn, setAmbientDefaultRegion as mo, runImageOverrideBuilds as mr, realSqsHostnames as ms, buildAgentCoreServeAuthCheck as mt, coerceRunRequest as n, withWorkloadAwsWiring as na, buildStageMap as ni, startCloudFrontServer as nn, AGENTCORE_MCP_PROTOCOL as no, parseMaxTasks as nr, probeAwsEmulatorHealth as ns, MICROVM_DEFAULT_INGRESS_PORT as nt, resolveServeBaseUrl as o, buildNamespaceOwnerForwarderDockerArgs as oa, groupRoutesByServer as oi, applyEdgeRequestResult as on, resolveAgentCoreTarget as oo, runEcsServiceEmulator as or, resolveHostDefaultCredentials as os, readMicrovmImageConfig as ot, isCustomResourceLambdaTarget as p, isEcrRegistryConfigKey as pa, buildJwksUrlFromIssuer as pi, describeS3OriginDomain as pn, namedEnvAwsRegion as po, resolveImageOverrides as pr, isRealAwsHost as ps, createLocalStartAgentCoreCommand as pt, MAX_RUN_HOOK_PAYLOAD_BYTES as q, filterWebSocketApisByIdentifiers as qa, classifySourceChange as qi, serviceStrategy as qn, effectiveLoopbackPorts as qo, computeCodeImageTag as qr, webFunctionFidelityWarnings as qt, coerceServeRequest as r, LOOPBACK_FORWARDER_IMAGE as ra, availableApiIdentifiers as ri, resolveErrorResponseCandidates as rn, AGENTCORE_RUNTIME_TYPE as ro, parseRestartPolicy as rr, readEmulatorRunFiles as rs, MICROVM_IMAGE_TYPE as rt, createStudioServeManager as s, describeForwarderFailure as sa, readMtlsMaterialsFromDisk as si, applyEdgeResponseResult as sn, derivePseudoParametersFromRegion as so, ImageOverrideError as sr, resolveWorkloadAwsWiring as ss, resolveMicrovmCodeArtifact as st, addStudioSpecificOptions as t, attachLoopbackForwarder as ta, attachStageContext as ti, matchBehavior as tn, AGENTCORE_HTTP_PROTOCOL as to, ecsClusterOption as tr, parseAwsEndpoint as ts, waitForAppAnswer as tt, reinvoke as u, architectureToPlatform as ua, resolveServiceIntegrationParameters as ui, edgeHeadersToHttp as un, tryResolveImageFnJoin as uo, enforceImageOverrideOrphans as ur, writeCaBundleFile as us, addStartWebFunctionSpecificOptions as ut, startStudioServer as v, resolveRuntimeImage as va, buildMethodArn as vi, pickLambdaEdgeFunctionLogicalId as vn, deployedFillMayBeSecret as vo, listPinnedTargets as vr, buildJavaTrustStore as vs, startAgentCoreWsBridge as vt, createLocalListCommand as w, substituteAgainstStateAsync as wa, applyCorsResponseHeaders as wi, WEB_FUNCTION_TYPE as wn, withoutKeys as wo, getContainerNetworkIp as wr, parseOriginOverrides as wt, createStudioStore as x, assertEcsTaskImagesResolvable as xa, invokeRequestAuthorizer as xi, resolveCloudFrontDistribution as xn, keysOverriddenBy as xo, DEFAULT_SHADOW_READY_TIMEOUT_MS as xr, resolveProfileCredentials as xs, createLocalStartCloudFrontCommand as xt, toStudioTargetGroups as y, EcsTaskResolutionError as ya, computeRequestIdentityHash as yi, pickTargetFunctionLogicalId as yn, firstUsableRegion as yo, buildCloudMapIndex as yr, createMixedModeTlsMaterials as ys, LocalStartCloudFrontError as yt, MICROVM_CONTROL_PATH as z, resolveSsmParameters as za, bufferToBody as zi, albStrategy as zn, HOST_CA_TRUST_ENV_KEYS as zo, signAgentCoreInvocation as zr, disposeWebFunctionArtifact as zt };
-//# sourceMappingURL=local-studio-CAxQV9HT.js.map
+//# sourceMappingURL=local-studio-D_aFesGK.js.map