dsh-codex-subscription 2.5.7 → 2.5.8

package/README.en.md

@@ -106,7 +106,7 @@ This plugin supports the latest DeepSeek Harness release recorded in its package
 2. Paste this package name, with its version, into the **Package name or address** field:
 
    ```text
-   dsh-codex-subscription@2.5.7
+   dsh-codex-subscription@2.5.8
    ```
 
 3. Click **Install** and wait for completion. Follow the page instructions; save your work before restarting if requested.
@@ -139,6 +139,12 @@ dsh --profile headless "Reply with only the word: ok"
 
 ## Inside the plugin
 
+<details>
+<summary><b>Interface demo (animation, click to expand)</b>: models, prompts, images, annotation, sketch board, quota and resets</summary>
+<br>
+<p align="center"><img src="docs/assets/readme-demo-en.webp" width="1100" alt="Demo: sign in with ChatGPT, pick a subscription model, ask, generate an image, view and annotate it, continue on the sketch board, and check quota and resets"></p>
+</details>
+
 ### Everyday controls, right in the composer
 
 Choose a model, adjust reasoning, switch speed tiers, and check remaining quota without opening settings for every request.

package/README.md

@@ -106,7 +106,7 @@
 2. 在 **包名或地址** 输入框中粘贴下面的包名（已带版本号）：
 
    ```text
-   dsh-codex-subscription@2.5.7
+   dsh-codex-subscription@2.5.8
    ```
 
 3. 点击 **安装**，等待安装完成；按页面提示操作，需要重启时先保存工作。
@@ -139,6 +139,12 @@ dsh --profile headless "只回复：ok"
 
 ## 界面一览
 
+<details>
+<summary><b>界面演示（动图，点击展开）</b>：选模型、提问、出图、标注、草图、额度与重置</summary>
+<br>
+<p align="center"><img src="docs/assets/readme-demo.webp" width="1100" alt="演示：登录 ChatGPT 选订阅模型、提问、用订阅出图、查看与标注、进入草图、查看额度与重置"></p>
+</details>
+
 ### 日常操作，留在输入框
 
 选模型、调推理档位、切换速度档位，同时查看剩余额度。无需为每次请求打开设置。

package/lib/client.js

@@ -587,6 +587,88 @@ window.__ModuleLoader__.load({
 			].join("\n");
 		}
 		//#endregion
