@eddyskywalker/dsh-chatgpt-subscription 0.11.5 → 0.11.7

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+- **插件内上下文预算恢复**：Kimi Code、MiniMax Code、Command Code、Claude、WorkBuddy 的模型请求在 HTTP 400/422 明确报告完整且一致的窗口、输入和输出 token 计数时，若输入仍能放下、上游输出预留等于实际发送的上限，会保留完整消息和工具，只降低输出上限并重试一次（预留 1024 tokens 余量，至少保留 1024 输出 tokens）。普通请求与摘要请求共用此路径，不修改 DSH、不截断历史。显式 thinking budget 不满足时不强行重试；鉴权、限流、字节限制、模糊计数、服务端忽略参数和流内错误保持原处理，输出截断也仍报告失败。Kimi/MiniMax 共用的输入估算补计推理文本和工具调用参数，避免将这些实际输入计为零。验证：截图预算的三种输出字段回归、MiniMax 普通/摘要真实 LLM 服务调用、Kimi Chat Completions 与 Command Code Responses 适配器回归通过；全量插件测试、强制源码及测试类型检查、构建通过。Codex 不支持输出上限字段，未套用此恢复；未进行真实账号端到端验证，不能据此认定截图中未知线路的所有压缩故障已解决。
+
+- **修复设置页「订阅服务」整页样式丢失（只剩标签栏有样式）**。
+  - **根因**：客户端插件系统按属性记账样式归属。模块工厂 materialize 时会把文档里**所有未打标**的 `<style>` 认领给当时正在 materialize 的那个包（`style:not([data-plugin])` 被写上该包 id），并在该包重载 / 被新 revision 替换 / 被从依赖图剪除时执行 `removeOwnedStyles(id)`，按 owner 删掉这些标签。本插件的 7 张表（antigravity / claude / kimi-code / minimax-code / workbuddy / pool / mermaid）此前只用 `style.id = …` 注入、**不带 `data-plugin`**，于是先被别的包认领，再随那个包的重载被一起删除；而聊天区那张已按约定打了 `data-plugin` + `data-plugin-css` 的 `…/main` 表存活下来。设置页标签栏的样式来自 `…/main`（`.dsh-codex-segments`、`.dsh-hub-tabs`），正文控件来自被删掉的共享 `.dsha-*` 基础表，所以呈现为「标签栏正常、整页正文裸奔」。
+  - **修法**：新增 `src/client/common/plugin-style.ts` 的 `installPluginStyle(name, css, legacyId?)`，把原来的「`createElement` + `style.id` + 一次性 append」统一换成：按 `…/<name>` 的 `data-plugin-css` 定位、缺失时创建、**创建/命中时都盖上本包的 `data-plugin` 与唯一的 `data-plugin-css`**、内容变化时刷新 `textContent`、disposer 恒为空操作（标签归文档所有）。八个安装器全部改走它，原来判断存在即 return 的分支一并去掉，因此旧 bundle 在页面里留下的未打标元素会被**就地接管**（不会叠出第二份 CSS），`…/main` 的行为保持不变。
+  - **测试**：新增 `test/client-style-ownership.test.ts`（5 条）——八个安装器跑完后断言文档里不剩任何 `style:not([data-plugin])`（不给别的包留可认领对象）、每张表的 `data-plugin-css` 都指向本包；ChatGPT 默认页依赖的 `.dsha-*` 基础表（Kimi / Antigravity）确实带本包归属；模拟 `removeOwnedStyles` 删光后重新安装能全部恢复；模拟「旧 bundle 的未打标表已被别的包认领」时必须接管同一元素并改回本包；旧 bundle 的过期 CSS 必须被刷新而不是 dedupe 成空操作。
+  - **验证**：`npm run typecheck` 0 错误；全量 **2314 passed** / 9 skipped，仅 `test/quota-ui.test.tsx` 2 条与本次无关、且在本机时区（Etc/GMT+7）下必然失败的历史用例（把 UTC 的 2030-01-01 渲染成 2029-12-31）未过。
+
 - **修复 Ollama「同步模型列表」报 `Failed to execute 'json' on 'Response': Unexpected end of JSON input`**（[issue #36](https://github.com/Aa728848/dsh-chatgpt-subscription/issues/36)）。
   - **根因不在 Ollama Cloud**：issue 里推测的端点与鉴权都没问题——`CLOUD_BASE_URL` 一直就是 `https://ollama.com`，`/api/tags` 也一直带着 `Authorization: Bearer <key>`，只是从来没有任何一条断言钉住这两点（本次补上）。真正的原因是**本插件自己的路由**：`/ollama/api` 是全插件唯一没有用 `try/catch` 包起来的设置路由处理器，一旦它抛错，DSH 的 web server（`packages/host/webserver`）只会回一个**空的 400**（`res.writeHead(400); res.end()`）。卡片再把这个空响应体交给 `response.json()`，浏览器抛出的解析异常就成了用户看到的全部错误——既没有状态码，也没有请求信息，真实原因只留在主机日志里。同步路径上 `storeCatalog()` 当时是唯一没有保护的 `await`，设置文件写不进去就会走到这里。
   - **修法（主机侧）**：路由处理器整体包进 `try/catch`，兜底用与 Claude / Kimi / WorkBuddy 等同级线路相同的 `{ok:false,error}` 500 信封，并补上它们都有、本线路唯独没有的 404 兜底；`storeCatalog()` 单独捕获，区分「列表读到了但本地存不下」与「读不到」。

package/README.md

@@ -766,6 +766,8 @@ npm pack --dry-run
 
 ### 压缩失败
 
+Kimi Code、MiniMax Code、Command Code、Claude、WorkBuddy 遇到“输入加输出预留超限”时，插件可在 HTTP 400/422 的完整 token 计数证明输入仍能放下、且上游确实采用了请求输出上限的情况下，仅降低输出上限重试一次。消息、工具和历史保持不变，摘要请求也适用。降低后的输出仍可能截断，截断不会冒充完整摘要。Codex 不支持该输出参数，不走此恢复；输入本身超限、模糊错误或流内错误仍交给 Harness 处理。这不是对所有压缩故障的通用修复。
+
 MiniMax、Kimi、Codex、Claude、Command Code、WorkBuddy 和 Antigravity 的错误处理会将明确的上下文超限错误交给 Harness 的溢出恢复机制。该机制需要宿主启用压缩后端；它不是无条件重发同一个超限请求。认证、配额、请求体字节限制和输出截断不会因此被当作上下文超限。手动压缩仍需生成完整摘要；如果摘要请求本身超限、被截断或缺少正文，修正错误分类也不能保证它成功。请保留失败会话中的 `compaction/end` 错误、provider/model、宿主及插件版本，以便定位。
 
 | 现象 | 处理 |

package/lib/client.js

@@ -9723,9 +9723,45 @@ window.__ModuleLoader__.load({
 			}
 		};
 		//#endregion
-		//#region src/client/styles.ts
+		//#region src/client/common/plugin-style.ts
+		/**
+		* Shared installer for every stylesheet this plugin injects.
+		*
+		* The DSH client module system books stylesheet ownership by attribute. When a
+		* package's factory materializes it claims every untagged `<style>` in the
+		* document for itself (`style:not([data-plugin])` gains that package's id); when
+		* a package reloads, is replaced at a new revision, or is pruned from the graph,
+		* it removes every tag carrying its id. A sheet injected as a plain
+		* `<style id=…>` therefore gets claimed by whichever sibling package
+		* materializes next and is then deleted as that sibling's bookkeeping — which is
+		* how the whole shared provider design system (`.dsha-*`) disappeared from the
+		* settings page while the already-tagged chat-only `…/main` sheet survived.
+		*
+		* Tagging every sheet with this package's own `data-plugin` and a unique
+		* `data-plugin-css` keeps the module system from attributing it to another
+		* package, and re-running the installer on every `apply()` restores it after one
+		* of our own reloads. The tag is owned by the document: the installer refreshes
+		* stale text but never removes the element, so a stale fiber's teardown can
+		* never take the styles away.
+		*/
 		const PLUGIN_ID = "@eddyskywalker/dsh-chatgpt-subscription";
-		const STYLE_ID$5 = `${PLUGIN_ID}/main`;
+		function installPluginStyle(name, css, legacyId) {
+			if (typeof document === "undefined") return () => void 0;
+			const pluginCss = `${PLUGIN_ID}/${name}`;
+			let element = document.querySelector(`style[data-plugin-css="${pluginCss}"]`);
+			element ??= legacyId === void 0 ? null : document.getElementById(legacyId);
+			if (element === null) {
+				element = document.createElement("style");
+				if (legacyId !== void 0) element.id = legacyId;
+				document.head.appendChild(element);
+			}
+			element.dataset.plugin = PLUGIN_ID;
+			element.dataset.pluginCss = pluginCss;
+			if (element.textContent !== css) element.textContent = css;
+			return () => void 0;
+		}
+		//#endregion
+		//#region src/client/styles.ts
 		const CSS = `
 .dsh-codex-page{box-sizing:border-box;color:var(--dsw-alias-label-primary);display:flex;flex-direction:column;gap:20px;max-width:780px;min-width:0;padding:2px 0 30px}
 .dsh-codex-page *{box-sizing:border-box}
@@ -9873,29 +9909,20 @@ window.__ModuleLoader__.load({
 		* create it when missing, refresh `textContent` when a rebuilt bundle ships
 		* different CSS (HMR), and return a no-op disposer unconditionally, matching
 		* the additive installers.
+		*
+		* Every other sheet this plugin injects now goes through the same installer
+		* (`installPluginStyle`), which additionally stamps the ownership attributes
+		* the client module system needs so the tag cannot be claimed by, and later
+		* removed with, some other package.
 		*/
 		function installStyles() {
-			if (typeof document === "undefined") return () => void 0;
-			const existing = document.querySelector(`style[data-plugin-css="${STYLE_ID$5}"]`);
-			if (existing !== null) {
-				if (existing.textContent !== CSS) existing.textContent = CSS;
-				return () => void 0;
-			}
-			const element = document.createElement("style");
-			element.dataset.plugin = PLUGIN_ID;
-			element.dataset.pluginCss = STYLE_ID$5;
-			element.textContent = CSS;
-			document.head.appendChild(element);
-			return () => void 0;
+			return installPluginStyle("main", CSS);
 		}
 		//#endregion
 		//#region src/client/antigravity/styles.ts
 		const STYLE_ID$4 = "dsh-antigravity-settings-style";
 		function installAntigravityStyles() {
-			if (typeof document === "undefined" || document.getElementById("dsh-antigravity-settings-style")) return;
-			const style = document.createElement("style");
-			style.id = STYLE_ID$4;
-			style.textContent = `
+			installPluginStyle("antigravity", `
 .dsha-page{box-sizing:border-box;color:var(--dsw-alias-label-primary);display:flex;flex-direction:column;gap:20px;max-width:780px;min-width:0;padding:2px 0 30px}
 .dsha-page *{box-sizing:border-box}
 .dsha-group{border-top:0.5px solid var(--dsw-alias-border-l2);min-width:0}
@@ -9969,8 +9996,7 @@ window.__ModuleLoader__.load({
 .dsha-account-details{display:flex;flex-wrap:wrap;gap:14px;font-size:12px;color:var(--dsw-alias-label-secondary)}
 .dsha-account-actions{display:flex;flex-wrap:wrap;gap:6px;margin-top:2px}
 .dsha-account-actions .dsha-btn{padding:5px 10px;font-size:12px}
-`;
-			document.head.append(style);
+`, STYLE_ID$4);
 		}
 		//#endregion
 		//#region src/client/common/styles.ts
@@ -9984,14 +10010,10 @@ window.__ModuleLoader__.load({
 		* them, so nothing that already rendered changes appearance.
 		*/
 		function installPoolStyles() {
-			if (typeof document === "undefined" || document.getElementById("dsh-provider-pool-style")) return;
-			const style = document.createElement("style");
-			style.id = POOL_STYLE_ID;
-			style.textContent = `
+			installPluginStyle("pool", `
 .dsha-badge.danger{background:color-mix(in srgb,var(--dsw-alias-label-danger,#d94b4b) 18%,var(--dsw-alias-bg-layer-1));color:var(--dsw-alias-label-danger,#d94b4b);border:0.5px solid color-mix(in srgb,var(--dsw-alias-label-danger,#d94b4b) 40%,transparent)}
 .dsha-account-card .dsha-btn.danger{color:var(--dsw-alias-label-danger,#d94b4b)}
-`;
-			document.head.append(style);
+`, POOL_STYLE_ID);
 		}
 		//#endregion
 		//#region src/client/antigravity/AntigravityComposerQuota.tsx
@@ -10227,10 +10249,7 @@ window.__ModuleLoader__.load({
 		* markers, neither of which a sibling line renders.
 		*/
 		function installClaudeStyles() {
-			if (typeof document === "undefined" || document.getElementById("dsh-claude-settings-style")) return;
-			const style = document.createElement("style");
-			style.id = STYLE_ID$3;
-			style.textContent = `
+			installPluginStyle("claude", `
 .dsha-badge.claude-adopted{background:color-mix(in srgb,var(--dsw-alias-button-info-fill,#397ee8) 16%,var(--dsw-alias-bg-layer-1));border-color:color-mix(in srgb,var(--dsw-alias-button-info-fill,#397ee8) 45%,var(--dsw-alias-border-l2));color:var(--dsw-alias-label-primary)}
 .dshcl-flow{border-bottom:0.5px solid var(--dsw-alias-border-l2);display:flex;flex-direction:column;gap:10px;padding:12px 0}
 .dshcl-flow-url{background:var(--dsw-alias-bg-layer-1,rgba(127,127,127,.14));border:0.5px solid var(--dsw-alias-border-l2);border-radius:7px;color:var(--dsw-alias-label-primary);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px;overflow-wrap:anywhere;padding:8px 10px;user-select:all}
@@ -10240,8 +10259,7 @@ window.__ModuleLoader__.load({
 .dshcl-mono{font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px;overflow-wrap:anywhere}
 .dshcl-model-meta{color:var(--dsw-alias-label-tertiary);font-size:11px;margin-left:5px}
 .dshcl-empty-inline{color:var(--dsw-alias-label-tertiary);font-size:12px}
-`;
-			document.head.append(style);
+`, STYLE_ID$3);
 		}
 		//#endregion
 		//#region src/client/command-code/CommandCodeComposerQuota.tsx
@@ -10560,11 +10578,7 @@ window.__ModuleLoader__.load({
 `;
 		/** Kimi-specific rules layered on top of the shared control styles. */
 		function installKimiCodeStyles() {
-			if (typeof document === "undefined" || document.getElementById("dsh-kimi-code-settings-style")) return;
-			const style = document.createElement("style");
-			style.id = STYLE_ID$2;
-			style.textContent = BASE;
-			document.head.appendChild(style);
+			installPluginStyle("kimi-code", BASE, STYLE_ID$2);
 		}
 		//#endregion
 		//#region src/client/minimax-code/MinimaxCodeComposerQuota.tsx
@@ -10662,16 +10676,12 @@ window.__ModuleLoader__.load({
 		* credential path and the model-name list.
 		*/
 		function installMinimaxCodeStyles() {
-			if (typeof document === "undefined" || document.getElementById("dsh-minimax-code-settings-style")) return;
-			const style = document.createElement("style");
-			style.id = STYLE_ID$1;
-			style.textContent = `
+			installPluginStyle("minimax-code", `
 .dshm-mono{font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px}
 .dshm-model-list{display:flex;flex-wrap:wrap;gap:7px;padding-top:8px}
 .dshm-model-list code{background:var(--dsw-alias-bg-layer-2);border:0.5px solid var(--dsw-alias-border-l2);border-radius:6px;color:var(--dsw-alias-label-secondary);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px;padding:5px 8px;white-space:nowrap}
 .dshm-quota-note{margin-top:12px}
-`;
-			document.head.append(style);
+`, STYLE_ID$1);
 		}
 		//#endregion
 		//#region src/client/workbuddy/WorkBuddyComposerQuota.tsx
@@ -10794,16 +10804,12 @@ window.__ModuleLoader__.load({
 		* every sibling tab, and the account card is the shared one.
 		*/
 		function installWorkBuddyStyles() {
-			if (typeof document === "undefined" || document.getElementById("dsh-workbuddy-settings-style")) return;
-			const style = document.createElement("style");
-			style.id = STYLE_ID;
-			style.textContent = `
+			installPluginStyle("workbuddy", `
 .dshwb-mono{font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px}
 .dsha-account-add-actions{display:flex;flex-wrap:wrap;gap:8px}
 .dsha-account-add-actions .dsha-btn{background:var(--dsw-alias-button-info-fill,#397ee8);border-color:transparent;color:var(--dsw-alias-button-info-label,#fff)}
 .dsha-account-add-actions .dsha-btn:hover:not(:disabled){opacity:.9;background:var(--dsw-alias-button-info-fill,#397ee8)}
-`;
-			document.head.append(style);
+`, STYLE_ID);
 		}
 		//#endregion
 		//#region src/client/mermaid/sanitize.ts
@@ -10854,10 +10860,7 @@ window.__ModuleLoader__.load({
 		//#region src/client/mermaid/styles.ts
 		const MERMAID_STYLE_ID = "dsh-mermaid-renderer-style";
 		function installMermaidStyles() {
-			if (typeof document === "undefined" || document.getElementById("dsh-mermaid-renderer-style")) return;
-			const style = document.createElement("style");
-			style.id = MERMAID_STYLE_ID;
-			style.textContent = `
+			installPluginStyle("mermaid", `
 .dsh-mermaid-wrapper{margin:12px 0;border:1px solid var(--dsw-alias-border-l2,rgba(255,255,255,0.12));border-radius:8px;overflow:hidden;background:var(--dsw-alias-bg-layer-2,#1a1a1a);box-shadow:0 2px 8px rgba(0,0,0,0.15)}
 .dsh-mermaid-header{display:flex;align-items:center;justify-content:space-between;padding:6px 12px;background:var(--dsw-alias-bg-layer-1,rgba(0,0,0,0.25));border-bottom:1px solid var(--dsw-alias-border-l2,rgba(255,255,255,0.08));font-size:12px;color:var(--dsw-alias-label-secondary,#888)}
 .dsh-mermaid-title{font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px;text-transform:uppercase;letter-spacing:0.5px;color:var(--dsw-alias-label-tertiary,#aaa);font-weight:600}
@@ -10876,8 +10879,7 @@ window.__ModuleLoader__.load({
 .dsh-mermaid-modal-btn:hover{background:rgba(255,255,255,0.15)}
 .dsh-mermaid-modal-stage{flex:1;width:100%;height:100%;overflow:auto;display:flex;justify-content:center;align-items:center;padding:40px}
 .dsh-mermaid-modal-stage svg{max-width:90vw;max-height:85vh;height:auto}
-`;
-			document.head.append(style);
+`, MERMAID_STYLE_ID);
 		}
 		//#endregion
 		//#region src/client/mermaid/renderer.ts