@eddyskywalker/dsh-chatgpt-subscription 0.1.13 → 0.1.15

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+- 设置页新增内置子代理模型与思考深度选择，新启动的 spawn/fork 子代理可统一路由到指定的 ChatGPT 订阅模型和 reasoning effort；可选深度随模型能力联动。
+- 设置页新增 GPT-5.6 Sol / Terra / Luna 有效上下文窗口配置：默认 272K，可选最高 1M，并动态影响 DSH 的模型解析、压缩阈值与溢出判断。
+
 ## 0.1.12 - 2026-08-20
 
 - 适配 DSH `0.1.0-rc.8`：peerDependencies / devDependencies 中全部 DSH 包范围从 `^0.1.0-rc.6` 提升至 `^0.1.0-rc.8`，并重新生成 package-lock.json。已在本机 rc.8 依赖集上验证：typecheck、55 项测试与 tsdown 构建全部通过，插件代码无需改动。

package/README.md

@@ -39,6 +39,8 @@
 **设置页**
 
 - 展示账号（脱敏 email、套餐、账号 ID 后四位）、连接状态、额度与订阅增强功能开关；
+- 可选择新启动的内置子代理使用哪个 ChatGPT 订阅模型及思考深度；可选深度会随模型能力联动，该设置不改变父会话模型；
+- 5.6 Sol / Terra / Luna 默认使用 272K 有效上下文，可在设置中选择最高 1M，用于 DSH 压缩与溢出判断；其他模型保持目录声明值；
 - 可访问的进度条、窄窗口/200% 缩放布局、深浅主题与 reduced-motion。
 
 ## 模型目录
@@ -108,7 +110,7 @@ npx @deepseek-ai/dsh plugin --profile web add "link:C:\absolute\path\to\dsh-chat
 3. 完成 ChatGPT 登录；
 4. 执行 **测试连接**。
 
-DSH 模型选择器应显示 **“Codex（ChatGPT 订阅）”**。
+DSH 模型选择器应显示 **“Codex（ChatGPT 订阅）”**。在同一设置页的“增强功能”中，还可配置新子代理模型和 GPT-5.6 系列的有效上下文窗口。子代理模型设置适用于 DSH 内置的 spawn/fork 子代理（其会话标记为 `origin: subagent`）；外部 ACP/Codex CLI 等 provider-managed 子代理不经过本插件路由。
 
 卸载前建议先在设置页点击 **“注销”**，它会删除当前平台的凭据和 Host 内存中的额度缓存。
 

package/lib/client.js

