cdk-local 0.110.0 → 0.111.0

package/dist/{local-studio-8hdH7a_R.js → local-studio-HtgyKdTW.js}

@@ -30155,6 +30155,7 @@ const STUDIO_SCRIPT = `
   let shownDetailId = null;        // captured request whose read-only detail is shown
   let pendingReqPrefill = null;    // {method,path,headers,body} to seed the next serve request composer (re-invoke)
   let studioDockerfiles = [];      // Dockerfiles scanned at boot (pinned-ecs image-override picker)
+  let lastAppliedCfn = null;       // last-applied --from-cfn-stack (null | true | name) — a change re-loads targets (issue #385)
 
   function el(tag, cls, text) {
     const e = document.createElement(tag);
@@ -30401,7 +30402,7 @@ const STUDIO_SCRIPT = `
     };
   }
 
-  // Per-backing-service image-override pickers for a pinned ALB (issue #382):
+  // Per-backing-service image-override pickers for a pinned ALB (issue #384):
   // one Dockerfile select per deployed-registry-pinned service the ALB fronts.
   // collect() returns a { [serviceId]: dockerfile } map threaded as
   // imageOverrides (one --image-override service=df per entry).
@@ -30659,7 +30660,7 @@ const STUDIO_SCRIPT = `
       lines.push('--image-override ' + applied.imageOverride);
     }
     // An alb serve threads a per-backing-service imageOverrides map (issue
-    // #382); surface one --image-override line each so the picks do not
+    // #384); surface one --image-override line each so the picks do not
     // silently vanish from the running view (the issue #356 contract).
     if (applied && applied.imageOverrides) {
       Object.keys(applied.imageOverrides).forEach(function (svc) {
@@ -30801,7 +30802,7 @@ const STUDIO_SCRIPT = `
         ws.appendChild(io.node);
         collectImageOverride = io.collect;
       }
-      // An ALB boots its backing ECS services (issue #382); a pinned backing
+      // An ALB boots its backing ECS services (issue #384); a pinned backing
       // service has the same "local edits do not take effect" problem, so offer
       // a per-service Dockerfile picker that threads
       // --image-override service=dockerfile to start-alb.
@@ -31754,6 +31755,9 @@ const STUDIO_SCRIPT = `
       cfn.checked = on;
       cfnName.value = typeof c.fromCfnStack === 'string' ? c.fromCfnStack : '';
       cfnName.style.display = on ? '' : 'none';
+      // Seed the last-applied from-cfn-stack signature so the first Session-bar
+      // edit only re-loads targets if it actually changes the binding (#385).
+      lastAppliedCfn = on ? (typeof c.fromCfnStack === 'string' && c.fromCfnStack ? c.fromCfnStack : true) : null;
       // assume-role is now checkbox-gated, symmetric with from-cfn-stack
       // (issue #343): the ARN input appears only when the box is checked.
       const roleOn = document.getElementById('sess-role-on');
@@ -31782,8 +31786,9 @@ const STUDIO_SCRIPT = `
     const role = document.getElementById('sess-role');
     const roleOn = document.getElementById('sess-role-on');
     const msg = document.getElementById('sess-msg');
