cdk-local 0.81.1 → 0.83.0

package/dist/{local-studio-DvNmnaF0.js → local-studio-8r3jr9nj.js}

@@ -45,6 +45,71 @@ var StudioEventBus = class {
 	}
 };
 
+//#endregion
+//#region src/local/studio-store.ts
+/**
+* Build the studio store and subscribe it to `bus`. The store merges the
+* start/end pair of each invocation (keyed by id) and keeps a ring of log
+* lines; both windows evict oldest-first past their caps.
+*/
+function createStudioStore(bus, options = {}) {
+	const maxInvocations = options.maxInvocations ?? 200;
+	const maxLogs = options.maxLogs ?? 5e3;
+	const bindGraceMs = options.bindGraceMs ?? 250;
+	const invocations = /* @__PURE__ */ new Map();
+	const logs = [];
+	const onInvocation = (ev) => {
+		invocations.set(ev.id, {
+			...invocations.get(ev.id),
+			...ev
+		});
+		if (invocations.size > maxInvocations) {
+			const oldest = invocations.keys().next().value;
+			if (oldest !== void 0) invocations.delete(oldest);
+		}
+	};
+	const onLog = (ev) => {
+		logs.push(ev);
+		if (logs.length > maxLogs) logs.shift();
+	};
+	bus.on("invocation", onInvocation);
+	bus.on("log", onLog);
+	let disposed = false;
+	return {
+		history: () => ({
+			invocations: [...invocations.values()],
+			logs: [...logs]
+		}),
+		searchLogs: (query, opts = {}) => {
+			const needle = query.toLowerCase();
+			const limit = opts.limit ?? 200;
+			const matches = [];
+			for (let i = logs.length - 1; i >= 0 && matches.length < limit; i -= 1) {
+				const log = logs[i];
+				if (!log) continue;
+				if (opts.target !== void 0 && log.target !== opts.target) continue;
+				if (needle === "" || log.line.toLowerCase().includes(needle)) matches.push(log);
+			}
+			return matches;
+		},
+		logsForInvocation: (id) => {
+			const inv = invocations.get(id);
+			if (!inv) return [];
+			if (inv.kind === "lambda") return logs.filter((l) => l.containerId === id);
+			const from = inv.ts;
+			const to = inv.ts + (inv.durationMs ?? 0) + bindGraceMs;
+			return logs.filter((l) => l.target === inv.target && l.ts >= from && l.ts <= to);
+		},
+		invocation: (id) => invocations.get(id),
+		dispose: () => {
+			if (disposed) return;
+			disposed = true;
+			bus.off("invocation", onInvocation);
+			bus.off("log", onLog);
+		}
+	};
+}
+
 //#endregion
 //#region src/local/studio-ui.ts
 /**
@@ -150,12 +215,27 @@ const STUDIO_CSS = `
   .section pre { margin: 0; white-space: pre-wrap; word-break: break-word; color: #cfcfcf; }
   .endpoint { display: block; color: #6aa9ff; text-decoration: none; padding: 2px 0; }
   .endpoint:hover { text-decoration: underline; }
+  .searchbar { padding: 6px 10px; border-bottom: 1px solid #2a2a2a; background: #151515;
+    position: sticky; top: 28px; z-index: 1; }
+  .searchbar input {
+    width: 100%; background: #111; color: #ddd; border: 1px solid #333; border-radius: 3px;
+    padding: 5px 8px; font: 12px ui-monospace, Menlo, monospace;
+  }
+  .searchbar input:focus { outline: none; border-color: #4ec97a; }
+  #log-results { display: none; }
+  #log-results.active { display: block; }
+  .log-hit { padding: 4px 12px; border-bottom: 1px solid #222; white-space: pre-wrap;
+    word-break: break-word; }
+  .log-hit .lt { color: #777; }
+  .log-hit .lg { color: #6aa9ff; }
+  .log-hits-meta { padding: 6px 12px; color: #888; font-size: 11px; }
   #conn { font-size: 11px; }
   #conn.up { color: #7bd88f; }
   #conn.down { color: #e0707a; }
 `;
 const STUDIO_SCRIPT = `
   const KIND_LABEL = { lambda: 'Lambda', api: 'API', alb: 'ALB', ecs: 'ECS', agentcore: 'AgentCore' };
+  const SERVE_KINDS = ['api', 'alb', 'ecs']; // long-running serve targets
   const rowsById = new Map();      // invocationId -> timeline row element
   const invById = new Map();       // invocationId -> latest invocation event
   const logsById = new Map();      // invocationId / serve targetId -> [log lines]
@@ -186,10 +266,11 @@ const STUDIO_SCRIPT = `
         pane.appendChild(el('div', 'group-title', group.title));
         for (const entry of group.entries) {
           total += 1;
-          // Lambda targets are single-shot invokes; API targets are
-          // long-running serves (slice C1). Other kinds list but are not
-          // yet runnable.
-          const runnable = group.kind === 'lambda' || group.kind === 'api';
+          // Lambda targets are single-shot invokes; api / alb / ecs are
+          // long-running serves. Other kinds list but are not yet runnable.
+          // Within ecs, only services are servable (task defs are run-task).
+          const isServe = SERVE_KINDS.includes(group.kind) && (group.kind !== 'ecs' || entry.servable === true);
+          const runnable = group.kind === 'lambda' || isServe;
           const t = el('div', runnable ? 'target runnable' : 'target');
           const name = el('span', 'name', entry.id);
           name.title = entry.id; // full path on hover even when truncated
@@ -201,16 +282,16 @@ const STUDIO_SCRIPT = `
             t.appendChild(btn);
             t.onclick = () => selectTarget(entry.id, 'lambda');
             targetEls.set(entry.id, t);
-          } else if (group.kind === 'api') {
+          } else if (isServe) {
             // A serve target: a running-state dot + a Start/Stop button
             // slot, both refreshed by updateServeRow on serve events.
             const dot = el('span', 'run-dot');
             const btnSlot = el('span', 'btn-slot');
             t.appendChild(dot);
             t.appendChild(btnSlot);
-            t.onclick = () => selectTarget(entry.id, 'api');
+            t.onclick = () => selectTarget(entry.id, group.kind);
             targetEls.set(entry.id, t);
-            serveMeta.set(entry.id, { dot, btnSlot });
+            serveMeta.set(entry.id, { dot, btnSlot, kind: group.kind });
             updateServeRow(entry.id);
           }
           pane.appendChild(t);
@@ -251,7 +332,10 @@ const STUDIO_SCRIPT = `
     const status = st ? st.status : 'stopped';
     const running = status === 'running';
     const starting = status === 'starting';
-    meta.dot.textContent = running ? '● ' + firstPort(st.endpoints) : starting ? '○ starting' : '';
+    // A serve with a host endpoint shows the dot + :port; a pure-compute
+    // ecs service has no endpoint, so just the dot + running.
+    const port = running ? firstPort(st.endpoints) : '';
+    meta.dot.textContent = running ? (port ? '● ' + port : '● running') : starting ? '○ starting' : '';
     meta.dot.className = 'run-dot' + (starting ? ' starting' : '');
     meta.btnSlot.innerHTML = '';
     const btn = running || starting
@@ -275,7 +359,7 @@ const STUDIO_SCRIPT = `
   function selectTarget(id, kind) {
     highlightTarget(id);
     shownDetailId = null;
-    if (kind === 'api') {
+    if (SERVE_KINDS.includes(kind)) {
       shownServeId = id;
       shownInvId = null;
       active = null;
@@ -287,13 +371,17 @@ const STUDIO_SCRIPT = `
   }
 
   async function startServe(id) {
+    // The serve kind (api / alb / ecs) drives which headless command the
+    // server spawns; it is recorded on the row when the target list loads.
+    const meta = serveMeta.get(id);
+    const kind = meta ? meta.kind : 'api';
     serveState.set(id, { status: 'starting', endpoints: [] });
     updateServeRow(id);
     try {
       const res = await fetch('/api/run', {
         method: 'POST',
         headers: { 'content-type': 'application/json' },
-        body: JSON.stringify({ targetId: id, kind: 'api' }),
+        body: JSON.stringify({ targetId: id, kind }),
       });
       const data = await res.json();
       if (!res.ok) {
@@ -343,6 +431,8 @@ const STUDIO_SCRIPT = `
     }
     ws.appendChild(head);
 
+    const meta = serveMeta.get(id);
+    const isEcs = meta && meta.kind === 'ecs';
     const epSec = el('div', 'section');
     epSec.appendChild(el('h3', null, 'Endpoints'));
     if (running && st.endpoints.length) {
@@ -350,6 +440,10 @@ const STUDIO_SCRIPT = `
         const link = href(url);
         epSec.appendChild(link);
       }
+    } else if (running && isEcs) {
+      // A pure-compute ECS service has no host endpoint — it just runs the
+      // replicas (reach them container-to-container via Cloud Map).
+      epSec.appendChild(el('pre', null, '(running — pure compute service, no host endpoint)'));
     } else {
       epSec.appendChild(el('pre', null, starting ? '(starting…)' : '(not running)'));
     }
@@ -475,7 +569,7 @@ const STUDIO_SCRIPT = `
 
   function addInvocation(ev) {
     invById.set(ev.id, Object.assign(invById.get(ev.id) || {}, ev));
-    const timeline = document.getElementById('timeline');
+    const timeline = document.getElementById('timeline-rows');
     const placeholder = timeline.querySelector('.empty');
     if (placeholder) placeholder.remove();
 
@@ -555,6 +649,84 @@ const STUDIO_SCRIPT = `
     respSec.appendChild(h);
     respSec.appendChild(el('pre', null, ev.response != null ? fmt(ev.response) : '(pending…)'));
     ws.appendChild(respSec);
+
+    // Logs bound to THIS request at CloudWatch granularity (D5), fetched
+    // from the server store.
+    const logSec = el('div', 'section');
+    logSec.appendChild(el('h3', null, 'Logs'));
+    const logPre = el('pre', null, '(loading…)');
+    logSec.appendChild(logPre);
+    ws.appendChild(logSec);
+    fetchInvocationLogs(id, logPre);
+  }
+
+  async function fetchInvocationLogs(id, pre) {
+    try {
+      const res = await fetch('/api/invocations/' + encodeURIComponent(id) + '/logs');
+      const data = await res.json();
+      const lines = (data.logs || []).map((l) => l.line);
+      if (shownDetailId === id) pre.textContent = lines.length ? lines.join('\\n') : '(none)';
+    } catch (err) {
+      if (shownDetailId === id) pre.textContent = '(failed to load logs)';
+    }
+  }
+
+  // Full-text log search over the server store. A non-empty query shows
+  // matching log lines INSTEAD of the timeline rows; clearing restores them.
+  let searchTimer = null;
+  function wireLogSearch() {
+    const input = document.getElementById('log-search');
+    const rows = document.getElementById('timeline-rows');
+    const results = document.getElementById('log-results');
+    input.addEventListener('input', () => {
+      if (searchTimer) clearTimeout(searchTimer);
+      searchTimer = setTimeout(() => runLogSearch(input.value.trim(), rows, results), 180);
+    });
+  }
+
+  async function runLogSearch(query, rows, results) {
+    if (query === '') {
+      results.classList.remove('active');
+      rows.style.display = '';
+      results.innerHTML = '';
+      return;
+    }
+    rows.style.display = 'none';
+    results.classList.add('active');
+    try {
+      const res = await fetch('/api/logs?q=' + encodeURIComponent(query));
+      const data = await res.json();
+      const hits = data.logs || [];
+      results.innerHTML = '';
+      results.appendChild(el('div', 'log-hits-meta', hits.length + ' match' + (hits.length === 1 ? '' : 'es')));
+      for (const h of hits) {
+        const row = el('div', 'log-hit');
+        row.appendChild(el('span', 'lt', new Date(h.ts).toLocaleTimeString() + '  '));
+        row.appendChild(el('span', 'lg', (h.target || '') + '  '));
+        row.appendChild(document.createTextNode(h.line));
+        results.appendChild(row);
+      }
+    } catch (err) {
+      results.innerHTML = '';
+      results.appendChild(el('div', 'log-hits-meta', 'Search failed: ' + err));
+    }
+  }
+
+  // Pull retained history on (re)connect so the timeline + logs reflect the
+  // whole session, not just events since this page loaded.
+  async function loadHistory() {
+    try {
+      const res = await fetch('/api/history');
+      const data = await res.json();
+      for (const log of (data.logs || [])) {
+        const arr = logsById.get(log.containerId) || [];
+        arr.push(log.line);
+        logsById.set(log.containerId, arr);
+      }
+      for (const inv of (data.invocations || [])) addInvocation(inv);
+    } catch (err) {
+      /* live SSE still drives the timeline; history is best-effort */
+    }
   }
 
   function connect() {
@@ -616,8 +788,10 @@ const STUDIO_SCRIPT = `
   }
 
   loadTargets().then(loadRunning);
+  loadHistory();
   connect();
   initSplitters();
+  wireLogSearch();
 `;
 /**
 * Render the full studio HTML document. `appLabel` is shown in the
@@ -646,7 +820,12 @@ function renderStudioHtml(appLabel, cliName) {
   <div class="splitter" id="split-left"></div>
   <section class="pane" id="workspace"><div class="empty">Pick a Lambda to invoke, or an API to serve, on the left.</div></section>
   <div class="splitter" id="split-right"></div>
-  <section class="pane" id="timeline"><h2>Timeline</h2><div class="empty">No requests yet.</div></section>
+  <section class="pane" id="timeline">
+    <h2>Timeline</h2>
+    <div class="searchbar"><input id="log-search" type="search" placeholder="Search logs…" autocomplete="off" spellcheck="false" /></div>
+    <div id="timeline-rows"><div class="empty">No requests yet.</div></div>
+    <div id="log-results"></div>
+  </section>
 </main>
 <script>${STUDIO_SCRIPT}<\/script>
 </body>
@@ -667,12 +846,13 @@ function escapeHtml(s) {
 * projection without booting the server.
 */
 function toStudioTargetGroups(listing) {
-	const map = (entries) => entries.map((e) => {
+	const map = (entries, opts = {}) => entries.map((e) => {
 		const t = {
 			id: e.displayPath ?? e.qualifiedId,
 			qualifiedId: e.qualifiedId
 		};
 		if (e.kind) t.surface = e.kind;
+		if (opts.servable !== void 0) t.servable = opts.servable;
 		return t;
 	});
 	return [
@@ -689,7 +869,7 @@ function toStudioTargetGroups(listing) {
 		{
 			kind: "ecs",
 			title: "ECS Services / Tasks",
-			entries: [...map(listing.ecsServices), ...map(listing.ecsTaskDefinitions)]
+			entries: [...map(listing.ecsServices, { servable: true }), ...map(listing.ecsTaskDefinitions, { servable: false })]
 		},
 		{
 			kind: "agentcore",
@@ -727,7 +907,8 @@ async function startStudioServer(options) {
 	};
 }
 function handleRequest(req, res, bus, html, targetsJson, options) {
-	const path = (req.url ?? "/").split("?")[0];
+	const url = req.url ?? "/";
+	const path = url.split("?")[0];
 	if (req.method === "GET" && (path === "/" || path === "/index.html")) {
 		res.writeHead(200, { "content-type": "text/html; charset=utf-8" });
 		res.end(html);
@@ -744,6 +925,32 @@ function handleRequest(req, res, bus, html, targetsJson, options) {
 		res.end(JSON.stringify(running));
 		return;
 	}
+	if (req.method === "GET" && path === "/api/history") {
+		const history = options.store ? options.store.history() : {
+			invocations: [],
+			logs: []
+		};
+		res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+		res.end(JSON.stringify(history));
+		return;
+	}
+	if (req.method === "GET" && path === "/api/logs") {
+		const params = new URLSearchParams(url.split("?")[1] ?? "");
+		const query = params.get("q") ?? "";
+		const target = params.get("target") || void 0;
+		const logs = options.store ? options.store.searchLogs(query, target !== void 0 ? { target } : {}) : [];
+		res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+		res.end(JSON.stringify({ logs }));
+		return;
+	}
+	const invLogsMatch = /^\/api\/invocations\/([^/]+)\/logs$/.exec(path ?? "");
+	if (req.method === "GET" && invLogsMatch) {
+		const id = decodeURIComponent(invLogsMatch[1] ?? "");
+		const logs = options.store ? options.store.logsForInvocation(id) : [];
+		res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+		res.end(JSON.stringify({ logs }));
+		return;
+	}
 	if (req.method === "GET" && path === "/api/events") {
 		serveSse(req, res, bus);
 		return;
@@ -1300,10 +1507,37 @@ function bridgeUpgrade(req, clientSocket, head, upstreamHost, upstreamPort) {
 
 //#endregion
 //#region src/local/studio-serve-manager.ts
-/** Kinds the serve manager can start in this build. */
-const SERVE_SUPPORTED = ["api"];
-/** `Server listening on <url>` is the stable ready marker `start-api` prints. */
-const LISTENING_RE = /Server listening on (\S+)/;
+/**
+* The serve lifecycle per kind. `api` + `alb` expose host HTTP endpoints
+* the studio capture proxy fronts; `ecs` (start-service) is pure compute
+* with no host port, so it has no endpoint and no capture — studio just
+* runs the replicas + streams their logs.
+*/
+const SERVE_SPECS = {
+	api: {
+		command: "start-api",
+		portArgs: [
+			"--port",
+			"0",
+			"--host",
+			"127.0.0.1"
+		],
+		readyRe: /Server listening on (\S+)/,
+		capturesHttp: true
+	},
+	alb: {
+		command: "start-alb",
+		portArgs: [],
+		readyRe: /ALB front-door: (https?:\/\/\S+)/,
+		capturesHttp: true
+	},
+	ecs: {
+		command: "start-service",
+		portArgs: [],
+		readyRe: /Service\(s\) running:/,
+		capturesHttp: false
+	}
+};
 /**
 * Build the studio serve manager. Slice C1 drives a long-running
 * `cdkl start-api <target>` child — studio is a control plane over the
@@ -1322,15 +1556,18 @@ const LISTENING_RE = /Server listening on (\S+)/;
 * Slice C2 fronts each HTTP serve endpoint with a capture proxy
 * ({@link startStudioProxy}) so every request to the served port lands
 * on the studio timeline (decision D4a); the `endpoints` the UI is
-* handed are the proxy URLs. Full-text log search and alb / ecs serve
-* kinds are still to come.
+* handed are the proxy URLs. The serve-kinds slice generalized this to a
+* per-kind {@link ServeKindSpec}: `api` (`start-api`) + `alb`
+* (`start-alb`) expose host HTTP endpoints the proxy captures, while
+* `ecs` (`start-service`) is pure compute — no host port, no capture,
+* just the running replicas + their streamed logs.
 */
 function createStudioServeManager(config) {
 	const spawnFn = config.spawnFn ?? spawn;
 	const nodeBin = config.nodeBin ?? process.execPath;
 	const clock = config.clock ?? Date.now;
 	const readyTimeoutMs = config.readyTimeoutMs ?? 12e4;
-	const stopGraceMs = config.stopGraceMs ?? 1e4;
+	const stopGraceMs = config.stopGraceMs ?? 45e3;
 	const setTimeoutFn = config.setTimeoutFn ?? setTimeout;
 	const clearTimeoutFn = config.clearTimeoutFn ?? clearTimeout;
 	const cwd = config.cwd ?? process.cwd();
@@ -1365,14 +1602,11 @@ function createStudioServeManager(config) {
 		if (message !== void 0) ev.message = message;
 		config.bus.emit("serve", ev);
 	}
-	function buildArgs(targetId) {
+	function buildArgs(targetId, spec) {
 		const args = [
-			"start-api",
+			spec.command,
 			targetId,
-			"--port",
-			"0",
-			"--host",
-			"127.0.0.1"
+			...spec.portArgs
 		];
 		if (config.app) args.push("--app", config.app);
 		if (config.profile) args.push("--profile", config.profile);
@@ -1381,13 +1615,14 @@ function createStudioServeManager(config) {
 		return args;
 	}
 	async function start(req) {
-		if (!SERVE_SUPPORTED.includes(req.kind)) throw new Error(`Serving '${req.kind}' targets from studio is not supported yet (API only in this build).`);
+		const spec = SERVE_SPECS[req.kind];
+		if (!spec) throw new Error(`Serving '${req.kind}' targets from studio is not supported (serve kinds: ${Object.keys(SERVE_SPECS).join(", ")}).`);
 		const existing = entries.get(req.targetId);
 		if (existing && existing.status !== "stopped" && existing.status !== "error") throw new Error(`'${req.targetId}' is already running.`);
 		const startedAt = clock();
 		let child;
 		try {
-			child = spawnFn(nodeBin, [config.cliEntry, ...buildArgs(req.targetId)], { cwd });
+			child = spawnFn(nodeBin, [config.cliEntry, ...buildArgs(req.targetId, spec)], { cwd });
 		} catch (err) {
 			throw err instanceof Error ? err : new Error(String(err));
 		}
@@ -1411,7 +1646,7 @@ function createStudioServeManager(config) {
 				if (settled) return;
 				settled = true;
 				entry.status = "error";
-				emitServe(entry, `Timed out after ${readyTimeoutMs}ms waiting for the server to listen.`);
+				emitServe(entry, `Timed out after ${readyTimeoutMs}ms waiting for the serve to be ready.`);
 				stopChild(child, stopGraceMs, setTimeoutFn, clearTimeoutFn);
 				closeProxies(entry);
 				entries.delete(req.targetId);
@@ -1426,9 +1661,9 @@ function createStudioServeManager(config) {
 				emitServe(entry);
 				resolve(publicState(entry));
 			};
-			const onListening = async (childUrl) => {
+			const onReady = async (childUrl) => {
 				let endpoint = childUrl;
-				if (captureRequests && /^https?:/i.test(childUrl)) try {
+				if (childUrl && spec.capturesHttp && captureRequests && /^https?:/i.test(childUrl)) try {
 					const proxy = await proxyFactory({
 						bus: config.bus,
 						target: req.targetId,
@@ -1444,13 +1679,13 @@ function createStudioServeManager(config) {
 					await closeProxies(entry);
 					return;
 				}
-				if (!entry.endpoints.includes(endpoint)) entry.endpoints.push(endpoint);
+				if (endpoint && !entry.endpoints.includes(endpoint)) entry.endpoints.push(endpoint);
 				if (settled) emitServe(entry);
 				else becomeRunning();
 			};
 			streamLines(child.stdout, (line) => {
-				const m = LISTENING_RE.exec(line);
-				if (m?.[1]) onListening(m[1]);
+				const m = spec.readyRe.exec(line);
+				if (m) onReady(m[1]);
 				emitLog(config.bus, clock, req.targetId, line, "stdout");
 			});
 			streamLines(child.stderr, (line) => {
@@ -1651,6 +1886,7 @@ async function localStudioCommand(options) {
 	const { stacks } = await synthesizer.synthesize(synthOpts);
 	const targetGroups = toStudioTargetGroups(listTargets(stacks));
 	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 bus = new StudioEventBus();
 	const childConfig = {
 		cliEntry: process.argv[1] ?? "",
@@ -1663,15 +1899,19 @@ async function localStudioCommand(options) {
 	};
 	const dispatcher = createStudioDispatcher(childConfig);
 	const serveManager = createStudioServeManager(childConfig);
+	const store = createStudioStore(bus);
 	const server = await startStudioServer({
 		port,
 		bus,
 		targetGroups,
 		appLabel,
 		cliName: getEmbedConfig().cliName,
+		store,
 		onRun: (body) => {
 			const req = coerceRunRequest(body);
-			return req.kind === "lambda" ? dispatcher.run(req) : serveManager.start(req);
+			if (req.kind === "lambda") return dispatcher.run(req);
+			if (req.kind === "ecs" && !servableEcs.has(req.targetId)) return Promise.reject(/* @__PURE__ */ new Error(`'${req.targetId}' is not a servable ECS service (an ECS task definition runs via run-task, not start-service).`));
+			return serveManager.start(req);
 		},
 		onStop: async (body) => {
 			const req = coerceStopRequest(body);
@@ -1684,7 +1924,7 @@ async function localStudioCommand(options) {
 	logger.info(`${cliName} studio is running at ${server.url}`);
 	logger.info("Press Ctrl-C to stop.");
 	if (options.open && process.stdout.isTTY) openBrowser(server.url);
-	await blockUntilShutdown(server, serveManager, cliName);
+	await blockUntilShutdown(server, serveManager, store, cliName);
 }
 /** Best-effort cross-platform browser open. Failures are non-fatal. */
 function openBrowser(url) {
@@ -1706,13 +1946,14 @@ function openBrowser(url) {
 * BEFORE the server closes so their RIE containers are torn down rather
 * than orphaned.
 */
-function blockUntilShutdown(server, serveManager, cliName) {
+function blockUntilShutdown(server, serveManager, store, cliName) {
 	return new Promise((resolveShutdown) => {
 		let shuttingDown = false;
 		const shutdown = (signal) => {
 			if (shuttingDown) return;
 			shuttingDown = true;
 			getLogger().info(`Received ${signal}; stopping ${cliName} studio...`);
+			store.dispose();
 			serveManager.stopAll().catch((err) => getLogger().warn(`Error stopping serve targets: ${String(err)}`)).then(() => server.close()).catch((err) => getLogger().warn(`Error stopping studio server: ${String(err)}`)).finally(() => resolveShutdown());
 		};
 		process.on("SIGINT", () => shutdown("SIGINT"));
@@ -1748,5 +1989,5 @@ function addStudioSpecificOptions(cmd) {
 }
 
 //#endregion
-export { createStudioServeManager as a, startStudioServer as c, StudioEventBus as d, createLocalStudioCommand as i, toStudioTargetGroups as l, coerceRunRequest as n, startStudioProxy as o, coerceStopRequest as r, createStudioDispatcher as s, addStudioSpecificOptions as t, renderStudioHtml as u };
-//# sourceMappingURL=local-studio-DvNmnaF0.js.map
+export { createStudioServeManager as a, startStudioServer as c, createStudioStore as d, StudioEventBus as f, createLocalStudioCommand as i, toStudioTargetGroups as l, coerceRunRequest as n, startStudioProxy as o, coerceStopRequest as r, createStudioDispatcher as s, addStudioSpecificOptions as t, renderStudioHtml as u };
+//# sourceMappingURL=local-studio-8r3jr9nj.js.map