camox 0.51.0 → 0.52.2

package/dist/features/studio/FollowAgentProvider.js

@@ -2,8 +2,8 @@ import { useProjectUuid } from "../../lib/auth.js";
 import { parseLocalePath } from "../../lib/locale-path.js";
 import { useViewLocale } from "../../lib/view-locale-context.js";
 import { useLocation, useNavigate } from "../navigation/navigation.js";
-import { useCamoxApp } from "../provider/components/CamoxAppContext.js";
 import { reads, useReadQueries, useReadQuery } from "../../lib/studio-reads.js";
+import { useRoutableLayouts } from "../../lib/studio-definitions.js";
 import { FollowAgentContext } from "./followAgentContext.js";
 import { canvasPageId, getCanvasPages } from "../canvas/canvasPages.js";
 import { selectedCanvasPage } from "../canvas/canvasSelection.js";
@@ -102,7 +102,7 @@ function _temp(id) {
 /** Where the editor is, and the Studio content following locates the agent's touches with. */
 function useFollowWhere(runtimeBasePath) {
 	const $ = c(35);
-	const app = useCamoxApp();
+	const layouts = useRoutableLayouts();
 	const projectUuid = useProjectUuid();
 	const location = useLocation();
 	const { locale, locales } = useViewLocale();
@@ -129,20 +129,20 @@ function useFollowWhere(runtimeBasePath) {
 	const { data: pageList } = useReadQuery(t1, t3);
 	const discoveredPaths = useDiscoveredPreviewPaths(runtimeBasePath);
 	let t4;
-	if ($[6] !== app || $[7] !== discoveredPaths || $[8] !== locale || $[9] !== pageList) {
-		t4 = pageList ? getCanvasPages(pageList, app.getLayouts(), discoveredPaths, locale) : [];
-		$[6] = app;
-		$[7] = discoveredPaths;
+	if ($[6] !== discoveredPaths || $[7] !== layouts || $[8] !== locale || $[9] !== pageList) {
+		t4 = pageList ? getCanvasPages(pageList, layouts, discoveredPaths, locale) : [];
+		$[6] = discoveredPaths;
+		$[7] = layouts;
 		$[8] = locale;
 		$[9] = pageList;
 		$[10] = t4;
 	} else t4 = $[10];
 	const canvasPages = t4;
 	let t5;
-	if ($[11] !== app || $[12] !== canvasPages || $[13] !== locales || $[14] !== location.pathname) {
-		t5 = selectedCanvasPage(canvasPages, app.getLayouts(), location.pathname, locales);
-		$[11] = app;
-		$[12] = canvasPages;
+	if ($[11] !== canvasPages || $[12] !== layouts || $[13] !== locales || $[14] !== location.pathname) {
+		t5 = selectedCanvasPage(canvasPages, layouts, location.pathname, locales);
+		$[11] = canvasPages;
+		$[12] = layouts;
 		$[13] = locales;
 		$[14] = location.pathname;
 		$[15] = t5;

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

@@ -3,9 +3,9 @@ import { getApiUrl } from "../../../lib/api-client.js";
 import { Link as Link$1 } from "../../navigation/navigation.js";
 import { reads, useReadQuery } from "../../../lib/studio-reads.js";
 import { useLocalizedPath } from "../../../lib/view-locale.js";
+import { version } from "../../../package.js";
 import { STUDIO_SETTINGS_PATH } from "../routes.js";
 import { buildFaviconUrl } from "../../routes/pageRuntime.js";
-import { version } from "../../../package.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";

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

@@ -2,18 +2,19 @@ import { useDraftScope } from "../../../lib/draft-scope.js";
 import { reads, useReadQuery } from "../../../lib/studio-reads.js";
 import { cn } from "../../../lib/utils.js";
 import { draftMutations } from "../../../lib/queries.js";
+import { previewStore } from "../../preview/previewStore.js";
 import { localeLabel } from "../localeOptions.js";
 import { draftLabel, plural, timeAgo } from "../draftLabel.js";
 import { useRenameDraft } from "./RenameDraftDialog.js";
 import { useShowInCanvas } from "../showInCanvas.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
-import { CONFLICTS_CHANGED_ERROR, TRANSLATIONS_PENDING_ERROR } from "@camox/api-contract/drafts";
+import { CONFLICTS_CHANGED_ERROR, REVISION_CHANGED_ERROR, TRANSLATIONS_PENDING_ERROR } from "@camox/api-contract/drafts";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useMutation } from "@tanstack/react-query";
 import { Button } from "@camox/ui/button";
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from "@camox/ui/sheet";
-import { CircleCheck, OctagonX, Replace, Trash2, Unlink } from "lucide-react";
+import { CircleCheck, OctagonX, Replace, Trash2, TriangleAlert, Unlink } from "lucide-react";
 import { toast } from "@camox/ui/toaster";
 import { Skeleton } from "@camox/ui/skeleton";
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@camox/ui/alert-dialog";
@@ -104,8 +105,8 @@ const LOST_REASONS = {
 	writtenAfterDeletion: "This draft deletes what it was added to, so publishing deletes it too."
 };
 /**
-* A card for something to know before publishing: blockers in red, conflicts and lost changes in
-* amber.
+* A card for something to know before publishing: blockers in red; removals, conflicts and lost
+* changes in amber.
 */
 function Card(t0) {
 	const $ = c(22);
@@ -189,25 +190,37 @@ function Card(t0) {
 	} else t10 = $[21];
 	return t10;
 }
-/** From how many blockers sharing a message they fold into one card, naming each subject. */
+/** From how many problems sharing a message they fold into one card, naming each subject. */
 const SHARED_MESSAGE_MIN = 3;
 /**
-* One card per blocker, saying what's wrong and where. Blockers sharing a message fold into one
-* card naming each: a development draft can hold dozens of definitions to release, and the
-* message is the same for each. A blocker on a page has an action that shows it in the Canvas.
+* Warnings the review shows: what the draft's code removes while Live content uses it, which is
+* about the draft. Other warnings are about problems already on Live, and stay out (ADR 0009).
 */
-function BlockerCards({ blockers, onShow }) {
+const isShownWarning = (problem) => problem.code === "removedInUse";
+/**
+* One card per problem, saying what's wrong and where. Problems sharing a message fold into one
+* card naming each: a development draft can hold dozens of definitions to release, and a removed
+* block can sit on dozens of pages, with the same message for each. A problem on a page has an
+* action that shows it in the Canvas; a blocker in the draft's code, which only the agent fixes,
+* one that opens the draft's thread.
+*/
+function ProblemCards({ problems, tone, icon, onShow, onOpenThread }) {
 	const byMessage = /* @__PURE__ */ new Map();
-	for (const problem of blockers) byMessage.set(problem.message, [...byMessage.get(problem.message) ?? [], problem]);
+	for (const problem of problems) byMessage.set(problem.message, [...byMessage.get(problem.message) ?? [], problem]);
 	return [...byMessage].flatMap(([message, shared]) => {
 		if (shared.length < SHARED_MESSAGE_MIN) return shared.map((problem) => {
 			const place = problemPlace(problem);
 			const target = blockerTarget(problem);
 			return /* @__PURE__ */ jsx(Card, {
-				tone: "danger",
-				icon: OctagonX,
+				tone,
+				icon,
 				title: problem.message,
-				action: target && /* @__PURE__ */ jsx(Button, {
+				action: problem.entity === "code" ? /* @__PURE__ */ jsx(Button, {
+					variant: "outline",
+					size: "sm",
+					onClick: onOpenThread,
+					children: "Open the thread"
+				}) : target && /* @__PURE__ */ jsx(Button, {
 					variant: "outline",
 					size: "sm",
 					onClick: () => onShow(target),
@@ -217,8 +230,8 @@ function BlockerCards({ blockers, onShow }) {
 			}, `${problem.code}:${problem.id}:${problem.locale}:${problem.field}`);
 		});
 		return [/* @__PURE__ */ jsx(Card, {
-			tone: "danger",
-			icon: OctagonX,
+			tone,
+			icon,
 			title: message,
 			children: /* @__PURE__ */ jsx("ul", {
 				className: "flex flex-wrap gap-1 pt-0.5",
@@ -433,34 +446,62 @@ function UseLiveVersionButton(t0) {
 	} else t8 = $[19];
 	return t8;
 }
-/** Blockers first, then conflicts, then lost changes: one card each, with no section heading. */
+/**
+* Blockers first, then what the draft's code removes while Live content uses it, then conflicts,
+* then lost changes: one card each, with no section heading.
+*/
 function Cards(t0) {
-	const $ = c(25);
-	const { projectId, preview, onChanged, onShow } = t0;
+	const $ = c(33);
+	const { projectId, preview, onChanged, onShow, onOpenThread } = t0;
 	const { blockers, conflicts, lost, changes, defaultLocale } = preview;
-	if (blockers.length + conflicts.length + lost.length === 0) return null;
 	let t1;
-	if ($[0] !== changes) {
-		t1 = new Set(changes.filter(_temp).map(_temp2));
-		$[0] = changes;
+	if ($[0] !== preview.warnings) {
+		t1 = preview.warnings.filter(isShownWarning);
+		$[0] = preview.warnings;
 		$[1] = t1;
 	} else t1 = $[1];
-	const deleted = t1;
+	const warnings = t1;
+	if (blockers.length + warnings.length + conflicts.length + lost.length === 0) return null;
 	let t2;
-	if ($[2] !== blockers || $[3] !== onShow) {
-		t2 = /* @__PURE__ */ jsx(BlockerCards, {
-			blockers,
-			onShow
-		});
-		$[2] = blockers;
-		$[3] = onShow;
-		$[4] = t2;
-	} else t2 = $[4];
+	if ($[2] !== changes) {
+		t2 = new Set(changes.filter(_temp).map(_temp2));
+		$[2] = changes;
+		$[3] = t2;
+	} else t2 = $[3];
+	const deleted = t2;
 	let t3;
-	if ($[5] !== conflicts || $[6] !== defaultLocale || $[7] !== deleted || $[8] !== onChanged || $[9] !== projectId) {
-		let t4;
-		if ($[11] !== defaultLocale || $[12] !== deleted || $[13] !== onChanged || $[14] !== projectId) {
-			t4 = (conflict) => /* @__PURE__ */ jsxs(Card, {
+	if ($[4] !== blockers || $[5] !== onOpenThread || $[6] !== onShow) {
+		t3 = /* @__PURE__ */ jsx(ProblemCards, {
+			problems: blockers,
+			tone: "danger",
+			icon: OctagonX,
+			onShow,
+			onOpenThread
+		});
+		$[4] = blockers;
+		$[5] = onOpenThread;
+		$[6] = onShow;
+		$[7] = t3;
+	} else t3 = $[7];
+	let t4;
+	if ($[8] !== onOpenThread || $[9] !== onShow || $[10] !== warnings) {
+		t4 = /* @__PURE__ */ jsx(ProblemCards, {
+			problems: warnings,
+			tone: "warning",
+			icon: TriangleAlert,
+			onShow,
+			onOpenThread
+		});
+		$[8] = onOpenThread;
+		$[9] = onShow;
+		$[10] = warnings;
+		$[11] = t4;
+	} else t4 = $[11];
+	let t5;
+	if ($[12] !== conflicts || $[13] !== defaultLocale || $[14] !== deleted || $[15] !== onChanged || $[16] !== projectId) {
+		let t6;
+		if ($[18] !== defaultLocale || $[19] !== deleted || $[20] !== onChanged || $[21] !== projectId) {
+			t6 = (conflict) => /* @__PURE__ */ jsxs(Card, {
 				tone: "warning",
 				icon: Replace,
 				title: conflictTitle(conflict),
@@ -479,25 +520,25 @@ function Cards(t0) {
 					})
 				]
 			}, conflictKey(conflict));
-			$[11] = defaultLocale;
-			$[12] = deleted;
-			$[13] = onChanged;
-			$[14] = projectId;
-			$[15] = t4;
-		} else t4 = $[15];
-		t3 = conflicts.map(t4);
-		$[5] = conflicts;
-		$[6] = defaultLocale;
-		$[7] = deleted;
-		$[8] = onChanged;
-		$[9] = projectId;
-		$[10] = t3;
-	} else t3 = $[10];
-	let t4;
-	if ($[16] !== defaultLocale || $[17] !== lost) {
-		let t5;
-		if ($[19] !== defaultLocale) {
-			t5 = (change_1) => /* @__PURE__ */ jsxs(Card, {
+			$[18] = defaultLocale;
+			$[19] = deleted;
+			$[20] = onChanged;
+			$[21] = projectId;
+			$[22] = t6;
+		} else t6 = $[22];
+		t5 = conflicts.map(t6);
+		$[12] = conflicts;
+		$[13] = defaultLocale;
+		$[14] = deleted;
+		$[15] = onChanged;
+		$[16] = projectId;
+		$[17] = t5;
+	} else t5 = $[17];
+	let t6;
+	if ($[23] !== defaultLocale || $[24] !== lost) {
+		let t7;
+		if ($[26] !== defaultLocale) {
+			t7 = (change_1) => /* @__PURE__ */ jsxs(Card, {
 				tone: "warning",
 				icon: Unlink,
 				title: change_1.reason === "writtenAfterDeletion" ? change_1.label : `Loses the change to the ${change_1.label}`,
@@ -507,30 +548,32 @@ function Cards(t0) {
 				change_1.id,
 				change_1.locale
 			]));
-			$[19] = defaultLocale;
-			$[20] = t5;
-		} else t5 = $[20];
-		t4 = lost.map(t5);
-		$[16] = defaultLocale;
-		$[17] = lost;
-		$[18] = t4;
-	} else t4 = $[18];
-	let t5;
-	if ($[21] !== t2 || $[22] !== t3 || $[23] !== t4) {
-		t5 = /* @__PURE__ */ jsxs("ul", {
+			$[26] = defaultLocale;
+			$[27] = t7;
+		} else t7 = $[27];
+		t6 = lost.map(t7);
+		$[23] = defaultLocale;
+		$[24] = lost;
+		$[25] = t6;
+	} else t6 = $[25];
+	let t7;
+	if ($[28] !== t3 || $[29] !== t4 || $[30] !== t5 || $[31] !== t6) {
+		t7 = /* @__PURE__ */ jsxs("ul", {
 			className: "flex flex-col gap-2",
 			children: [
-				t2,
 				t3,
-				t4
+				t4,
+				t5,
+				t6
 			]
 		});
-		$[21] = t2;
-		$[22] = t3;
-		$[23] = t4;
-		$[24] = t5;
-	} else t5 = $[24];
-	return t5;
+		$[28] = t3;
+		$[29] = t4;
+		$[30] = t5;
+		$[31] = t6;
+		$[32] = t7;
+	} else t7 = $[32];
+	return t7;
 }
 function _temp2(change_0) {
 	return JSON.stringify([
@@ -574,37 +617,82 @@ function StatusLine(t0) {
 	} else t3 = $[6];
 	return t3;
 }
+/** What Publish sends: the review's token, and the revision a draft with code shows. */
+const publishInput = (projectId, shown, publishAnyway) => ({
+	projectId,
+	token: shown.token,
+	...shown.code?.revision && { revision: shown.code.revision },
+	...publishAnyway && { publishAnyway }
+});
+/** Why a publish with code went back to the review, as the review says it. */
+const PUBLISH_ABORTED = {
+	revisionChanged: "The agent changed the code since this review opened, so the publish stopped. Check the preview, then publish again.",
+	conflictsChanged: "Live changed while publishing, so the publish stopped and Live is as it was. Check the new list.",
+	blocked: "Something now needs fixing before publishing, so the publish stopped.",
+	codeDoesNotMerge: "Live's code changed while publishing, and it doesn't merge with this draft's yet, so the publish stopped. Camox's agent is fixing it in the draft's thread: publish again once it's done.",
+	liveCodeMoved: "Live's code changed while publishing, and the draft took too long to take it in, so the publish stopped. Try again.",
+	failed: "The publish couldn't finish on Camox's side, and Live is as it was. Try again."
+};
 /**
-* What's fine or still running: the draft is up to date with Live, its translations, and the
-* page SEO being written.
+* What's fine or still running: the draft is up to date with Live, its latest code changes
+* building, its translations, and the page SEO being written.
 */
 function StatusLines(t0) {
-	const $ = c(20);
+	const $ = c(34);
 	const { preview, locales, waiting } = t0;
-	const { conflicts, translating, warnings } = preview;
+	const { conflicts, translating, warnings, code } = preview;
 	let seoPages;
 	let t1;
 	let t2;
 	let t3;
-	if ($[0] !== conflicts.length || $[1] !== locales || $[2] !== translating || $[3] !== waiting || $[4] !== warnings) {
+	let t4;
+	let t5;
+	let t6;
+	if ($[0] !== code || $[1] !== conflicts.length || $[2] !== locales || $[3] !== translating || $[4] !== waiting || $[5] !== warnings) {
 		const translations = locales.filter(_temp3).map(_temp4);
-		let t4;
-		if ($[9] !== warnings) {
-			t4 = new Set(warnings.filter(_temp5).map(_temp6));
-			$[9] = warnings;
-			$[10] = t4;
-		} else t4 = $[10];
-		seoPages = t4.size;
+		let t7;
+		if ($[13] !== warnings) {
+			t7 = new Set(warnings.filter(_temp5).map(_temp6));
+			$[13] = warnings;
+			$[14] = t7;
+		} else t7 = $[14];
+		seoPages = t7.size;
+		const aborted = code?.publishAborted && !code.publishing ? code.publishAborted : null;
 		t1 = "flex flex-col gap-1.5";
-		if ($[11] !== conflicts.length) {
-			t2 = conflicts.length === 0 && /* @__PURE__ */ jsx(StatusLine, {
+		if ($[15] !== aborted) {
+			t2 = aborted && /* @__PURE__ */ jsx("li", {
+				className: "text-sm text-amber-700 dark:text-amber-400",
+				children: PUBLISH_ABORTED[aborted] ?? PUBLISH_ABORTED.failed
+			});
+			$[15] = aborted;
+			$[16] = t2;
+		} else t2 = $[16];
+		if ($[17] !== code?.includesLive || $[18] !== conflicts.length) {
+			t3 = conflicts.length === 0 && (code?.includesLive ?? true) && /* @__PURE__ */ jsx(StatusLine, {
 				done: true,
 				children: "Includes everything published to Live since this draft started"
 			});
-			$[11] = conflicts.length;
-			$[12] = t2;
-		} else t2 = $[12];
-		t3 = translating.length > 0 ? /* @__PURE__ */ jsxs(StatusLine, {
+			$[17] = code?.includesLive;
+			$[18] = conflicts.length;
+			$[19] = t3;
+		} else t3 = $[19];
+		if ($[20] !== code?.building) {
+			t4 = code?.building && /* @__PURE__ */ jsx(StatusLine, {
+				done: false,
+				children: "Building the latest changes…"
+			});
+			$[20] = code?.building;
+			$[21] = t4;
+		} else t4 = $[21];
+		if ($[22] !== code?.publishing) {
+			t5 = code?.publishing && /* @__PURE__ */ jsx(StatusLine, {
+				done: false,
+				children: "Publishing the new code and content…"
+			});
+			$[22] = code?.publishing;
+			$[23] = t5;
+		} else t5 = $[23];
+		t6 = translating.length > 0 ? /* @__PURE__ */ jsxs(StatusLine, {
 			done: false,
 			children: [
 				"Translating into ",
@@ -617,24 +705,31 @@ function StatusLines(t0) {
 			done: true,
 			children: ["Translated into ", listFormat.format(translations.map(localeLabel))]
 		});
-		$[0] = conflicts.length;
-		$[1] = locales;
-		$[2] = translating;
-		$[3] = waiting;
-		$[4] = warnings;
-		$[5] = seoPages;
-		$[6] = t1;
-		$[7] = t2;
-		$[8] = t3;
+		$[0] = code;
+		$[1] = conflicts.length;
+		$[2] = locales;
+		$[3] = translating;
+		$[4] = waiting;
+		$[5] = warnings;
+		$[6] = seoPages;
+		$[7] = t1;
+		$[8] = t2;
+		$[9] = t3;
+		$[10] = t4;
+		$[11] = t5;
+		$[12] = t6;
 	} else {
-		seoPages = $[5];
-		t1 = $[6];
-		t2 = $[7];
-		t3 = $[8];
+		seoPages = $[6];
+		t1 = $[7];
+		t2 = $[8];
+		t3 = $[9];
+		t4 = $[10];
+		t5 = $[11];
+		t6 = $[12];
 	}
-	let t4;
-	if ($[13] !== seoPages) {
-		t4 = seoPages > 0 && /* @__PURE__ */ jsxs(StatusLine, {
+	let t7;
+	if ($[24] !== seoPages) {
+		t7 = seoPages > 0 && /* @__PURE__ */ jsxs(StatusLine, {
 			done: false,
 			children: [
 				"Writing SEO for ",
@@ -642,26 +737,32 @@ function StatusLines(t0) {
 				"…"
 			]
 		});
-		$[13] = seoPages;
-		$[14] = t4;
-	} else t4 = $[14];
-	let t5;
-	if ($[15] !== t1 || $[16] !== t2 || $[17] !== t3 || $[18] !== t4) {
-		t5 = /* @__PURE__ */ jsxs("ul", {
+		$[24] = seoPages;
+		$[25] = t7;
+	} else t7 = $[25];
+	let t8;
+	if ($[26] !== t1 || $[27] !== t2 || $[28] !== t3 || $[29] !== t4 || $[30] !== t5 || $[31] !== t6 || $[32] !== t7) {
+		t8 = /* @__PURE__ */ jsxs("ul", {
 			className: t1,
 			children: [
 				t2,
 				t3,
-				t4
+				t4,
+				t5,
+				t6,
+				t7
 			]
 		});
-		$[15] = t1;
-		$[16] = t2;
-		$[17] = t3;
-		$[18] = t4;
-		$[19] = t5;
-	} else t5 = $[19];
-	return t5;
+		$[26] = t1;
+		$[27] = t2;
+		$[28] = t3;
+		$[29] = t4;
+		$[30] = t5;
+		$[31] = t6;
+		$[32] = t7;
+		$[33] = t8;
+	} else t8 = $[33];
+	return t8;
 }
 function _temp6(warning_0) {
 	return warning_0.id;
@@ -1093,8 +1194,12 @@ function ReviewDraftSheet(t0) {
 	} else t13 = $[25];
 	let t14;
 	if ($[26] !== leave || $[27] !== preview) {
-		t14 = (t15) => {
-			const { empty, ended: ended_0 } = t15;
+		t14 = (result) => {
+			if ("publishing" in result && result.publishing) {
+				preview.refetch();
+				return;
+			}
+			const { empty, ended: ended_0 } = result;
 			if (!empty) return leave(ended_0);
 			toast.info("This draft has no changes, so there is nothing to publish.");
 			preview.refetch();
@@ -1111,6 +1216,11 @@ function ReviewDraftSheet(t0) {
 				preview.refetch();
 				return;
 			}
+			if (error.code === REVISION_CHANGED_ERROR) {
+				toast.error(error.message || "The draft changed since you opened this review.");
+				preview.refetch();
+				return;
+			}
 			if (error.code === TRANSLATIONS_PENDING_ERROR) {
 				toast.info("Translations are still running. Wait for them, or publish anyway.");
 				preview.refetch();
@@ -1137,7 +1247,7 @@ function ReviewDraftSheet(t0) {
 	const data = preview.data;
 	const headline = data?.overview.status === "ready" ? data.overview.headline : null;
 	const busy = publish.isPending;
-	const ready = !!data && data.blockers.length === 0 && !busy && !preview.isFetching;
+	const ready = !!data && data.blockers.length === 0 && !data.code?.building && !data.code?.publishing && !busy && !preview.isFetching;
 	let t17;
 	if ($[34] !== data?.translating) {
 		t17 = data?.translating ?? [];
@@ -1157,10 +1267,7 @@ function ReviewDraftSheet(t0) {
 	if ($[36] !== busy || $[37] !== data || $[38] !== mutate || $[39] !== projectId || $[40] !== translated || $[41] !== waiting) {
 		t18 = () => {
 			if (!waiting || !translated || !data || busy) return;
-			mutate({
-				projectId,
-				token: data.token
-			}, { onSettled: () => setWaiting(null) });
+			mutate(publishInput(projectId, data), { onSettled: () => setWaiting(null) });
 		};
 		t19 = [
 			waiting,
@@ -1187,10 +1294,7 @@ function ReviewDraftSheet(t0) {
 	if ($[44] !== data || $[45] !== projectId || $[46] !== publish || $[47] !== translating.length) {
 		t20 = () => {
 			if (!data) return;
-			if (translating.length === 0) return publish.mutate({
-				projectId,
-				token: data.token
-			});
+			if (translating.length === 0) return publish.mutate(publishInput(projectId, data));
 			setWaiting({ conflicts: new Set(data.conflicts.map(conflictKey)) });
 		};
 		$[44] = data;
@@ -1259,6 +1363,10 @@ function ReviewDraftSheet(t0) {
 					onShow: (target) => {
 						onOpenChange(false);
 						showInCanvas(target);
+					},
+					onOpenThread: () => {
+						onOpenChange(false);
+						previewStore.send({ type: "showCanvas" });
 					}
 				}),
 				/* @__PURE__ */ jsx(StatusLines, {
@@ -1309,11 +1417,7 @@ function ReviewDraftSheet(t0) {
 			variant: "outline",
 			className: "ml-auto",
 			disabled: !ready,
-			onClick: () => data && publish.mutate({
-				projectId,
-				token: data.token,
-				publishAnyway: true
-			}),
+			onClick: () => data && publish.mutate(publishInput(projectId, data, true)),
 			children: "Publish anyway"
 		});
 		$[65] = data;