@ljwei-stak/dsh-model-router 0.14.0-beta.2 → 0.14.0-beta.3

package/.dsh-plugin/client.js

@@ -11601,7 +11601,7 @@ var xterm_default = `/**
 `;
 
 // .dsh-plugin/client/host-version.mjs
-var ROUTER_CLIENT_VERSION = true ? "0.14.0-beta.2" : "";
+var ROUTER_CLIENT_VERSION = true ? "0.14.0-beta.3" : "";
 var STALE_HOST_MESSAGE = "\u63D2\u4EF6\u540E\u53F0\u7248\u672C\u8F83\u65E7\uFF0C\u8BF7\u5B8C\u5168\u9000\u51FA\u5E76\u91CD\u542F Harness\uFF08\u5305\u62EC\u6258\u76D8\u56FE\u6807\uFF09\u540E\u518D\u4F7F\u7528\u3002";
 function isMissingRemoteMethod(message) {
   const value = String(message ?? "");
@@ -11723,6 +11723,7 @@ function parseTerminalStop(value) {
   const request = plainObject(value, "terminal stop request");
   return { sessionId: sessionIdOf(request.sessionId) };
 }
+var isTerminalSessionId = (value) => typeof value === "string" && SESSION_ID.test(value);
 
 // .dsh-plugin/client/cli-terminal-state.mjs
 var text3 = (value) => typeof value === "string" ? value.trim() : "";
@@ -11779,10 +11780,26 @@ var formatDuration = (ms2) => {
   const minutes = Math.floor(seconds / 60);
   return minutes < 60 ? `${minutes} \u5206 ${seconds % 60} \u79D2` : `${Math.floor(minutes / 60)} \u5C0F\u65F6 ${minutes % 60} \u5206`;
 };
-var unwrap = (response, fallback) => {
-  if (response?.ok) return response.value;
-  throw new Error(remoteErrorText(text3(response?.error?.message) || text3(response?.error), fallback));
-};
+function unwrapTerminal(response, fallback) {
+  if (!response?.ok) throw new Error(remoteErrorText(text3(response?.error?.message) || text3(response?.error), fallback));
+  const inner = response.value;
+  if (inner && typeof inner === "object" && typeof inner.ok === "boolean") {
+    if (!inner.ok) throw new Error(remoteErrorText(text3(inner.error?.message) || text3(inner.error), fallback));
+    return inner.value;
+  }
+  return inner;
+}
+var unwrap = unwrapTerminal;
+async function loadTerminalInfo(api) {
+  const info = unwrap(await api.terminalInfo(), "\u65E0\u6CD5\u8BFB\u53D6\u7EC8\u7AEF\u72B6\u6001\u3002");
+  if (!info || typeof info !== "object" || !["pty", "pipe"].includes(info.backend)) throw new Error("\u7EC8\u7AEF\u72B6\u6001\u683C\u5F0F\u65E0\u6548\u3002");
+  return info;
+}
+async function startTerminal(api, request) {
+  const session = unwrap(await api.terminalStart({ ...request, confirmed: true }), "\u7EC8\u7AEF\u542F\u52A8\u5931\u8D25\u3002");
+  if (!isTerminalSessionId(session?.sessionId)) throw new Error("\u7EC8\u7AEF\u542F\u52A8\u7ED3\u679C\u7F3A\u5C11\u6709\u6548\u7684\u4F1A\u8BDD ID\u3002");
+  return session;
+}
 var TerminalConnection = class {
   constructor({ api, sessionId, onData, onExit, onError, waitMs = 800, retryMs = 1e3, resizeDelayMs = 120, setTimer = setTimeout, clearTimer = clearTimeout }) {
     Object.assign(this, { api, sessionId, onData, onExit, onError, waitMs, retryMs, resizeDelayMs });
@@ -11796,6 +11813,13 @@ var TerminalConnection = class {
     this.failures = 0;
   }
   start() {
+    if (!isTerminalSessionId(this.sessionId)) {
+      this.closed = true;
+      this.onError?.(new Error("\u7EC8\u7AEF\u4F1A\u8BDD ID \u65E0\u6548\uFF0C\u65E0\u6CD5\u8BFB\u53D6\u8F93\u51FA\u3002"));
+      this.onExit?.({ endReason: "lost", exitCode: null });
+      this.loop = Promise.resolve();
+      return this.loop;
+    }
     this.loop = this.readLoop();
     return this.loop;
   }
@@ -11849,7 +11873,9 @@ var TerminalConnection = class {
     }
   }
   resize(cols, rows) {
-    if (this.closed) return;
+    if (this.closed || !Number.isFinite(cols) || !Number.isFinite(rows)) return;
+    cols = Math.min(TERMINAL_LIMITS.maxCols, Math.max(TERMINAL_LIMITS.minCols, Math.round(cols)));
+    rows = Math.min(TERMINAL_LIMITS.maxRows, Math.max(TERMINAL_LIMITS.minRows, Math.round(rows)));
     if (this.resizeTimer) this.clearTimer(this.resizeTimer);
     this.resizeTimer = this.setTimer(() => {
       this.resizeTimer = null;
@@ -11975,10 +12001,9 @@ function CliTerminalCard({ api, health }) {
   const mounted = import_react4.default.useRef(true);
   const loadInfo = import_react4.default.useCallback(async () => {
     try {
-      const response = await api.terminalInfo();
+      const value = await loadTerminalInfo(api);
       if (!mounted.current) return;
-      if (!response?.ok) throw new Error(remoteErrorText(response?.error?.message, "\u65E0\u6CD5\u8BFB\u53D6\u7EC8\u7AEF\u72B6\u6001\u3002"));
-      setInfo({ status: "ready", value: response.value, error: "" });
+      setInfo({ status: "ready", value, error: "" });
     } catch (error) {
       if (mounted.current) setInfo({ status: "error", value: null, error: errorText(error, "\u65E0\u6CD5\u8BFB\u53D6\u7EC8\u7AEF\u72B6\u6001\u3002") });
     }
@@ -12007,15 +12032,14 @@ function CliTerminalCard({ api, health }) {
     setStarting(true);
     setStartError("");
     try {
-      const response = await api.terminalStart({ target: selected.id, mode, cwd: text4(cwd), cols: 100, rows: 30, confirmed: true });
-      if (!response?.ok) throw new Error(remoteErrorText(response?.error?.message, "\u7EC8\u7AEF\u542F\u52A8\u5931\u8D25\u3002"));
+      const session = await startTerminal(api, { target: selected.id, mode, cwd: text4(cwd), cols: 100, rows: 30 });
       storeCwd(text4(cwd));
       if (!mounted.current) {
-        void api.terminalStop({ sessionId: response.value.sessionId });
+        void api.terminalStop({ sessionId: session.sessionId });
         return;
       }
-      setSessions((previous) => [...previous, { ...response.value, ended: null }]);
-      setActiveId(response.value.sessionId);
+      setSessions((previous) => [...previous, { ...session, ended: null }]);
+      setActiveId(session.sessionId);
       setConfirming(false);
     } catch (error) {
       if (mounted.current) setStartError(errorText(error, "\u7EC8\u7AEF\u542F\u52A8\u5931\u8D25\u3002"));

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.14.0-beta.3 — 2026-10-03
+
+Prerelease under the npm `next` tag only (`latest` stays 0.13.3). **Quit Harness completely (including the tray icon) and start it again after updating**, or the Host keeps running the 0.14.0-beta.2 code.
+
+### Fixed
+- 官方工具终端: a session (e.g. Kimi Code 登录) opened a black terminal and then failed with `typert gateway: modelRouterOfficialTools/terminalRead: wire field "request" failed boundary validation`; the footer read `undefined · undefined`. The Host methods answer with their own `{ ok, value }` envelope and the Typert gateway wraps that again, so the client receives `{ ok: true, value: { ok: true, value: result } }`. The terminal card read only the outer level, so the session id, command and directory were `undefined` and every `terminalRead` carried no `sessionId`, which the strict request codec rejects at the gateway. Host-side start failures (such as a missing CLI) were hidden the same way. The card now unwraps both levels (`unwrapTerminal`, `loadTerminalInfo`, `startTerminal`) and reports inner errors. The schemas were correct, and the gateway does not strip response fields.
+- The client never sends a read or write for an invalid session id, and it clamps resize requests from a collapsed panel into the accepted 10–500 × 3–300 range instead of failing validation.
+
+### Tests
+- `tests/helpers/typert-gateway.mjs` copies Harness's gateway boundary (`assertExactArguments`, `decode`, `assertJsonValue`, `encodeRpcResult`, JSON wire). `tests/cli-terminal-gateway.test.mjs` sends the card's real payloads for all six terminal methods through it, through the real `OfficialToolsRemoteService` envelope and the real Host services.
+
 ## 0.14.0-beta.2 — 2026-10-03
 
 Prerelease under the npm `next` tag only (`latest` stays 0.13.3).

package/README.md

@@ -402,7 +402,7 @@ Claude Code, Codex, MiMo Code, and Grok Build support read-only and approved edi
 
 The planned Harness model ID is not necessarily the vendor CLI's model name. A saved `cliModel`, or temporary `cliModelsJson` keyed by tool or work-package ID, can provide a known vendor CLI name. A package-specific temporary mapping takes priority over a tool mapping, then the saved profile. ZCode uses its configured default model. Most vendor CLIs do not provide a verifiable actual model ID in their results, so inspect vendor run records to confirm which model and price applied. The plugin's sequential CLI team runner is separate from Harness's built-in Agent Teams lifecycle.
 
-### Interactive terminal (官方工具终端, 0.14.0-beta.2, npm `next`)
+### Interactive terminal (官方工具终端, 0.14.0-beta.3, npm `next`)
 
 The workbench has an **官方工具终端** card below the tool health check. It runs your system shell (PowerShell on Windows, your login `$SHELL` elsewhere) or one installed official CLI (`codex`, `claude`, `kimi`, `mcode`, `mimo`, `grok`, `gemini`) interactively, in tabs, with live output: multi-turn conversations, full-screen TUIs, and logins such as `codex login`, `claude auth login`, `kimi login`, `mcode login`, `mimo auth login`, `grok login` (choose **登录**).
 

package/README.zh.md

@@ -391,7 +391,7 @@ Claude 与 Codex 若本机已有经核验的签名入口，仍优先走原有沙
 
 Harness 目录中的模型 ID 未必是厂商 CLI 接受的名字。逐模型设置可填写 `cliModel`；团队执行时临时的“工作包映射 > 工具映射 > 保存映射”。ZCode 3.14.3 不能逐次切换模型。多数 CLI 不回报可核验的实际模型 ID，执行后要对照厂商运行记录、权限和账单。Windows Harness 沙箱的 ACL 文件效果报告为部分隔离，涉及敏感仓库时应先用测试环境验证。
 
-### 官方工具终端（0.14.0-beta.2，npm `next`）
+### 官方工具终端（0.14.0-beta.3，npm `next`）
 
 工作台“官方工具 · 体检”下方新增 **官方工具终端** 卡片：以标签页形式交互运行系统终端（Windows 为 PowerShell，其他系统为登录 `$SHELL`）或已安装的官方 CLI（`codex`、`claude`、`kimi`、`mcode`、`mimo`、`grok`、`gemini`），实时输出，可多轮对话、显示全屏界面，也可选 **登录** 直接运行 `codex login`、`claude auth login`、`kimi login`、`mcode login`、`mimo auth login`、`grok login`。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ljwei-stak/dsh-model-router",
-  "version": "0.14.0-beta.2",
+  "version": "0.14.0-beta.3",
   "type": "module",
   "description": "Model Router for official DeepSeek Harness Desktop: cost-aware task routing, dependent work packages and official vendor CLI discovery, installation and execution. GAL is available separately as @ljwei-stak/dsh-galgame.",
   "repository": {
@@ -79,7 +79,7 @@
   "scripts": {
     "build:client": "node scripts/build-client.mjs",
     "check:client": "node scripts/build-client.mjs --check",
-    "test": "node --test tests/router.test.mjs tests/harness-*.test.mjs tests/official-tools.test.mjs tests/official-team-runtime.test.mjs tests/model-profiles.test.mjs tests/model-profile-editor.test.mjs tests/tool-install-state.test.mjs tests/vendor-adapters.test.mjs tests/desktop-compat.test.mjs tests/plugin-split.test.mjs tests/task-executors.test.mjs tests/roadmap.test.mjs tests/insights-state.test.mjs tests/billing-team-ledger.test.mjs tests/subscription-billing.test.mjs tests/subscription-host.test.mjs tests/test-pass-regressions.test.mjs tests/roadmap-gaps.test.mjs tests/cordis-inject.test.mjs tests/cli-terminal.test.mjs",
+    "test": "node --test tests/router.test.mjs tests/harness-*.test.mjs tests/official-tools.test.mjs tests/official-team-runtime.test.mjs tests/model-profiles.test.mjs tests/model-profile-editor.test.mjs tests/tool-install-state.test.mjs tests/vendor-adapters.test.mjs tests/desktop-compat.test.mjs tests/plugin-split.test.mjs tests/task-executors.test.mjs tests/roadmap.test.mjs tests/insights-state.test.mjs tests/billing-team-ledger.test.mjs tests/subscription-billing.test.mjs tests/subscription-host.test.mjs tests/test-pass-regressions.test.mjs tests/roadmap-gaps.test.mjs tests/cordis-inject.test.mjs tests/cli-terminal.test.mjs tests/cli-terminal-gateway.test.mjs",
     "prepack": "node scripts/prepack.mjs",
     "pack:local": "npm pack --pack-destination dist"
   },