+		//#region src/image-official-tools.js
+		const IMAGE_ASPECT_RATIOS = Object.freeze([
+			["square", "1:1"],
+			["portrait", "3:4"],
+			["story", "9:16"],
+			["landscape", "4:3"],
+			["widescreen", "16:9"]
+		]);
+		/**
+		* Build viewer actions for one image.
+		* @param {{ src: string, name: string, t: (key: string) => string,
+		*   attachForEdit: (src: string, name: string, draft: string, annotations?: unknown[], referenceName?: string, sourceInDraft?: boolean, extraFiles?: File[]) => Promise<unknown>,
+		*   sourceInDraft?: boolean }} options
+		*/
+		function officialImageTools({ src, name, t, attachForEdit, sourceInDraft = false }) {
+			const send = (draft, extraFiles = []) => attachForEdit(src, name, draft, [], void 0, sourceInDraft, extraFiles);
+			const base = {
+				pendingLabel: t("imageEditPreparing"),
+				errorLabel: t("imageEditFailed"),
+				closeOnSuccess: true
+			};
+			return [
+				{
+					...base,
+					id: "remove-background",
+					kind: "tool",
+					label: t("imageRemoveBackground"),
+					onInvoke: () => send(t("imageRemoveBackgroundPrompt"))
+				},
+				{
+					...base,
+					id: "erase",
+					kind: "mask",
+					label: t("imageErase"),
+					onInvoke: async ({ mask }) => {
+						if (!(mask instanceof Blob)) throw new Error("Mark the area to erase first");
+						const maskName = `${String(name).replace(/\.[a-z0-9]+$/iu, "")}-erase-mask.png`;
+						return send(t("imageErasePrompt"), [new File([mask], maskName, { type: "image/png" })]);
+					}
+				},
+				{
+					...base,
+					id: "resize",
+					kind: "choice",
+					label: t("imageResize"),
+					options: IMAGE_ASPECT_RATIOS.map(([id, ratio]) => ({
+						value: ratio,
+						label: `${t(`imageRatio_${id}`)} ${ratio}`
+					})),
+					onInvoke: ({ option }) => send(t("imageResizePrompt").replaceAll("{aspectRatio}", option))
+				}
+			];
+		}
+		/** Draw relative erase strokes in one color onto a canvas of the given size. */
+		function paintEraseStrokes(context, strokes, width, height, color) {
+			context.strokeStyle = color;
+			context.fillStyle = color;
+			context.lineCap = "round";
+			context.lineJoin = "round";
+			const scale = Math.min(width, height);
+			for (const stroke of strokes) {
+				const points = stroke.points;
+				if (points.length === 0) continue;
+				context.lineWidth = stroke.size * scale;
+				context.beginPath();
+				if (points.length === 1) {
+					context.arc(points[0].x * width, points[0].y * height, stroke.size * scale / 2, 0, Math.PI * 2);
+					context.fill();
+					continue;
+				}
+				context.moveTo(points[0].x * width, points[0].y * height);
+				for (const point of points.slice(1)) context.lineTo(point.x * width, point.y * height);
+				context.stroke();
+			}
+		}
+		/** Codex's erase mask: the marked area white on black, at the image's own resolution. */
+		function paintEraseMask(context, strokes, width, height) {
+			context.fillStyle = "#000";
+			context.fillRect(0, 0, width, height);
+			paintEraseStrokes(context, strokes, width, height, "#fff");
+		}
+		//#endregion
 		//#region src/client-image-previews.jsx
 		function openPreview(props, item, opener, sourceInDraft = false) {
 			const { service, preference, t, attachForEdit } = props;
@@ -595,25 +677,35 @@ window.__ModuleLoader__.load({
 			service.open({
 				items: [{
 					...item,
-					actions: settings.imageEditing ? [{
-						id: "edit",
-						label: t("imageEdit"),
-						pendingLabel: t("imageEditPreparing"),
-						errorLabel: t("imageEditFailed"),
-						closeOnSuccess: true,
-						onInvoke: ({ annotations }) => attachForEdit(item.src, item.name, buildImageEditDraft({
-							annotations,
-							translate: t,
-							sourceName: item.name,
-							referenceName
-						}), annotations, referenceName, sourceInDraft)
-					}, ...settings.imageSketch && props.openSketchImage ? [{
-						id: "sketch",
-						label: t("imageToSketch"),
-						pendingLabel: t("imageEditPreparing"),
-						errorLabel: t("imageEditFailed"),
-						onInvoke: () => props.openSketchImage(item.src, item.name)
-					}] : []] : []
+					actions: settings.imageEditing ? [
+						{
+							id: "edit",
+							label: t("imageEdit"),
+							pendingLabel: t("imageEditPreparing"),
+							errorLabel: t("imageEditFailed"),
+							closeOnSuccess: true,
+							onInvoke: ({ annotations }) => attachForEdit(item.src, item.name, buildImageEditDraft({
+								annotations,
+								translate: t,
+								sourceName: item.name,
+								referenceName
+							}), annotations, referenceName, sourceInDraft)
+						},
+						...officialImageTools({
+							src: item.src,
+							name: item.name,
+							t,
+							attachForEdit,
+							sourceInDraft
+						}),
+						...settings.imageSketch && props.openSketchImage ? [{
+							id: "sketch",
+							label: t("imageToSketch"),
+							pendingLabel: t("imageEditPreparing"),
+							errorLabel: t("imageEditFailed"),
+							onInvoke: () => props.openSketchImage(item.src, item.name)
+						}] : []
+					] : []
 				}],
 				opener,
 				source: sourceInDraft ? "codex-draft" : "codex-message",
@@ -804,7 +896,27 @@ window.__ModuleLoader__.load({
 				d: "M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
 			}));
 		}
-		const ForwardRef$3 = /*#__PURE__*/ react.forwardRef(ArrowPathIcon);
+		const ForwardRef$6 = /*#__PURE__*/ react.forwardRef(ArrowPathIcon);
+		//#endregion
+		//#region node_modules/.pnpm/@heroicons+react@2.2.0_react@18.3.1/node_modules/@heroicons/react/24/outline/esm/ArrowsPointingOutIcon.js
+		function ArrowsPointingOutIcon({ title, titleId, ...props }, svgRef) {
+			return /*#__PURE__*/ react.createElement("svg", Object.assign({
+				xmlns: "http://www.w3.org/2000/svg",
+				fill: "none",
+				viewBox: "0 0 24 24",
+				strokeWidth: 1.5,
+				stroke: "currentColor",
+				"aria-hidden": "true",
+				"data-slot": "icon",
+				ref: svgRef,
+				"aria-labelledby": titleId
+			}, props), title ? /*#__PURE__*/ react.createElement("title", { id: titleId }, title) : null, /*#__PURE__*/ react.createElement("path", {
+				strokeLinecap: "round",
+				strokeLinejoin: "round",
+				d: "M3.75 3.75v4.5m0-4.5h4.5m-4.5 0L9 9M3.75 20.25v-4.5m0 4.5h4.5m-4.5 0L9 15M20.25 3.75h-4.5m4.5 0v4.5m0-4.5L15 9m5.25 11.25h-4.5m4.5 0v-4.5m0 4.5L15 15"
+			}));
+		}
+		const ForwardRef$5 = /*#__PURE__*/ react.forwardRef(ArrowsPointingOutIcon);
 		//#endregion
 		//#region node_modules/.pnpm/@heroicons+react@2.2.0_react@18.3.1/node_modules/@heroicons/react/24/outline/esm/ExclamationCircleIcon.js
 		function ExclamationCircleIcon({ title, titleId, ...props }, svgRef) {
@@ -824,7 +936,27 @@ window.__ModuleLoader__.load({
 				d: "M12 9v3.75m9-.75a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 3.75h.008v.008H12v-.008Z"
 			}));
 		}
-		const ForwardRef$2 = /*#__PURE__*/ react.forwardRef(ExclamationCircleIcon);
+		const ForwardRef$4 = /*#__PURE__*/ react.forwardRef(ExclamationCircleIcon);
+		//#endregion
+		//#region node_modules/.pnpm/@heroicons+react@2.2.0_react@18.3.1/node_modules/@heroicons/react/24/outline/esm/PaintBrushIcon.js
+		function PaintBrushIcon({ title, titleId, ...props }, svgRef) {
+			return /*#__PURE__*/ react.createElement("svg", Object.assign({
+				xmlns: "http://www.w3.org/2000/svg",
+				fill: "none",
+				viewBox: "0 0 24 24",
+				strokeWidth: 1.5,
+				stroke: "currentColor",
+				"aria-hidden": "true",
+				"data-slot": "icon",
+				ref: svgRef,
+				"aria-labelledby": titleId
+			}, props), title ? /*#__PURE__*/ react.createElement("title", { id: titleId }, title) : null, /*#__PURE__*/ react.createElement("path", {
+				strokeLinecap: "round",
+				strokeLinejoin: "round",
+				d: "M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42"
+			}));
+		}
+		const ForwardRef$3 = /*#__PURE__*/ react.forwardRef(PaintBrushIcon);
 		//#endregion
 		//#region node_modules/.pnpm/@heroicons+react@2.2.0_react@18.3.1/node_modules/@heroicons/react/24/outline/esm/PhotoIcon.js
 		function PhotoIcon({ title, titleId, ...props }, svgRef) {
@@ -844,7 +976,27 @@ window.__ModuleLoader__.load({
 				d: "m2.25 15.75 5.159-5.159a2.25 2.25 0 0 1 3.182 0l5.159 5.159m-1.5-1.5 1.409-1.409a2.25 2.25 0 0 1 3.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 0 0 1.5-1.5V6a1.5 1.5 0 0 0-1.5-1.5H3.75A1.5 1.5 0 0 0 2.25 6v12a1.5 1.5 0 0 0 1.5 1.5Zm10.5-11.25h.008v.008h-.008V8.25Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Z"
 			}));
 		}
-		const ForwardRef$1 = /*#__PURE__*/ react.forwardRef(PhotoIcon);
+		const ForwardRef$2 = /*#__PURE__*/ react.forwardRef(PhotoIcon);
+		//#endregion
+		//#region node_modules/.pnpm/@heroicons+react@2.2.0_react@18.3.1/node_modules/@heroicons/react/24/outline/esm/ScissorsIcon.js
+		function ScissorsIcon({ title, titleId, ...props }, svgRef) {
+			return /*#__PURE__*/ react.createElement("svg", Object.assign({
+				xmlns: "http://www.w3.org/2000/svg",
+				fill: "none",
+				viewBox: "0 0 24 24",
+				strokeWidth: 1.5,
+				stroke: "currentColor",
+				"aria-hidden": "true",
+				"data-slot": "icon",
+				ref: svgRef,
+				"aria-labelledby": titleId
+			}, props), title ? /*#__PURE__*/ react.createElement("title", { id: titleId }, title) : null, /*#__PURE__*/ react.createElement("path", {
+				strokeLinecap: "round",
+				strokeLinejoin: "round",
+				d: "m7.848 8.25 1.536.887M7.848 8.25a3 3 0 1 1-5.196-3 3 3 0 0 1 5.196 3Zm1.536.887a2.165 2.165 0 0 1 1.083 1.839c.005.351.054.695.14 1.024M9.384 9.137l2.077 1.199M7.848 15.75l1.536-.887m-1.536.887a3 3 0 1 1-5.196 3 3 3 0 0 1 5.196-3Zm1.536-.887a2.165 2.165 0 0 0 1.083-1.838c.005-.352.054-.695.14-1.025m-1.223 2.863 2.077-1.199m0-3.328a4.323 4.323 0 0 1 2.068-1.379l5.325-1.628a4.5 4.5 0 0 1 2.48-.044l.803.215-7.794 4.5m-2.882-1.664A4.33 4.33 0 0 0 10.607 12m3.736 0 7.794 4.5-.802.215a4.5 4.5 0 0 1-2.48-.043l-5.326-1.629a4.324 4.324 0 0 1-2.068-1.379M14.343 12l-2.882 1.664"
+			}));
+		}
+		const ForwardRef$1 = /*#__PURE__*/ react.forwardRef(ScissorsIcon);
 		const ORIGINAL_IMAGE_ID_PATTERN = /^img_[0-9a-f]{32}$/u;
 		const positiveInteger = (value) => Number.isSafeInteger(value) && value > 0;
 		function decodeOriginalImageRef(value) {
@@ -1032,32 +1184,41 @@ window.__ModuleLoader__.load({
 							errorLabel: t("imageDownloadFailed"),
 							onInvoke: downloadOriginal
 						},
-						actions: !features.imageEditing ? [] : [{
-							id: "continue-editing",
-							label: t("imageEdit"),
-							pendingLabel: t("imageEditPreparing"),
-							errorLabel: t("imageEditFailed"),
-							closeOnSuccess: true,
-							onInvoke: ({ annotations = [] }) => {
-								const imageKey = String(attachment.attachmentId ?? "image").replace(/[^a-zA-Z0-9_-]/g, "_");
-								const sourceName = annotations.length === 0 ? downloadName : `codex-edit-${imageKey}-source.png`;
-								const referenceName = `codex-edit-${imageKey}-annotations.png`;
-								return attachForEdit(src, sourceName, buildImageEditDraft({
-									annotations,
-									translate: t,
-									width: attachment.width,
-									height: attachment.height,
-									sourceName,
-									referenceName
-								}), annotations, referenceName);
-							}
-						}, ...features.imageSketch && openSketchImage ? [{
-							id: "sketch",
-							label: t("imageToSketch"),
-							pendingLabel: t("imageEditPreparing"),
-							errorLabel: t("imageEditFailed"),
-							onInvoke: () => openSketchImage(src, downloadName)
-						}] : []]
+						actions: !features.imageEditing ? [] : [
+							{
+								id: "continue-editing",
+								label: t("imageEdit"),
+								pendingLabel: t("imageEditPreparing"),
+								errorLabel: t("imageEditFailed"),
+								closeOnSuccess: true,
+								onInvoke: ({ annotations = [] }) => {
+									const imageKey = String(attachment.attachmentId ?? "image").replace(/[^a-zA-Z0-9_-]/g, "_");
+									const sourceName = annotations.length === 0 ? downloadName : `codex-edit-${imageKey}-source.png`;
+									const referenceName = `codex-edit-${imageKey}-annotations.png`;
+									return attachForEdit(src, sourceName, buildImageEditDraft({
+										annotations,
+										translate: t,
+										width: attachment.width,
+										height: attachment.height,
+										sourceName,
+										referenceName
+									}), annotations, referenceName);
+								}
+							},
+							...officialImageTools({
+								src,
+								name: downloadName,
+								t,
+								attachForEdit
+							}),
+							...features.imageSketch && openSketchImage ? [{
+								id: "sketch",
+								label: t("imageToSketch"),
+								pendingLabel: t("imageEditPreparing"),
+								errorLabel: t("imageEditFailed"),
+								onInvoke: () => openSketchImage(src, downloadName)
+							}] : []
+						]
 					}],
 					opener: triggerRef.current,
 					source: "codex-generated",
@@ -1107,7 +1268,7 @@ window.__ModuleLoader__.load({
 					showOutput ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexImageToolRow",
 						children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(!settled ? ForwardRef$3 : failed ? ForwardRef$2 : ForwardRef$1, {
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(!settled ? ForwardRef$6 : failed ? ForwardRef$4 : ForwardRef$2, {
 								className: "codexImageToolIcon",
 								"aria-hidden": "true"
 							}),
@@ -5525,6 +5686,21 @@ window.__ModuleLoader__.load({
 			sketchEditableFile: "可编辑草稿",
 			sketchFormatHint: "PNG 为合并图片；可编辑草稿保留原生笔画，可重新导入（32 MB 内）。",
 			imageToSketch: "进入草图",
+			imageRemoveBackground: "移除背景",
+			imageRemoveBackgroundPrompt: "移除此图像的背景。保持所有前景主体不变且完整，边缘干净平滑。将背景设为透明。",
+			imageErase: "擦除",
+			imageEraseHint: "在要移除的内容上涂抹",
+			imageErasePrompt: "从第一张图像中移除第二张图像中标记的区域",
+			imageBrushSize: "画笔大小",
+			imageUndo: "撤销",
+			imageSend: "发送",
+			imageResize: "调整大小",
+			imageResizePrompt: "将宽高比设为 {aspectRatio}",
+			imageRatio_square: "正方形",
+			imageRatio_portrait: "竖向",
+			imageRatio_story: "故事版式",
+			imageRatio_landscape: "横向",
+			imageRatio_widescreen: "宽屏",
 			sketchPictures: "图片",
 			sketchPictureAdd: "添加",
 			sketchPictureSelect: "选择图片",
@@ -6097,6 +6273,21 @@ window.__ModuleLoader__.load({
 			sketchEditableFile: "Editable draft",
 			sketchFormatHint: "PNG is flattened; editable drafts retain native strokes and can be imported again (up to 32 MB).",
 			imageToSketch: "Open in sketch",
+			imageRemoveBackground: "Remove background",
+			imageRemoveBackgroundPrompt: "Remove the background from this image. Keep all foreground subjects unchanged and fully intact, with clean, smooth edges. Make the background transparent.",
+			imageErase: "Erase",
+			imageEraseHint: "Brush over what you want to remove",
+			imageErasePrompt: "Remove the area marked in the second image from the first image",
+			imageBrushSize: "Brush size",
+			imageUndo: "Undo",
+			imageSend: "Send",
+			imageResize: "Resize",
+			imageResizePrompt: "Make the aspect ratio {aspectRatio}",
+			imageRatio_square: "Square",
+			imageRatio_portrait: "Portrait",
+			imageRatio_story: "Story",
+			imageRatio_landscape: "Landscape",
+			imageRatio_widescreen: "Widescreen",
 			sketchPictures: "Images",
 			sketchPictureAdd: "Add",
 			sketchPictureSelect: "Select image",
@@ -6919,6 +7110,9 @@ window.__ModuleLoader__.load({
 .dcsiv-inline-note{position:absolute;bottom:34px;box-sizing:border-box;display:grid;width:min(300px,calc(100vw - 40px));grid-template-columns:24px minmax(0,1fr) 24px;align-items:center;gap:7px;padding:7px 8px;border:1px solid rgba(255,255,255,.12);border-radius:18px;background:rgba(32,33,37,.94);box-shadow:0 14px 38px rgba(0,0,0,.38);color:#fff;pointer-events:auto;backdrop-filter:blur(20px);-webkit-backdrop-filter:blur(20px)}.dcsiv-annotation[data-x=right] .dcsiv-inline-note{left:-8px}.dcsiv-annotation[data-x=left] .dcsiv-inline-note{right:-8px}.dcsiv-annotation[data-x=center] .dcsiv-inline-note{left:50%;transform:translateX(-50%)}.dcsiv-annotation[data-y=down] .dcsiv-inline-note{top:34px;bottom:auto}.dcsiv-inline-note::after{position:absolute;width:9px;height:9px;background:rgba(32,33,37,.94);content:'';transform:rotate(45deg)}.dcsiv-annotation[data-y=up] .dcsiv-inline-note::after{bottom:-5px}.dcsiv-annotation[data-y=down] .dcsiv-inline-note::after{top:-5px}.dcsiv-annotation[data-x=right] .dcsiv-inline-note::after{left:13px}.dcsiv-annotation[data-x=left] .dcsiv-inline-note::after{right:13px}.dcsiv-annotation[data-x=center] .dcsiv-inline-note::after{left:calc(50% - 4px)}.dcsiv-inline-index{display:grid;place-items:center;width:22px;height:22px;border-radius:50%;background:var(--dsw-alias-state-business-primary,#3964fe);color:#fff;font-size:10px;font-weight:700}.dcsiv-inline-note textarea{box-sizing:border-box;width:100%;min-height:24px;max-height:92px;resize:none;overflow:auto;border:0;outline:0;background:transparent;color:#fff;font:inherit;font-size:12px;line-height:18px}.dcsiv-inline-note textarea::placeholder{color:rgba(255,255,255,.44)}.dcsiv-note-remove{display:grid;place-items:center;width:24px;height:24px;padding:0;border:0;border-radius:50%;background:transparent;color:rgba(255,255,255,.68);cursor:pointer}.dcsiv-note-remove:hover{background:rgba(255,255,255,.1);color:#fff}
 .dcsiv-nav{position:absolute;top:50%;z-index:4;width:42px;height:42px;padding:0;transform:translateY(-50%);background:rgba(48,49,53,.82);box-shadow:0 8px 24px rgba(0,0,0,.28);backdrop-filter:blur(16px);-webkit-backdrop-filter:blur(16px)}.dcsiv-prev{left:6px}.dcsiv-next{right:6px}.dcsiv-counter{position:absolute;bottom:8px;left:50%;padding:5px 10px;border-radius:999px;background:rgba(38,39,43,.86);color:rgba(255,255,255,.72);font-size:11px;transform:translateX(-50%);backdrop-filter:blur(16px)}
 .dcsiv-hint{display:none}
+.dcsiv-mask{position:absolute;inset:0;width:100%;height:100%;border-radius:12px;cursor:crosshair;touch-action:none}
+.dcsiv-tool-icon{width:16px;height:16px;flex:none}.dcsiv-menu{position:fixed;z-index:12;display:flex;flex-direction:column;min-width:150px;padding:6px;border:1px solid rgba(255,255,255,.12);border-radius:12px;background:rgba(32,33,37,.97);box-shadow:0 12px 32px rgba(0,0,0,.4)}.dcsiv-menu button{height:32px;padding:0 10px;border:0;border-radius:8px;background:none;color:rgba(255,255,255,.9);font:inherit;font-size:13px;text-align:left;cursor:pointer}.dcsiv-menu button:hover,.dcsiv-menu button:focus-visible{background:rgba(255,255,255,.1)}
+.dcsiv-erase-bar{position:absolute;left:50%;top:22px;z-index:7;display:flex;align-items:center;gap:10px;padding:6px 8px 6px 14px;transform:translateX(-50%);border:1px solid rgba(255,255,255,.1);border-radius:999px;background:rgba(38,39,43,.92);color:rgba(255,255,255,.86);font-size:12px;white-space:nowrap}.dcsiv-erase-bar label{display:inline-flex;align-items:center;gap:6px}.dcsiv-erase-bar input{width:90px}.dcsiv-primary{background:#fff!important;color:#111!important}
 .dcsiv-copy-notes{position:absolute;right:20px;bottom:22px;z-index:6;display:inline-flex;align-items:center;gap:6px;height:32px;padding:0 11px;border:1px solid rgba(255,255,255,.1);border-radius:999px;background:rgba(38,39,43,.86);color:rgba(255,255,255,.82);font:inherit;font-size:12px;cursor:pointer;backdrop-filter:blur(16px)}
 .dcsiv-edit-short{display:none}
 @media(max-width:760px){.dcsiv-actions{flex-wrap:wrap;justify-content:center}.dcsiv-edit-short{display:inline;white-space:normal;max-width:min(280px,calc(100vw - 80px))}.dcsiv-edit-action{height:auto;min-height:32px}.dcsiv-close-floating{top:12px;right:12px;width:40px;height:40px}.dcsiv-workspace{padding:60px 12px 68px}.dcsiv-image{max-width:calc(100vw - 24px);max-height:calc(100vh - 136px)}.dcsiv-topbar{bottom:12px;max-width:calc(100vw - 24px)}.dcsiv-button{padding:0 8px}.dcsiv-button span.dcsiv-label{display:none}.dcsiv-inline-note{width:min(260px,calc(100vw - 40px))}.dcsiv-copy-notes{display:none}}
@@ -7102,6 +7296,18 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/subscription-image-viewer.jsx
+		const TOOL_ICONS = {
+			"remove-background": ForwardRef$1,
+			erase: ForwardRef$3,
+			resize: ForwardRef$5
+		};
+		const ToolIcon = ({ id }) => {
+			const Icon = TOOL_ICONS[id];
+			return Icon ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon, {
+				className: "dcsiv-tool-icon",
+				"aria-hidden": "true"
+			}) : null;
+		};
 		const fill$1 = (value, variables) => Object.entries(variables).reduce((text, [key, replacement]) => text.replaceAll(`{${key}}`, String(replacement)), value);
 		const clamp = (value, min, max) => Math.min(max, Math.max(min, value));
 		const bytesLabel = (bytes) => bytes === void 0 ? void 0 : bytes < 1024 * 1024 ? `${Math.max(.1, bytes / 1024).toLocaleString(void 0, { maximumFractionDigits: 1 })} KB` : `${(bytes / 1024 / 1024).toLocaleString(void 0, { maximumFractionDigits: 1 })} MB`;
@@ -7112,8 +7318,9 @@ window.__ModuleLoader__.load({
 		const noteText = (annotations, t) => annotations.map((annotation, index) => {
 			return `${fill$1(t("imageAnnotation"), { value: index + 1 })} (${Math.round(annotation.x * 100)}%, ${Math.round(annotation.y * 100)}%): ${annotation.note.trim()}`;
 		}).filter((line) => !line.endsWith(": ")).join("\n");
-		function ViewerAction({ action, annotations, item, service, revision, t }) {
+		function ViewerAction({ action, annotations, item, service, revision, t, onStartMask }) {
 			const [state, setState] = (0, react.useState)("idle");
+			const [menu, setMenu] = (0, react.useState)();
 			const active = (0, react.useRef)(true);
 			(0, react.useEffect)(() => {
 				active.current = true;
@@ -7121,14 +7328,15 @@ window.__ModuleLoader__.load({
 					active.current = false;
 				};
 			}, []);
-			const invoke = async () => {
+			const invoke = async (extra = {}) => {
 				if (state === "pending") return;
 				setState("pending");
 				try {
 					await action.onInvoke({
 						annotations,
 						item,
-						src: item.src
+						src: item.src,
+						...extra
 					});
 					if (!active.current || service.getSnapshot()?.revision !== revision) return;
 					setState("idle");
@@ -7138,6 +7346,62 @@ window.__ModuleLoader__.load({
 				}
 			};
 			const label = state === "pending" ? action.pendingLabel : state === "failed" ? action.errorLabel : action.label;
+			if (action.kind === "mask") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+				type: "button",
+				className: "dcsiv-button",
+				onClick: () => onStartMask(action),
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ToolIcon, { id: action.id }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "dcsiv-label",
+					children: action.label
+				})]
+			});
+			if (action.kind === "tool") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+				type: "button",
+				className: "dcsiv-button",
+				disabled: state === "pending",
+				onClick: () => {
+					invoke();
+				},
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ToolIcon, { id: action.id }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "dcsiv-label",
+					children: label
+				})]
+			});
+			if (action.kind === "choice") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+				type: "button",
+				className: "dcsiv-button",
+				"aria-haspopup": "menu",
+				"aria-expanded": menu !== void 0,
+				disabled: state === "pending",
+				onClick: (event) => {
+					const box = event.currentTarget.getBoundingClientRect();
+					const host = event.currentTarget.closest(".dcsiv-root");
+					setMenu((value) => value === void 0 && host ? {
+						host,
+						style: {
+							left: box.left,
+							bottom: window.innerHeight - box.top + 8
+						}
+					} : void 0);
+				},
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ToolIcon, { id: action.id }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "dcsiv-label",
+					children: label
+				})]
+			}), menu ? (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "dcsiv-menu",
+				role: "menu",
+				style: menu.style,
+				children: action.options.map((option) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					role: "menuitem",
+					onClick: () => {
+						setMenu(void 0);
+						invoke({ option: option.value });
+					},
+					children: option.label
+				}, option.value))
+			}), menu.host) : null] });
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 				type: "button",
 				className: "dcsiv-button dcsiv-edit-action",
