@eddyskywalker/dsh-chatgpt-subscription 0.1.16 → 0.1.18

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- 设置页新增内置子代理模型与思考深度选择，新启动的 spawn/fork 子代理可统一路由到指定的 ChatGPT 订阅模型和 reasoning effort；可选深度随模型能力联动。
+- 子代理设置扩展为 DSH 全部已接入 Provider/模型；思考深度使用所选模型的真实 reasoning effort 目录，上下文在选定模型后展开并作为子 Agent 的有效压缩预算。
 - 设置页新增 GPT-5.6 Sol / Terra / Luna 有效上下文窗口配置：默认 272K，可选最高 1M，并动态影响 DSH 的模型解析、压缩阈值与溢出判断。
 
 ## 0.1.12 - 2026-08-20

package/README.md

@@ -39,7 +39,7 @@
 **设置页**
 
 - 展示账号（脱敏 email、套餐、账号 ID 后四位）、连接状态、额度与订阅增强功能开关；
-- 可选择新启动的内置子代理使用哪个 ChatGPT 订阅模型及思考深度；可选深度会随模型能力联动，该设置不改变父会话模型；
+- 当父 Agent 使用本插件的 `codex-chatgpt` 模型时，子代理可选择 DSH 当前接入的任意 Provider/模型（如 DeepSeek V4 Flash）；思考深度来自所选模型公开能力，上下文在选定模型后展开配置；非 Codex 父 Agent完全沿用 DSH 默认子代理继承设计；
 - 5.6 Sol / Terra / Luna 默认使用 272K 有效上下文，可在设置中选择最高 1M，用于 DSH 压缩与溢出判断；其他模型保持目录声明值；
 - 可访问的进度条、窄窗口/200% 缩放布局、深浅主题与 reduced-motion。
 

package/lib/client.js

