camox 0.54.0 → 0.57.0

package/dist/features/studio/studioStore.js

@@ -9,7 +9,7 @@ const studioStore = createStore({
 			open: false,
 			startRenaming: false
 		},
-		isDiscardDraftDialogOpen: false,
+		isDeleteDraftDialogOpen: false,
 		localeDialog: null,
 		websiteLocation: null
 	},
@@ -64,16 +64,16 @@ const studioStore = createStore({
 				}
 			};
 		},
-		openDiscardDraftDialog: (context) => {
+		openDeleteDraftDialog: (context) => {
 			return {
 				...context,
-				isDiscardDraftDialogOpen: true
+				isDeleteDraftDialogOpen: true
 			};
 		},
-		closeDiscardDraftDialog: (context) => {
+		closeDeleteDraftDialog: (context) => {
 			return {
 				...context,
-				isDiscardDraftDialogOpen: false
+				isDeleteDraftDialogOpen: false
 			};
 		},
 		openLocaleDialog: (context, event) => {

package/dist/features/studio/workingSentence.js

@@ -0,0 +1,55 @@
+import { localeName } from "./localeOptions.js";
+
+//#region src/features/studio/workingSentence.ts
+const PHRASES = {
+	translator: {
+		verb: "Translating",
+		locale: "into",
+		singleLocale: "Add a language to translate into"
+	},
+	seoManager: {
+		verb: "Writing SEO for",
+		verbFor: { file: "Describing" },
+		locale: "in"
+	}
+};
+/** The most locales a burst names; past it, the first are named and the rest counted. */
+const NAMED_LOCALES = 3;
+/** Joins parts as a list: "a", "a and b", "a, b and c". */
+const listed = (parts) => parts.length < 2 ? parts.join("") : `${parts.slice(0, -1).join(", ")} and ${parts.at(-1)}`;
+/**
+* Each locale of a burst with its count, the first counted by the caller: "into German and 12
+* into Spanish", or with the rest counted together, "…and 9 into 2 other languages".
+*/
+function inLocales(locales, preposition) {
+	const named = locales.length > NAMED_LOCALES ? locales.slice(0, 2) : locales;
+	const rest = locales.slice(named.length);
+	const parts = named.map(({ locale, count }, index) => `${index === 0 ? "" : `${count} `}${preposition} ${localeName(locale)}`);
+	if (rest.length > 0) {
+		const count = rest.reduce((sum, each) => sum + each.count, 0);
+		parts.push(`${count} ${preposition} ${rest.length} other languages`);
+	}
+	return listed(parts);
+}
+/**
+* What a patroller is working on: "Translating hero into Spanish" for one subject, "Translating
+* 38 items into German and 12 into Spanish" for a burst, counted in each locale.
+*/
+function workingSentence(id, working) {
+	const phrase = PHRASES[id];
+	const { subject, locales } = working;
+	const verb = (subject && phrase.verbFor?.[subject.entity]) ?? phrase.verb;
+	const first = locales[0]?.count ?? 0;
+	return [
+		verb,
+		subject?.name ?? `${first} ${first === 1 ? "item" : "items"}`,
+		inLocales(locales, phrase.locale)
+	].filter(Boolean).join(" ");
+}
+/** What a patroller says while idle in a project with a single locale, if anything. */
+function singleLocaleSentence(id) {
+	return PHRASES[id].singleLocale;
+}
+
+//#endregion
+export { singleLocaleSentence, workingSentence };

package/dist/lib/queries.js

@@ -43,7 +43,7 @@ const projectMutations = {
 };
 const draftMutations = {
 	publish: () => getOrpc().drafts.publish.mutationOptions(),
-	discard: () => getOrpc().drafts.discard.mutationOptions(),
+	delete: () => getOrpc().drafts.delete.mutationOptions(),
 	/** Requests the draft's overview again right away, once it failed. */
 	retryOverview: () => getOrpc().drafts.retryOverview.mutationOptions(),
 	/** Drops the draft's copy of an entity it conflicts on, to use Live's version instead. */

package/dist/lib/studio-reads.d.ts

@@ -7,6 +7,7 @@ import "./queries.js";
 import "react";
 import "@camox/api-contract/query-keys";
 import { QueryClient } from "@tanstack/react-query";
+import "@camox/api-contract/patrol";
 //#region src/lib/studio-reads.d.ts
 type LayoutRead = Awaited<ReturnType<ApiClient["layouts"]["get"]>>;
 /** A layout's structure: its blocks before and after the content of its pages. */

package/dist/lib/studio-reads.js

@@ -206,6 +206,11 @@ const reads = {
 		fetch: ({ apiIn, signal }, { projectId, draftId }) => apiIn(draftId).drafts.get({ projectId }, { signal }),
 		staleTime: Infinity
 	}),
+	patrol: entry({
+		key: ({ projectId }) => [...queryKeys.patrol.get, projectId],
+		everyLocale: true,
+		fetch: ({ api, signal }, { projectId }) => api.patrol.get({ projectId }, { signal })
+	}),
 	publishPreview: entry({
 		key: ({ draftId }) => [
 			...queryKeys.drafts.all,

package/dist/lib/use-thread.js

@@ -13,19 +13,16 @@ const OPEN = 1;
 * signed-in editor's Live thread when `draftId` is null, or the draft's thread, which `draftId`
 * names as the draft header does (`development` in dev mode). A message is resent with its
 * operation id each time the thread shows itself after the socket opens, until it accepts it,
-* which records it once, or turns it down. A thread that ended with its draft isn't reconnected
-* to, but for a development draft's or the editor's Live thread, which move on to a new thread.
-* Mount it once per project and draft.
+* which records it once, or turns it down. A draft's thread that ended with its draft isn't
+* reconnected to, but for a development draft's, which moves on to a new thread. Mount it once
+* per project and draft.
 *
-* When the Live thread starts a draft, a studio that sent a message of the run that wrote enters
-* the draft with it (`onEnterDraft`), even if it only hears so on reconnecting, from the editor's
-* fresh Live thread; its messages still on their way go with it. Any other studio moves on to
-* that fresh Live thread, continued in the draft.
+* When the agent on Live hands a request off to a draft it started, the studio that sent a
+* message of that run hears it (`onEnterDraft`), to enter the draft. The editor's Live thread
+* stays as it is, ending that turn on the draft's card, which every studio on Live shows.
 *
 * It reports what each writing script touched (`touched`), for runs one of its messages was part
-* of only, so that the studio follows the agent; teammates' runs leave it where it is. A studio
-* entering the draft its Live thread started keeps following that run there, starting with what
-* the write touched.
+* of only, so that the studio follows the agent; teammates' runs leave it where it is.
 */
 function useThread(apiUrl, projectId, draftId, t0) {
 	const $ = c(47);
@@ -35,8 +32,8 @@ function useThread(apiUrl, projectId, draftId, t0) {
 		$[0] = t0;
 		$[1] = t1;
 	} else t1 = $[1];
-	const { carried, onEnterDraft } = t1;
-	const [state, setState] = React.useState(carried?.state ?? EMPTY_THREAD_STATE);
+	const { onEnterDraft } = t1;
+	const [state, setState] = React.useState(EMPTY_THREAD_STATE);
 	let t2;
 	if ($[2] !== state) {
 		t2 = threadViewOf(state);
@@ -45,50 +42,37 @@ function useThread(apiUrl, projectId, draftId, t0) {
 	} else t2 = $[3];
 	const view = t2;
 	let t3;
-	if ($[4] !== carried?.unaccepted) {
-		t3 = carried?.unaccepted ?? /* @__PURE__ */ new Map();
-		$[4] = carried?.unaccepted;
-		$[5] = t3;
-	} else t3 = $[5];
+	if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
+		t3 = /* @__PURE__ */ new Map();
+		$[4] = t3;
+	} else t3 = $[4];
 	const [unaccepted, setUnaccepted] = React.useState(t3);
 	const [error, setError] = React.useState();
-	const t4 = carried?.sent;
-	let t5;
-	if ($[6] !== t4) {
-		t5 = new Set(t4);
-		$[6] = t4;
-		$[7] = t5;
-	} else t5 = $[7];
-	const sent = React.useRef(t5);
+	let t4;
+	if ($[5] !== apiUrl || $[6] !== draftId || $[7] !== projectId) {
+		t4 = () => new Set(handedOffTo(apiUrl, projectId, draftId));
+		$[5] = apiUrl;
+		$[6] = draftId;
+		$[7] = projectId;
+		$[8] = t4;
+	} else t4 = $[8];
+	const [sent] = React.useState(t4);
 	const shown = React.useRef(false);
 	const [shows, setShows] = React.useState(0);
-	const [entering, setEntering] = React.useState();
-	const leaving = React.useRef(false);
-	let t6;
-	if ($[8] !== carried) {
-		t6 = () => carried?.touched ? {
-			sequence: 1,
-			batch: carried.touched
-		} : void 0;
-		$[8] = carried;
-		$[9] = t6;
-	} else t6 = $[9];
-	const [touched, setTouched] = React.useState(t6);
-	const touchedWhileLeaving = React.useRef(void 0);
-	let t7;
-	if ($[10] !== apiUrl) {
-		t7 = apiSocketOptions(apiUrl);
-		$[10] = apiUrl;
-		$[11] = t7;
-	} else t7 = $[11];
+	const [touched, setTouched] = React.useState();
+	let t5;
+	if ($[9] !== apiUrl) {
+		t5 = apiSocketOptions(apiUrl);
+		$[9] = apiUrl;
+		$[10] = t5;
+	} else t5 = $[10];
 	const socket = usePartySocket({
-		...t7,
+		...t5,
 		basePath: draftId ? `threads/draft/${projectId}/${draftId}` : `threads/live/${projectId}`,
 		maxEnqueuedMessages: 0,
 		shouldReconnectOnClose: _temp,
 		onClose(event_0) {
-			const movesOn = draftId === null || draftId === DEVELOPMENT_DRAFT;
-			if (event_0.code === THREAD_ENDED_CLOSE_CODE && movesOn) socket.reconnect();
+			if (event_0.code === THREAD_ENDED_CLOSE_CODE && draftId === DEVELOPMENT_DRAFT) socket.reconnect();
 		},
 		onOpen() {
 			shown.current = false;
@@ -104,153 +88,125 @@ function useThread(apiUrl, projectId, draftId, t0) {
 			onFrame(frame);
 		}
 	});
+	let t6;
+	if ($[11] !== draftId || $[12] !== sent) {
+		t6 = (started) => draftId === null && started.operationIds.some((operationId) => sent.has(operationId));
+		$[11] = draftId;
+		$[12] = sent;
+		$[13] = t6;
+	} else t6 = $[13];
+	const asked = t6;
+	let t7;
+	if ($[14] !== sent) {
+		t7 = (batch) => batch.operationIds.some((operationId_0) => sent.has(operationId_0));
+		$[14] = sent;
+		$[15] = t7;
+	} else t7 = $[15];
+	const ours = t7;
 	let t8;
-	if ($[12] !== draftId) {
-		t8 = (started) => draftId === null && started.operationIds.some((operationId) => sent.current.has(operationId));
-		$[12] = draftId;
-		$[13] = t8;
-	} else t8 = $[13];
-	const wrote = t8;
-	let t9;
-	if ($[14] === Symbol.for("react.memo_cache_sentinel")) {
-		t9 = (batch) => batch.operationIds.some((operationId_0) => sent.current.has(operationId_0));
-		$[14] = t9;
-	} else t9 = $[14];
-	const ours = t9;
-	const onFrame = React.useEffectEvent((frame_0) => {
-		if (leaving.current) {
-			if (frame_0.type === "touched" && ours(frame_0.touched)) touchedWhileLeaving.current = frame_0.touched;
-			return;
-		}
-		switch (frame_0.type) {
-			case "started-draft":
-			case "continued-in": {
-				const started_0 = frame_0.type === "started-draft" ? frame_0.startedDraft : frame_0.continuedIn;
-				if (wrote(started_0)) {
-					leaving.current = true;
-					setEntering(started_0.draftId);
+	if ($[16] !== apiUrl || $[17] !== asked || $[18] !== onEnterDraft || $[19] !== ours || $[20] !== projectId || $[21] !== sent) {
+		t8 = (frame_0) => {
+			switch (frame_0.type) {
+				case "started-draft":
+					if (asked(frame_0.startedDraft)) {
+						handedOff.set(threadKey(apiUrl, projectId, frame_0.startedDraft.draftId), sent);
+						onEnterDraft?.(frame_0.startedDraft.draftId);
+					}
 					return;
-				}
-				if (frame_0.type === "started-draft" && draftId === null) {
-					setState(EMPTY_THREAD_STATE);
-					socket.reconnect();
+				case "events":
+					setState((current_2) => reduceThreadFrame(current_2, frame_0));
+					if (!shown.current) {
+						shown.current = true;
+						setShows(_temp2);
+					}
+					return;
+				case "drafts":
+					setState((current_1) => reduceThreadFrame(current_1, frame_0));
+					return;
+				case "touched":
+					if (ours(frame_0.touched)) {
+						const batch_0 = frame_0.touched;
+						setTouched((last) => ({
+							sequence: (last?.sequence ?? 0) + 1,
+							batch: batch_0
+						}));
+					}
+					return;
+				case "accepted":
+					setUnaccepted((current_0) => without(current_0, frame_0.operationId));
+					return;
+				case "error": {
+					console.error("[useThread]", frame_0.message);
+					setError(frame_0.message);
+					const { operationId: operationId_1 } = frame_0;
+					if (operationId_1) setUnaccepted((current) => without(current, operationId_1));
 					return;
 				}
-				setState((current_2) => reduceThreadFrame(current_2, frame_0));
-				return;
-			}
-			case "events":
-				setState((current_1) => reduceThreadFrame(current_1, frame_0));
-				if (!shown.current) {
-					shown.current = true;
-					setShows(_temp2);
-				}
-				return;
-			case "touched":
-				if (ours(frame_0.touched)) {
-					const batch_0 = frame_0.touched;
-					setTouched((last) => ({
-						sequence: (last?.sequence ?? 0) + 1,
-						batch: batch_0
-					}));
-				}
-				return;
-			case "accepted":
-				setUnaccepted((current_0) => without(current_0, frame_0.operationId));
-				return;
-			case "error": {
-				console.error("[useThread]", frame_0.message);
-				setError(frame_0.message);
-				const { operationId: operationId_1 } = frame_0;
-				if (operationId_1) setUnaccepted((current) => without(current, operationId_1));
-				return;
 			}
-		}
-	});
-	let t10;
-	if ($[15] !== socket || $[16] !== unaccepted) {
-		t10 = () => {
+		};
+		$[16] = apiUrl;
+		$[17] = asked;
+		$[18] = onEnterDraft;
+		$[19] = ours;
+		$[20] = projectId;
+		$[21] = sent;
+		$[22] = t8;
+	} else t8 = $[22];
+	const onFrame = React.useEffectEvent(t8);
+	let t9;
+	if ($[23] !== socket || $[24] !== unaccepted) {
+		t9 = () => {
 			for (const [operationId_2, text] of unaccepted) transmit(socket, {
 				type: "send",
 				operationId: operationId_2,
 				text
 			});
 		};
-		$[15] = socket;
-		$[16] = unaccepted;
-		$[17] = t10;
-	} else t10 = $[17];
-	const resendUnaccepted = React.useEffectEvent(t10);
-	let t11;
-	if ($[18] !== resendUnaccepted || $[19] !== shows) {
-		t11 = () => {
+		$[23] = socket;
+		$[24] = unaccepted;
+		$[25] = t9;
+	} else t9 = $[25];
+	const resendUnaccepted = React.useEffectEvent(t9);
+	let t10;
+	if ($[26] !== resendUnaccepted || $[27] !== shows) {
+		t10 = () => {
 			if (shows > 0) resendUnaccepted();
 		};
-		$[18] = resendUnaccepted;
-		$[19] = shows;
-		$[20] = t11;
-	} else t11 = $[20];
+		$[26] = resendUnaccepted;
+		$[27] = shows;
+		$[28] = t10;
+	} else t10 = $[28];
+	let t11;
+	if ($[29] !== shows) {
+		t11 = [shows];
+		$[29] = shows;
+		$[30] = t11;
+	} else t11 = $[30];
+	React.useEffect(t10, t11);
 	let t12;
-	if ($[21] !== shows) {
-		t12 = [shows];
-		$[21] = shows;
-		$[22] = t12;
-	} else t12 = $[22];
-	React.useEffect(t11, t12);
-	let t13;
-	if ($[23] !== onEnterDraft || $[24] !== state || $[25] !== unaccepted) {
-		t13 = (started_1) => onEnterDraft?.(started_1, {
-			state,
-			unaccepted,
-			sent: sent.current,
-			touched: touchedWhileLeaving.current
-		});
-		$[23] = onEnterDraft;
-		$[24] = state;
-		$[25] = unaccepted;
-		$[26] = t13;
-	} else t13 = $[26];
-	const enterDraft = React.useEffectEvent(t13);
-	let t14;
-	if ($[27] !== enterDraft || $[28] !== entering) {
-		t14 = () => {
-			if (entering) enterDraft(entering);
-		};
-		$[27] = enterDraft;
-		$[28] = entering;
-		$[29] = t14;
-	} else t14 = $[29];
-	let t15;
-	if ($[30] !== entering) {
-		t15 = [entering];
-		$[30] = entering;
-		$[31] = t15;
-	} else t15 = $[31];
-	React.useEffect(t14, t15);
-	let t16;
-	if ($[32] !== socket) {
-		t16 = () => {
+	if ($[31] !== socket) {
+		t12 = () => {
 			const resync = () => {
 				if (document.visibilityState === "visible") transmit(socket, { type: "resync" });
 			};
 			document.addEventListener("visibilitychange", resync);
 			return () => document.removeEventListener("visibilitychange", resync);
 		};
-		$[32] = socket;
-		$[33] = t16;
-	} else t16 = $[33];
-	let t17;
-	if ($[34] !== socket) {
-		t17 = [socket];
-		$[34] = socket;
-		$[35] = t17;
-	} else t17 = $[35];
-	React.useEffect(t16, t17);
-	let t18;
-	if ($[36] !== socket) {
-		t18 = (text_0) => {
+		$[31] = socket;
+		$[32] = t12;
+	} else t12 = $[32];
+	let t13;
+	if ($[33] !== socket) {
+		t13 = [socket];
+		$[33] = socket;
+		$[34] = t13;
+	} else t13 = $[34];
+	React.useEffect(t12, t13);
+	let t14;
+	if ($[35] !== sent || $[36] !== socket) {
+		t14 = (text_0) => {
 			const operationId_3 = crypto.randomUUID();
-			sent.current.add(operationId_3);
+			sent.add(operationId_3);
 			setError(void 0);
 			setUnaccepted((current_3) => new Map(current_3).set(operationId_3, text_0));
 			transmit(socket, {
@@ -259,23 +215,24 @@ function useThread(apiUrl, projectId, draftId, t0) {
 				text: text_0
 			});
 		};
+		$[35] = sent;
 		$[36] = socket;
-		$[37] = t18;
-	} else t18 = $[37];
-	const send = t18;
-	let t19;
+		$[37] = t14;
+	} else t14 = $[37];
+	const send = t14;
+	let t15;
 	if ($[38] !== socket) {
-		t19 = () => transmit(socket, { type: "stop" });
+		t15 = () => transmit(socket, { type: "stop" });
 		$[38] = socket;
-		$[39] = t19;
-	} else t19 = $[39];
-	const stop = t19;
-	const t20 = unaccepted.size > 0;
-	let t21;
-	if ($[40] !== error || $[41] !== send || $[42] !== stop || $[43] !== t20 || $[44] !== touched || $[45] !== view) {
-		t21 = {
+		$[39] = t15;
+	} else t15 = $[39];
+	const stop = t15;
+	const t16 = unaccepted.size > 0;
+	let t17;
+	if ($[40] !== error || $[41] !== send || $[42] !== stop || $[43] !== t16 || $[44] !== touched || $[45] !== view) {
+		t17 = {
 			view,
-			sending: t20,
+			sending: t16,
 			send,
 			stop,
 			error,
@@ -284,12 +241,12 @@ function useThread(apiUrl, projectId, draftId, t0) {
 		$[40] = error;
 		$[41] = send;
 		$[42] = stop;
-		$[43] = t20;
+		$[43] = t16;
 		$[44] = touched;
 		$[45] = view;
-		$[46] = t21;
-	} else t21 = $[46];
-	return t21;
+		$[46] = t17;
+	} else t17 = $[46];
+	return t17;
 }
 function _temp2(count) {
 	return count + 1;
@@ -297,6 +254,15 @@ function _temp2(count) {
 function _temp(event) {
 	return event.code !== THREAD_ENDED_CLOSE_CODE;
 }
+/**
+* The operation ids of the messages a studio sent on Live, by the draft the agent on Live handed
+* its request off to: the draft's agent runs on them, so once the studio follows that draft's
+* thread, it follows what they touch.
+*/
+const handedOff = /* @__PURE__ */ new Map();
+const threadKey = (apiUrl, projectId, draftId) => `${apiUrl}|${projectId}|${draftId}`;
+/** The operation ids a studio carries into the draft `draftId`: none for Live. */
+const handedOffTo = (apiUrl, projectId, draftId) => draftId !== null && handedOff.get(threadKey(apiUrl, projectId, draftId)) || [];
 function transmit(socket, message) {
 	if (socket.readyState === OPEN) socket.send(JSON.stringify(message));
 }

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.54.0";
+var version = "0.57.0";
 
 //#endregion
 export { version };