dsh-figmark 1.2.3 → 1.2.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.2.4 — 2026-11-06
+
+本版统一批注卡片的预览与发送方式，修复缩放网页导出错位，并改进本机网页的检索和状态保留。
+
+### Improved
+
+- 待发送标注进入输入框原生附件区；输入框为空时也可直接点右下角发送，或补充文字后一起发送。
+- 标注卡片的重复附件缩略图合并显示，其他手动附件继续保留；卡片本身只负责预览与移除。
+- 「本机网页」切换侧栏后保留当前页面、代理连接和未发送标注，返回时无需重新检索。
+- 本机网页检索合并首页与 `index.html` 的重复结果；多个结果匹配时要求明确选择。
+- 精简本机网页列表的标题、说明、搜索框和结果布局。
+
+### Fixed
+
+- 修复缩放网页导出时按可视尺寸重新排版，导致网页标题和截图内容错位的问题。
+- 修复 HTML 标注卡片把任意 URL 当作普通文件打开的问题。
+- 修复 PDF 多页标注附件在原生输入框中的识别和发送状态。
+
 ## 1.2.3 — 2026-11-02
 
 本版增加输入框附图标注，并修复导出 SVG 与画布 Pin 编号的显示问题。

package/lib/client.js

@@ -73,15 +73,17 @@ window.__ModuleLoader__.load({
 			reveal_hidden: "元素目前不可见，请先展开或翻到对应页面",
 			reveal_wrong_surface: "无法切换到标注所在的页面",
 			reveal_timeout: "页面没有响应定位请求",
-			serviceKicker: "LOCAL RUNTIME",
 			serviceTitle: "本机网页",
-			serviceHint: "只标注已经在 http:// 上运行、可交互的页面。静态 HTML 只读预览，不进入标注。",
-			serviceSearch: "输入 localhost:5173 或运行中的地址",
+			serviceHint: "打开正在运行的本机网页，直接圈画与批注。",
+			serviceSearch: "搜索页面，或输入 localhost:5173",
 			serviceOpen: "打开",
 			serviceOpening: "正在连接",
 			serviceLocal: "正在运行",
 			serviceScanning: "检索中",
 			serviceRescan: "重新检索",
+			serviceNoMatch: "没有匹配的页面",
+			serviceChooseMatch: "找到多个页面，请选择下方的一项。",
+			serviceSearchHint: "换个关键词，或输入完整的本机地址。",
 			serviceEmpty: "没有发现本机服务",
 			serviceEmptyHint: "先启动开发服务器，或在上方直接输入地址。",
 			serviceBadAddress: "请输入本机 HTTP 地址",
@@ -169,18 +171,25 @@ window.__ModuleLoader__.load({
 			detailHint: "当前选中",
 			detailUnset: "未选中",
 			detailIdle: "在图上点一下、框一块或画一笔，就能为那处写说明。",
-			cardOpen: "打开完整标注",
+			cardOpen: "打开原文件",
 			cardOpenLive: "回到本机网页",
 			cardCaptureOmitted: "位置标注",
 			cardCaptureFailed: "截图失败",
-			cardMore: "还有 {n} 处",
+			cardMore: "查看其余 {n} 处",
+			cardExpand: "查看完整批注",
+			cardCollapse: "收起详情",
+			cardOpenFailed: "未能打开原内容，请重试。",
 			cardGoal: "目标",
 			cardPage: "第 {n} 页",
+			cardPages: "共 {n} 页",
 			cardCount: "{n} 处标注",
 			pendingCount: "{n}",
 			pendingRemove: "移除附图标注",
-			pendingSendHint: "发送当前对话框中的全部标注",
-			pendingSendNow: "发送全部标注",
+			pendingSendHint: "发送当前消息及全部待发送标注",
+			pendingSendMessage: "发送消息",
+			pendingSending: "发送中…",
+			pendingUnavailable: "当前输入框暂时无法发送。",
+			pendingSendNow: "发送这份标注",
 			pendingFailed: "没能发送："
 		};
 		/** English copy. */
@@ -223,15 +232,17 @@ window.__ModuleLoader__.load({
 			reveal_hidden: "The element is not visible yet",
 			reveal_wrong_surface: "Could not switch to the mark’s page",
 			reveal_timeout: "The page did not answer the locate request",
-			serviceKicker: "LOCAL RUNTIME",
 			serviceTitle: "Local pages",
-			serviceHint: "Annotate interactive pages already served over http://. Static HTML is preview-only.",
-			serviceSearch: "localhost:5173 or another running address",
+			serviceHint: "Open a running local page to draw and comment.",
+			serviceSearch: "Find a page or enter localhost:5173",
 			serviceOpen: "Open",
 			serviceOpening: "Connecting",
 			serviceLocal: "Running",
 			serviceScanning: "Scanning",
 			serviceRescan: "Scan again",
+			serviceNoMatch: "No matching pages",
+			serviceChooseMatch: "Several pages match. Choose one below.",
+			serviceSearchHint: "Try another keyword or enter the full local address.",
 			serviceEmpty: "No local services found",
 			serviceEmptyHint: "Start a development server, or type its address above.",
 			serviceBadAddress: "Enter a local HTTP address",
@@ -319,18 +330,25 @@ window.__ModuleLoader__.load({
 			detailHint: "selected",
 			detailUnset: "nothing selected",
 			detailIdle: "Click the figure, or box a region or draw a stroke, to write about that spot.",
-			cardOpen: "Open the full annotation",
+			cardOpen: "Open source file",
 			cardOpenLive: "Return to the local page",
 			cardCaptureOmitted: "location only",
 			cardCaptureFailed: "screenshot failed",
-			cardMore: "and {n} more",
+			cardMore: "Show {n} more",
+			cardExpand: "Review all annotations",
+			cardCollapse: "Collapse details",
+			cardOpenFailed: "Could not open the source. Try again.",
 			cardGoal: "Goal",
 			cardPage: "page {n}",
+			cardPages: "{n} pages",
 			cardCount: "{n} annotations",
 			pendingCount: "{n}",
 			pendingRemove: "Remove the annotation",
-			pendingSendHint: "Send every annotation in this composer",
-			pendingSendNow: "Send every annotation",
+			pendingSendHint: "Send the message and all staged reviews",
+			pendingSendMessage: "Send message",
+			pendingSending: "Sending…",
+			pendingUnavailable: "This composer cannot send right now.",
+			pendingSendNow: "Send this review",
 			pendingFailed: "Could not send: "
 		};
 		/** Locale namespace this dictionary registers under. */
@@ -4815,14 +4833,14 @@ window.__ModuleLoader__.load({
 		* Upload one file as a draft attachment without putting it in the rail yet.
 		* @param conversation - the conversation service.
 		* @param sessionId - session the draft belongs to.
-		* @param file - the file to hold, when there is one.
+		* @param files - the rendered review images to hold.
 		* @returns the ids the send will add, empty when the file could not be made into one.
 		*/
-		function holdFile(conversation, sessionId, file) {
+		function holdFiles(conversation, sessionId, files) {
 			const create = conversation.createDrafts?.bind(conversation);
-			if (file === void 0 || create === void 0) return [];
+			if (files.length === 0 || create === void 0) return [];
 			try {
-				return create(sessionId, [file]).map((draft) => draft.id);
+				return create(sessionId, files);
 			} catch {
 				return [];
 			}
@@ -4833,9 +4851,10 @@ window.__ModuleLoader__.load({
 		* @param sessionId - session the draft belongs to.
 		* @param message - the message, verbatim.
 		* @param file - the review picture, when the surface has one to attach.
+		* @param additionalFiles - marked page images of a multi-page review.
 		* @returns what was armed, or undefined when this session cannot be armed.
 		*/
-		function armReview(conversation, sessionId, message, file) {
+		function armReview(conversation, sessionId, message, file, additionalFiles = []) {
 			let shell;
 			try {
 				shell = conversation.input.shell(sessionId);
@@ -4843,10 +4862,12 @@ window.__ModuleLoader__.load({
 				return;
 			}
 			if (typeof shell.submit !== "function") return void 0;
+			const drafts = holdFiles(conversation, sessionId, file === void 0 ? additionalFiles : [file, ...additionalFiles]);
 			return {
 				shell,
 				text: message,
-				attachmentIds: holdFile(conversation, sessionId, file)
+				attachmentIds: drafts.map((draft) => draft.id),
+				previewUrls: drafts.flatMap((draft) => draft.previewUrl === void 0 ? [] : [draft.previewUrl])
 			};
 		}
 		/**
@@ -4909,12 +4930,13 @@ window.__ModuleLoader__.load({
 			for (const claim of claims) {
 				const { text, attachmentIds } = claim.armed;
 				if (draft.includes(text)) continue;
-				if (attachmentIds.length > 0) {
-					if (!attach(shell, attachmentIds)) {
+				const missing = attachmentIds.filter((id) => !live.attachmentIds?.includes(id));
+				if (missing.length > 0) {
+					if (!attach(shell, missing)) {
 						unwind(shell, typed, added);
 						return;
 					}
-					added.push(...attachmentIds);
+					added.push(...missing);
 				}
 				draft = draft.trim() === "" ? text : `${draft}\n\n${text}`;
 			}
@@ -4974,7 +4996,7 @@ window.__ModuleLoader__.load({
 			try {
 				shell.setDraft(merge.typed);
 			} catch {}
-			for (const claim of claims) for (const id of claim.armed.attachmentIds) shell.removeAttachment?.(id);
+			for (const claim of claims) if (claim.armed.staged !== true) for (const id of claim.armed.attachmentIds) shell.removeAttachment?.(id);
 		}
 		/**
 		* Take one card off whatever patch its shell is currently carrying.
@@ -5047,9 +5069,9 @@ window.__ModuleLoader__.load({
 				const send = () => {
 					try {
 						original.apply(shell, args);
-						settleClaims(shell, claims, merge);
 					} finally {
 						waiting = false;
+						settleClaims(shell, claims, merge);
 					}
 				};
 				if (wroteThrough(shell, merge)) {
@@ -5102,13 +5124,27 @@ window.__ModuleLoader__.load({
 		*/
 		function parkInComposer(input) {
 			const { document: document_, locale, paths, sessionId } = input;
-			const message = buildAnnotationMessage(document_, paths, locale, input.file !== void 0, input.pageImages ?? 0, input.pageCapture);
+			let armed = input.conversation === void 0 ? void 0 : armReview(input.conversation, sessionId, "", input.file, input.files);
+			const planned = (input.file === void 0 ? 0 : 1) + (input.files?.length ?? 0);
+			const attached = armed?.attachmentIds.length ?? planned;
+			const pageCapture = input.pageCapture === "attached" && attached === 0 ? "failed" : input.pageCapture;
+			const message = buildAnnotationMessage(document_, paths, locale, attached > 0, Math.min(input.pageImages ?? 0, attached), pageCapture);
+			if (armed !== void 0 && input.conversation !== void 0) {
+				const ids = armed.attachmentIds.length > 0 ? armed.attachmentIds : holdFiles(input.conversation, sessionId, [new File([message], "annotation.txt", { type: "text/plain" })]).map((draft) => draft.id);
+				if (ids.length > 0 && attach(armed.shell, ids)) armed = {
+					...armed,
+					attachmentIds: ids,
+					staged: true
+				};
+				else {
+					for (const id of ids) input.conversation.releaseDraftAttachment?.(id);
+					armed = void 0;
+				}
+			}
 			rememberDelivered(message, input.thumb);
-			const block = matchAnnotation(message, 0);
-			const armed = input.conversation === void 0 ? void 0 : armReview(input.conversation, sessionId, message, input.file);
 			parkAnnotation({
 				sessionId,
-				data: block?.data ?? {
+				data: matchAnnotation(message, 0)?.data ?? {
 					file: document_.figure.path,
 					scope: "",
 					target: "",
@@ -5119,7 +5155,10 @@ window.__ModuleLoader__.load({
 				},
 				raw: message,
 				conversation: input.conversation,
-				armed,
+				armed: armed === void 0 ? void 0 : {
+					...armed,
+					text: message
+				},
 				send: input.send
 			});
 		}
@@ -8792,19 +8831,20 @@ body[data-ds-dark-theme] .da-root{--da-quiet:#9aa0a8}
   border:0.5px solid var(--dsw-alias-border-l2,rgba(128,128,128,.3));border-radius:12px;
   background:var(--dsw-alias-bg-base,rgba(255,255,255,.72));
   box-shadow:0 1px 2px rgba(20,40,80,.04);white-space:normal}
-button.da-card{appearance:none;font-family:inherit;cursor:pointer;transition:border-color .15s ease,box-shadow .15s ease,background .15s ease}
-button.da-card:hover{border-color:var(--dsw-alias-border-l3,rgba(128,128,128,.46));background:var(--dsw-alias-bg-layer-2,rgba(128,128,128,.08));
-  box-shadow:0 3px 10px rgba(20,40,80,.07)}
-button.da-card:focus-visible{outline:2px solid var(--da-accent,#176df2);outline-offset:1px}
-.da-card-head{display:flex;align-items:center;gap:8px;min-width:0;padding:7px 9px;
+/* Review, source navigation and delivery are separate native buttons. */
+.da-card button,.da-staged-send{appearance:none;font:inherit;color:inherit;cursor:pointer}
+.da-card button:focus-visible,.da-staged-send:focus-visible{outline:2px solid var(--da-accent,#176df2);outline-offset:-2px}
+.da-card button:hover,.da-staged-send:hover{background:var(--dsw-alias-bg-layer-2,rgba(128,128,128,.08));color:var(--da-accent,#176df2)}
+.da-card-head{width:100%;box-sizing:border-box;border:0;text-align:left;display:flex;align-items:center;gap:8px;min-width:0;padding:7px 9px;
   border-bottom:0.5px solid var(--dsw-alias-border-l2,rgba(128,128,128,.2));
   background:var(--dsw-alias-bg-layer-1,rgba(128,128,128,.025))}
+.da-card-head-static{cursor:default}
 .da-card-shot{position:relative;display:flex;flex:0 0 auto;align-items:center;justify-content:center;width:34px;height:34px;overflow:hidden;border-radius:7px;
   border:0.5px solid var(--dsw-alias-border-l2,rgba(128,128,128,.18));
   background:var(--dsw-alias-bg-layer-3,rgba(128,128,128,.1));color:var(--da-accent,#176df2)}
 /* The picture covers the glyph; a picture that fails hides itself, and the glyph
    underneath it all along is what is left. A miss is never an empty box. */
-.da-card-shot img{position:absolute;inset:0;width:100%;height:100%;object-fit:cover}
+.da-card-shot img{position:absolute;inset:0;width:100%;height:100%;object-fit:contain}
 .da-card-shot img[hidden]{display:none}
 .da-card-glyph{width:18px;height:18px}
 .da-card-text{display:flex;flex:1 1 auto;flex-direction:column;gap:2px;min-width:0}
@@ -8827,10 +8867,11 @@ button.da-card:focus-visible{outline:2px solid var(--da-accent,#176df2);outline-
   border-radius:50%;background:var(--dsw-alias-bg-layer-3,rgba(128,128,128,.1));
   color:var(--dsw-alias-label-tertiary,inherit)}
 .da-card-go svg{width:14px;height:14px;fill:none;stroke:currentColor;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round}
-button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242,.14));color:var(--da-accent,#176df2)}
+.da-card-head:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242,.14));color:var(--da-accent,#176df2)}
 /* Each mark is a compact record, not a line of debug output. The row head answers
    "which mark and where"; the element name and selector follow only when the message
    carried them; the reader's sentence is the strongest text. */
+.da-card[data-expanded="true"] .da-card-go{transform:rotate(90deg)}
 .da-card-body{display:flex;flex-direction:column;min-width:0;padding:0 9px 2px}
 .da-card-row{display:flex;flex-direction:column;gap:2px;min-width:0;padding:6px 0}
 .da-card-row+.da-card-row{border-top:0.5px solid var(--dsw-alias-border-l2,rgba(128,128,128,.14))}
@@ -8932,21 +8973,23 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
   background:none;font:inherit;font-size:13px;line-height:1;cursor:pointer;opacity:.65}
 .da-staged-result-x:hover{opacity:1;background:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.72))}
 .da-staged-result-x:focus-visible{outline:2px solid var(--da-accent,#176df2);outline-offset:1px}
-/* One figure, one picture. The message that carries an annotation also attaches the
-   review picture, and the shell draws that attachment full width above the bubble —
-   so the same figure appeared twice, once huge and once as the card's 38px copy. The
-   card can open that figure itself, so the large copy is the one to drop: it is the
-   duplicate, and it was the reason the card sat under a picture the reader had
-   already seen. Selected from the attachment row forward rather than from the card
-   back, because CSS has no parent selector to reach; :has does have a following
-   sibling test, which is exactly this relationship.
-
-   Two guards keep it narrow. :not([data-static]) means a card that cannot open
-   anything (the queue dock's, drawn before sending) hides nothing — that copy is the
-   only picture in the dock. And if a shell ever stops marking its attachment row
-   with data-message-attachments, this rule stops matching rather than breaking
-   anything: the large picture simply returns and the card keeps working. */
-[data-message-attachments]:has(~ * .da-card:not([data-static])){display:none}
+/* Attachments belong to the message. A review may carry several PDF pages,
+   and a message may also carry unrelated files; its source is not that snapshot. */
+.da-card-actions{display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;gap:4px;padding:3px 5px;
+  border-top:0.5px solid var(--dsw-alias-border-l2,rgba(128,128,128,.2))}
+.da-card-toggle,.da-card-source{border:0;border-radius:6px;background:none;padding:6px 4px;min-height:30px;font-size:11px!important}
+.da-card-source{color:var(--da-accent,#176df2)!important}
+.da-card-error{padding:6px 9px;color:var(--dsw-alias-label-error,#c0392b);font-size:11px}
+.da-card-locator{margin-left:22px;overflow-wrap:anywhere;white-space:pre-wrap;color:var(--dsw-alias-label-tertiary,inherit);
+  font:10px/1.5 var(--dsw-font-family-mono,ui-monospace,SFMono-Regular,Menlo,monospace)}
+.da-card[data-expanded="true"] .da-card-said{display:block;white-space:pre-wrap;-webkit-line-clamp:unset}
+.da-card[data-expanded="true"] .da-card-name{white-space:normal;overflow-wrap:anywhere}
+.da-card-target{overflow-wrap:anywhere}
+.da-staged-type{font-size:9px;font-weight:650;letter-spacing:.04em;color:var(--dsw-alias-label-tertiary,inherit)}
+.da-staged-details{display:block;width:min(440px,100%);margin-top:4px}
+.da-staged-details[hidden]{display:none}
+.da-staged-send{border:0;border-radius:6px;background:none;min-height:28px;padding:4px 8px;font-size:11px;color:var(--da-accent,#176df2)}
+.da-staged-send[disabled]{opacity:.6;cursor:default}
 
 /* --- local service browser ------------------------------------------------ */
 .da-service-shell{display:flex;flex-direction:column;height:100%;min-height:0}
@@ -8998,7 +9041,7 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 .da-services{--da-service-ink:var(--dsw-alias-label-primary,#1b1d20);
   --da-service-muted:var(--dsw-alias-label-tertiary,#787d85);
   --da-service-line:color-mix(in srgb,var(--dsw-alias-border-l2,#c9cbd0) 66%,transparent);
-  box-sizing:border-box;height:100%;overflow:auto;padding:clamp(26px,7vh,64px) 22px 40px;
+  box-sizing:border-box;height:100%;overflow:auto;padding:24px 20px 32px;width:100%;
   color:var(--da-service-ink);
   background:
     radial-gradient(circle at 18% 0%,color-mix(in srgb,#4c8a63 8%,transparent),transparent 36%),
@@ -9006,10 +9049,7 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 .da-services-head,.da-service-search,.da-services-toolbar,.da-service-list,.da-services-error{
   width:min(480px,100%);margin-left:auto;margin-right:auto}
 .da-services-head{padding:0 4px 18px}
-.da-services-kicker{display:block;margin-bottom:8px;color:var(--da-service-muted);
-  font:9px/1.2 var(--dsw-font-family-mono,ui-monospace,SFMono-Regular,Menlo,monospace);
-  letter-spacing:.16em}
-.da-services-head h1{margin:0;font-size:clamp(25px,4.5vw,34px);font-weight:680;line-height:1.08;letter-spacing:-.035em}
+.da-services-head h1{margin:0;font-size:20px;font-weight:680;line-height:1.08;letter-spacing:-.035em}
 .da-services-head p{max-width:410px;margin:9px 0 0;color:var(--da-service-muted);font-size:12px;line-height:1.65}
 .da-service-search{display:flex;align-items:center;gap:9px;box-sizing:border-box;height:48px;padding:0 7px 0 14px;
   border:1px solid var(--da-service-line);border-radius:15px;
@@ -15559,6 +15599,32 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 			});
 		}
 		//#endregion
+		//#region src/client/annotation-subject.ts
+		/** Shared display identity for a review, before and after sending. */
+		/**
+		* Identify the reviewed source, independently of its mark tools or screenshot.
+		* @param data - the immutable message facts.
+		* @returns a readable name, media badge, and whether navigation belongs to the service tab.
+		*/
+		function annotationSubject(data) {
+			const address = data.html ? loopbackAddressOf(data.file) : void 0;
+			if (address !== void 0) {
+				const url = new URL(address);
+				return {
+					name: `${url.host}${url.pathname === "/" ? "" : url.pathname}`,
+					badge: "WEB",
+					live: true
+				};
+			}
+			const suffix = suffixOf(data.file);
+			const badge = data.html ? "HTML" : /^(?:pdf|svg|png|jpe?g|webp|gif|bmp|ico)$/u.test(suffix) ? suffix.toUpperCase() : "FIG";
+			return {
+				name: baseNameOf(data.file),
+				badge,
+				live: false
+			};
+		}
+		//#endregion
 		//#region src/client/annotation-card.tsx
 		/**
 		* The annotation a reader sent, as a card inside their own bubble.
@@ -15566,8 +15632,8 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 		* The message still says everything it said — the model reads the same text,
 		* copying it copies the same text — but in the transcript the same block is easier
 		* to scan as a small sheet: which figure, how large, how many marks, and what each
-		* of them asked for. Clicking it opens the figure in the Sidebar, where the full
-		* annotator (and every mark, at full size) already is.
+		* of them asked for. Clicking its header expands the delivered review; a separate action opens the
+		* current source in the Sidebar, which may have changed since this message was sent.
 		*
 		* Two rules keep this a view and nothing more. It reads the block it was dispatched
 		* for and never edits it; and it draws from the parsed data alone, so a block whose
@@ -15693,9 +15759,10 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 		* @returns the row.
 		*/
 		function CardRow(props) {
-			const { mark, ordinal, page } = props;
+			const { mark, ordinal, page, expanded } = props;
 			const said = mark.comment === "" ? void 0 : mark.comment;
 			const parts = readCardMarkLabel(mark.label);
+			const number = /\d+$/u.exec(parts.name)?.[0] ?? String(ordinal);
 			const kind = parts.name.replace(/\s*\d+$/u, "");
 			const label = parts.element === "" ? kind : parts.element;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
@@ -15708,7 +15775,7 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "da-card-kind",
 								"aria-hidden": "true",
-								children: ordinal
+								children: number
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 								className: "da-card-mark",
@@ -15737,6 +15804,10 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 						className: "da-card-said",
 						children: said
 					}),
+					expanded ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "da-card-locator",
+						children: mark.label
+					}) : null,
 					parts.aside === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "da-card-warning",
 						children: parts.aside
@@ -15750,7 +15821,6 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 		* @returns the card, or the block's own text when its data is not one it can draw.
 		*/
 		function AnnotationCard(props) {
-			const [shot, setShot] = (0, react.useState)(true);
 			(0, react.useEffect)(() => {
 				ensureStyles(document);
 			}, []);
@@ -15760,111 +15830,156 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 				className: "da-card-fallback",
 				children: raw
 			});
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ReviewCard, {
+				...props,
+				data,
+				raw
+			}, raw || JSON.stringify(data));
+		}
+		/** The review snapshot; navigation to the current source is a separate action. */
+		function ReviewCard(props) {
+			const { data, raw, embedded = false } = props;
+			const [failedThumb, setFailedThumb] = (0, react.useState)();
+			const [expanded, setExpanded] = (0, react.useState)(embedded);
+			const [trouble, setTrouble] = (0, react.useState)(false);
+			const bodyId = (0, react.useId)();
 			const interactive = props.interactive !== false;
 			const open = props.open;
-			const thumb = shot ? thumbFor(raw) : void 0;
-			const shown = data.marks.slice(0, MAX_ROWS);
+			const candidate = thumbFor(raw);
+			const thumb = candidate === failedThumb ? void 0 : candidate;
+			const shown = embedded || expanded ? data.marks : data.marks.slice(0, MAX_ROWS);
 			const rest = data.marks.length - shown.length;
-			const liveFile = data.html && loopbackAddressOf(data.file) !== void 0;
-			const displayFile = liveFile ? data.file.replace(/[?#].*$/u, "") : data.file;
+			const subject = annotationSubject(data);
+			const liveFile = subject.live;
 			const captureNotice = liveFile && thumb === void 0 ? data.pageCapture === "omitted" ? resolveTranslate(props, "cardCaptureOmitted") : data.pageCapture === "failed" ? resolveTranslate(props, "cardCaptureFailed") : "" : "";
-			const canOpen = interactive && open !== void 0 && (props.canOpen?.(data.file, data.html) ?? true);
-			const cut = Math.max(displayFile.lastIndexOf("/"), displayFile.lastIndexOf("\\"));
-			const name = displayFile.slice(cut + 1);
+			const sourceOpener = interactive && (props.canOpen?.(data.file, data.html) ?? true) ? open : void 0;
 			const dimensions = /(\d+)\s*[×x]\s*(\d+)/u.exec(data.scope);
 			const size = dimensions === null ? "" : `${dimensions[1]}×${dimensions[2]}`;
-			const head = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-				className: "da-card-head",
-				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-						className: "da-card-shot",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetIcon, {}), thumb === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
-							alt: "",
-							src: thumb,
-							onError: () => {
-								setShot(false);
-							}
+			const pages = /^(?:共 (\d+) 页|(\d+) pages)(?:，|,|$)/u.exec(data.scope);
+			const scope = pages === null ? size : resolveTranslate(props, "cardPages", { n: Number(pages[1] ?? pages[2]) });
+			const headContent = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					className: "da-card-shot",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetIcon, {}), thumb === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
+						alt: "",
+						src: thumb,
+						onError: () => {
+							setFailedThumb(thumb);
+						}
+					})]
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					className: "da-card-text",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "da-card-title-row",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "da-card-title",
+								title: data.file,
+								children: subject.name
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "da-card-type",
+								children: subject.badge
+							}),
+							captureNotice === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "da-card-capture",
+								children: captureNotice
+							})
+						]
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "da-card-scope",
+						children: [scope === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "da-card-meta",
+							title: data.scope,
+							children: scope
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "da-card-tally",
+							"aria-label": resolveTranslate(props, "cardCount", { n: data.marks.length }),
+							title: data.scope,
+							children: data.marks.length
 						})]
+					})]
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "da-card-go",
+					"aria-hidden": "true",
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
+						viewBox: "0 0 16 16",
+						focusable: "false",
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", { d: "m6 3.5 4.5 4.5L6 12.5" })
+					})
+				})
+			] });
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				className: "da-card",
+				"data-expanded": expanded,
+				children: [
+					embedded ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "da-card-head da-card-head-static",
+						children: headContent
+					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: "da-card-head",
+						"aria-expanded": expanded,
+						"aria-controls": bodyId,
+						title: resolveTranslate(props, expanded ? "cardCollapse" : "cardExpand"),
+						onClick: () => {
+							setExpanded((value) => !value);
+						},
+						children: headContent
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-						className: "da-card-text",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-							className: "da-card-title-row",
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "da-card-title",
-									children: name
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "da-card-type",
-									children: data.html ? "HTML" : "FIG"
-								}),
-								captureNotice === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "da-card-capture",
-									children: captureNotice
-								})
-							]
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-							className: "da-card-scope",
-							children: [size === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "da-card-meta",
-								title: data.scope,
-								children: size
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "da-card-tally",
-								"aria-label": resolveTranslate(props, "cardCount", { n: data.marks.length }),
-								title: data.scope,
-								children: data.marks.length
-							})]
+						className: "da-card-body",
+						id: bodyId,
+						children: [
+							shown.map((mark, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CardRow, {
+								mark,
+								ordinal: index + 1,
+								expanded,
+								page: mark.page === void 0 ? void 0 : resolveTranslate(props, "cardPage", { n: mark.page })
+							}, `${String(mark.page ?? "")}-${String(index)}`)),
+							rest > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "da-card-rest",
+								children: resolveTranslate(props, "cardMore", { n: rest })
+							}) : null,
+							data.target === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "da-card-row da-card-target",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "da-card-goal",
+									children: resolveTranslate(props, "cardGoal")
+								}), data.target]
+							})
+						]
+					}),
+					embedded ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "da-card-actions",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: "da-card-toggle",
+							"aria-expanded": expanded,
+							"aria-controls": bodyId,
+							onClick: () => {
+								setExpanded((value) => !value);
+							},
+							children: resolveTranslate(props, expanded ? "cardCollapse" : "cardExpand")
+						}), sourceOpener === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: "da-card-source",
+							title: data.file,
+							onClick: () => {
+								setTrouble(sourceOpener(data.file, data.html) === false);
+							},
+							children: resolveTranslate(props, liveFile ? "cardOpenLive" : "cardOpen")
 						})]
 					}),
