deskbuddy 0.2.0-beta.35 → 0.2.0-beta.36

package/dist/cli.js

@@ -2890,13 +2890,40 @@ function singleCursor(lines3, q) {
     if (m) {
       const k = Number(m[1]) - 1;
       if (k >= 0 && k < n) return squash(m[2]).startsWith(squash(q.options[k].label).slice(0, 6)) ? k : -1;
-      if (k === n) return /^Typesomething/.test(squash(m[2])) ? n : -1;
+      if (k === n) return /^(Typesomething)?$/.test(squash(m[2])) ? n : -1;
       return -1;
     }
     if (new RegExp(`^\\s*${CURSOR}\\s*(Next|Submit)\\s*$`).test(l)) return n + 1;
   }
   return -1;
 }
+function typeLine(lines3, n) {
+  const start = questionStart(lines3);
+  if (start < 0) return -1;
+  for (let i = start; i < lines3.length; i++) {
+    const m = lines3[i].match(/^\s*(?:[❯>›]\s*)?[☐☒]?\s*(\d+)\.(?:\s|$)/);
+    if (m && Number(m[1]) === n + 1) return i;
+  }
+  return -1;
+}
+function typedText(lines3, n) {
+  const ln = typeLine(lines3, n);
+  if (ln < 0) return null;
+  const parts = [lines3[ln].replace(/^\s*(?:[❯>›]\s*)?[☐☒]?\s*\d+\./, "")];
+  for (let i = ln + 1; i < lines3.length; i++) {
+    if (new RegExp(`^\\s*(?:${CURSOR}\\s*)?(Submit|Next)\\s*$`).test(lines3[i]) || /^\s*(?:[❯>›]\s*)?[☐☒]?\s*\d+\./.test(lines3[i])) break;
+    parts.push(lines3[i]);
+  }
+  return squash(parts.join(""));
+}
+async function typeOther(io, q, text) {
+  const n = q.options.length;
+  const want = squash(text);
+  if (!want) return "no_focus";
+  if (!await waitUntil(io, (l) => onQuestion(l, q) && typedText(l, n) === "")) return "no_focus";
+  io.write(text);
+  return await waitUntil(io, (l) => typedText(l, n) === want) ? "typed" : "mismatch";
+}
 async function move(io, delta) {
   const key = delta > 0 ? KEY_DOWN : KEY_UP;
   for (let i = 0; i < Math.abs(delta); i++) {
@@ -2904,12 +2931,16 @@ async function move(io, delta) {
     await io.sleep(ARROW_GAP_MS);
   }
 }
-async function answerQuestions(io, questions, selections) {
+async function answerQuestions(io, questions, selections, others) {
   if (questions.length === 0 || selections.length !== questions.length) return "not_waiting";
+  if (others !== void 0 && others.length !== questions.length) return "not_waiting";
   for (let qi = 0; qi < questions.length; qi++) {
     const sel = selections[qi];
     const q = questions[qi];
-    if (sel.length === 0 || sel.some((i) => !Number.isInteger(i) || i < 0 || i >= q.options.length)) return "not_waiting";
+    const n = q.options.length;
+    const other = others?.[qi] ?? "";
+    if (sel.length === 0 || sel.some((i) => !Number.isInteger(i) || i < 0 || i > n)) return "not_waiting";
+    if (sel.includes(n) !== (squash(other) !== "")) return "not_waiting";
     if (q.multiSelect !== true && sel.length !== 1) return "not_waiting";
   }
   if (!await settled(io, (l) => onQuestion(l, questions[0]))) return "not_waiting";
@@ -2930,6 +2961,14 @@ async function answerQuestions(io, questions, selections) {
       for (const t of sel) {
         await move(io, t - cur);
         cur = t;
+        if (t === n) {
+          const ty = await typeOther(io, q, others?.[qi] ?? "");
+          if (ty !== "no_focus") wrote = true;
+          if (ty !== "typed") return fail();
+          io.write(KEY_ENTER);
+          if (!await waitUntil(io, (l) => checked(l, typeLine(l, n)))) return fail();
+          continue;
+        }
         const onTarget = await waitUntil(io, (l) => {
           const ln = optionLine(l, t + 1, q.options[t].label);
           return ln >= 0 && io.cursorLine?.() === ln;
@@ -2948,7 +2987,11 @@ async function answerQuestions(io, questions, selections) {
       const cur = singleCursor(io.screen(), q);
       if (cur < 0) return fail();
       await move(io, t - cur);
-      if (!await waitUntil(io, (l) => singleCursor(l, q) === t && optionLine(l, t + 1, q.options[t].label) >= 0)) return fail();
+      if (t === n) {
+        const ty = await typeOther(io, q, others?.[qi] ?? "");
+        if (ty !== "no_focus") wrote = true;
+        if (ty !== "typed") return fail();
+      } else if (!await waitUntil(io, (l) => singleCursor(l, q) === t && optionLine(l, t + 1, q.options[t].label) >= 0)) return fail();
       io.write(KEY_ENTER);
       wrote = true;
     }
@@ -7806,7 +7849,14 @@ ${PRELUDE3}
     }
   }
   if (C && typeof C.currentId === 'string') return { mode: 'dom', locale: localeOf(), why };
-  return { mode: 'none', locale: localeOf(), why };
+  // 没有 SDK 时列出页面上像接口的全局名（258 退回：WorkBuddy 5.1.7 没有 wb，日志里据此判断老版本把接口放在哪）
+  let globals;
+  if (why === 'no_wb') {
+    try {
+      globals = Object.getOwnPropertyNames(globalThis).filter((k) => /wb|work|buddy|genie|sdk|electron|bridge|ipc|conv|agent|app/i.test(k) && !/^on/.test(k) && k.length <= 40).sort().slice(0, 30);
+    } catch (e) { globals = undefined; }
+  }
+  return { mode: 'none', locale: localeOf(), why, ...(globals ? { globals } : {}) };
 })()`;
 var IDLE_STATES = "['idle','completed','cancelled','canceled','done','failed','error','terminated','archived','deleted','']";
 var SNAPSHOT2 = String.raw`(async () => {
@@ -8249,7 +8299,10 @@ var WorkbuddyAppWatch = class {
         this.#nonSdkSince = first && kept && now - kept.at < NON_SDK_KEEP_MS ? kept.since : now;
         this.#nonSdkKept = null;
       }
-      if (first || prev !== this.#mode || prevWhy !== this.#modeWhy) this.#d.log(`WorkBuddy App \u6388\u6743\u6865\u6A21\u5F0F\uFF1A${this.#mode}${this.#modeWhy ? `\uFF08${modeWhyText(this.#modeWhy)}\uFF09` : ""}`);
+      if (first || prev !== this.#mode || prevWhy !== this.#modeWhy) {
+        const g = Array.isArray(r?.globals) ? r.globals.filter((x) => typeof x === "string").map((x) => x.slice(0, 40)).slice(0, 30) : null;
+        this.#d.log(`WorkBuddy App \u6388\u6743\u6865\u6A21\u5F0F\uFF1A${this.#mode}${this.#modeWhy ? `\uFF08${modeWhyText(this.#modeWhy)}\uFF09` : ""}${g ? `\uFF1B\u9875\u9762\u5168\u5C40\u540D\uFF1A${g.join(",") || "\u65E0"}` : ""}`);
+      }
       const cands = this.#client?.target?.candidates ?? 1;
       if (this.#mode !== "sdk" && this.#modeWhy === "no_wb" && cands > 1 && this.#nonSdkSince && now - this.#nonSdkSince >= NO_SDK_REPROBE_MS && now - this.#reprobeAt >= NO_SDK_REPROBE_MS) {
         this.#reprobeAt = now;
@@ -8518,7 +8571,7 @@ function modeWhyText(why) {
   const msg = rest.join(":");
   switch (k) {
     case "no_wb":
-      return "\u9875\u9762\u91CC\u6CA1\u6709 WorkBuddy SDK\uFF08globalThis.wb\uFF09";
+      return "\u9875\u9762\u91CC\u6CA1\u6709 WorkBuddy SDK\uFF08globalThis.wb\uFF09\uFF0CWorkBuddy \u7248\u672C\u53EF\u80FD\u592A\u65E7\uFF0C\u5347\u7EA7\u5230\u6700\u65B0\u7248\u540E\u4EFB\u52A1\u624D\u80FD\u76F4\u63A5\u8FDB App";
     case "no_conversations":
       return "\u9875\u9762\u91CC\u6CA1\u6709\u4F1A\u8BDD\u63A5\u53E3\uFF08wb.conversations\uFF09";
     case "no_list_get":
@@ -10455,14 +10508,28 @@ function parseAnswer(m) {
   const questions = parseQuestions(a.questions);
   const sel = a.selections;
   if (!questions || sel.length !== questions.length) return null;
+  let others;
+  if (a.others !== void 0) {
+    if (!Array.isArray(a.others) || a.others.length !== questions.length) return null;
+    others = [];
+    for (const o of a.others) {
+      if (typeof o !== "string" || o.length > OTHER_MAX_CHARS || /[\u0000-\u001f\u007f-\u009f\u200b-\u200f\u202a-\u202e\u2066-\u2069\ufeff]/.test(o)) return null;
+      others.push(o);
+    }
+  }
   const selections = [];
   for (let i = 0; i < questions.length; i++) {
     const s2 = sel[i];
-    if (!Array.isArray(s2) || s2.length === 0 || !s2.every((x) => Number.isInteger(x) && x >= 0 && x < questions[i].options.length)) return null;
+    const n = questions[i].options.length;
+    const other = others?.[i] ?? "";
+    if (!Array.isArray(s2) || s2.length === 0 || !s2.every((x) => Number.isInteger(x) && x >= 0 && x <= n)) return null;
+    if (s2.includes(n) !== (other.trim() !== "")) return null;
+    if (new Set(s2).size !== s2.length) return null;
     selections.push(s2);
   }
-  return { instructionId, sessionId, expireAt, answer: { kind: "question", questions, selections } };
+  return { instructionId, sessionId, expireAt, answer: { kind: "question", questions, selections, ...others ? { others } : {} } };
 }
+var OTHER_MAX_CHARS = 500;
 function parseQuestions(v) {
   if (!Array.isArray(v)) return null;
   const qs = v;
@@ -10828,20 +10895,31 @@ function pendingCall(text, toolName) {
 function selectionsOf(input, lists) {
   const qs = Array.isArray(input.questions) ? input.questions : null;
   if (!qs || !Array.isArray(lists) || lists.length !== qs.length) return null;
-  const out = [];
+  const selections = [];
+  const others = [];
   for (let i = 0; i < qs.length; i++) {
     const opts = Array.isArray(qs[i]?.options) ? qs[i].options : [];
     const items = lists[i];
     if (!Array.isArray(items) || items.length === 0) return null;
     const idx = [];
-    for (const label of items) {
+    let other = "";
+    for (let j = 0; j < items.length; j++) {
+      const label = items[j];
       const k = opts.findIndex((o) => o?.label === label);
-      if (k < 0) return null;
-      idx.push(k);
+      if (k >= 0) {
+        if (!idx.includes(k)) idx.push(k);
+        continue;
+      }
+      if (j !== items.length - 1 || typeof label !== "string") return null;
+      other = label.replace(/[\u0000-\u001f\u007f-\u009f\u200b-\u200f\u202a-\u202e\u2066-\u2069\ufeff]+/g, " ").replace(/\s+/g, " ").trim();
+      if (!other) return null;
     }
-    out.push(idx);
+    if (other) idx.push(opts.length);
+    if (qs[i]?.multiSelect !== true && idx.length !== 1) return null;
+    selections.push(idx);
+    others.push(other);
   }
-  return out;
+  return { selections, others };
 }
 var WorkbuddyBridge = class {
   #d;
@@ -10979,10 +11057,16 @@ var WorkbuddyBridge = class {
       if (reply.decision !== "allow") return;
       const sel = selectionsOf(card.input, reply.answerLists);
       if (!sel) {
-        this.#d.log(`WorkBuddy\uFF1A\u4F1A\u8BDD ${card.sessionId.slice(0, 8)} \u7684\u8BBE\u5907\u7B54\u6848\u5BF9\u4E0D\u4E0A\u9009\u9879\uFF08\u542B\u81EA\u5DF1\u586B\u5199\u7684\u7B54\u6848\uFF09\uFF0C\u6846\u7559\u7ED9\u7535\u8111`);
+        this.#d.log(`WorkBuddy\uFF1A\u4F1A\u8BDD ${card.sessionId.slice(0, 8)} \u7684\u8BBE\u5907\u7B54\u6848\u5BF9\u4E0D\u4E0A\u9009\u9879\uFF0C\u6846\u7559\u7ED9\u7535\u8111`);
         return;
       }
-      spec = { kind: "question", questions: card.input.questions, selections: sel };
+      const withOther = sel.others.some((o) => o !== "");
+      spec = {
+        kind: "question",
+        questions: card.input.questions,
+        selections: sel.selections,
+        ...withOther ? { others: sel.others } : {}
+      };
     } else if (reply.decision === "allow" || reply.decision === "deny") {
       spec = { kind: "permission", toolName: card.toolName, fingerprint: card.fingerprint, decision: reply.decision };
     } else return;
@@ -19667,7 +19751,7 @@ async function applyAnswer(req, io, trust) {
     } else if (a.kind === "trust" && a.prompt !== "hooks" && trust?.widens) r = "not_waiting";
     else if (a.kind === "trust") r = await answerTrust(keys, trust?.tool ?? "", a.decision, trust?.forms ?? [], a.prompt ?? "trust");
     else if (a.kind === "permission") r = await answerPermission(keys, a.toolName, a.fingerprint, a.decision);
-    else r = await answerQuestions(keys, a.questions, a.selections);
+    else r = await answerQuestions(keys, a.questions, a.selections, a.others);
   } catch {
     r = "partial";
   }

package/hook/hook-debug.log

@@ -338,3 +338,27 @@
 2026-10-12T07:48:57.673Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
 2026-10-12T07:48:57.673Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
 2026-10-12T07:49:00.208Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝
+2026-10-12T08:43:33.911Z [opencode] 回填选择题失败：/question/{requestID}/reply status=404
+2026-10-12T08:43:38.975Z [opencode] opencode 版本 1.4.3：带说明的拒绝不走新路由
+2026-10-12T08:43:38.975Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T08:43:39.078Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
+2026-10-12T08:43:39.078Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T08:43:41.400Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝
+2026-10-12T08:45:36.004Z [opencode] 回填选择题失败：/question/{requestID}/reply status=404
+2026-10-12T08:45:40.986Z [opencode] opencode 版本 1.4.3：带说明的拒绝不走新路由
+2026-10-12T08:45:40.986Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T08:45:41.084Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
+2026-10-12T08:45:41.084Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T08:45:43.292Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝
+2026-10-12T08:51:55.878Z [opencode] 回填选择题失败：/question/{requestID}/reply status=404
+2026-10-12T08:52:01.359Z [opencode] opencode 版本 1.4.3：带说明的拒绝不走新路由
+2026-10-12T08:52:01.360Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T08:52:01.517Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
+2026-10-12T08:52:01.517Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T08:52:04.661Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝
+2026-10-12T09:01:07.164Z [opencode] 回填选择题失败：/question/{requestID}/reply status=404
+2026-10-12T09:01:12.193Z [opencode] opencode 版本 1.4.3：带说明的拒绝不走新路由
+2026-10-12T09:01:12.194Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T09:01:12.293Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
+2026-10-12T09:01:12.293Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-12T09:01:14.613Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskbuddy",
-  "version": "0.2.0-beta.35",
+  "version": "0.2.0-beta.36",
   "description": "把 Claude Code、Codex 等 AI 编码智能体每个会话窗口的状态，实时同步到桌面硬件屏幕",
   "keywords": [
     "ai",