dsh-codex-subscription 2.6.0 → 2.6.2

package/README.en.md

@@ -106,7 +106,7 @@ This plugin supports the latest DeepSeek Harness release recorded in its package
 2. Paste this package name, with its version, into the **Package name or address** field:
 
    ```text
-   dsh-codex-subscription@2.6.0
+   dsh-codex-subscription@2.6.2
    ```
 
 3. Click **Install** and wait for completion. Follow the page instructions; save your work before restarting if requested.
@@ -118,7 +118,7 @@ Why the version is included: DSH's plugin page only installs versions that are a
 <summary>Terminal installation (with an existing dsh command)</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.0
+dsh plugin --profile web add dsh-codex-subscription@2.6.2
 ```
 
 Follow the restart instructions, then sign in under **Settings → Codex**. Both the Plugins page and the terminal use DSH's installation management.
@@ -131,7 +131,7 @@ Follow the restart instructions, then sign in under **Settings → Codex**. Both
 After signing in and selecting a Codex model in Web, install the same plugin in the Headless profile:
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.0
+dsh plugin --profile headless add dsh-codex-subscription@2.6.2
 dsh --profile headless "Reply with only the word: ok"
 ```
 
@@ -266,7 +266,7 @@ Find this plugin on the DSH **Plugins** page and use its update or uninstall act
 <summary>Terminal commands</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.0
+dsh plugin --profile web update dsh-codex-subscription@2.6.2
 ```
 
 Run only when you want to uninstall:
@@ -282,7 +282,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 reports the plugin as incompatible?</summary>
 
-DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.6.0`, then restart DSH.
+DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.6.2`, then restart DSH.
 
 </details>
 

package/README.md

@@ -106,7 +106,7 @@
 2. 在 **包名或地址** 输入框中粘贴下面的包名（已带版本号）：
 
    ```text
-   dsh-codex-subscription@2.6.0
+   dsh-codex-subscription@2.6.2
    ```
 
 3. 点击 **安装**，等待安装完成；按页面提示操作，需要重启时先保存工作。
@@ -118,7 +118,7 @@
 <summary>终端安装（已能运行 dsh 命令）</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.0
+dsh plugin --profile web add dsh-codex-subscription@2.6.2
 ```
 
 安装完成后按提示重启 DSH，再到 **设置 → Codex 订阅** 登录。插件页面和终端均由 DSH 管理安装。
@@ -131,7 +131,7 @@ dsh plugin --profile web add dsh-codex-subscription@2.6.0
 先在 Web 中完成登录并选择一次 Codex 模型，再把同一个插件安装到 Headless profile：
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.0
+dsh plugin --profile headless add dsh-codex-subscription@2.6.2
 dsh --profile headless "只回复：ok"
 ```
 
@@ -295,7 +295,7 @@ DSH 实机设置截图。
 <summary>终端方式</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.0
+dsh plugin --profile web update dsh-codex-subscription@2.6.2
 ```
 
 仅在需要卸载时运行：
@@ -311,7 +311,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 提示插件不兼容？</summary>
 
-2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.6.0`，然后重启 DSH。
+2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.6.2`，然后重启 DSH。
 
 </details>
 

package/lib/client.js

