@agimon-ai/doompi-author 0.0.1-alpha.41 → 0.0.1-alpha.42

package/dist/extensions/web.mjs

@@ -530,11 +530,8 @@ const TERMINAL_REQUEST_STATUSES = /* @__PURE__ */ new Set([
 ]);
 const EMPTY_SESSION = {
 	generation: 0,
-	activeTool: "select",
 	annotationsByDocument: {},
-	annotations: [],
-	candidateText: "",
-	regions: [],
+	toolsByDocument: {},
 	requests: []
 };
 function normalizeAuthorPath(path) {
@@ -561,8 +558,19 @@ function authorSessionWorkspace(sessionId) {
 	if (sessionId === null) return EMPTY_SESSION;
 	return authorWorkspace.store.state.sessions[sessionId] ?? EMPTY_SESSION;
 }
-function authorDocumentAnnotations(sessionId, path) {
-	return sessionId === null ? void 0 : authorWorkspace.store.state.sessions[sessionId]?.annotationsByDocument[normalizeAuthorPath(path)];
+const EMPTY_COLLECTION = Object.freeze({
+	revision: 0,
+	stale: false,
+	candidate: void 0,
+	candidateText: "",
+	annotations: Object.freeze([]),
+	updatedAt: 0
+});
+function authorDocumentAnnotations(sessionId, path, state = authorWorkspace.store.state) {
+	if (sessionId === null) return EMPTY_COLLECTION;
+	const document = state.documents[authorDocumentKey(sessionId, path)];
+	const collection = state.sessions[sessionId]?.annotationsByDocument[normalizeAuthorPath(path)];
+	return document !== void 0 && collection !== void 0 && !collection.stale && collection.revision === document.version && collection.sourceSha256 === document.sourceSha256 ? collection : EMPTY_COLLECTION;
 }
 function hydrateAuthorAnnotationCollections(records) {
 	authorWorkspace.update((state) => {
@@ -579,8 +587,6 @@ function hydrateAuthorAnnotationCollections(records) {
 				...record.collection,
 				stale
 			});
-			const visible = session.focusedDocument?.path === path && !stale;
-			const annotations = visible ? collection.annotations : session.annotations;
 			sessions = {
 				...sessions,
 				[record.sessionId]: {
@@ -588,13 +594,7 @@ function hydrateAuthorAnnotationCollections(records) {
 					annotationsByDocument: {
 						...session.annotationsByDocument,
 						[path]: collection
-					},
-					...visible ? {
-						annotations,
-						regions: annotations,
-						candidate: collection.candidate,
-						candidateText: collection.candidateText
-					} : {}
+					}
 				}
 			};
 		}
@@ -626,32 +626,25 @@ function putAuthorDocument(sessionId, input) {
 		};
 		const session = state.sessions[sessionId];
 		let sessions = state.sessions;
-		if (sourceChanged && session?.focusedDocument?.path === path) {
-			staleThumbnails.push(...session.candidate?.thumbnailUrl === void 0 ? [] : [session.candidate.thumbnailUrl], ...session.annotations.flatMap((annotation) => annotation.thumbnailUrl === void 0 ? [] : [annotation.thumbnailUrl]));
+		if (sourceChanged && session !== void 0) {
+			const collection = session.annotationsByDocument[path];
+			if (collection?.candidate?.thumbnailUrl !== void 0) staleThumbnails.push(collection.candidate.thumbnailUrl);
+			staleThumbnails.push(...(collection?.annotations ?? []).flatMap((annotation) => annotation.thumbnailUrl === void 0 ? [] : [annotation.thumbnailUrl]));
 			const now = Date.now();
-			const generation = session.generation + 1;
-			const staleCollection = staleAuthorCollection(session.annotationsByDocument[path], now);
+			const staleCollection = staleAuthorCollection(collection, now);
 			sessions = {
 				...sessions,
 				[sessionId]: {
 					...session,
-					generation,
-					focusedDocument: {
-						path,
-						generation,
-						revision: baselineVersion,
-						sourceSha256: input.sourceSha256,
-						focusedAt: now
-					},
 					annotationsByDocument: {
 						...session.annotationsByDocument,
 						...staleCollection && { [path]: staleCollection }
 					},
-					annotations: [],
-					regions: [],
-					candidate: void 0,
-					candidateText: "",
-					requests: session.requests.map((request) => input.kind !== "story-preview" && request.documentPath === path && (request.status === "REQUESTED" || request.status === "CHANGING" || request.status === "CHANGED") ? {
+					requests: session.requests.map((request) => input.kind !== "story-preview" && request.documentPath === path && [
+						"REQUESTED",
+						"CHANGING",
+						"CHANGED"
+					].includes(request.status) ? {
 						...request,
 						status: "FAILED",
 						currentOperation: void 0,
@@ -660,20 +653,6 @@ function putAuthorDocument(sessionId, input) {
 					} : request)
 				}
 			};
-		} else if (sourceChanged && session?.annotationsByDocument[path] !== void 0) {
-			const collection = session.annotationsByDocument[path];
-			if (collection.candidate?.thumbnailUrl !== void 0) staleThumbnails.push(collection.candidate.thumbnailUrl);
-			staleThumbnails.push(...collection.annotations.flatMap((annotation) => annotation.thumbnailUrl === void 0 ? [] : [annotation.thumbnailUrl]));
-			sessions = {
-				...sessions,
-				[sessionId]: {
-					...session,
-					annotationsByDocument: {
-						...session.annotationsByDocument,
-						[path]: staleAuthorCollection(collection, Date.now())
-					}
-				}
-			};
 		}
 		return {
 			documents: {
@@ -687,76 +666,37 @@ function putAuthorDocument(sessionId, input) {
 	return result;
 }
 /** Claims focus and returns a generation token that makes cleanup race-safe. */
-function focusAuthorDocument(sessionId, path, revision, sourceSha256) {
-	const normalized = normalizeAuthorPath(path);
+function focusAuthorDocument(sessionId, path) {
 	let generation = 0;
-	authorWorkspace.update((state) => {
-		const session = state.sessions[sessionId] ?? EMPTY_SESSION;
-		generation = session.generation + 1;
-		const stored = session.annotationsByDocument[normalized];
-		const current = stored !== void 0 && stored.revision === revision && stored.sourceSha256 === sourceSha256 && !stored.stale ? stored : void 0;
-		const annotations = current?.annotations ?? [];
-		return {
-			...state,
-			sessions: {
-				...state.sessions,
-				[sessionId]: {
-					...session,
-					generation,
-					focusedDocument: {
-						path: normalized,
-						generation,
-						revision,
-						sourceSha256,
-						focusedAt: Date.now()
-					},
-					annotations,
-					regions: annotations,
-					candidate: current?.candidate,
-					candidateText: current?.candidateText ?? ""
-				}
-			}
-		};
-	});
-	return generation;
-}
-function syncAuthorDocumentFocus(sessionId, generation, revision, sourceSha256) {
 	updateSession(sessionId, (session) => {
-		const focused = session.focusedDocument;
-		if (focused === void 0 || focused.generation !== generation) return session;
-		if (focused.revision === revision && focused.sourceSha256 === sourceSha256) return session;
+		generation = session.generation + 1;
 		return {
 			...session,
+			generation,
 			focusedDocument: {
-				...focused,
-				revision,
-				sourceSha256
+				path: normalizeAuthorPath(path),
+				generation,
+				focusedAt: Date.now()
 			}
 		};
 	});
+	return generation;
 }
 function releaseAuthorDocumentFocus(sessionId, generation) {
-	updateSession(sessionId, (session) => {
-		if (session.focusedDocument?.generation !== generation) return session;
-		return {
-			...session,
-			focusedDocument: void 0,
-			candidate: void 0,
-			candidateText: "",
-			annotations: [],
-			regions: []
-		};
-	});
+	updateSession(sessionId, (session) => session.focusedDocument?.generation === generation ? {
+		...session,
+		focusedDocument: void 0
+	} : session);
 }
-function seekAuthorVideo(sessionId, timeSeconds) {
-	const workspace = authorSessionWorkspace(sessionId);
-	const focused = workspace.focusedDocument;
-	if (!focused || workspace.candidate || !Number.isFinite(timeSeconds) || timeSeconds < 0 || authorDocument(sessionId, focused.path)?.kind !== "video") return false;
+function seekAuthorVideo(sessionId, path, timeSeconds) {
+	const normalized = normalizeAuthorPath(path);
+	const focused = authorSessionWorkspace(sessionId).focusedDocument;
+	if (focused?.path !== normalized || authorDocumentAnnotations(sessionId, normalized).candidate || !Number.isFinite(timeSeconds) || timeSeconds < 0 || authorDocument(sessionId, normalized)?.kind !== "video") return false;
+	setAuthorToolMode(sessionId, normalized, "select");
 	updateSession(sessionId, (session) => ({
 		...session,
-		activeTool: "select",
 		videoSeekRequest: {
-			path: focused.path,
+			path: normalized,
 			generation: focused.generation,
 			timeSeconds,
 			sequence: (session.videoSeekRequest?.sequence ?? 0) + 1
@@ -764,110 +704,78 @@ function seekAuthorVideo(sessionId, timeSeconds) {
 	}));
 	return true;
 }
-function setAuthorToolMode(sessionId, activeTool) {
-	updateSession(sessionId, (session) => session.activeTool === activeTool ? session : {
+function setAuthorToolMode(sessionId, path, tool) {
+	const normalized = normalizeAuthorPath(path);
+	updateSession(sessionId, (session) => ({
 		...session,
-		activeTool
-	});
-}
-function setAuthorRegionCandidate(sessionId, candidate) {
-	let staleThumbnail;
-	updateSession(sessionId, (session) => {
-		const focused = session.focusedDocument;
-		if (candidate !== void 0) {
-			if (focused === void 0 || focused.path !== normalizeAuthorPath(candidate.documentPath)) throw new Error("The Author selection does not belong to the focused document.");
-			if (focused.revision !== candidate.revision || focused.sourceSha256 !== candidate.sourceSha256) throw new Error("The Author selection is stale for the focused document.");
+		toolsByDocument: {
+			...session.toolsByDocument,
+			[normalized]: tool
 		}
-		if (focused === void 0) return session;
-		staleThumbnail = session.candidate?.thumbnailUrl;
-		const copied = candidate === void 0 ? void 0 : copyCandidate(candidate);
-		return withFocusedCollection({
-			...session,
-			candidate: copied
-		}, focused.path, { candidate: copied });
-	});
-	if (staleThumbnail !== void 0 && staleThumbnail !== candidate?.thumbnailUrl) revokeThumbnail(staleThumbnail);
+	}));
+}
+function validateCandidate(sessionId, path, candidate) {
+	const document = authorDocument(sessionId, path);
+	if (document === void 0 || normalizeAuthorPath(candidate.documentPath) !== normalizeAuthorPath(path)) throw new Error("The Author selection does not belong to the document.");
+	if (document.version !== candidate.revision || document.sourceSha256 !== candidate.sourceSha256) throw new Error("The Author selection is stale for the document.");
 }
-function setAuthorCandidateText(sessionId, candidateText) {
+function setAuthorRegionCandidate(sessionId, path, candidate) {
+	if (candidate !== void 0) validateCandidate(sessionId, path, candidate);
+	const thumbnail = authorDocumentAnnotations(sessionId, path).candidate?.thumbnailUrl;
+	updateCollection(sessionId, path, (collection) => ({
+		...collection,
+		candidate: candidate && copyCandidate(candidate)
+	}));
+	if (thumbnail !== void 0 && thumbnail !== candidate?.thumbnailUrl) revokeThumbnail(thumbnail);
+}
+function setAuthorCandidateText(sessionId, path, candidateText) {
 	if (new TextEncoder().encode(candidateText).byteLength > 2048) throw new Error("Author candidate text must not exceed 2 KiB.");
-	updateSession(sessionId, (session) => {
-		const path = session.focusedDocument?.path;
-		return path === void 0 ? session : withFocusedCollection({
-			...session,
-			candidateText
-		}, path, { candidateText });
-	});
+	updateCollection(sessionId, path, (collection) => ({
+		...collection,
+		candidateText
+	}));
 }
-function commitAuthorRegion(sessionId, comment) {
+function commitAuthorRegion(sessionId, path, comment) {
+	const candidate = authorDocumentAnnotations(sessionId, path).candidate;
+	if (candidate === void 0) throw new Error("Select a document annotation before adding a comment.");
 	const id = crypto.randomUUID();
-	const session = authorSessionWorkspace(sessionId);
-	if (session.candidate === void 0) throw new Error("Select a document annotation before adding a comment.");
 	addAuthorRegion(sessionId, {
-		...session.candidate,
+		...candidate,
 		id,
 		comment,
 		version: 1
 	});
-	updateSession(sessionId, (current) => {
-		const path = current.focusedDocument?.path;
-		return path === void 0 ? current : withFocusedCollection({
-			...current,
-			candidate: void 0,
-			candidateText: ""
-		}, path, {
-			candidate: void 0,
-			candidateText: ""
-		});
-	});
+	updateCollection(sessionId, path, (collection) => ({
+		...collection,
+		candidate: void 0,
+		candidateText: ""
+	}));
 	return id;
 }
 function addAuthorRegion(sessionId, region) {
 	if (region.comment.trim() === "") throw new Error("Every Author annotation requires a comment.");
-	updateSession(sessionId, (session) => {
-		const focused = session.focusedDocument;
-		if (focused === void 0 || focused.path !== normalizeAuthorPath(region.documentPath)) throw new Error("The Author annotation does not belong to the focused document.");
-		if (focused.revision !== region.revision || focused.sourceSha256 !== region.sourceSha256) throw new Error("The Author annotation is stale for the focused document.");
-		if (session.annotations.length >= 16) throw new Error(`Author requests support at most 16 annotations.`);
-		if (session.annotations.some((candidate) => candidate.id === region.id)) throw new Error(`Author annotation '${region.id}' already exists.`);
-		const annotations = [...session.annotations, copyRegion({
-			...region,
-			version: region.version ?? 1
-		})];
-		return withFocusedCollection({
-			...session,
-			annotations,
-			regions: annotations
-		}, focused.path, { annotations });
+	validateCandidate(sessionId, region.documentPath, region);
+	updateCollection(sessionId, region.documentPath, (collection) => {
+		if (collection.annotations.length >= 16) throw new Error(`Author requests support at most 16 annotations.`);
+		if (collection.annotations.some((candidate) => candidate.id === region.id)) throw new Error(`Author annotation '${region.id}' already exists.`);
+		return {
+			...collection,
+			annotations: [...collection.annotations, copyRegion({
+				...region,
+				version: region.version ?? 1
+			})]
+		};
 	});
 }
-function removeAuthorRegion(sessionId, regionId, expectedVersion, documentPath) {
+function removeAuthorRegion(sessionId, path, regionId, expectedVersion) {
 	let thumbnail;
-	updateSession(sessionId, (session) => {
-		const path = documentPath === void 0 ? session.focusedDocument?.path : normalizeAuthorPath(documentPath);
-		if (path === void 0) return session;
-		const focused = session.focusedDocument?.path === path;
-		const collection = session.annotationsByDocument[path];
-		const current = focused ? session.annotations : collection?.annotations;
-		if (current === void 0) return session;
-		const annotation = current.find((candidate) => candidate.id === regionId);
-		if (annotation === void 0 || expectedVersion !== void 0 && (annotation.version ?? 1) !== expectedVersion) return session;
+	updateCollection(sessionId, path, (collection) => {
+		const annotation = collection.annotations.find((candidate) => candidate.id === regionId);
+		if (annotation === void 0 || expectedVersion !== void 0 && (annotation.version ?? 1) !== expectedVersion) return collection;
 		thumbnail = annotation.thumbnailUrl;
-		const annotations = current.filter((candidate) => candidate.id !== regionId);
-		if (focused) return withFocusedCollection({
-			...session,
-			annotations,
-			regions: annotations
-		}, path, { annotations });
 		return {
-			...session,
-			annotationsByDocument: {
-				...session.annotationsByDocument,
-				[path]: {
-					...collection,
-					annotations,
-					updatedAt: Date.now()
-				}
-			}
+			...collection,
+			annotations: collection.annotations.filter((candidate) => candidate.id !== regionId)
 		};
 	});
 	if (thumbnail !== void 0) revokeThumbnail(thumbnail);
@@ -1012,9 +920,7 @@ function updateDocument(sessionId, path, update) {
 		if (document === void 0) return state;
 		const next = update(document);
 		const session = state.sessions[sessionId];
-		const focused = session?.focusedDocument;
 		const identityChanged = document.version !== next.version || document.sourceSha256 !== next.sourceSha256;
-		const focusedChanged = identityChanged && focused?.path === document.path;
 		const collection = identityChanged ? session?.annotationsByDocument[document.path] : void 0;
 		if (collection !== void 0) {
 			if (collection.candidate?.thumbnailUrl !== void 0) staleThumbnails.push(collection.candidate.thumbnailUrl);
@@ -1028,18 +934,7 @@ function updateDocument(sessionId, path, update) {
 				annotationsByDocument: {
 					...session.annotationsByDocument,
 					...staleCollection && { [document.path]: staleCollection }
-				},
-				...focusedChanged ? {
-					focusedDocument: {
-						...focused,
-						revision: next.version,
-						sourceSha256: next.sourceSha256
-					},
-					candidate: void 0,
-					candidateText: "",
-					annotations: [],
-					regions: []
-				} : {}
+				}
 			}
 		} : state.sessions;
 		return {
@@ -1100,27 +995,31 @@ function staleAuthorCollection(collection, updatedAt) {
 		updatedAt
 	};
 }
-function withFocusedCollection(session, path, update) {
-	const focused = session.focusedDocument;
-	if (focused === void 0 || focused.path !== path) return session;
-	const collection = {
-		...session.annotationsByDocument[path],
-		revision: focused.revision,
-		sourceSha256: focused.sourceSha256,
-		stale: false,
-		candidate: session.candidate,
-		candidateText: session.candidateText,
-		annotations: session.annotations,
-		updatedAt: Date.now(),
-		...update
-	};
-	return {
-		...session,
-		annotationsByDocument: {
-			...session.annotationsByDocument,
-			[path]: collection
-		}
-	};
+function updateCollection(sessionId, path, update) {
+	const normalized = normalizeAuthorPath(path);
+	const document = authorDocument(sessionId, normalized);
+	if (document === void 0) return;
+	updateSession(sessionId, (session) => {
+		const current = authorDocumentAnnotations(sessionId, normalized);
+		const base = current === EMPTY_COLLECTION ? {
+			...EMPTY_COLLECTION,
+			revision: document.version,
+			sourceSha256: document.sourceSha256
+		} : current;
+		const next = update(base);
+		if (next === base) return session;
+		return {
+			...session,
+			annotationsByDocument: {
+				...session.annotationsByDocument,
+				[normalized]: {
+					...next,
+					stale: false,
+					updatedAt: Date.now()
+				}
+			}
+		};
+	});
 }
 function boundedHistoryText(value) {
 	if (value === void 0) return void 0;
@@ -1346,6 +1245,7 @@ function normalizedAuthorRectangle(bounds, drag) {
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_lib/authorCapture.ts
 const AUTHOR_CAPTURE_MAX_DIMENSION = 1600;
+const AUTHOR_PACKET_MAX_BYTES = 65536;
 const AUTHOR_QUOTE_MAX_BYTES = 4096;
 const AUTHOR_REGION_COLORS = [
 	"#ff5f57",
@@ -1426,6 +1326,12 @@ function percent(value) {
 function rectLocation(rect) {
 	return `x ${percent(rect.x)}, y ${percent(rect.y)}, w ${percent(rect.width)}, h ${percent(rect.height)}`;
 }
+/** Context stays below the host limit even when paths and anchor locations are unusually long. */
+function authorDocumentContextContent(path, alias, annotations) {
+	const heading = `Author document: ${path}${alias === void 0 ? "" : ` (canvas ${alias})`}`;
+	const drafts = annotations.map((region, index) => `(${index + 1}) ${region.comment.slice(0, 1e3)} [${anchorLocation(region.anchor)}]`);
+	return utf8Prefix([heading, ...drafts.length === 0 ? [] : ["Unsent annotations (not yet submitted):", ...drafts]].join("\n"), AUTHOR_PACKET_MAX_BYTES);
+}
 function anchorLocation(anchor) {
 	switch (anchor.kind) {
 		case "text-range": return anchor.startLine === anchor.endLine ? `line ${String(anchor.startLine)}` : `lines ${String(anchor.startLine)}-${String(anchor.endLine)}`;
@@ -1626,23 +1532,23 @@ function multiRegionCaptureProvider(regions) {
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/dock/_components/AuthorRegionDrafts.tsx
-function AuthorRegionDrafts({ sessionId, workspace }) {
+function AuthorRegionDrafts({ sessionId, path, drafts }) {
 	const [error, setError] = useState();
 	const add = () => {
 		try {
-			commitAuthorRegion(sessionId, workspace.candidateText);
+			commitAuthorRegion(sessionId, path, drafts.candidateText);
 			setError(void 0);
 		} catch (reason) {
 			setError(reason instanceof Error ? reason.message : String(reason));
 		}
 	};
-	if (!workspace.candidate && workspace.annotations.length === 0) return null;
-	const candidateKind = workspace.candidate?.mode === "point" ? "point" : "region";
+	if (!drafts.candidate && drafts.annotations.length === 0) return null;
+	const candidateKind = drafts.candidate?.mode === "point" ? "point" : "region";
 	return /* @__PURE__ */ jsxs("section", {
 		className: "space-y-2",
 		"data-testid": "author-region-drafts",
 		children: [
-			workspace.candidate ? /* @__PURE__ */ jsxs(Fragment, { children: [
+			drafts.candidate ? /* @__PURE__ */ jsxs(Fragment, { children: [
 				/* @__PURE__ */ jsxs("h3", {
 					className: "text-base font-semibold text-doom-text",
 					children: ["Current ", candidateKind]
@@ -1655,18 +1561,18 @@ function AuthorRegionDrafts({ sessionId, workspace }) {
 						" as an unsent annotation."
 					]
 				}),
-				workspace.candidate.anchor.kind === "video-time-rect" || workspace.candidate.anchor.kind === "video-time-point" ? /* @__PURE__ */ jsxs("p", {
+				drafts.candidate.anchor.kind === "video-time-rect" || drafts.candidate.anchor.kind === "video-time-point" ? /* @__PURE__ */ jsxs("p", {
 					className: "text-base text-doom-dim sm:text-sm",
 					children: [
 						"Frame at ",
-						workspace.candidate.anchor.timeSeconds.toFixed(3),
+						drafts.candidate.anchor.timeSeconds.toFixed(3),
 						"s"
 					]
 				}) : null,
 				/* @__PURE__ */ jsx("textarea", {
 					"aria-label": "Annotation comment",
-					value: workspace.candidateText,
-					onChange: (event) => setAuthorCandidateText(sessionId, event.target.value),
+					value: drafts.candidateText,
+					onChange: (event) => setAuthorCandidateText(sessionId, path, event.target.value),
 					placeholder: "What should change here?",
 					rows: 3,
 					className: "min-h-11 w-full resize-y rounded border border-doom-border bg-doom-deep p-2 text-lg leading-normal text-doom-text focus:border-doom-red focus:outline-none sm:text-sm"
@@ -1675,15 +1581,15 @@ function AuthorRegionDrafts({ sessionId, workspace }) {
 					className: "min-h-11 min-w-11 text-base [@media(pointer:fine)]:min-h-8 sm:text-sm",
 					variant: "outline",
 					onClick: add,
-					disabled: !workspace.candidate || !workspace.candidateText.trim() || workspace.annotations.length >= 16,
+					disabled: !drafts.candidate || !drafts.candidateText.trim() || drafts.annotations.length >= 16,
 					children: "add annotation"
 				}),
 				/* @__PURE__ */ jsx(Button, {
 					variant: "ghost",
 					className: "min-h-11 min-w-11 text-base [@media(pointer:fine)]:min-h-8 sm:text-sm",
 					onClick: () => {
-						setAuthorRegionCandidate(sessionId, void 0);
-						setAuthorCandidateText(sessionId, "");
+						setAuthorRegionCandidate(sessionId, path, void 0);
+						setAuthorCandidateText(sessionId, path, "");
 						setError(void 0);
 					},
 					children: "Discard annotation"
@@ -1693,17 +1599,17 @@ function AuthorRegionDrafts({ sessionId, workspace }) {
 				className: "block text-base text-doom-red",
 				children: error
 			}) : null,
-			workspace.annotations.length > 0 ? /* @__PURE__ */ jsxs("h3", {
+			drafts.annotations.length > 0 ? /* @__PURE__ */ jsxs("h3", {
 				className: "text-base font-semibold text-doom-text",
 				children: [
 					"Unsent annotations (",
-					workspace.annotations.length,
+					drafts.annotations.length,
 					")"
 				]
 			}) : null,
 			/* @__PURE__ */ jsx("ol", {
 				className: "space-y-2",
-				children: workspace.annotations.map((region, index) => /* @__PURE__ */ jsxs("li", {
+				children: drafts.annotations.map((region, index) => /* @__PURE__ */ jsxs("li", {
 					className: "rounded border border-doom-border bg-doom-panel p-2 text-base leading-normal text-doom-text sm:text-sm",
 					children: [
 						/* @__PURE__ */ jsxs("span", { children: [
@@ -1717,9 +1623,9 @@ function AuthorRegionDrafts({ sessionId, workspace }) {
 						region.anchor.kind === "video-time-rect" || region.anchor.kind === "video-time-point" ? /* @__PURE__ */ jsxs(Button, {
 							variant: "outline",
 							className: "min-h-11 min-w-11 text-base [@media(pointer:fine)]:min-h-8 sm:text-sm",
-							disabled: workspace.candidate !== void 0,
+							disabled: drafts.candidate !== void 0,
 							onClick: () => {
-								if (region.anchor.kind === "video-time-rect" || region.anchor.kind === "video-time-point") seekAuthorVideo(sessionId, region.anchor.timeSeconds);
+								if (region.anchor.kind === "video-time-rect" || region.anchor.kind === "video-time-point") seekAuthorVideo(sessionId, path, region.anchor.timeSeconds);
 							},
 							children: [
 								"Go to ",
@@ -1731,7 +1637,7 @@ function AuthorRegionDrafts({ sessionId, workspace }) {
 							className: "min-h-11 min-w-11 text-base [@media(pointer:fine)]:min-h-8 sm:text-sm",
 							variant: "ghost",
 							"aria-label": `Remove annotation ${index + 1}`,
-							onClick: () => removeAuthorRegion(sessionId, region.id),
+							onClick: () => removeAuthorRegion(sessionId, path, region.id),
 							children: "remove"
 						})
 					]
@@ -1742,7 +1648,7 @@ function AuthorRegionDrafts({ sessionId, workspace }) {
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/dock/_components/AuthorFeedbackControls.tsx
-function AuthorFeedbackControls({ sessionId, document, workspace, submitCapture }) {
+function AuthorFeedbackControls({ sessionId, document, drafts, submitCapture }) {
 	const [status, setStatus] = useState();
 	const [capturing, setCapturing] = useState(false);
 	return /* @__PURE__ */ jsxs("div", {
@@ -1750,21 +1656,22 @@ function AuthorFeedbackControls({ sessionId, document, workspace, submitCapture
 		children: [
 			/* @__PURE__ */ jsx(AuthorRegionDrafts, {
 				sessionId,
-				workspace
+				path: document.path,
+				drafts
 			}),
-			workspace.annotations.length > 0 ? /* @__PURE__ */ jsx(Button, {
+			drafts.annotations.length > 0 ? /* @__PURE__ */ jsx(Button, {
 				className: "min-h-11 min-w-11 w-full text-base [@media(pointer:fine)]:min-h-8 sm:text-sm",
 				variant: "outline",
 				"data-testid": "author-attach-capture",
-				disabled: capturing || workspace.candidate !== void 0 || submitCapture === void 0,
+				disabled: capturing || drafts.candidate !== void 0 || submitCapture === void 0,
 				onClick: async () => {
-					if (capturing || workspace.candidate || submitCapture === void 0) return;
+					if (capturing || drafts.candidate || submitCapture === void 0) return;
 					setCapturing(true);
 					setStatus("Submitting annotations…");
 					try {
-						const packet = createAuthorCapturePacket(crypto.randomUUID(), Date.now(), document, workspace.annotations, authorCanvasAlias(sessionId, document.path));
+						const packet = createAuthorCapturePacket(crypto.randomUUID(), Date.now(), document, drafts.annotations, authorCanvasAlias(sessionId, document.path));
 						await submitCapture({
-							...await multiRegionCaptureProvider(workspace.annotations).capture(),
+							...await multiRegionCaptureProvider(drafts.annotations).capture(),
 							context: authorCaptureContext(packet)
 						});
 						setStatus("Request submitted. You can keep annotating here.");
@@ -1774,7 +1681,7 @@ function AuthorFeedbackControls({ sessionId, document, workspace, submitCapture
 						setCapturing(false);
 					}
 				},
-				children: capturing ? "Submitting…" : `Submit ${workspace.annotations.length} annotation${workspace.annotations.length === 1 ? "" : "s"}`
+				children: capturing ? "Submitting…" : `Submit ${drafts.annotations.length} annotation${drafts.annotations.length === 1 ? "" : "s"}`
 			}) : null,
 			submitCapture === void 0 ? /* @__PURE__ */ jsx("output", {
 				className: "text-sm text-doom-red",
@@ -1991,10 +1898,10 @@ function AuthorRequestLog({ requests }) {
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/dock/_components/AuthorToolPalette.tsx
-function AuthorToolPalette({ sessionId, kind, activeTool }) {
+function AuthorToolPalette({ sessionId, path, kind, activeTool }) {
 	const [error, setError] = useState();
 	const format = (style) => {
-		const selected = authorSessionWorkspace(sessionId).candidate;
+		const selected = authorDocumentAnnotations(sessionId, path).candidate;
 		const document = selected && authorDocument(sessionId, selected.documentPath);
 		if (!selected || !document || selected.anchor.kind !== "text-range" || selected.revision !== document.version || selected.sourceSha256 !== document.sourceSha256) {
 			setError("Select text in the document first.");
@@ -2005,7 +1912,7 @@ function AuthorToolPalette({ sessionId, kind, activeTool }) {
 		const text = content.slice(startOffset, endOffset);
 		const replacement = style === "Bold" ? `**${text}**` : style === "Link" ? `[${text}](https://)` : text.split("\n").map((line) => `${style === "Heading" ? "## " : "- "}${line}`).join("\n");
 		reviseAuthorDocument(sessionId, document.path, content.slice(0, startOffset) + replacement + content.slice(endOffset));
-		setAuthorRegionCandidate(sessionId, void 0);
+		setAuthorRegionCandidate(sessionId, path, void 0);
 		setError(void 0);
 	};
 	const tools = [
@@ -2017,18 +1924,18 @@ function AuthorToolPalette({ sessionId, kind, activeTool }) {
 		].includes(kind) ? [{
 			label: "Pan",
 			glyph: "✋",
-			action: () => setAuthorToolMode(sessionId, activeTool === "pan" ? "select" : "pan"),
+			action: () => setAuthorToolMode(sessionId, path, activeTool === "pan" ? "select" : "pan"),
 			active: activeTool === "pan"
 		}, {
 			label: "Draw",
 			glyph: "✎",
-			action: () => setAuthorToolMode(sessionId, activeTool === "draw" ? "select" : "draw"),
+			action: () => setAuthorToolMode(sessionId, path, activeTool === "draw" ? "select" : "draw"),
 			active: activeTool === "draw"
 		}] : [],
 		{
 			label: "Region",
 			glyph: "⌗",
-			action: () => setAuthorToolMode(sessionId, activeTool === "mark" ? "select" : "mark"),
+			action: () => setAuthorToolMode(sessionId, path, activeTool === "mark" ? "select" : "mark"),
 			active: activeTool === "mark"
 		},
 		...kind === "markdown" ? [
@@ -2056,7 +1963,7 @@ function AuthorToolPalette({ sessionId, kind, activeTool }) {
 		{
 			label: "Comment",
 			glyph: "●",
-			action: () => setAuthorToolMode(sessionId, activeTool === "comment" ? "select" : "comment"),
+			action: () => setAuthorToolMode(sessionId, path, activeTool === "comment" ? "select" : "comment"),
 			active: activeTool === "comment"
 		}
 	];
@@ -2110,7 +2017,8 @@ function AuthorPanel({ sessionId, activeMinorModes, submitCapture, statuses, ren
 	const focused = documents.find((document) => document.path === workspace?.focusedDocument?.path);
 	const focusedPath = workspace?.focusedDocument?.path;
 	const requests = (workspace?.requests ?? []).filter((request) => focusedPath === void 0 || request.documentPath === focusedPath);
-	const activity = sessionId === null ? null : renderSessionActivity?.() ?? null;
+	const drafts = useStore(authorWorkspace.store, (state) => authorDocumentAnnotations(sessionId, focusedPath ?? "", state));
+	const activity = sessionId !== null && focusedPath !== void 0 && requests.some((request) => request.status === "REQUESTED" || request.status === "CHANGING") ? renderSessionActivity?.() ?? null : null;
 	if (!activeMinorModes?.includes("author")) return null;
 	return /* @__PURE__ */ jsxs("section", {
 		"data-testid": "author-panel",
@@ -2139,8 +2047,9 @@ function AuthorPanel({ sessionId, activeMinorModes, submitCapture, statuses, ren
 						}) : null,
 						/* @__PURE__ */ jsx(AuthorToolPalette, {
 							sessionId,
+							path: focused.path,
 							kind: focused.kind,
-							activeTool: workspace.activeTool
+							activeTool: workspace.toolsByDocument[normalizeAuthorPath(focused.path)] ?? "select"
 						}),
 						autonomousVoiceGridVisible(statuses) && grid !== void 0 ? /* @__PURE__ */ jsxs("div", {
 							"data-testid": "author-grid-snapshot",
@@ -2158,7 +2067,7 @@ function AuthorPanel({ sessionId, activeMinorModes, submitCapture, statuses, ren
 							children: /* @__PURE__ */ jsx(AuthorFeedbackControls, {
 								sessionId,
 								document: focused,
-								workspace,
+								drafts,
 								submitCapture
 							}, focused.path)
 						})
@@ -3177,11 +3086,11 @@ function AuthorMediaView({ sessionId, document: source, activeTool, displayedReg
 		};
 	}, [source.mediaUrl]);
 	const seek = (seconds) => {
-		if (authorSessionWorkspace(sessionId).candidate || !Number.isFinite(seconds)) return;
+		if (authorDocumentAnnotations(sessionId, source.path).candidate || !Number.isFinite(seconds)) return;
 		const player = video.current;
 		if (!player) return;
 		player.pause();
-		setAuthorToolMode(sessionId, "select");
+		setAuthorToolMode(sessionId, source.path, "select");
 		setSelection(void 0);
 		if (player.getState().currentTime === seconds) return;
 		setFrameReady(false);
@@ -3316,7 +3225,7 @@ function AuthorMediaView({ sessionId, document: source, activeTool, displayedReg
 			if (!blob) throw new Error("Unable to capture selected media.");
 			if (authorSessionWorkspace(sessionId).focusedDocument?.generation !== focused.generation) return;
 			thumbnailUrl = URL.createObjectURL(blob);
-			setAuthorRegionCandidate(sessionId, {
+			setAuthorRegionCandidate(sessionId, source.path, {
 				documentPath: source.path,
 				revision: source.version,
 				sourceSha256: source.sourceSha256,
@@ -3675,14 +3584,14 @@ function AuthorMediaView({ sessionId, document: source, activeTool, displayedReg
 				marking: activeTool === "mark",
 				onSeek: seek,
 				onToggle: () => {
-					setAuthorToolMode(sessionId, "select");
+					setAuthorToolMode(sessionId, source.path, "select");
 					setSelection(void 0);
 					if (playback.playing) video.current?.pause();
 					else video.current?.play().catch((reason) => setError(String(reason)));
 				},
 				onAnnotate: () => {
 					video.current?.pause();
-					setAuthorToolMode(sessionId, "mark");
+					setAuthorToolMode(sessionId, source.path, "mark");
 				}
 			}) : null,
 			error ? /* @__PURE__ */ jsx("output", {
@@ -3763,7 +3672,7 @@ function AuthorStructuredView({ sessionId, document, displayedRegions }) {
 								const bounds = event.currentTarget.getBoundingClientRect();
 								const slide = Number(fragment.location.match(/(?:slide\s*|slides\/slide)(\d+)/)?.[1]);
 								if (!cells && !Number.isSafeInteger(slide)) return;
-								setAuthorRegionCandidate(sessionId, {
+								setAuthorRegionCandidate(sessionId, document.path, {
 									documentPath: document.path,
 									revision: document.version,
 									sourceSha256: document.sourceSha256,
@@ -3851,7 +3760,7 @@ function AuthorTextView({ sessionId, document, preview, displayedRegions }) {
 				const current = authorDocument(sessionId, document.path);
 				const bounds = host.current?.getBoundingClientRect();
 				if (!current || !bounds || range.from === range.to) return;
-				setAuthorRegionCandidate(sessionId, {
+				setAuthorRegionCandidate(sessionId, document.path, {
 					documentPath: current.path,
 					revision: current.version,
 					sourceSha256: current.sourceSha256,
@@ -3884,7 +3793,7 @@ function tabId(path) {
 }
 /** Unsent annotations only. Sent ones live in the request log, not on the canvas. */
 function displayedAuthorRegions(workspace) {
-	return (workspace?.regions ?? []).map((region, index) => ({
+	return (workspace?.annotations ?? []).map((region, index) => ({
 		ordinal: index + 1,
 		region
 	}));
@@ -3907,9 +3816,9 @@ function ActiveAuthorDocumentPanel(props) {
 	const alias = useStore(canvasAliases, (state) => props.alias ?? (sessionId === null ? void 0 : state[authorDocumentKey(sessionId, props.path)]));
 	const loadFailure = useStore(canvasFailures, (state) => sessionId === null ? void 0 : state[authorDocumentKey(sessionId, props.path)]);
 	const document = useStore(authorWorkspace.store, (state) => sessionId === null ? void 0 : state.documents[authorDocumentKey(sessionId, path)]);
-	const focusGeneration = useRef(void 0);
 	const workspace = useStore(authorWorkspace.store, (state) => sessionId === null ? void 0 : state.sessions[sessionId]);
-	const activeTool = workspace?.activeTool ?? "select";
+	const drafts = useStore(authorWorkspace.store, (state) => authorDocumentAnnotations(sessionId, path, state));
+	const activeTool = workspace?.toolsByDocument[normalizeAuthorPath(path)] ?? "select";
 	const [markdownPreview, setMarkdownPreview] = useState(true);
 	const [status, setStatus] = useState();
 	const [previewOpen, setPreviewOpen] = useState(false);
@@ -3923,25 +3832,10 @@ function ActiveAuthorDocumentPanel(props) {
 	};
 	const PreviewPanel = (previewSource === void 0 ? void 0 : (props.slotData?.(authorPreviewActionSlot) ?? []).find(({ data }) => data.embeddedPanel !== void 0 && (data.supportsSource === void 0 || data.supportsSource(previewSource))))?.data.embeddedPanel;
 	useEffect(() => {
-		if (document === void 0 || sessionId === null) return;
-		const generation = focusAuthorDocument(sessionId, path, document.version, document.sourceSha256);
-		focusGeneration.current = generation;
+		if (sessionId === null) return;
+		const generation = focusAuthorDocument(sessionId, path);
 		return () => releaseAuthorDocumentFocus(sessionId, generation);
-	}, [
-		kind,
-		document?.sourceSha256,
-		path,
-		sessionId
-	]);
-	useEffect(() => {
-		const generation = focusGeneration.current;
-		if (document === void 0 || sessionId === null || generation === void 0) return;
-		syncAuthorDocumentFocus(sessionId, generation, document.version, document.sourceSha256);
-	}, [
-		document?.sourceSha256,
-		document?.version,
-		sessionId
-	]);
+	}, [path, sessionId]);
 	useEffect(() => {
 		if (kind === void 0 || sessionId === null || alias === void 0) return;
 		const profiles = authorProfilesForDocument(sessionId, path, kind);
@@ -3980,8 +3874,7 @@ function ActiveAuthorDocumentPanel(props) {
 		}
 	};
 	const gridVisible = autonomousVoiceGridVisible(statuses);
-	const focusedWorkspace = workspace?.focusedDocument?.path === document.path ? workspace : void 0;
-	const displayedRegions = displayedAuthorRegions(focusedWorkspace);
+	const displayedRegions = displayedAuthorRegions(drafts);
 	const displayedPreviewAnnotations = displayedRegions.flatMap(({ ordinal, region }) => {
 		if (region.anchor.kind === "story-preview-rect") return [{
 			ordinal,
@@ -4012,7 +3905,7 @@ function ActiveAuthorDocumentPanel(props) {
 		document,
 		activeTool,
 		displayedRegions,
-		pendingCandidate: focusedWorkspace?.candidate !== void 0,
+		pendingCandidate: drafts.candidate !== void 0,
 		seekRequest: workspace?.videoSeekRequest
 	}, document.path);
 	return /* @__PURE__ */ jsxs("section", {
@@ -4079,7 +3972,7 @@ function ActiveAuthorDocumentPanel(props) {
 					className: "min-h-11 min-w-11 shrink-0",
 					"aria-label": `${mode} tool`,
 					"aria-pressed": activeTool === mode,
-					onClick: () => setAuthorToolMode(sessionId, mode),
+					onClick: () => setAuthorToolMode(sessionId, document.path, mode),
 					children: mode
 				}, mode))
 			}) : null,
@@ -4090,10 +3983,10 @@ function ActiveAuthorDocumentPanel(props) {
 					source: previewSource,
 					activeTool: activeTool === "crop" ? "select" : activeTool,
 					displayedAnnotations: displayedPreviewAnnotations,
-					pendingCandidate: focusedWorkspace?.candidate !== void 0,
+					pendingCandidate: drafts.candidate !== void 0,
 					onAnnotationCandidate: (candidate) => {
 						setAuthorStoryPreview(sessionId, document.path, candidate.preview);
-						setAuthorRegionCandidate(sessionId, {
+						setAuthorRegionCandidate(sessionId, document.path, {
 							documentPath: document.path,
 							revision: document.version,
 							sourceSha256: document.sourceSha256,
@@ -4120,7 +4013,7 @@ function ActiveAuthorDocumentPanel(props) {
 					visible: gridVisible
 				})]
 			}),
-			focusedWorkspace !== void 0 && [
+			[
 				"image",
 				"pdf",
 				"video",
@@ -4130,7 +4023,7 @@ function ActiveAuthorDocumentPanel(props) {
 				children: /* @__PURE__ */ jsx(AuthorFeedbackControls, {
 					sessionId,
 					document,
-					workspace: focusedWorkspace,
+					drafts,
 					submitCapture: props.submitCapture
 				})
 			}) : null
@@ -4153,7 +4046,7 @@ function authorFileTab(path, preferredAlias) {
 				source: "author",
 				id: documentPath,
 				label: alias === void 0 ? name : `${alias} · ${name}`,
-				content: `Author document: ${documentPath}${alias === void 0 ? "" : ` (canvas ${alias})`}`
+				content: authorDocumentContextContent(documentPath, alias, authorDocumentAnnotations(sessionId, documentPath).annotations)
 			};
 		},
 		onOpen(sessionId) {
@@ -4214,6 +4107,7 @@ function authorFileTab(path, preferredAlias) {
 		},
 		onClose(sessionId) {
 			const key = authorDocumentKey(sessionId, normalized);
+			setAuthorToolMode(sessionId, canvasPaths.state[key] ?? normalized, "select");
 			pendingCanvases.get(key)?.abort();
 			pendingCanvases.delete(key);
 			const alias = canvasAliases.state[key] ?? preferredAlias;
@@ -4494,7 +4388,7 @@ function recordAuthorComposerSubmission(submission) {
 			revision: packet.document.revision,
 			sourceSha256: packet.document.sourceSha256
 		});
-		for (const region of packet.regions) removeAuthorRegion(submission.sessionId, region.id, region.version ?? 1, packet.document.path);
+		for (const region of packet.regions) removeAuthorRegion(submission.sessionId, packet.document.path, region.id, region.version ?? 1);
 	}
 }
 /** Only the host's correlated execution events may settle a submitted capture. */