dsh-codex-subscription 0.3.6 → 0.3.7

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 profile; use `web` only when it is the user's target.
-- Use the pinned `v0.3.6` release assets for a first install, never a moving branch.
+- Use the pinned `v0.3.7` release assets for a first install, never a moving branch.
 - Never print OAuth credentials, account IDs, authorization callbacks, or the
   credential store.
 - Do not start, stop, or restart DSH without explicit permission.
@@ -51,7 +51,7 @@ the user which installation is the target.
 Download the fixed release asset to a visible file, then invoke the requested action:
 
 ```powershell
-curl.exe -fL https://github.com/WSL043/dsh-codex-subscription/releases/download/v0.3.6/dsh-codex.ps1 -o "$env:TEMP\dsh-codex.ps1"
+curl.exe -fL https://github.com/WSL043/dsh-codex-subscription/releases/download/v0.3.7/dsh-codex.ps1 -o "$env:TEMP\dsh-codex.ps1"
 powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$env:TEMP\dsh-codex.ps1" Install
 ```
 
@@ -59,7 +59,7 @@ If `curl.exe` is unavailable, download the same pinned asset without executing
 remote text in memory:
 
 ```powershell
-Invoke-WebRequest -UseBasicParsing -Uri 'https://github.com/WSL043/dsh-codex-subscription/releases/download/v0.3.6/dsh-codex.ps1' -OutFile "$env:TEMP\dsh-codex.ps1"
+Invoke-WebRequest -UseBasicParsing -Uri 'https://github.com/WSL043/dsh-codex-subscription/releases/download/v0.3.7/dsh-codex.ps1' -OutFile "$env:TEMP\dsh-codex.ps1"
 powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$env:TEMP\dsh-codex.ps1" Install
 ```
 