@@ -5678,6 +5678,13 @@ window.__ModuleLoader__.load({
 			inputImageDetail_original: "原图",
 			reasoningSummary: "推理摘要",
 			reasoningSummaryHint: "让模型在会话的“思考”部分给出推理摘要。自动由模型决定；简洁更短；详细更完整；关闭则不要摘要。",
+			retryPolicy: "请求重试",
+			retryPolicyHint: "请求因网络或服务端错误失败时的自动重试次数。默认沿用 DSH 的标准重试；无限会一直重试直到成功或手动停止。",
+			retryPolicy_default: "默认",
+			retryPolicy_off: "不重试",
+			retryPolicy_10: "10 次",
+			retryPolicy_20: "20 次",
+			retryPolicy_unlimited: "无限",
 			reasoningSummary_auto: "自动",
 			reasoningSummary_concise: "简洁",
 			reasoningSummary_detailed: "详细",
@@ -6271,6 +6278,13 @@ window.__ModuleLoader__.load({
 			inputImageDetail_original: "Original",
 			reasoningSummary: "Reasoning summary",
 			reasoningSummaryHint: "Shows a summary of the reasoning in the Thinking section of the conversation. Auto lets the model decide; concise is shorter; detailed is fuller; off asks for none.",
+			retryPolicy: "Request retries",
+			retryPolicyHint: "How many times a request is retried after a network or server error. Default keeps the standard DSH retries; Unlimited keeps retrying until it succeeds or you stop it.",
+			retryPolicy_default: "Default",
+			retryPolicy_off: "No retries",
+			retryPolicy_10: "10",
+			retryPolicy_20: "20",
+			retryPolicy_unlimited: "Unlimited",
 			reasoningSummary_auto: "Auto",
 			reasoningSummary_concise: "Concise",
 			reasoningSummary_detailed: "Detailed",
@@ -8388,6 +8402,15 @@ window.__ModuleLoader__.load({
 			"none"
 		]);
 		const DEFAULT_REASONING_SUMMARY = "auto";
+		const RETRY_POLICY_FIELD = "retryPolicy";
+		const RETRY_POLICIES = Object.freeze([
+			"default",
+			"off",
+			"10",
+			"20",
+			"unlimited"
+		]);
+		const DEFAULT_RETRY_POLICY = "default";
 		const INPUT_IMAGE_DETAIL_FIELD = "inputImageDetail";
 		const INPUT_IMAGE_DETAILS = Object.freeze([
 			"low",
@@ -8448,6 +8471,7 @@ window.__ModuleLoader__.load({
 			"high"
 		].includes(value) ? value : DEFAULT_OUTPUT_VERBOSITY;
 		const normalizeReasoningSummary = (value) => REASONING_SUMMARIES.includes(value) ? value : DEFAULT_REASONING_SUMMARY;
+		const normalizeRetryPolicy = (value) => RETRY_POLICIES.includes(value) ? value : DEFAULT_RETRY_POLICY;
 		const normalizeInputImageDetail = (value) => INPUT_IMAGE_DETAILS.includes(value) ? value : DEFAULT_INPUT_IMAGE_DETAIL;
 		const normalizeStreamIdleTimeoutMinutes = (value) => STREAM_IDLE_TIMEOUT_MINUTES.includes(value) ? value : 10;
 		const normalizeSpeedMode = (value) => [
@@ -8529,6 +8553,7 @@ window.__ModuleLoader__.load({
 					outputVerbosity: normalizeOutputVerbosity(value?.[OUTPUT_VERBOSITY_FIELD]),
 					inputImageDetail: normalizeInputImageDetail(value?.[INPUT_IMAGE_DETAIL_FIELD]),
 					reasoningSummary: normalizeReasoningSummary(value?.[REASONING_SUMMARY_FIELD]),
+					retryPolicy: normalizeRetryPolicy(value?.[RETRY_POLICY_FIELD]),
 					streamIdleTimeoutMinutes: normalizeStreamIdleTimeoutMinutes(value?.[STREAM_IDLE_TIMEOUT_MINUTES_FIELD]),
 					contextMode: normalizeContextMode(value?.[CONTEXT_MODE_FIELD]),
 					customContextWindow: normalizeCustomContextWindow(value?.[CUSTOM_CONTEXT_WINDOW_FIELD]),
@@ -8589,6 +8614,7 @@ window.__ModuleLoader__.load({
 						[OUTPUT_VERBOSITY_FIELD]: normalizeOutputVerbosity(value?.[OUTPUT_VERBOSITY_FIELD]),
 						[INPUT_IMAGE_DETAIL_FIELD]: normalizeInputImageDetail(value?.[INPUT_IMAGE_DETAIL_FIELD]),
 						[REASONING_SUMMARY_FIELD]: normalizeReasoningSummary(value?.[REASONING_SUMMARY_FIELD]),
+						[RETRY_POLICY_FIELD]: normalizeRetryPolicy(value?.[RETRY_POLICY_FIELD]),
 						[STREAM_IDLE_TIMEOUT_MINUTES_FIELD]: normalizeStreamIdleTimeoutMinutes(value?.[STREAM_IDLE_TIMEOUT_MINUTES_FIELD]),
 						[CONTEXT_MODE_FIELD]: normalizeContextMode(value?.[CONTEXT_MODE_FIELD]),
 						[CUSTOM_CONTEXT_WINDOW_FIELD]: normalizeCustomContextWindow(value?.[CUSTOM_CONTEXT_WINDOW_FIELD]),
@@ -9113,7 +9139,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.6.0";
+		const PACKAGE_VERSION = "2.6.2";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -10484,6 +10510,41 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		function RetryPolicyPreference({ preference, t }) {
+			const snapshot = usePreferenceSnapshot(preference);
+			const writable = snapshot.status === "ready" && snapshot.writable === true;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "codexSubscriptionPreference",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "codexSubscriptionPreferenceCopy",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "codexSubscriptionPreferenceLabel",
+						children: t("retryPolicy")
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "codexSubscriptionPreferenceHint",
+						children: t("retryPolicyHint")
+					})]
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexSubscriptionQuotaModes",
+					"data-saving": snapshot.saving || void 0,
+					"aria-busy": snapshot.saving || void 0,
+					role: "radiogroup",
+					"aria-label": t("retryPolicy"),
+					children: RETRY_POLICIES.map((value) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+						className: "codexSubscriptionQuotaMode",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+							type: "radio",
+							name: "codex-retry-policy",
+							checked: snapshot.retryPolicy === value,
+							disabled: !writable,
+							onChange: () => {
+								preference.set({ [RETRY_POLICY_FIELD]: value });
+							}
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(`retryPolicy_${value}`) })]
+					}, value))
+				})]
+			});
+		}
 		function StreamIdleTimeoutPreference({ preference, t }) {
 			const snapshot = usePreferenceSnapshot(preference);
 			const writable = snapshot.status === "ready" && snapshot.writable === true;
@@ -10792,6 +10853,11 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ReasoningSummaryPreference, {
 								preference,
 								t
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "codexSubscriptionDivider" }),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(RetryPolicyPreference, {
+								preference,
+								t
 							})
 						]
 					}),

