dsh-codex-subscription 1.4.1 → 1.6.0

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.4.1` package below; do not install a moving branch.
+- Use the exact `1.6.0` 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.4.1
+npx -y @deepseek-ai/dsh@0.1.1-rc.2 plugin --profile web add dsh-codex-subscription@1.6.0
 ```
 
 With an existing global `dsh` command:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@1.4.1
+dsh plugin --profile web add dsh-codex-subscription@1.6.0
 ```
 
 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.4.1` appears exactly once.
+1. `dsh-codex-subscription` version `1.6.0` 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/DIRECTORY.md

@@ -4,11 +4,11 @@ Use this factual copy when listing `dsh-codex-subscription` in a DSH plugin dire
 
 ## Short description
 
-Use a ChatGPT subscription in DeepSeek Harness through independent OAuth sign-in, with Codex models, backend-reported quota, subscription web search, image generation, and no silent paid fallback.
+Use a ChatGPT subscription in DeepSeek Harness through independent OAuth sign-in, with Codex models, backend-reported quota, subscription web search, Beta image generation/editing, and no silent paid fallback.
 
 ## 中文短描述
 
-通过独立 OAuth 登录在 DeepSeek Harness 中使用 ChatGPT 订阅，提供 Codex 模型、服务端实际额度、订阅搜索和图片生成，不会静默切换其他付费路由。
+通过独立 OAuth 登录在 DeepSeek Harness 中使用 ChatGPT 订阅，提供 Codex 模型、服务端实际额度、订阅搜索和 Beta 图片生成与编辑，不会静默切换其他付费路由。
 
 ## Facts
 
@@ -18,7 +18,7 @@ Use a ChatGPT subscription in DeepSeek Harness through independent OAuth sign-in
 - Codex CLI required: no
 - OpenAI API key required: no
 - Platforms: official DSH plus DSH-Portable product forms for Windows, macOS, and Linux
-- Main capabilities: Codex models, quota, web search, image generation, optional composer quota, optional Fast mode, secret-free support diagnostics
+- Main capabilities: Codex models, quota and expiring resets, web search, Beta image generation/editing with explicit references and native preview/download, optional composer quota, Fast mode, secret-free support diagnostics and direct feedback
 - Safety boundary: subscription failures remain visible and never silently fall back to another paid provider
 
 ## Install

package/README.md