@@ -7224,6 +7488,12 @@ window.__ModuleLoader__.load({
 			const [selected, setSelected] = (0, react.useState)();
 			const [focusNote, setFocusNote] = (0, react.useState)();
 			const [copied, setCopied] = (0, react.useState)(false);
+			const [erasing, setErasing] = (0, react.useState)();
+			const [strokes, setStrokes] = (0, react.useState)([]);
+			const [brush, setBrush] = (0, react.useState)(.05);
+			const [sending, setSending] = (0, react.useState)(false);
+			const drawingRef = (0, react.useRef)(false);
+			const maskRef = (0, react.useRef)(null);
 			const rootRef = (0, react.useRef)(null);
 			annotationsByImageRef.current = annotationsByImage;
 			(0, react.useEffect)(() => {
@@ -7316,11 +7586,85 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				setAnnotating(false);
 				setSelected(void 0);
+				setErasing(void 0);
+				setStrokes([]);
 			}, [
 				item?.id,
 				item?.src,
 				request?.revision
 			]);
+			(0, react.useEffect)(() => {
+				const canvas = maskRef.current;
+				if (!erasing || canvas === null) return;
+				const context = canvas.getContext("2d");
+				context.clearRect(0, 0, canvas.width, canvas.height);
+				paintEraseStrokes(context, strokes, canvas.width, canvas.height, "rgba(255,59,48,.5)");
+			}, [erasing, strokes]);
+			const strokePoint = (event) => {
+				const bounds = maskRef.current?.getBoundingClientRect();
+				if (bounds === void 0) return void 0;
+				return {
+					x: clamp((event.clientX - bounds.left) / bounds.width, 0, 1),
+					y: clamp((event.clientY - bounds.top) / bounds.height, 0, 1)
+				};
+			};
+			const maskHandlers = {
+				onPointerDown: (event) => {
+					const point = strokePoint(event);
+					if (point === void 0) return;
+					event.stopPropagation();
+					event.currentTarget.setPointerCapture?.(event.pointerId);
+					drawingRef.current = true;
+					setStrokes((current) => [...current, {
+						size: brush / transformRef.current.zoom,
+						points: [point]
+					}]);
+				},
+				onPointerMove: (event) => {
+					if (!drawingRef.current) return;
+					const point = strokePoint(event);
+					if (point === void 0) return;
+					setStrokes((current) => current.length === 0 ? current : [...current.slice(0, -1), {
+						...current.at(-1),
+						points: [...current.at(-1).points, point]
+					}]);
+				},
+				onPointerUp: () => {
+					drawingRef.current = false;
+				},
+				onPointerCancel: () => {
+					drawingRef.current = false;
+				}
+			};
+			const startMask = (action) => {
+				resetGesture();
+				setAnnotating(false);
+				setStrokes([]);
+				setErasing(action);
+			};
+			const sendMask = async () => {
+				const image = imageRef.current;
+				if (!erasing || strokes.length === 0 || image === null || sending) return;
+				setSending(true);
+				try {
+					const canvas = document.createElement("canvas");
+					canvas.width = image.naturalWidth;
+					canvas.height = image.naturalHeight;
+					paintEraseMask(canvas.getContext("2d"), strokes, canvas.width, canvas.height);
+					const mask = await new Promise((resolve, reject) => canvas.toBlob((blob) => blob ? resolve(blob) : reject(/* @__PURE__ */ new Error("Mask")), "image/png"));
+					await erasing.onInvoke({
+						mask,
+						item,
+						src: item.src,
+						annotations: []
+					});
+					setErasing(void 0);
+					setStrokes([]);
+					if (erasing.closeOnSuccess) service.close();
+				} finally {
+					setSending(false);
+				}
+			};
 			const addAnnotation = (event) => {
 				if (!annotating || event.target.closest(".dcsiv-annotation")) return;
 				const bounds = surfaceRef.current?.getBoundingClientRect();
@@ -7452,7 +7796,8 @@ window.__ModuleLoader__.load({
 									item,
 									service,
 									revision: request.revision,
-									t
+									t,
+									onStartMask: startMask
 								}, `${request.revision}:${index}:${action.id}`))
 							]
 						})
