dsh-remote-control 2.0.2 → 2.0.4

package/cordis.patch.yml

@@ -12,7 +12,6 @@
         hostTokenEnv: DRC_HOST_TOKEN
         hostLabel: dsh-host
         unarchiveOnPrompt: true
-        takeOverQuestions: false
         listingRefreshSec: 15
         approvalTimeoutSec: 180
         keepAwake:

package/dist/bundle/index.js

@@ -11,11 +11,20 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 var __commonJS = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -10500,7 +10509,17 @@ function defaultHistory(sessionId) {
     },
     { kind: "delta", sessionId, messageId: "mock_h3", text: "\u7ED3\u6784\u6E05\u695A\u4E86\u3002", role: "assistant", done: true },
     { kind: "delta", sessionId, messageId: "mock_h4", text: "\u518D\u8DD1\u4E00\u904D\u6D4B\u8BD5", role: "user", done: true },
-    { kind: "delta", sessionId, messageId: "mock_h5", text: "\u6D4B\u8BD5\u5168\u8FC7\u3002", role: "assistant", done: true }
+    { kind: "delta", sessionId, messageId: "mock_h5", text: "\u6D4B\u8BD5\u5168\u8FC7\u3002", role: "assistant", done: true },
+    // 2026-10-05 补：待办快照也进历史页（wire 1.5.0）。放在最后——一页里最后一条
+    // 就是那一页截止时的清单，本地全链路要真的走到这条路径，而不是只在单测里摆帧。
+    {
+      kind: "todo",
+      sessionId,
+      todos: [
+        { content: "\u590D\u73B0\u7528\u6237\u62A5\u7684\u95EE\u9898", status: "completed" },
+        { content: "\u6539\u5B8C\u8DD1\u4E00\u904D\u672C\u5730\u5168\u94FE\u8DEF", status: "in_progress" }
+      ]
+    }
   ];
 }
 function createMockKernel(options) {
@@ -10673,7 +10692,7 @@ var init_mock_kernel = __esm({
 // src/index.ts
 import path6 from "node:path";
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/crypto/bytes.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/crypto/bytes.js
 import { Buffer as Buffer2 } from "node:buffer";
 var encoder = new TextEncoder();
 var decoder = new TextDecoder("utf-8", { fatal: false });
@@ -10700,7 +10719,7 @@ function concat(parts) {
   return out;
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/crypto/keys.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/crypto/keys.js
 import { createHash, randomBytes } from "node:crypto";
 var KDF_NAMESPACE = "dsh-rc/v1";
 var UNIT_SEPARATOR = 31;
@@ -10730,7 +10749,7 @@ function randomNonce() {
   return new Uint8Array(randomBytes(NONCE_BYTES));
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/crypto/record.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/crypto/record.js
 var import_tweetnacl = __toESM(require_nacl_fast(), 1);
 var MAC_BYTES = 16;
 var MIN_RECORD_BYTES = NONCE_BYTES + MAC_BYTES;
@@ -10763,7 +10782,7 @@ function open(key, record2) {
   }
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/identity/pairing.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/identity/pairing.js
 import { randomBytes as randomBytes2 } from "node:crypto";
 var URI_PREFIX = "dshr:";
 var TOKEN_RE = /^\d{6}$/;
@@ -30461,7 +30480,7 @@ function date4(params) {
   return _coercedDate(ZodDate, params);
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/wire/frames.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/wire/frames.js
 var PAIRING_TOKEN_RE = /^\d{6}$/;
 var nonEmpty = external_exports.string().min(1);
 var pairingToken = external_exports.string().regex(PAIRING_TOKEN_RE);
@@ -30620,7 +30639,7 @@ function parseRelayFrameText(raw) {
   }
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/wire/payloads.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/wire/payloads.js
 var SESSION_STATES = [
   "idle",
   "running",
@@ -30770,7 +30789,7 @@ var evResult = external_exports.object({
   message: external_exports.string().optional(),
   data: external_exports.record(external_exports.string(), external_exports.unknown()).optional()
 });
-var historyItem = external_exports.discriminatedUnion("t", [evMessageDelta, evToolEvent]);
+var historyItem = external_exports.discriminatedUnion("t", [evMessageDelta, evToolEvent, evTodo]);
 var evSessionHistory = external_exports.object({
   t: external_exports.literal("ev.session_history"),
   sessionId: nonEmpty2,
@@ -30905,7 +30924,7 @@ var PAYLOAD_TYPES = {
   evSessionHistory: "ev.session_history"
 };
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/wire/outbound.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/wire/outbound.js
 function sessionChanged(sessions, reason) {
   return { t: PAYLOAD_TYPES.evSessionChanged, sessions, ...reason === void 0 ? {} : { reason } };
 }
@@ -30967,7 +30986,7 @@ function sessionHistory(args) {
   };
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.4.0/node_modules/dsh-remote-wire/dist/src/platform/sleep.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.5.0/node_modules/dsh-remote-wire/dist/src/platform/sleep.js
 function detectBackend(platform) {
   if (platform === "darwin")
     return "caffeinate";
@@ -31780,6 +31799,9 @@ function historyWireItem(event) {
       ...event.role === void 0 ? {} : { role: event.role }
     });
   }
+  if (event.kind === "todo") {
+    return todoList({ todos: event.todos });
+  }
   if (event.kind === "tool") {
     return toolEvent({
       callId: event.callId,
@@ -32230,6 +32252,8 @@ import { randomBytes as randomBytes3 } from "node:crypto";
 var BACKOFF_MIN_MS = 1e3;
 var BACKOFF_MAX_MS = 3e4;
 var HANDSHAKE_TIMEOUT_MS = 1e4;
+var PROBE_INTERVAL_MS = 2e4;
+var PROBE_TIMEOUT_MS = 1e4;
 var VOIDED_MAX = 256;
 var RelayClient = class {
   constructor(options) {
@@ -32251,6 +32275,10 @@ var RelayClient = class {
   stopped = false;
   reconnectTimer;
   handshakeTimer;
+  /** 存活探针的下一次提问（自重启的 setTimeout 链，见 {@link startProbe}）。 */
+  probeTimer;
+  /** 已提问、还没等到 pong 的那个定时器；undefined = 当前没有待答的问题。 */
+  pongDeadline;
   /** 连续解不开的会话：解不开说明这端已经没有对应密钥，留着它只会让手机永远转圈。 */
   undecryptable = /* @__PURE__ */ new Map();
   /** 已经向中继声明过的 convId（防重复 `session-leave`）；有上界，见 {@link VOIDED_MAX}。 */
@@ -32326,6 +32354,7 @@ var RelayClient = class {
       });
     });
     socket.on("message", (raw) => this.onFrame(String(raw)));
+    this.startProbe(socket);
     socket.on("close", (code, reason) => {
       this.options.clock.clearTimeout(timeout);
       this.emitState("offline", `\u8FDE\u63A5\u5173\u95ED ${code} ${reason ? reason.toString() : ""}`.trim());
@@ -32496,6 +32525,7 @@ var RelayClient = class {
         });
         return;
       case "pong":
+        this.clearPongDeadline();
         return;
       case "enc":
       case "enc-batch":
@@ -32559,6 +32589,7 @@ var RelayClient = class {
       this.options.clock.clearTimeout(this.handshakeTimer);
       this.handshakeTimer = void 0;
     }
+    this.stopProbe();
     if (!socket) return;
     socket.removeAllListeners();
     socket.on("error", () => {
@@ -32568,6 +32599,49 @@ var RelayClient = class {
     } catch {
     }
   }
+  // ── 存活探针 ────────────────────────────────────────────────────────
+  /**
+   * 每隔 `probeIntervalMs` 问中继一句 `ping`，并给答复留 `probeTimeoutMs`。
+   *
+   * 用**自重启的 setTimeout 链**而不是 setInterval：时钟接口只有 setTimeout
+   * （见 `Clock`），而且链式写法天然带上"上一轮还没答就下一轮"的语义——
+   * 超时判死之后这条链也跟着 socket 一起被 closeSocket 收掉。
+   *
+   * `ping`/`pong` 是协议里本来就有的一对应用帧（中继无条件回 pong），
+   * 所以这一跳不需要动线协议；不直接用 ws 协议层 ping 是因为那一条在
+   * Node 的 ws 里由库自动应答，两端都"看得见"却都不留痕，排障时查不到。
+   */
+  startProbe(socket) {
+    this.stopProbe();
+    const interval = this.options.probeIntervalMs ?? PROBE_INTERVAL_MS;
+    const timeout = this.options.probeTimeoutMs ?? PROBE_TIMEOUT_MS;
+    const ask = () => {
+      if (this.stopped || this.socket !== socket) return;
+      if (socket.readyState === import_websocket.default.OPEN) {
+        this.raw({ t: "ping", ts: this.options.clock.now() });
+        this.clearPongDeadline();
+        this.pongDeadline = this.options.clock.setTimeout(() => {
+          this.options.log("relay probe timeout", { waitedMs: timeout });
+          socket.terminate();
+        }, timeout);
+      }
+      this.probeTimer = this.options.clock.setTimeout(ask, interval);
+    };
+    this.probeTimer = this.options.clock.setTimeout(ask, interval);
+  }
+  stopProbe() {
+    if (this.probeTimer !== void 0) {
+      this.options.clock.clearTimeout(this.probeTimer);
+      this.probeTimer = void 0;
+    }
+    this.clearPongDeadline();
+  }
+  clearPongDeadline() {
+    if (this.pongDeadline !== void 0) {
+      this.options.clock.clearTimeout(this.pongDeadline);
+      this.pongDeadline = void 0;
+    }
+  }
   emitState(relay, problem) {
     this.options.onState({
       relay,
@@ -34448,7 +34522,7 @@ function startPill(ctx, deps) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = true ? "2.0.2" : "dev";
+var PLUGIN_VERSION = true ? "2.0.4" : "dev";
 
 // src/index.ts
 var SERVICE_NAMES = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-control",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "DSH Remote Control host plugin: pairs a running DeepSeek Harness with the DRC relay so a WeChat Mini Program can send prompts, watch streamed output, and answer approvals. Payload-level E2E encryption; the relay never sees plaintext. Pairing is one click on the status-bar pill (three same-origin routes + a browser half).",
   "type": "module",
   "license": "MIT",
@@ -53,19 +53,19 @@
     "provenance": true
   },
   "dependencies": {
-    "dsh-remote-wire": "^1.4.0",
+    "dsh-remote-wire": "^1.5.0",
     "qrcode": "^1.5.4",
     "tweetnacl": "^1.0.3",
     "ws": "^8.18.0",
     "zod": "^4.6.5"
   },
   "devDependencies": {
-    "@types/node": "^22.9.0",
+    "@types/node": "^26.6.3",
     "@types/qrcode": "^1.5.5",
     "@types/ws": "^8.5.12",
-    "esbuild": "^0.27.7",
+    "esbuild": "^0.28.2",
     "prettier": "^3.3.3",
-    "typescript": "^5.6.3"
+    "typescript": "^7.0.2"
   },
   "scripts": {
     "clean": "node --input-type=module -e \"import { rmSync } from 'node:fs'; rmSync('dist', { recursive: true, force: true })\"",