dsh-codex-subscription 1.6.0 → 1.7.1

package/AGENTS.md

@@ -6,7 +6,7 @@ Use this guide when a user asks an Agent to install, update, verify, or remove
 ## Safety
 
 - Confirm the target DSH installation and profile. Use `web` only when it is the user's target.
-- Use the exact `1.6.0` package below; do not install a moving branch.
+- Use the exact `1.7.1` package below; do not install a moving branch.
 - Never print OAuth credentials, account IDs, authorization callbacks, or credential-store contents.
 - Preserve the DSH profile, unrelated plugins, sessions, and saved sign-in.
 - Do not start, stop, or restart DSH without explicit permission.
@@ -34,13 +34,13 @@ For an official DSH installation run through npm, keep the complete `npx` prefix
 run command does not create a global `dsh` command:
 
 ```sh
-npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.6.0
+npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.7.1
 ```
 
 With an existing global `dsh` command:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@1.6.0
+dsh plugin --profile web add dsh-codex-subscription@1.7.1
 ```
 
 Use the same `add` command to update or repair. This is the complete package-changing operation.
@@ -58,7 +58,7 @@ dsh --profile web --dump-config
 
 For the official npm route, run the same checks with `npx -y @deepseek-ai/dsh@0.1.1-rc.2` in place of `dsh`.
 
-1. `dsh-codex-subscription` version `1.6.0` appears exactly once.
+1. `dsh-codex-subscription` version `1.7.1` appears exactly once.
 2. `codex-subscription` appears exactly once in the composed config.
 3. No unrelated plugin or profile was changed and DSH was not restarted.
 

package/README.md

@@ -49,7 +49,7 @@ DSH-Portable exposes the same standard plugin command, so the command above also
 | **Composer quota** | Choose a compact percentage, progress bar, or no inline quota display |
 | **Safe quota reset** | See the next expiry and deliberately try a reset with a cooldown and acknowledgement |
 | **Subscription search** | Explicitly choose DSH default search or Codex subscription search |
-| **Codex image generation and editing (Beta)** | Generate without references, or explicitly edit selected conversation images; preview, zoom, and download the original |
+| **Codex image generation and editing (Beta)** | Generate without references, or explicitly edit one selected image; preview, zoom, annotate regions, download the original, and continue in the same composer |
 | **Fast mode** | Switch between Standard and Fast directly in the composer |
 
 These capabilities reuse the same local ChatGPT sign-in. Subscription routing failures stay visible and never silently switch to another paid route.
@@ -169,11 +169,15 @@ clicks are single-flight, and an uncertain network result is never retried autom
 
 ### Image generation and editing (Beta)
 
-Generated images open in a DSH-native preview with zoom, fit, dimensions, and **Download original**. A new image request
-does not silently include earlier images. To refine a result, explicitly ask to edit that image in the same conversation;
-the plugin sends only the selected durable image references, up to five. GPT Image 2 can take longer than a normal text
+Generated images open in a DSH-native preview with zoom, fit, dimensions, **Download original**, and numbered region notes.
+**Continue editing in composer** attaches exactly the image you opened and writes the region notes into the draft without
+sending it. A new image request does not silently include earlier images. GPT Image 2 can take longer than a normal text
 turn, and detailed text, exact composition, or repeated-character consistency may still need another pass.
 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/image-preview-annotations-en.png" width="900" alt="DSH-native generated-image preview with zoom, original download, and numbered region annotations">
+</p>
+
 ### Composer speed
 
 With a supported Codex model selected, open the composer's model menu to choose Standard or Fast.
@@ -210,7 +214,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 - **`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.1-rc.2 ...` command above;
 - **More than one DSH exists:** run the standard command from the intended DSH environment. For an Agent, specify the target or pass `-DshPath` explicitly;
 - **Setup still fails:** send the Agent guide above to an Agent. 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 form collects exact DSH/plugin versions and reproduction steps. The generated report excludes credentials and account identifiers; still do not attach sign-in URLs, authorization codes, or browser callback addresses.
+- **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 and a bounded sign-in phase, but excludes credentials, account identifiers, raw errors, and full logs. Paste it into the required diagnostics field; never attach sign-in URLs, authorization codes, or browser callback addresses.
 
 The ChatGPT Codex backend and DSH can change independently. This community project is not affiliated with or endorsed by DeepSeek or OpenAI.
 

package/README.zh-CN.md

@@ -166,9 +166,13 @@ ChatGPT 返回可用重置卡时，设置页会用紧凑的一行显示数量和
 
 ### 图片生成与编辑（Beta）
 
-生成的图片会在 DSH 原生风格的查看器中打开，支持缩放、适合窗口、查看尺寸和下载原图。全新生成不会静默带入历史图片；
-需要继续修改时，要在同一会话明确说明编辑这张图，插件只会发送明确选中的持久图片引用，最多 5 张。GPT Image 2 的耗时可能明显长于
-文本回复，复杂文字、精确构图和连续角色一致性也可能需要再次调整。
+生成图片会在 DSH 原生查看器中打开，可缩放、适合窗口、查看尺寸、下载原图，并对具体部位添加编号标注。
+点击“在输入框中继续编辑”时，只会附上当前打开的这一张图，并把部位标注写入草稿，不会自动发送。
+新的图片请求不会静默带入历史图片。GPT Image 2 的耗时可能明显长于文本回复，复杂文字、精确构图和连续角色一致性也可能需要再次调整。
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/image-preview-annotations.png" width="900" alt="DSH 原生图片预览中的缩放、原图下载与编号部位标注">
+</p>
 
 ### 输入框速度
 
@@ -206,7 +210,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 - **`dsh` 无法识别**：官方 npm 方式本来就不会创建全局 `dsh` 命令，请使用上面的完整 `npx -y @deepseek-ai/dsh@0.1.1-rc.2 ...` 命令；
 - **电脑上有多个 DSH**：请在目标 DSH 环境中运行标准命令；交给 Agent 时明确目标，或传入 `-DshPath`；
 - **安装仍然失败**：把上面的 Agent 文档链接发给 Agent，不要删除 profile 或随意修改系统 PATH。
-- **需要提交问题**：在设置页底部生成“支持诊断”，然后打开[使用问题表单](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml)。表单会收集准确的 DSH/插件版本和复现步骤；报告不含凭据和账号标识，仍不要附上登录链接、授权码或浏览器回调地址。
+- **需要提交问题**：在设置页底部生成“支持诊断”，然后打开[使用问题表单](https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml)。报告包含系统/运行时和有限的登录阶段，但不含凭据、账号标识、原始错误或完整日志；请粘贴到必填诊断栏，且不要附上登录链接、授权码或浏览器回调地址。
 
 ## 边界与支持
 

package/lib/client.js

@@ -28,6 +28,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		let react = require("react");
 		react = __toESM(react, 1);
+		let react_dom = require("react-dom");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		//#region node_modules/.pnpm/@heroicons+react@2.2.0_react@18.3.1/node_modules/@heroicons/react/16/solid/esm/BoltIcon.js
@@ -91,6 +92,19 @@ window.__ModuleLoader__.load({
 		async function readLoginProgress({ flow, readFlow, readAccount }) {
 			try {
 				const nextFlow = await readFlow();
+				if (nextFlow.phase === "failed") try {
+					const account = await readAccount();
+					if (account?.authenticated === true) return {
+						flow: {
+							id: flow.id,
+							method: flow.method,
+							phase: "authenticated",
+							authenticated: true
+						},
+						account,
+						recovered: true
+					};
+				} catch {}
 				if (nextFlow.phase !== "authenticated") return { flow: nextFlow };
 				return {
 					flow: nextFlow,
@@ -250,8 +264,17 @@ window.__ModuleLoader__.load({
 			imageZoomOut: "缩小",
 			imageZoomIn: "放大",
 			imageFit: "适合窗口",
-			imageRefineHint: "要修改这张图，请在当前会话明确说“编辑这张图片……”；插件只会把这张图作为参考。",
-			imageNewHint: "要重新生成，请直接描述一张新图片；不会自动带入历史图片。"
+			imageAnnotate: "标注部位",
+			imageAnnotateHint: "点击图片添加编号标注",
+			imageAnnotation: "标注 {value}",
+			imageAnnotationPlaceholder: "描述这个部位要修改什么",
+			imageEditPrompt: "描述你想怎样修改这张图",
+			imageEditDefault: "编辑这张图片。",
+			imageRegionNotes: "部位修改：",
+			imageEdit: "在输入框中继续编辑",
+			imageEditPreparing: "正在添加到输入框…",
+			imageEditFailed: "无法把图片添加到输入框。",
+			imageRemoveAnnotation: "删除标注"
 		};
 		const en = {
 			nav: "Codex",
@@ -373,8 +396,17 @@ window.__ModuleLoader__.load({
 			imageZoomOut: "Zoom out",
 			imageZoomIn: "Zoom in",
 			imageFit: "Fit to window",
-			imageRefineHint: "To change this image, say “Edit this image…” in this conversation; only this image is sent as a reference.",
-			imageNewHint: "To start over, describe a new image; prior images are not included automatically."
+			imageAnnotate: "Annotate",
+			imageAnnotateHint: "Click the image to add a numbered note",
+			imageAnnotation: "Note {value}",
+			imageAnnotationPlaceholder: "Describe what should change in this area",
+			imageEditPrompt: "Describe how you want to change this image",
+			imageEditDefault: "Edit this image.",
+			imageRegionNotes: "Region changes:",
+			imageEdit: "Continue editing in composer",
+			imageEditPreparing: "Adding to composer…",
+			imageEditFailed: "Could not add the image to the composer.",
+			imageRemoveAnnotation: "Remove note"
 		};
 		const STYLE = `
 .codexSubscription{display:flex;flex-direction:column;gap:10px;max-width:720px;color:var(--dsw-alias-label-primary);container-type:inline-size}
