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

@@ -48,7 +48,7 @@ DSH-Portable exposes the same standard plugin command, so the command above also
 | **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** | 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 |
+| **Subscription search** | Explicitly route search globally through DSH default search or the signed-in Codex subscription |
 | **Codex image generation and editing (Beta)** | Generate without references, or explicitly edit one selected image; preview, zoom, annotate regions, download the original, and continue in the same composer |
 | **Fast mode** | Switch between Standard and Fast directly in the composer |
 | **Model-aware context** | Keep catalog defaults, use each model's supported extended window, or enter a full numeric token limit for each model |
@@ -58,21 +58,16 @@ These capabilities reuse the same local ChatGPT sign-in. Subscription routing fa
 ## Product screen
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/settings-focus-en.png" width="820" alt="Codex subscription settings in DeepSeek Harness">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/context-settings-en.png" width="820" alt="Current Codex subscription settings in DeepSeek Harness with search, model-aware context, composer quota, and support diagnostics">
 </p>
 
-<details>
-<summary>View the complete settings screen</summary>
-
-![Complete Codex subscription settings in DeepSeek Harness](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/settings-en.png)
-
-</details>
+Captured from the installed official DeepSeek Harness `0.1.1-rc.2` product with the current plugin build.
 
 ## Prepare DSH
 
 This plugin is currently compatible through DeepSeek Harness `0.1.1-rc.2` and requires a ChatGPT account that currently has Codex access.
 
