dsh-remote-control 2.0.0 → 2.0.1

package/dist/bundle/client.cjs

@@ -75,12 +75,17 @@ function pillLabel(status) {
     if (waiting > 0) return { text: `\u7B49 ${waiting} \u4EF6\u4E8B`, tone: "wait" };
     return { text: "\u5DF2\u914D\u5BF9", tone: "on" };
   }
+  if (pairingCount(status) > 0) return { text: "\u624B\u673A\u79BB\u7EBF", tone: "wait" };
   return { text: "\u672A\u914D\u5BF9", tone: "off" };
 }
 function waitingCount(status) {
   const count = status?.waiting;
   return typeof count === "number" && count > 0 ? Math.min(Math.floor(count), 99) : 0;
 }
+function pairingCount(status) {
+  const count = status?.pairings;
+  return typeof count === "number" ? count : 0;
+}
 function humanDuration(sec) {
   const total = typeof sec === "number" && sec > 0 ? Math.floor(sec) : 0;
   if (total < 60) return `${total} \u79D2`;
@@ -236,7 +241,7 @@ function buildPill(root, deps) {
   let expiresInMs = 0;
   let lastStatus;
   let disposed = false;
-  const pairedNow = () => typeof lastStatus?.paired === "number" ? lastStatus.paired : 0;
+  const pairingNow = () => pairingCount(lastStatus);
   const write = () => {
     const next = pillLabel(lastStatus);
     label.textContent = next.text;
@@ -268,11 +273,16 @@ function buildPill(root, deps) {
     head.appendChild(stateText);
     const actions = doc.createElement("div");
     actions.className = "drc-actions";
-    const action = pairedNow() > 0 ? { label: "\u9000\u51FA\u914D\u5BF9", run: requestUnpair } : { label: "\u5237\u65B0", run: requestPairing };
+    const action = pairingNow() > 0 ? { label: "\u9000\u51FA\u914D\u5BF9", run: requestUnpair } : { label: "\u5237\u65B0", run: requestPairing };
     actions.appendChild(buttonOf(action.label, () => void action.run()));
     head.appendChild(actions);
     return head;
   };
+  const offlineNote = () => {
+    if (!lastStatus) return null;
+    if (pillLabel(lastStatus).text !== "\u624B\u673A\u79BB\u7EBF") return null;
+    return text("p", "drc-note", "\u914D\u5BF9\u8FD8\u5728\uFF1A\u5C0F\u7A0B\u5E8F\u56DE\u524D\u53F0\u4F1A\u81EA\u52A8\u91CD\u8FDE\uFF0C\u4E0D\u7528\u91CD\u65B0\u626B\u7801\u3002");
+  };
   const infoRows = () => {
     if (!lastStatus) return [];
     const rows = [
@@ -305,14 +315,16 @@ function buildPill(root, deps) {
       panel.appendChild(text("p", "drc-code", view.token));
       panel.appendChild(text("p", "drc-note", qrNote()));
     } else if (view.kind === "unavailable" || view.kind === "failed") {
-      const note = view.kind === "unavailable" ? text("p", "drc-note", view.reason) : (() => {
+      const note2 = view.kind === "unavailable" ? text("p", "drc-note", view.reason) : (() => {
         const node = text("p", "drc-note", `\u914D\u5BF9\u8BF7\u6C42\u6CA1\u6210\u529F\uFF1A${view.detail}`);
         node.setAttribute("data-kind", "failed");
         return node;
       })();
-      panel.appendChild(note);
+      panel.appendChild(note2);
     }
     for (const row of infoRows()) panel.appendChild(row);
+    const note = offlineNote();
+    if (note) panel.appendChild(note);
   };
   const closePanel = () => {
     if (countTimer !== void 0) {
@@ -373,7 +385,7 @@ function buildPill(root, deps) {
       warn("\u9000\u51FA\u914D\u5BF9\u8BF7\u6C42\u5931\u8D25\uFF08\u9762\u677F\u4F1A\u9760\u4E0B\u4E00\u6B21\u8F6E\u8BE2\u5BF9\u8D26\uFF09", error);
     }
     if (disposed || !panel) return;
-    if (lastStatus) lastStatus = { ...lastStatus, paired: 0 };
+    if (lastStatus) lastStatus = { ...lastStatus, paired: 0, pairings: 0 };
     write();
     view = { kind: "loading" };
     paint();
@@ -388,7 +400,7 @@ function buildPill(root, deps) {
     panel.tabIndex = -1;
     root.appendChild(panel);
     button.setAttribute("aria-expanded", "true");
-    if (pairedNow() > 0) {
+    if (pairingNow() > 0) {
       view = { kind: "info" };
       paint();
     } else {
@@ -430,7 +442,7 @@ function buildPill(root, deps) {
       const body = await response.json?.();
       if (!body || typeof body !== "object") return;
       lastStatus = body;
-      if (view.kind === "qr" && pairedNow() > 0) {
+      if (view.kind === "qr" && pairingNow() > 0) {
         view = { kind: "info" };
         if (countTimer !== void 0) {
           clearInterval(countTimer);

package/dist/bundle/index.js

@@ -7486,10 +7486,10 @@ var require_segments = __commonJS({
       const segs = getSegmentsFromString(data, Utils.isKanjiModeEnabled());
       const nodes = buildNodes(segs);
       const graph = buildGraph(nodes, version2);
-      const path6 = dijkstra.find_path(graph.map, "start", "end");
+      const path7 = dijkstra.find_path(graph.map, "start", "end");
       const optimizedSegs = [];
-      for (let i = 1; i < path6.length - 1; i++) {
-        optimizedSegs.push(graph.table[path6[i]].node);
+      for (let i = 1; i < path7.length - 1; i++) {
+        optimizedSegs.push(graph.table[path7[i]].node);
       }
       return exports.fromArray(mergeSegments(optimizedSegs));
     };
@@ -9925,7 +9925,7 @@ var require_utils2 = __commonJS({
 // ../../node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/png.js
 var require_png2 = __commonJS({
   "../../node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/png.js"(exports) {
-    var fs = __require("fs");
+    var fs2 = __require("fs");
     var PNG = require_png().PNG;
     var Utils = require_utils2();
     exports.render = function render(qrData, options) {
@@ -9966,7 +9966,7 @@ var require_png2 = __commonJS({
       });
       png.pack();
     };
-    exports.renderToFile = function renderToFile(path6, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path7, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
@@ -9977,7 +9977,7 @@ var require_png2 = __commonJS({
         called = true;
         cb.apply(null, args);
       };
-      const stream = fs.createWriteStream(path6);
+      const stream = fs2.createWriteStream(path7);
       stream.on("error", done);
       stream.on("close", done);
       exports.renderToFileStream(stream, qrData, options);
@@ -10039,14 +10039,14 @@ var require_utf8 = __commonJS({
       }
       return output2;
     };
-    exports.renderToFile = function renderToFile(path6, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path7, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
       }
-      const fs = __require("fs");
+      const fs2 = __require("fs");
       const utf82 = exports.render(qrData, options);
-      fs.writeFile(path6, utf82, cb);
+      fs2.writeFile(path7, utf82, cb);
     };
   }
 });
@@ -10167,7 +10167,7 @@ var require_svg_tag = __commonJS({
       return str;
     }
     function qrToPath(data, size, margin) {
-      let path6 = "";
+      let path7 = "";
       let moveBy = 0;
       let newRow = false;
       let lineLength = 0;
@@ -10178,19 +10178,19 @@ var require_svg_tag = __commonJS({
         if (data[i]) {
           lineLength++;
           if (!(i > 0 && col > 0 && data[i - 1])) {
-            path6 += newRow ? svgCmd("M", col + margin, 0.5 + row + margin) : svgCmd("m", moveBy, 0);
+            path7 += newRow ? svgCmd("M", col + margin, 0.5 + row + margin) : svgCmd("m", moveBy, 0);
             moveBy = 0;
             newRow = false;
           }
           if (!(col + 1 < size && data[i + 1])) {
-            path6 += svgCmd("h", lineLength);
+            path7 += svgCmd("h", lineLength);
             lineLength = 0;
           }
         } else {
           moveBy++;
         }
       }
-      return path6;
+      return path7;
     }
     exports.render = function render(qrData, options, cb) {
       const opts = Utils.getOptions(options);
@@ -10198,10 +10198,10 @@ var require_svg_tag = __commonJS({
       const data = qrData.modules.data;
       const qrcodesize = size + opts.margin * 2;
       const bg = !opts.color.light.a ? "" : "<path " + getColorAttrib(opts.color.light, "fill") + ' d="M0 0h' + qrcodesize + "v" + qrcodesize + 'H0z"/>';
-      const path6 = "<path " + getColorAttrib(opts.color.dark, "stroke") + ' d="' + qrToPath(data, size, opts.margin) + '"/>';
+      const path7 = "<path " + getColorAttrib(opts.color.dark, "stroke") + ' d="' + qrToPath(data, size, opts.margin) + '"/>';
       const viewBox = 'viewBox="0 0 ' + qrcodesize + " " + qrcodesize + '"';
       const width = !opts.width ? "" : 'width="' + opts.width + '" height="' + opts.width + '" ';
-      const svgTag = '<svg xmlns="http://www.w3.org/2000/svg" ' + width + viewBox + ' shape-rendering="crispEdges">' + bg + path6 + "</svg>\n";
+      const svgTag = '<svg xmlns="http://www.w3.org/2000/svg" ' + width + viewBox + ' shape-rendering="crispEdges">' + bg + path7 + "</svg>\n";
       if (typeof cb === "function") {
         cb(null, svgTag);
       }
@@ -10215,15 +10215,15 @@ var require_svg = __commonJS({
   "../../node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/svg.js"(exports) {
     var svgTagRenderer = require_svg_tag();
     exports.render = svgTagRenderer.render;
-    exports.renderToFile = function renderToFile(path6, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path7, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
       }
-      const fs = __require("fs");
+      const fs2 = __require("fs");
       const svgTag = exports.render(qrData, options);
       const xmlStr = '<?xml version="1.0" encoding="utf-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">' + svgTag;
-      fs.writeFile(path6, xmlStr, cb);
+      fs2.writeFile(path7, xmlStr, cb);
     };
   }
 });
@@ -10381,8 +10381,8 @@ var require_server = __commonJS({
         cb
       };
     }
-    function getTypeFromFilename(path6) {
-      return path6.slice((path6.lastIndexOf(".") - 1 >>> 0) + 2).toLowerCase();
+    function getTypeFromFilename(path7) {
+      return path7.slice((path7.lastIndexOf(".") - 1 >>> 0) + 2).toLowerCase();
     }
     function getRendererFromType(type) {
       switch (type) {
@@ -10446,17 +10446,17 @@ var require_server = __commonJS({
       const renderer = getRendererFromType(params.opts.type);
       return render(renderer.renderToBuffer, text, params);
     };
-    exports.toFile = function toFile(path6, text, opts, cb) {
-      if (typeof path6 !== "string" || !(typeof text === "string" || typeof text === "object")) {
+    exports.toFile = function toFile(path7, text, opts, cb) {
+      if (typeof path7 !== "string" || !(typeof text === "string" || typeof text === "object")) {
         throw new Error("Invalid argument");
       }
       if (arguments.length < 3 && !canPromise()) {
         throw new Error("Too few arguments provided");
       }
       const params = checkParams(text, opts, cb);
-      const type = params.opts.type || getTypeFromFilename(path6);
+      const type = params.opts.type || getTypeFromFilename(path7);
       const renderer = getRendererFromType(type);
-      const renderToFile = renderer.renderToFile.bind(null, path6);
+      const renderToFile = renderer.renderToFile.bind(null, path7);
       return render(renderToFile, text, params);
     };
     exports.toFileStream = function toFileStream(stream, text, opts) {
@@ -10655,9 +10655,9 @@ var init_mock_kernel = __esm({
 });
 
 // src/index.ts
-import path5 from "node:path";
+import path6 from "node:path";
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/crypto/bytes.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.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 });
@@ -10684,7 +10684,7 @@ function concat(parts) {
   return out;
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/crypto/keys.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.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;
@@ -10714,7 +10714,7 @@ function randomNonce() {
   return new Uint8Array(randomBytes(NONCE_BYTES));
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/crypto/record.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.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;
@@ -10747,7 +10747,7 @@ function open(key, record2) {
   }
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/identity/pairing.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.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}$/;
@@ -11593,10 +11593,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path6) {
-  if (!path6)
+function getElementAtPath(obj, path7) {
+  if (!path7)
     return obj;
-  return path6.reduce((acc, key) => acc?.[key], obj);
+  return path7.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -11936,11 +11936,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path6, issues) {
+function prefixIssues(path7, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path6);
+    iss.path.unshift(path7);
     return iss;
   });
 }
@@ -12390,16 +12390,16 @@ function flattenError(error62, mapper = (issue2) => issue2.message) {
 }
 function formatError(error62, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error63, path6 = []) => {
+  const processError = (error63, path7 = []) => {
     for (const issue2 of error63.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path6, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path7, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
       } else {
-        const fullpath = [...path6, ...issue2.path];
+        const fullpath = [...path7, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -12438,17 +12438,17 @@ function formatError(error62, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error62, mapper = (issue2) => issue2.message) {
   const result2 = { errors: [] };
-  const processError = (error63, path6 = []) => {
+  const processError = (error63, path7 = []) => {
     var _a3;
     for (const issue2 of error63.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path6, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path7, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path6, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
       } else {
-        const fullpath = [...path6, ...issue2.path];
+        const fullpath = [...path7, ...issue2.path];
         if (fullpath.length === 0) {
           result2.errors.push(mapper(issue2));
           continue;
@@ -12487,8 +12487,8 @@ function treeifyError(error62, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path6 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path6) {
+  const path7 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path7) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -29590,13 +29590,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path6 = ref.slice(1).split("/").filter(Boolean);
-  if (path6.length === 0) {
+  const path7 = ref.slice(1).split("/").filter(Boolean);
+  if (path7.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path6[0] === defsKey) {
-    const key = path6[1] === void 0 ? void 0 : decodeJSONPointerSegment(path6[1]);
+  if (path7[0] === defsKey) {
+    const key = path7[1] === void 0 ? void 0 : decodeJSONPointerSegment(path7[1]);
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -30445,7 +30445,7 @@ function date4(params) {
   return _coercedDate(ZodDate, params);
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/wire/frames.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.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);
@@ -30604,7 +30604,7 @@ function parseRelayFrameText(raw) {
   }
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/wire/payloads.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.0/node_modules/dsh-remote-wire/dist/src/wire/payloads.js
 var SESSION_STATES = [
   "idle",
   "running",
@@ -30767,12 +30767,28 @@ var evPayload = external_exports.discriminatedUnion("t", [
   evResult,
   evSessionHistory
 ]);
+var imageAttachment = external_exports.object({
+  /** 落盘用的文件名（mp 侧生成，形如 `img-<ms>-<n>.jpg`；主机侧还会再收敛一次字符集）。 */
+  name: nonEmpty2,
+  mediaType: external_exports.literal("image/jpeg"),
+  /** base64 字节，**不带** `data:` 前缀。 */
+  data: nonEmpty2,
+  /** 压缩后的像素尺寸，主机写旁车元数据用（排错时对得上）。 */
+  width: external_exports.number().int().positive().optional(),
+  height: external_exports.number().int().positive().optional()
+});
 var cmdSendPrompt = external_exports.object({
   t: external_exports.literal("cmd.send_prompt"),
   cmdId: nonEmpty2,
   /** DSH 会话 id，不是配对通道 id。 */
   sessionId: nonEmpty2,
-  text: external_exports.string()
+  text: external_exports.string(),
+  /**
+   * 随消息的图片附件。**可选**：老版本手机不带这个字段，老主机看到也不认
+   * （zod 默认 strip 未知键，而 text 照旧）——所以这是向后兼容的增补，不升协议版本。
+   * 上限 4 张：再多对"看清楚这张图"没有帮助，只是把帧撑爆。
+   */
+  images: external_exports.array(imageAttachment).max(4).optional()
 });
 var answerItem = external_exports.object({
   questionId: nonEmpty2,
@@ -30861,7 +30877,7 @@ var PAYLOAD_TYPES = {
   evSessionHistory: "ev.session_history"
 };
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/wire/outbound.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.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 } };
 }
@@ -30920,7 +30936,7 @@ function sessionHistory(args) {
   };
 }
 
-// ../../node_modules/.pnpm/dsh-remote-wire@1.2.0/node_modules/dsh-remote-wire/dist/src/platform/sleep.js
+// ../../node_modules/.pnpm/dsh-remote-wire@1.3.0/node_modules/dsh-remote-wire/dist/src/platform/sleep.js
 function detectBackend(platform) {
   if (platform === "darwin")
     return "caffeinate";
@@ -30961,6 +30977,81 @@ function buildSleepCommand(platform, ownerPid, keepDisplay = false) {
 // src/core/runtime.ts
 import { randomUUID } from "node:crypto";
 
+// src/shell/uploads.ts
+import fs from "node:fs";
+import path from "node:path";
+function safeSegment(raw, fallback, maxLen = 96) {
+  const cleaned = String(raw || "").replace(/[^A-Za-z0-9._-]+/g, "_").replace(/^[._-]+/, "").slice(0, maxLen).replace(/[._-]+$/, "");
+  return cleaned === "" ? fallback : cleaned;
+}
+function decodeBase64(data) {
+  if (!/^[A-Za-z0-9+/=\s]+$/.test(data)) return null;
+  const buf = Buffer.from(data, "base64");
+  return buf.length > 0 ? buf : null;
+}
+function looksLikeJpeg(buf) {
+  return buf.length > 3 && buf[0] === 255 && buf[1] === 216 && buf[2] === 255;
+}
+function saveImageAttachments(options) {
+  const maxCount = options.maxCount ?? 4;
+  const maxBytes = options.maxBytesPerImage ?? 4 * 1024 * 1024;
+  const images = options.images || [];
+  if (images.length === 0) return { ok: true, saved: [], dir: options.dir };
+  if (images.length > maxCount) {
+    return { ok: false, message: `\u4E00\u6B21\u6700\u591A\u5E26 ${maxCount} \u5F20\u56FE\u7247\uFF0C\u6536\u5230 ${images.length} \u5F20` };
+  }
+  const decoded = [];
+  for (const [i, img] of images.entries()) {
+    if (img.mediaType !== "image/jpeg") {
+      return { ok: false, message: `\u7B2C ${i + 1} \u5F20\u4E0D\u662F jpeg\uFF08${img.mediaType || "\u7A7A"}\uFF09\uFF0C\u4E3B\u673A\u53EA\u6536 jpeg` };
+    }
+    const buf = decodeBase64(img.data);
+    if (!buf) return { ok: false, message: `\u7B2C ${i + 1} \u5F20\u7684\u89E3\u7801\u5931\u8D25\uFF08\u4E0D\u662F\u5408\u6CD5 base64\uFF09` };
+    if (buf.length > maxBytes) {
+      return {
+        ok: false,
+        message: `\u7B2C ${i + 1} \u5F20\u6709 ${Math.round(buf.length / 1024)}KB\uFF0C\u8D85\u8FC7\u5355\u5F20\u4E0A\u9650 ${Math.round(maxBytes / 1024)}KB`
+      };
+    }
+    if (!looksLikeJpeg(buf)) {
+      return { ok: false, message: `\u7B2C ${i + 1} \u5F20\u7684\u5185\u5BB9\u4E0D\u662F jpeg\uFF08\u6587\u4EF6\u5934\u5BF9\u4E0D\u4E0A\uFF09` };
+    }
+    decoded.push({ img, buf });
+  }
+  const sessionDir = path.join(options.dir, safeSegment(options.sessionId, "session"));
+  const written = [];
+  try {
+    fs.mkdirSync(sessionDir, { recursive: true });
+    for (const [i, one] of decoded.entries()) {
+      const base = safeSegment(one.img.name, `img-${i + 1}.jpg`).replace(/\.jpg$/i, "") + ".jpg";
+      let name = base;
+      let n = 1;
+      while (fs.existsSync(path.join(sessionDir, name))) {
+        name = base.replace(/\.jpg$/, `-${++n}.jpg`);
+      }
+      const file2 = path.join(sessionDir, name);
+      fs.writeFileSync(file2, one.buf, { mode: 384 });
+      written.push({ name, path: file2, bytes: one.buf.length });
+    }
+  } catch (error62) {
+    return {
+      ok: false,
+      message: `\u56FE\u7247\u843D\u76D8\u5931\u8D25\uFF1A${String(error62?.message ?? error62).slice(0, 160)}`
+    };
+  }
+  return { ok: true, saved: written, dir: sessionDir };
+}
+function appendImageNote(text, saved) {
+  if (saved.length === 0) return text;
+  const lines = saved.map((img, i) => `${i + 1}. ${img.path}`);
+  const note = `
+
+[\u56FE\u7247\u9644\u4EF6 ${saved.length} \u5F20\uFF0C\u5DF2\u5B58\u5230\u672C\u673A]
+${lines.join("\n")}`;
+  const head = String(text || "");
+  return head === "" ? note.replace(/^\n\n/, "") : head + note;
+}
+
 // src/core/window.ts
 var DEFAULT_WINDOW_OPTIONS = {
   windowMs: 120,
@@ -31131,7 +31222,11 @@ var DEFAULTS = {
   listingRefreshMs: 15e3,
   approvalTimeoutMs: 18e4,
   questionTimeoutMs: 3e5,
-  unarchiveOnPrompt: true
+  unarchiveOnPrompt: true,
+  // 图片附件：默认**不收**（uploadDir 空 = 拒收）。要放开必须在插件配置里显式
+  // 给一个目录——落盘是往用户磁盘写文件，不该由库默认值悄悄代劳。
+  uploadDir: "",
+  maxImageBytes: 4 * 1024 * 1024
 };
 var LISTING_LIMIT = 100;
 var HISTORY_LIMIT = 40;
@@ -31218,7 +31313,32 @@ var HostRuntime = class {
               return;
             }
           }
-          const sent = await this.kernel.sendPrompt(cmd.sessionId, cmd.text);
+          let text = cmd.text;
+          const images = Array.isArray(cmd.images) ? cmd.images : [];
+          if (images.length > 0) {
+            if (!this.options.uploadDir) {
+              reply(false, { message: "\u8FD9\u53F0\u4E3B\u673A\u6CA1\u914D\u56FE\u7247\u843D\u76D8\u76EE\u5F55\uFF08uploadDir\uFF09\uFF0C\u6536\u4E0D\u4E86\u56FE\u7247\u9644\u4EF6" });
+              return;
+            }
+            const saved = saveImageAttachments({
+              images,
+              dir: this.options.uploadDir,
+              sessionId: cmd.sessionId,
+              maxBytesPerImage: this.options.maxImageBytes
+            });
+            if (!saved.ok) {
+              reply(false, { message: saved.message });
+              return;
+            }
+            this.options.log?.("\u56FE\u7247\u9644\u4EF6\u843D\u76D8", {
+              sessionId: cmd.sessionId,
+              images: saved.saved.length,
+              bytes: saved.saved.reduce((sum, img) => sum + img.bytes, 0),
+              dir: saved.dir
+            });
+            text = appendImageNote(text, saved.saved);
+          }
+          const sent = await this.kernel.sendPrompt(cmd.sessionId, text);
           reply(sent.ok, sent.message ? { message: sent.message } : {});
           if (sent.ok) {
             this.sleep.markActive();
@@ -31567,9 +31687,11 @@ var HostRuntime = class {
    * 再补一帧 `ev.run_state` 兜住"手机上装的是老版小程序"这一档。
    *
    * 为什么要两条而不是一条：`ev.permission_resolved` / `ev.question_resolved` 是按
-   * `requestId` 收单的（一次答完不会误收别的会话、别的请求那张卡），但**用户手机上现在装的
-   * 那一版还不认这两帧**——小程序的分发是一串 `if (p.t === …)`，认不出来的 `t` 静默忽略。
-   * 而 `ev.run_state` 正好是它早就认的那条"挂着的审批/提问作废"信号
+   * `requestId` 收单的（一次答完不会误收别的会话、别的请求那张卡），这是**正路**——
+   * mp 1.0.1 起就认这两帧（`pages/chat/chat.js` 的 `_onPermissionResolved` /
+   * `_onQuestionResolved`）。而 `ev.run_state` 是它从第一版就认的粗粒度信号
+   * （整会话两张卡一起收），发它只为兜住 **1.0.1 以前**的安装存量——那一档小程序
+   * 的分发是一串 `if (p.t === …)`，认不出来的 `t` 静默忽略。
    * （`pages/chat/chat.js` 的 `_onRunState` 同时清 `pendingPermission` 与 `pendingQuestion`，
    * 并停掉那条还在走的本地倒数）。所以两条都发：新版手机收到精确帧就精收一张，
    * 老版手机靠 `run_state` 也能当场收卡，不用等用户重新上传小程序。
@@ -33218,12 +33340,6 @@ function createServicesKernel(services, options) {
         modelFace: modelFaceSummary(),
         workspaceRegistry: typeof services.workspaceRegistry === "object",
         userQuestions: typeof services.userQuestions === "object",
-        // 这个键**已经不生效**了：提问现在跟审批一样是 waterfall 参与者，两端同弹、
-        // 谁先答谁算，不再有"接管/取代桌面"这回事（那条 `registerProvider` 单提供者
-        // 路线在这一代宿主上根本不存在）。这里照实把配置值报出来，真正的状态看
-        // `questionsFace`。（删键要动 config.ts/index.ts，那两棵树此刻有并行会话在飞的改动。）
-        takeOverQuestions: options.takeOverQuestions === true,
-        takeOverQuestionsInert: options.takeOverQuestions === true,
         archivedSessions: archivedIds().size,
         hasOn: typeof services.on === "function",
         // 真机排错的第一现场：内核到底发了哪些事件类型、其中哪些我们没认。
@@ -33576,7 +33692,7 @@ function createOneShotTimers(clock) {
 
 // src/shell/status.ts
 import { mkdirSync, renameSync, writeFileSync } from "node:fs";
-import path from "node:path";
+import path2 from "node:path";
 var StatusFile = class {
   constructor(file2, clock, refreshMs = 3e3) {
     this.file = file2;
@@ -33590,7 +33706,7 @@ var StatusFile = class {
   write(snapshot) {
     if (!this.file) return;
     try {
-      mkdirSync(path.dirname(this.file), { recursive: true });
+      mkdirSync(path2.dirname(this.file), { recursive: true });
       const tmp = `${this.file}.tmp-${process.pid}`;
       writeFileSync(
         tmp,
@@ -33633,7 +33749,7 @@ var StatusFile = class {
 // src/shell/host-id.ts
 import { randomBytes as randomBytes4 } from "node:crypto";
 import { chmodSync, mkdirSync as mkdirSync2, readFileSync, writeFileSync as writeFileSync2 } from "node:fs";
-import path2 from "node:path";
+import path3 from "node:path";
 var HOST_ID = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,63}$/;
 function newHostId() {
   return `drc-${randomBytes4(6).toString("hex")}`;
@@ -33641,7 +33757,7 @@ function newHostId() {
 function resolveHostId(dir, configured) {
   if (configured) return configured;
   if (!dir) return newHostId();
-  const file2 = path2.join(dir, "host-id");
+  const file2 = path3.join(dir, "host-id");
   let existing;
   try {
     existing = readFileSync(file2, "utf8").trim();
@@ -33673,7 +33789,7 @@ function resolveHostId(dir, configured) {
 // src/shell/pair-store.ts
 import { chmodSync as chmodSync2, mkdirSync as mkdirSync3, readFileSync as readFileSync2, renameSync as renameSync2, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { createHash as createHash2 } from "node:crypto";
-import path3 from "node:path";
+import path4 from "node:path";
 var storedConversationSchema = external_exports.object({
   id: external_exports.string().min(1),
   /** 配对 PSK（base64）。两把方向密钥在恢复时由它现派生，不落盘。 */
@@ -33691,14 +33807,14 @@ var storeSchema = external_exports.object({
   savedAt: external_exports.number().finite().nonnegative(),
   conversations: external_exports.array(storedConversationSchema)
 });
-function safeSegment(hostId) {
+function safeSegment2(hostId) {
   const cleaned = hostId.replace(/[^A-Za-z0-9._-]/g, "_").slice(0, 48);
   const tag = createHash2("sha256").update(hostId).digest("hex").slice(0, 8);
   return `${cleaned || "host"}-${tag}`;
 }
 function defaultPairStoreFile(statusFile, hostId) {
   if (!statusFile) return "";
-  return path3.join(path3.dirname(statusFile), `conversations-${safeSegment(hostId)}.json`);
+  return path4.join(path4.dirname(statusFile), `conversations-${safeSegment2(hostId)}.json`);
 }
 var PairStore = class {
   constructor(options) {
@@ -33768,7 +33884,7 @@ var PairStore = class {
     const body = JSON.stringify({ version: 1, hostId, savedAt: now, conversations }) + "\n";
     const tmp = `${file2}.tmp-${process.pid}`;
     try {
-      mkdirSync3(path3.dirname(file2), { recursive: true });
+      mkdirSync3(path4.dirname(file2), { recursive: true });
       writeFileSync3(tmp, body, { encoding: "utf8", mode: 384 });
       chmodSync2(tmp, 384);
       renameSync2(tmp, file2);
@@ -33797,7 +33913,7 @@ function safeJsonParse(raw) {
 
 // src/shell/config.ts
 import { homedir } from "node:os";
-import path4 from "node:path";
+import path5 from "node:path";
 var DEFAULT_CONFIG = {
   enabled: true,
   serverUrl: "ws://127.0.0.1:8787",
@@ -33807,12 +33923,11 @@ var DEFAULT_CONFIG = {
   hostLabel: "dsh-host",
   keepAwake: { enabled: true, idleReleaseSec: 300, keepDisplay: false },
   mockBridge: false,
-  statusFile: path4.join(homedir(), ".dsh", "dsh-remote-control", "status.json"),
+  statusFile: path5.join(homedir(), ".dsh", "dsh-remote-control", "status.json"),
   unarchiveOnPrompt: true,
   pairOnStartSec: 0,
   pairTtlMs: 12e4,
   carrierGraceMs: 5e3,
-  takeOverQuestions: false,
   approvalTimeoutSec: 180,
   listingRefreshSec: 15,
   conversationIdleTtlSec: 86400,
@@ -33820,6 +33935,9 @@ var DEFAULT_CONFIG = {
   restoredIdleTtlSec: 604800,
   // 密钥簿落盘：默认跟着 statusFile 走（见 `resolvePairStoreFile`）。
   pairStoreFile: "",
+  // 图片附件落盘：默认 status.json 同目录的 uploads/（见 `resolveUploadDir`）。
+  uploadDir: "",
+  maxImageBytes: 4 * 1024 * 1024,
   // 配对的唯一入口。关掉它 = 这台主机**没有**配对入口（`/drc pair` 与文本二维码都在
   // 2026-10-03 删掉了），所以 index.ts 会把它记成一条 warn 而不是安静地什么都不做。
   pill: { enabled: true }
@@ -33831,7 +33949,17 @@ function resolvePairStoreFile(config2, hostId) {
   if (!configured) return defaultPairStoreFile(config2.statusFile, hostId);
   if (configured.startsWith("/")) return configured;
   if (!config2.statusFile) return configured;
-  return path4.join(path4.dirname(config2.statusFile), configured);
+  return path5.join(path5.dirname(config2.statusFile), configured);
+}
+function resolveUploadDir(config2) {
+  const configured = config2.uploadDir.trim();
+  if (!configured) {
+    const base = config2.statusFile ? path5.dirname(config2.statusFile) : path5.join(homedir(), ".dsh", "dsh-remote-control");
+    return path5.join(base, "uploads");
+  }
+  if (configured.startsWith("/")) return configured;
+  if (!config2.statusFile) return configured;
+  return path5.join(path5.dirname(config2.statusFile), configured);
 }
 var loopback = /^wss?:\/\/(localhost|127\.0\.0\.1|\[::1\])(:|\/|$)/;
 var wsUrl = /^wss?:\/\/.+/;
@@ -33860,7 +33988,6 @@ function readConfig(injected, env = process.env) {
   if (fromEnv("DRC_PAIR_ON_START_SEC")) merged.pairOnStartSec = envSeconds(env.DRC_PAIR_ON_START_SEC);
   if (fromEnv("DRC_PILL")) merged.pill.enabled = envFlag(env.DRC_PILL, merged.pill.enabled);
   if (fromEnv("DRC_MOCK_BRIDGE") === "1") merged.mockBridge = true;
-  if (fromEnv("DRC_TAKE_OVER_QUESTIONS") === "1") merged.takeOverQuestions = true;
   if (merged.hostTokenEnv) merged.hostToken = env[merged.hostTokenEnv] ?? merged.hostToken;
   return merged;
 }
@@ -33935,13 +34062,6 @@ function validateConfig(config2) {
   if (!config2.statusFile) {
     problems.push({ level: "warn", field: "statusFile", message: "\u4E3A\u7A7A\u5C06\u5173\u95ED\u72B6\u6001\u5FEB\u7167\uFF1BGUI \u5BBF\u4E3B\u91CC\u8FD9\u662F\u552F\u4E00\u7684\u6392\u9519\u5165\u53E3" });
   }
-  if (config2.takeOverQuestions) {
-    problems.push({
-      level: "warn",
-      field: "takeOverQuestions",
-      message: "\u63D0\u95EE\u63A5\u7BA1\u4F1A**\u53D6\u4EE3\u684C\u9762 UI \u7684\u63D0\u95EE\u80FD\u529B**\uFF08ctx.userQuestions \u53EA\u5141\u8BB8\u4E00\u4E2A\u6D3B\u8DC3 provider\uFF09\uFF1B\u624B\u673A\u7AEF\u4E0D\u5728\u7EBF\u65F6\u63D0\u95EE\u4F1A\u76F4\u63A5\u5931\u8D25"
-    });
-  }
   return problems;
 }
 function redact(value) {
@@ -34098,6 +34218,7 @@ function pillStatusHandler(deps) {
       json2(response, 200, {
         relay: status.relay,
         paired: status.paired,
+        pairings: status.pairings,
         serverUrl: status.serverUrl,
         version: status.version,
         waiting: status.waiting,
@@ -34261,7 +34382,7 @@ function startPill(ctx, deps) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = true ? "2.0.0" : "dev";
+var PLUGIN_VERSION = true ? "2.0.1" : "dev";
 
 // src/index.ts
 var SERVICE_NAMES = [
@@ -34317,7 +34438,7 @@ function applyInner(ctx, injected) {
   const clock = systemClock;
   const oneShot = createOneShotTimers(clock);
   const status = new StatusFile(config2.statusFile, clock);
-  const hostId = resolveHostId(config2.statusFile ? path5.dirname(config2.statusFile) : "", config2.hostId);
+  const hostId = resolveHostId(config2.statusFile ? path6.dirname(config2.statusFile) : "", config2.hostId);
   const log = (message, fields = {}) => {
     try {
       process.stdout.write(
@@ -34441,6 +34562,8 @@ function applyInner(ctx, injected) {
     runtime = new HostRuntime(port, transport, sleep, clock, {
       listingRefreshMs: config2.listingRefreshSec * 1e3,
       unarchiveOnPrompt: config2.unarchiveOnPrompt,
+      uploadDir: resolveUploadDir(config2),
+      maxImageBytes: config2.maxImageBytes,
       approvalTimeoutMs: config2.approvalTimeoutSec * 1e3,
       log: (message, fields) => log(message, fields)
     });
@@ -34571,12 +34694,14 @@ function applyInner(ctx, injected) {
   function currentPairing() {
     const shown = active.pairing;
     if (!shown) return null;
-    if (!slots.resolveFor(shown.token)) return null;
-    return { qr: shown.qr, token: shown.token, expiresAt: shown.expiresAt };
+    const slot = slots.resolveFor(shown.token);
+    if (!slot) return null;
+    return { qr: shown.qr, token: shown.token, expiresAt: slot.expiresAt };
   }
   function ensureFreshPairing() {
     const fresh = currentPairing() ?? createPairing();
     if (!fresh) return null;
+    if (fresh.expiresAt <= Date.now()) return createPairing();
     return { qr: fresh.qr, token: fresh.token, expiresAt: fresh.expiresAt };
   }
   function pillStatus() {
@@ -34584,6 +34709,11 @@ function applyInner(ctx, injected) {
     return {
       relay: relay ? relayState() : "idle",
       paired: relay?.clientCount ?? 0,
+      // 配对簿里几条会话 = 配对还在不在。为什么必须与 paired 分开：pair-store 之后
+      // 配对按 D3 长存、落盘，手机退后台只是 socket 断——只用 clientCount 回答 配没配上，
+      // 用户把小程序放进后台的每一分钟，桌面那颗 pill 都会说 未配对，点开还会烧一张
+      // 不需要的新码（2026-10-04 用户报的误解）。
+      pairings: relay?.conversationCount ?? 0,
       serverUrl: config2.serverUrl,
       version: PLUGIN_VERSION,
       waiting: waiting.count,
@@ -34625,7 +34755,7 @@ function applyInner(ctx, injected) {
         return;
       }
       decided = true;
-      start(createServicesKernel(collected, { log, takeOverQuestions: config2.takeOverQuestions, clock }));
+      start(createServicesKernel(collected, { log, clock }));
       return;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-control",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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,7 +53,7 @@
     "provenance": true
   },
   "dependencies": {
-    "dsh-remote-wire": "^1.2.0",
+    "dsh-remote-wire": "^1.3.0",
     "qrcode": "^1.5.4",
     "tweetnacl": "^1.0.3",
     "ws": "^8.18.0",