+    const nextCfn = cfn.checked ? cfnName.value.trim() || true : null;
     const body = {
-      fromCfnStack: cfn.checked ? cfnName.value.trim() || true : null,
+      fromCfnStack: nextCfn,
       // assume-role is explicit-ARN-only: checked + empty is simply not bound.
       assumeRole: roleOn.checked ? role.value.trim() || null : null,
       watch: document.getElementById('sess-watch').checked,
@@ -31801,17 +31806,32 @@ const STUDIO_SCRIPT = `
       }
       msg.textContent = '✓ applied';
       setTimeout(function () { msg.textContent = ''; }, 1200);
-      // Do NOT re-load from the server here (issue #349): the UI already shows
-      // exactly what was just PATCHed, and re-loading CLOBBERS the controls.
-      // assume-role has no bare server form, so a checked-but-empty assume-role
-      // PATCHes null; re-loading would read that back and immediately UN-check
-      // the box + hide the ARN input — so clicking the checkbox appeared to do
-      // nothing. loadConfig() runs once on init.
+      // Do NOT re-load the SESSION CONTROLS from the server here (issue #349):
+      // the UI already shows exactly what was just PATCHed, and re-loading
+      // CLOBBERS the controls. assume-role has no bare server form, so a
+      // checked-but-empty assume-role PATCHes null; re-loading would read that
+      // back and immediately UN-check the box. loadConfig() runs once on init.
+      //
+      // But a --from-cfn-stack change DID re-classify the targets server-side
+      // (issue #385) — the PATCH response already reflects the new binding, and
+      // the server swapped its target list. Re-fetch /api/targets so the
+      // image-override pickers appear / disappear without restarting studio.
+      // Only when the binding actually changed, so a watch / role toggle does
+      // not needlessly rebuild the target pane. Running-serve rows are
+      // preserved on re-render (serveState + updateServeRow drive them).
+      if (!sameCfn(nextCfn, lastAppliedCfn)) {
+        lastAppliedCfn = nextCfn;
+        await loadTargets();
+      }
     } catch (err) {
       msg.textContent = 'Failed: ' + err;
     }
   }
 
+  // Two --from-cfn-stack values are the same binding when both clear (null),
+  // both bare (true), or the same stack name.
+  function sameCfn(a, b) { return a === b; }
+
   function wireSession() {
     const cfn = document.getElementById('sess-cfn');
     const cfnName = document.getElementById('sess-cfn-name');
@@ -31995,7 +32015,7 @@ function annotatePinnedEcsTargets(groups, classify) {
 }
 /**
 * Annotate each `alb` entry of `groups` with the deployed-registry-pinned ECS
-* services that ALB fronts (issue #382), so the alb composer can offer a
+* services that ALB fronts (issue #384), so the alb composer can offer a
 * per-service image-override Dockerfile picker. `resolveBackingPinned` maps one
 * ALB entry to its pinned backing services (`{ id, label }`, where `id` is the
 * `--image-override` key — `start-alb`'s `Stack:LogicalId` service-boot
@@ -32054,11 +32074,11 @@ async function startStudioServer(options) {
 	const host = options.host ?? "127.0.0.1";
 	const maxBump = options.maxPortBump ?? 20;
 	const html = renderStudioHtml(options.appLabel, options.cliName);
-	const targetsJson = JSON.stringify({
+	let targetsJson = JSON.stringify({
 		groups: options.targetGroups,
 		dockerfiles: options.dockerfiles ?? []
 	});
-	const server = createServer$1((req, res) => handleRequest(req, res, options.bus, html, targetsJson, options));
+	const server = createServer$1((req, res) => handleRequest(req, res, options.bus, html, () => targetsJson, options));
 	const boundPort = await listenWithBump(server, host, options.port, maxBump);
 	return {
 		url: `http://${host}:${boundPort}`,
@@ -32066,10 +32086,16 @@ async function startStudioServer(options) {
 		close: () => new Promise((resolveClose, reject) => {
 			server.close((err) => err ? reject(err) : resolveClose());
 			server.closeAllConnections?.();
-		})
+		}),
+		setTargets: (groups, dockerfiles) => {
+			targetsJson = JSON.stringify({
+				groups,
+				dockerfiles: dockerfiles ?? []
+			});
+		}
 	};
 }