-- Do not want to configure Node.js? Use [DSH-Portable](https://github.com/WSL043/DSH-Portable), a community desktop distribution with portable and installed editions for Windows plus desktop packages for macOS and Linux.
+- Do not want to configure Node.js? Use [DSH-Portable](https://github.com/WSL043/DSH-Portable), a community portable desktop distribution for Windows, macOS, and Linux.
 - Prefer the official route? Follow the [DeepSeek Harness run guide](https://github.com/deepseek-ai/deepseek-harness#run).
 
 ## Install
@@ -142,7 +137,7 @@ Restart DSH manually after installation, then:
 
 - ChatGPT OAuth sign-in with credentials kept on the host;
 - Codex models and Beta image generation/editing directly inside DSH conversations;
-- A clear choice between DSH default search and Codex subscription search;
+- A clear global choice between DSH default search and Codex subscription search; it applies to every model and session rather than following the selected model;
 - Actual backend-provided quota, reset time, and freshness;
 - Separate standard Codex, Codex-Spark, Credits, and other independent limits;
 - Visible quota-reset count and earliest expiry, with deliberate early redemption, layered confirmation, and no automatic retry;

package/README.zh-CN.md

@@ -49,7 +49,7 @@ DSH-Portable 也提供相同的标准插件命令，因此同样使用上面的
 | **额度可见** | 普通 Codex、Spark 等服务端实际返回的额度分开显示 |
 | **输入框额度** | 可选择紧凑百分比、进度条或完全关闭输入框额度显示 |
 | **安全额度重置** | 直接查看最早到期时间，并通过冷静期和知情确认主动尝试重置 |
-| **订阅搜索** | 可在 DSH 默认搜索与 Codex 订阅搜索之间明确切换 |
+| **订阅搜索** | 可将全部模型的搜索明确路由到 DSH 默认搜索或已登录的 Codex 订阅 |
 | **Codex 图片生成与编辑（Beta）** | 可无参考图全新生成，也可明确选择会话图片继续编辑；支持预览、缩放和下载原图 |
 | **高速模式** | 直接在输入框切换标准或高速，无需离开当前会话 |
 | **模型感知上下文** | 可保留目录默认值、按模型启用扩展窗口，或为每个模型填写完整数字 Token 上限 |
@@ -59,21 +59,16 @@ DSH-Portable 也提供相同的标准插件命令，因此同样使用上面的
 ## 实际界面
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/settings-focus.png" width="820" alt="DeepSeek Harness 中的 Codex 订阅设置">
+  <img src="https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/context-settings.png" width="820" alt="当前 DeepSeek Harness Codex 订阅设置，包含搜索来源、模型感知上下文、输入框额度和支持诊断">
 </p>
 
-<details>
-<summary>查看完整设置界面</summary>
-
-![DeepSeek Harness 的完整 Codex 订阅设置](https://raw.githubusercontent.com/WSL043/dsh-codex-subscription/main/docs/assets/settings.png)
-
-</details>
+图片来自已安装的官方 DeepSeek Harness `0.1.1-rc.2` 与当前插件构建。
 
 ## 准备 DSH
 
 本插件当前适配到 DeepSeek Harness `0.1.1-rc.2`，并需要一个当前具有 Codex 使用资格的 ChatGPT 账户。
 
-- 不想配置 Node.js：使用 [DSH-Portable](https://github.com/WSL043/DSH-Portable)。这是社区桌面分发，提供 Windows 便携版和安装版，以及 macOS、Linux 桌面包；
+- 不想配置 Node.js：使用 [DSH-Portable](https://github.com/WSL043/DSH-Portable)。这是面向 Windows、macOS 和 Linux 的社区便携桌面分发；
 - 想按官方方式运行：查看 [DeepSeek Harness 官方说明](https://github.com/deepseek-ai/deepseek-harness#run)。
 
 ## 安装
@@ -142,7 +137,7 @@ dsh --profile web --dump-config
 
 - ChatGPT OAuth 登录，凭据保留在本机；
 - Codex 模型和 Beta 图片生成与编辑直接出现在 DSH 会话中；
-- DSH 默认搜索与 Codex 订阅搜索可随时切换；
+- 搜索来源是全局设置，可在 DSH 默认搜索与 Codex 订阅搜索之间切换；它对所有模型和会话生效，不会随当前模型自动切换；
 - 设置页显示服务端返回的额度、重置时间和更新时间；
 - 普通 Codex、Codex-Spark、Credits 等独立额度分开显示；
 - 显示重置卡数量与最早到期时间，也允许在额度未完全用尽时主动尝试，并经过分层确认且不会自动重试；

package/lib/client.js

@@ -49,6 +49,17 @@ window.__ModuleLoader__.load({
 		}
 		const ForwardRef = /*#__PURE__*/ react.forwardRef(BoltIcon);
 		//#endregion
+		//#region src/image-edit.js
+		function buildImageEditDraft({ prompt = "", annotations = [], translate }) {
+			if (typeof translate !== "function") throw new TypeError("translate must be a function");
+			const notes = annotations.map((annotation, index) => ({
+				number: index + 1,
+				note: typeof annotation?.note === "string" ? annotation.note.trim() : ""
+			})).filter((annotation) => annotation.note !== "").map((annotation) => String(annotation.number) + ". " + annotation.note);
+			const base = prompt.trim() === "" ? translate("imageEditDefault") : prompt.trim();
+			return notes.length === 0 ? base : base + "\n\n" + translate("imageRegionNotes") + "\n" + notes.join("\n");
+		}
+		//#endregion
 		//#region src/settings-contract.js
 		const SETTINGS_NAMESPACE = "codex-subscription";
 		const QUICK_QUOTA_MODE_FIELD = "quickQuotaMode";
@@ -212,10 +223,11 @@ window.__ModuleLoader__.load({
 			diagnosticsFailed: "无法生成诊断信息。",
 			feedbackOpen: "反馈问题",
 			searchTitle: "搜索来源",
+			searchScope: "此设置对所有模型和会话生效，不会随当前模型自动切换。",
 			searchDsh: "DSH 默认",
-			searchDshHint: "当前搜索服务",
+			searchDshHint: "所有模型使用 DSH 当前搜索服务",
 			searchCodex: "Codex 订阅",
-			searchCodexHint: "ChatGPT 订阅搜索",
+			searchCodexHint: "所有模型通过已登录的 ChatGPT 订阅搜索",
 			preferenceFailed: "设置未保存。",
 			preferenceRetry: "重试",
 			usage: "订阅额度",
@@ -354,10 +366,11 @@ window.__ModuleLoader__.load({
 			diagnosticsFailed: "Could not create diagnostics.",
 			feedbackOpen: "Report a problem",
 			searchTitle: "Search source",
+			searchScope: "Applies to every model and session; it does not switch with the selected model.",
 			searchDsh: "DSH default",
-			searchDshHint: "Current search service",
+			searchDshHint: "Use DSH's current search service for every model",
 			searchCodex: "Codex subscription",
-			searchCodexHint: "ChatGPT subscription search",
+			searchCodexHint: "Search through the signed-in ChatGPT subscription for every model",
 			preferenceFailed: "The setting was not saved.",
 			preferenceRetry: "Retry",
 			usage: "Subscription quota",
@@ -471,6 +484,7 @@ window.__ModuleLoader__.load({
 			imageRemoveAnnotation: "Remove note"
 		};
 		const STYLE = `
+.codexSubscriptionSearchHead{display:flex;flex-direction:column;gap:1px}.codexSubscriptionSearchScope{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
 .codexSubscription{display:flex;flex-direction:column;gap:10px;max-width:720px;color:var(--dsw-alias-label-primary);container-type:inline-size}
 .codexSubscription h2,.codexSubscription h3,.codexSubscription p{margin:0}.codexSubscriptionHead{display:flex;align-items:center;gap:8px;flex-wrap:wrap}
 .codexSubscription h2{font-size:16px;line-height:24px;font-weight:500}.codexSubscription h3{font-size:14px;line-height:22px;font-weight:500}
@@ -552,15 +566,7 @@ 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 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 }) {
+		function CodexGeneratedImage({ attachment, loadImage, attachForEdit, getImageViewer, t }) {
 			const [attempt, setAttempt] = (0, react.useState)(0);
 			const [error, setError] = (0, react.useState)(false);
 			const [open, setOpen] = (0, react.useState)(false);
@@ -646,7 +652,11 @@ window.__ModuleLoader__.load({
 				setEditBusy(true);
 				setEditError(false);
 				try {
-					await attachForEdit(src, downloadName, editDraft(prompt, annotations, t));
+					await attachForEdit(src, downloadName, buildImageEditDraft({
+						prompt,
+						annotations,
+						translate: t
+					}));
 					close();
 				} catch {
 					setEditError(true);
@@ -654,6 +664,35 @@ window.__ModuleLoader__.load({
 					setEditBusy(false);
 				}
 			};
+			const openImage = () => {
+				if (src === void 0) return;
+				if ((getImageViewer?.())?.open?.({
+					items: [{
+						id: attachment.attachmentId ?? downloadName,
+						src,
+						name: label,
+						width: attachment.width,
+						height: attachment.height,
+						bytes: attachment.bytes
+					}],
+					opener: triggerRef.current,
+					source: "codex-generated",
+					annotations: true,
+					editor: {
+						label: t("imageEdit"),
+						busyLabel: t("imageEditPreparing"),
+						errorLabel: t("imageEditFailed"),
+						placeholder: t("imageEditPrompt"),
+						onSubmit: ({ prompt: nextPrompt, annotations: nextAnnotations }) => attachForEdit(src, downloadName, buildImageEditDraft({
+							prompt: nextPrompt,
+							annotations: nextAnnotations,
+							translate: t
+						}))
+					}
+				}) === true) return;
+				setZoom(1);
+				setOpen(true);
+			};
 			if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
 				className: "codexGeneratedImageRetry",
@@ -819,19 +858,14 @@ window.__ModuleLoader__.load({
 				className: "codexGeneratedImageFrame",
 				title: t("imageOpen"),
 				"aria-label": fill(t("imageOpenNamed"), { value: label }),
-				onClick: () => {
-					if (src !== void 0) {
-						setZoom(1);
-						setOpen(true);
-					}
-				},
+				onClick: openImage,
 				children: src === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("imageLoading") }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
 					src,
 					alt: label
 				})
 			}), lightbox] });
 		}
-		function CodexImageToolRow({ block, loadImage, attachForEdit, t }) {
+		function CodexImageToolRow({ block, loadImage, attachForEdit, getImageViewer, 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;
@@ -869,6 +903,7 @@ window.__ModuleLoader__.load({
 							attachment: image.attachment,
 							loadImage,
 							attachForEdit,
+							getImageViewer,
 							t
 						})
 					}),
@@ -1100,7 +1135,13 @@ window.__ModuleLoader__.load({
 			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionSearch",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("searchTitle") }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "codexSubscriptionSearchHead",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("searchTitle") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "codexSubscriptionSearchScope",
+						children: t("searchScope")
+					})]
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "codexSubscriptionSearchChoices",
 					role: "radiogroup",
 					"aria-label": t("searchTitle"),
@@ -2337,6 +2378,13 @@ window.__ModuleLoader__.load({
 				inject: (sessionId) => ({
 					t,
 					loadImage: (attachment) => conversation.resolveImage(sessionId, attachment),
+					getImageViewer: () => {
+						try {
+							return ctx.get("nativeImageViewer");
+						} catch {
+							return;
+						}
+					},
 					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");

package/lib/index.js

@@ -902,7 +902,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.8.0";
+const PACKAGE_VERSION = "1.9.0";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-search.js

package/package.json

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