-					canOpen ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "da-card-go",
-						"aria-hidden": "true",
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
-							viewBox: "0 0 16 16",
-							focusable: "false",
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", { d: "m6 3.5 4.5 4.5L6 12.5" })
-						})
+					trouble ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "da-card-error",
+						role: "status",
+						children: resolveTranslate(props, "cardOpenFailed")
 					}) : null
 				]
 			});
-			const body = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-				className: "da-card-body",
-				children: [
-					shown.map((mark, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CardRow, {
-						mark,
-						ordinal: index + 1,
-						page: mark.page === void 0 ? void 0 : resolveTranslate(props, "cardPage", { n: mark.page })
-					}, `${String(mark.page ?? "")}-${String(index)}`)),
-					rest > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "da-card-row da-card-rest",
-						children: resolveTranslate(props, "cardMore", { n: rest })
-					}) : null,
-					data.target === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-						className: "da-card-row da-card-target",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "da-card-goal",
-							children: resolveTranslate(props, "cardGoal")
-						}), data.target]
-					})
-				]
-			});
-			const onClick = canOpen && open !== void 0 ? () => {
-				open(data.file, data.html);
-			} : void 0;
-			if (onClick === void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-				className: "da-card",
-				"data-static": "",
-				children: [head, body]
-			});
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-				type: "button",
-				className: "da-card",
-				title: `${resolveTranslate(props, liveFile ? "cardOpenLive" : "cardOpen")} — ${displayFile}`,
-				onClick,
-				children: [head, body]
-			});
 		}
 		//#endregion
 		//#region src/client/document-seat.ts