@@ -7466,142 +7811,194 @@ window.__ModuleLoader__.load({
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "dcsiv-workspace",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("main", {
-							ref: stageRef,
-							className: "dcsiv-stage",
-							"data-dragging": dragging,
-							"data-annotating": annotating,
-							onClick: (event) => {
-								if (event.target === event.currentTarget && !annotating && transform.zoom === 1) service.close();
-							},
-							...!annotating ? pointerHandlers : {},
-							onDoubleClick: () => {
-								if (transform.zoom === 1) actual();
-								else fit();
-							},
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-									ref: surfaceRef,
-									className: "dcsiv-surface",
-									onClick: addAnnotation,
-									style: { transform: `translate3d(${transform.x}px,${transform.y}px,0) scale(${transform.zoom})` },
-									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
-										ref: imageRef,
-										className: "dcsiv-image",
-										src: item.src,
-										alt: item.name,
-										draggable: "false",
-										onLoad: () => {
-											measure();
-										}
-									}, `${request.revision}:${item.id}`)
-								}),
-								annotations.map((annotation, position) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dcsiv-annotation",
-									"data-x": annotation.x < .38 ? "right" : annotation.x > .62 ? "left" : "center",
-									"data-y": annotation.y < .28 ? "down" : "up",
-									style: annotationPosition(annotation),
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-										type: "button",
-										className: "dcsiv-pin",
-										"data-active": selected === annotation.id,
-										"aria-label": fill$1(t("imageAnnotation"), { value: position + 1 }),
-										onClick: (event) => {
-											event.stopPropagation();
-											const opening = selected !== annotation.id;
-											setSelected(opening ? annotation.id : void 0);
-											if (opening) setFocusNote(annotation.id);
-										},
-										children: position + 1
-									}), selected === annotation.id ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-										className: "dcsiv-inline-note",
-										"data-note-id": annotation.id,
-										onClick: (event) => event.stopPropagation(),
-										children: [
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-												className: "dcsiv-inline-index",
-												children: position + 1
-											}),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
-												value: annotation.note,
-												rows: 1,
-												"aria-label": fill$1(t("imageAnnotation"), { value: position + 1 }),
-												placeholder: t("imageAnnotationPlaceholder"),
-												onChange: (event) => {
-													const note = event.target.value;
-													setAnnotations((current) => current.map((entry) => entry.id === annotation.id ? {
-														...entry,
-														note
-													} : entry));
-												},
-												onKeyDown: (event) => {
-													if (event.key === "Enter" && !event.shiftKey || event.key === "Escape") {
-														event.preventDefault();
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("main", {
+								ref: stageRef,
+								className: "dcsiv-stage",
+								"data-dragging": dragging,
+								"data-annotating": annotating || erasing !== void 0,
+								onClick: (event) => {
+									if (event.target === event.currentTarget && !annotating && !erasing && transform.zoom === 1) service.close();
+								},
+								...!annotating && !erasing ? pointerHandlers : {},
+								onDoubleClick: () => {
+									if (transform.zoom === 1) actual();
+									else fit();
+								},
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										ref: surfaceRef,
+										className: "dcsiv-surface",
+										onClick: addAnnotation,
+										style: { transform: `translate3d(${transform.x}px,${transform.y}px,0) scale(${transform.zoom})` },
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
+											ref: imageRef,
+											className: "dcsiv-image",
+											src: item.src,
+											alt: item.name,
+											draggable: "false",
+											onLoad: () => {
+												measure();
+											}
+										}, `${request.revision}:${item.id}`), erasing ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("canvas", {
+											ref: maskRef,
+											className: "dcsiv-mask",
+											width: imageRef.current?.naturalWidth || 1,
+											height: imageRef.current?.naturalHeight || 1,
+											"aria-label": t("imageEraseHint"),
+											...maskHandlers
+										}) : null]
+									}),
+									annotations.map((annotation, position) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dcsiv-annotation",
+										"data-x": annotation.x < .38 ? "right" : annotation.x > .62 ? "left" : "center",
+										"data-y": annotation.y < .28 ? "down" : "up",
+										style: annotationPosition(annotation),
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "dcsiv-pin",
+											"data-active": selected === annotation.id,
+											"aria-label": fill$1(t("imageAnnotation"), { value: position + 1 }),
+											onClick: (event) => {
+												event.stopPropagation();
+												const opening = selected !== annotation.id;
+												setSelected(opening ? annotation.id : void 0);
+												if (opening) setFocusNote(annotation.id);
+											},
+											children: position + 1
+										}), selected === annotation.id ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dcsiv-inline-note",
+											"data-note-id": annotation.id,
+											onClick: (event) => event.stopPropagation(),
+											children: [
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													className: "dcsiv-inline-index",
+													children: position + 1
+												}),
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
+													value: annotation.note,
+													rows: 1,
+													"aria-label": fill$1(t("imageAnnotation"), { value: position + 1 }),
+													placeholder: t("imageAnnotationPlaceholder"),
+													onChange: (event) => {
+														const note = event.target.value;
+														setAnnotations((current) => current.map((entry) => entry.id === annotation.id ? {
+															...entry,
+															note
+														} : entry));
+													},
+													onKeyDown: (event) => {
+														if (event.key === "Enter" && !event.shiftKey || event.key === "Escape") {
+															event.preventDefault();
+															event.stopPropagation();
+															event.nativeEvent?.stopImmediatePropagation?.();
+															setSelected(void 0);
+														}
+													}
+												}),
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													type: "button",
+													className: "dcsiv-note-remove",
+													"aria-label": t("imageRemoveAnnotation"),
+													onClick: (event) => {
 														event.stopPropagation();
-														event.nativeEvent?.stopImmediatePropagation?.();
+														setAnnotations((current) => current.filter((entry) => entry.id !== annotation.id));
 														setSelected(void 0);
-													}
-												}
-											}),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-												type: "button",
-												className: "dcsiv-note-remove",
-												"aria-label": t("imageRemoveAnnotation"),
-												onClick: (event) => {
-													event.stopPropagation();
-													setAnnotations((current) => current.filter((entry) => entry.id !== annotation.id));
-													setSelected(void 0);
-												},
-												children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCloseOutline16, {})
-											})
-										]
-									}) : null]
-								}, annotation.id)),
-								showCounter ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+													},
+													children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCloseOutline16, {})
+												})
+											]
+										}) : null]
+									}, annotation.id)),
+									showCounter ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "dcsiv-button dcsiv-icon-only dcsiv-nav dcsiv-prev",
+											"aria-label": t("imagePrevious"),
+											onClick: (event) => {
+												event.stopPropagation();
+												setIndex((value) => (value - 1 + request.items.length) % request.items.length);
+											},
+											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronLeftOutline14, {})
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "dcsiv-button dcsiv-icon-only dcsiv-nav dcsiv-next",
+											"aria-label": t("imageNext"),
+											onClick: (event) => {
+												event.stopPropagation();
+												setIndex((value) => (value + 1) % request.items.length);
+											},
+											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronRightOutline14, {})
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+											className: "dcsiv-counter",
+											children: [
+												index + 1,
+												" / ",
+												request.items.length
+											]
+										})
+									] }) : annotating ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dcsiv-hint",
+										children: t("imageAnnotateHint")
+									}) : transform.zoom === 1 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dcsiv-hint",
+										children: t("imageZoomHint")
+									}) : null
+								]
+							}),
+							erasing ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dcsiv-erase-bar",
+								role: "toolbar",
+								"aria-label": t("imageErase"),
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("imageEraseHint") }),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [t("imageBrushSize"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+										type: "range",
+										min: "0.01",
+										max: "0.15",
+										step: "0.01",
+										value: brush,
+										onChange: (event) => setBrush(Number(event.target.value))
+									})] }),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
-										className: "dcsiv-button dcsiv-icon-only dcsiv-nav dcsiv-prev",
-										"aria-label": t("imagePrevious"),
-										onClick: (event) => {
-											event.stopPropagation();
-											setIndex((value) => (value - 1 + request.items.length) % request.items.length);
-										},
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronLeftOutline14, {})
+										className: "dcsiv-button",
+										disabled: strokes.length === 0 || sending,
+										onClick: () => setStrokes((current) => current.slice(0, -1)),
+										children: t("imageUndo")
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
-										className: "dcsiv-button dcsiv-icon-only dcsiv-nav dcsiv-next",
-										"aria-label": t("imageNext"),
-										onClick: (event) => {
-											event.stopPropagation();
-											setIndex((value) => (value + 1) % request.items.length);
+										className: "dcsiv-button",
+										disabled: sending,
+										onClick: () => {
+											setErasing(void 0);
+											setStrokes([]);
 										},
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronRightOutline14, {})
+										children: t("cancel")
 									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-										className: "dcsiv-counter",