@@ -93,7 +93,7 @@ When `dsh`, Node.js, and pnpm are already available, install the pinned npm
 package directly:
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@0.3.6
+dsh plugin --profile web add dsh-codex-subscription@0.3.7
 ```
 
 Update with `dsh plugin --profile web update dsh-codex-subscription`. When

package/README.en.md

@@ -33,7 +33,7 @@ If this helps, open the [GitHub repository](https://github.com/WSL043/dsh-codex-
 
 ## Prepare DSH
 
-This plugin supports DeepSeek Harness `0.1.0-rc.6` and requires a ChatGPT account
+This plugin supports DeepSeek Harness `0.1.0-rc.6` and `0.1.0-rc.7`, 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).

package/README.md

@@ -29,7 +29,7 @@
 
 ## 准备 DSH
 
-本插件适配 DeepSeek Harness `0.1.0-rc.6`，还需要一个当前具有 Codex 使用资格的
+本插件适配 DeepSeek Harness `0.1.0-rc.6` 与 `0.1.0-rc.7`，还需要一个当前具有 Codex 使用资格的
 ChatGPT 账户。
 
 - 不想配置 Node.js：使用 [DSH-Portable（社区便携包）](https://github.com/WSL043/DSH-Portable)；

package/dsh-codex.ps1

@@ -32,8 +32,8 @@ if ($Managed -and -not $PSBoundParameters.ContainsKey('Action')) {
 
 $PackageName = 'dsh-codex-subscription'
 $LegacyPackageName = '@wsl043/dsh-codex-subscription'
-$PackageVersion = '0.3.6'
-$PackageSpec = 'https://github.com/WSL043/dsh-codex-subscription/releases/download/v0.3.6/dsh-codex-subscription.tgz'
+$PackageVersion = '0.3.7'
+$PackageSpec = 'https://github.com/WSL043/dsh-codex-subscription/releases/download/v0.3.7/dsh-codex-subscription.tgz'
 $PnpmVersion = '11.19.0'
 $PnpmUrl = 'https://registry.npmjs.org/pnpm/-/pnpm-11.19.0.tgz'
 $PnpmSha512 = '7881F3ED590D472C4A955E2B88B2121791116066DCC88CBCA3849EC9B60F1BBAA6D2CCB221FA91DA4E1C65BEF2BCBE379365AEA7AC539C7BF86DEDC3A1B22DCE'

package/lib/client.js

@@ -9,6 +9,7 @@ window.__ModuleLoader__.load({
 		let _deepseek_ai_dsh_client_ui_attachment = require("@deepseek-ai/dsh-client-ui-attachment");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		//#region src/settings-contract.js
+		const SETTINGS_NAMESPACE = "codex-subscription";
 		const QUICK_QUOTA_FIELD = "quickQuotaVisible";
 		const SEARCH_PROVIDER_FIELD = "searchProvider";
 		const SEARCH_PROVIDER_CODEX = "codex";
@@ -37,6 +38,8 @@ window.__ModuleLoader__.load({
 			"slots",
 			"locale",
 			"connection",
+			"remote",
+			"settingsScope",
 			"modelDirectories",
 			"conversation"
 		];
@@ -280,61 +283,92 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
-		function createPreferenceController(rpc) {
-			let snapshot = Object.freeze({
-				status: "loading",
-				visible: false,
-				searchProvider: "dsh",
-				writable: false,
-				error: false
-			});
+		function createPreferenceController(scope, rpc) {
+			let updating = false;
+			let error = false;
+			let fallbackStatus = "loading";
+			let fallback;
 			let generation = 0;
+			const nativeSnapshot = () => scope.getSnapshot();
+			const read = () => {
+				const native = nativeSnapshot();
+				const current = native.status === "ready" ? native : fallbackStatus === "ready" ? fallback : native;
+				return Object.freeze({
+					status: updating ? "updating" : current.status,
+					visible: current.value?.[QUICK_QUOTA_FIELD] === true,
+					searchProvider: normalizeSearchProvider(current.value?.[SEARCH_PROVIDER_FIELD]),
+					writable: !updating && current.status === "ready" && current.writable === true,
+					error
+				});
+			};
+			let snapshot = read();
 			const listeners = /* @__PURE__ */ new Set();
-			const publish = (next) => {
-				snapshot = Object.freeze(next);
+			const publish = () => {
+				snapshot = read();
 				for (const listener of listeners) listener();
 			};
-			const accept = (value) => publish({
-				status: "ready",
-				visible: value?.[QUICK_QUOTA_FIELD] === true,
-				searchProvider: normalizeSearchProvider(value?.[SEARCH_PROVIDER_FIELD]),
-				writable: value?.writable === true,
-				error: false
+			const disposeScope = scope.subscribe(() => {
+				error = false;
+				publish();
 			});
+			const acceptFallback = (value) => {
+				fallbackStatus = "ready";
+				fallback = {
+					status: "ready",
+					value: {
+						[QUICK_QUOTA_FIELD]: value?.[QUICK_QUOTA_FIELD] === true,
+						[SEARCH_PROVIDER_FIELD]: normalizeSearchProvider(value?.[SEARCH_PROVIDER_FIELD])
+					},
+					writable: value?.writable === true
+				};
+			};
 			const load = async () => {
 				const current = ++generation;
+				updating = false;
+				fallbackStatus = "loading";
+				fallback = void 0;
+				error = false;
+				publish();
+				if (nativeSnapshot().status === "ready") return;
 				try {
 					const value = unwrap(await rpc.call(CHANNEL, "preferences/status", {}));
-					if (current === generation) accept(value);
+					if (current !== generation || nativeSnapshot().status === "ready") return;
+					acceptFallback(value);
+					publish();
 				} catch {
-					if (current === generation) publish({
-						status: "unavailable",
-						visible: false,
-						searchProvider: "dsh",
-						writable: false,
-						error: false
-					});
+					if (current !== generation || nativeSnapshot().status === "ready") return;
+					fallbackStatus = "unavailable";
+					publish();
 				}
 			};
 			const set = async (patch) => {
 				if (snapshot.status !== "ready" || snapshot.writable !== true) return;
-				const previous = snapshot;
 				const current = ++generation;
-				publish({
-					status: "updating",
-					visible: patch["quickQuotaVisible"] ?? snapshot.visible,
-					searchProvider: patch["searchProvider"] ?? snapshot.searchProvider,
-					writable: false,
-					error: false
-				});
+				const entries = Object.entries(patch);
+				updating = true;
+				error = false;
+				publish();
 				try {
-					const value = unwrap(await rpc.call(CHANNEL, "preferences/update", patch));
-					if (current === generation) accept(value);
+					if (nativeSnapshot().status === "ready") {
+						for (const [field, value] of entries) {
+							if (current !== generation) return;
+							await scope.set(field, value);
+						}
+						if (current !== generation) return;
+						const accepted = nativeSnapshot().value;
+						error = entries.some(([field, value]) => accepted?.[field] !== value);
+					} else {
+						const value = unwrap(await rpc.call(CHANNEL, "preferences/update", patch));
+						if (current !== generation) return;
+						acceptFallback(value);
+					}
 				} catch {
-					if (current === generation) publish({
-						...previous,
-						error: true
-					});
+					if (current === generation) error = true;
+				} finally {
+					if (current === generation) {
+						updating = false;
+						publish();
+					}
 				}
 			};
 			return {
@@ -344,7 +378,8 @@ window.__ModuleLoader__.load({
 					return () => listeners.delete(listener);
 				},
 				load,
-				set
+				set,
+				dispose: disposeScope
 			};
 		}
 		const usePreferenceSnapshot = (preference) => (0, react.useSyncExternalStore)(preference.subscribe, preference.getSnapshot);
@@ -902,12 +937,16 @@ window.__ModuleLoader__.load({
 				return () => tag.remove();
 			}, "codex-subscription: style");
 			const connection = ctx.get("connection");
-			const preference = createPreferenceController(connection.rpc);
+			const preference = createPreferenceController(ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE }), connection.rpc);
 			ctx.effect(() => {
 				preference.load();
-				return ctx.on("connection/reset", () => {
+				const disposeReset = ctx.on("connection/reset", () => {
 					preference.load();
 				});
+				return () => {
+					disposeReset?.();
+					preference.dispose();
+				};
 			}, "codex-subscription: preferences");
 			const t = ctx.locale.bind(NS);
 			ctx.slots.inject("settings.section", () => ctx.slots.register({

package/lib/index.js

@@ -540,7 +540,7 @@ function createCodexSearchProvider(options) {
 						accept: "application/json",
 						"content-type": "application/json",
 						originator: "pi",
-						"user-agent": "dsh-codex-subscription/0.3.6"
+						"user-agent": "dsh-codex-subscription/0.3.7"
 					},
 					body: JSON.stringify({
 						id,
@@ -929,7 +929,7 @@ function createCodexUsageReader(options) {
 				"chatgpt-account-id": accountId,
 				accept: "application/json",
 				"cache-control": "no-store",
-				"user-agent": "dsh-codex-subscription/0.3.6"
+				"user-agent": "dsh-codex-subscription/0.3.7"
 			},
 			signal: requestSignal(signal, timeoutMs)
 		});
@@ -1064,17 +1064,7 @@ function apply(ctx) {
 			[SEARCH_PROVIDER_FIELD]: settings.get()[SEARCH_PROVIDER_FIELD],
 			writable: ctx.settings.writable
 		}),
-		update: async (patch) => {
-			const previousSearchProvider = settings.get()[SEARCH_PROVIDER_FIELD];
-			await settings.update(patch);
-			if (patch["searchProvider"] === void 0) return;
-			try {
-				await searchProvider.select(patch[SEARCH_PROVIDER_FIELD]);
-			} catch (error) {
-				await settings.update({ [SEARCH_PROVIDER_FIELD]: previousSearchProvider });
-				throw error;
-			}
-		}
+		update: (patch) => settings.update(patch)
 	};
 	const store = new DshOAuthCredentialStore(ctx.credentials, CREDENTIAL_REF, [LEGACY_CREDENTIAL_REF]);
 	const provider = openaiCodexSubscriptionProvider();
@@ -1122,9 +1112,15 @@ function apply(ctx) {
 		resolveSessionId: () => currentAgent()?.session.id
 	}));
 	ctx.effect(() => {
-		searchProvider.select(settings.get()[SEARCH_PROVIDER_FIELD]).catch((error) => {
-			ctx.logger?.warn?.("could not select the configured web search provider: %s", error.message);
-		});
+		const select = async (value) => {
+			try {
+				await searchProvider.select(value[SEARCH_PROVIDER_FIELD]);
+			} catch (error) {
+				ctx.logger?.warn?.("could not select the configured web search provider: %s", error.message);
+			}
+		};
+		select(settings.get());
+		return settings.watch(select);
 	}, "codex-subscription: search provider selection");
 	const coordinator = new CodexLoginCoordinator(createCodexAuthService(authModels, store));
 	const usageReader = createCodexUsageReader({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "packageManager": "pnpm@11.19.0",
   "description": "ChatGPT and Codex subscriptions for DeepSeek Harness with OAuth login, image generation, quota, and subscription web search",
   "type": "module",
@@ -29,6 +29,7 @@
     },
     "client": {
       "inject": [
+        "@deepseek-ai/dsh-api-remotes",
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-runtime",
@@ -79,44 +80,46 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-attachment": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-credentials": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-web": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-api-remotes": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-attachment": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-credentials": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-llm": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-settings": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-tools": "0.1.0-rc.6 || 0.1.0-rc.7",
+    "@deepseek-ai/dsh-web": "0.1.0-rc.6 || 0.1.0-rc.7",
     "@deepseek-ai/schemastery": "3.18.1",
     "@earendil-works/pi-ai": "0.82.1",
     "react": "^18.2.0"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-attachment": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-credentials": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-web": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-api-remotes": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-attachment": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-credentials": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-llm": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-settings": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-tools": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-web": "0.1.0-rc.7",
     "@deepseek-ai/schemastery": "3.18.1",
     "@earendil-works/pi-ai": "0.82.1",
     "react": "18.3.1",