@@ -15948,7 +16063,8 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 						paths: saved,
 						thumb,
 						file: void 0,
-						pageImages: images.length,
+						files: images.slice(0, 8).map(({ page, image }) => new File([image], `${baseNameOf(document.figure.path)}${pageFileSuffix(page)}.annotated.png`, { type: "image/png" })),
+						pageImages: Math.min(images.length, 8),
 						locale: options.locale,
 						send: async () => {
 							if (sessions === void 0) throw new Error("the sessions service is unavailable");
@@ -16167,31 +16283,9 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 		//#endregion
 		//#region src/client/pending-card.tsx
 		/**
-		* The parked annotation, drawn inside the composer as an attachment card.
-		*
-		* The composer is a lexical editor owned by the conversation package: nothing can be
-		* written into it that stays a card, and the whole annotation block sitting in the
-		* input box is exactly what a reader cannot scan. So the block is armed beside the box
-		* — its message held, its picture uploaded — and the chip stands beside the reader's
-		* own attachments as the face of what that send will carry: the figure's thumbnail, how
-		* many marks it carries, the file's name, and the first mark's note.
-		* It is portalled into the composer card's own flow (see `composer-seat`), so it
-		* sits where an attached picture sits; the dock entry that owns it holds only the
-		* anchor, and falls back to drawing in the dock itself when there is no card.
-		*
-		* What the card shows and what it hides is the point. A dimension or a pair of
-		* coordinates is not something to read at a glance, so it stays in the block the model
-		* reads and in the hover title, and never on the face: the face says the figure and the
-		* count first, the note second, and truncates both rather than wrapping into a wall of
-		* text.
-		*
-		* One press is the point, and the box keeps the reader's own words while it is not
-		* pressed: nothing is written into the draft, so the sentence being typed stays the only
-		* text in it. The box's own send carries the armed message — typing above the card and
-		* pressing Send sends the sentence and the review as one message, with the annotation
-		* behind the sentence — and the card's own action runs that same send for a reader who
-		* wants to fire it from the card. The card goes when that send takes it, or when the
-		* reader drops it, because that is when it stops standing for anything.
+		* Reviews staged beside the composer. The chip previews its immutable payload;
+		* the native composer Send carries armed reviews, with or without typed text.
+		* Older hosts without draft admission retain a direct-delivery fallback.
 		* @module dsh-figmark/client/pending-card
 		*/
 		/**
@@ -16229,28 +16323,6 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 			});
 		}
 		/**
-		* The small outline that stands for a mark's shape on the card's one line.
-		* @returns the glyph.
-		*/
-		function MarkIcon() {
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
-				className: "da-staged-mark-icon",
-				viewBox: "0 0 12 12",
-				"aria-hidden": "true",
-				focusable: "false",
-				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("rect", {
-					x: "1",
-					y: "2",
-					width: "10",
-					height: "8",
-					rx: "1.5",
-					fill: "none",
-					stroke: "currentColor",
-					strokeWidth: "1.1"
-				})
-			});
-		}
-		/**
 		* A mark's name without its coordinates: the kind and its number, which is what a
 		* reader recognises, with a space between the two the way the product writes it.
 		* @param label - the mark's own name, coordinates and all.
@@ -16269,25 +16341,15 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [trouble, setTrouble] = (0, react.useState)("");
 			const [shot, setShot] = (0, react.useState)(true);
+			const [expanded, setExpanded] = (0, react.useState)(false);
+			const detailId = (0, react.useId)();
 			const sending = (0, react.useRef)(false);
 			const armed = entry.armed;
 			const data = entry.data;
 			const thumb = shot ? thumbFor(entry.raw) : void 0;
 			const send = async () => {
 				if (sending.current) return;
-				if (armed !== void 0) {
-					sending.current = true;
-					setBusy(true);
-					try {
-						armed.shell.submit?.();
-					} finally {
-						queueMicrotask(() => {
-							sending.current = false;
-							setBusy(false);
-						});
-					}
-					return;
-				}
+				setTrouble("");
 				sending.current = true;
 				setBusy(true);
 				try {
@@ -16311,88 +16373,127 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 				entry.id,
 				sessionId
 			]);
-			const shownFile = data.file.replace(/[?#].*$/u, "");
-			const cut = Math.max(shownFile.lastIndexOf("/"), shownFile.lastIndexOf("\\"));
-			const name = shownFile.slice(cut + 1);
+			const subject = annotationSubject(data);
+			const name = subject.name;
 			const first = data.marks[0];
-			const captureNotice = data.html && thumb === void 0 ? data.pageCapture === "omitted" ? resolveTranslate(props, "cardCaptureOmitted") : data.pageCapture === "failed" ? resolveTranslate(props, "cardCaptureFailed") : "" : "";
+			const captureNotice = subject.live && thumb === void 0 ? data.pageCapture === "omitted" ? resolveTranslate(props, "cardCaptureOmitted") : data.pageCapture === "failed" ? resolveTranslate(props, "cardCaptureFailed") : "" : "";
 			const detail = first === void 0 ? name : first.comment === "" ? first.label : `${first.label} · ${first.comment}`;
 			const hover = data.scope === "" ? data.file : `${data.file} · ${data.scope}`;
 			const removeLabel = resolveTranslate(props, "pendingRemove");
+			const hint = resolveTranslate(props, "pendingSendNow");
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 				className: "da-staged",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-					className: "da-staged-card",
-					title: hover,
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-						type: "button",
-						className: "da-staged-open",
-						disabled: busy,
-						title: resolveTranslate(props, armed === void 0 ? "pendingSendNow" : "pendingSendHint"),
-						onClick: () => {
-							send();
-						},
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-							className: "da-staged-shot",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(FigureIcon, {}), thumb === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
-								alt: "",
-								src: thumb,
-								onError: () => {
-									setShot(false);
-								}
-							})]
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-							className: "da-staged-text",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "da-staged-card",
+						title: hover,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							className: "da-staged-open",
+							"aria-expanded": expanded,
+							"aria-controls": detailId,
+							title: resolveTranslate(props, expanded ? "cardCollapse" : "cardExpand"),
+							onClick: () => {
+								setExpanded((value) => !value);
+							},
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-								className: "da-staged-head",
+								className: "da-staged-shot",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(FigureIcon, {}), thumb === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
+									alt: "",
+									src: thumb,
+									onError: () => {
+										setShot(false);
+									}
+								})]
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "da-staged-text",
 								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "da-staged-title",
-										title: name,
-										children: name
-									}),
-									captureNotice === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "da-staged-capture",
-										children: captureNotice
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+										className: "da-staged-head",
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "da-staged-title",
+												title: name,
+												children: name
+											}),
+											captureNotice === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "da-staged-capture",
+												children: captureNotice
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "da-staged-count",
+												"aria-label": resolveTranslate(props, "cardCount", { n: data.marks.length }),
+												children: resolveTranslate(props, "pendingCount", { n: data.marks.length })
+											})
+										]
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "da-staged-count",
-										"aria-label": resolveTranslate(props, "cardCount", { n: data.marks.length }),
-										children: resolveTranslate(props, "pendingCount", { n: data.marks.length })
-									})
-								]
-							}), first === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-								className: "da-staged-line",
-								title: detail,
-								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MarkIcon, {}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "da-staged-shape",
-										children: shortLabel(first.label)
+										className: "da-staged-type",
+										children: subject.badge
 									}),
-									first.comment === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "da-staged-said",
-										children: first.comment
+									first === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+										className: "da-staged-line",
+										title: detail,
+										children: [
+											first.page === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "da-card-page",
+												children: resolveTranslate(props, "cardPage", { n: first.page })
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "da-staged-shape",
+												children: shortLabel(first.label)
+											}),
+											first.comment === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "da-staged-said",
+												children: first.comment
+											})
+										]
 									})
 								]
 							})]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: "da-staged-x",
+							"aria-label": removeLabel,
+							title: removeLabel,
+							disabled: busy,
+							onClick: () => {
+								if (sending.current) return;
+								if (armed !== void 0) disarmReview(armed, entry.conversation);
+								unparkAnnotation(sessionId, entry.id);
+							},
+							children: "×"
 						})]
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						id: detailId,
+						className: "da-staged-details",
+						hidden: !expanded,
+						children: expanded ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AnnotationCard, {
+							node: { data },
+							raw: entry.raw,
+							interactive: false,
+							embedded: true,
+							t: props.t,
+							localeId: props.localeId
+						}) : null
+					}),
+					armed === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
-						className: "da-staged-x",
-						"aria-label": removeLabel,
-						title: removeLabel,
+						className: "da-staged-send",
 						disabled: busy,
+						title: hint,
 						onClick: () => {
-							if (armed !== void 0) disarmReview(armed, entry.conversation);
-							unparkAnnotation(sessionId, entry.id);
+							send();
 						},
-						children: "×"
-					})]
-				}), trouble === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					className: "da-staged-trouble",
-					children: trouble
-				})]
+						children: resolveTranslate(props, busy ? "pendingSending" : "pendingSendNow")
+					}) : null,
+					trouble === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "da-staged-trouble",
+						role: "alert",
+						children: trouble
+					})
+				]
 			});
 		}
 		/**
@@ -16427,6 +16528,11 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 				return mountSeat(node, setSeat);
 			}, [sessionId, showing]);
 			if (!showing) return null;
+			const owned = entries.flatMap((entry) => entry.armed?.previewUrls ?? []).map((url) => `img[src=${JSON.stringify(url)}]`).join(",");
+			const thumbnailStyle = owned === "" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: `
+    [data-composer-card] [role="group"] > div:has(${owned}){display:none}
+    [data-composer-card] > div:has(> div > [role="group"]):not(:has([role="group"] > div:not(:has(${owned})))){display:none}
+  ` });
 			const cards = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: entries.map((entry) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ParkedChip, {
 				entry,
 				sessionId,
@@ -16453,11 +16559,15 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 					children: "×"
 				})]
 			});
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-				className: "da-staged-anchor",
-				ref: anchor,
-				hidden: true
-			}), seat === null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [cards, report] }) : (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [cards, report] }), seat)] });
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "da-staged-anchor",
+					ref: anchor,
+					hidden: true
+				}),
+				thumbnailStyle,
+				seat === null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [cards, report] }) : (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [cards, report] }), seat)
+			] });
 		}
 		//#endregion
 		//#region src/client/live-drafts.ts
@@ -17041,13 +17151,13 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 					return;
 				}
 				const needle = query.trim().toLowerCase();
-				const titleMatch = visible.find((service) => service.title?.toLowerCase().includes(needle) === true);
-				if (titleMatch !== void 0) {
-					openWorkspace(titleMatch.url, titleMatch.title);
-					return;
-				}
-				const first = visible[0];
-				openWorkspace(looksLikeAddress(query) || first === void 0 ? query : first.url, looksLikeAddress(query) || first === void 0 ? void 0 : first.title);
+				if (needle === "") return;
+				const titleMatch = visible.some((service) => service.title?.toLowerCase().includes(needle) === true);
+				if (looksLikeAddress(query) && !titleMatch) openWorkspace(query);
+				else if (visible.length === 1) {
+					const only = visible[0];
+					openWorkspace(only.url, only.title);
+				} else setError(t(visible.length === 0 ? "serviceNoMatch" : "serviceChooseMatch"));
 			};
 			const visible = (0, react.useMemo)(() => {
 				const needle = query.trim().toLowerCase();
@@ -17146,14 +17256,7 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 							children: [
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", {
 									className: "da-services-head",
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "da-services-kicker",
-											children: t("serviceKicker")
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h1", { children: t("serviceTitle") }),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("serviceHint") })
-									]
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h1", { children: t("serviceTitle") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("serviceHint") })]
 								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("form", {
 									className: "da-service-search",
@@ -17211,7 +17314,7 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 										children: t("serviceScanning")
 									}) : visible.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "da-services-empty",
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("serviceEmpty") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("serviceEmptyHint") })]
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t(query.trim() === "" ? "serviceEmpty" : "serviceNoMatch") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(query.trim() === "" ? "serviceEmptyHint" : "serviceSearchHint") })]
 									}) : visible.map((service) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 										type: "button",
 										className: "da-service-row",
@@ -18445,6 +18548,7 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 		*/
 		function canOpenFigure(ctx, sessionId, path, html) {
 			if (sessionId === "" || path === "") return false;
+			if (/^[a-z][a-z\d+.-]*:\/\//iu.test(path) && !isLivePage(path, html)) return false;
 			const sidebar = ctx.get("sidebarRight");
 			if (sidebar === void 0) return false;
 			return !isLivePage(path, html) || sidebar.openTab !== void 0;
@@ -18521,6 +18625,7 @@ button.da-card:hover .da-card-go{background:var(--da-accent-soft,rgba(23,109,242
 			ctx.effect(() => sidebarTabs.register({
 				id: SERVICE_BODY_ID,
 				kind: SERVICE_KIND,
+				keepMounted: true,
 				priority: "extension",
 				title: () => locale.bind(NAMESPACE)("serviceTitle"),
 				guide: [{

package/lib/index.js

@@ -885,9 +885,14 @@ ${readFileSync(createRequire(import.meta.url).resolve("modern-screenshot/dist/in
       ? [rect.left + scroll[0], rect.top + scroll[1], width, height]
       : [0, 0, width, height]
     var target = surface || root
+    // The deck's ancestor may scale a 1920px slide into a 548px viewport. Layout
+    // at the original size, then map the bitmap into imageRect. Feeding rect.width
+    // back as CSS width reflows/clips the slide while its children stay full-size.
+    var layoutWidth = surface ? surface.offsetWidth || width : width
+    var layoutHeight = surface ? surface.offsetHeight || height : height
     // The parent composes at no more than 1.5x, so a larger source only costs a DOM
     // clone and PNG encode without adding pixels the delivered picture keeps.
-    var scale = Math.min(1.5, 1800 / Math.max(width, height))
+    var scale = Math.min(1.5, 1800 / Math.max(layoutWidth, layoutHeight))
     var screenshot = window.modernScreenshot
     if (!screenshot || typeof screenshot.domToDataUrl !== 'function') {
       send({
@@ -900,8 +905,9 @@ ${readFileSync(createRequire(import.meta.url).resolve("modern-screenshot/dist/in
       return
     }
     screenshot.domToDataUrl(target, {
-      width: width,
-      height: height,
+      width: layoutWidth,
+      height: layoutHeight,
+      style: surface ? { transform: 'none', zoom: '1' } : null,
       scale: scale,
       backgroundColor: '#ffffff',
       maximumCanvasSize: 4096,
@@ -1555,7 +1561,7 @@ function probe(candidate) {
 			const finishResponse = () => {
 				/* v8 ignore next -- Node populates statusCode before emitting `response`. */
 				const status = res.statusCode ?? 0;
-				if (status < 200 || status >= 500) {
+				if (status < 200 || status >= 400) {
 					finish(void 0);
 					return;
 				}
@@ -1630,7 +1636,16 @@ async function discoverServices(request, sessionCwd) {
 		workspace: 1,
 		common: 2
 	};
-	return services.sort((left, right) => rank[left.source] - rank[right.source] || new URL(left.url).port.localeCompare(new URL(right.url).port, void 0, { numeric: true }));
+	const sorted = services.sort((left, right) => rank[left.source] - rank[right.source] || new URL(left.url).port.localeCompare(new URL(right.url).port, void 0, { numeric: true }));
+	const pages = /* @__PURE__ */ new Set();
+	return sorted.filter((service) => {
+		const url = new URL(service.url);
+		const path = service.title === void 0 ? url.pathname : url.pathname.replace(/\/index\.html?$/iu, "/");
+		const key = `${url.origin}${path}${url.search}${url.hash}\n${service.title ?? ""}`;
+		if (pages.has(key)) return false;
+		pages.add(key);
+		return true;
+	});
 }
 //#endregion
 //#region src/host/store-schema.ts

package/market/index.json

@@ -101,8 +101,8 @@
       },
       "versions": [
         {
-          "version": "1.2.2",
-          "publishTimestamp": 1793526077,
+          "version": "1.2.4",
+          "publishTimestamp": 1793932197,
           "source": {
             "type": "npm",
             "registry": "https://registry.npmjs.org"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-figmark",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "private": false,
   "description": "DSH 插件：在右侧栏预览里对科研配图、SVG、PDF 与本机网页直接圈画批注，标注写进侧车文件并可一键交给智能体改图源",
   "license": "MIT",