@@ -175,8 +175,6 @@ window.__ModuleLoader__.load({
 			const text = blocks.map((block) => block.type === "text" || block.type === "reasoning" ? block.text : "").filter(Boolean).join(" ").trim();
 			return text === "" ? null : text;
 		}
-		//#endregion
-		//#region src/shared/model-catalog.ts
 		const CODEX_MODEL_CATALOG = [
 			{
 				id: "gpt-5.6-sol",
@@ -242,7 +240,26 @@ window.__ModuleLoader__.load({
 				supportsReasoningSummary: false
 			}
 		];
-		CODEX_MODEL_CATALOG[0];
+		const DEFAULT_CODEX_MODEL = CODEX_MODEL_CATALOG[0];
+		const CONFIGURABLE_CONTEXT_MODEL_IDS = [
+			"gpt-5.6-sol",
+			"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;
+		}
 		//#endregion
 		//#region src/client/api.ts
 		var SubscriptionApi = class {
@@ -309,6 +326,7 @@ window.__ModuleLoader__.load({
 			const [authUrl, setAuthUrl] = (0, react.useState)(null);
 			const [popupBlocked, setPopupBlocked] = (0, react.useState)(false);
 			const [connection, setConnection] = (0, react.useState)(null);
+			const [contextDrafts, setContextDrafts] = (0, react.useState)({});
 			const load = (0, react.useCallback)(async (quiet = false) => {
 				if (!quiet) setError(null);
 				try {
@@ -419,6 +437,19 @@ window.__ModuleLoader__.load({
 					preferences
 				});
 			});
+			const updateContextWindow = async (model) => {
+				const current = status?.preferences.contextWindowOverrides[model] ?? resolveCodexCatalogEntry(model).contextWindow;
+				const parsed = parseCapacity(contextDrafts[model] ?? String(current));
+				if (parsed === null) {
+					setError(t("contextWindowInvalid"));
+					return;
+				}
+				await updatePreferences({ contextWindowOverrides: { [model]: parsed } });
+				setContextDrafts((drafts) => ({
+					...drafts,
+					[model]: String(parsed)
+				}));
+			};
 			const logout = async () => run("logout", async () => {
 				await apiRef.current.logout();
 				eventSourceRef.current?.close();
@@ -564,38 +595,116 @@ window.__ModuleLoader__.load({
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Section, {
 							title: t("enhancements"),
-							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("searchProvider") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-									className: "dsh-codex-muted",
-									children: t("searchProviderHint")
-								})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsh-codex-segments",
-									role: "radiogroup",
-									"aria-label": t("searchProvider"),
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-										type: "radio",
-										name: "dsh-codex-search-provider",
-										checked: status?.preferences.searchProvider === "dsh",
+							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("searchProvider") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+										className: "dsh-codex-muted",
+										children: t("searchProviderHint")
+									})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsh-codex-segments",
+										role: "radiogroup",
+										"aria-label": t("searchProvider"),
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+											type: "radio",
+											name: "dsh-codex-search-provider",
+											checked: status?.preferences.searchProvider === "dsh",
+											disabled: busy !== null,
+											onChange: () => updatePreferences({ searchProvider: "dsh" })
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("searchProviderDsh") })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+											type: "radio",
+											name: "dsh-codex-search-provider",
+											checked: status?.preferences.searchProvider === "codex",
+											disabled: busy !== null,
+											onChange: () => updatePreferences({ searchProvider: "codex" })
+										}), /* @__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: () => updatePreferences({ searchProvider: "dsh" })
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("searchProviderDsh") })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-										type: "radio",
-										name: "dsh-codex-search-provider",
-										checked: status?.preferences.searchProvider === "codex",
+										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
+										}),
+										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-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", {
+										className: "dsh-codex-muted",
+										children: t("contextWindowsHint")
+									})] }), CONFIGURABLE_CONTEXT_MODEL_IDS.map((model) => {
+										const fallback = status?.preferences.contextWindowOverrides[model] ?? resolveCodexCatalogEntry(model).contextWindow;
+										return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+											className: "dsh-codex-context-row",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: resolveCodexCatalogEntry(model).name }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+												className: "dsh-codex-capacity-control",
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+													type: "text",
+													inputMode: "numeric",
+													value: contextDrafts[model] ?? formatCapacity(fallback),
+													disabled: busy !== null,
+													"aria-label": resolveCodexCatalogEntry(model).name + " " + t("contextWindow"),
+													onChange: (event) => setContextDrafts((drafts) => ({
+														...drafts,
+														[model]: event.currentTarget.value
+													})),
+													onBlur: () => void updateContextWindow(model),
+													onKeyDown: (event) => {
+														if (event.key === "Enter") event.currentTarget.blur();
+													}
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("tokens") })]
+											})]
+										}, model);
+									})]
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+									className: "dsh-codex-check",
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+										type: "checkbox",
+										checked: status?.preferences.quickQuotaVisible === true,
 										disabled: busy !== null,
-										onChange: () => updatePreferences({ searchProvider: "codex" })
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("searchProviderCodex") })] })]
-								})]
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-								className: "dsh-codex-check",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-									type: "checkbox",
-									checked: status?.preferences.quickQuotaVisible === true,
-									disabled: busy !== null,
-									onChange: (event) => updatePreferences({ quickQuotaVisible: event.currentTarget.checked })
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("quickQuota") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("quickQuotaHint") })] })]
-							})]
+										onChange: (event) => updatePreferences({ quickQuotaVisible: event.currentTarget.checked })
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("quickQuota") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", { children: t("quickQuotaHint") })] })]
+								})
+							]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Section, {
 							title: t("quota"),
@@ -777,6 +886,27 @@ 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) {
+			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;
+		}
+		function formatCapacity(value) {
+			if (value % 1e3 === 0) return `${value / 1e3}K`;
+			return String(value);
+		}
 		function formatPercent(value) {
 			return `${new Intl.NumberFormat(void 0, { maximumFractionDigits: 1 }).format(value)}%`;
 		}
@@ -853,6 +983,21 @@ window.__ModuleLoader__.load({
 				searchProviderHint: "选择 DSH Web 搜索工具使用默认来源，或改用当前 ChatGPT 订阅的 Codex 搜索来源。",
 				searchProviderDsh: "DSH 默认",
 				searchProviderCodex: "Codex 订阅",
+				subagentModel: "子代理模型",
+				subagentModelHint: "新启动的内置子代理使用此 ChatGPT 订阅模型；父会话的模型选择不受影响。",
+				subagentReasoningEffort: "子代理思考深度",
+				subagentReasoningEffortHint: "控制子代理请求的 reasoning effort；可选项会随所选模型变化。",
+				reasoningNone: "无",
+				reasoningLow: "低",
+				reasoningMedium: "中",
+				reasoningHigh: "高",
+				reasoningXhigh: "超高",
+				reasoningMax: "最大",
+				contextWindows: "GPT-5.6 上下文窗口",
+				contextWindowsHint: "默认 272K；可选启用最高 1M。该值用于 DSH 的压缩与溢出判断，可输入 1M、512K 等容量。",
+				contextWindow: "上下文窗口",
+				contextWindowInvalid: "上下文窗口必须是 1 到 1M 的整数，可使用 K 或 M 后缀。",
+				tokens: "tokens",
 				quickQuota: "在输入框旁显示快捷用量",
 				quickQuotaHint: "仅在当前会话选中 codex-chatgpt 模型时显示。",
 				quota: "用量与限额",
@@ -936,6 +1081,21 @@ 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",
+				subagentModel: "Subagent model",
+				subagentModelHint: "New built-in subagents use this ChatGPT subscription model; the parent session selection is unchanged.",
+				subagentReasoningEffort: "Subagent reasoning effort",
+				subagentReasoningEffortHint: "Controls reasoning effort for subagent requests. Available values follow the selected model.",
+				reasoningNone: "None",
+				reasoningLow: "Low",
+				reasoningMedium: "Medium",
+				reasoningHigh: "High",
+				reasoningXhigh: "Extra high",
+				reasoningMax: "Maximum",
+				contextWindows: "GPT-5.6 context windows",
+				contextWindowsHint: "Defaults to 272K, with an optional value up to 1M. DSH uses it for compaction and overflow detection; values such as 1M and 512K are accepted.",
+				contextWindow: "Context window",
+				contextWindowInvalid: "The context window must be an integer from 1 to 1M. K and M suffixes are accepted.",
+				tokens: "tokens",
 				quickQuota: "Show quick usage beside the composer",
 				quickQuotaHint: "Shown only when the current session uses a codex-chatgpt model.",
 				quota: "Usage and limits",
@@ -1014,6 +1174,14 @@ window.__ModuleLoader__.load({
 .dsh-codex-segments input:checked+span{background:var(--dsw-alias-bg-base);box-shadow:0 1px 2px rgba(0,0,0,.08);color:var(--dsw-alias-label-primary)}
 .dsh-codex-segments input:focus-visible+span{outline:2px solid var(--dsw-alias-button-info-fill,#397ee8);outline-offset:2px}
 .dsh-codex-segments input:disabled+span{cursor:default;opacity:.5}
+.dsh-codex-select,.dsh-codex-capacity-control input{background:var(--dsw-alias-bg-layer-2);border:1px solid var(--dsw-alias-border-l2);border-radius:7px;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;padding:7px 9px}
+.dsh-codex-select{max-width:210px;min-width:150px}
+.dsh-codex-context-settings{border-bottom:1px solid var(--dsw-alias-border-l2);display:grid;gap:10px;padding:12px 0}
+.dsh-codex-context-settings>div>strong{font-size:13px;font-weight:600}
+.dsh-codex-context-row{align-items:center;display:flex;font-size:12px;gap:14px;justify-content:space-between}
+.dsh-codex-capacity-control{align-items:center;display:flex;gap:7px}
+.dsh-codex-capacity-control input{font-family:ui-monospace,SFMono-Regular,Consolas,monospace;text-align:right;width:90px}
+.dsh-codex-capacity-control small{color:var(--dsw-alias-label-tertiary);font-size:11px;width:42px}
 .dsh-codex-check{align-items:flex-start;border-bottom:1px solid var(--dsw-alias-border-l2);cursor:pointer;display:flex;gap:10px;padding:12px 0}
 .dsh-codex-check input{flex:none;margin-top:2px}
 .dsh-codex-check small{color:var(--dsw-alias-label-secondary);display:block;font-size:12px;line-height:1.45;margin-top:2px}
@@ -1052,7 +1220,7 @@ window.__ModuleLoader__.load({
 .dsh-codex-image-loading,.dsh-codex-image-failed{border:1px dashed var(--dsw-alias-border-l2);border-radius:8px;color:var(--dsw-alias-label-tertiary);display:inline-flex;font-size:12px;line-height:1.4;padding:18px 20px}
 .dsh-codex-image-failed{color:var(--dsw-alias-label-danger,#d94b4b)}
 @keyframes dsh-codex-pulse{0%,100%{opacity:.55}50%{opacity:1}}
-@media(max-width:560px){.dsh-codex-row,.dsh-codex-pref-row,.dsh-codex-quota-fact{align-items:flex-start;flex-direction:column;gap:3px}.dsh-codex-value,.dsh-codex-quota-fact strong{text-align:left}.dsh-codex-actions{justify-content:flex-start}.dsh-codex-grouphead{align-items:flex-start;flex-direction:column;gap:0;padding:12px 0}.dsh-codex-meter-meta{align-items:flex-start;flex-direction:column;gap:2px}.dsh-codex-errorbar{align-items:flex-start;flex-direction:column}.dsh-codex-segments{width:100%}.dsh-codex-segments label{flex:1}.dsh-codex-segments span{text-align:center}.dsh-codex-image-tool{max-width:100%;margin-left:0}}
+@media(max-width:560px){.dsh-codex-row,.dsh-codex-pref-row,.dsh-codex-quota-fact{align-items:flex-start;flex-direction:column;gap:3px}.dsh-codex-value,.dsh-codex-quota-fact strong{text-align:left}.dsh-codex-actions{justify-content:flex-start}.dsh-codex-grouphead{align-items:flex-start;flex-direction:column;gap:0;padding:12px 0}.dsh-codex-meter-meta{align-items:flex-start;flex-direction:column;gap:2px}.dsh-codex-errorbar{align-items:flex-start;flex-direction:column}.dsh-codex-segments{width:100%}.dsh-codex-select{max-width:none;width:100%}.dsh-codex-context-row{align-items:flex-start;flex-direction:column;gap:5px}.dsh-codex-segments label{flex:1}.dsh-codex-segments span{text-align:center}.dsh-codex-image-tool{max-width:100%;margin-left:0}}
 @media(prefers-reduced-motion:reduce){.dsh-codex-meter>span{transition:none}.dsh-codex-skeleton span{animation:none}}
 `;
 		function installStyles() {