@@ -409,11 +441,24 @@ window.__ModuleLoader__.load({
 .codexModelSelect{position:relative;min-width:0}.codexModelSelectTrigger{display:flex;align-items:center;gap:4px;min-width:0;max-width:min(360px,45cqw);height:28px;padding:0 4px 0 8px;border:0;border-radius:24px;outline:0;background:transparent;color:var(--dsw-alias-label-secondary);font-size:13px;font-weight:500;line-height:20px;cursor:pointer}.codexModelSelectTrigger:hover:not(:disabled),.codexModelSelectTrigger[aria-expanded=true]{background:var(--dsw-alias-interactive-bg-hover)}.codexModelSelectTrigger:focus-visible{box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}.codexModelSelectTrigger:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}.codexModelSelectBolt{display:block;flex:none;width:14px;height:14px;color:var(--dsw-alias-label-primary)}.codexModelSelectLabel{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectEffort{flex:none;color:var(--dsw-alias-label-caption)}.codexModelSelectChevron{flex:none;color:var(--dsw-alias-label-caption);transition:transform 120ms}.codexModelSelectTrigger[aria-expanded=true] .codexModelSelectChevron{transform:rotate(180deg)}
 .codexModelSelectMenu,.codexModelSelectSubmenu{position:absolute;z-index:30;box-sizing:border-box;width:max-content;min-width:min(240px,calc(100vw - 32px));max-width:min(420px,calc(100vw - 32px));max-height:min(360px,calc(100vh - 96px));padding:4px;border:1px solid var(--dsw-alias-border-inverted);border-radius:12px;background:var(--dsw-specific-menu);box-shadow:var(--dsw-shadow-lv3);color:var(--dsw-alias-label-primary);overflow:hidden}.codexModelSelectMenu{right:0;bottom:calc(100% + 8px)}.codexModelSelectSubmenu{right:calc(100% + 8px);bottom:0;min-width:min(230px,calc(100vw - 32px))}.codexModelSelectCell{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;height:40px;box-sizing:border-box;padding:0 10px;border:0;border-radius:10px;background:transparent;color:inherit;font-size:14px;line-height:22px;text-align:left;cursor:pointer}.codexModelSelectCell:hover,.codexModelSelectCell:focus-visible,.codexModelSelectCell[data-open=true]{background:var(--dsw-alias-interactive-bg-hover);outline:0}.codexModelSelectCell:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}.codexModelSelectCellLabel{flex:none;white-space:nowrap}.codexModelSelectCellValue{flex:auto;min-width:0;overflow:hidden;color:var(--dsw-alias-label-tertiary);text-align:right;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectCellChevron{flex:none;color:var(--dsw-alias-label-tertiary)}.codexModelSelectGroups{min-height:0;max-height:352px;overflow-y:auto}.codexModelSelectGroup+.codexModelSelectGroup{margin-top:4px}.codexModelSelectGroupTitle{position:sticky;top:0;z-index:1;padding:5px 8px 3px;background:var(--dsw-specific-menu);color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:500;line-height:18px}.codexModelSelectOption{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;min-height:38px;box-sizing:border-box;padding:6px 8px;border:0;border-radius:10px;outline:0;background:transparent;color:inherit;text-align:left;cursor:pointer}.codexModelSelectOption:hover:not(:disabled),.codexModelSelectOption:focus-visible{background:var(--dsw-alias-interactive-bg-hover)}.codexModelSelectOption:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}.codexModelSelectOptionCopy{display:flex;flex:1;min-width:0;flex-direction:column}.codexModelSelectOptionName{overflow:hidden;color:inherit;font-size:14px;font-weight:500;line-height:20px;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectOptionDescription{overflow:hidden;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;text-overflow:ellipsis;white-space:nowrap}.codexModelSelectCheck{display:grid;place-items:center;flex:0 0 18px;color:var(--dsw-alias-label-primary)}.codexModelSelectStatus,.codexModelSelectEmpty{padding:10px;color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}.codexModelSelectError,.codexModelSelectWarning{display:flex;align-items:flex-start;justify-content:space-between;gap:8px;margin-bottom:4px;padding:7px 8px;border-radius:8px;background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}.codexModelSelectWarning{background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-state-warn-label)}.codexModelSelectRetry{flex:none;padding:0;border:0;background:transparent;color:inherit;font:inherit;font-weight:600;cursor:pointer}
 .codexModelSelectMenu{overflow:visible}
-.codexImageTool{display:flex;flex-direction:column;gap:8px;margin:4px 0;color:var(--dsw-alias-label-primary)}.codexImageToolRow{display:flex;align-items:center;min-height:24px;gap:8px;font-size:13px;line-height:20px}.codexImageToolIcon{display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;color:var(--dsw-alias-label-secondary)}.codexImageToolIcon::before{content:'';width:8px;height:8px;border:1.5px solid currentColor;border-radius:3px}.codexImageTool[data-state=running] .codexImageToolIcon::before{border-radius:50%;border-right-color:transparent;animation:codexImageSpin 800ms linear infinite}.codexImageTool[data-state=error] .codexImageToolIcon::before{border-color:var(--dsw-alias-state-error-primary);background:var(--dsw-alias-state-error-primary)}.codexImageToolTitle{font-weight:500}.codexImageToolState{color:var(--dsw-alias-label-tertiary)}.codexImageToolError{margin:0 0 0 24px;font-size:12px;line-height:18px;color:var(--dsw-alias-state-error-primary)}.codexImageToolGallery{margin-left:24px}.codexGeneratedImageFrame{display:flex;align-items:center;justify-content:center;width:min(240px,100%);min-height:120px;padding:0;overflow:hidden;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-tertiary);cursor:pointer}.codexGeneratedImageFrame img{display:block;width:100%;max-height:240px;object-fit:contain}.codexGeneratedImageRetry{min-height:36px;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-secondary);cursor:pointer}.codexGeneratedImageModal{width:min(920px,calc(100vw - 32px));max-height:calc(100vh - 32px)}.codexGeneratedImageModalContent{min-height:0;overflow:hidden}.codexGeneratedImageViewer{display:flex;min-width:0;flex-direction:column;gap:12px}.codexGeneratedImageStage{display:grid;place-items:center;min-height:280px;max-height:calc(100vh - 260px);overflow:auto;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-module-platform)}.codexGeneratedImageStage img{display:block;max-width:100%;max-height:calc(100vh - 280px);object-fit:contain;transform-origin:center;transition:transform 120ms ease}.codexGeneratedImageMeta{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}.codexGeneratedImageToolbar{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.codexGeneratedImageZoom{display:flex;align-items:center;gap:6px}.codexGeneratedImageZoomValue{min-width:44px;color:var(--dsw-alias-label-secondary);font-size:12px;text-align:center}.codexGeneratedImageDownload{display:inline-flex;align-items:center;gap:6px;min-height:32px;box-sizing:border-box;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:999px;background:transparent;color:var(--dsw-alias-label-primary);font-size:13px;text-decoration:none}.codexGeneratedImageDownload:hover{background:var(--dsw-alias-interactive-bg-hover)}.codexGeneratedImageGuidance{display:flex;flex-direction:column;gap:2px;padding-top:2px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}@keyframes codexImageSpin{to{transform:rotate(360deg)}}
+.codexImageTool{display:flex;flex-direction:column;gap:8px;margin:4px 0;color:var(--dsw-alias-label-primary)}.codexImageToolRow{display:flex;align-items:center;min-height:24px;gap:8px;font-size:13px;line-height:20px}.codexImageToolIcon{display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;color:var(--dsw-alias-label-secondary)}.codexImageToolIcon::before{content:'';width:8px;height:8px;border:1.5px solid currentColor;border-radius:3px}.codexImageTool[data-state=running] .codexImageToolIcon::before{border-radius:50%;border-right-color:transparent;animation:codexImageSpin 800ms linear infinite}.codexImageTool[data-state=error] .codexImageToolIcon::before{border-color:var(--dsw-alias-state-error-primary);background:var(--dsw-alias-state-error-primary)}.codexImageToolTitle{font-weight:500}.codexImageToolState{color:var(--dsw-alias-label-tertiary)}.codexImageToolError{margin:0 0 0 24px;font-size:12px;line-height:18px;color:var(--dsw-alias-state-error-primary)}.codexImageToolGallery{margin-left:24px}.codexGeneratedImageFrame{display:flex;align-items:center;justify-content:center;width:min(240px,100%);height:240px;padding:0;overflow:hidden;border:1px solid var(--dsw-alias-border-l2);border-radius:16px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-tertiary);cursor:pointer}.codexGeneratedImageFrame img{display:block;width:100%;height:100%;object-fit:cover}.codexGeneratedImageRetry{min-height:36px;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-secondary);cursor:pointer}.codexGeneratedImageModal{width:min(920px,calc(100vw - 32px));max-height:calc(100vh - 32px)}.codexGeneratedImageModalContent{min-height:0;overflow:hidden}.codexGeneratedImageViewer{display:flex;min-width:0;flex-direction:column;gap:12px}.codexGeneratedImageStage{display:grid;place-items:center;min-height:280px;max-height:calc(100vh - 260px);overflow:auto;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-module-platform)}.codexGeneratedImageStage img{display:block;max-width:100%;max-height:calc(100vh - 280px);object-fit:contain;transform-origin:center;transition:transform 120ms ease}.codexGeneratedImageMeta{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}.codexGeneratedImageToolbar{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.codexGeneratedImageZoom{display:flex;align-items:center;gap:6px}.codexGeneratedImageZoomValue{min-width:44px;color:var(--dsw-alias-label-secondary);font-size:12px;text-align:center}.codexGeneratedImageDownload{display:inline-flex;align-items:center;gap:6px;min-height:32px;box-sizing:border-box;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:999px;background:transparent;color:var(--dsw-alias-label-primary);font-size:13px;text-decoration:none}.codexGeneratedImageDownload:hover{background:var(--dsw-alias-interactive-bg-hover)}.codexGeneratedImageGuidance{display:flex;flex-direction:column;gap:2px;padding-top:2px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}@keyframes codexImageSpin{to{transform:rotate(360deg)}}
 .codexImageBeta{padding:0 5px;border:1px solid var(--dsw-alias-border-l2);border-radius:999px;color:var(--dsw-alias-label-tertiary);font-size:10px;line-height:16px}
 @container (max-width:560px){.codexSubscriptionCreditRows{grid-template-columns:1fr}}
 @container (max-width:480px){.codexSubscriptionAccountRow,.codexSubscriptionSectionHead{align-items:flex-start;flex-direction:column}.codexSubscriptionActions{width:100%}.codexSubscriptionSearchChoices{grid-template-columns:1fr}}
 @media(max-width:640px){.codexSubscriptionCard{padding:14px}}
+`;
+		const IMAGE_STYLE = String.raw`
+.codexGeneratedImageLightbox{position:fixed;inset:0;z-index:1000;display:grid;grid-template-rows:auto minmax(0,1fr) auto;background:var(--dsw-alias-bg-base,#111);color:var(--dsw-alias-label-primary);outline:0}.codexGeneratedImageTopbar{display:flex;align-items:center;justify-content:space-between;gap:20px;min-height:58px;padding:8px 14px;border-bottom:1px solid var(--dsw-alias-border-l2);background:color-mix(in srgb,var(--dsw-alias-bg-base,#111) 92%,transparent);backdrop-filter:blur(18px)}.codexGeneratedImageTopbar>div:first-child{display:flex;min-width:0;flex-direction:column}.codexGeneratedImageTopbar strong{overflow:hidden;font-size:13px;font-weight:600;line-height:20px;text-overflow:ellipsis;white-space:nowrap}.codexGeneratedImageTopbar small{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:17px}.codexGeneratedImageActions{display:flex;align-items:center;gap:6px}.codexGeneratedImageActions button,.codexGeneratedImageActions a{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;gap:5px;height:32px;padding:0 10px;border:1px solid transparent;border-radius:16px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;text-decoration:none;cursor:pointer}.codexGeneratedImageActions button:hover,.codexGeneratedImageActions a:hover,.codexGeneratedImageActions button.is-active{background:var(--dsw-alias-interactive-bg-hover)}.codexGeneratedImageActions button:focus-visible,.codexGeneratedImageActions a:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:1px}.codexGeneratedImageActions button:disabled{opacity:.4;cursor:default}.codexGeneratedImageActions>span{min-width:38px;color:var(--dsw-alias-label-tertiary);font-size:11px;text-align:center}.codexGeneratedImageClose{font-size:20px!important}.codexGeneratedImageCanvas{position:relative;display:grid;place-items:center;min-height:0;overflow:auto;padding:24px;background:var(--dsw-alias-bg-base,#111)}.codexGeneratedImageSurface{position:relative;display:inline-flex;max-width:calc(100vw - 48px);max-height:calc(100vh - 210px);transform-origin:center;transition:transform 120ms ease}.codexGeneratedImageSurface img{display:block;max-width:100%;max-height:calc(100vh - 210px);border-radius:12px;object-fit:contain}.codexGeneratedImageCanvas.is-annotating .codexGeneratedImageSurface{cursor:crosshair}.codexGeneratedImagePin{position:absolute;display:grid;place-items:center;width:24px;height:24px;padding:0;border:2px solid white;border-radius:50%;background:var(--dsw-alias-label-primary);box-shadow:0 1px 4px rgba(0,0,0,.35);color:var(--dsw-alias-bg-base,#111);font:inherit;font-size:11px;font-weight:700;transform:translate(-50%,-50%);cursor:pointer}.codexGeneratedImagePin.is-active{background:var(--dsw-alias-state-business-primary,#3964fe);color:white}.codexGeneratedImageAnnotateHint{position:absolute;bottom:14px;left:50%;padding:6px 10px;border-radius:14px;background:color-mix(in srgb,var(--dsw-alias-bg-layer-3) 90%,transparent);box-shadow:var(--dsw-shadow-lv2);color:var(--dsw-alias-label-secondary);font-size:11px;transform:translateX(-50%)}.codexGeneratedImageEditDock{display:flex;flex-direction:column;gap:8px;padding:10px 14px 14px;border-top:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2,var(--dsw-alias-bg-base))}.codexGeneratedImagePrompt,.codexGeneratedImageAnnotation{display:flex;align-items:center;gap:8px;width:min(820px,100%);margin:0 auto}.codexGeneratedImagePrompt>*:first-child,.codexGeneratedImageAnnotation>*:nth-child(2){min-width:0;flex:1}.codexGeneratedImagePrompt button{flex:none;white-space:nowrap}.codexGeneratedImageAnnotation>span{flex:none;color:var(--dsw-alias-label-secondary);font-size:12px}.codexGeneratedImageAnnotation>button{flex:none;height:28px;padding:0 8px;border:0;border-radius:14px;background:transparent;color:var(--dsw-alias-label-tertiary);font:inherit;font-size:11px;cursor:pointer}.codexGeneratedImageAnnotation>button:hover{background:var(--dsw-alias-interactive-bg-hover)}.codexGeneratedImageEditError{width:min(820px,100%);margin:0 auto;color:var(--dsw-alias-state-error-primary);font-size:11px;line-height:17px}@media(max-width:760px){.codexGeneratedImageTopbar{align-items:flex-start;flex-direction:column}.codexGeneratedImageActions{width:100%;overflow-x:auto}.codexGeneratedImageActions>span{display:none}.codexGeneratedImageCanvas{padding:12px}.codexGeneratedImageSurface{max-width:calc(100vw - 24px);max-height:calc(100vh - 270px)}.codexGeneratedImageSurface img{max-height:calc(100vh - 270px)}.codexGeneratedImagePrompt,.codexGeneratedImageAnnotation{align-items:stretch;flex-direction:column}.codexGeneratedImagePrompt button{width:100%}}
+`;
+		const IMAGE_LAYOUT_STYLE = String.raw`
+.codexGeneratedImageWorkspace{display:grid;min-height:0;grid-template-columns:minmax(0,1fr)}
+.codexGeneratedImageWorkspace.has-comments{grid-template-columns:minmax(0,1fr) 296px}
+.codexGeneratedImageComments{display:flex;min-width:0;flex-direction:column;gap:12px;overflow:auto;padding:18px 14px;border-left:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2,var(--dsw-alias-bg-base))}
+.codexGeneratedImageComments>header{display:flex;flex-direction:column;gap:2px}.codexGeneratedImageComments>header strong{font-size:13px;font-weight:600;line-height:20px}.codexGeneratedImageComments>header small{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:17px}
+.codexGeneratedImageCommentList{display:flex;flex-direction:column;gap:8px}.codexGeneratedImageCommentList article{display:grid;grid-template-columns:24px minmax(0,1fr) 24px;align-items:start;gap:7px;padding:9px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-layer-3)}.codexGeneratedImageCommentList article.is-active{border-color:var(--dsw-alias-state-business-primary,#3964fe)}
+.codexGeneratedImageCommentList article>span{display:grid;place-items:center;width:22px;height:22px;border-radius:50%;background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-base,#111);font-size:10px;font-weight:700}.codexGeneratedImageCommentList textarea{box-sizing:border-box;width:100%;min-height:64px;resize:vertical;border:0;outline:0;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;line-height:18px}.codexGeneratedImageCommentList textarea::placeholder{color:var(--dsw-alias-label-dimmed)}
+.codexGeneratedImageCommentList article>button{display:grid;place-items:center;width:22px;height:22px;padding:0;border:0;border-radius:50%;background:transparent;color:var(--dsw-alias-label-tertiary);font:inherit;font-size:17px;cursor:pointer}.codexGeneratedImageCommentList article>button:hover{background:var(--dsw-alias-interactive-bg-hover)}
+@media(max-width:760px){.codexGeneratedImageWorkspace.has-comments{grid-template-columns:minmax(0,1fr);grid-template-rows:minmax(0,1fr) minmax(118px,34vh)}.codexGeneratedImageComments{border-top:1px solid var(--dsw-alias-border-l2);border-left:0;padding:10px 12px}}
 `;
 		const unwrap = (response) => {
 			if (!response?.ok) throw new Error(response?.error?.message ?? "Codex RPC failed");
@@ -443,13 +488,28 @@ window.__ModuleLoader__.load({
 			return cleaned.toLowerCase().endsWith(".png") ? cleaned : `${cleaned}.png`;
 		};
 		const imageByteSize = (bytes) => bytes < 1024 * 1024 ? `${Math.max(.1, bytes / 1024).toLocaleString(void 0, { maximumFractionDigits: 1 })} KB` : `${(bytes / 1024 / 1024).toLocaleString(void 0, { maximumFractionDigits: 1 })} MB`;
-		function CodexGeneratedImage({ attachment, loadImage, t }) {
+		function editDraft(prompt, annotations, t) {
+			const notes = annotations.map((annotation, index) => ({
+				number: index + 1,
+				note: annotation.note.trim()
+			})).filter((annotation) => annotation.note !== "").map((annotation) => String(annotation.number) + ". " + annotation.note);
+			const base = prompt.trim() === "" ? t("imageEditDefault") : prompt.trim();
+			return notes.length === 0 ? base : base + "\n\n" + t("imageRegionNotes") + "\n" + notes.join("\n");
+		}
+		function CodexGeneratedImage({ attachment, loadImage, attachForEdit, t }) {
 			const [attempt, setAttempt] = (0, react.useState)(0);
 			const [error, setError] = (0, react.useState)(false);
 			const [open, setOpen] = (0, react.useState)(false);
 			const [src, setSrc] = (0, react.useState)();
 			const [zoom, setZoom] = (0, react.useState)(1);
+			const [annotationMode, setAnnotationMode] = (0, react.useState)(false);
+			const [annotations, setAnnotations] = (0, react.useState)([]);
+			const [selectedAnnotation, setSelectedAnnotation] = (0, react.useState)();
+			const [prompt, setPrompt] = (0, react.useState)("");
+			const [editBusy, setEditBusy] = (0, react.useState)(false);
+			const [editError, setEditError] = (0, react.useState)(false);
 			const triggerRef = (0, react.useRef)(null);
+			const dialogRef = (0, react.useRef)(null);
 			(0, react.useEffect)(() => {
 				let live = true;
 				setError(false);
@@ -471,15 +531,224 @@ window.__ModuleLoader__.load({
 				setOpen(false);
 				window.requestAnimationFrame(() => triggerRef.current?.focus());
 			};
+			(0, react.useEffect)(() => {
+				if (!open) return void 0;
+				const previousOverflow = document.body.style.overflow;
+				document.body.style.overflow = "hidden";
+				dialogRef.current?.focus();
+				const keydown = (event) => {
+					if (event.key === "Escape") {
+						event.preventDefault();
+						close();
+						return;
+					}
+					if (event.key === "Tab") {
+						const focusable = [...dialogRef.current.querySelectorAll("button:not(:disabled),a[href],input:not(:disabled),textarea:not(:disabled),[tabindex]:not([tabindex=\"-1\"])")];
+						if (focusable.length === 0) return;
+						const first = focusable[0];
+						const last = focusable.at(-1);
+						if (event.shiftKey && document.activeElement === first) {
+							event.preventDefault();
+							last.focus();
+						} else if (!event.shiftKey && document.activeElement === last) {
+							event.preventDefault();
+							first.focus();
+						}
+					}
+				};
+				document.addEventListener("keydown", keydown);
+				return () => {
+					document.body.style.overflow = previousOverflow;
+					document.removeEventListener("keydown", keydown);
+				};
+			}, [open]);
 			const label = attachment.name ?? t("imageLabel");
 			const downloadName = imageDownloadName(attachment);
-			const imageMeta = `${attachment.width} × ${attachment.height} · ${imageByteSize(attachment.bytes)}`;
+			const imageMeta = attachment.width + " × " + attachment.height + " · " + imageByteSize(attachment.bytes);
+			const addAnnotation = (event) => {
+				if (!annotationMode || event.target.closest(".codexGeneratedImagePin")) return;
+				const bounds = event.currentTarget.getBoundingClientRect();
+				const annotation = {
+					id: crypto.randomUUID(),
+					x: Math.max(0, Math.min(1, (event.clientX - bounds.left) / bounds.width)),
+					y: Math.max(0, Math.min(1, (event.clientY - bounds.top) / bounds.height)),
+					note: ""
+				};
+				setAnnotations((value) => [...value, annotation]);
+				setSelectedAnnotation(annotation.id);
+			};
+			const continueEditing = async () => {
+				if (editBusy || src === void 0) return;
+				setEditBusy(true);
+				setEditError(false);
+				try {
+					await attachForEdit(src, downloadName, editDraft(prompt, annotations, t));
+					close();
+				} catch {
+					setEditError(true);
+				} finally {
+					setEditBusy(false);
+				}
+			};
 			if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
 				className: "codexGeneratedImageRetry",
 				onClick: () => setAttempt((value) => value + 1),
 				children: t("imageLoadFailed")
 			});
+			const lightbox = !open || src === void 0 ? null : (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				ref: dialogRef,
+				className: "codexGeneratedImageLightbox",
+				role: "dialog",
+				"aria-modal": "true",
+				"aria-label": t("imagePreview"),
+				tabIndex: -1,
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", {
+						className: "codexGeneratedImageTopbar",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: imageMeta })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexGeneratedImageActions",
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: annotationMode ? "is-active" : "",
+									"aria-pressed": annotationMode,
+									onClick: () => setAnnotationMode((value) => !value),
+									children: t("imageAnnotate")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									"aria-label": t("imageZoomOut"),
+									disabled: zoom <= .5,
+									onClick: () => setZoom((value) => Math.max(.5, value - .25)),
+									children: "−"
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [Math.round(zoom * 100), "%"] }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									"aria-label": t("imageZoomIn"),
+									disabled: zoom >= 3,
+									onClick: () => setZoom((value) => Math.min(3, value + .25)),
+									children: "+"
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+									type: "button",
+									onClick: () => setZoom(1),
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFullscreenOutline16, { "aria-hidden": "true" }), t("imageFit")]
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("a", {
+									href: src,
+									download: downloadName,
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDownloadOutline16, { "aria-hidden": "true" }), t("imageDownload")]
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "codexGeneratedImageClose",
+									"aria-label": t("imageClosePreview"),
+									onClick: close,
+									children: "×"
+								})
+							]
+						})]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexGeneratedImageWorkspace " + (annotationMode || annotations.length > 0 ? "has-comments" : ""),
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("main", {
+							className: "codexGeneratedImageCanvas " + (annotationMode ? "is-annotating" : ""),
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "codexGeneratedImageSurface",
+								onClick: addAnnotation,
+								style: { transform: "scale(" + zoom + ")" },
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
+									src,
+									alt: label
+								}), annotations.map((annotation, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "codexGeneratedImagePin " + (annotation.id === selectedAnnotation ? "is-active" : ""),
+									"aria-label": fill(t("imageAnnotation"), { value: index + 1 }),
+									style: {
+										left: annotation.x * 100 + "%",
+										top: annotation.y * 100 + "%"
+									},
+									onClick: (event) => {
+										event.stopPropagation();
+										setSelectedAnnotation(annotation.id);
+									},
+									children: index + 1
+								}, annotation.id))]
+							}), annotationMode ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "codexGeneratedImageAnnotateHint",
+								children: t("imageAnnotateHint")
+							}) : null]
+						}), annotationMode || annotations.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("aside", {
+							className: "codexGeneratedImageComments",
+							"aria-label": t("imageAnnotate"),
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("imageAnnotate") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("imageAnnotateHint") })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "codexGeneratedImageCommentList",
+								children: annotations.map((annotation, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("article", {
+									className: annotation.id === selectedAnnotation ? "is-active" : "",
+									onClick: () => setSelectedAnnotation(annotation.id),
+									children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: index + 1 }),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
+											value: annotation.note,
+											rows: 3,
+											"aria-label": fill(t("imageAnnotation"), { value: index + 1 }),
+											placeholder: t("imageAnnotationPlaceholder"),
+											onFocus: () => setSelectedAnnotation(annotation.id),
+											onChange: (event) => {
+												const note = event.target.value;
+												setAnnotations((value) => value.map((item) => item.id === annotation.id ? {
+													...item,
+													note
+												} : item));
+											}
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											"aria-label": t("imageRemoveAnnotation"),
+											onClick: (event) => {
+												event.stopPropagation();
+												setAnnotations((value) => value.filter((item) => item.id !== annotation.id));
+												if (selectedAnnotation === annotation.id) setSelectedAnnotation(void 0);
+											},
+											children: "×"
+										})
+									]
+								}, annotation.id))
+							})]
+						}) : null]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("footer", {
+						className: "codexGeneratedImageEditDock",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexGeneratedImagePrompt",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
+								value: prompt,
+								placeholder: t("imageEditPrompt"),
+								onChange: (event) => setPrompt(event.target.value),
+								onKeyDown: (event) => {
+									if (event.key === "Enter" && !event.shiftKey) {
+										event.preventDefault();
+										continueEditing();
+									}
+								}
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+								type: "button",
+								disabled: editBusy,
+								onClick: () => {
+									continueEditing();
+								},
+								children: editBusy ? t("imageEditPreparing") : t("imageEdit")
+							})]
+						}), editError ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "codexGeneratedImageEditError",
+							role: "alert",
+							children: t("imageEditFailed")
+						}) : null]
+					})
+				]
+			}), document.body);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				ref: triggerRef,
 				type: "button",
@@ -496,78 +765,9 @@ window.__ModuleLoader__.load({
 					src,
 					alt: label
 				})
-			}), src === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-				open,
-				onClose: close,
-				title: t("imagePreview"),
-				closeLabel: t("imageClosePreview"),
-				className: "codexGeneratedImageModal",
-				contentClassName: "codexGeneratedImageModalContent",
-				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "codexGeneratedImageViewer",
-					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-							className: "codexGeneratedImageStage",
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
-								src,
-								alt: label,
-								style: { transform: `scale(${zoom})` }
-							})
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-							className: "codexGeneratedImageMeta",
-							children: imageMeta
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "codexGeneratedImageToolbar",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								className: "codexGeneratedImageZoom",
-								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-										type: "button",
-										variant: "outline",
-										"aria-label": t("imageZoomOut"),
-										title: t("imageZoomOut"),
-										disabled: zoom <= .5,
-										onClick: () => setZoom((value) => Math.max(.5, value - .25)),
-										children: "−"
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-										className: "codexGeneratedImageZoomValue",
-										children: [Math.round(zoom * 100), "%"]
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-										type: "button",
-										variant: "outline",
-										"aria-label": t("imageZoomIn"),
-										title: t("imageZoomIn"),
-										disabled: zoom >= 3,
-										onClick: () => setZoom((value) => Math.min(3, value + .25)),
-										children: "+"
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-										type: "button",
-										variant: "outline",
-										onClick: () => setZoom(1),
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFullscreenOutline16, { "aria-hidden": "true" }), t("imageFit")]
-									})
-								]
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("a", {
-								className: "codexGeneratedImageDownload",
-								href: src,
-								download: downloadName,
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDownloadOutline16, { "aria-hidden": "true" }), t("imageDownload")]
-							})]
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "codexGeneratedImageGuidance",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("imageRefineHint") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("imageNewHint") })]
-						})
-					]
-				})
-			})] });
+			}), lightbox] });
 		}
-		function CodexImageToolRow({ block, loadImage, t }) {
+		function CodexImageToolRow({ block, loadImage, attachForEdit, t }) {
 			const settled = block?.kind === "tool-result";
 			const image = settled ? block.content.find((item) => item?.type === "image" && item.attachment !== void 0) : void 0;
 			const failed = settled && block.isError === true;
@@ -604,6 +804,7 @@ window.__ModuleLoader__.load({
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CodexGeneratedImage, {
 							attachment: image.attachment,
 							loadImage,
+							attachForEdit,
 							t
 						})
 					}),
@@ -1868,7 +2069,7 @@ window.__ModuleLoader__.load({
 			ctx.effect(() => {
 				const tag = document.createElement("style");
 				tag.dataset.plugin = "dsh-codex-subscription";
-				tag.textContent = STYLE;
+				tag.textContent = STYLE + IMAGE_STYLE + IMAGE_LAYOUT_STYLE;
 				document.head.append(tag);
 				return () => tag.remove();
 			}, "codex-subscription: style");
@@ -1935,7 +2136,22 @@ window.__ModuleLoader__.load({
 				locale: NS,
 				inject: (sessionId) => ({
 					t,
-					loadImage: (attachment) => conversation.resolveImage(sessionId, attachment)
+					loadImage: (attachment) => conversation.resolveImage(sessionId, attachment),
+					attachForEdit: async (src, filename, draft) => {
+						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");
+						const response = await fetch(src);
+						if (!response.ok) throw new Error("Could not read generated image");
+						const blob = await response.blob();
+						const created = conversation.createDraftImages([new File([blob], filename, { type: blob.type || "image/png" })]);
+						const input = conversation.input.for(actx);
+						if (!input.addImages(created.map((item) => item.id))) {
+							conversation.releaseDraftImages(created);
+							throw new Error("The composer is busy");
+						}
+						sessions.open(sessionId);
+						input.setDraft(draft);
+					}
 				})
 			}, CodexImageToolRow));
 		}

package/lib/index.js

@@ -229,6 +229,14 @@ var CodexLoginCoordinator = class {
 	async accountStatus(options) {
 		return publicClone(await this.auth.status(options));
 	}
+	supportState() {
+		const active = this.#activeId === void 0 ? void 0 : this.#sessions.get(this.#activeId);
+		if (active === void 0) return { phase: "idle" };
+		return {
+			method: active.view.method,
+			phase: active.view.phase
+		};
+	}
 	async start({ method }) {
 		if (!LOGIN_METHODS.has(method)) throw new Error(`unsupported Codex login method: ${String(method)}`);
 		const active = this.#activeId === void 0 ? void 0 : this.#sessions.get(this.#activeId);
@@ -317,7 +325,7 @@ var CodexLoginCoordinator = class {
 				authenticated: status.authenticated === true,
 				...typeof status.expiresAt === "number" ? { expiresAt: status.expiresAt } : {}
 			};
-		}).catch((error) => {
+		}).catch(async (error) => {
 			if (controller.signal.aborted) {
 				session.view = {
 					id,
@@ -328,6 +336,20 @@ var CodexLoginCoordinator = class {
 				};
 				return;
 			}
+			try {
+				const status = await this.auth.status();
+				if (status.authenticated === true) {
+					session.view = {
+						id,
+						provider: "openai-codex",
+						method,
+						phase: "authenticated",
+						authenticated: true,
+						...typeof status.expiresAt === "number" ? { expiresAt: status.expiresAt } : {}
+					};
+					return;
+				}
+			} catch {}
 			session.view = {
 				id,
 				provider: "openai-codex",
@@ -504,7 +526,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0 } = {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.6.0";
+const PACKAGE_VERSION = "1.7.1";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-search.js
@@ -898,7 +920,7 @@ function createCodexImageTool(options) {
 //#endregion
 //#region src/diagnostics.js
 /** Build a support report that deliberately excludes OAuth and account metadata. */
-async function createSubscriptionDiagnostics({ auth, preferences }) {
+async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" } }) {
 	let account = { status: "unknown" };
 	const issues = [];
 	try {
@@ -907,11 +929,16 @@ async function createSubscriptionDiagnostics({ auth, preferences }) {
 		issues.push({ code: "account-status-unavailable" });
 	}
 	return {
-		schemaVersion: 1,
+		schemaVersion: 2,
 		package: "dsh-codex-subscription",
 		version: PACKAGE_VERSION,
-		runtime: { node: process.version },
+		runtime: {
+			node: process.version,
+			platform: process.platform,
+			arch: process.arch
+		},
 		account,
+		login,
 		provider: {
 			id: "openai-codex",
 			transport: "sse",
@@ -1558,7 +1585,8 @@ function apply(ctx) {
 		preferences,
 		diagnosticsReader: () => createSubscriptionDiagnostics({
 			auth,
-			preferences
+			preferences,
+			login: coordinator.supportState()
 		})
 	});
 	ctx.effect(() => ctx.connection.rpc.handle(CHANNEL, handler, { authority: "loopback" }), "codex-subscription: loopback account RPC");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.6.0",
+  "version": "1.7.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",
@@ -20,8 +20,7 @@
     "compatibility.json",
     "LICENSE",
     "SECURITY.md",
-    "THIRD_PARTY_NOTICES.md",
-    "docs/assets/*.png"
+    "THIRD_PARTY_NOTICES.md"
   ],
   "dsh": {
     "bundle": {
@@ -95,7 +94,8 @@
     "@deepseek-ai/dsh-web": "0.1.0-rc.6 || 0.1.0-rc.7 || 0.1.0-rc.8 || 0.1.1-rc.1 || 0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
     "@earendil-works/pi-ai": "0.82.1",
-    "react": "^18.2.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
@@ -119,6 +119,7 @@
     "@earendil-works/pi-ai": "0.82.1",
     "@heroicons/react": "2.2.0",
     "react": "18.3.1",
+    "react-dom": "18.3.1",
     "tsdown": "0.22.2"
   },
   "scripts": {