camox 0.75.0 → 0.76.0

package/dist/features/provider/AuthenticatedCamoxProvider.js

@@ -7,18 +7,18 @@ import { useApplyTheme, useThemeActions } from "../studio/useTheme.js";
 import { usePreviewPagesActions, useShowCanvasAction } from "../preview/CamoxPreview.js";
 import { useProjectRoom } from "../../lib/use-project-room.js";
 import { useLeaveDraft } from "../studio/viewSwitch.js";
+import { DraftNotices } from "../studio/components/DraftNotices.js";
 import { useNavbarActions } from "../studio/components/Navbar.js";
-import { draftNoticeMessage } from "../studio/draftNotice.js";
 import { CommandPalette, useCommandPaletteActions } from "./components/CommandPalette.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Toaster, toast } from "@camox/ui/toaster";
+import { Toaster } from "@camox/ui/toaster";
 import studioCssUrl from "virtual:camox-studio-css";
 
 //#region src/features/provider/AuthenticatedCamoxProvider.tsx
 function AuthenticatedCamoxProvider(t0) {
-	const $ = c(20);
+	const $ = c(24);
 	const { children } = t0;
 	useAdminShortcuts();
 	useCommandPaletteActions();
@@ -37,85 +37,97 @@ function AuthenticatedCamoxProvider(t0) {
 	const { data: project } = useReadQuery(t1);
 	const draftScope = useDraftScope();
 	const studioCache = useStudioCache();
+	const [revisions] = React.useState(createRevisions);
+	const leaveDraft = useLeaveDraft();
 	let t2;
+	if ($[2] !== authClient || $[3] !== draftScope || $[4] !== leaveDraft) {
+		t2 = (left, by) => {
+			if (left.draftId !== draftScope.current()) return;
+			if (by === signedInUserId(authClient)) return leaveDraft(left);
+			draftScope.leave(left, { notice: true });
+		};
+		$[2] = authClient;
+		$[3] = draftScope;
+		$[4] = leaveDraft;
+		$[5] = t2;
+	} else t2 = $[5];
+	const onDraftLeft = t2;
 	let t3;
-	if ($[2] !== draftScope) {
-		t2 = () => draftScope.onNotice(_temp);
-		t3 = [draftScope];
-		$[2] = draftScope;
-		$[3] = t2;
-		$[4] = t3;
+	let t4;
+	if ($[6] !== onDraftLeft) {
+		t3 = (ended) => onDraftLeft(ended, ended.endedBy.id);
+		t4 = (archived) => onDraftLeft(archived, archived.archivedBy.id);
+		$[6] = onDraftLeft;
+		$[7] = t3;
+		$[8] = t4;
 	} else {
-		t2 = $[3];
-		t3 = $[4];
+		t3 = $[7];
+		t4 = $[8];
 	}
-	React.useEffect(t2, t3);
-	const [revisions] = React.useState(createRevisions);
-	const leaveDraft = useLeaveDraft();
-	let t4;
-	if ($[5] !== authClient || $[6] !== draftScope || $[7] !== leaveDraft || $[8] !== revisions) {
-		let t5;
-		if ($[10] !== revisions) {
-			t5 = (revision) => revisions.announce(revision);
-			$[10] = revisions;
-			$[11] = t5;
-		} else t5 = $[11];
-		t4 = {
-			onDraftEnded(ended) {
-				if (ended.draftId !== draftScope.current()) return;
-				if (ended.endedBy.id === signedInUserId(authClient)) return leaveDraft(ended);
-				draftScope.leave(ended, { notice: true });
-			},
+	let t5;
+	if ($[9] !== revisions) {
+		t5 = (revision) => revisions.announce(revision);
+		$[9] = revisions;
+		$[10] = t5;
+	} else t5 = $[10];
+	let t6;
+	if ($[11] !== t3 || $[12] !== t4 || $[13] !== t5) {
+		t6 = {
+			onDraftEnded: t3,
+			onDraftArchived: t4,
 			onRevision: t5
 		};
-		$[5] = authClient;
-		$[6] = draftScope;
-		$[7] = leaveDraft;
-		$[8] = revisions;
-		$[9] = t4;
-	} else t4 = $[9];
-	useProjectRoom(apiUrl, project?.id, studioCache, t4);
+		$[11] = t3;
+		$[12] = t4;
+		$[13] = t5;
+		$[14] = t6;
+	} else t6 = $[14];
+	useProjectRoom(apiUrl, project?.id, studioCache, t6);
 	const { resolvedTheme } = useApplyTheme();
-	let t5;
-	if ($[12] === Symbol.for("react.memo_cache_sentinel")) {
-		t5 = /* @__PURE__ */ jsx("link", {
+	let t7;
+	if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = /* @__PURE__ */ jsx("link", {
 			rel: "stylesheet",
 			href: studioCssUrl,
 			"data-camox-studio": true
 		});
-		$[12] = t5;
-	} else t5 = $[12];
-	let t6;
-	if ($[13] !== resolvedTheme) {
-		t6 = /* @__PURE__ */ jsx(Toaster, { theme: resolvedTheme });
-		$[13] = resolvedTheme;
-		$[14] = t6;
-	} else t6 = $[14];
-	let t7;
-	if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
-		t7 = /* @__PURE__ */ jsx(CommandPalette, {});
 		$[15] = t7;
 	} else t7 = $[15];
 	let t8;
-	if ($[16] !== children || $[17] !== revisions || $[18] !== t6) {
-		t8 = /* @__PURE__ */ jsxs(RevisionsContext, {
+	if ($[16] !== resolvedTheme) {
+		t8 = /* @__PURE__ */ jsx(Toaster, { theme: resolvedTheme });
+		$[16] = resolvedTheme;
+		$[17] = t8;
+	} else t8 = $[17];
+	let t10;
+	let t9;
+	if ($[18] === Symbol.for("react.memo_cache_sentinel")) {
+		t9 = /* @__PURE__ */ jsx(CommandPalette, {});
+		t10 = /* @__PURE__ */ jsx(DraftNotices, {});
+		$[18] = t10;
+		$[19] = t9;
+	} else {
+		t10 = $[18];
+		t9 = $[19];
+	}
+	let t11;
+	if ($[20] !== children || $[21] !== revisions || $[22] !== t8) {
+		t11 = /* @__PURE__ */ jsxs(RevisionsContext, {
 			value: revisions,
 			children: [
-				t5,
+				t7,
 				children,
-				t6,
-				t7
+				t8,
+				t9,
+				t10
 			]
 		});
-		$[16] = children;
-		$[17] = revisions;
-		$[18] = t6;
-		$[19] = t8;
-	} else t8 = $[19];
-	return t8;
-}
-function _temp(notice) {
-	toast(draftNoticeMessage(notice));
+		$[20] = children;
+		$[21] = revisions;
+		$[22] = t8;
+		$[23] = t11;
+	} else t11 = $[23];
+	return t11;
 }
 
 //#endregion

package/dist/features/routes/pageRuntime.d.ts

@@ -4,7 +4,7 @@ import "../../core/structuredData.js";
 import "../../core/createLayout.js";
 import "../../core/createApp.js";
 import "../../lib/studio-reads.js";
-import { EndedDraft } from "@camox/api-contract/drafts";
+import { ArchivedDraft, EndedDraft } from "@camox/api-contract/drafts";
 import { QueryClient } from "@tanstack/react-query";
 import { Router } from "@camox/api-contract/router";
 import { RouterClient } from "@orpc/server";
@@ -22,8 +22,8 @@ export type PageStructure = {
   recordStructuredData?: PageWithBlocks["recordStructuredData"];
 };
 /**
- * Why a member can't see the draft a URL names: it doesn't exist, it isn't open to them, or it
- * was published or deleted (ADR 0011).
+ * Why a member can't see the draft a URL names: it doesn't exist, it isn't open to them, it
+ * was published or deleted (ADR 0011), or it's archived (ADR 0046).
  */
 export type DraftNotice = {
   reason: "missing";
@@ -31,7 +31,9 @@ export type DraftNotice = {
   reason: "forbidden";
 } | ({
   reason: "ended";
-} & EndedDraft);
+} & EndedDraft) | ({
+  reason: "archived";
+} & ArchivedDraft);
 /** Which draft a render read: the URL's, or Live when there was none or it couldn't be read. */
 export interface DraftRead {
   /** The draft the render read. Absent for Live. */

package/dist/features/routes/pageRuntime.js

@@ -6,7 +6,7 @@ import { PAGE_IMAGE_SIZE, pageImageUrl } from "../og/pageImage.js";
 import { curatedLayoutContext } from "../../core/layoutContext.js";
 import { isArticle } from "../../core/structuredData.js";
 import { publishingDraft } from "../runtime/publishingDraft.js";
-import { DRAFT_ENDED_ERROR_CODE, DRAFT_HEADER, LOOK_TOKEN_HEADER, PUBLISHING_DRAFT_HEADER } from "@camox/api-contract/drafts";
+import { DRAFT_ARCHIVED_ERROR_CODE, DRAFT_ENDED_ERROR_CODE, DRAFT_HEADER, LOOK_TOKEN_HEADER, PUBLISHING_DRAFT_HEADER } from "@camox/api-contract/drafts";
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 
@@ -84,6 +84,10 @@ function draftRefusalNotice(error, draftId) {
 		reason: "ended",
 		...data
 	};
+	if (code === DRAFT_ARCHIVED_ERROR_CODE && data) return {
+		reason: "archived",
+		...data
+	};
 	if (isNotFoundError(error) && data?.draftId === draftId) return { reason: "missing" };
 	if (code === "FORBIDDEN" || status === 403) return { reason: "forbidden" };
 	if (code === "UNAUTHORIZED" || status === 401) return null;

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

@@ -5,13 +5,14 @@ import { reads, useReadQuery } from "../../../lib/studio-reads.js";
 import { cn } from "../../../lib/utils.js";
 import { BOTTOM_CARD_EDGES, CARD_BODY_EDGES } from "../../preview/components/SidebarStack.js";
 import { studioStore } from "../studioStore.js";
+import { useRestoreDraft } from "../useRestoreDraft.js";
+import { ThreadMessages } from "./ThreadMessages.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";
-import { ThreadMessages } from "./ThreadMessages.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -24,9 +25,10 @@ import { EMPTY_THREAD_VIEW } from "@camox/api-contract/threads";
 * studio it is only hidden: the studio keeps following the editor's runs there. It follows
 * where the studio is: the editor's own Live thread on Live, and the draft's thread in a draft.
 * When the agent on Live hands the editor's request off to a draft, the studio that asked enters
-* it, if it still shows Live; the card the Live turn ends on opens it too. Each message tells the
-* agent where the editor is: the page they look at, with what they selected on it unless they
-* cleared it from the composer, or the Canvas with no page selected. A message the studio sends
+* it, if it still shows Live; the card the Live turn ends on opens it too, or restores it once
+* it's archived. Each message tells the agent where the editor is: the page they look at, with
+* what they selected on it unless they cleared it from the composer, or the Canvas with no page
+* selected. A message the studio sends
 * from elsewhere (`studioStore`'s `sendToAgent`), such as Fix with agent's, goes out through the
 * thread it follows, as if the editor had sent it. In a draft, it tells the studio whether a turn
 * is going in the draft's thread, whoever started it, which publishing waits for.
@@ -135,7 +137,7 @@ function CurrentThread() {
 	return t4;
 }
 function Thread(t0) {
-	const $ = c(48);
+	const $ = c(52);
 	const { apiUrl, projectId, draftId, onEnterDraft, onOpenDraft, composerCarry } = t0;
 	let t1;
 	if ($[0] !== onEnterDraft) {
@@ -145,10 +147,22 @@ function Thread(t0) {
 	} else t1 = $[1];
 	const { view, sending, send, stop, error, touched } = useThread(apiUrl, projectId, draftId, t1);
 	useAgentRunToast(view, draftId);
+	const { restore } = useRestoreDraft(projectId);
 	let t2;
+	if ($[2] !== restore || $[3] !== view.messages) {
+		t2 = (restored) => {
+			const card = view.messages.find((message) => message.from === "draft" && message.draftId === restored);
+			restore(restored, card?.from === "draft" ? card.name : void 0);
+		};
+		$[2] = restore;
+		$[3] = view.messages;
+		$[4] = t2;
+	} else t2 = $[4];
+	const restoreCard = t2;
 	let t3;
-	if ($[2] !== draftId || $[3] !== view.running) {
-		t2 = () => {
+	let t4;
+	if ($[5] !== draftId || $[6] !== view.running) {
+		t3 = () => {
 			if (!draftId) return;
 			studioStore.trigger.agentWorking({
 				draftId,
@@ -159,167 +173,169 @@ function Thread(t0) {
 				working: false
 			});
 		};
-		t3 = [draftId, view.running];
-		$[2] = draftId;
-		$[3] = view.running;
-		$[4] = t2;
-		$[5] = t3;
+		t4 = [draftId, view.running];
+		$[5] = draftId;
+		$[6] = view.running;
+		$[7] = t3;
+		$[8] = t4;
 	} else {
-		t2 = $[4];
-		t3 = $[5];
+		t3 = $[7];
+		t4 = $[8];
 	}
-	React.useEffect(t2, t3);
+	React.useEffect(t3, t4);
 	const follow = React.use(FollowAgentContext);
-	let t4;
-	if ($[6] !== follow) {
-		t4 = (batch) => follow?.receive(batch);
-		$[6] = follow;
-		$[7] = t4;
-	} else t4 = $[7];
-	const followTouched = React.useEffectEvent(t4);
 	let t5;
-	if ($[8] !== followTouched || $[9] !== touched) {
-		t5 = () => {
-			if (touched) followTouched(touched.batch);
-		};
-		$[8] = followTouched;
-		$[9] = touched;
+	if ($[9] !== follow) {
+		t5 = (batch) => follow?.receive(batch);
+		$[9] = follow;
 		$[10] = t5;
 	} else t5 = $[10];
+	const followTouched = React.useEffectEvent(t5);
 	let t6;
-	if ($[11] !== touched) {
-		t6 = [touched];
-		$[11] = touched;
-		$[12] = t6;
-	} else t6 = $[12];
-	React.useEffect(t5, t6);
+	if ($[11] !== followTouched || $[12] !== touched) {
+		t6 = () => {
+			if (touched) followTouched(touched.batch);
+		};
+		$[11] = followTouched;
+		$[12] = touched;
+		$[13] = t6;
+	} else t6 = $[13];
+	let t7;
+	if ($[14] !== touched) {
+		t7 = [touched];
+		$[14] = touched;
+		$[15] = t7;
+	} else t7 = $[15];
+	React.useEffect(t6, t7);
 	const where = React.use(EditorWhereContext);
 	const selection = useEditorSelection(where);
-	let t7;
-	if ($[13] !== selection) {
-		t7 = selection ? JSON.stringify([
+	let t8;
+	if ($[16] !== selection) {
+		t8 = selection ? JSON.stringify([
 			selection.blockId,
 			selection.itemId,
 			selection.recordId,
 			selection.fieldName
 		]) : null;
-		$[13] = selection;
-		$[14] = t7;
-	} else t7 = $[14];
-	const selectionKey = t7;
+		$[16] = selection;
+		$[17] = t8;
+	} else t8 = $[17];
+	const selectionKey = t8;
 	const [cleared, setCleared] = React.useState(null);
 	if (cleared !== null && selectionKey !== cleared) setCleared(null);
 	const carried = selection && selectionKey !== cleared ? selection : void 0;
-	let t8;
-	if ($[15] !== carried || $[16] !== follow || $[17] !== send || $[18] !== where) {
-		t8 = (text) => {
+	let t9;
+	if ($[18] !== carried || $[19] !== follow || $[20] !== send || $[21] !== where) {
+		t9 = (text) => {
 			follow?.resume();
 			send(text, where?.on === "page" && carried ? {
 				...where,
 				selection: carried
 			} : where);
 		};
-		$[15] = carried;
-		$[16] = follow;
-		$[17] = send;
-		$[18] = where;
-		$[19] = t8;
-	} else t8 = $[19];
-	const sendFollowing = t8;
+		$[18] = carried;
+		$[19] = follow;
+		$[20] = send;
+		$[21] = where;
+		$[22] = t9;
+	} else t9 = $[22];
+	const sendFollowing = t9;
 	const waiting = useSelector(studioStore, _temp);
-	let t9;
-	if ($[20] !== sendFollowing) {
-		t9 = () => {
-			for (const message of studioStore.getSnapshot().context.agentMessages) {
-				studioStore.trigger.takeAgentMessage({ id: message.id });
-				sendFollowing(message.text);
-			}
-		};
-		$[20] = sendFollowing;
-		$[21] = t9;
-	} else t9 = $[21];
-	const sendWaiting = React.useEffectEvent(t9);
 	let t10;
-	if ($[22] !== sendWaiting || $[23] !== waiting) {
+	if ($[23] !== sendFollowing) {
 		t10 = () => {
-			if (waiting.length > 0) sendWaiting();
+			for (const message_0 of studioStore.getSnapshot().context.agentMessages) {
+				studioStore.trigger.takeAgentMessage({ id: message_0.id });
+				sendFollowing(message_0.text);
+			}
 		};
-		$[22] = sendWaiting;
-		$[23] = waiting;
+		$[23] = sendFollowing;
 		$[24] = t10;
 	} else t10 = $[24];
+	const sendWaiting = React.useEffectEvent(t10);
 	let t11;
-	if ($[25] !== waiting) {
-		t11 = [waiting];
-		$[25] = waiting;
-		$[26] = t11;
-	} else t11 = $[26];
-	React.useEffect(t10, t11);
+	if ($[25] !== sendWaiting || $[26] !== waiting) {
+		t11 = () => {
+			if (waiting.length > 0) sendWaiting();
+		};
+		$[25] = sendWaiting;
+		$[26] = waiting;
+		$[27] = t11;
+	} else t11 = $[27];
 	let t12;
-	if ($[27] !== onOpenDraft || $[28] !== sending || $[29] !== view) {
-		t12 = /* @__PURE__ */ jsx(ThreadMessages, {
+	if ($[28] !== waiting) {
+		t12 = [waiting];
+		$[28] = waiting;
+		$[29] = t12;
+	} else t12 = $[29];
+	React.useEffect(t11, t12);
+	let t13;
+	if ($[30] !== onOpenDraft || $[31] !== restoreCard || $[32] !== sending || $[33] !== view) {
+		t13 = /* @__PURE__ */ jsx(ThreadMessages, {
 			view,
 			sending,
-			onOpenDraft
+			onOpenDraft,
+			onRestoreDraft: restoreCard
 		});
-		$[27] = onOpenDraft;
-		$[28] = sending;
-		$[29] = view;
-		$[30] = t12;
-	} else t12 = $[30];
-	let t13;
-	if ($[31] !== error) {
-		t13 = error && /* @__PURE__ */ jsx("p", {
+		$[30] = onOpenDraft;
+		$[31] = restoreCard;
+		$[32] = sending;
+		$[33] = view;
+		$[34] = t13;
+	} else t13 = $[34];
+	let t14;
+	if ($[35] !== error) {
+		t14 = error && /* @__PURE__ */ jsx("p", {
 			role: "alert",
 			className: "text-destructive px-2 pt-2 text-sm",
 			children: error
 		});
-		$[31] = error;
-		$[32] = t13;
-	} else t13 = $[32];
-	let t14;
-	if ($[33] !== carried?.path) {
-		t14 = carried?.path.at(-1);
-		$[33] = carried?.path;
-		$[34] = t14;
-	} else t14 = $[34];
+		$[35] = error;
+		$[36] = t14;
+	} else t14 = $[36];
 	let t15;
-	if ($[35] !== selectionKey) {
-		t15 = () => selectionKey !== null && setCleared(selectionKey);
-		$[35] = selectionKey;
-		$[36] = t15;
-	} else t15 = $[36];
+	if ($[37] !== carried?.path) {
+		t15 = carried?.path.at(-1);
+		$[37] = carried?.path;
+		$[38] = t15;
+	} else t15 = $[38];
 	let t16;
-	if ($[37] !== composerCarry || $[38] !== sendFollowing || $[39] !== stop || $[40] !== t14 || $[41] !== t15 || $[42] !== view.running) {
-		t16 = /* @__PURE__ */ jsx(ThreadComposer, {
+	if ($[39] !== selectionKey) {
+		t16 = () => selectionKey !== null && setCleared(selectionKey);
+		$[39] = selectionKey;
+		$[40] = t16;
+	} else t16 = $[40];
+	let t17;
+	if ($[41] !== composerCarry || $[42] !== sendFollowing || $[43] !== stop || $[44] !== t15 || $[45] !== t16 || $[46] !== view.running) {
+		t17 = /* @__PURE__ */ jsx(ThreadComposer, {
 			onSend: sendFollowing,
 			onStop: stop,
-			selection: t14,
-			onClearSelection: t15,
+			selection: t15,
+			onClearSelection: t16,
 			running: view.running,
 			carry: composerCarry
 		});
-		$[37] = composerCarry;
-		$[38] = sendFollowing;
-		$[39] = stop;
-		$[40] = t14;
-		$[41] = t15;
-		$[42] = view.running;
-		$[43] = t16;
-	} else t16 = $[43];
-	let t17;
-	if ($[44] !== t12 || $[45] !== t13 || $[46] !== t16) {
-		t17 = /* @__PURE__ */ jsxs(Fragment, { children: [
-			t12,
-			t13,
-			t16
-		] });
-		$[44] = t12;
-		$[45] = t13;
-		$[46] = t16;
+		$[41] = composerCarry;
+		$[42] = sendFollowing;
+		$[43] = stop;
+		$[44] = t15;
+		$[45] = t16;
+		$[46] = view.running;
 		$[47] = t17;
 	} else t17 = $[47];
-	return t17;
+	let t18;
+	if ($[48] !== t13 || $[49] !== t14 || $[50] !== t17) {
+		t18 = /* @__PURE__ */ jsxs(Fragment, { children: [
+			t13,
+			t14,
+			t17
+		] });
+		$[48] = t13;
+		$[49] = t14;
+		$[50] = t17;
+		$[51] = t18;
+	} else t18 = $[51];
+	return t18;
 }
 function _temp(state) {
 	return state.context.agentMessages;