package/lib/index.js

@@ -14,7 +14,8 @@ import { constants, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import { LlmError, createUserMessage } from "@deepseek-ai/dsh-llm";
+import * as dshLlm from "@deepseek-ai/dsh-llm";
+import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import * as dshCredentials from "@deepseek-ai/dsh-credentials";
 import { dshHomePath, resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
@@ -304,6 +305,15 @@ const REASONING_SUMMARIES = Object.freeze([
 	"none"
 ]);
 const DEFAULT_REASONING_SUMMARY = "auto";
+const RETRY_POLICY_FIELD = "retryPolicy";
+const RETRY_POLICIES = Object.freeze([
+	"default",
+	"off",
+	"10",
+	"20",
+	"unlimited"
+]);
+const DEFAULT_RETRY_POLICY = "default";
 const INPUT_IMAGE_DETAIL_FIELD = "inputImageDetail";
 const INPUT_IMAGE_DETAILS = Object.freeze([
 	"low",
@@ -359,6 +369,7 @@ const normalizeOutputVerbosity = (value) => [
 	"high"
 ].includes(value) ? value : DEFAULT_OUTPUT_VERBOSITY;
 const normalizeReasoningSummary = (value) => REASONING_SUMMARIES.includes(value) ? value : DEFAULT_REASONING_SUMMARY;
+const normalizeRetryPolicy = (value) => RETRY_POLICIES.includes(value) ? value : DEFAULT_RETRY_POLICY;
 const normalizeInputImageDetail = (value) => INPUT_IMAGE_DETAILS.includes(value) ? value : DEFAULT_INPUT_IMAGE_DETAIL;
 const normalizeStreamIdleTimeoutMinutes = (value) => STREAM_IDLE_TIMEOUT_MINUTES.includes(value) ? value : 10;
 const normalizeContextMode = (value) => [
@@ -485,6 +496,11 @@ const PREFERENCE_FIELDS = Object.freeze({
 		default: DEFAULT_REASONING_SUMMARY,
 		error: "Invalid reasoning summary preference"
 	},
+	[RETRY_POLICY_FIELD]: {
+		choices: RETRY_POLICIES,
+		default: DEFAULT_RETRY_POLICY,
+		error: "Invalid retry policy preference"
+	},
 	[INPUT_IMAGE_DETAIL_FIELD]: {
 		choices: INPUT_IMAGE_DETAILS,
 		default: DEFAULT_INPUT_IMAGE_DETAIL,
@@ -2064,7 +2080,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.6.0";
+const PACKAGE_VERSION = "2.6.2";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -2732,6 +2748,21 @@ function createSketchAgentTool(bridge, attachments, getSessionMessages = () => [
 	});
 }
 //#endregion
+//#region src/retry-policy.js
+/** @param {string} choice a RETRY_POLICIES value @param {Function | undefined} resolve DSH's resolveRetryPolicy */
+function retryPolicyFor(choice, resolve) {
+	if (choice === "default" || typeof resolve !== "function") return void 0;
+	try {
+		if (choice === "unlimited") return resolve({ mode: "always" }, "codex-subscription retryPolicy");
+		return resolve({
+			mode: "normal",
+			maxRetries: choice === "off" ? 0 : Number(choice)
+		}, "codex-subscription retryPolicy");
+	} catch {
+		return;
+	}
+}
+//#endregion
 //#region src/account-vault.js
 const VERSION = 1;
 const DEFAULT_LABEL = "Account 1";
@@ -6508,6 +6539,7 @@ function apply(ctx, config = {}) {
 				[OUTPUT_VERBOSITY_FIELD]: normalizeOutputVerbosity(settings.get()[OUTPUT_VERBOSITY_FIELD]),
 				[INPUT_IMAGE_DETAIL_FIELD]: normalizeInputImageDetail(settings.get()[INPUT_IMAGE_DETAIL_FIELD]),
 				[REASONING_SUMMARY_FIELD]: normalizeReasoningSummary(settings.get()[REASONING_SUMMARY_FIELD]),
+				[RETRY_POLICY_FIELD]: normalizeRetryPolicy(settings.get()[RETRY_POLICY_FIELD]),
 				[STREAM_IDLE_TIMEOUT_MINUTES_FIELD]: normalizeStreamIdleTimeoutMinutes(settings.get()[STREAM_IDLE_TIMEOUT_MINUTES_FIELD]),
 				[CONTEXT_MODE_FIELD]: normalizeContextMode(settings.get()[CONTEXT_MODE_FIELD]),
 				[CUSTOM_CONTEXT_WINDOW_FIELD]: normalizeCustomContextWindow(settings.get()[CUSTOM_CONTEXT_WINDOW_FIELD]),
@@ -6548,14 +6580,20 @@ function apply(ctx, config = {}) {
 		cacheRetention: "short",
 		transport: "sse"
 	});
+	const retryProfile = (choice) => {
+		const retryPolicy = retryPolicyFor(choice, dshLlm.resolveRetryPolicy);
+		return retryPolicy === void 0 ? {} : { retryPolicy };
+	};
 	let profileKey;
 	let profileSnapshot;
 	const profiles = () => {
 		const preferences = settings.get();
 		const streamIdleTimeoutMinutes = normalizeStreamIdleTimeoutMinutes(preferences[STREAM_IDLE_TIMEOUT_MINUTES_FIELD]);
+		const retryChoice = normalizeRetryPolicy(preferences[RETRY_POLICY_FIELD]);
 		const key = JSON.stringify([
 			modelCatalog.revision(),
 			streamIdleTimeoutMinutes,
+			retryChoice,
 			normalizeContextMode(preferences[CONTEXT_MODE_FIELD]),
 			preferences[CUSTOM_CONTEXT_OVERRIDES_FIELD],
 			...Object.values(CUSTOM_CONTEXT_MODEL_FIELDS).map((field) => preferences[field])
@@ -6564,7 +6602,8 @@ function apply(ctx, config = {}) {
 			profileKey = key;
 			profileSnapshot = /* @__PURE__ */ new Map([[PROVIDER, Object.freeze({
 				...profile,
-				streamIdleTimeoutMs: streamIdleTimeoutMinutes * 60 * 1e3
+				streamIdleTimeoutMs: streamIdleTimeoutMinutes * 60 * 1e3,
+				...retryProfile(retryChoice)
 			})]]);
 		}
 		return profileSnapshot;
@@ -6644,9 +6683,9 @@ function apply(ctx, config = {}) {
 			try {
 				resolved = await resolveAuth();
 			} catch {
-				throw new LlmError("ChatGPT subscription authorization failed", "AUTH_FAILED");
+				throw new dshLlm.LlmError("ChatGPT subscription authorization failed", "AUTH_FAILED");
 			}
-			if (typeof resolved?.auth.apiKey !== "string" || resolved.auth.apiKey.length === 0) throw new LlmError("ChatGPT subscription is not signed in", "MISSING_CREDENTIAL");
+			if (typeof resolved?.auth.apiKey !== "string" || resolved.auth.apiKey.length === 0) throw new dshLlm.LlmError("ChatGPT subscription is not signed in", "MISSING_CREDENTIAL");
 			return resolved.auth.apiKey;
 		},
 		auth: adapterAuth,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "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",
@@ -133,6 +133,12 @@
     "ws": "8.21.3"
   },
   "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-subagent-codex": {
       "optional": true
     }