dsh-codex-subscription 2.2.8 → 2.2.9

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; 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 |
+| **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; the account catalog is the only source, so signed out or when it cannot be read no models are shown and no bundled list stands in |
 | **Model list** | Show or hide individual models in the composer picker under Models & runtime | Display only; selected models and requests still work |
 | **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 |

package/README.md

@@ -31,7 +31,7 @@
 | 功能 | 你可以做什么 | 使用方式 / 条件 |
 | --- | --- | --- |
 | **订阅登录** | 直接登录 ChatGPT，使用 Codex 订阅模型，无需 API Key | 普通聊天无需 Codex CLI |
-| **模型目录同步** | 自动读取账号可用模型与推理档位，支持手动刷新；目录标注退役的模型会在模型名称旁显示退役日期，不会自动切换你的选择 | 新型号以账号目录开放情况为准 |
+| **模型目录同步** | 自动读取账号可用模型与推理档位，支持手动刷新；目录标注退役的模型会在模型名称旁显示退役日期，不会自动切换你的选择 | 新型号以账号目录开放情况为准；模型只来自账号目录，未登录或读取失败时不显示任何模型，也不使用内置列表 |
 | **模型列表** | 在“模型与运行”中逐个显示或隐藏输入框中的模型 | 仅影响列表显示；已选模型和请求不受影响 |
 | **推理等级** | 在输入框选择模型支持的推理档位 | 档位随模型变化 |
 | **高速模式** | 在支持的模型上切换标准 / Fast，输入框显示闪电标识 | 默认标准；Fast 会增加用量消耗 |

package/lib/client.js

