dsh-codex-subscription 2.2.5 → 2.2.7

package/README.en.md

@@ -31,7 +31,7 @@ Subscription access, model controls, quota management, and image creation in one
 | Feature | What you can do | Availability / setup |
 | --- | --- | --- |
 | **Subscription sign-in** | Sign in to ChatGPT and use Codex subscription models without an API key | Normal chat needs no Codex CLI |
-| **Model catalog sync** | Read available models and reasoning levels from your account, with manual refresh | New models appear when your account offers them |
+| **Model catalog sync** | Read available models and reasoning levels from your account, with manual refresh; models marked for retirement show their retirement date next to the model name, without automatically switching your selection | New models appear when your account offers them |
 | **Reasoning levels** | Choose supported reasoning effort in the composer | Levels vary by model |
 | **Fast mode** | Switch supported models between Standard and Fast, with a lightning indicator | Standard by default; Fast increases usage |
 | **Response verbosity** | Request short, medium, or detailed responses | Follows the model default unless changed |
@@ -87,7 +87,7 @@ Subscription access, model controls, quota management, and image creation in one
 
 ## Prepare DSH
 
-Compatible with DSH `0.2.0-rc.1` plugin compatibility checks and settings APIs, while retaining support for previously supported versions.
+Verified against DSH `0.2.0-rc.1` (`next` channel) and `0.1.7-rc.2` (`latest` channel), with earlier accepted versions still supported.
 
 This plugin supports the latest DeepSeek Harness release recorded in its package metadata and requires a ChatGPT account that currently has Codex access.
 
@@ -270,6 +270,13 @@ dsh plugin --profile web remove dsh-codex-subscription
 
 ## Troubleshooting
 
+<details>
+<summary>DSH 0.2.0-rc.1 reports plugin 2.2.4 as incompatible?</summary>
+
+DSH 0.2.0-rc.1 did not exist when 2.2.4 and earlier were published, and a published package's compatibility declaration cannot be changed. Update to 2.2.5 or later from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription`, then restart DSH.
+
+</details>
+
 <details>
 <summary>No dsh command on your computer?</summary>
 
@@ -303,6 +310,13 @@ The current plugin icon and its appearance in DSH’s Installed list.
 
 <sub>Captured in DSH 0.1.7-alpha.2.</sub>
 
+## Positioning and boundaries
+
+- **ChatGPT / Codex subscription only**, done in depth: quota and forecasting, images and sketches, subtasks, diagnostics. Other subscriptions such as Claude or Grok are out of scope.
+- **Fail explicitly**: requests never silently fall back to another paid route, and quota windows the account does not return are never invented.
+- **Tracks official DSH releases**: every release is accepted end to end (install, start, remove, reinstall) against official DSH channels such as latest and next; verified versions are recorded in the [compatibility notes](docs/dsh-020-compatibility.md).
+- Models, quota and features depend on what your account actually returns; the ChatGPT backend and DSH can change independently.
+
 ## Scope and support
 
 The ChatGPT Codex backend and DSH can change independently. This community project is not affiliated with or endorsed by DeepSeek or OpenAI.

package/README.md

@@ -31,7 +31,7 @@
 | 功能 | 你可以做什么 | 使用方式 / 条件 |
 | --- | --- | --- |
 | **订阅登录** | 直接登录 ChatGPT，使用 Codex 订阅模型，无需 API Key | 普通聊天无需 Codex CLI |
-| **模型目录同步** | 自动读取账号可用模型与推理档位，支持手动刷新 | 新型号以账号目录开放情况为准 |
+| **模型目录同步** | 自动读取账号可用模型与推理档位，支持手动刷新；目录标注退役的模型会在模型名称旁显示退役日期，不会自动切换你的选择 | 新型号以账号目录开放情况为准 |
 | **推理等级** | 在输入框选择模型支持的推理档位 | 档位随模型变化 |
 | **高速模式** | 在支持的模型上切换标准 / Fast，输入框显示闪电标识 | 默认标准；Fast 会增加用量消耗 |
 | **输出详略** | 选择简短、适中或详细的回答偏好 | 默认跟随模型 |
@@ -87,7 +87,7 @@
 
 ## 准备 DSH
 
-已适配 DSH `0.2.0-rc.1` 的插件兼容性检查与设置接口，同时保留已支持版本的兼容。
+已验证兼容 DSH `0.2.0-rc.1`（`next` 通道）和 `0.1.7-rc.2`（`latest` 通道），并继续支持更早的已验收版本。
 
 本插件支持软件包元数据中记录的最新版 DeepSeek Harness，并需要一个当前具有 Codex 使用资格的 ChatGPT 账户。
 
