dsh-codex-subscription 2.0.0 → 2.0.1

package/README.en.md

@@ -42,7 +42,7 @@ DSH-Portable exposes the same standard plugin command, so the command above also
 | **Subscription models** | Sign in to ChatGPT and use Codex without an OpenAI API key or Codex CLI |
 | **Recoverable and diagnosable** | Sign-in state reconciles automatically; failed reads can be retried in place, while timeouts and stale account responses cannot overwrite current state; Settings can create a support report without credentials or account identifiers |
 | **Visible quota** | Keep backend-provided standard Codex, Spark, and other limits separate |
-| **Composer quota** | Choose a compact percentage, progress bar, or no inline quota display |
+| **Composer quota** | Choose a compact percentage, progress bar, Beta runway forecast, or no inline display |
 | **Safe quota reset** | See each reset credit separately and deliberately try one with a cooldown and acknowledgement |
 | **Subscription search** | Explicitly route search globally through DSH default search or the signed-in Codex subscription |
 | **Codex image generation and editing (Beta)** | Generate without references, or explicitly edit one selected image; preview, zoom, annotate regions, download the original, and get the original host path for new or edited images |
@@ -55,10 +55,10 @@ These capabilities reuse the same local ChatGPT sign-in. Subscription routing fa
 ## Product screen
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/context-settings-en.png" width="820" alt="Current Codex subscription settings in DeepSeek Harness with search, model-aware context, composer quota, and support diagnostics">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/context-settings.png" width="820" alt="2.0.0 account and preference settings: sign-in, quota display and alerts">
 </p>
 
-The screenshot illustrates the settings layout; available options can vary by DSH and plugin version.
+2.0.0 groups settings into Account & preferences and Advanced & diagnostics. Screenshots use the Chinese UI, with the account label hidden and scrollable content expanded for readability. [View advanced settings](docs/assets/settings-advanced-2.0.png).
 
 ## Prepare DSH
 