@@ -4537,6 +4537,7 @@ window.__ModuleLoader__.load({
 		//#region src/client-primitives.js
 		const Input = _deepseek_ai_dsh_client_ui_primitives.Input;
 		const Button = _deepseek_ai_dsh_client_ui_primitives.Button;
+		const Switch = _deepseek_ai_dsh_client_ui_primitives.Switch;
 		const useAnchoredPosition = _deepseek_ai_dsh_client_ui_primitives.useAnchoredPosition;
 		const useDismissOnOutsidePointer = _deepseek_ai_dsh_client_ui_primitives.useDismissOnOutsidePointer;
 		const IconCheckOutline16 = _deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16 ?? _deepseek_ai_dsh_client_ui_primitives.IconCheckOutlineRegular;
@@ -4659,7 +4660,7 @@ window.__ModuleLoader__.load({
 			"diagnosticReason_inspection-timeout": "检查超时",
 			"diagnosticSource_network": "网络请求（非完整回复）",
 			"diagnosticReason_catalog-online": "在线目录已载入",
-			"diagnosticReason_catalog-fallback": "使用备用目录",
+			"diagnosticReason_catalog-unavailable": "尚未读取账户目录",
 			"diagnosticReason_storage-readable": "预测缓存可读",
 			"diagnosticReason_tool-registered": "全局工具已注册",
 			"diagnosticReason_tool-missing": "未找到全局工具",
@@ -4737,6 +4738,8 @@ window.__ModuleLoader__.load({
 			compaction_cloud: "开启",
 			compactionHint: "实验功能，默认关闭。长上下文由 Codex 压缩后继续请求，保留 DSH 历史与原生压缩。开启时该请求使用 SSE；历史改变后重新建立压缩状态。",
 			advancedModelSearch: "模型与搜索",
+			modelsSectionTitle: "模型",
+			searchSectionTitle: "搜索",
 			inputImageDetail: "输入图片精度",
 			inputImageDetailHint: "控制发送给模型的图片精度，精度越高输入 token 用量越大。",
 			inputImageDetail_auto: "自动",
@@ -4929,7 +4932,9 @@ window.__ModuleLoader__.load({
 			searchDomainCount: "个域名",
 			catalogRefresh: "刷新模型",
 			catalogOnline: "已加载账户在线模型目录",
-			catalogFallback: "当前使用内置模型目录；登录后可刷新账户可用模型",
+			catalogSignedOut: "登录后显示账户可用的模型。",
+			catalogLoading: "正在读取账户模型目录…",
+			catalogFailed: "无法读取账户模型目录，请检查网络后重试。",
 			pickerModelsTitle: "输入框模型列表",
 			pickerModelsHint: "只控制输入框中的模型列表；不会影响已选模型或模型请求。新模型默认显示。",
 			searchMode: "订阅搜索模式",
@@ -5148,7 +5153,7 @@ window.__ModuleLoader__.load({
 			providerDefault: "Default",
 			selectModel: "选择模型",
 			modelsLoading: "正在读取模型…",
-			modelsEmpty: "没有可用模型。",
+			modelsEmpty: "没有可用模型；请先登录，并确认网络可用。",
 			modelsHidden: "所有模型都已从列表中隐藏；可在设置中重新显示。",
 			effortsEmpty: "当前模型未提供推理等级。",
 			modelRetry: "重试",
@@ -5210,7 +5215,7 @@ window.__ModuleLoader__.load({
 			"diagnosticReason_inspection-timeout": "Check timed out",
 			"diagnosticSource_network": "Network request (not full reply)",
 			"diagnosticReason_catalog-online": "Online catalog loaded",
-			"diagnosticReason_catalog-fallback": "Fallback catalog",
+			"diagnosticReason_catalog-unavailable": "Account catalog not loaded",
 			"diagnosticReason_storage-readable": "Forecast cache readable",
 			"diagnosticReason_tool-registered": "Global tool registered",
 			"diagnosticReason_tool-missing": "Global tool not found",
@@ -5288,6 +5293,8 @@ window.__ModuleLoader__.load({
 			compaction_cloud: "On",
 			compactionHint: "Experimental, off by default. Codex compacts long requests while DSH history and native compaction remain available. These requests use SSE; changed history invalidates previous checkpoints.",
 			advancedModelSearch: "Models and search",
+			modelsSectionTitle: "Models",
+			searchSectionTitle: "Search",
 			inputImageDetail: "Input image detail",
 			inputImageDetailHint: "Controls the detail level of images sent to the model. Higher detail uses more input tokens.",
 			inputImageDetail_auto: "Auto",
@@ -5480,7 +5487,9 @@ window.__ModuleLoader__.load({
 			searchDomainCount: "domains",
 			catalogRefresh: "Refresh models",
 			catalogOnline: "Account model catalog loaded",
-			catalogFallback: "Using the built-in catalog. Sign in to refresh account models.",
+			catalogSignedOut: "Sign in to show the models your account can use.",
+			catalogLoading: "Reading the account model catalog…",
+			catalogFailed: "Could not read the account model catalog. Check the network and try again.",
 			pickerModelsTitle: "Models in picker",
 			pickerModelsHint: "Only controls the composer model list. Selected models and requests still work. New models appear by default.",
 			searchMode: "Subscription search mode",
@@ -5699,7 +5708,7 @@ window.__ModuleLoader__.load({
 			providerDefault: "Default",
 			selectModel: "Select model",
 			modelsLoading: "Loading models…",
-			modelsEmpty: "No models available.",
+			modelsEmpty: "No models available. Sign in and make sure the network is reachable.",
 			modelsHidden: "All models are hidden from this list. Show one in settings.",
 			effortsEmpty: "This model provides no reasoning effort levels.",
 			modelRetry: "Retry",
@@ -5780,12 +5789,6 @@ window.__ModuleLoader__.load({
 .codexSubscriptionPreferenceCopy{display:flex;min-width:0;flex-direction:column;gap:2px}
 .codexSubscriptionPreferenceLabel{display:flex;align-items:center;gap:6px}
 .codexSubscriptionPreferenceHint{max-width:300px;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
-.codexSubscriptionSwitch{position:relative;flex:none;width:36px;height:20px;padding:2px;border:0;border-radius:999px;background:var(--dsw-alias-bg-module-platform);cursor:pointer;transition:background 120ms var(--ds-ease-in-out)}
-.codexSubscriptionSwitch[aria-checked=true]{background:var(--dsw-alias-label-primary)}
-.codexSubscriptionSwitch:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:2px}
-.codexSubscriptionSwitch:disabled{cursor:not-allowed;opacity:.5}
-.codexSubscriptionSwitchKnob{display:block;width:16px;height:16px;border-radius:50%;background:var(--dsw-alias-bg-layer-1);box-shadow:0 1px 2px var(--dsw-alias-border-l3);transition:transform 120ms var(--ds-ease-in-out)}
-.codexSubscriptionSwitch[aria-checked=true] .codexSubscriptionSwitchKnob{transform:translateX(16px)}
 .codexSubscriptionQuotaModes{display:flex;align-items:center;gap:3px;padding:2px;border-radius:9px;background:var(--dsw-alias-bg-module-platform)}
 .codexSubscriptionQuotaMode{position:relative;display:flex;align-items:center;justify-content:center;min-height:26px;padding:0 9px;border-radius:7px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;cursor:pointer;white-space:nowrap}
 .codexSubscriptionQuotaMode small{margin-left:3px;font-size:9px;line-height:1;color:var(--dsw-alias-label-tertiary)}
@@ -5794,7 +5797,8 @@ window.__ModuleLoader__.load({
 .codexSubscriptionQuotaMode:has(input:disabled){cursor:not-allowed;opacity:.5}
 .codexSubscriptionQuotaMode input{position:absolute;width:1px;height:1px;opacity:0;pointer-events:none}
 .codexSubscriptionContext{display:flex;flex-direction:column;gap:8px}
-.codexSubscriptionContextHead{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}
+.codexSubscriptionPickerSetting{display:flex;flex-direction:column;gap:8px}
+.codexSubscriptionContextHead{font-size:13px;line-height:20px;display:flex;align-items:flex-start;justify-content:space-between;gap:12px}
 .codexSubscriptionContextCopy{display:flex;min-width:0;flex:1;flex-direction:column;gap:2px}
 .codexSubscriptionContextHint{font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
 .codexSubscriptionContextTrigger{height:32px;min-width:108px;display:inline-flex;align-items:center;justify-content:space-between;gap:10px;padding:0 10px 0 12px;border:0;border-radius:999px;outline:0;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;cursor:pointer}
@@ -5858,6 +5862,10 @@ window.__ModuleLoader__.load({
 .codexSubscriptionLimitMeta{display:flex;justify-content:space-between;gap:10px;flex-wrap:wrap;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary)}
 .codexSubscriptionLimitPeriod{display:flex;gap:8px;flex-wrap:wrap}
 .codexSubscriptionSearchOptions{margin-top:10px;font-size:12px}
+.codexSubscriptionDivider+.codexSubscriptionDivider{display:none}
+.codexSubscriptionPickerModels{display:flex;flex-direction:column;border-top:1px solid var(--dsw-alias-border-l2)}
+.codexSubscriptionPickerModel{display:flex;align-items:center;justify-content:space-between;gap:12px;min-height:36px;border-bottom:1px solid var(--dsw-alias-border-l2);font-size:13px}
+.codexSubscriptionPickerModel:last-child{border-bottom:0}
 .codexSubscriptionSearchOptions>summary{cursor:pointer;color:var(--dsw-alias-label-primary);padding:6px 0}
 .codexSubscriptionSearchOptions>summary>span{float:right;color:var(--dsw-alias-label-tertiary)}
 .codexSubscriptionSearchOptions[open]>summary{margin-bottom:8px}
@@ -7652,7 +7660,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.2.8";
+		const PACKAGE_VERSION = "2.2.9";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -7921,8 +7929,9 @@ window.__ModuleLoader__.load({
 				const hidden = new Set(preferenceSnapshot.disabledModels);
 				return state.groups.map((group) => group.id === "openai-codex" ? {
 					...group,
-					models: group.models.filter((model) => !hidden.has(model.id))
-				} : group).filter((group) => group.models.length > 0);
+					models: group.models.filter((model) => !hidden.has(model.id)),
+					allHidden: group.models.length > 0 && group.models.every((model) => hidden.has(model.id))
+				} : group).filter((group) => group.models.length > 0 || group.allHidden === true);
 			}, [state.groups, preferenceSnapshot.disabledModels]);
 			const currentChoice = choices.find((choice) => choice.selection.provider === state.current?.provider && choice.selection.model === state.current?.model);
 			const reasoning = currentChoice?.model.reasoning;
@@ -8099,21 +8108,28 @@ window.__ModuleLoader__.load({
 							className: "codexModelSelectGroup",
 							role: "group",
 							"aria-labelledby": `${id}-${group.id}`,
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-								className: "codexModelSelectGroupTitle",
-								id: `${id}-${group.id}`,
-								children: group.name
-							}), group.models.map((model) => option({
-								key: model.id,
-								label: model.name,
-								description: model.description,
-								selected: state.current?.provider === group.id && state.current.model === model.id,
-								disabled: busy,
-								onClick: () => chooseModel({
-									provider: group.id,
-									model: model.id
-								})
-							}))]
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									className: "codexModelSelectGroupTitle",
+									id: `${id}-${group.id}`,
+									children: group.name
+								}),
+								group.allHidden === true ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									className: "codexModelSelectEmpty",
+									children: t("modelsHidden")
+								}) : null,
+								group.models.map((model) => option({
+									key: model.id,
+									label: model.name,
+									description: model.description,
+									selected: state.current?.provider === group.id && state.current.model === model.id,
+									disabled: busy,
+									onClick: () => chooseModel({
+										provider: group.id,
+										model: model.id
+									})
+								}))
+							]
 						}, group.id))
 					}),
 					state.status === "ready" && visibleGroups.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -8706,6 +8722,21 @@ window.__ModuleLoader__.load({
 			return next;
 		}
 		//#endregion
+		//#region src/picker-draft.js
+		const toggleModelId = (draft, modelId) => draft.includes(modelId) ? draft.filter((id) => id !== modelId) : [...draft, modelId];
+		/**
+		* What to do with the draft after a render.
+		* - adopt: nothing pending, follow the saved value
+		* - wait: a change is pending but a write is still in flight
+		* - save: send the draft
+		* - settled: the pending change already equals the saved value
+		*/
+		function draftStep({ dirty, writable, draft, saved }) {
+			if (!dirty) return "adopt";
+			if (!writable) return "wait";
+			return JSON.stringify(draft) === JSON.stringify(saved) ? "settled" : "save";
+		}
+		//#endregion
 		//#region src/client-preferences.jsx
 		function QuickQuotaPreference({ preference, t }) {
 			const snapshot = usePreferenceSnapshot(preference);
@@ -8766,17 +8797,13 @@ window.__ModuleLoader__.load({
 						className: "codexSubscriptionPreferenceHint",
 						children: t("autoQuotaRetryHint")
 					})]
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-					className: "codexSubscriptionSwitch",
-					type: "button",
-					role: "switch",
-					"aria-label": t("autoQuotaRetry"),
-					"aria-checked": snapshot.autoQuotaRetry,
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Switch, {
+					checked: snapshot.autoQuotaRetry,
+					label: t("autoQuotaRetry"),
 					disabled: !writable,
-					onClick: () => {
-						preference.set({ [AUTO_QUOTA_RETRY_FIELD]: !snapshot.autoQuotaRetry });
-					},
-					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: "codexSubscriptionSwitchKnob" })
+					onChange: (next) => {
+						preference.set({ [AUTO_QUOTA_RETRY_FIELD]: next });
+					}
 				})]
 			});
 		}
@@ -8898,47 +8925,77 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
-		/** Show every account model while saving which entries the composer picker hides. */
+		/**
+		* Show every account model while saving which entries the composer picker hides.
+		* The controller ignores a write while another is saving, so quick toggles are kept
+		* in a local draft and sent as one write once the previous one has settled.
+		*/
 		function PickerModelsPreference({ preference, t }) {
 			const snapshot = usePreferenceSnapshot(preference);
-			const writable = snapshot.status === "ready" && snapshot.writable === true;
-			const hidden = snapshot.disabledModels;
+			const ready = snapshot.status === "ready" && (snapshot.writable === true || snapshot.saving === true);
+			const saved = snapshot.disabledModels;
+			const [draft, setDraft] = (0, react.useState)(saved);
+			const [open, setOpen] = (0, react.useState)(false);
+			const dirty = (0, react.useRef)(false);
+			(0, react.useEffect)(() => {
+				const step = draftStep({
+					dirty: dirty.current,
+					writable: snapshot.writable === true,
+					draft,
+					saved
+				});
+				if (step === "adopt") setDraft(saved);
+				else if (step === "save" || step === "settled") dirty.current = false;
+				if (step === "save") preference.set({ [DISABLED_MODELS_FIELD]: draft });
+			}, [
+				draft,
+				saved.join(" "),
+				snapshot.writable
+			]);
 			const toggle = (modelId) => {
-				const next = hidden.includes(modelId) ? hidden.filter((id) => id !== modelId) : [...hidden, modelId];
-				preference.set({ [DISABLED_MODELS_FIELD]: next });
+				dirty.current = true;
+				setDraft((current) => toggleModelId(current, modelId));
 			};
+			const shown = snapshot.availableModels.filter((model) => !draft.includes(model.id)).length;
+			if (snapshot.availableModels.length === 0) return null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "codexSubscriptionContext",
+				className: "codexSubscriptionPickerSetting",
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "codexSubscriptionContextCopy",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "codexSubscriptionPreferenceLabel",
-						children: t("pickerModelsTitle")
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "codexSubscriptionContextHint",
-						children: t("pickerModelsHint")
+					className: "codexSubscriptionPreference",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionPreferenceCopy",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "codexSubscriptionPreferenceLabel",
+							children: t("pickerModelsTitle")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "codexSubscriptionPreferenceHint",
+							children: t("pickerModelsHint")
+						})]
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+						className: "codexSubscriptionContextTrigger",
+						type: "button",
+						"aria-expanded": open,
+						onClick: () => setOpen((value) => !value),
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
+							shown,
+							" / ",
+							snapshot.availableModels.length
+						] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, {})]
 					})]
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-					className: "codexSubscriptionContextModels",
+				}), open ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "codexSubscriptionPickerModels",
 					role: "group",
 					"aria-label": t("pickerModelsTitle"),
 					children: snapshot.availableModels.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionContextModel",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "codexSubscriptionContextModelCopy",
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.name })
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							className: "codexSubscriptionSwitch",
-							type: "button",
-							role: "switch",
-							"aria-label": model.name,
-							"aria-checked": !hidden.includes(model.id),
-							disabled: !writable,
-							onClick: () => toggle(model.id),
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: "codexSubscriptionSwitchKnob" })
+						className: "codexSubscriptionPickerModel",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: model.name }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Switch, {
+							checked: !draft.includes(model.id),
+							label: model.name,
+							disabled: !ready,
+							onChange: () => toggle(model.id)
 						})]
 					}, model.id))
