@agimon-ai/po-author 0.0.0-alpha.43 → 0.0.0-alpha.45

package/dist/extensions/native.mjs

@@ -800,6 +800,27 @@ function authorCaptureContext(packet) {
 	};
 }
 //#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/_lib/authorFileSave.ts
+/** Web and native commit text, encoded images and serialized documents through this one conditional save. */
+async function saveAuthorFileBytes(transport, url, path, body, expectedSha256, signal) {
+	if (path.startsWith("artifact:")) throw new Error("Artifacts are read-only.");
+	if (!/^[a-f0-9]{64}$/.test(expectedSha256)) throw new Error("This Author view has no valid source digest.");
+	const response = await transport(url, {
+		method: "PUT",
+		headers: {
+			"Content-Type": "application/octet-stream",
+			"X-Expected-SHA256": expectedSha256
+		},
+		body,
+		signal
+	});
+	if (response.status === 409) throw new Error("This file changed elsewhere. Keep your edits and reopen it before saving.");
+	if (!response.ok) throw new Error(`Author save failed (${String(response.status)})`);
+	const digest = response.headers.get("X-File-SHA256");
+	if (digest === null || !/^[a-f0-9]{64}$/.test(digest)) throw new Error("Author save returned an invalid digest.");
+	return digest;
+}
+//#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_lib/authorFiles.native.ts
 const MAX_FILE_BYTES = 5242880;
 const IMAGE_TYPES = /* @__PURE__ */ new Set([
@@ -856,8 +877,8 @@ function authorNativeCanOpen(path) {
 }
 /**
 * The raw reads Author's canvas already uses, restated for the native transport:
-* po-artifact's guarded artifact read and the host's session file, plus the two
-* canvas routes from apiRoutes.ts, whose definer the phone does not load.
+* po-artifact's guarded artifact read and Author's session file API, plus the
+* document routes from apiRoutes.ts, whose definer the phone does not load.
 */
 const artifactFiles = createApiClient({ content: {
 	method: "GET",
@@ -875,14 +896,12 @@ const sessionFiles = createApiClient({
 		method: "GET",
 		path: "/file",
 		query: ["path"],
-		host: true,
 		raw: true
 	},
 	fileWrite: {
 		method: "PUT",
 		path: "/file",
 		query: ["path"],
-		host: true,
 		raw: true
 	},
 	documentsOpen: {
@@ -958,22 +977,7 @@ async function saveAuthorNativeImage(sessionId, path, image, sourceSha256, signa
 	return digest;
 }
 async function saveAuthorNativeBytes(sessionId, path, body, sourceSha256, signal) {
-	const result = await sessionFiles.session(sessionId).fileWrite({
-		query: { path },
-		headers: {
-			"Content-Type": "application/octet-stream",
-			"X-Expected-SHA256": sourceSha256
-		},
-		body,
-		signal
-	});
-	if (!result.ok) {
-		if (result.status === 409) throw new Error("This file changed elsewhere. Keep your edits and reopen it before saving.");
-		throw new Error(result.error || `Author save failed (${String(result.status)})`);
-	}
-	const digest = result.response.headers.get("X-File-SHA256");
-	if (digest === null || !/^[a-f0-9]{64}$/.test(digest)) throw new Error("Author save returned an invalid digest.");
-	return digest;
+	return await saveAuthorFileBytes(nativeApiTransport, sessionFiles.session(sessionId).fileWrite.url({ query: { path } }), path, body, sourceSha256, signal);
 }
 /** Reads one document for marking up on the phone: an image as base64, anything textual as a string. */
 async function loadAuthorFile(sessionId, path, signal) {
@@ -1247,6 +1251,18 @@ function authorNotesContent(path, notes) {
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_lib/authorNativeCapture.ts
+/** Snapshot layout-unit geometry before asynchronous raster capture and reject any intervening transform change. */
+async function captureNativeAuthorViewport(capture, getViewport) {
+	const viewport = getViewport();
+	if (!viewport || ![viewport.width, viewport.height].every((value) => Number.isFinite(value) && value > 0)) throw new Error("The document geometry is not ready to capture.");
+	const snapshot = { ...viewport };
+	const result = await capture();
+	if (getViewport() !== viewport) throw new Error("The document moved during capture. Keep it still and try again.");
+	return {
+		capture: result,
+		viewport: snapshot
+	};
+}
 /** A native mark is feedback on what was displayed, never source-edit authority. */
 function nativeAuthorCapture(captureId, capturedAt, document, notes, viewport, alias) {
 	const regions = notes.map((note) => {
@@ -1632,14 +1648,15 @@ function AuthorDocumentView(props) {
 	}] : []].filter((mark) => mark.textRange === void 0 && (mark.sourceSha256 === void 0 || mark.sourceSha256 === props.sourceSha256)), body.kind, props.page, props.timeSeconds);
 	const sending = status.state === "sending";
 	const inspectingSource = canInspectSource && readingMode === "source";
+	const drawing = !inspectingSource && !draft && !sending && props.onDraw !== void 0 && tool !== "pin";
 	const annotation = /* @__PURE__ */ jsx(AnnotationSurface, {
 		accessibilityLabel: props.name,
-		zoomable: body.kind === "image" && !sending,
-		onViewportChange: (viewport) => props.onZoomChange?.(viewport.zoom),
+		zoomable: body.kind === "image",
+		onViewportChange: props.onViewportChange,
 		marks: inspectingSource ? [] : marks,
 		selectedId: inspectingSource ? void 0 : draft ? DRAFT_ID : props.selectedId,
 		onPlace: inspectingSource || draft || sending || tool !== "pin" ? void 0 : props.onPlace,
-		onDraw: !inspectingSource && !draft && !sending && props.onDraw && tool !== "pin" ? (points) => {
+		onDraw: drawing ? (points) => {
 			if (tool === "draw") {
 				props.onDraw?.(points);
 				return;
@@ -1695,7 +1712,7 @@ function AuthorDocumentView(props) {
 				accessibilityRole: "button",
 				accessibilityLabel: `Comment on ${fragment.location}`,
 				disabled: !!draft || sending || !props.onPlace,
-				style: [s.notes, s.fragment],
+				style: [s.notes, s.touchTarget],
 				onPress: (event) => {
 					event.stopPropagation();
 					props.onPlace?.({
@@ -1759,6 +1776,7 @@ function AuthorDocumentView(props) {
 					}) : null,
 					props.onDraw && !props.edit && !inspectingSource ? /* @__PURE__ */ jsx(SegmentedControl, {
 						accessibilityLabel: "Mark tool",
+						style: s.touchTarget,
 						options: [
 							{
 								value: "pin",
@@ -1794,6 +1812,7 @@ function AuthorDocumentView(props) {
 					}) : null,
 					canInspectSource && !props.edit ? /* @__PURE__ */ jsx(SegmentedControl, {
 						accessibilityLabel: "Document view",
+						style: s.touchTarget,
 						options: [{
 							value: "read",
 							label: "Read"
@@ -1829,6 +1848,7 @@ function AuthorDocumentView(props) {
 				style: s.scroll,
 				contentContainerStyle: s.content,
 				keyboardShouldPersistTaps: "handled",
+				scrollEnabled: !drawing,
 				children: [
 					props.edit?.image ? /* @__PURE__ */ jsx(Image, {
 						accessibilityLabel: "Crop preview",
@@ -2059,7 +2079,7 @@ const s = StyleSheet.create((theme) => ({
 		gap: theme.spacing(2),
 		uni__dependencies: [0]
 	},
-	fragment: { minHeight: 44 },
+	touchTarget: { minHeight: 44 },
 	note: {
 		minHeight: 44,
 		flexDirection: "row",
@@ -2300,7 +2320,14 @@ function AuthorDocumentPanel({ path, ...props }) {
 	const [cropping, setCropping] = useState(false);
 	const [videoFrame, setVideoFrame] = useState();
 	const mediaTime = useRef(0);
-	const imageZoom = useRef(1);
+	const geometry = useRef(void 0);
+	const onViewportChange = useCallback((viewport) => {
+		const previous = geometry.current;
+		if (previous?.key !== key || previous.viewport.width !== viewport.width || previous.viewport.height !== viewport.height || previous.viewport.zoom !== viewport.zoom || previous.viewport.originX !== viewport.originX || previous.viewport.originY !== viewport.originY) geometry.current = {
+			key,
+			viewport: { ...viewport }
+		};
+	}, [key]);
 	const edit = useSyncExternalStore(subscribeEdits, () => editsStore.store.state[key]);
 	const captureRef = useRef(void 0);
 	const onCaptureReady = useCallback((capture) => {
@@ -2494,7 +2521,7 @@ function AuthorDocumentPanel({ path, ...props }) {
 			if (!props.submitCapture) throw new Error("This host cannot confirm feedback delivery. Your notes have not been sent.");
 			const provider = captureRef.current;
 			if (provider?.key !== key) throw new Error("The document is not ready to capture. Try again when it has finished opening.");
-			const capture = await provider.capture();
+			const { capture, viewport } = await captureNativeAuthorViewport(provider.capture, () => geometry.current?.key === key ? geometry.current.viewport : void 0);
 			setStatus({ state: "sending" });
 			if (capture.bytes.byteLength > 2097152 || Math.max(capture.width, capture.height) > 1600) throw new Error("This capture exceeds the Author evidence budget.");
 			const { file, body } = current;
@@ -2509,11 +2536,7 @@ function AuthorDocumentPanel({ path, ...props }) {
 					naturalWidth: body.naturalWidth,
 					naturalHeight: body.naturalHeight
 				} : {}
-			}, sent, {
-				width: capture.width,
-				height: capture.height,
-				...file.kind === "image" ? { zoom: imageZoom.current } : {}
-			}, alias);
+			}, sent, viewport, alias);
 			recordNativeAuthorRequest(sessionId, packet, regions);
 			recorded = true;
 			await props.submitCapture({
@@ -2704,9 +2727,7 @@ function AuthorDocumentPanel({ path, ...props }) {
 			children,
 			onReady: onCaptureReady
 		}) ?? children,
-		onZoomChange: (zoom) => {
-			imageZoom.current = zoom;
-		},
+		onViewportChange,
 		onResumeVideo: videoFrame === void 0 ? void 0 : () => {
 			setSeekSeconds(videoFrame.timeSeconds);
 			setVideoFrame(void 0);