@@ -92,9 +92,9 @@ dsh --profile headless "Reply with only the word: ok"
 The official `npx @deepseek-ai/dsh web` command does not create a global `dsh` command. Keep the full `npx` prefix when installing the plugin:
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web add dsh-codex-subscription
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 --profile web --dump-config
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web add dsh-codex-subscription
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 --profile web --dump-config
 ```
 
 </details>
@@ -142,12 +142,13 @@ When the official model catalog exposes GPT-6 Astra, Standard preserves the cata
 ### Composer quota
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota-en.png" width="800" alt="Codex quota inside the composer">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota.png" width="800" alt="Codex quota inside the composer">
 </p>
 
-Choose Off, Percent, Progress bar, or Beta Runway in Settings. The compact display appears only for a selected Codex model. Runway is opt-in and estimates pace only from official remaining-percentage observations. It needs at least three samples; sustained high use usually produces a range in 5–10 minutes, while low use takes longer or reports a stable state. Non-sensitive observations from the last 24 hours are kept locally so calibration can continue after restart; a quota reset, account switch, or disabling the feature starts a new calibration period.
-The composer shows each returned quota window with its duration. When Plus returns both five-hour and weekly limits, both are visible. Spark keeps its independent quota. Accounts with only a weekly window still show only that window; the plugin does not invent a
-five-hour limit, Credits, or spending caps that the service did not return.
+Choose Off, Percent, Progress bar, or Beta Runway under Account & preferences. When a five-hour window exists, the composer shows that window only; the popover retains all windows. A weekly-only display omits the week label and uses compact durations such as `36% · ≈10h–12h`.
+
+Runway uses official observations from the recent two hours, including unchanged readings. Repeated boundary crossings can refine the rate interval when the assumptions hold; insufficient evidence or changing intensity falls back to a conservative estimate. It remains Beta and is not a guarantee of working time. History is bounded and stored locally; resets, long gaps or disabling the feature restart calibration.
+Spark keeps its independent quota. The plugin does not invent five-hour limits, Credits, or spending caps that the service did not return.
 
 ### Safe quota reset
 
@@ -173,6 +174,24 @@ A new image request does not silently include earlier images. GPT Image 2 can ta
 
 The screenshot above illustrates image viewing and on-image notes; available buttons can vary with the image and installed viewer version.
 
+### Sketch canvas (Beta)
+
+![Sketch canvas in the Chinese UI: aspect ratio, brushes, shapes, layers and zoom](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/sketch-canvas.png)
+
+Open Sketch from the composer button or `@Sketch`, or choose Open in sketch from an enhanced image preview. Attachment intake and removal use the native DSH component.
+
+Sketch supports local drafts, image layers, aspect ratios, brushes, lines and shapes, two erasers, undo/redo, pan/zoom and configurable shortcuts. Smoothing processes a completed stroke only after release. Up to 20 drafts stay in the current browser; attaching a sketch never sends it automatically. Its image panel manages only the current sketch, not the conversation library.
+
+**Sketch-to-image example**: draw, click Attach, describe the desired result in the composer, then send.
+
+| Original sketch | Actual plugin output |
+| --- | --- |
+| ![Mountains and cabin sketch](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/sketch-demo-source.png) | ![Watercolor mountain cabin generated from the sketch](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/sketch-demo-result.png) |
+
+The request preserves the mountain and cabin composition while creating a warm watercolor travel illustration with green peaks, an orange roof, a meadow stream and morning light, without the blue outlines. GPT-5.6-Luna made one image-tool call requesting low quality. Luna is the conversation model; the subscription backend determines the actual image model.
+
+Flare / Sunburst request overrides remain experimental: successful generation does not confirm which image engine or quality the subscription backend used.
+
 ### Composer speed
 
 With a supported Codex model selected, open the composer's model menu to choose Standard or Fast.
@@ -205,22 +224,22 @@ These operations preserve the DSH profile, other plugins, and saved sign-in.
 ### Update and verify
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web update dsh-codex-subscription
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 --profile web --dump-config
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web update dsh-codex-subscription
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 --profile web --dump-config
 ```
 
 ### Uninstall
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web remove dsh-codex-subscription
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web remove dsh-codex-subscription
 ```
 
 </details>
 
 ## Troubleshooting
 
-- **`dsh` is not recognized:** the official npm route does not create a global `dsh` command; use the complete `npx -y @deepseek-ai/dsh@0.1.2-rc.1 ...` command above;
+- **`dsh` is not recognized:** the official npm route does not create a global `dsh` command; use the complete `npx -y @deepseek-ai/dsh@0.1.5-rc.1 ...` command above;
 - **More than one DSH exists:** run the standard command from the intended DSH environment so that product selects the corresponding profile;
 - **Setup still fails:** confirm the command is running in the intended DSH environment. Do not delete the profile or change the system PATH to force an install.
 - **Need to report a problem:** generate a **Support diagnostics** report at the bottom of Settings, then open the [bug report form](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml). The report includes the OS/runtime, bounded sign-in phase, and safe request-failure categories, but excludes credentials, account identifiers, proxy addresses, raw responses, and full logs. Paste it into the required diagnostics field; never attach sign-in URLs, authorization codes, or browser callback addresses.

package/README.md

@@ -43,7 +43,7 @@ DSH-Portable 也提供相同的标准插件命令，因此同样使用上面的
 | **订阅模型直连** | 登录 ChatGPT 后直接使用 Codex，不需要 OpenAI API Key 或 Codex CLI |
 | **可恢复、可诊断** | 登录状态会自动对账；读取失败时可在原处重试，超时和旧账号响应不会覆盖当前状态；设置页可生成不含凭据和账号标识的支持报告 |
 | **额度可见** | 普通 Codex、Spark 等服务端实际返回的额度分开显示 |
-| **输入框额度** | 可选择紧凑百分比、进度条或完全关闭输入框额度显示 |
+| **输入框额度** | 可选择紧凑百分比、进度条、Beta 续航预测或关闭显示 |
 | **安全额度重置** | 每张重置卡单独显示，并通过冷静期和知情确认主动尝试重置 |
 | **订阅搜索** | 可将全部模型的搜索明确路由到 DSH 默认搜索或已登录的 Codex 订阅 |
 | **Codex 图片生成与编辑（Beta）** | 可无参考图全新生成，也可明确选择会话图片继续编辑；支持预览、缩放、区域备注、下载原图，并为新生成或编辑的图片提供 DSH 主机上的原图路径 |
@@ -56,10 +56,10 @@ DSH-Portable 也提供相同的标准插件命令，因此同样使用上面的
 ## 实际界面
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/context-settings.png" width="820" alt="当前 DeepSeek Harness Codex 订阅设置，包含搜索来源、模型感知上下文、输入框额度和支持诊断">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/context-settings.png" width="820" alt="2.0.0 账号与偏好：登录、额度、显示模式与提醒">
 </p>
 
-截图用于说明设置页布局；可用选项会随 DSH 与插件版本变化。
+2.0.0 设置分为“账号与偏好”和“高级与诊断”。截图已隐藏账号信息，并展开滚动内容便于阅读；[查看高级页](docs/assets/settings-advanced-2.0.png)。
 
 ## 准备 DSH
 
@@ -93,9 +93,9 @@ dsh --profile headless "只回复：ok"
 官方的 `npx @deepseek-ai/dsh web` 不会创建全局 `dsh` 命令，因此安装插件时也要保留完整的 `npx` 前缀：
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web add dsh-codex-subscription
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 --profile web --dump-config
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web add dsh-codex-subscription
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 --profile web --dump-config
 ```
 
 </details>
@@ -143,10 +143,12 @@ dsh --profile web --dump-config
 ### 输入框额度
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota.png" width="800" alt="中文 DSH 输入框内的 Codex 剩余额度进度条">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/composer-quota.png" width="800" alt="中文 DSH 输入框内的 Codex 剩余额度和紧凑续航预测">
 </p>
 
-可在设置中选择关闭、百分比、进度条或 Beta 续航预测；紧凑额度只在选择 Codex 模型时显示。续航预测仅在用户主动选择后，根据官方剩余百分比估算当前消耗速度。它至少需要 3 个样本；持续高消耗时通常 5–10 分钟即可给出范围，消耗较低时会延长观察或显示稳定。最近 24 小时的无敏感信息观测会保存在本机，重启后可以继续校准；额度重置、账号切换或关闭功能会开启新的校准周期。输入框分别显示服务端返回的各额度窗口，并标明窗口时长：Plus 返回 5 小时和每周额度时，两项都会显示。
+可在“账号与偏好”选择关闭、百分比、进度条或 Beta 续航预测。存在 5 小时额度时，输入框只显示短窗口；每周额度等完整信息留在悬浮详情。仅有周额度时省略“周”字，预测采用 `36% · ≈10h–12h` 这样的紧凑格式。
+
+续航预测根据最近两小时的官方读数估算，额度不变的采样同样参与计算。满足条件时利用连续跳格约束速度，读数不足或使用强度变化时会退回保守估计。范围不是实际可工作时间的保证，仍标记 Beta。历史在本机有限保存；重置、长时间离线或关闭预测会重新校准。
 Spark 使用独立额度。只返回每周额度的账号仍只显示每周，不会虚构 5 小时窗口、Credits 或消费上限。
 
 ### 安全使用额度重置