-				})]
+				}) : null]
 			});
 		}
 		function ContextWindowPreference({ preference, t }) {
@@ -8995,110 +9052,112 @@ window.__ModuleLoader__.load({
 				}
 			];
 			const selectedMode = contextModeItems.find((item) => item.id === snapshot.contextMode)?.label ?? t("contextStandard");
+			if (snapshot.contextModels.length === 0) return null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionContext",
-				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionContextHead",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "codexSubscriptionContextCopy",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "codexSubscriptionPreferenceLabel",
-								children: t("contextTitle")
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "codexSubscriptionContextHint",
-								children: hint
-							})]
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Menu, {
-							open: menuOpen,
-							items: contextModeItems,
-							selectedId: snapshot.contextMode,
-							onSelect: (value) => {
-								setMenuOpen(false);
-								preference.set({ [CONTEXT_MODE_FIELD]: value });
-							},
-							onClose: () => setMenuOpen(false),
-							align: "end",
-							side: "bottom",
-							portal: true,
-							compact: true,
-							anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-								className: "codexSubscriptionContextTrigger",
-								type: "button",
-								"aria-label": t("contextTitle"),
-								"aria-haspopup": "menu",
-								"aria-expanded": menuOpen,
-								disabled: !writable,
-								onClick: () => setMenuOpen((value) => !value),
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: selectedMode }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, {})]
-							})
-						})]
-					}),
-					snapshot.contextMode === "custom" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionContextModels",
-						children: [modelRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "codexSubscriptionContextModel",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-								className: "codexSubscriptionContextModelCopy",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextMaximum"), {
-									minimum: String(Math.min(MIN_CUSTOM_CONTEXT_WINDOW, model.maximum)),
-									value: String(model.maximum)
-								}) })]
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
-								"aria-label": `${model.label} ${t("contextTokens")}`,
-								className: "codexSubscriptionContextInput",
-								type: "number",
-								inputMode: "numeric",
-								min: Math.min(MIN_CUSTOM_CONTEXT_WINDOW, model.maximum),
-								max: model.maximum,
-								step: 1,
-								value: drafts[model.key] ?? "",
-								disabled: !writable,
-								onChange: (event) => {
-									const nextValue = event.currentTarget.value;
-									setDrafts((current) => ({
-										...current,
-										[model.key]: nextValue
-									}));
-								},
-								onBlur: () => commit(model.key),
-								onKeyDown: (event) => {
-									if (event.key === "Enter") event.currentTarget.blur();
-								}
-							})]
-						}, model.key)), fixedRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "codexSubscriptionContextModel",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-								className: "codexSubscriptionContextModelCopy",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextFixed"), { value: formatContextWindow(model.maximum) }) })]
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "codexSubscriptionContextHint",
-								children: formatContextWindow(model.maximum)
-							})]
-						}, model.key))]
-					}) : null,
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "codexSubscriptionPreference",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "codexSubscriptionContextHead",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionContextCopy",
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "codexSubscriptionPreferenceHint",
-							children: t(snapshot.catalogStatus?.source === "online" ? "catalogOnline" : "catalogFallback")
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+							className: "codexSubscriptionPreferenceLabel",
+							children: t("contextTitle")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "codexSubscriptionContextHint",
+							children: hint
+						})]
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Menu, {
+						open: menuOpen,
+						items: contextModeItems,
+						selectedId: snapshot.contextMode,
+						onSelect: (value) => {
+							setMenuOpen(false);
+							preference.set({ [CONTEXT_MODE_FIELD]: value });
+						},
+						onClose: () => setMenuOpen(false),
+						align: "end",
+						side: "bottom",
+						portal: true,
+						compact: true,
+						anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							className: "codexSubscriptionContextTrigger",
 							type: "button",
-							variant: "outline",
-							disabled: snapshot.modelsLoading,
-							"aria-busy": snapshot.modelsLoading,
-							onClick: () => {
-								preference.refreshModels();
+							"aria-label": t("contextTitle"),
+							"aria-haspopup": "menu",
+							"aria-expanded": menuOpen,
+							disabled: !writable,
+							onClick: () => setMenuOpen((value) => !value),
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: selectedMode }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, {})]
+						})
+					})]
+				}), snapshot.contextMode === "custom" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "codexSubscriptionContextModels",
+					children: [modelRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionContextModel",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+							className: "codexSubscriptionContextModelCopy",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextMaximum"), {
+								minimum: String(Math.min(MIN_CUSTOM_CONTEXT_WINDOW, model.maximum)),
+								value: String(model.maximum)
+							}) })]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Input, {
+							"aria-label": `${model.label} ${t("contextTokens")}`,
+							className: "codexSubscriptionContextInput",
+							type: "number",
+							inputMode: "numeric",
+							min: Math.min(MIN_CUSTOM_CONTEXT_WINDOW, model.maximum),
+							max: model.maximum,
+							step: 1,
+							value: drafts[model.key] ?? "",
+							disabled: !writable,
+							onChange: (event) => {
+								const nextValue = event.currentTarget.value;
+								setDrafts((current) => ({
+									...current,
+									[model.key]: nextValue
+								}));
 							},
-							children: t(snapshot.modelsLoading ? "refreshing" : "catalogRefresh")
+							onBlur: () => commit(model.key),
+							onKeyDown: (event) => {
+								if (event.key === "Enter") event.currentTarget.blur();
+							}
 						})]