@@ -8,7 +8,7 @@ No OpenAI API key or Codex CLI. Models, search, quota, and image generation stay
 
 [![CI](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml/badge.svg)](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/dsh-codex-subscription?logo=npm&label=npm)](https://www.npmjs.com/package/dsh-codex-subscription)
-[![npm downloads](https://img.shields.io/npm/dt/dsh-codex-subscription?logo=npm&label=downloads)](https://www.npmjs.com/package/dsh-codex-subscription)
+[![total npm downloads](https://img.shields.io/npm/dt/dsh-codex-subscription?logo=npm&label=total%20downloads)](https://www.npmjs.com/package/dsh-codex-subscription)
 [![MIT](https://img.shields.io/badge/license-MIT-111111.svg)](LICENSE)
 [![Star](https://img.shields.io/github/stars/WSL043/dsh-codex-subscription?style=flat&logo=github&label=Star)](https://github.com/WSL043/dsh-codex-subscription/stargazers)
 
@@ -47,10 +47,10 @@ DSH-Portable exposes the same standard plugin command, so the command above also
 | **Recoverable and diagnosable** | Sign-in state reconciles automatically; 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 |
-| **Safe quota reset** | Use a reset only for an exhausted Codex quota, with a cooldown, checkbox, and typed confirmation |
+| **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** | Describe an image in a DSH conversation and view the generated result in that session |
-| **Fast mode (Beta)** | Switch between Standard and Fast directly in the composer |
+| **Codex image generation and editing (Beta)** | Generate without references, or explicitly edit selected conversation images; preview, zoom, and download the original |
+| **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.
 
@@ -139,14 +139,14 @@ Restart DSH manually after installation, then:
 ## Features
 
 - ChatGPT OAuth sign-in with credentials kept on the host;
-- Codex models and image generation directly inside DSH conversations;
+- Codex models and Beta image generation/editing directly inside DSH conversations;
 - A clear choice between DSH default search and Codex subscription search;
 - Actual backend-provided quota, reset time, and freshness;
 - Separate standard Codex, Codex-Spark, Credits, and other independent limits;
-- Deliberate quota-reset redemption for exhausted Codex limits, with layered confirmation and no automatic retry;
+- Visible quota-reset count and earliest expiry, with deliberate early redemption, layered confirmation, and no automatic retry;
 - Optional percentage or progress bar for the selected Codex model (off by default);
-- Standard or Fast mode for supported Codex models directly in the composer (Beta);
-- A copyable support report in Settings that excludes OAuth credentials, account identifiers, and authorization timestamps;
+- Standard or Fast mode for supported Codex models directly in the composer;
+- A copyable support report and direct feedback link in Settings; the report excludes OAuth credentials, account identifiers, and authorization timestamps;
 - Visible errors when subscription routing is unavailable, with no silent paid fallback.
 
 ### Composer quota
@@ -161,12 +161,20 @@ Standard Codex uses the lowest remaining window returned by the service; Spark u
 
 ### Safe quota reset
 
-If ChatGPT reports an available quota reset, Settings shows it in a compact row. Redemption stays disabled
-until a Codex model quota is exhausted. Using one requires a five-second cooldown, an acknowledgement checkbox,
-and the exact confirmation phrase. Cancel never consumes a reset, rapid repeated clicks are single-flight, and an
-uncertain network result is never retried automatically.
+If ChatGPT reports an available quota reset, Settings shows its count and earliest disclosed expiry in a compact row.
+You may deliberately try it before a quota reaches 100%, which is useful for a reset nearing expiry. ChatGPT still
+decides whether a window needs resetting and may return **nothing to reset** without spending the reset. The final
+action requires an acknowledgement checkbox and five-second cooldown. Cancel never consumes a reset, rapid repeated
+clicks are single-flight, and an uncertain network result is never retried automatically.
 
-### Composer speed (Beta)
+### 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
+turn, and detailed text, exact composition, or repeated-character consistency may still need another pass.
+
+### Composer speed
 
 With a supported Codex model selected, open the composer's model menu to choose Standard or Fast.
 Standard adds no icon; only Fast shows a lightning icon before the model name. Spark does not show the speed entry. Fast mode increases speed and uses more Credits;

package/README.zh-CN.md

@@ -9,7 +9,7 @@
 
 [![CI](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml/badge.svg)](https://github.com/WSL043/dsh-codex-subscription/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/dsh-codex-subscription?logo=npm&label=npm)](https://www.npmjs.com/package/dsh-codex-subscription)
-[![npm downloads](https://img.shields.io/npm/dt/dsh-codex-subscription?logo=npm&label=downloads)](https://www.npmjs.com/package/dsh-codex-subscription)
+[![npm 总下载量](https://img.shields.io/npm/dt/dsh-codex-subscription?logo=npm&label=%E6%80%BB%E4%B8%8B%E8%BD%BD%E9%87%8F)](https://www.npmjs.com/package/dsh-codex-subscription)
 [![MIT](https://img.shields.io/badge/license-MIT-111111.svg)](LICENSE)
 [![Star](https://img.shields.io/github/stars/WSL043/dsh-codex-subscription?style=flat&logo=github&label=Star)](https://github.com/WSL043/dsh-codex-subscription/stargazers)
 
@@ -48,10 +48,10 @@ DSH-Portable 也提供相同的标准插件命令，因此同样使用上面的
 | **可恢复、可诊断** | 登录状态会自动对账；设置页可生成不含凭据和账号标识的支持报告 |
 | **额度可见** | 普通 Codex、Spark 等服务端实际返回的额度分开显示 |
 | **输入框额度** | 可选择紧凑百分比、进度条或完全关闭输入框额度显示 |
-| **安全额度重置** | 仅在 Codex 额度用尽后使用重置，并经过冷静期、勾选和输入确认 |
+| **安全额度重置** | 直接查看最早到期时间，并通过冷静期和知情确认主动尝试重置 |
 | **订阅搜索** | 可在 DSH 默认搜索与 Codex 订阅搜索之间明确切换 |
-| **Codex 图片生成** | 在 DSH 对话里直接描述画面，生成结果会显示在当前会话中 |
-| **高速模式（Beta）** | 直接在输入框切换标准或高速，无需离开当前会话 |
+| **Codex 图片生成与编辑（Beta）** | 可无参考图全新生成，也可明确选择会话图片继续编辑；支持预览、缩放和下载原图 |
+| **高速模式** | 直接在输入框切换标准或高速，无需离开当前会话 |
 
 这些能力共用同一份本机 ChatGPT 登录。订阅路由失败时会明确报错，不会静默切换到其他付费路由。
 
@@ -139,14 +139,14 @@ dsh --profile web --dump-config
 ## 功能
 
 - ChatGPT OAuth 登录，凭据保留在本机；
-- Codex 模型和图片生成直接出现在 DSH 会话中；
+- Codex 模型和 Beta 图片生成与编辑直接出现在 DSH 会话中；
 - DSH 默认搜索与 Codex 订阅搜索可随时切换；
 - 设置页显示服务端返回的额度、重置时间和更新时间；
 - 普通 Codex、Codex-Spark、Credits 等独立额度分开显示；
-- 已用尽的 Codex 额度可主动使用重置卡，并经过分层确认且不会自动重试；
+- 显示重置卡数量与最早到期时间，也允许在额度未完全用尽时主动尝试，并经过分层确认且不会自动重试；
 - 输入框可用百分比或进度条显示当前 Codex 模型的剩余额度（默认关闭）；
-- 输入框可为支持的 Codex 模型切换标准或高速模式（Beta）；
-- 设置页可生成并复制无敏感信息的支持诊断，报告不包含 OAuth 凭据、账号标识或授权时间；
+- 输入框可为支持的 Codex 模型切换标准或高速模式；
+- 设置页可生成并复制无敏感信息的支持诊断，并直接打开反馈入口；报告不包含 OAuth 凭据、账号标识或授权时间；
 - 订阅路由不可用时明确报错，不会静默切换到其他付费路由。
 
 ### 输入框额度
@@ -160,11 +160,17 @@ Spark 使用独立额度。插件不会写死“5 小时 + 每周”，也不会
 
 ### 安全使用额度重置
 
-ChatGPT 返回可用重置卡时，设置页会用紧凑的一行显示。只有至少一个 Codex 模型额度已用尽后才能使用；
-最终操作还需要等待 5 秒、勾选知情确认，并输入完全一致的确认短语。取消不会消耗，快速连续点击只允许一次请求，
-网络结果不确定时也不会自动重试。
+ChatGPT 返回可用重置卡时，设置页会用紧凑的一行显示数量和服务端提供的最早到期时间。即使额度尚未到 100%，
+也可以主动尝试使用，适合重置卡即将过期的情况；是否需要重置仍由 ChatGPT 判断，服务端可能返回“当前无需重置”且不扣次数。
+最终操作需要勾选知情确认并等待 5 秒。取消不会消耗，快速连续点击只允许一次请求，网络结果不确定时也不会自动重试。
 
-### 输入框速度（Beta）
+### 图片生成与编辑（Beta）
+
+生成的图片会在 DSH 原生风格的查看器中打开，支持缩放、适合窗口、查看尺寸和下载原图。全新生成不会静默带入历史图片；
+需要继续修改时，要在同一会话明确说明编辑这张图，插件只会发送明确选中的持久图片引用，最多 5 张。GPT Image 2 的耗时可能明显长于
+文本回复，复杂文字、精确构图和连续角色一致性也可能需要再次调整。
+
+### 输入框速度
 
 选择支持的 Codex 模型后，可在输入框的模型菜单中切换标准与高速。标准模式不增加图标，
 只有高速模式会在模型名称左侧显示闪电；Spark 不显示速度入口。高速模式会提高速度，也会消耗更多 Credits；具体规则见

package/lib/client.js

@@ -127,6 +127,7 @@ window.__ModuleLoader__.load({
 		];
 		const NS = "settings.codexSubscription";
 		const CHANNEL = "/codex-subscription";
+		const SUPPORT_ISSUE_URL = "https://github.com/WSL043/dsh-codex-subscription/issues/new?template=install-problem.yml";
 		const QUICK_QUOTA_REFRESH_EVENT = "dsh-codex-subscription:refresh-quick-quota";
 		const QUICK_QUOTA_REFRESH_MS = 6e4;
 		const zh = {
@@ -153,6 +154,7 @@ window.__ModuleLoader__.load({
 			diagnosticsCopy: "复制诊断",
 			diagnosticsCopied: "已复制",
 			diagnosticsFailed: "无法生成诊断信息。",
+			feedbackOpen: "反馈问题",
 			searchTitle: "搜索来源",
 			searchDsh: "DSH 默认",
 			searchDshHint: "当前搜索服务",
@@ -183,13 +185,16 @@ window.__ModuleLoader__.load({
 			monthlyCreditLimit: "Credits 月度消费上限",
 			resetCredits: "可用额度重置次数",
 			resetCreditsValue: "{count} 次",
-			resetUse: "使用一次重置",
-			resetUnavailable: "仅当至少一个 Codex 模型额度已用尽时可使用。",
+			resetUse: "使用重置",
 			resetPreparing: "正在读取重置详情…",
 			resetConfirmTitle: "确认使用额度重置",
-			resetWarning: "此操作会立即消耗 1 次额度重置，且无法撤销。请确认你确实需要恢复已用尽的模型额度。",
-			resetAcknowledge: "我知道这会消耗 1 次额度重置",
-			resetTypeHint: "输入 {phrase} 以继续",
+			resetWarning: "若 ChatGPT 执行重置，将立即消耗 1 次且无法撤销。",
+			resetEarlyWarning: "当前模型额度尚未用尽；ChatGPT 可能执行重置，也可能判定暂无需重置且不消耗次数。",
+			resetAcknowledge: "我知道这次操作可能立即消耗 1 次重置",
+			resetCreditExpires: "到期：{value}",
+			resetCreditExpiryUnknown: "到期时间未提供",
+			resetCreditExpiryLoading: "正在读取到期时间…",
+			resetCreditExpiryFailed: "无法读取到期时间",
 			resetWait: "请再等待 {count} 秒",
 			resetFinal: "消耗 1 次并重置额度",
 			resetUsing: "正在重置…",
@@ -202,8 +207,7 @@ window.__ModuleLoader__.load({
 			resetExpired: "本次确认已失效，请重新开始。",
 			resetInProgress: "额度重置正在处理中。",
 			resetTooEarly: "请等待冷静期结束后再确认。",
-			resetPhraseMismatch: "确认短语不一致。",
-			resetNotExhausted: "当前 Codex 模型额度尚未用尽。",
+			resetAcknowledgeRequired: "请先确认已了解这次操作可能消耗重置次数。",
 			resetAccountChanged: "登录账号已变更，请重新开始。",
 			creditsNote: "仅显示 Codex 为此账户或工作区实际返回的额外 Credits、消费上限或额度重置次数；三者不是同一项。",
 			creditsUsed: "已用 {used} / {limit} credits",
@@ -231,6 +235,7 @@ window.__ModuleLoader__.load({
 			modelFailed: "模型目录加载失败：{value}",
 			groupFailed: "{name}：{value}",
 			imageGenerate: "生成图片",
+			imageBeta: "Beta",
 			imageGenerating: "正在生成…",
 			imageGenerated: "已生成",
 			imageFailed: "生成失败",
@@ -240,7 +245,13 @@ window.__ModuleLoader__.load({
 			imageLoading: "正在加载图片…",
 			imageLoadFailed: "图片加载失败，点击重试",
 			imagePreview: "图片预览",
-			imageClosePreview: "关闭预览"
+			imageClosePreview: "关闭预览",
+			imageDownload: "下载原图",
+			imageZoomOut: "缩小",
+			imageZoomIn: "放大",
+			imageFit: "适合窗口",
+			imageRefineHint: "要修改这张图，请在当前会话明确说“编辑这张图片……”；插件只会把这张图作为参考。",
+			imageNewHint: "要重新生成，请直接描述一张新图片；不会自动带入历史图片。"
 		};
 		const en = {
 			nav: "Codex",
@@ -266,6 +277,7 @@ window.__ModuleLoader__.load({
 			diagnosticsCopy: "Copy report",
 			diagnosticsCopied: "Copied",
 			diagnosticsFailed: "Could not create diagnostics.",
+			feedbackOpen: "Report a problem",
 			searchTitle: "Search source",
 			searchDsh: "DSH default",
 			searchDshHint: "Current search service",
@@ -296,13 +308,16 @@ window.__ModuleLoader__.load({
 			monthlyCreditLimit: "Monthly Credits spending cap",
 			resetCredits: "Available quota resets",
 			resetCreditsValue: "{count} available",
-			resetUse: "Use one reset",
-			resetUnavailable: "Available only when at least one Codex model quota is exhausted.",
+			resetUse: "Use reset",
 			resetPreparing: "Reading reset details…",
 			resetConfirmTitle: "Confirm quota reset",
-			resetWarning: "This immediately consumes one quota reset and cannot be undone. Continue only if you intend to restore an exhausted model quota.",
-			resetAcknowledge: "I understand this consumes one quota reset",
-			resetTypeHint: "Type {phrase} to continue",
+			resetWarning: "If ChatGPT performs the reset, one reset is consumed immediately and cannot be restored.",
+			resetEarlyWarning: "No model quota is exhausted. ChatGPT may reset it, or report that nothing needs resetting without consuming a reset.",
+			resetAcknowledge: "I understand this may consume one reset now",
+			resetCreditExpires: "Expires {value}",
+			resetCreditExpiryUnknown: "Expiration time not provided",
+			resetCreditExpiryLoading: "Reading expiration…",
+			resetCreditExpiryFailed: "Could not read expiration",
 			resetWait: "Wait {count} more seconds",
 			resetFinal: "Consume one reset",
 			resetUsing: "Resetting…",
@@ -315,8 +330,7 @@ window.__ModuleLoader__.load({
 			resetExpired: "This confirmation expired. Start again.",
 			resetInProgress: "A quota reset is already in progress.",
 			resetTooEarly: "Wait for the cooldown before confirming.",
-			resetPhraseMismatch: "The confirmation phrase does not match.",
-			resetNotExhausted: "The current Codex model quota is not exhausted.",
+			resetAcknowledgeRequired: "Confirm that you understand this may consume a reset.",
 			resetAccountChanged: "The signed-in account changed. Start again.",
 			creditsNote: "Shows only extra Credits, spending caps, or quota resets returned for this account or workspace; these are separate items.",
 			creditsUsed: "{used} / {limit} credits used",
@@ -344,6 +358,7 @@ window.__ModuleLoader__.load({
 			modelFailed: "Could not load models: {value}",
 			groupFailed: "{name}: {value}",
 			imageGenerate: "Generate image",
+			imageBeta: "Beta",
 			imageGenerating: "Generating…",
 			imageGenerated: "Generated",
 			imageFailed: "Generation failed",
@@ -353,7 +368,13 @@ window.__ModuleLoader__.load({
 			imageLoading: "Loading image…",
 			imageLoadFailed: "Image failed to load. Click to retry",
 			imagePreview: "Image preview",
-			imageClosePreview: "Close preview"
+			imageClosePreview: "Close preview",
+			imageDownload: "Download original",
+			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."
 		};
 		const STYLE = `
 .codexSubscription{display:flex;flex-direction:column;gap:10px;max-width:720px;color:var(--dsw-alias-label-primary);container-type:inline-size}
@@ -372,7 +393,7 @@ window.__ModuleLoader__.load({
 .codexSubscriptionFlow p{font-size:13px;line-height:20px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionCode{width:max-content;max-width:100%;font:600 16px/22px ui-monospace,SFMono-Regular,Consolas,monospace;letter-spacing:.08em;overflow-wrap:anywhere}
 .codexSubscriptionError{font-size:13px;line-height:20px;color:var(--dsw-alias-state-error-primary)}.codexSubscriptionInput{width:100%;box-sizing:border-box}
 .codexSubscriptionRecover{display:flex;align-items:center;justify-content:space-between;gap:12px}.codexSubscriptionRecover .codexSubscriptionError{flex:1}.codexSubscriptionRecover button{flex:0 0 auto}
-.codexSubscriptionDiagnostics pre{max-height:240px;margin:0;padding:10px 12px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;font:11px/17px ui-monospace,SFMono-Regular,Consolas,monospace;color:var(--dsw-alias-label-secondary)}
+.codexSubscriptionDiagnostics pre{max-height:240px;margin:0;padding:10px 12px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;font:11px/17px ui-monospace,SFMono-Regular,Consolas,monospace;color:var(--dsw-alias-label-secondary)}.codexSubscriptionLink{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;min-height:32px;padding:0 13px;border:1px solid var(--dsw-alias-border-l2);border-radius:999px;background:transparent;color:var(--dsw-alias-label-primary);font-size:13px;line-height:20px;text-decoration:none;white-space:nowrap}.codexSubscriptionLink:hover{background:var(--dsw-alias-bg-module-platform)}.codexSubscriptionLink:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:2px}
 .codexSubscriptionSectionTitle{display:flex;flex:1;min-width:0;flex-direction:column;gap:2px}.codexSubscriptionFreshness{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
 .codexSubscriptionRefresh{flex:0 0 auto;min-width:72px;width:max-content;white-space:nowrap!important;word-break:keep-all!important;overflow-wrap:normal!important;writing-mode:horizontal-tb!important}.codexSubscriptionRefresh *{white-space:nowrap!important;word-break:keep-all!important;writing-mode:horizontal-tb!important}
 .codexSubscriptionEmpty{padding:18px;border:1px dashed var(--dsw-alias-border-l3);border-radius:10px;text-align:center;font-size:13px;line-height:20px;color:var(--dsw-alias-label-tertiary)}
@@ -382,13 +403,14 @@ window.__ModuleLoader__.load({
 .codexSubscriptionLimit progress::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexSubscriptionLimit progress::-webkit-progress-value{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}.codexSubscriptionLimit progress::-moz-progress-bar{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}.codexSubscriptionLimitMeta{display:flex;justify-content:space-between;gap:10px;flex-wrap:wrap;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
 .codexSubscriptionCreditSection{display:flex;flex-direction:column;gap:7px}.codexSubscriptionCreditNote{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionCreditRows{display:grid;grid-template-columns:repeat(auto-fit,minmax(180px,1fr));gap:8px}.codexSubscriptionCreditBalance,.codexSubscriptionSpendLimit{min-width:0;border-radius:10px;padding:12px 14px;background:var(--dsw-alias-bg-module-platform)}
 .codexSubscriptionCreditBalance{display:flex;flex-direction:column;gap:6px}.codexSubscriptionCreditBalance span,.codexSubscriptionCreditLabel{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionCreditBalance strong{font:600 18px/24px ui-monospace,SFMono-Regular,Consolas,monospace;font-variant-numeric:tabular-nums;overflow-wrap:anywhere}
-.codexSubscriptionResetSummary{display:flex;align-items:center;justify-content:space-between;gap:10px}.codexSubscriptionResetBalance{display:flex;flex-direction:column;gap:8px}.codexSubscriptionResetBalance .codexSubscriptionActions{justify-content:flex-start}.codexSubscriptionResetFlow{display:flex;flex-direction:column;gap:9px;border:1px solid var(--dsw-alias-state-warning-border,var(--dsw-alias-border-l2));border-radius:10px;padding:11px 12px;background:var(--dsw-alias-bg-module-platform)}.codexSubscriptionResetFlow h4{margin:0;font-size:13px;line-height:20px;font-weight:600}.codexSubscriptionResetWarning{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionResetCheck{display:flex;align-items:flex-start;gap:8px;font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary);cursor:pointer}.codexSubscriptionResetCheck input{margin:3px 0 0;accent-color:var(--dsw-alias-label-primary)}.codexSubscriptionResetPhrase{font:600 12px/18px ui-monospace,SFMono-Regular,Consolas,monospace}.codexSubscriptionResetFinal{border-color:var(--dsw-alias-state-error-primary)!important;color:var(--dsw-alias-state-error-primary)!important}.codexSubscriptionResetResult{font-size:12px;line-height:18px;color:var(--dsw-alias-state-success-primary)}
+.codexSubscriptionResetSummary{display:flex;align-items:center;justify-content:space-between;gap:10px}.codexSubscriptionResetMeta{display:flex;min-width:0;flex-direction:column;gap:1px}.codexSubscriptionResetBalance{display:flex;flex-direction:column;gap:8px}.codexSubscriptionResetBalance .codexSubscriptionActions{justify-content:flex-start}.codexSubscriptionResetFlow{display:flex;flex-direction:column;gap:10px;border-top:1px solid var(--dsw-alias-border-l2);padding-top:10px}.codexSubscriptionResetFlow h4{margin:0;font-size:13px;line-height:20px;font-weight:500}.codexSubscriptionResetWarning{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}.codexSubscriptionResetExpiry{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}.codexSubscriptionResetCheck{display:flex;align-items:flex-start;gap:8px;padding:9px 10px;border-radius:8px;background:var(--dsw-alias-bg-module-platform);font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary);cursor:pointer}.codexSubscriptionResetCheck input{margin:3px 0 0;accent-color:var(--dsw-alias-label-primary)}.codexSubscriptionResetFinal{border-color:var(--dsw-alias-state-error-primary)!important;color:var(--dsw-alias-state-error-primary)!important}.codexSubscriptionResetResult{font-size:12px;line-height:18px;color:var(--dsw-alias-state-success-primary)}
 .codexSubscriptionSpendLimit{display:flex;flex-direction:column;gap:8px}.codexSubscriptionSpendTop{display:flex;align-items:baseline;justify-content:space-between;gap:12px}.codexSubscriptionSpendTop strong{font:600 16px/22px ui-monospace,SFMono-Regular,Consolas,monospace;font-variant-numeric:tabular-nums}.codexSubscriptionSpendLimit progress{width:100%;height:6px;border:0;border-radius:999px;overflow:hidden;background:var(--dsw-alias-border-l3);accent-color:var(--dsw-alias-brand-primary,#3964fe);-webkit-appearance:none;appearance:none}.codexSubscriptionSpendLimit progress::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexSubscriptionSpendLimit progress::-webkit-progress-value{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}.codexSubscriptionSpendLimit progress::-moz-progress-bar{background:var(--dsw-alias-brand-primary,#3964fe);border-radius:999px}
 .codexComposerQuota{display:inline-flex;align-items:center;flex:0 0 auto;height:28px;box-sizing:border-box;padding:0;color:var(--dsw-alias-label-secondary);font-family:inherit;font-size:12px;line-height:20px;font-weight:500;font-variant-numeric:tabular-nums;white-space:nowrap;user-select:none}.codexComposerQuotaBar{display:block;width:40px;height:4px;border:0;border-radius:999px;overflow:hidden;background:var(--dsw-alias-border-l3);accent-color:var(--dsw-alias-label-secondary);-webkit-appearance:none;appearance:none}.codexComposerQuotaBar::-webkit-progress-bar{background:var(--dsw-alias-border-l3);border-radius:999px}.codexComposerQuotaBar::-webkit-progress-value{background:var(--dsw-alias-label-secondary);border-radius:999px}.codexComposerQuotaBar::-moz-progress-bar{background:var(--dsw-alias-label-secondary);border-radius:999px}
 .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}.codexGeneratedImageLightbox{position:fixed;inset:0;z-index:1000;display:flex;align-items:center;justify-content:center;padding:32px;border:0;background:rgba(0,0,0,.72)}.codexGeneratedImageLightbox img{display:block;max-width:min(1100px,calc(100vw - 64px));max-height:calc(100vh - 64px);object-fit:contain}.codexGeneratedImageClose{position:absolute;top:16px;right:16px;width:36px;height:36px;border:1px solid rgba(255,255,255,.35);border-radius:50%;background:rgba(0,0,0,.48);color:#fff;font-size:20px;line-height:1;cursor:pointer}@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%);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)}}
+.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}}
@@ -413,12 +435,20 @@ window.__ModuleLoader__.load({
 			const date = new Date(value);
 			return Number.isFinite(date.getTime()) ? date : void 0;
 		};
+		const imageDownloadName = (attachment) => {
+			const fallback = "codex-generated-image.png";
+			if (typeof attachment?.name !== "string") return fallback;
+			const cleaned = attachment.name.replace(/[<>:"/\\|?*\u0000-\u001f]/gu, "-").replace(/[. ]+$/u, "").trim();
+			if (cleaned === "") return fallback;
+			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 }) {
 			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 closeRef = (0, react.useRef)(null);
+			const [zoom, setZoom] = (0, react.useState)(1);
 			const triggerRef = (0, react.useRef)(null);
 			(0, react.useEffect)(() => {
 				let live = true;
@@ -437,25 +467,13 @@ window.__ModuleLoader__.load({
 				loadImage,
 				attempt
 			]);
-			(0, react.useEffect)(() => {
-				if (!open) return void 0;
-				const handleKeyDown = (event) => {
-					if (event.key === "Escape") {
-						event.preventDefault();
-						setOpen(false);
-					} else if (event.key === "Tab") {
-						event.preventDefault();
-						closeRef.current?.focus();
-					}
-				};
-				document.addEventListener("keydown", handleKeyDown);
-				closeRef.current?.focus();
-				return () => {
-					document.removeEventListener("keydown", handleKeyDown);
-					triggerRef.current?.focus();
-				};
-			}, [open]);
+			const close = () => {
+				setOpen(false);
+				window.requestAnimationFrame(() => triggerRef.current?.focus());
+			};
 			const label = attachment.name ?? t("imageLabel");
+			const downloadName = imageDownloadName(attachment);
+			const imageMeta = `${attachment.width} × ${attachment.height} · ${imageByteSize(attachment.bytes)}`;
 			if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
 				className: "codexGeneratedImageRetry",
@@ -469,30 +487,84 @@ window.__ModuleLoader__.load({
 				title: t("imageOpen"),
 				"aria-label": fill(t("imageOpenNamed"), { value: label }),
 				onClick: () => {
-					if (src !== void 0) setOpen(true);
+					if (src !== void 0) {
+						setZoom(1);
+						setOpen(true);
+					}
 				},
 				children: src === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("imageLoading") }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
 					src,
 					alt: label
 				})
-			}), !open || src === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "codexGeneratedImageLightbox",
-				role: "dialog",
-				"aria-modal": "true",
-				"aria-label": t("imagePreview"),
-				onClick: () => setOpen(false),
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
-					src,
-					alt: label,
-					onClick: (event) => event.stopPropagation()
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-					ref: closeRef,
-					type: "button",
-					className: "codexGeneratedImageClose",
-					"aria-label": t("imageClosePreview"),
-					onClick: () => setOpen(false),
-					children: "×"
-				})]
+			}), 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") })]
+						})
+					]
+				})
 			})] });
 		}
 		function CodexImageToolRow({ block, loadImage, t }) {
@@ -517,6 +589,10 @@ window.__ModuleLoader__.load({
 								className: "codexImageToolTitle",
 								children: t("imageGenerate")
 							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "codexImageBeta",
+								children: t("imageBeta")
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "codexImageToolState",
 								children: status
@@ -1311,18 +1387,28 @@ window.__ModuleLoader__.load({
 							})]
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "codexSubscriptionActions",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-								type: "button",
-								variant: "outline",
-								disabled: busy,
-								onClick: load,
-								children: t("diagnosticsLoad")
-							}), report === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-								type: "button",
-								variant: "outline",
-								onClick: copy,
-								children: copied ? t("diagnosticsCopied") : t("diagnosticsCopy")
-							})]
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									type: "button",
+									variant: "outline",
+									disabled: busy,
+									onClick: load,
+									children: t("diagnosticsLoad")
+								}),
+								report === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									type: "button",
+									variant: "outline",
+									onClick: copy,
+									children: copied ? t("diagnosticsCopied") : t("diagnosticsCopy")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
+									className: "codexSubscriptionLink",
+									href: SUPPORT_ISSUE_URL,
+									target: "_blank",
+									rel: "noreferrer",
+									children: t("feedbackOpen")
+								})
+							]
 						})]
 					}),
 					report === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", { children: JSON.stringify(report, null, 2) }),
@@ -1349,14 +1435,49 @@ window.__ModuleLoader__.load({
 				children: fill(t("resets"), { value })
 			});
 		}
-		function ResetCreditControl({ rpc, t, count, exhausted, onConsumed }) {
+		function ResetCreditExpiry({ expiresAt, t }) {
+			const date = validDate(expiresAt);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "codexSubscriptionResetExpiry",
+				children: date === void 0 ? t("resetCreditExpiryUnknown") : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("time", {
+					dateTime: date.toISOString(),
+					title: date.toLocaleString(),
+					children: fill(t("resetCreditExpires"), { value: date.toLocaleString() })
+				})
+			});
+		}
+		function ResetCreditControl({ rpc, t, count, nextExpiresAt, hasExhaustedQuota, onConsumed }) {
 			const [challenge, setChallenge] = (0, react.useState)();
 			const [resetBusy, setResetBusy] = (0, react.useState)(false);
 			const [resetAcknowledged, setResetAcknowledged] = (0, react.useState)(false);
-			const [resetPhrase, setResetPhrase] = (0, react.useState)("");
 			const [resetCountdown, setResetCountdown] = (0, react.useState)(0);
 			const [resetError, setResetError] = (0, react.useState)();
 			const [resetResult, setResetResult] = (0, react.useState)();
+			const [inspectedExpiry, setInspectedExpiry] = (0, react.useState)(nextExpiresAt);
+			const [expiryState, setExpiryState] = (0, react.useState)(nextExpiresAt === void 0 ? "loading" : "ready");
+			(0, react.useEffect)(() => {
+				if (nextExpiresAt !== void 0) {
+					setInspectedExpiry(nextExpiresAt);
+					setExpiryState("ready");
+					return;
+				}
+				let live = true;
+				setExpiryState("loading");
+				rpc.call(CHANNEL, "reset-credit/inspect", {}).then(unwrap).then((value) => {
+					if (!live) return;
+					setInspectedExpiry(value.nextExpiresAt);
+					setExpiryState("ready");
+				}).catch(() => {
+					if (live) setExpiryState("error");
+				});
+				return () => {
+					live = false;
+				};
+			}, [
+				rpc,
+				count,
+				nextExpiresAt
+			]);
 			(0, react.useEffect)(() => {
 				if (challenge === void 0) {
 					setResetCountdown(0);
@@ -1368,24 +1489,22 @@ window.__ModuleLoader__.load({
 				return () => window.clearInterval(timer);
 			}, [challenge]);
 			const prepareReset = () => {
-				if (resetBusy || !exhausted) return;
+				if (resetBusy) return;
 				setResetBusy(true);
 				setResetError(void 0);
 				setResetResult(void 0);
 				rpc.call(CHANNEL, "reset-credit/prepare", {}).then(unwrap).then((next) => {
 					setChallenge(next);
 					setResetAcknowledged(false);
-					setResetPhrase("");
 				}).catch((error) => setResetError(resetCreditErrorText(error, t))).finally(() => setResetBusy(false));
 			};
 			const cancelReset = () => {
 				if (resetBusy) return;
 				setChallenge(void 0);
 				setResetAcknowledged(false);
-				setResetPhrase("");
 				setResetError(void 0);
 			};
-			const resetReady = challenge !== void 0 && resetAcknowledged && resetPhrase === challenge.confirmPhrase && resetCountdown === 0;
+			const resetReady = challenge !== void 0 && resetAcknowledged && resetCountdown === 0;
 			const consumeReset = () => {
 				if (resetBusy) return;
 				if (!resetReady) return;
@@ -1394,11 +1513,10 @@ window.__ModuleLoader__.load({
 				setResetResult(void 0);
 				rpc.call(CHANNEL, "reset-credit/consume", {
 					challengeId: challenge.challengeId,
-					phrase: resetPhrase
+					acknowledged: resetAcknowledged
 				}).then(unwrap).then((result) => {
 					setChallenge(void 0);
 					setResetAcknowledged(false);
-					setResetPhrase("");
 					const message = result.code === "reset" ? t("resetSuccess") : result.code === "nothing_to_reset" ? t("resetNothing") : result.code === "no_credit" ? t("resetNoCredit") : t("resetAlready");
 					setResetResult(message);
 					onConsumed();
@@ -1409,14 +1527,26 @@ window.__ModuleLoader__.load({
 				children: [
 					challenge === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "codexSubscriptionResetSummary",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: fill(t("resetCreditsValue"), { count }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "codexSubscriptionResetMeta",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: fill(t("resetCreditsValue"), { count }) }), expiryState === "loading" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "codexSubscriptionResetExpiry",
+								role: "status",
+								children: t("resetCreditExpiryLoading")
+							}) : expiryState === "error" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "codexSubscriptionResetExpiry",
+								children: t("resetCreditExpiryFailed")
+							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditExpiry, {
+								expiresAt: inspectedExpiry,
+								t
+							})]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "codexSubscriptionActions",
 							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 								type: "button",
 								variant: "outline",
-								disabled: !exhausted || resetBusy,
+								disabled: resetBusy,
 								"aria-busy": resetBusy,
-								title: !exhausted ? t("resetUnavailable") : void 0,
 								onClick: prepareReset,
 								children: resetBusy ? t("resetPreparing") : t("resetUse")
 							})
@@ -1434,9 +1564,13 @@ window.__ModuleLoader__.load({
 								className: "codexSubscriptionResetWarning",
 								children: challenge.description
 							}) : null,
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ResetCreditExpiry, {
+								expiresAt: challenge.creditExpiresAt,
+								t
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "codexSubscriptionResetWarning",
-								children: t("resetWarning")
+								children: t(hasExhaustedQuota ? "resetWarning" : "resetEarlyWarning")
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
 								className: "codexSubscriptionResetCheck",
@@ -1447,20 +1581,6 @@ window.__ModuleLoader__.load({
 									onChange: (event) => setResetAcknowledged(event.target.checked)
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("resetAcknowledge") })]
 							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-								className: "codexSubscriptionPreferenceCopy",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "codexSubscriptionCreditLabel",
-									children: fill(t("resetTypeHint"), { phrase: challenge.confirmPhrase })
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
-									className: "codexSubscriptionInput codexSubscriptionResetPhrase",
-									value: resetPhrase,
-									disabled: resetBusy,
-									autoComplete: "off",
-									spellCheck: false,
-									onChange: (event) => setResetPhrase(event.target.value)
-								})]
-							}),
 							resetCountdown > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "codexSubscriptionCreditNote",
 								role: "status",
@@ -1509,8 +1629,7 @@ window.__ModuleLoader__.load({
 				["This quota reset confirmation is no longer valid", "resetExpired"],
 				["This quota reset is already in progress", "resetInProgress"],
 				["Wait before confirming this quota reset", "resetTooEarly"],
-				["The quota reset confirmation phrase does not match", "resetPhraseMismatch"],
-				["The current Codex quota is not exhausted", "resetNotExhausted"],
+				["You must acknowledge that this may consume one quota reset", "resetAcknowledgeRequired"],
 				["The signed-in ChatGPT account changed", "resetAccountChanged"]
 			])).get(error instanceof Error ? error.message : "") ?? "resetFailed");
 		}
@@ -1648,7 +1767,8 @@ window.__ModuleLoader__.load({
 										rpc,
 										t,
 										count: visibleUsage.resetCredits.availableCount,
-										exhausted,
+										nextExpiresAt: visibleUsage.resetCredits.nextExpiresAt,
+										hasExhaustedQuota: exhausted,
 										onConsumed: () => load(true)
 									})]
 								}) : null,

package/lib/index.js

@@ -448,6 +448,7 @@ const normalizeQuickQuotaMode = (value, legacyVisible = false) => [
 const supportsCodexFastMode = (modelId) => typeof modelId === "string" && (/^gpt-5\.(?:5|6)(?:$|-)/u.test(modelId) || modelId === "gpt-5.4");
 //#endregion
 //#region src/pi-ai-runtime.js
+const FAST_SERVICE_TIER = "priority";
 /**
 * Preserve pi-ai's native Codex OAuth provider while allowing DSH's generic
 * PiAiAdapter to pass the access token resolved by the host credential store.
@@ -478,15 +479,15 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0 } = {
 		const onPayload = options.onPayload;
 		return {
 			...options,
-			serviceTier: "fast",
+			serviceTier: FAST_SERVICE_TIER,
 			async onPayload(payload, requestModel) {
 				const fastPayload = {
 					...payload,
-					service_tier: "fast"
+					service_tier: FAST_SERVICE_TIER
 				};
 				return {
 					...await onPayload?.(fastPayload, requestModel) ?? fastPayload,
-					service_tier: "fast"
+					service_tier: FAST_SERVICE_TIER
 				};
 			}
 		};
@@ -503,7 +504,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0 } = {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.4.1";
+const PACKAGE_VERSION = "1.6.0";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-search.js
@@ -626,7 +627,9 @@ function createCodexSearchProvider(options) {
 //#region src/codex-images.js
 const CODEX_IMAGE_TOOL_NAME = "codex_image_generate";
 const CODEX_IMAGE_GENERATION_URL = "https://chatgpt.com/backend-api/codex/images/generations";
+const CODEX_IMAGE_EDIT_URL = "https://chatgpt.com/backend-api/codex/images/edits";
 const IMAGE_MODEL = "gpt-image-2";
+const MAX_REFERENCE_IMAGES = 5;
 const RESPONSE_ENVELOPE_BYTES = 1024 * 1024;
 const PNG_SIGNATURE = Buffer.from([
 	137,
@@ -695,6 +698,24 @@ function imageReference(value) {
 		...value.name === void 0 ? {} : { name: value.name }
 	};
 }
+function referenceOf(value, attachments) {
+	if (!record$2(value) || typeof value.attachmentId !== "string" || value.attachmentId.length === 0 || value.attachmentId.length > 256 || !attachments.imageLimits.mediaTypes.includes(value.mediaType) || !Number.isSafeInteger(value.bytes) || value.bytes <= 0 || !Number.isSafeInteger(value.width) || value.width <= 0 || !Number.isSafeInteger(value.height) || value.height <= 0 || value.name !== void 0 && (typeof value.name !== "string" || value.name.length > 256)) throw new Error("referenceImages contains an invalid image reference");
+	return imageReference(value);
+}
+async function editImages(values, attachments, signal) {
+	if (!Array.isArray(values) || values.length === 0 || values.length > MAX_REFERENCE_IMAGES) throw new Error(`referenceImages must contain between 1 and ${MAX_REFERENCE_IMAGES} images`);
+	const references = values.map((value) => referenceOf(value, attachments));
+	if (new Set(references.map((value) => value.attachmentId)).size !== references.length) throw new Error("referenceImages must not contain duplicates");
+	const images = [];
+	let totalBytes = 0;
+	for (const reference of references) {
+		const stored = await attachments.readImage(reference, signal);
+		totalBytes += stored.data.byteLength;
+		if (totalBytes > attachments.imageLimits.maxMessageImageBytes) throw new Error("referenceImages exceed the DSH message image limit");
+		images.push({ image_url: `data:${stored.ref.mediaType};base64,${Buffer.from(stored.data).toString("base64")}` });
+	}
+	return images;
+}
 function imageContent(value) {
 	return [{
 		type: "text",
@@ -761,12 +782,45 @@ function createCodexImageTool(options) {
 	const attachments = options.attachments;
 	return defineTool({
 		name: CODEX_IMAGE_TOOL_NAME,
-		description: "Generate an image from a detailed description using the signed-in Codex subscription. Use this whenever the user asks to create an image.",
-		parameters: { prompt: {
-			type: "string",
-			required: true,
-			description: "A complete, production-ready description of the image to generate."
-		} },
+		description: "Create a new image or explicitly edit selected prior images using the signed-in Codex subscription. Omit referenceImages for a completely new image. Include only the exact prior image references the user asked to edit; never assume every image in the conversation is a reference.",
+		parameters: {
+			prompt: {
+				type: "string",
+				required: true,
+				description: "A complete, production-ready description of the image to generate."
+			},
+			referenceImages: {
+				type: "array",
+				description: "Optional explicit references to 1-5 prior images to edit. Omit for a new image.",
+				items: {
+					type: "object",
+					additionalProperties: false,
+					properties: {
+						attachmentId: {
+							type: "string",
+							required: true
+						},
+						mediaType: {
+							type: "string",
+							required: true
+						},
+						bytes: {
+							type: "integer",
+							required: true
+						},
+						width: {
+							type: "integer",
+							required: true
+						},
+						height: {
+							type: "integer",
+							required: true
+						},
+						name: { type: "string" }
+					}
+				}
+			}
+		},
 		output: {
 			schema: imageOutputSchema(),
 			render: (_args, value) => imageContent(value)
@@ -783,9 +837,11 @@ function createCodexImageTool(options) {
 			if (typeof access !== "string" || access.length === 0 || typeof accountId !== "string" || accountId.length === 0) throw new Error("ChatGPT subscription is not signed in");
 			if (!attachments.imageLimits.mediaTypes.includes("image/png")) throw new Error("This DSH installation does not accept PNG image attachments");
 			const maximumBytes = Math.min(attachments.imageLimits.maxImageBytes, attachments.imageLimits.maxMessageImageBytes);
+			const editing = args.referenceImages !== void 0;
+			const images = editing ? await editImages(args.referenceImages, attachments, exec.signal) : void 0;
 			let response;
 			try {
-				response = await fetchImage(CODEX_IMAGE_GENERATION_URL, {
+				response = await fetchImage(editing ? CODEX_IMAGE_EDIT_URL : CODEX_IMAGE_GENERATION_URL, {
 					method: "POST",
 					redirect: "error",
 					headers: {
@@ -798,6 +854,7 @@ function createCodexImageTool(options) {
 						"user-agent": USER_AGENT
 					},
 					body: JSON.stringify({
+						...images === void 0 ? {} : { images },
 						prompt,
 						background: "auto",
 						model: IMAGE_MODEL,
@@ -808,12 +865,12 @@ function createCodexImageTool(options) {
 				});
 			} catch (error) {
 				if (exec.signal.aborted) throw exec.signal.reason;
-				throw new Error("Codex image generation request failed", { cause: error });
+				throw new Error(`Codex image ${editing ? "edit" : "generation"} request failed`, { cause: error });
 			}
 			if (!response.ok) {
 				if (response.status === 401 || response.status === 403) throw new Error("ChatGPT sign-in needs to be renewed");
 				if (response.status === 429) throw new Error("Codex image generation quota is unavailable");
-				throw new Error(`Codex image generation failed (HTTP ${response.status})`);
+				throw new Error(`Codex image ${editing ? "edit" : "generation"} failed (HTTP ${response.status})`);
 			}
 			const metadata = responseMetadata(await readJsonWithin(response, encodedLimit(maximumBytes) + RESPONSE_ENVELOPE_BYTES));
 			const data = decodeCodexPng(metadata.encoded, maximumBytes);
@@ -948,7 +1005,18 @@ function spendControlReachedOf(value) {
 function resetCreditsOf(value) {
 	if (value === void 0 || value === null) return void 0;
 	if (!record$1(value) || !Number.isSafeInteger(value.available_count) || value.available_count < 0) throw new Error("Codex returned malformed reset credit details");
-	return { availableCount: value.available_count };
+	if (value.credits !== void 0 && value.credits !== null && !Array.isArray(value.credits)) throw new Error("Codex returned malformed reset credit details");
+	const expirations = (value.credits ?? []).filter((credit) => record$1(credit) && credit.status?.toLowerCase?.() === "available").map((credit) => {
+		if (Number.isSafeInteger(credit.expires_at) && credit.expires_at > 0) return credit.expires_at * 1e3;
+		if (typeof credit.expires_at === "string" && credit.expires_at.length <= 64) {
+			const parsed = Date.parse(credit.expires_at);
+			if (Number.isFinite(parsed) && parsed > 0) return parsed;
+		}
+	}).filter((expiration) => expiration !== void 0);
+	return {
+		availableCount: value.available_count,
+		...expirations.length === 0 ? {} : { nextExpiresAt: Math.min(...expirations) }
+	};
 }
 /** Reduce the provider payload to a browser-safe quota projection. */
 function parseCodexUsage(value) {
@@ -1054,7 +1122,6 @@ function createCodexUsageReader(options) {
 //#region src/reset-credits.js
 const CODEX_RESET_CREDITS_URL = "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits";
 const CODEX_RESET_CONSUME_URL = `${CODEX_RESET_CREDITS_URL}/consume`;
-const RESET_CONFIRM_PHRASE = "USE RESET";
 const DEFAULT_CONFIRM_DELAY_MS = 5e3;
 const DEFAULT_CHALLENGE_TTL_MS = 6e4;
 const DEFAULT_TIMEOUT_MS = 15e3;
@@ -1076,15 +1143,22 @@ function credentialsOf(auth, credential) {
 		accountId
 	};
 }
+function expirationOf(value) {
+	if (value === void 0 || value === null) return void 0;
+	if (Number.isSafeInteger(value) && value > 0) return value * 1e3;
+	if (typeof value === "string" && value.length > 0 && value.length <= 64) {
+		const parsed = Date.parse(value);
+		if (Number.isFinite(parsed) && parsed > 0) return parsed;
+	}
+	throw new Error("ChatGPT returned malformed quota reset details");
+}
 function parseDetails(value, now) {
 	if (!record(value) || !Number.isSafeInteger(value.available_count) || value.available_count < 0 || !Array.isArray(value.credits)) throw new Error("ChatGPT returned malformed quota reset details");
 	if (value.available_count === 0) throw new Error("No quota reset is available");
 	const available = value.credits.filter((credit) => record(credit) && typeof credit.id === "string" && credit.id.length > 0 && credit.id.length <= 256 && typeof credit.status === "string" && credit.status.toLowerCase() === "available").map((credit) => {
-		const expiresAt = credit.expires_at === void 0 || credit.expires_at === null ? void 0 : credit.expires_at * 1e3;
-		if (expiresAt !== void 0 && (!Number.isSafeInteger(credit.expires_at) || credit.expires_at <= 0)) throw new Error("ChatGPT returned malformed quota reset details");
 		return {
 			credit,
-			expiresAt
+			expiresAt: expirationOf(credit.expires_at)
 		};
 	}).filter(({ expiresAt }) => expiresAt === void 0 || expiresAt > now).sort((a, b) => (a.expiresAt ?? Number.MAX_SAFE_INTEGER) - (b.expiresAt ?? Number.MAX_SAFE_INTEGER));
 	if (available.length === 0) throw new Error("No usable quota reset is available");
@@ -1104,14 +1178,13 @@ function parseConsumeResult(value) {
 		"already_redeemed"
 	].includes(value.code)) throw new Error("ChatGPT returned an unreadable quota reset response");
 	const windowsReset = Array.isArray(value.windows_reset) ? value.windows_reset.filter((item) => typeof item === "string").slice(0, 16) : [];
+	const windowsResetCount = Number.isSafeInteger(value.windows_reset) && value.windows_reset >= 0 && value.windows_reset <= 16 ? value.windows_reset : void 0;
 	return {
 		code: value.code,
-		windowsReset
+		windowsReset,
+		...windowsResetCount === void 0 ? {} : { windowsResetCount }
 	};
 }
-function quotaIsExhausted(usage) {
-	return Array.isArray(usage?.rateLimits) && usage.rateLimits.some((limit) => limit?.id !== "code_review" && Array.isArray(limit?.windows) && limit.windows.some((window) => Number.isFinite(window?.usedPercent) && window.usedPercent >= 100));
-}
 /**
 * Host-only reset redemption. The browser receives an opaque, short-lived
 * challenge; account ids, bearer tokens, credit ids, and idempotency keys stay
@@ -1129,29 +1202,42 @@ function createCodexResetCreditService(options) {
 	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 	const challenges = /* @__PURE__ */ new Map();
 	const resolveCredentials = async (signal) => credentialsOf(await getAuth({ signal }), await readCredential({ signal }));
+	const readDetails = async (signal) => {
+		const { access, accountId } = await resolveCredentials(signal);
+		const response = await fetchReset(CODEX_RESET_CREDITS_URL, {
+			method: "GET",
+			redirect: "error",
+			headers: {
+				authorization: `Bearer ${access}`,
+				"chatgpt-account-id": accountId,
+				accept: "application/json",
+				"cache-control": "no-store",
+				"user-agent": USER_AGENT
+			},
+			signal: requestSignal(signal, timeoutMs)
+		});
+		if (!response.ok) throw new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT quota reset request failed (HTTP ${response.status})`);
+		let raw;
+		try {
+			raw = await response.json();
+		} catch {
+			throw new Error("ChatGPT returned unreadable quota reset details");
+		}
+		return {
+			accountId,
+			details: parseDetails(raw, now())
+		};
+	};
 	return Object.freeze({
+		async inspect({ signal } = {}) {
+			const { details } = await readDetails(signal);
+			return {
+				availableCount: details.availableCount,
+				...details.creditExpiresAt === void 0 ? {} : { nextExpiresAt: details.creditExpiresAt }
+			};
+		},
 		async prepare({ signal } = {}) {
-			const { access, accountId } = await resolveCredentials(signal);
-			const response = await fetchReset(CODEX_RESET_CREDITS_URL, {
-				method: "GET",
-				redirect: "error",
-				headers: {
-					authorization: `Bearer ${access}`,
-					"chatgpt-account-id": accountId,
-					accept: "application/json",
-					"cache-control": "no-store",
-					"user-agent": USER_AGENT
-				},
-				signal: requestSignal(signal, timeoutMs)
-			});
-			if (!response.ok) throw new Error(response.status === 401 || response.status === 403 ? "ChatGPT sign-in needs to be renewed" : `ChatGPT quota reset request failed (HTTP ${response.status})`);
-			let raw;
-			try {
-				raw = await response.json();
-			} catch {
-				throw new Error("ChatGPT returned unreadable quota reset details");
-			}
-			const details = parseDetails(raw, now());
+			const { accountId, details } = await readDetails(signal);
 			const preparedAt = now();
 			const readyAt = preparedAt + confirmDelayMs;
 			const expiresAt = Math.min(preparedAt + challengeTtlMs, details.creditExpiresAt ?? Number.MAX_SAFE_INTEGER);
@@ -1168,14 +1254,14 @@ function createCodexResetCreditService(options) {
 			return {
 				challengeId,
 				availableCount: details.availableCount,
-				confirmPhrase: RESET_CONFIRM_PHRASE,
 				readyAt,
 				expiresAt,
+				...details.creditExpiresAt === void 0 ? {} : { creditExpiresAt: details.creditExpiresAt },
 				...details.title === void 0 ? {} : { title: details.title },
 				...details.description === void 0 ? {} : { description: details.description }
 			};
 		},
-		async consume({ challengeId, phrase, signal } = {}) {
+		async consume({ challengeId, acknowledged, signal } = {}) {
 			const challenge = typeof challengeId === "string" ? challenges.get(challengeId) : void 0;
 			if (challenge === void 0) throw new Error("This quota reset confirmation is no longer valid");
 			if (challenge.state === "pending") throw new Error("This quota reset is already in progress");
@@ -1184,13 +1270,9 @@ function createCodexResetCreditService(options) {
 				challenges.delete(challengeId);
 				throw new Error("This quota reset confirmation is no longer valid");
 			}
-			if (phrase !== "USE RESET") throw new Error("The quota reset confirmation phrase does not match");
+			if (acknowledged !== true) throw new Error("You must acknowledge that this may consume one quota reset");
 			challenge.state = "pending";
 			try {
-				if (!quotaIsExhausted(await usageReader.read({
-					force: true,
-					signal
-				}))) throw new Error("The current Codex quota is not exhausted");
 				const { access, accountId } = await resolveCredentials(signal);
 				if (accountId !== challenge.accountId) throw new Error("The signed-in ChatGPT account changed");
 				const response = await fetchReset(CODEX_RESET_CONSUME_URL, {
@@ -1317,13 +1399,13 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			const message = error instanceof Error && known.has(error.message) ? error.message : "Could not read ChatGPT usage";
 			return publicError("internal", message);
 		}
-		if (endpoint === "reset-credit/prepare" || endpoint === "reset-credit/consume") try {
+		if (endpoint === "reset-credit/inspect" || endpoint === "reset-credit/prepare" || endpoint === "reset-credit/consume") try {
 			signal.throwIfAborted();
 			return {
 				ok: true,
-				value: endpoint === "reset-credit/prepare" ? await resetCreditService.prepare({ signal }) : await resetCreditService.consume({
+				value: endpoint === "reset-credit/inspect" ? await resetCreditService.inspect({ signal }) : endpoint === "reset-credit/prepare" ? await resetCreditService.prepare({ signal }) : await resetCreditService.consume({
 					challengeId: payload?.challengeId,
-					phrase: payload?.phrase,
+					acknowledged: payload?.acknowledged,
 					signal
 				})
 			};
@@ -1338,11 +1420,10 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 				"This quota reset confirmation is no longer valid",
 				"This quota reset is already in progress",
 				"Wait before confirming this quota reset",
-				"The quota reset confirmation phrase does not match",
-				"The current Codex quota is not exhausted",
+				"You must acknowledge that one quota reset will be consumed",
 				"The signed-in ChatGPT account changed"
 			]);
-			const fallback = endpoint === "reset-credit/prepare" ? "Could not prepare a quota reset" : "Could not use the quota reset";
+			const fallback = endpoint === "reset-credit/inspect" ? "Could not read quota reset details" : endpoint === "reset-credit/prepare" ? "Could not prepare a quota reset" : "Could not use the quota reset";
 			const message = error instanceof Error && known.has(error.message) ? error.message : fallback;
 			return publicError("internal", message);
 		}
@@ -1483,4 +1564,4 @@ function apply(ctx) {
 	ctx.effect(() => ctx.connection.rpc.handle(CHANNEL, handler, { authority: "loopback" }), "codex-subscription: loopback account RPC");
 }
 //#endregion
-export { CODEX_IMAGE_GENERATION_URL, CODEX_IMAGE_TOOL_NAME, CODEX_RESET_CONSUME_URL, CODEX_RESET_CREDITS_URL, CODEX_USAGE_URL, CodexLoginCoordinator, DshOAuthCredentialStore, RESET_CONFIRM_PHRASE, apply, assertCodexAuthUrl, commandForCodexAuthUrl, createCodexAuthService, createCodexImageTool, createCodexResetCreditService, createCodexRpcHandler, createCodexUsageReader, createSearchProviderSwitcher, createSubscriptionDiagnostics, createSubscriptionRpcHandler, decodeCodexPng, inject, name, openCodexAuthUrl, parseCodexUsage };
+export { CODEX_IMAGE_GENERATION_URL, CODEX_IMAGE_TOOL_NAME, CODEX_RESET_CONSUME_URL, CODEX_RESET_CREDITS_URL, CODEX_USAGE_URL, CodexLoginCoordinator, DshOAuthCredentialStore, apply, assertCodexAuthUrl, commandForCodexAuthUrl, createCodexAuthService, createCodexImageTool, createCodexResetCreditService, createCodexRpcHandler, createCodexUsageReader, createSearchProviderSwitcher, createSubscriptionDiagnostics, createSubscriptionRpcHandler, decodeCodexPng, inject, name, openCodexAuthUrl, parseCodexUsage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "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",