@@ -270,6 +270,13 @@ dsh plugin --profile web remove dsh-codex-subscription
 
 ## 常见问题
 
+<details>
+<summary>DSH 0.2.0-rc.1 提示插件 2.2.4 不兼容？</summary>
+
+2.2.4 及更早版本发布时 DSH 0.2.0-rc.1 还不存在，其兼容声明无法事后修改。请更新到 2.2.5 或更高版本：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription`，然后重启 DSH。
+
+</details>
+
 <details>
 <summary>电脑没有 dsh 命令，怎么安装？</summary>
 
@@ -303,6 +310,13 @@ dsh plugin --profile web remove dsh-codex-subscription
 
 <sub>DSH 0.1.7-alpha.2 实机界面。</sub>
 
+## 定位与边界
+
+- **只做 ChatGPT / Codex 订阅**，并把这一件事做深：额度与预测、图片与草图、子任务、诊断；不接入 Claude、Grok 等其他订阅。
+- **失败就明确报错**：不会静默切换到其他付费路由，也不会虚构账号没有返回的额度窗口。
+- **跟随官方 DSH 发布**：每次发版都用官方 DSH 的 latest、next 等通道做安装、启动、卸载、重装的端到端验收；已验证的版本见 [兼容性记录](docs/dsh-020-compatibility.md)。
+- 模型、额度和功能开放情况以你的账号实际返回为准；ChatGPT 后端与 DSH 可能独立变化。
+
 ## 边界与支持
 
 ChatGPT Codex 后端和 DSH 可能独立变化；本项目为社区项目，与 DeepSeek、OpenAI 无隶属或背书关系。

package/lib/client.js

@@ -734,7 +734,20 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/image-conversation-node.js
 		const KIND = "codex-image-output";
-		const resultsOf = (event) => event?.type === "tool/result" && event.data.meta?.kind === "codex-subscription-image" ? (event.data.message?.content ?? []).filter((block) => block.type === "tool-result" && !block.isError && block.content?.some((part) => part.type === "image" && part.attachment)) : [];
+		const hasImage = (block) => block?.content?.some((part) => part.type === "image" && part.attachment);
+		const isImage = (part) => part?.type === "image" && part.attachment;
+		const resultsOf = (event) => {
+			if (event?.type !== "tool/result" || event.data.meta?.kind !== "codex-subscription-image") return [];
+			const content = event.data.message?.content ?? [];
+			const wrapped = content.filter((block) => block.type === "tool-result" && !block.isError && hasImage(block));
+			if (wrapped.length > 0) return wrapped;
+			return content.some(isImage) ? [{
+				type: "tool-result",
+				toolCallId: `${event.data.turn}:${event.data.step ?? event.seq}`,
+				isError: false,
+				content
+			}] : [];
+		};
 		const imageConversationNode = {
 			kind: KIND,
 			target: "chat",
@@ -1110,7 +1123,7 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
-					!showOutput || image === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					!showOutput && !settled || image === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "codexImageToolGallery",
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CodexGeneratedImage, {
 							features,
@@ -4742,7 +4755,7 @@ window.__ModuleLoader__.load({
 			streamIdleTimeout_10: "10 分钟",
 			streamIdleTimeout_20: "20 分钟",
 			streamIdleTimeout_30: "30 分钟",
-			subagentBackendHint: "Codex 复用订阅登录和工作区权限；默认继承当前订阅模型。开启 DSH 子任务模型选择并新建会话后，可在聊天中指定允许的订阅模型与推理档位；非订阅会话需指定。共享上下文子任务仍用 DSH。",
+			subagentBackendHint: "Codex 复用订阅登录和工作区权限；默认继承当前订阅模型。在“插件 → 子智能体”开启模型选择并勾选允许的模型后新建会话，可在聊天中指定允许的订阅模型与推理档位；非订阅会话需指定。共享上下文子任务仍用 DSH。",
 			subagentBackendUnavailable: "当前宿主缺少子代理服务，请更新 DSH。",
 			subagentRuntimeMissing: "尚未准备 Codex 子任务运行时，仅影响此选项。普通订阅对话无需安装。",
 			subagentRuntimePrepare: "准备方法（含离线说明）",
@@ -5290,7 +5303,7 @@ window.__ModuleLoader__.load({
 			streamIdleTimeout_10: "10 min",
 			streamIdleTimeout_20: "20 min",
 			streamIdleTimeout_30: "30 min",
-			subagentBackendHint: "Codex reuses subscription login and workspace permissions, inheriting the current subscription model by default. Enable DSH subtask model selection and start a new session to request an allowed subscription model and reasoning effort in chat; other model sessions require an explicit selection. Shared-context subtasks stay in DSH.",
+			subagentBackendHint: "Codex reuses subscription login and workspace permissions, inheriting the current subscription model by default. Turn on model selection under Plugins → Subagent, tick the allowed models and start a new session to request an allowed subscription model and reasoning effort in chat; other model sessions require an explicit selection. Shared-context subtasks stay in DSH.",
 			subagentBackendUnavailable: "Subagent services are unavailable. Update DSH to use this option.",
 			subagentRuntimeMissing: "Codex subtask runtime is not prepared. Subscription chat does not require it.",
 			subagentRuntimePrepare: "Setup and offline instructions",
@@ -7623,7 +7636,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.2.5";
+		const PACKAGE_VERSION = "2.2.7";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {

package/lib/index.js

@@ -1277,9 +1277,29 @@ function subagentThreadPolicy(parent, policy, requested = {}) {
 		modelProvider: "openai",
 		approvalPolicy: "never",
 		sandbox: policy.mode,
-		config: effort === void 0 ? {} : { model_reasoning_effort: effort }
+		config: {
+			...CHILD_FEATURES_OFF,
+			...effort === void 0 ? {} : { model_reasoning_effort: effort }
+		}
 	};
 }
+/**
+* A ChatGPT-authenticated Codex child would otherwise expose the account's
+* connected apps (calendar, site deploys, ...) and plugin installs, all
+* auto-approved. A DSH subtask gets the workspace tools only.
+*/
+const CHILD_FEATURES_OFF = Object.freeze({ features: Object.freeze(Object.fromEntries([
+	"apps",
+	"plugins",
+	"plugin_sharing",
+	"remote_plugin",
+	"tool_suggest",
+	"browser_use",
+	"browser_use_external",
+	"browser_use_full_cdp_access",
+	"computer_use",
+	"in_app_browser"
+].map((name) => [name, false]))) });
 /** Reuse the official DSH process/turn provider; keep only subscription auth here. */
 function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refresh, loadRuntime, maintenance = () => false }) {
 	let runtime;
@@ -1385,6 +1405,20 @@ function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refre
 		}
 	};
 }
+/**
+* DSH 0.2 mounts Agent preset rows once, at boot and before plugins load, so the
+* Loader never lists them and `internal/config` never reaches a later listener.
+* Read them from the preset registry; a host without it simply has none.
+*/
+function presetEntries(ctx) {
+	try {
+		const generations = ctx.get?.("agentPresets")?.generations;
+		if (!(generations instanceof Map)) return [];
+		return [...generations.values()].flatMap((generation) => [...generation.mount?.tree?.entries?.() ?? []]);
+	} catch {
+		return [];
+	}
+}
 /** Change only standard independent spawn tools; leave fork/custom tools untouched. */
 function createSubagentBackendSwitcher({ entries, prepare, persist }) {
 	const originals = /* @__PURE__ */ new Map();
@@ -3010,7 +3044,7 @@ async function readSubscriptionCredentials(getAuth, readCredential, signal) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.2.5";
+const PACKAGE_VERSION = "2.2.7";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -3028,6 +3062,43 @@ const DEFAULT_REFRESH_TIMEOUT_MS = 1e4;
 const record$4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 const nonEmpty$2 = (value) => typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
 const positiveInteger$1 = (value) => Number.isSafeInteger(value) && value > 0 ? value : void 0;
+function upgradeModelId(value) {
+	return (typeof value.upgrade === "string" ? nonEmpty$2(value.upgrade) : record$4(value.upgrade) ? nonEmpty$2(value.upgrade.model) : void 0) ?? (record$4(value.upgrade_info) ? nonEmpty$2(value.upgrade_info.model) : void 0) ?? (record$4(value.upgradeInfo) ? nonEmpty$2(value.upgradeInfo.model) : void 0);
+}
+function retirementMillis(value) {
+	for (const source of [
+		value,
+		value.upgrade,
+		value.upgrade_info,
+		value.upgradeInfo
+	]) {
+		if (!record$4(source)) continue;
+		for (const raw of [source.retirement_at, source.retirementAt]) {
+			const seconds = positiveInteger$1(raw);
+			if (seconds !== void 0 && Number.isSafeInteger(seconds * 1e3)) return seconds * 1e3;
+			if (typeof raw === "string" && /^\d{4}-\d{2}-\d{2}T[\d:.]+(?:Z|[+-]\d{2}:\d{2})$/u.test(raw)) {
+				const parsed = Date.parse(raw);
+				if (Number.isFinite(parsed) && parsed > 0) return parsed;
+			}
+		}
+	}
+}
+function retirementNotice(value, now = Date.now(), targetDisplayName) {
+	if (!record$4(value) || !Number.isFinite(now)) return void 0;
+	const at = retirementMillis(value);
+	if (at === void 0 || at <= now) return void 0;
+	const date = new Date(at);
+	if (!Number.isFinite(date.getTime())) return void 0;
+	const dateText = `${String(date.getUTCFullYear()).padStart(4, "0")}-${String(date.getUTCMonth() + 1).padStart(2, "0")}-${String(date.getUTCDate()).padStart(2, "0")}`;
+	const upgradeTo = upgradeModelId(value);
+	const upgradeName = upgradeTo === void 0 ? void 0 : nonEmpty$2(targetDisplayName) ?? upgradeTo;
+	return {
+		text: `Retires on ${dateText} (UTC).${upgradeName === void 0 ? "" : ` Switch to ${upgradeName} to keep working.`}`,
+		at,
+		upgradeTo,
+		dateText
+	};
+}
 function reasoningMap(levels) {
 	const supported = new Set((Array.isArray(levels) ? levels : []).map((level) => nonEmpty$2(record$4(level) ? level.effort : void 0)).filter(Boolean));
 	const map = Object.fromEntries(LEVELS.map((level) => [level, null]));
@@ -3052,7 +3123,7 @@ function unsupportedCapabilities(value) {
 		...speeds.length ? { speeds } : {}
 	};
 }
-function visibleModel(value) {
+function visibleModel(value, displayNames, now) {
 	if (!record$4(value)) return void 0;
 	const id = nonEmpty$2(value.slug);
 	const reserve = id === "gpt-reserve" && ["list", "hide"].includes(value.visibility);
@@ -3063,11 +3134,19 @@ function visibleModel(value) {
 		...value,
 		supported_reasoning_levels: supported
 	});
+	const upgradeTo = upgradeModelId(value);
+	const retirement = retirementNotice(value, now, displayNames.get(upgradeTo));
+	const notice = retirement?.text;
+	const description = nonEmpty$2(value.description);
 	return {
 		...Object.keys(unsupported).length ? { unsupported } : {},
 		id,
-		name: reserve ? "GPT-Reserve (Experimental)" : nonEmpty$2(value.display_name) ?? id,
-		description: nonEmpty$2(value.description),
+		name: `${reserve ? "GPT-Reserve (Experimental)" : nonEmpty$2(value.display_name) ?? id}${retirement === void 0 ? "" : ` (retires ${retirement.dateText})`}`,
+		description: notice === void 0 ? description : description === void 0 ? notice : `${description}\n${notice}`,
+		...retirement === void 0 ? {} : { retirement: {
+			at: retirement.at,
+			upgradeTo: retirement.upgradeTo
+		} },
 		priority: Number.isFinite(value.priority) ? value.priority : 0,
 		input: input.length > 0 ? input : ["text"],
 		contextWindow: positiveInteger$1(value.context_window) ?? positiveInteger$1(value.max_context_window),
@@ -3083,10 +3162,17 @@ function visibleModel(value) {
 		supportsFast: [...Array.isArray(value.additional_speed_tiers) ? value.additional_speed_tiers : [], ...Array.isArray(value.service_tiers) ? value.service_tiers.map((tier) => tier?.id) : []].some((tier) => tier === "fast" || tier === "priority")
 	};
 }
-function parseOfficialModelCatalog(value) {
+function parseOfficialModelCatalog(value, now = Date.now()) {
 	if (!record$4(value) || !Array.isArray(value.models)) throw new Error("Codex returned a malformed model catalog");
+	const displayNames = /* @__PURE__ */ new Map();
+	for (const model of value.models) {
+		if (!record$4(model)) continue;
+		const id = nonEmpty$2(model.slug);
+		const name = nonEmpty$2(model.display_name);
+		if (id !== void 0 && name !== void 0 && !displayNames.has(id)) displayNames.set(id, name);
+	}
 	const seen = /* @__PURE__ */ new Set();
-	return value.models.map(visibleModel).filter((model) => model !== void 0 && !seen.has(model.id) && seen.add(model.id)).sort((left, right) => Number(left.id === "gpt-reserve") - Number(right.id === "gpt-reserve") || right.priority - left.priority);
+	return value.models.map((model) => visibleModel(model, displayNames, now)).filter((model) => model !== void 0 && !seen.has(model.id) && seen.add(model.id)).sort((left, right) => Number(left.id === "gpt-reserve") - Number(right.id === "gpt-reserve") || right.priority - left.priority);
 }
 function mergeModel(baseModels, remote) {
 	const base = baseModels.find((model) => model.id === remote.id) ?? baseModels.find((model) => model.id !== "gpt-5.3-codex-spark") ?? baseModels[0];
@@ -3095,6 +3181,7 @@ function mergeModel(baseModels, remote) {
 		...base,
 		id: remote.id,
 		name: remote.name,
+		...remote.retirement === void 0 || remote.description === void 0 ? {} : { description: remote.description },
 		input: remote.input,
 		reasoning: remote.reasoning,
 		thinkingLevelMap: remote.thinkingLevelMap,
@@ -3110,12 +3197,14 @@ function mergeModel(baseModels, remote) {
 }
 function createOfficialModelCatalog(options = {}) {
 	const fetchCatalog = options.fetch ?? fetch;
+	const getNow = options.now ?? Date.now;
 	const scheduleTimeout = options.setTimeout ?? setTimeout;
 	const cancelTimeout = options.clearTimeout ?? clearTimeout;
 	const timeoutMs = Number.isFinite(options.timeoutMs) && options.timeoutMs > 0 ? options.timeoutMs : DEFAULT_REFRESH_TIMEOUT_MS;
 	let models;
 	let metadata = /* @__PURE__ */ new Map();
 	let etag;
+	let rawCatalog;
 	let revision = 0;
 	let refreshing;
 	let generation = 0;
@@ -3155,10 +3244,19 @@ function createOfficialModelCatalog(options = {}) {
 			if (currentGeneration !== generation || requestSignal.aborted) return false;
 			if (response.status === 304) {
 				outcome = "ok";
-				return false;
+				if (rawCatalog === void 0) return false;
+				const remote = parseOfficialModelCatalog(rawCatalog, getNow());
+				const next = remote.map((model) => mergeModel(options.baseModels(), model)).filter(Boolean);
+				if (next.length === 0 || JSON.stringify(next) === JSON.stringify(models)) return false;
+				models = next;
+				metadata = new Map(remote.map((model) => [model.id, model]));
+				revision += 1;
+				options.onUpdated?.();
+				return true;
 			}
 			if (!response.ok) throw new Error(`Codex model catalog failed (HTTP ${response.status})`);
-			const remote = parseOfficialModelCatalog(await response.json());
+			const raw = await response.json();
+			const remote = parseOfficialModelCatalog(raw, getNow());
 			if (currentGeneration !== generation || requestSignal.aborted) return false;
 			if (remote.length === 0) throw new Error("Codex returned an empty model catalog");
 			const baseModels = options.baseModels();
@@ -3166,6 +3264,7 @@ function createOfficialModelCatalog(options = {}) {
 			if (next.length === 0) throw new Error("Codex model catalog has no compatible models");
 			if (currentGeneration !== generation || requestSignal.aborted) return false;
 			models = next;
+			rawCatalog = raw;
 			metadata = new Map(remote.map((model) => [model.id, model]));
 			etag = nonEmpty$2(response.headers.get("etag")) ?? etag;
 			revision += 1;
@@ -3219,6 +3318,7 @@ function createOfficialModelCatalog(options = {}) {
 			refreshing = void 0;
 			flight?.cancel();
 			models = void 0;
+			rawCatalog = void 0;
 			metadata = /* @__PURE__ */ new Map();
 			etag = void 0;
 			refreshStatus = "idle";
@@ -6047,7 +6147,7 @@ function apply(ctx, config = {}) {
 		});
 		scoped.subagents.registerProvider(instance.provider);
 		const switcher = createSubagentBackendSwitcher({
-			entries: () => scoped.loader.entries(),
+			entries: () => [...scoped.loader.entries(), ...presetEntries(scoped)],
 			prepare: instance.prepare,
 			persist: (mode) => settings.update({ subagentBackend: mode })
 		});

package/package.json

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