-					}),
-					snapshot.modelError ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						className: "codexSubscriptionError",
-						role: "alert",
-						children: t("modelDirectoryFailed")
-					}) : null
-				]
+					}, model.key)), fixedRows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "codexSubscriptionContextModel",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+							className: "codexSubscriptionContextModelCopy",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: model.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: fill(t("contextFixed"), { value: formatContextWindow(model.maximum) }) })]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "codexSubscriptionContextHint",
+							children: formatContextWindow(model.maximum)
+						})]
+					}, model.key))]
+				}) : null]
+			});
+		}
+		/** The account catalog is the only model list: say why it is empty, and offer one refresh. */
+		function ModelCatalogStatus({ preference, t }) {
+			const snapshot = usePreferenceSnapshot(preference);
+			const online = snapshot.catalogStatus?.source === "online";
+			const { refresh: catalogRefresh } = snapshot.catalogStatus ?? {};
+			const failed = snapshot.modelError || catalogRefresh === "failed";
+			const message = snapshot.modelsLoading || catalogRefresh === "refreshing" ? "catalogLoading" : failed && !online ? "catalogFailed" : online ? "catalogOnline" : "catalogSignedOut";
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "codexSubscriptionPreference",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: failed && !online ? "codexSubscriptionError" : "codexSubscriptionPreferenceHint",
+					role: failed && !online ? "alert" : void 0,
+					children: t(message)
+				}), online || catalogRefresh !== "idle" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+					type: "button",
+					variant: "outline",
+					disabled: snapshot.modelsLoading,
+					"aria-busy": snapshot.modelsLoading,
+					onClick: () => {
+						preference.refreshModels();
+					},
+					children: t(snapshot.modelsLoading ? "refreshing" : "catalogRefresh")
+				}) : null]
 			});
 		}
 		function PreferencesCard({ preference, rpc, t, section = "display" }) {
@@ -9108,10 +9167,10 @@ window.__ModuleLoader__.load({
 				children: [section === "advanced" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						className: "codexSubscriptionCard codexSubscriptionPreferencesCard",
-						"aria-label": t("advancedModelSearch"),
+						"aria-label": t("modelsSectionTitle"),
 						children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("advancedModelSearch") }),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SearchProviderPreference, {
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("modelsSectionTitle") }),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelCatalogStatus, {
 								preference,
 								t
 							}),