@@ -171,6 +173,24 @@ ChatGPT 返回可用重置卡时，设置页会把每张卡分别显示为紧凑
 
 上图展示图片查看与图上备注的基本交互；具体按钮会随图片和所安装的查看器版本变化。
 
+### 草图画板（Beta）
+
+![草图画板实机界面：画布比例、笔刷、形状、图层与缩放](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/sketch-canvas.png)
+
+点击输入框的草图按钮或输入 `@Sketch` 打开。图片预览中可选择“进入草图”；上传、粘贴和移除附件仍由 DSH 原生组件处理。
+
+草图支持多份本地草稿、图片图层、画布比例、三种笔刷、直线和形状、两种橡皮、撤销重做、拖动缩放与可配置快捷键。平滑仅在抬笔后处理整笔路径，不拖慢绘画光标。草稿最多 20 份，仅保存在当前浏览器；附加草图不会自动发送。左侧图片面板只管理当前草图的图片，不是会话图片库。
+
+**草图生成图片实测**：画好后点击“附加”，在输入框说明想要的效果，再发送。
+
+| 画板原草图 | 插件实际生成结果 |
+| --- | --- |
+| ![山峰与小屋草图](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/sketch-demo-source.png) | ![根据草图生成的水彩山间小屋](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/sketch-demo-result.png) |
+
+示例要求：保留山峰与小屋的构图，生成温暖的水彩旅行插画，青绿山峰、橙色屋顶、草地小溪与柔和晨光，不保留蓝色线条。此例通过 GPT-5.6-Luna 发起一次图片工具调用，请求低质量；Luna 是对话模型，实际出图型号由订阅后端决定。
+
+图片请求中的 Flare / Sunburst 型号选项仍属实验性功能。成功生成不代表订阅后端确认采用指定型号或质量；不会把请求参数当成实际返回型号。
+
 ### 输入框速度
 
 选择支持的 Codex 模型后，可在输入框的模型菜单中切换标准与高速。标准模式不增加图标，
@@ -203,22 +223,22 @@ dsh plugin --profile web remove dsh-codex-subscription
 ### 更新并检查
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web update dsh-codex-subscription
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 --profile web --dump-config
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web update dsh-codex-subscription
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web list dsh-codex-subscription --depth 0
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 --profile web --dump-config
 ```
 
 ### 卸载
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web remove dsh-codex-subscription
+npx -y @deepseek-ai/dsh@0.1.5-rc.1 plugin --profile web remove dsh-codex-subscription
 ```
 
 </details>
 
 ## 常见问题
 
-- **`dsh` 无法识别**：官方 npm 方式本来就不会创建全局 `dsh` 命令，请使用上面的完整 `npx -y @deepseek-ai/dsh@0.1.2-rc.1 ...` 命令；
+- **`dsh` 无法识别**：官方 npm 方式本来就不会创建全局 `dsh` 命令，请使用上面的完整 `npx -y @deepseek-ai/dsh@0.1.5-rc.1 ...` 命令；
 - **电脑上有多个 DSH**：请从目标 DSH 环境运行标准命令，由该产品自身选择对应 profile；
 - **安装仍然失败**：确认命令是在目标 DSH 环境中运行，不要删除 profile 或随意修改系统 PATH。
 - **需要提交问题**：在设置页底部生成“支持诊断”，然后打开[使用问题表单](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml)。报告包含系统/运行时、有限的登录阶段和安全的请求失败分类，但不含凭据、账号标识、代理地址、原始响应或完整日志；请粘贴到必填诊断栏，且不要附上登录链接、授权码或浏览器回调地址。

package/THIRD_PARTY_NOTICES.md

@@ -7,7 +7,7 @@ This project depends on software distributed under its own terms. The dependency
 | DeepSeek Harness packages | Plugin host, client slots, credential and LLM interfaces | MIT | https://github.com/deepseek-ai/deepseek-harness |
 | `@earendil-works/pi-ai` 0.82.1 | OpenAI Codex OAuth, model catalog, Responses transport, and WebSocket continuation | MIT | https://github.com/earendil-works/pi |
 | React | DSH settings component runtime | MIT | https://github.com/facebook/react |
-| dsh-image-viewer 0.1.0-beta.9 (3d121d3) | Adapted built-in image viewer, interaction state, and styles | MIT, Copyright (c) 2026 WSL043; full license included in LICENSE | https://github.com/WSL043/dsh-image-viewer |
+| dsh-image-viewer 0.1.0-beta.9 (3d121d3), with 0.1.0 (7f3be2c) zoom and annotation improvements | Adapted built-in image viewer, interaction state, and styles | MIT, Copyright (c) 2026 WSL043; full license included in LICENSE | https://github.com/WSL043/dsh-image-viewer |
 | Heroicons | Composer speed icon | MIT | https://github.com/tailwindlabs/heroicons |
 | `https-proxy-agent` 7.0.6 | HTTPS proxy transport for Codex OAuth token requests | MIT | https://github.com/TooTallNate/proxy-agents |
 | QuotaPin for Codex | Design basis for the opt-in local quota runway forecast | MIT | https://github.com/WSL043/QuotaPin-for-Codex |

package/compatibility.json