-										children: [
-											index + 1,
-											" / ",
-											request.items.length
-										]
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dcsiv-button dcsiv-primary",
+										disabled: strokes.length === 0 || sending,
+										onClick: () => {
+											sendMask();
+										},
+										children: sending ? t("imageEditPreparing") : t("imageSend")
 									})
-								] }) : annotating ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "dcsiv-hint",
-									children: t("imageAnnotateHint")
-								}) : transform.zoom === 1 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "dcsiv-hint",
-									children: t("imageZoomHint")
-								}) : null
-							]
-						}), annotations.some((annotation) => annotation.note.trim() !== "") ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-							type: "button",
-							className: "dcsiv-copy-notes",
-							onClick: () => {
-								copyNotes();
-							},
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCopyOutline16, {}), copied ? t("imageCopied") : t("imageCopyNotes")]
-						}) : null]
+								]
+							}) : null,
+							annotations.some((annotation) => annotation.note.trim() !== "") ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+								type: "button",
+								className: "dcsiv-copy-notes",
+								onClick: () => {
+									copyNotes();
+								},
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCopyOutline16, {}), copied ? t("imageCopied") : t("imageCopyNotes")]
+							}) : null
+						]
 					})
 				]
 			});
@@ -7622,6 +8019,12 @@ window.__ModuleLoader__.load({
 				pendingLabel: typeof action.pendingLabel === "string" && action.pendingLabel !== "" ? action.pendingLabel : action.label,
 				errorLabel: typeof action.errorLabel === "string" && action.errorLabel !== "" ? action.errorLabel : action.label,
 				closeOnSuccess: action.closeOnSuccess === true,
+				kind: [
+					"tool",
+					"mask",
+					"choice"
+				].includes(action.kind) ? action.kind : "edit",
+				options: Array.isArray(action.options) ? action.options.filter((option) => typeof option?.value === "string" && typeof option?.label === "string") : [],
 				onInvoke: action.onInvoke
 			}];
 		}) : [];