@@ -246,17 +246,6 @@ window.__ModuleLoader__.load({
 			"gpt-5.6-terra",
 			"gpt-5.6-luna"
 		];
-		const STANDARD_REASONING_EFFORTS = [
-			"none",
-			"low",
-			"medium",
-			"high",
-			"xhigh"
-		];
-		const GPT_56_REASONING_EFFORTS = [...STANDARD_REASONING_EFFORTS, "max"];
-		function reasoningEffortsForModel(model) {
-			return resolveCodexCatalogEntry(model).reasoningProfile === "gpt-5.6" ? GPT_56_REASONING_EFFORTS : STANDARD_REASONING_EFFORTS;
-		}
 		function resolveCodexCatalogEntry(model) {
 			return CODEX_MODEL_CATALOG.find((entry) => entry.id === model) ?? DEFAULT_CODEX_MODEL;
 		}
@@ -266,6 +255,9 @@ window.__ModuleLoader__.load({
 			status() {
 				return request(`${ROUTE_PREFIX}/status`);
 			}
+			models() {
+				return request(`${ROUTE_PREFIX}/models`);
+			}
 			startLogin() {
 				return post(`${ROUTE_PREFIX}/login/start`, {});
 			}
@@ -321,6 +313,7 @@ window.__ModuleLoader__.load({
 			const apiRef = (0, react.useRef)(new SubscriptionApi());
 			const eventSourceRef = (0, react.useRef)(null);
 			const [status, setStatus] = (0, react.useState)(null);
+			const [modelCatalog, setModelCatalog] = (0, react.useState)(null);
 			const [busy, setBusy] = (0, react.useState)(null);
 			const [error, setError] = (0, react.useState)(null);
 			const [authUrl, setAuthUrl] = (0, react.useState)(null);
@@ -330,8 +323,9 @@ window.__ModuleLoader__.load({
 			const load = (0, react.useCallback)(async (quiet = false) => {
 				if (!quiet) setError(null);
 				try {
-					const next = await apiRef.current.status();
+					const [next, models] = await Promise.all([apiRef.current.status(), apiRef.current.models()]);
 					setStatus(next);
+					setModelCatalog(models);
 					if (next.error !== void 0) setError(next.error.message);
 				} catch (cause) {
 					if (!quiet) setError(messageOf(cause));
@@ -620,51 +614,147 @@ window.__ModuleLoader__.load({
 										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("searchProviderCodex") })] })]
 									})]
 								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsh-codex-pref-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("subagentModel") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "dsh-codex-muted",
-										children: t("subagentModelHint")
-									})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
-										className: "dsh-codex-select",
-										"aria-label": t("subagentModel"),
-										value: status?.preferences.subagentModel ?? CODEX_MODEL_CATALOG[0].id,
-										disabled: busy !== null,
-										onChange: (event) => {
-											const subagentModel = event.currentTarget.value;
-											const currentEffort = status?.preferences.subagentReasoningEffort ?? resolveCodexCatalogEntry(subagentModel).defaultReasoningEffort;
-											const supportedEfforts = reasoningEffortsForModel(subagentModel);
-											updatePreferences({
-												subagentModel,
-												subagentReasoningEffort: supportedEfforts.includes(currentEffort) ? currentEffort : resolveCodexCatalogEntry(subagentModel).defaultReasoningEffort
-											});
-										},
-										children: CODEX_MODEL_CATALOG.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-											value: model.id,
-											children: model.name
-										}, model.id))
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsh-codex-pref-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("subagentReasoningEffort") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "dsh-codex-muted",
-										children: t("subagentReasoningEffortHint")
-									})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
-										className: "dsh-codex-select",
-										"aria-label": t("subagentReasoningEffort"),
-										value: status?.preferences.subagentReasoningEffort ?? "medium",
-										disabled: busy !== null,
-										onChange: (event) => void updatePreferences({
-											subagentModel: status?.preferences.subagentModel ?? CODEX_MODEL_CATALOG[0].id,
-											subagentReasoningEffort: event.currentTarget.value
+								(() => {
+									const selectedProvider = modelCatalog?.providers.find((provider) => provider.id === status?.preferences.subagentProvider) ?? modelCatalog?.providers[0];
+									const selectedModel = selectedProvider?.models.find((model) => model.id === status?.preferences.subagentModel) ?? selectedProvider?.models[0];
+									const reasoning = selectedModel?.reasoning;
+									const selectedEffort = status?.preferences.subagentReasoningEffort ?? reasoning?.defaultEffort ?? reasoning?.efforts[0]?.id ?? "";
+									const savedContext = status?.preferences.subagentContextWindow ?? selectedModel?.contextWindow;
+									const contextDraft = contextDrafts.subagent;
+									const parsedContextValue = contextDraft === void 0 ? savedContext ?? null : parsePositiveCapacity(contextDraft);
+									const parsedContext = parsedContextValue !== null && (selectedModel?.maxContextWindow === void 0 || parsedContextValue <= selectedModel.maxContextWindow) ? parsedContextValue : null;
+									const contextDirty = contextDraft !== void 0 && parsedContext !== savedContext;
+									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-codex-pref-row",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("subagentProvider") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "dsh-codex-muted",
+												children: t("subagentProviderHint")
+											})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
+												className: "dsh-codex-select",
+												"aria-label": t("subagentProvider"),
+												value: selectedProvider?.id ?? "",
+												disabled: busy !== null || selectedProvider === void 0,
+												onChange: (event) => {
+													const provider = modelCatalog?.providers.find((entry) => entry.id === event.currentTarget.value);
+													const model = provider?.models[0];
+													if (provider === void 0 || model === void 0) return;
+													const effort = model.reasoning?.defaultEffort ?? model.reasoning?.efforts[0]?.id ?? null;
+													updatePreferences({
+														subagentProvider: provider.id,
+														subagentModel: model.id,
+														subagentReasoningEffort: effort,
+														subagentContextWindow: model.contextWindow ?? 1
+													});
+													setContextDrafts((drafts) => ({
+														...drafts,
+														subagent: formatCapacity(model.contextWindow ?? 1)
+													}));
+												},
+												children: modelCatalog?.providers.map((provider) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: provider.id,
+													children: provider.name
+												}, provider.id))
+											})]
 										}),
