dsh-codex-subscription 1.1.5 → 1.1.6

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.1.5` package below; do not install a moving branch.
+- Use the exact `1.1.6` 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.
@@ -38,19 +38,19 @@ 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.1 plugin --profile web add dsh-codex-subscription@1.1.5
+npx -y @deepseek-ai/dsh@0.1.1-rc.1 plugin --profile web add dsh-codex-subscription@1.1.6
 ```
 
 With an existing global `dsh` command:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@1.1.5
+dsh plugin --profile web add dsh-codex-subscription@1.1.6
 ```
 
 From a DSH-Portable folder:
 
 ```powershell
-.\dsh.exe plugin --profile web add dsh-codex-subscription@1.1.5
+.\dsh.exe plugin --profile web add dsh-codex-subscription@1.1.6
 ```
 
 Use the same `add` command to update or repair. This is the complete package-changing operation.
@@ -70,7 +70,7 @@ For DSH-Portable, replace `dsh` with `.\dsh.exe`. Static acceptance requires:
 
 For the official npm route, run the same checks with `npx -y @deepseek-ai/dsh@0.1.1-rc.1` in place of `dsh`.
 
-1. `dsh-codex-subscription` version `1.1.5` appears exactly once.
+1. `dsh-codex-subscription` version `1.1.6` 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.en.md

@@ -49,7 +49,7 @@ These capabilities reuse the same local ChatGPT sign-in. Subscription routing fa
 
 This plugin is currently compatible through DeepSeek Harness `0.1.1-rc.1` and requires a ChatGPT account that currently has Codex access.
 
-- Do not want to configure Node.js? Use the [community DSH-Portable package](https://github.com/WSL043/DSH-Portable).
+- 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.
 - Prefer the official route? Follow the [DeepSeek Harness run guide](https://github.com/deepseek-ai/deepseek-harness#run).
 
 ## Install

package/README.md

@@ -50,7 +50,7 @@
 
 本插件当前适配到 DeepSeek Harness `0.1.1-rc.1`，并需要一个当前具有 Codex 使用资格的 ChatGPT 账户。
 
-- 不想配置 Node.js：使用 [DSH-Portable（社区便携包）](https://github.com/WSL043/DSH-Portable)；
+- 不想配置 Node.js：使用 [DSH-Portable](https://github.com/WSL043/DSH-Portable)。这是社区桌面分发，提供 Windows 便携版和安装版，以及 macOS、Linux 桌面包；
 - 想按官方方式运行：查看 [DeepSeek Harness 官方说明](https://github.com/deepseek-ai/deepseek-harness#run)。
 
 ## 安装

package/lib/client.js

@@ -79,6 +79,34 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/login-progress.js
+		/** Reconcile a login flow with the credential store without exposing credentials. */
+		async function readLoginProgress({ flow, readFlow, readAccount }) {
+			try {
+				const nextFlow = await readFlow();
+				if (nextFlow.phase !== "authenticated") return { flow: nextFlow };
+				return {
+					flow: nextFlow,
+					account: await readAccount()
+				};
+			} catch (flowError) {
+				try {
+					const account = await readAccount();
+					if (account?.authenticated === true) return {
+						flow: {
+							id: flow.id,
+							method: flow.method,
+							phase: "authenticated",
+							authenticated: true
+						},
+						account,
+						recovered: true
+					};
+				} catch {}
+				throw flowError;
+			}
+		}
+		//#endregion
 		//#region src/client.jsx
 		const inject = [
 			"slots",
@@ -985,12 +1013,17 @@ window.__ModuleLoader__.load({
 					"cancelled"
 				].includes(flow.phase)) return void 0;
 				const timer = window.setInterval(() => {
-					call("login/status", { id: flow.id }).then((next) => {
-						setFlow(next);
-						if (next.phase === "authenticated") call("status").then((account) => {
-							setAccount(account);
+					readLoginProgress({
+						flow,
+						readFlow: () => call("login/status", { id: flow.id }),
+						readAccount: () => call("status")
+					}).then((next) => {
+						setFlow(next.flow);
+						setError(void 0);
+						if (next.account !== void 0) {
+							setAccount(next.account);
 							notifyQuickQuota();
-						});
+						}
 					}).catch(() => setError(t("failed")));
 				}, 800);
 				return () => window.clearInterval(timer);
@@ -1006,7 +1039,21 @@ window.__ModuleLoader__.load({
 			const cancel = () => {
 				if (flow?.id === void 0) return;
 				setBusy(true);
-				call("login/cancel", { id: flow.id }).then(setFlow).finally(() => setBusy(false));
+				call("login/cancel", { id: flow.id }).then((next) => {
+					setFlow(next);
+					return call("status").then((account) => {
+						if (account.authenticated === true) {
+							setAccount(account);
+							setFlow({
+								...next,
+								phase: "authenticated",
+								authenticated: true
+							});
+							setError(void 0);
+							notifyQuickQuota();
+						}
+					});
+				}).catch(() => setError(t("failed"))).finally(() => setBusy(false));
 			};
 			const submit = (event) => {
 				event.preventDefault();

package/lib/index.js

@@ -373,7 +373,6 @@ var CodexLoginCoordinator = class {
 			};
 			session.controller.abort(/* @__PURE__ */ new Error("Codex login cancelled"));
 		}
-		await Promise.resolve(session.run).catch(() => void 0);
 		return this.read(id);
 	}
 	async logout(options) {
@@ -495,7 +494,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0 } = {
 		streamSimple: (model, context, options) => provider.streamSimple(model, context, withSpeed(model, options))
 	});
 }
-const USER_AGENT = `dsh-codex-subscription/1.1.5`;
+const USER_AGENT = `dsh-codex-subscription/1.1.6`;
 //#endregion
 //#region src/codex-search.js
 const CODEX_SEARCH_PROVIDER_ID = "codex-subscription";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "ChatGPT and Codex subscriptions for DeepSeek Harness with OAuth login, image generation, quota, and subscription web search",
   "type": "module",
   "main": "./lib/index.js",