camox 0.68.0 → 0.71.0

package/dist/features/renderer/studioConnection.js

@@ -26,7 +26,7 @@ const mirror = (message) => mirrors[message.store]?.send({
 * its cache follows the studio's (see `protocol.ts`). The studio's questions are answered from
 * `camoxApp`, the draft's code; without it, none can be.
 */
-function connectToStudio(handle, { queryClient, studioCache, draftScope, camoxApp }) {
+function connectToStudio(handle, { queryClient, studioCache, draftScope, camoxApp, prepareFrame }) {
 	let welcomed = false;
 	let frames = [];
 	const listeners = /* @__PURE__ */ new Set();
@@ -109,6 +109,14 @@ function connectToStudio(handle, { queryClient, studioCache, draftScope, camoxAp
 				return;
 			case "ask": {
 				const { askId, question } = message;
+				if (question.type === "prepareFrame") {
+					(prepareFrame?.(question) ?? Promise.resolve()).catch(() => {}).then(() => studio({
+						type: "answer",
+						askId,
+						value: null
+					}));
+					return;
+				}
 				if (!camoxApp) {
 					studio({
 						type: "answer",

package/dist/features/runtime/pageApp.js

@@ -1,5 +1,6 @@
 import { DraftScopeContext } from "../../lib/draft-scope.js";
 import { useAuthState, useSignInRedirect } from "../../lib/auth.js";
+import { ArtifactCaptureContext } from "../../core/hooks/useArtifactHost.js";
 import { useSignInShortcut } from "../provider/signInShortcut.js";
 import { PreviewDocumentContext } from "./PreviewDocumentContext.js";
 import { PreviewActivation } from "../preview/components/PreviewActivation.js";
@@ -36,9 +37,12 @@ function PageApp(t0) {
 			sessionless: input.look,
 			children: /* @__PURE__ */ jsx(PreviewDocumentContext.Provider, {
 				value: currentInput.previewDocument,
-				children: input.previewHandoff ? /* @__PURE__ */ jsx(PreviewSignInPage, {}) : input.look ? /* @__PURE__ */ jsx(PageContent, {
-					camoxApp,
-					input: currentInput
+				children: input.previewHandoff ? /* @__PURE__ */ jsx(PreviewSignInPage, {}) : input.look ? /* @__PURE__ */ jsx(ArtifactCaptureContext, {
+					value: true,
+					children: /* @__PURE__ */ jsx(PageContent, {
+						camoxApp,
+						input: currentInput
+					})
 				}) : /* @__PURE__ */ jsx(PageExperience, {
 					camoxApp,
 					input: currentInput,

package/dist/features/runtime/pageNavigation.js

@@ -1,7 +1,8 @@
-import { DraftScopeContext, draftNamedBy } from "../../lib/draft-scope.js";
+import { DraftScopeContext, ShownDraftContext, draftNamedBy } from "../../lib/draft-scope.js";
 import { PageAlternatesContext, ViewLocaleContext } from "../../lib/view-locale-context.js";
 import { NavigationProvider } from "../navigation/navigation.js";
 import { fetchRuntimeJson, getNavigationTarget } from "./navigationTarget.js";
+import { SWITCH_WAIT_MS, ViewSwitchDeadlineContext, ViewSwitchesContext } from "../../lib/view-switch.js";
 import { reads } from "../../lib/studio-reads.js";
 import { createPrefetchCache, listenForLinkIntent } from "./linkPrefetch.js";
 import { PageViewportContext } from "./pageViewport.js";
@@ -13,7 +14,7 @@ import { createNavigationRequestTracker } from "./navigationRequest.js";
 import { createScrollRestoration } from "./scrollRestoration.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { hydrate } from "@tanstack/react-query";
 import { createHead, renderDOMHead } from "@unhead/react/client";
 
@@ -63,13 +64,24 @@ function prefetchKey(pathname, draft) {
 function PageNavigationProvider({ camoxApp, children, initialInput, queryClient }) {
 	const draftScope = React.useContext(DraftScopeContext);
 	if (!draftScope) throw new Error("PageNavigationProvider needs a DraftScopeContext provider");
-	const [{ input, source, generation }, setLocation] = React.useState(() => {
+	const [{ input, source, switched, navigation }, setLocation] = React.useState(() => {
 		draftScope.adopt(initialInput);
 		return {
 			input: initialInput,
-			generation: 0
+			navigation: 0
 		};
 	});
+	const [preparers] = React.useState(() => /* @__PURE__ */ new Set());
+	const [commits] = React.useState(() => /* @__PURE__ */ new Map());
+	const navigations = React.useRef(0);
+	const lastShown = React.useRef(Promise.resolve());
+	const switches = React.useMemo(() => ({
+		prepare(preparer) {
+			preparers.add(preparer);
+			return () => void preparers.delete(preparer);
+		},
+		shown: () => lastShown.current
+	}), [preparers]);
 	const current = React.useRef(initialInput);
 	const [requests] = React.useState(createNavigationRequestTracker);
 	const ownsWindow = initialInput.presentation !== "studio";
@@ -88,6 +100,20 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 	}, [restoration]);
 	const pendingAnnouncement = React.useRef(null);
 	const announcer = React.useRef(null);
+	const prepareSwitch = React.useCallback((next) => {
+		const view = {
+			pathname: next.pathname,
+			...next.derived && { derivedLayoutId: next.derived.layoutId },
+			draftId: next.draftId ?? null,
+			locale: next.locale
+		};
+		const deadline = Date.now() + SWITCH_WAIT_MS;
+		const prepared = Promise.all([...preparers].map((prepare) => Promise.resolve(prepare(view)).catch(() => {})));
+		return {
+			deadline,
+			ready: Promise.race([prepared.then(() => {}), new Promise((resolve) => setTimeout(resolve, SWITCH_WAIT_MS))])
+		};
+	}, [preparers]);
 	const loadPage = React.useCallback(async (pathname, draft, signal) => {
 		const response = await fetchRuntimeJson(draftScope, "/_camox/data", initialInput.runtimeBasePath, { path: pathname }, draft, signal);
 		if (!response.ok) throw new Error(`Navigation failed: ${response.status}`);
@@ -106,6 +132,7 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 	const { analytics } = initialInput;
 	const navigate = React.useCallback(async ({ to, replace, source, draft, pop = false, refresh = false }) => {
 		const request = requests.begin();
+		const id = ++navigations.current;
 		const href = pop ? to : draftScope.hrefFor(to, {
 			from: window.location.href,
 			draft
@@ -122,12 +149,20 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 			if (target.url.hash && viewport) position(viewport, "fragment", target.url.href);
 			return;
 		}
+		lastShown.current = new Promise((resolve) => commits.set(id, resolve));
+		const settle = () => {
+			for (const [waiting, resolve] of commits) {
+				if (waiting > id) continue;
+				commits.delete(waiting);
+				resolve();
+			}
+		};
 		try {
 			let next = current.current;
 			const targetDraft = draftNamedBy(target.url.href);
 			const fetched = target.pathname !== next.pathname || refresh || targetDraft !== draftNamedBy(next.href);
 			if (fetched) next = await (!refresh && prefetched.take(prefetchKey(target.pathname, targetDraft)) || loadPage(target.pathname, targetDraft, request.signal));
-			if (!request.isCurrent()) return;
+			if (!request.isCurrent()) return settle();
 			const switching = (next.draftId ?? null) !== (current.current.draftId ?? null) || !sameLocale(next.locale, current.current.locale);
 			const positions = restoration();
 			if (!pop) {
@@ -145,6 +180,7 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 			};
 			pendingAnnouncement.current = fetched && !refresh ? next.pathname : null;
 			if (fetched) draftScope.adopt(next);
+			const switched = switching ? prepareSwitch(next) : void 0;
 			hydrate(queryClient, switching ? next.dehydratedState : preserveStableLayoutBlockCaches(next.dehydratedState, current.current.layoutIdentity, next.layoutIdentity));
 			next = {
 				...next,
@@ -162,12 +198,14 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 			renderDOMHead(manager.head);
 			if (ownsWindow && analytics && next.pathname !== previous.pathname) sendPageView(analytics, window);
 			if (ownsWindow) document.documentElement.lang = next.locale.tag;
-			React.startTransition(() => setLocation((location) => ({
+			React.startTransition(() => setLocation({
 				input: next,
 				source: pop ? void 0 : source,
-				generation: location.generation + (switching ? 1 : 0)
-			})));
+				switched,
+				navigation: id
+			}));
 		} catch {
+			settle();
 			if (!request.isCurrent()) return;
 			if (pop) window.location.reload();
 			else if (replace) window.location.replace(target.url.href);
@@ -175,12 +213,14 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 		}
 	}, [
 		analytics,
+		commits,
 		draftScope,
 		initialInput.runtimeBasePath,
 		loadPage,
 		ownsWindow,
 		position,
 		prefetched,
+		prepareSwitch,
 		queryClient,
 		requests,
 		restoration
@@ -250,6 +290,21 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 			prefetched.clear();
 		};
 	}, [draftScope, prefetched]);
+	React.useLayoutEffect(() => {
+		for (const [waiting, resolve] of commits) {
+			if (waiting > navigation) continue;
+			commits.delete(waiting);
+			resolve();
+		}
+		if (switched) setLocation((location) => ({
+			...location,
+			switched: void 0
+		}));
+	}, [
+		commits,
+		navigation,
+		switched
+	]);
 	React.useLayoutEffect(() => {
 		const intent = takeScroll(input.href);
 		const viewport = scroll.current?.viewport();
@@ -310,13 +365,14 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 		initialInput.runtimeBasePath,
 		requests
 	]);
+	const hydrated = React.useSyncExternalStore(noSubscription, isClient, isServer);
 	const url = new URL(input.href);
 	const viewLocale = useSameJson({
 		locale: input.locale,
 		locales: input.locales
 	});
 	const alternates = useSameJson(input.alternates ?? null);
-	return /* @__PURE__ */ jsx(NavigationProvider, {
+	return /* @__PURE__ */ jsxs(NavigationProvider, {
 		location: {
 			href: input.href,
 			pathname: input.pathname,
@@ -325,18 +381,38 @@ function PageNavigationProvider({ camoxApp, children, initialInput, queryClient
 			source
 		},
 		navigate,
-		children: /* @__PURE__ */ jsx(ViewLocaleContext, {
-			value: viewLocale,
-			children: /* @__PURE__ */ jsx(PageAlternatesContext, {
-				value: alternates,
-				children: /* @__PURE__ */ jsx(PageViewportContext, {
-					value: pageViewport,
-					children: /* @__PURE__ */ jsx(React.Fragment, { children: children(input) }, generation)
+		children: [/* @__PURE__ */ jsx(ViewSwitchesContext, {
+			value: switches,
+			children: /* @__PURE__ */ jsx(ViewSwitchDeadlineContext, {
+				value: switched?.deadline ?? null,
+				children: /* @__PURE__ */ jsx(ShownDraftContext, {
+					value: input.draftId ?? null,
+					children: /* @__PURE__ */ jsx(ViewLocaleContext, {
+						value: viewLocale,
+						children: /* @__PURE__ */ jsx(PageAlternatesContext, {
+							value: alternates,
+							children: /* @__PURE__ */ jsx(PageViewportContext, {
+								value: pageViewport,
+								children: children(input)
+							})
+						})
+					})
 				})
 			})
-		})
+		}), hydrated && /* @__PURE__ */ jsx(React.Suspense, {
+			fallback: null,
+			children: /* @__PURE__ */ jsx(SwitchGate, { ready: switched?.ready })
+		})]
 	});
 }
+const noSubscription = () => () => {};
+const isClient = () => true;
+const isServer = () => false;
+/** Suspends the switch's render until the next view is ready. */
+function SwitchGate({ ready }) {
+	if (ready) React.use(ready);
+	return null;
+}
 
 //#endregion
 export { PageNavigationProvider };

package/dist/features/runtime/rendererClient.js

@@ -1,5 +1,5 @@
 import { DraftScopeContext, createDraftScope, followUrl } from "../../lib/draft-scope.js";
-import { StudioCacheContext, createStudioCache } from "../../lib/studio-reads.js";
+import { StudioCacheContext, createStudioCache, reads } from "../../lib/studio-reads.js";
 import { getDraftReadClient } from "../../lib/api-client.js";
 import { STUDIO_HANDLE_KEY } from "../renderer/protocol.js";
 import { CoreCamoxProvider } from "../provider/CoreCamoxProvider.js";
@@ -23,7 +23,8 @@ async function startRendererWithApp(camoxApp) {
 		return;
 	}
 	const input = readHydrationData();
-	if (!input.apiUrl || !input.authenticationUrl || !input.projectUuid) {
+	const { projectUuid, runtimeBasePath } = input;
+	if (!input.apiUrl || !input.authenticationUrl || !projectUuid) {
 		console.error("Camox: the renderer document is missing its API or project.");
 		return;
 	}
@@ -44,7 +45,13 @@ async function startRendererWithApp(camoxApp) {
 		queryClient,
 		studioCache,
 		draftScope,
-		camoxApp
+		camoxApp,
+		prepareFrame: ({ pathname, derivedLayoutId, locale }) => Promise.all([studioCache.ensure(reads.canvasFrame({
+			projectUuid,
+			runtimeBasePath,
+			pathname,
+			...derivedLayoutId && { derivedLayoutId }
+		}), { locale }), codeLoaded])
 	});
 	const container = document.createElement("div");
 	document.body.append(container);
@@ -58,14 +65,14 @@ async function startRendererWithApp(camoxApp) {
 					apiUrl: input.apiUrl,
 					authenticationUrl: input.authenticationUrl,
 					camoxApp,
-					projectUuid: input.projectUuid,
+					projectUuid,
 					initialAuthenticated: true,
 					children: /* @__PURE__ */ jsx(CompleteBlockEditingRuntimeProvider, { children: /* @__PURE__ */ jsx(RendererApp, {
 						connection,
 						camoxApp,
 						codeLoaded,
-						projectUuid: input.projectUuid,
-						runtimeBasePath: input.runtimeBasePath
+						projectUuid,
+						runtimeBasePath
 					}) })
 				})
 			})

package/dist/features/studio/agentRunToast.js

@@ -0,0 +1,71 @@
+import { c } from "react/compiler-runtime";
+import * as React from "react";
+import { toast } from "@camox/ui/toaster";
+
+//#region src/features/studio/agentRunToast.ts
+/**
+* Says the agent is working in a toast while a run goes in the draft's thread, anyone's, so the
+* editor knows wherever they are in the studio, then how it ended. Live's runs are too quick to
+* need one. Leaving the thread takes the toast away.
+*/
+function useAgentRunToast(view, draftId) {
+	const $ = c(13);
+	const id = React.useId();
+	const running = draftId !== null && view.running;
+	const ran = React.useRef(false);
+	let t0;
+	if ($[0] !== id || $[1] !== view) {
+		t0 = () => {
+			const last = view.messages.at(-1)?.from;
+			if (last === "failed") toast.error("Agent couldn't finish", { id });
+			else if (last === "stopped") toast.dismiss(id);
+			else toast.success("Agent is done", { id });
+		};
+		$[0] = id;
+		$[1] = view;
+		$[2] = t0;
+	} else t0 = $[2];
+	const ended = React.useEffectEvent(t0);
+	let t1;
+	if ($[3] !== ended || $[4] !== id || $[5] !== running) {
+		t1 = () => {
+			if (running) {
+				ran.current = true;
+				toast.loading("Agent is working…", { id });
+			} else if (ran.current) {
+				ran.current = false;
+				ended();
+			}
+		};
+		$[3] = ended;
+		$[4] = id;
+		$[5] = running;
+		$[6] = t1;
+	} else t1 = $[6];
+	let t2;
+	if ($[7] !== id || $[8] !== running) {
+		t2 = [running, id];
+		$[7] = id;
+		$[8] = running;
+		$[9] = t2;
+	} else t2 = $[9];
+	React.useEffect(t1, t2);
+	let t3;
+	let t4;
+	if ($[10] !== id) {
+		t3 = () => () => {
+			if (ran.current) toast.dismiss(id);
+		};
+		t4 = [id];
+		$[10] = id;
+		$[11] = t3;
+		$[12] = t4;
+	} else {
+		t3 = $[11];
+		t4 = $[12];
+	}
+	React.useEffect(t3, t4);
+}
+
+//#endregion
+export { useAgentRunToast };

package/dist/features/studio/components/ChatWidget.js

@@ -7,6 +7,7 @@ import { BOTTOM_CARD_EDGES, CARD_BODY_EDGES } from "../../preview/components/Sid
 import { studioStore } from "../studioStore.js";
 import { FollowAgentContext } from "../followAgentContext.js";
 import { useThread } from "../../../lib/use-thread.js";
+import { useAgentRunToast } from "../agentRunToast.js";
 import { EditorWhereContext } from "../editorWhereContext.js";
 import { useEditorSelection } from "../useEditorSelection.js";
 import { ThreadComposer, useComposerCarrier } from "./ThreadComposer.js";
@@ -141,6 +142,7 @@ function Thread(t0) {
 		$[1] = t1;
 	} else t1 = $[1];
 	const { view, sending, send, stop, error, touched } = useThread(apiUrl, projectId, draftId, t1);
+	useAgentRunToast(view, draftId);
 	const follow = React.use(FollowAgentContext);
 	let t2;
 	if ($[2] !== follow) {

package/dist/features/studio/components/DraftBar.js

@@ -14,8 +14,7 @@ import { FloatingToolbar } from "@camox/ui/floating-toolbar";
 */
 const SETTLE_MS = 1500;
 /**
-* Asks what to do with the draft being viewed, once its edits settle: discard its changes or
-* publish them. `stacked` places it in the Preview toolbar's column, just above the toolbar;
+* Asks what to do with the draft being viewed, once its edits settle: delete it or publish it. `stacked` places it in the Preview toolbar's column, just above the toolbar;
 * otherwise it floats at the bottom of the screen on its own.
 */
 function DraftBar(t0) {
@@ -63,7 +62,7 @@ function DraftBar(t0) {
 			type: "button",
 			variant: "outline",
 			onClick: _temp,
-			children: "Discard"
+			children: "Delete"
 		});
 		$[8] = t7;
 	} else t7 = $[8];