-										children: reasoningEffortsForModel(status?.preferences.subagentModel ?? CODEX_MODEL_CATALOG[0].id).map((effort) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-											value: effort,
-											children: reasoningEffortLabel(effort, t)
-										}, effort))
-									})]
-								}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-codex-pref-row",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("subagentModel") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "dsh-codex-muted",
+												children: t("subagentModelHint")
+											})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
+												className: "dsh-codex-select",
+												"aria-label": t("subagentModel"),
+												value: selectedModel?.id ?? "",
+												disabled: busy !== null || selectedModel === void 0,
+												onChange: (event) => {
+													const model = selectedProvider?.models.find((entry) => entry.id === event.currentTarget.value);
+													if (selectedProvider === void 0 || model === void 0) return;
+													const effort = model.reasoning?.defaultEffort ?? model.reasoning?.efforts[0]?.id ?? null;
+													updatePreferences({
+														subagentProvider: selectedProvider.id,
+														subagentModel: model.id,
+														subagentReasoningEffort: effort,
+														subagentContextWindow: model.contextWindow ?? 1
+													});
+													setContextDrafts((drafts) => ({
+														...drafts,
+														subagent: formatCapacity(model.contextWindow ?? 1)
+													}));
+												},
+												children: selectedProvider?.models.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: model.id,
+													children: model.name
+												}, model.id))
+											})]
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-codex-pref-row",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("subagentReasoningEffort") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "dsh-codex-muted",
+												children: t("subagentReasoningEffortHint")
+											})] }), reasoning !== void 0 && reasoning.efforts.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
+												className: "dsh-codex-select",
+												"aria-label": t("subagentReasoningEffort"),
+												value: selectedEffort,
+												disabled: busy !== null,
+												onChange: (event) => void updatePreferences({ subagentReasoningEffort: event.currentTarget.value }),
+												children: reasoning.efforts.map((effort) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: effort.id,
+													children: effort.name
+												}, effort.id))
+											}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "dsh-codex-muted",
+												children: t("providerDefault")
+											})]
+										}),
+										selectedModel?.contextWindow !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-codex-context-settings",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("strong", { children: [
+												selectedModel.name,
+												" · ",
+												t("contextWindow")
+											] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "dsh-codex-muted",
+												children: t("selectedModelContextHint")
+											})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+												className: "dsh-codex-context-row",
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("label", {
+													htmlFor: "dsh-subagent-context",
+													children: t("effectiveContextWindow")
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+													className: "dsh-codex-capacity-control",
+													children: [
+														/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+															id: "dsh-subagent-context",
+															type: "text",
+															inputMode: "numeric",
+															value: contextDraft ?? formatCapacity(savedContext ?? selectedModel.contextWindow),
+															disabled: busy !== null,
+															onChange: (event) => {
+																const value = event.currentTarget.value;
+																setContextDrafts((drafts) => ({
+																	...drafts,
+																	subagent: value
+																}));
+															}
+														}),
+														/* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("tokens") }),
+														/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+															className: "dsh-codex-context-save",
+															type: "button",
+															disabled: busy !== null || !contextDirty || parsedContext === null,
+															onClick: () => {
+																if (parsedContext !== null) updatePreferences({ subagentContextWindow: parsedContext });
+															},
+															children: t("save")
+														})
+													]
+												})]
+											})]
+										}) : null
+									] });
+								})(),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 									className: "dsh-codex-context-settings",
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("contextWindows") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -911,22 +1001,16 @@ window.__ModuleLoader__.load({
 				unitDisplay: "long"
 			}).format(value)} ${t("limitWindow")}`;
 		}
-		function reasoningEffortLabel(effort, t) {
-			return t({
-				none: "reasoningNone",
-				low: "reasoningLow",
-				medium: "reasoningMedium",
-				high: "reasoningHigh",
-				xhigh: "reasoningXhigh",
-				max: "reasoningMax"
-			}[effort] ?? "unknown");
-		}
-		function parseCapacity(value) {
+		function parsePositiveCapacity(value) {
 			const matched = value.trim().toLowerCase().replace(/[,_\s]/g, "").match(/^(\d+(?:\.\d+)?)(k|m)?$/);
 			if (matched === null) return null;
 			const multiplier = matched[2] === "m" ? 1e6 : matched[2] === "k" ? 1e3 : 1;
 			const parsed = Number(matched[1]) * multiplier;
-			return Number.isSafeInteger(parsed) && parsed >= 1 && parsed <= 1e6 ? parsed : null;
+			return Number.isSafeInteger(parsed) && parsed >= 1 ? parsed : null;
+		}
+		function parseCapacity(value) {
+			const parsed = parsePositiveCapacity(value);
+			return parsed !== null && parsed <= 1e6 ? parsed : null;
 		}
 		function formatCapacity(value) {
 			if (value % 1e3 === 0) return `${value / 1e3}K`;
@@ -1008,10 +1092,15 @@ window.__ModuleLoader__.load({
 				searchProviderHint: "选择 DSH Web 搜索工具使用默认来源，或改用当前 ChatGPT 订阅的 Codex 搜索来源。",
 				searchProviderDsh: "DSH 默认",
 				searchProviderCodex: "Codex 订阅",
+				subagentProvider: "子代理 Provider",
+				subagentProviderHint: "选择 DSH 当前已接入且可用的模型提供方。",
 				subagentModel: "子代理模型",
-				subagentModelHint: "新启动的内置子代理使用此 ChatGPT 订阅模型；父会话的模型选择不受影响。",
+				subagentModelHint: "仅当父 Agent 使用 Codex 订阅模型时生效；模型可来自任意已接入 Provider。",
 				subagentReasoningEffort: "子代理思考深度",
-				subagentReasoningEffortHint: "控制子代理请求的 reasoning effort；可选项会随所选模型变化。",
+				subagentReasoningEffortHint: "选项来自所选模型实际公开的 reasoning effort 能力。",
+				providerDefault: "使用 Provider 默认值",
+				effectiveContextWindow: "有效上下文窗口",
+				selectedModelContextHint: "选择模型后展开；该值仅用于子 Agent 的 DSH 上下文预算与压缩判断。",
 				reasoningNone: "无",
 				reasoningLow: "低",
 				reasoningMedium: "中",
@@ -1108,10 +1197,15 @@ window.__ModuleLoader__.load({
 				searchProviderHint: "Choose whether DSH web search uses its default provider or the Codex search source from this ChatGPT subscription.",
 				searchProviderDsh: "DSH default",
 				searchProviderCodex: "Codex subscription",
+				subagentProvider: "Subagent provider",
+				subagentProviderHint: "Choose from providers currently connected and available in DSH.",
 				subagentModel: "Subagent model",
-				subagentModelHint: "New built-in subagents use this ChatGPT subscription model; the parent session selection is unchanged.",
+				subagentModelHint: "Applies only when the parent uses Codex; the selected child model may come from any connected provider.",
 				subagentReasoningEffort: "Subagent reasoning effort",
-				subagentReasoningEffortHint: "Controls reasoning effort for subagent requests. Available values follow the selected model.",
+				subagentReasoningEffortHint: "Options come from the reasoning-effort capabilities exposed by the selected model.",
+				providerDefault: "Use provider default",
+				effectiveContextWindow: "Effective context window",
+				selectedModelContextHint: "Shown after model selection; used only for the child Agent context budget and DSH compaction decisions.",
 				reasoningNone: "None",
 				reasoningLow: "Low",
 				reasoningMedium: "Medium",