@@ -1,5 +1,11 @@
 {
-  "latestTested": "0.1.2-rc.1",
-  "supported": ["0.1.2-rc.1"],
-  "previews": ["0.1.5-alpha.1"]
+  "latestTested": "0.1.5-rc.1",
+  "supported": [
+    "0.1.2-rc.1",
+    "0.1.5-rc.1"
+  ],
+  "previews": [
+    "0.1.5-alpha.1",
+    "0.1.5-alpha.2"
+  ]
 }

package/lib/client.js

@@ -2311,12 +2311,17 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/image-composer.js
-		function attachImageFiles(conversation, input, files) {
-			const created = conversation.createDraftImages(files);
+		function attachImageFiles(conversation, input, files, sessionId) {
+			const modern = typeof conversation.createDrafts === "function";
+			const create = modern ? () => conversation.createDrafts(sessionId, files) : () => conversation.createDraftImages(files);
+			const release = modern ? (items) => conversation.releaseDraftAttachments(items) : (items) => conversation.releaseDraftImages(items);
+			const add = modern ? input.addAttachments : input.addImages;
+			if (typeof add !== "function" || modern && !sessionId) throw new Error("Image composer is unavailable");
+			const created = create();
 			try {
-				if (!input.addImages(created.map((item) => item.id))) throw new Error("The composer is busy");
+				if (!add.call(input, created.map((item) => item.id))) throw new Error("The composer is busy");
 			} catch (error) {
-				conversation.releaseDraftImages(created);
+				release(created);
 				throw error;
 			}
 			return created;
@@ -3335,10 +3340,10 @@ window.__ModuleLoader__.load({
 		const PIN_OUTER_STROKE = "#111827";
 		const PIN_INNER_STROKE = "#ffffff";
 		const finiteDimension = (value) => Number.isSafeInteger(value) && value > 0;
-		const clamp$1 = (value, min, max) => Math.min(max, Math.max(min, value));
+		const clamp$2 = (value, min, max) => Math.min(max, Math.max(min, value));
 		const clampCenter = (value, size, edge) => {
 			const margin = Math.min(edge, size / 2);
-			return clamp$1(value, margin, size - margin);
+			return clamp$2(value, margin, size - margin);
 		};
 		function getBitmapFactory(options) {
 			const factory = options?.createImageBitmap ?? options?.bitmapFactory ?? globalThis.createImageBitmap;
@@ -3470,6 +3475,182 @@ window.__ModuleLoader__.load({
 @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}}
 @media(prefers-reduced-motion:reduce){.dcsiv-surface{transition:none}}
 `;
+		//#endregion
+		//#region src/subscription-image-transform.js
+		const clamp$1 = (value, min, max) => Math.min(max, Math.max(min, value));
+		const fitted = () => ({
+			zoom: 1,
+			x: 0,
+			y: 0
+		});
+		function useImageTransform(identity) {
+			const [transform, setTransform] = (0, react.useState)(fitted);
+			const [dragging, setDragging] = (0, react.useState)(false);
+			const [pixelScale, setPixelScale] = (0, react.useState)(1);
+			const [geometry, setGeometry] = (0, react.useState)({
+				width: 0,
+				height: 0,
+				stageWidth: 0,
+				stageHeight: 0
+			});
+			const stageRef = (0, react.useRef)(null), surfaceRef = (0, react.useRef)(null), imageRef = (0, react.useRef)(null);
+			const transformRef = (0, react.useRef)(transform);
+			const pointers = (0, react.useRef)(/* @__PURE__ */ new Map()), gesture = (0, react.useRef)();
+			transformRef.current = transform;
+			const resetGesture = (0, react.useCallback)(() => {
+				pointers.current.clear();
+				gesture.current = void 0;
+				setDragging(false);
+			}, []);
+			const fit = (0, react.useCallback)(() => {
+				resetGesture();
+				setTransform(fitted());
+			}, [resetGesture]);
+			(0, react.useEffect)(() => {
+				fit();
+			}, [identity, fit]);
+			const actualScale = () => imageRef.current?.naturalWidth / Math.max(1, surfaceRef.current?.offsetWidth || 1) || 1;
+			const boundedPan = (0, react.useCallback)((zoom, x, y) => {
+				const stage = stageRef.current, surface = surfaceRef.current;
+				if (!stage || !surface || zoom <= 1) return {
+					x: 0,
+					y: 0
+				};
+				const limitX = Math.max(0, (surface.offsetWidth * zoom - stage.clientWidth) / 2);
+				const limitY = Math.max(0, (surface.offsetHeight * zoom - stage.clientHeight) / 2);
+				return {
+					x: clamp$1(x, -limitX, limitX),
+					y: clamp$1(y, -limitY, limitY)
+				};
+			}, []);
+			const setZoomAt = (0, react.useCallback)((zoom, clientX, clientY) => {
+				const stage = stageRef.current;
+				if (!stage) return;
+				setTransform((current) => {
+					const next = clamp$1(zoom, .5, Math.max(8, actualScale()));
+					const box = stage.getBoundingClientRect();
+					const px = clientX - box.left - box.width / 2, py = clientY - box.top - box.height / 2;
+					const ratio = next / current.zoom;
+					return {
+						zoom: next,
+						...boundedPan(next, px - (px - current.x) * ratio, py - (py - current.y) * ratio)
+					};
+				});
+			}, [boundedPan]);
+			const actual = (0, react.useCallback)(() => {
+				if (!imageRef.current?.naturalWidth) return;
+				resetGesture();
+				setTransform({
+					zoom: actualScale(),
+					x: 0,
+					y: 0
+				});
+			}, [resetGesture]);
+			const measure = (0, react.useCallback)(() => {
+				const next = {
+					width: surfaceRef.current?.offsetWidth ?? 0,
+					height: surfaceRef.current?.offsetHeight ?? 0,
+					stageWidth: stageRef.current?.clientWidth ?? 0,
+					stageHeight: stageRef.current?.clientHeight ?? 0
+				};
+				setGeometry((current) => Object.keys(next).every((key) => current[key] === next[key]) ? current : next);
+				setPixelScale(1 / actualScale());
+				setTransform((current) => ({
+					...current,
+					...boundedPan(current.zoom, current.x, current.y)
+				}));
+			}, [boundedPan]);
+			(0, react.useEffect)(() => {
+				if (!stageRef.current || !surfaceRef.current) return;
+				const observer = new ResizeObserver(measure);
+				observer.observe(stageRef.current);
+				observer.observe(surfaceRef.current);
+				measure();
+				return () => observer.disconnect();
+			}, [identity, measure]);
+			(0, react.useEffect)(() => {
+				const stage = stageRef.current;
+				if (!stage) return;
+				const wheel = (event) => {
+					event.preventDefault();
+					const delta = event.deltaY * (event.deltaMode === 1 ? 16 : event.deltaMode === 2 ? stage.clientHeight : 1);
+					setZoomAt(transformRef.current.zoom * Math.exp(-delta * .0015), event.clientX, event.clientY);
+				};
+				stage.addEventListener("wheel", wheel, { passive: false });
+				return () => stage.removeEventListener("wheel", wheel);
+			}, [identity, setZoomAt]);
+			const onPointerDown = (event) => {
+				if (event.button !== 0 || event.target.closest("button,a,input,textarea,select")) return;
+				const current = transformRef.current;
+				if (event.pointerType === "mouse" && current.zoom <= 1) return;
+				event.currentTarget.setPointerCapture(event.pointerId);
+				pointers.current.set(event.pointerId, {
+					x: event.clientX,
+					y: event.clientY
+				});
+				if (pointers.current.size === 2) {
+					const [a, b] = [...pointers.current.values()];
+					gesture.current = {
+						kind: "pinch",
+						distance: Math.hypot(a.x - b.x, a.y - b.y),
+						transform: current
+					};
+				} else gesture.current = {
+					kind: "pan",
+					x: event.clientX,
+					y: event.clientY,
+					transform: current
+				};
+				setDragging(true);
+			};
+			const onPointerMove = (event) => {
+				if (!pointers.current.has(event.pointerId)) return;
+				pointers.current.set(event.pointerId, {
+					x: event.clientX,
+					y: event.clientY
+				});
+				const start = gesture.current;
+				if (start?.kind === "pinch" && pointers.current.size >= 2) {
+					const [a, b] = [...pointers.current.values()];
+					setZoomAt(start.transform.zoom * Math.hypot(a.x - b.x, a.y - b.y) / Math.max(1, start.distance), (a.x + b.x) / 2, (a.y + b.y) / 2);
+				} else if (start?.kind === "pan") setTransform({
+					zoom: start.transform.zoom,
+					...boundedPan(start.transform.zoom, start.transform.x + event.clientX - start.x, start.transform.y + event.clientY - start.y)
+				});
+			};
+			const endPointer = (event) => {
+				pointers.current.delete(event.pointerId);
+				const remaining = [...pointers.current.values()][0];
+				if (remaining) gesture.current = {
+					kind: "pan",
+					...remaining,
+					transform: transformRef.current
+				};
+				else resetGesture();
+			};
+			return {
+				transform,
+				transformRef,
+				dragging,
+				pixelScale,
+				geometry,
+				stageRef,
+				surfaceRef,
+				imageRef,
+				fit,
+				actual,
+				measure,
+				setZoomAt,
+				resetGesture,
+				pointerHandlers: {
+					onPointerDown,
+					onPointerMove,
+					onPointerUp: endPointer,
+					onPointerCancel: endPointer,
+					onLostPointerCapture: endPointer
+				}
+			};
+		}
 		//#endregion
 		//#region src/subscription-image-viewer.jsx
 		const fill$1 = (value, variables) => Object.entries(variables).reduce((text, [key, replacement]) => text.replaceAll(`{${key}}`, String(replacement)), value);
@@ -3482,8 +3663,15 @@ 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, t }) {
+		function ViewerAction({ action, annotations, item, service, revision, t }) {
 			const [state, setState] = (0, react.useState)("idle");
+			const active = (0, react.useRef)(true);
+			(0, react.useEffect)(() => {
+				active.current = true;
+				return () => {
+					active.current = false;
+				};
+			}, []);
 			const invoke = async () => {
 				if (state === "pending") return;
 				setState("pending");
@@ -3493,10 +3681,11 @@ window.__ModuleLoader__.load({
 						item,
 						src: item.src
 					});
+					if (!active.current || service.getSnapshot()?.revision !== revision) return;
 					setState("idle");
 					if (action.closeOnSuccess) service.close();
 				} catch {
-					setState("failed");
+					if (active.current) setState("failed");
 				}
 			};
 			const label = state === "pending" ? action.pendingLabel : state === "failed" ? action.errorLabel : action.label;
@@ -3571,13 +3760,15 @@ window.__ModuleLoader__.load({
 		}
 		function SubscriptionImageViewerOverlay({ service, t }) {
 			const request = (0, react.useSyncExternalStore)(service.subscribe, service.getSnapshot);
-			const [index, setIndex] = (0, react.useState)(0);
-			const [transform, setTransform] = (0, react.useState)({
-				zoom: 1,
-				x: 0,
-				y: 0
+			const [cursor, setCursor] = (0, react.useState)({
+				revision: 0,
+				index: 0
 			});
-			const [dragging, setDragging] = (0, react.useState)(false);
+			const index = cursor.revision === request?.revision ? cursor.index : request?.index ?? 0;
+			const setIndex = (update) => setCursor((current) => ({
+				revision: request.revision,
+				index: typeof update === "function" ? update(current.revision === request.revision ? current.index : request.index) : update
+			}));
 			const [annotating, setAnnotating] = (0, react.useState)(false);
 			const [annotationsByImage, setAnnotationsByImage] = (0, react.useState)(service.getAnnotationsSnapshot);
 			const annotationsByImageRef = (0, react.useRef)(annotationsByImage);
@@ -3585,28 +3776,15 @@ window.__ModuleLoader__.load({
 			const [focusNote, setFocusNote] = (0, react.useState)();
 			const [copied, setCopied] = (0, react.useState)(false);
 			const rootRef = (0, react.useRef)(null);
-			const stageRef = (0, react.useRef)(null);
-			const surfaceRef = (0, react.useRef)(null);
-			const imageRef = (0, react.useRef)(null);
-			const pointersRef = (0, react.useRef)(/* @__PURE__ */ new Map());
-			const gestureRef = (0, react.useRef)();
-			const transformRef = (0, react.useRef)(transform);
-			transformRef.current = transform;
 			annotationsByImageRef.current = annotationsByImage;
 			(0, react.useEffect)(() => {
 				if (request === void 0) return;
-				setIndex(request.index);
-				setTransform({
-					zoom: 1,
-					x: 0,
-					y: 0
-				});
-				setDragging(false);
 				setAnnotating(false);
 				setSelected(void 0);
 				setCopied(false);
 			}, [request?.revision]);
 			const item = request?.items[index];
+			const { transform, transformRef, dragging, pixelScale, geometry, stageRef, surfaceRef, imageRef, fit, actual, measure, setZoomAt, resetGesture, pointerHandlers } = useImageTransform(`${request?.revision}:${item?.id}:${item?.src}`);
 			const annotations = item === void 0 ? [] : annotationsByImage[item.id] ?? [];
 			const setAnnotations = (0, react.useCallback)((update) => {
 				if (item === void 0) return;
@@ -3620,53 +3798,6 @@ window.__ModuleLoader__.load({
 				service.setAnnotations(item.id, next);
 				setAnnotationsByImage(snapshot);
 			}, [item?.id, service]);
-			const boundedPan = (0, react.useCallback)((zoom, x, y) => {
-				const stage = stageRef.current;
-				const surface = surfaceRef.current;
-				if (stage === null || surface === null || zoom <= 1) return {
-					x: 0,
-					y: 0
-				};
-				const limitX = Math.max(0, (surface.offsetWidth * zoom - stage.clientWidth) / 2) + 28;
-				const limitY = Math.max(0, (surface.offsetHeight * zoom - stage.clientHeight) / 2) + 28;
-				return {
-					x: clamp(x, -limitX, limitX),
-					y: clamp(y, -limitY, limitY)
-				};
-			}, []);
-			const setZoomAt = (0, react.useCallback)((nextZoom, clientX, clientY) => {
-				const stage = stageRef.current;
-				if (stage === null) return;
-				setTransform((current) => {
-					const next = clamp(nextZoom, .5, 8);
-					const box = stage.getBoundingClientRect();
-					const px = clientX - box.left - box.width / 2;
-					const py = clientY - box.top - box.height / 2;
-					const ratio = next / current.zoom;
-					return {
-						zoom: next,
-						...boundedPan(next, px - (px - current.x) * ratio, py - (py - current.y) * ratio)
-					};
-				});
-			}, [boundedPan]);
-			const fit = (0, react.useCallback)(() => {
-				setTransform({
-					zoom: 1,
-					x: 0,
-					y: 0
-				});
-			}, []);
-			const actual = (0, react.useCallback)(() => {
-				const image = imageRef.current;
-				const surface = surfaceRef.current;
-				if (image === null || surface === null || image.naturalWidth === 0) return;
-				const zoom = clamp(image.naturalWidth / Math.max(1, surface.offsetWidth), 1, 8);
-				setTransform({
-					zoom,
-					x: 0,
-					y: 0
-				});
-			}, []);
 			(0, react.useEffect)(() => {
 				if (request === void 0) return void 0;
 				const previousOverflow = document.body.style.overflow;
@@ -3734,77 +3865,13 @@ window.__ModuleLoader__.load({
 				annotations.length
 			]);
 			(0, react.useEffect)(() => {
-				setTransform({
-					zoom: 1,
-					x: 0,
-					y: 0
-				});
-				setDragging(false);
 				setAnnotating(false);
 				setSelected(void 0);
-			}, [item?.id]);
-			const onWheel = (0, react.useCallback)((event) => {
-				event.preventDefault();
-				setZoomAt(transformRef.current.zoom * Math.exp(-event.deltaY * .0015), event.clientX, event.clientY);
-			}, [setZoomAt]);
-			(0, react.useEffect)(() => {
-				const stage = stageRef.current;
-				if (stage === null || request === void 0) return void 0;
-				stage.addEventListener("wheel", onWheel, { passive: false });
-				return () => stage.removeEventListener("wheel", onWheel);
-			}, [onWheel, request]);
-			const onPointerDown = (event) => {
-				const target = event.target;
-				if (event.button !== 0 || annotating || target instanceof Element && target.closest("button,textarea,input,a,select,[contenteditable=true]") !== null) return;
-				pointersRef.current.set(event.pointerId, {
-					x: event.clientX,
-					y: event.clientY
-				});
-				if (pointersRef.current.size === 2) {
-					event.currentTarget.setPointerCapture(event.pointerId);
-					const [a, b] = [...pointersRef.current.values()];
-					gestureRef.current = {
-						kind: "pinch",
-						distance: Math.hypot(a.x - b.x, a.y - b.y),
-						transform
-					};
-				} else if (!annotating && transform.zoom > 1) {
-					event.currentTarget.setPointerCapture(event.pointerId);
-					gestureRef.current = {
-						kind: "pan",
-						x: event.clientX,
-						y: event.clientY,
-						transform
-					};
-					setDragging(true);
-				}
-			};
-			const onPointerMove = (event) => {
-				if (!pointersRef.current.has(event.pointerId)) return;
-				pointersRef.current.set(event.pointerId, {
-					x: event.clientX,
-					y: event.clientY
-				});
-				const gesture = gestureRef.current;
-				if (gesture?.kind === "pinch" && pointersRef.current.size >= 2) {
-					const [a, b] = [...pointersRef.current.values()];
-					const distance = Math.max(1, Math.hypot(a.x - b.x, a.y - b.y));
-					setZoomAt(gesture.transform.zoom * distance / Math.max(1, gesture.distance), (a.x + b.x) / 2, (a.y + b.y) / 2);
-				} else if (gesture?.kind === "pan") {
-					const pan = boundedPan(gesture.transform.zoom, gesture.transform.x + event.clientX - gesture.x, gesture.transform.y + event.clientY - gesture.y);
-					setTransform({
-						zoom: gesture.transform.zoom,
-						...pan
-					});
-				}
-			};
-			const endPointer = (event) => {
-				pointersRef.current.delete(event.pointerId);
-				if (pointersRef.current.size === 0) {
-					gestureRef.current = void 0;
-					setDragging(false);
-				}
-			};
+			}, [
+				item?.id,
+				item?.src,
+				request?.revision
+			]);
 			const addAnnotation = (event) => {
 				if (!annotating || event.target.closest(".dcsiv-annotation")) return;
 				const bounds = surfaceRef.current?.getBoundingClientRect();
@@ -3836,6 +3903,15 @@ window.__ModuleLoader__.load({
 			if (request === void 0 || item === void 0) return null;
 			const meta = [item.width && item.height ? `${item.width} × ${item.height}` : void 0, bytesLabel(item.bytes)].filter(Boolean).join(" · ");
 			const showCounter = request.items.length > 1;
+			const annotationPosition = (annotation) => {
+				const ratio = globalThis.devicePixelRatio || 1;
+				const align = (value) => Math.round(value * ratio) / ratio;
+				return {
+					left: align(geometry.stageWidth / 2 + transform.x + (annotation.x - .5) * geometry.width * transform.zoom - 12),
+					top: align(geometry.stageHeight / 2 + transform.y + (annotation.y - .5) * geometry.height * transform.zoom - 12),
+					visibility: geometry.width > 0 ? "visible" : "hidden"
+				};
+			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				ref: rootRef,
 				className: "dcsiv-root",
@@ -3861,7 +3937,10 @@ window.__ModuleLoader__.load({
 									"data-active": annotating,
 									"aria-label": annotating ? t("imageAnnotateCancel") : t("imageAnnotate"),
 									"aria-pressed": annotating,
-									onClick: () => setAnnotating((value) => !value),
+									onClick: () => {
+										resetGesture();
+										setAnnotating((value) => !value);
+									},
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 										className: "dcsiv-label",
 										children: annotating ? t("imageAnnotateCancel") : t("imageAnnotate")
@@ -3903,7 +3982,7 @@ window.__ModuleLoader__.load({
 								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 									className: "dcsiv-zoom",
-									children: [Math.round(transform.zoom * 100), "%"]
+									children: [Math.round(transform.zoom * pixelScale * 100), "%"]
 								}),
 								item.download === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("a", {
 									className: "dcsiv-download",
@@ -3923,8 +4002,9 @@ window.__ModuleLoader__.load({
 									annotations,
 									item,
 									service,
+									revision: request.revision,
 									t
-								}, action.id))
+								}, `${request.revision}:${index}:${action.id}`))
 							]
 						})
 					}),
@@ -3945,34 +4025,33 @@ window.__ModuleLoader__.load({
 							onClick: (event) => {
 								if (event.target === event.currentTarget && !annotating && transform.zoom === 1) service.close();
 							},
-							onPointerDown,
-							onPointerMove,
-							onPointerUp: endPointer,
-							onPointerCancel: endPointer,
+							...!annotating ? 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"
-								}), annotations.map((annotation, position) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							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: {
-										left: `${annotation.x * 100}%`,
-										top: `${annotation.y * 100}%`,
-										transform: `translate(-50%,-50%) scale(${1 / transform.zoom})`
-									},
+									style: annotationPosition(annotation),
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
 										className: "dcsiv-pin",
@@ -4028,43 +4107,44 @@ window.__ModuleLoader__.load({
 											})
 										]
 									}) : 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)(_deepseek_ai_dsh_client_ui_primitives.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)(_deepseek_ai_dsh_client_ui_primitives.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]
+								}, 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)(_deepseek_ai_dsh_client_ui_primitives.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)(_deepseek_ai_dsh_client_ui_primitives.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
+							]
 						}), annotations.some((annotation) => annotation.note.trim() !== "") ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 							type: "button",
 							className: "dcsiv-copy-notes",
@@ -4100,7 +4180,7 @@ window.__ModuleLoader__.load({
 			const items = (Array.isArray(request?.items) ? request.items : []).flatMap((item, position) => {
 				if (typeof item?.src !== "string" || item.src === "") return [];
 				return [{
-					id: typeof item.id === "string" && item.id !== "" ? item.id : `image-${position + 1}`,
+					id: typeof item.id === "string" && item.id !== "" ? item.id : item.src,
 					src: item.src,
 					name: typeof item.name === "string" && item.name !== "" ? item.name : `Image ${position + 1}`,
 					width: boundedNumber(item.width, void 0),
@@ -4849,7 +4929,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.0.0";
+		const PACKAGE_VERSION = "2.0.1";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -7193,7 +7273,7 @@ window.__ModuleLoader__.load({
 			})), "codex-subscription: Image trigger"));
 			const sessionInput = (sessionId) => {
 				const actx = sessions.scope(sessionId);
-				if (!actx || typeof conversation.createDraftImages !== "function" || !conversation.input?.for) throw new Error("Image composer is unavailable");
+				if (!actx || !conversation.input?.for) throw new Error("Image composer is unavailable");
 				return conversation.input.for(actx);
 			};
 			const openSketchImage = (sessionId) => async (src, name) => {
@@ -7209,7 +7289,7 @@ window.__ModuleLoader__.load({
 			const attachForEdit = (sessionId) => async (src, filename, draft, annotations = [], referenceName, sourceInDraft = false) => {
 				if (!preference.getSnapshot().imageEditing) throw new Error("Image editing is disabled");
 				const actx = sessions.scope(sessionId);
-				if (actx === void 0 || typeof conversation.createDraftImages !== "function" || conversation.input?.for === void 0) throw new Error("This DSH version does not provide the image composer bridge");
+				if (actx === void 0 || conversation.input?.for === void 0) throw new Error("This DSH version does not provide the image composer bridge");
 				const response = await fetch(src);
 				if (!response.ok) throw new Error("Could not read generated image");
 				const blob = await response.blob();
@@ -7220,7 +7300,7 @@ window.__ModuleLoader__.load({
 				}
 				const input = conversation.input.for(actx);
 				if (!preference.getSnapshot().imageEditing) throw new Error("Image editing is disabled");
-				if (files.length) attachImageFiles(conversation, input, files);
+				if (files.length) attachImageFiles(conversation, input, files, sessionId);
 				sessions.open(sessionId);
 				if (sourceInDraft && !annotations.length) return;
 				if (!input.state.getSnapshot().draft.trim()) input.setDraft(draft);
@@ -7279,7 +7359,7 @@ window.__ModuleLoader__.load({
 					attachSketch: (blob) => {
 						const current = preference.getSnapshot();
 						if (!current.imageSketch || !current.imageEditing) throw new Error("Sketch editing is disabled");
-						attachImageFiles(conversation, sessionInput(sessionId), [new File([blob], "sketch-reference.png", { type: "image/png" })]);
+						attachImageFiles(conversation, sessionInput(sessionId), [new File([blob], "sketch-reference.png", { type: "image/png" })], sessionId);
 					}
 				})
 			}, ImageWorkspace));

package/lib/index.js

@@ -1615,7 +1615,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.0.0";
+const PACKAGE_VERSION = "2.0.1";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -3882,6 +3882,7 @@ function apply(ctx) {
 		displayName: "ChatGPT subscription",
 		piProvider: provider,
 		configuredMaxTokens: /* @__PURE__ */ new Map(),
+		modelErrors: /* @__PURE__ */ new Map(),
 		streamIdleTimeoutMs: 600 * 1e3,
 		maxRequestImageBytes: MAX_REQUEST_IMAGE_BYTES,
 		requestImagePixelBudget: REQUEST_IMAGE_PIXEL_BUDGET,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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",
@@ -15,7 +15,6 @@
     "cordis.patch.yml",
     "README.md",
     "README.en.md",
-    "README.zh-CN.md",
     "DIRECTORY.md",
     "compatibility.json",
     "LICENSE",
@@ -75,21 +74,21 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "4.0.1 || 4.0.2",
-    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1 || 0.1.5-alpha.1",
-    "@deepseek-ai/dsh-web": "0.1.2-rc.1 || 0.1.5-alpha.1",
+    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
+    "@deepseek-ai/dsh-web": "0.1.2-rc.1 || 0.1.5-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2",
     "@deepseek-ai/schemastery": "3.18.1 || ^3.18.2",
     "@earendil-works/pi-ai": "0.82.1",
     "react": "^18.2.0",
@@ -97,23 +96,23 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-web": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-remotes": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-credentials": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-settings": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-tools": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-web": "0.1.5-rc.1",
     "@deepseek-ai/schemastery": "3.18.2",
     "@earendil-works/pi-ai": "0.82.1",
     "@heroicons/react": "2.2.0",

package/README.zh-CN.md

@@ -1,16 +0,0 @@
-# DSH Codex Subscription
-
-本项目现在默认使用简体中文 README：
-
-- [打开完整中文说明](README.md)
-- [Open the complete English README](README.en.md)
-
-旧的 `README.zh-CN.md` 地址会继续保留，已有书签和外部链接无需修改。
-
-安装：
-
-```powershell
-dsh plugin --profile web add dsh-codex-subscription
-```
-
-遇到问题请使用[使用问题表单](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml)。