-function handleRequest(req, res, bus, html, targetsJson, options) {
+function handleRequest(req, res, bus, html, getTargetsJson, options) {
 	const url = req.url ?? "/";
 	const path = url.split("?")[0];
 	if (req.method === "GET" && (path === "/" || path === "/index.html")) {
@@ -32079,7 +32105,7 @@ function handleRequest(req, res, bus, html, targetsJson, options) {
 	}
 	if (req.method === "GET" && path === "/api/targets") {
 		res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
-		res.end(targetsJson);
+		res.end(getTargetsJson());
 		return;
 	}
 	if (req.method === "GET" && path === "/api/running") {
@@ -33680,9 +33706,10 @@ async function prepareEcsImageContexts(args) {
 * the pin resolves, and surfaces a WARN (not a silent DEBUG swallow) when a
 * service still cannot be classified.
 *
-* NOTE: the target list + these pinned flags are computed ONCE at boot. A
-* run-time Session-bar `--from-cfn-stack` change (`PATCH /api/config`) does
-* NOT re-classify — restart studio to re-detect pins under a new binding.
+* The classifier is re-run whenever the Session-bar `--from-cfn-stack` binding
+* changes (`PATCH /api/config`), so the pickers appear / disappear under the
+* new binding without restarting studio (issue #385) — `classifyTargets`
+* re-invokes this against a fresh clone of the un-annotated target groups.
 *
 * Returns a `(id) => boolean` callback (true = pinned). Exported for testing.
 */
@@ -33700,7 +33727,7 @@ function makePinClassifier(args) {
 }
 /**
 * Build the boot-time resolver `annotateAlbPinnedBackingServices` calls per
-* `alb` entry (issue #382). It resolves the ALB to its backing ECS services
+* `alb` entry (issue #384). It resolves the ALB to its backing ECS services
 * (`resolveAlbFrontDoor`, template-only) and returns the subset that is in
 * `pinnedEcsByQualifiedId` — the `ecs` services already classified as a
 * deployed-registry pin by {@link makePinClassifier}. Each returned `id` is the
@@ -33740,6 +33767,86 @@ function makeAlbBackingPinnedResolver(args) {
 		}
 	};
 }
+/**
+* Classify the studio target list for a given `--from-cfn-stack` binding
+* (issue #385): annotate a FRESH clone of the un-annotated base groups with the
+* `pinned` (ecs services) + `backingPinnedServices` (alb entries) image-override
+* hints, and scan the app dir for Dockerfiles when at least one target is
+* pinned. Returns the annotated groups + dockerfiles; the un-annotated
+* `baseGroups` argument is left untouched so it can be re-classified under a
+* different binding (the Session-bar `--from-cfn-stack` change path —
+* `PATCH /api/config` — re-runs this and swaps the served target list, so the
+* pickers appear without restarting studio). Runs once at boot and again per
+* binding change.
+*
+* The clone means a re-classify never inherits stale pins; the `fromCfnStack`
+* override is threaded into the state-source options so the pin classifier
+* resolves INTRINSIC-ECR images against the right (or no) deployed stack
+* (issue #354). Exported for unit testing.
+*/
+async function classifyStudioTargets(args) {
+	const { baseGroups, stacks, servableEcs, options, fromCfnStack, logger } = args;
+	const groups = structuredClone(baseGroups);
+	const classifyOptions = {
+		...options,
+		fromCfnStack
+	};
+	const anyPinned = annotatePinnedEcsTargets(groups, makePinClassifier({
+		stacks,
+		contextByStack: await prepareEcsImageContexts({
+			serviceIds: [...servableEcs],
+			stacks,
+			options: classifyOptions,
+			logger
+		}),
+		logger
+	}));
+	const pinnedEcsByQualifiedId = /* @__PURE__ */ new Map();
+	for (const g of groups) {
+		if (g.kind !== "ecs") continue;
+		for (const e of g.entries) if (e.pinned) pinnedEcsByQualifiedId.set(e.qualifiedId, e.id);
+	}
+	const anyAlbBackingPinned = annotateAlbPinnedBackingServices(groups, makeAlbBackingPinnedResolver({
+		stacks,
+		pinnedEcsByQualifiedId,
+		logger
+	}));
+	return {
+		groups,
+		dockerfiles: anyPinned || anyAlbBackingPinned ? discoverDockerfiles(process.cwd()) : []
+	};
+}
+/**
+* Re-classify the studio target list when the Session-bar `--from-cfn-stack`
+* binding changes (issue #385), and swap the served list via `applyTargets`.
+* The orchestration the `PATCH /api/config` handler runs, extracted so its
+* branches are unit-testable without booting the studio server:
+*
+*  - **change gate**: returns immediately when `after === before` (a watch /
+*    assume-role toggle does not change the pin classification);
+*  - **latest-wins**: bumps `tokenRef.current` before the async `classify` and
+*    applies the result ONLY if its token is still current — so a slow earlier
+*    re-classify cannot clobber a newer binding's result when patches arrive in
+*    quick succession;
+*  - **fail-soft**: a `classify` rejection is WARN-logged and the previous
+*    target list is kept (never throws — the PATCH still returns the config).
+*
+* `after` (the post-patch binding) is threaded into `classify`, never the boot
+* value, so the pin classifier resolves against the new stack. Exported for
+* unit testing.
+*/
+async function reclassifyTargetsOnBindingChange(args) {
+	const { before, after, classify, applyTargets, tokenRef, logger } = args;
+	if (after === before) return;
+	logger.info("--from-cfn-stack binding changed; re-classifying targets...");
+	const myToken = ++tokenRef.current;
+	try {
+		const { groups, dockerfiles } = await classify(after);
+		if (myToken === tokenRef.current) applyTargets(groups, dockerfiles);
+	} catch (err) {
+		logger.warn(`studio: could not re-classify targets after a --from-cfn-stack change; the target list keeps its previous pins (restart studio to retry). ${err instanceof Error ? err.message : String(err)}`);
+	}
+}
 async function localStudioCommand(options) {
 	const logger = getLogger();
 	if (options.verbose) logger.setLevel("debug");
@@ -33776,27 +33883,16 @@ async function localStudioCommand(options) {
 	}
 	const appLabel = stacks.map((s) => s.stackName).join(", ") || appCmd;
 	const servableEcs = new Set(targetGroups.filter((g) => g.kind === "ecs").flatMap((g) => g.entries.filter((e) => e.servable).map((e) => e.id)));
-	const anyPinned = annotatePinnedEcsTargets(targetGroups, makePinClassifier({
-		stacks,
-		contextByStack: await prepareEcsImageContexts({
-			serviceIds: [...servableEcs],
-			stacks,
-			options,
-			logger
-		}),
-		logger
-	}));
-	const pinnedEcsByQualifiedId = /* @__PURE__ */ new Map();
-	for (const g of targetGroups) {
-		if (g.kind !== "ecs") continue;
-		for (const e of g.entries) if (e.pinned) pinnedEcsByQualifiedId.set(e.qualifiedId, e.id);
-	}
-	const anyAlbBackingPinned = annotateAlbPinnedBackingServices(targetGroups, makeAlbBackingPinnedResolver({
+	const baseTargetGroups = targetGroups;
+	const classifyTargets = (fromCfnStack) => classifyStudioTargets({
+		baseGroups: baseTargetGroups,
 		stacks,
-		pinnedEcsByQualifiedId,
+		servableEcs,
+		options,
+		fromCfnStack,
 		logger
-	}));
-	const dockerfiles = anyPinned || anyAlbBackingPinned ? discoverDockerfiles(process.cwd()) : [];
+	});
+	const { groups: initialGroups, dockerfiles: initialDockerfiles } = await classifyTargets(options.fromCfnStack);
 	const bus = new StudioEventBus();
 	const childConfig = {
 		cliEntry: process.argv[1] ?? "",
@@ -33824,11 +33920,13 @@ async function localStudioCommand(options) {
 		watch: childConfig.watch
 	});
 	const store = createStudioStore(bus);
+	let serverRef;
+	const reclassifyToken = { current: 0 };
 	const server = await startStudioServer({
 		port,
 		bus,
-		targetGroups,
-		dockerfiles,
+		targetGroups: initialGroups,
+		dockerfiles: initialDockerfiles,
 		appLabel,
 		cliName: getEmbedConfig().cliName,
 		store,
@@ -33868,11 +33966,21 @@ async function localStudioCommand(options) {
 		},
 		getRunning: () => ({ running: serveManager.list() }),
 		getConfig: () => sessionConfigSnapshot(),
-		patchConfig: (body) => {
+		patchConfig: async (body) => {
+			const beforeFromCfn = childConfig.fromCfnStack;
 			applyConfigPatch(body, childConfig);
-			return Promise.resolve(sessionConfigSnapshot());
+			await reclassifyTargetsOnBindingChange({
+				before: beforeFromCfn,
+				after: childConfig.fromCfnStack,
+				classify: classifyTargets,
+				applyTargets: (groups, dockerfiles) => serverRef?.setTargets(groups, dockerfiles),
+				tokenRef: reclassifyToken,
+				logger
+			});
+			return sessionConfigSnapshot();
 		}
 	});
+	serverRef = server;
 	const cliName = getEmbedConfig().cliName;
 	logger.info(`${cliName} studio is running at ${server.url}`);
 	if (childConfig.watch) logger.info("Watch mode: ON — serves started from the UI hot-reload on CDK source changes.");
@@ -33979,4 +34087,4 @@ function addStudioSpecificOptions(cmd) {
 
 //#endregion
 export { createLocalRunTaskCommand as $, buildDisconnectEvent as $n, addStartApiSpecificOptions as $t, matchBehavior as A, applyCorsResponseHeaders as An, webSocketApiMatchesIdentifier as Ar, invokeAgentCoreWs as At, runViewerRequest as B, evaluateResponseParameters as Bn, pickAgentCoreCandidateStack as Br, signAgentCoreInvocation as Bt, createLocalListCommand as C, verifyJwtViaDiscovery as Cn, countTargets as Cr, DEFAULT_SHADOW_READY_TIMEOUT_MS as Ct, createLocalStartCloudFrontCommand as D, invokeRequestAuthorizer as Dn, discoverWebSocketApisOrThrow as Dr, attachContainerLogStreamer as Dt, addStartCloudFrontSpecificOptions as E, evaluateCachedLambdaPolicy as En, discoverWebSocketApis as Er, getContainerNetworkIp as Et, isCloudFrontDistribution as F, matchRoute as Fn, AGENTCORE_AGUI_PROTOCOL as Fr, MCP_PATH as Ft, parseLbPortOverrides as G, HOST_GATEWAY_MIN_VERSION as Gn, tryResolveImageFnJoin as Gr, SUPPORTED_CODE_RUNTIMES as Gt, addAlbSpecificOptions as H, selectIntegrationResponse as Hn, derivePseudoParametersFromRegion as Hr, invokeAgentCore as Ht, pickFunctionUrlLogicalIdFromOrigin as I, translateLambdaResponse as In, AGENTCORE_HTTP_PROTOCOL as Ir, MCP_PROTOCOL_VERSION as It, resolveAlbFrontDoor as J, ConnectionRegistry as Jn, resolveProfileCredentials as Jr, renderCodeDockerfile as Jt, resolveAlbTarget as K, probeHostGatewaySupport as Kn, LocalInvokeBuildError as Kr, buildAgentCoreCodeImage as Kt, pickTargetFunctionLogicalId as L, applyAuthorizerOverlay as Ln, AGENTCORE_MCP_PROTOCOL as Lr, mcpInvokeOnce as Lt, serveFromStaticOrigin as M, buildCorsConfigFromCloudFrontChain as Mn, pickRefLogicalId as Mr, A2A_PATH as Mt, serveLambdaUrlOrigin as N, isFunctionUrlOacFronted as Nn, resolveLambdaArnIntrinsic as Nr, a2aInvokeOnce as Nt, parseOriginOverrides as O, invokeTokenAuthorizer as On, filterWebSocketApisByIdentifiers as Or, addInvokeAgentCoreSpecificOptions as Ot, CLOUDFRONT_DISTRIBUTION_TYPE as P, matchPreflight as Pn, AGENTCORE_A2A_PROTOCOL as Pr, MCP_CONTAINER_PORT as Pt, addRunTaskSpecificOptions as Q, buildConnectEvent as Qn, createLocalInvokeCommand as Qt, resolveCloudFrontDistribution as R, buildHttpApiV2Event as Rn, AGENTCORE_RUNTIME_TYPE as Rr, parseSseForJsonRpc as Rt, addListSpecificOptions as S, verifyJwtAuthorizer as Sn, resolveSingleTarget as Sr, CloudMapRegistry as St, LocalStartCloudFrontError as T, computeRequestIdentityHash as Tn, availableWebSocketApiIdentifiers as Tr, setShadowReadyTimeoutMs as Tt, albStrategy as U, tryParseStatus as Un, formatStateRemedy as Ur, waitForAgentCorePing as Ut, runViewerResponse as V, pickResponseTemplate as Vn, resolveAgentCoreTarget as Vr, AGENTCORE_SESSION_ID_HEADER as Vt, createLocalStartAlbCommand as W, VtlEvaluationError as Wn, substituteImagePlaceholders as Wr, downloadAndExtractS3Bundle as Wt, createLocalStartServiceCommand as X, handleConnectionsRequest as Xn, classifySourceChange as Xt, addStartServiceSpecificOptions as Y, buildMgmtEndpointEnvUrl as Yn, toCmdArgv as Yt, serviceStrategy as Z, parseConnectionsPath as Zn, addInvokeSpecificOptions as Zt, startStudioServer as _, defaultCredentialsLoader as _n, resolveCfnStackName as _r, runImageOverrideBuilds as _t, createLocalStudioCommand as a, attachStageContext as an, resolveRuntimeImage as ar, ecsClusterOption as at, createStudioStore as b, createJwksCache as bn, resolveSsmParameters as br, listPinnedTargets as bt, startStudioProxy as c, resolveEnvVars$1 as cn, substituteAgainstStateAsync as cr, resolveEcsAssumeRoleOption as ct, createStudioDispatcher as d, filterRoutesByApiIdentifiers as dn, LocalStateSourceError as dr, ImageOverrideError as dt, createLocalStartApiCommand as en, buildMessageEvent as er, MAX_TASKS_SUBNET_RANGE_CAP as et, filterStudioCustomResources as f, groupRoutesByServer as fn, createLocalStateProvider as fr, buildImageOverrideTag as ft, filterStudioTargetGroups as g, resolveServiceIntegrationParameters as gn, resolveCfnRegion as gr, resolveImageOverrides as gt, annotatePinnedEcsTargets as h, resolveSelectionExpression as hn, resolveCfnFallbackRegion as hr, parseImageOverrideFlags as ht, coerceStopRequest as i, createFileWatcher as in, resolveRuntimeFileExtension as ir, buildEcsImageResolutionContext$1 as it, startCloudFrontServer as j, buildCorsConfigByApiId as jn, discoverRoutes as jr, A2A_CONTAINER_PORT as jt, resolveCloudFrontTarget as k, attachAuthorizers as kn, parseSelectionExpressionPath as kr, createLocalInvokeAgentCoreCommand as kt, relayServeRequest as l, availableApiIdentifiers as ln, substituteEnvVarsFromState as lr, resolveSharedSidecarCredentials as lt, annotateAlbPinnedBackingServices as m, startApiServer as mn, rejectExplicitCfnStackWithMultipleStacks as mr, mergeForService as mt, coerceRunRequest as n, resolveApiTargetSubset as nn, buildContainerImage as nr, addEcsAssumeRoleOptions as nt, resolveServeBaseUrl as o, buildStageMap as on, EcsTaskResolutionError as or, parseMaxTasks as ot, isCustomResourceLambdaTarget as p, readMtlsMaterialsFromDisk as pn, isCfnFlagPresent as pr, enforceImageOverrideOrphans as pt, isApplicationLoadBalancer as q, bufferToBody as qn, buildStsClientConfig as qr, computeCodeImageTag as qt, coerceServeRequest as r, createAuthorizerCache as rn, resolveRuntimeCodeMountPath as rr, addImageOverrideOptions as rt, createStudioServeManager as s, materializeLayerFromArn as sn, substituteAgainstState as sr, parseRestartPolicy as st, addStudioSpecificOptions as t, createWatchPredicates as tn, architectureToPlatform as tr, addCommonEcsServiceOptions as tt, reinvoke as u, filterRoutesByApiIdentifier as un, substituteEnvVarsFromStateAsync as ur, runEcsServiceEmulator as ut, toStudioTargetGroups as v, buildCognitoJwksUrl as vn, CfnLocalStateProvider as vr, describePinnedImageUri as vt, formatTargetListing as w, buildMethodArn as wn, listTargets as wr, SOFT_RELOAD_COMPLETION_LOG_SUFFIX as wt, StudioEventBus as x, verifyCognitoJwt as xn, resolveWatchConfig as xr, buildCloudMapIndex as xt, renderStudioHtml as y, buildJwksUrlFromIssuer as yn, collectSsmParameterRefs as yr, isLocalCdkAssetImage as yt, compileCloudFrontFunction as z, buildRestV1Event as zn, AgentCoreResolutionError as zr, AGENTCORE_SIGV4_SERVICE as zt };
-//# sourceMappingURL=local-studio-8hdH7a_R.js.map
+//# sourceMappingURL=local-studio-HtgyKdTW.js.map