@@ -9132,6 +9191,14 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+						className: "codexSubscriptionCard codexSubscriptionPreferencesCard",
+						"aria-label": t("searchSectionTitle"),
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("searchSectionTitle") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SearchProviderPreference, {
+							preference,
+							t
+						})]
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						className: "codexSubscriptionCard codexSubscriptionPreferencesCard",
 						"aria-label": t("connectionTitle"),

package/lib/index.js

@@ -2966,7 +2966,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			}
 		};
 	};
-	const getModels = () => (catalog?.getModels(provider.getModels()) ?? provider.getModels()).map((model) => {
+	const getModels = () => (catalog?.getModels() ?? provider.getModels()).map((model) => {
 		const maximum = modelContextMaximum(model);
 		const mode = resolveContextMode();
 		if (model.id === "gpt-5.3-codex-spark" || !["extended", "custom"].includes(mode)) return model;
@@ -3046,7 +3046,7 @@ async function readSubscriptionCredentials(getAuth, readCredential, signal) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.2.8";
+const PACKAGE_VERSION = "2.2.9";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -3303,7 +3303,7 @@ function createOfficialModelCatalog(options = {}) {
 	};
 	return Object.freeze({
 		refresh,
-		getModels: (fallback) => models ?? fallback.filter((model) => model.id !== "gpt-5.3-codex-spark"),
+		getModels: () => models ?? [],
 		metadata: (modelId) => metadata.get(modelId),
 		revision: () => revision,
 		capabilityGaps: () => [...metadata.values()].filter((model) => model.unsupported && /^[a-z][a-z0-9._-]{0,79}$/u.test(model.id)).slice(0, 20).map((model) => ({
@@ -3311,7 +3311,7 @@ function createOfficialModelCatalog(options = {}) {
 			...structuredClone(model.unsupported)
 		})),
 		status: () => ({
-			source: models === void 0 ? "fallback" : "online",
+			source: models === void 0 ? "unavailable" : "online",
 			refresh: refreshStatus
 		}),
 		clear() {
@@ -4293,7 +4293,7 @@ function capabilityCoverage({ account, preference, runtime, catalog, tools, stor
 			reason = runtime.restartRequired ? "restart-required" : runtime.installed ? "runtime-present" : "runtime-missing";
 		} else if (id === "models" && catalog) {
 			readiness = catalog.source === "online" ? "pass" : "warn";
-			reason = catalog.source === "online" ? "catalog-online" : "catalog-fallback";
+			reason = catalog.source === "online" ? "catalog-online" : "catalog-unavailable";
 		} else if (id === "storage" && storage?.readable) {
 			readiness = "pass";
 			reason = "storage-readable";
@@ -4639,7 +4639,7 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		...collected.operations ? { operations: collected.operations } : {},
 		...collected.websocket ? { websocket: collected.websocket } : {},
 		...collected.compaction ? { compaction: collected.compaction } : {},
-		...catalog && ["fallback", "online"].includes(catalog.source) && [
+		...catalog && ["unavailable", "online"].includes(catalog.source) && [
 			"idle",
 			"refreshing",
 			"ok",
@@ -6072,7 +6072,7 @@ function apply(ctx, config = {}) {
 	});
 	const preferences = {
 		status: () => {
-			const models = modelCatalog.getModels(baseProvider.getModels());
+			const models = modelCatalog.getModels();
 			return {
 				[DISABLED_MODELS_FIELD]: normalizeDisabledModels(settings.get()[DISABLED_MODELS_FIELD]),
 				[AUTO_QUOTA_RETRY_FIELD]: normalizeAutoQuotaRetry(settings.get()[AUTO_QUOTA_RETRY_FIELD]),

package/package.json

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