@@ -8549,7 +8952,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.5.7";
+		const PACKAGE_VERSION = "2.5.8";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -12161,7 +12564,8 @@ window.__ModuleLoader__.load({
 				imageViewer.close();
 				liveOpen("sketch", document.activeElement, new File([blob], name || "image.png", { type: blob.type || "image/png" }));
 			};
-			const attachForEdit = (sessionId) => async (src, filename, draft, annotations = [], referenceName, sourceInDraft = false) => {
+			const attachForEdit = (sessionId) => async (src, filename, draft, annotations = [], referenceName, sourceInDraft = false, extraFiles) => {
+				const tool = Array.isArray(extraFiles);
 				if (!preference.getSnapshot().imageEditing) throw new Error("Image editing is disabled");
 				return withComposerSession(sessions, sessionId, async (actx) => {
 					if (conversation.input?.for === void 0) throw new Error("This DSH version does not provide the image composer bridge");
@@ -12173,14 +12577,15 @@ window.__ModuleLoader__.load({
 						const reference = await createAnnotatedImageReference(blob, annotations);
 						files.push(new File([reference], referenceName, { type: "image/png" }));
 					}
+					if (tool) files.push(...extraFiles);
 					lifetime.signal.throwIfAborted();
 					const input = conversation.input.for(actx);
 					if (!preference.getSnapshot().imageEditing) throw new Error("Image editing is disabled");
 					if (files.length) attachImageFiles(conversation, input, files, sessionId);
 					openComposerSession(sessions, ctx.get("uiWorkspace"), sessionId);
-					if (sourceInDraft && !annotations.length) return;
+					if (sourceInDraft && !annotations.length && !tool) return;
 					if (!input.state.getSnapshot().draft.trim()) input.setDraft(draft);
-					else if (annotations.length) if (!input.state.getSnapshot().occurrences?.length) appendImagePrompt(input, draft);
+					else if (annotations.length || tool) if (!input.state.getSnapshot().occurrences?.length) appendImagePrompt(input, draft);
 					else input.notify("info", draft);
 				});
 			};

package/lib/index.js

@@ -2049,7 +2049,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.5.7";
+const PACKAGE_VERSION = "2.5.8";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.5.7",
+  "version": "2.5.8",
   "description": "Use ChatGPT and Codex subscriptions in DeepSeek Harness with OAuth, quota, safe resets, web search, images, and Fast mode",
   "type": "module",
   "main": "./lib/index.js",