wezard 2.4.0 → 2.5.0

package/dist/daemon/approval.js

@@ -12,6 +12,7 @@ import { tagBadge, tagOfKey, withTagHeader } from "../shared/session-label.js";
 import { chatPolicyOf } from "./chat-name.js";
 import { makeStewardGuard } from "./steward-guard.js";
 import { sessionNameFor } from "./session-name.js";
+import { reachable } from "./reach.js";
 // ── Routing helpers ────────────────────────────────────────────────────
 // 卡片跟着本轮的频道走: 人在群 B 里 `.fix` 叫住在 A 的 wizard, 这一轮的审批/提问卡
 // 要出现在 B —— 等着点的人在那儿。`principal` (chatKey) 仍是 wizard 自己的 key,
@@ -29,6 +30,8 @@ const targetChatId = (key) => {
     const h = rest.indexOf("#");
     return h >= 0 ? rest.slice(0, h) : rest;
 };
+/** 卡片真正要去的那个聊天 (按频道换算之后) 此刻送得到吗 —— 微信 chat 不看企微长连接。 */
+const canReach = (client, key) => reachable(client, targetChatId(key));
 const pickApprover = (cfg) => {
     if (cfg.approval.approvers.length > 0)
         return cfg.approval.approvers[0];
@@ -496,10 +499,12 @@ const decodeKey = (key) => {
     return { reqId, decision: d };
 };
 // ── AskUserQuestion 投票卡分支 ─────────────────────────────────────────
-// PreToolUse 协议端只能输出 allow/deny/ask, 没有「合成 tool_result」通道。
-// 取舍: 用户在 WeCom 选了选项 → 走 deny + 把答案塞进 reason, model 把 reason
-// 当作上下文继续推理(CLI 不会弹原生 picker, 流程不被打断);
-// 选「🖥️ CLI 处理」哨兵选项 → 返回 ask, CLI 弹原生 picker 由用户本地作答。两路互斥。
+// 用户在 WeCom 选了选项 → allow + updatedInput 补上 `answers` (AskUserQuestion 自己的
+// 入参: {题目文本: 所选 label}): Claude Code 对 AskUserQuestion / ExitPlanMode 认 hook
+// 给的 updatedInput 为「已作答」, 跳过本地面板, 工具照常落地出 tool_result。曾经走
+// deny + 把答案塞进 reason, CLI 里显示成红色 hook error。
+// 选「🖥️ CLI 处理」哨兵选项 → 返回 ask, CLI 弹原生 picker 由用户本地作答; 选「聊聊」
+// → deny (本来就是「别答, 先讨论」)。codebuddy 的镜像流仍是 deny + reason (见下)。
 // vote_interaction 不支持 button_list (SDK 类型注释明写「button_interaction 类型卡片使用」),
 // 微信侧静默吞掉, 所以 cli 入口只能塞进 checkbox option_list 作为哨兵 id。
 const ASKQ_PREFIX = "ASKQ|";
@@ -651,7 +656,7 @@ const buildConfirmCard = (reqId, c, done) => ({
 /** 往 `principal` 的当前频道推一张确认卡; 卡发出后返回, `decided` 是人的决定 (超时 = false)。
  *  包一层对象是因为 promise 会被 await 摊平。发不出去就抛 —— 没人看得见的卡不该被当成「人拒绝了」。 */
 export const requestConfirm = async ({ client, principal, who, title, body, timeoutMs }) => {
-    if (!client.isConnected)
+    if (!canReach(client, principal))
         throw new Error("ws_disconnected");
     const { reqId, promise } = createPending({ meta: { kind: "generic", createdAt: Date.now(), chatKey: principal }, timeoutMs });
     const c = { who, title, body };
@@ -775,7 +780,7 @@ const handleExitPlanMode = async ({ cfg, log, client, body, getMirrorTarget, flu
     const approver = resolveApprover(cfg, body.session_id, getMirrorTarget);
     if (!approver)
         return { decision: "ask", reason: "no_approver" };
-    if (!client.isConnected)
+    if (!canReach(client, approver))
         return { decision: "ask", reason: "ws_disconnected" };
     const longPollMs = cfg.approval.longPollSec * 1000;
     const { reqId, promise } = createPending({
@@ -848,6 +853,9 @@ const handleExitPlanMode = async ({ cfg, log, client, body, getMirrorTarget, flu
     }
     return { decision: "ask", reason: "plan_unknown" };
 };
+// Claude Code 多选答案的编码 (逆向自其 AskUserQuestion 的结果校验): ", " 连接,
+// 含 ", " 或 `"` 的 label 用 JSON 字符串包起来, 否则它拆不回原 label。
+const encodeAskqLabels = (labels) => labels.map((l) => (l.includes(", ") || l.includes('"') ? JSON.stringify(l) : l)).join(", ");
 // raw 是 click 事件 listener 塞回 pending 的字符串编码 (cli / chat / picked:i,j)。
 export const interpretAskqRaw = (raw, q) => {
     if (raw === "cli")
@@ -861,7 +869,7 @@ export const interpretAskqRaw = (raw, q) => {
             .filter((n) => Number.isInteger(n) && n >= 0 && n < q.options.length);
         if (idxs.length === 0)
             return { kind: "empty" };
-        return { kind: "picked", labels: idxs.map((i) => q.options[i].label).join(", ") };
+        return { kind: "picked", labels: encodeAskqLabels(idxs.map((i) => q.options[i].label)) };
     }
     return { kind: "empty" };
 };
@@ -920,7 +928,7 @@ export const runMirrorAskqFlow = async ({ cfg, log, client, sessionId, chatKey,
         return;
     if (questions.some((q) => q.options.length === 0))
         return;
-    if (!client.isConnected)
+    if (!canReach(client, chatKey))
         return;
     const target = targetChatId(chatKey);
     const total = questions.length;
@@ -1069,7 +1077,7 @@ export const mootMirrorPlan = (sessionId) => {
     mirrorPlanSlots.delete(sessionId);
 };
 export const runMirrorPlanFlow = async ({ cfg, log, client, sessionId, chatKey, cwd, jsonlPath, voteTimeoutMs, sendKey }) => {
-    if (!client.isConnected)
+    if (!canReach(client, chatKey))
         return;
     const target = targetChatId(chatKey);
     const note = async (content) => {
@@ -1186,7 +1194,7 @@ const consumePickerAllow = (sessionId, toolName) => {
 };
 /** 返回「卡是否真的发出去了」— false (WS 断 / 发送失败) 时调用方应允许对同屏重试。 */
 export const runMirrorPickerFlow = async ({ log, client, cfg, sessionId, chatKey, cwd, jsonlPath, toolName, toolInput, agent, danger, voteTimeoutMs, press }) => {
-    if (!client.isConnected)
+    if (!canReach(client, chatKey))
         return false;
     const target = targetChatId(chatKey);
     const note = async (content) => {
@@ -1293,7 +1301,7 @@ export const runMirrorPickerFlow = async ({ log, client, cfg, sessionId, chatKey
     }
 };
 // 多问题: 逐题顺序发卡 → 收答 → 下一题。任一题选「CLI」整体转 CLI,选「聊聊」
-// 整体转讨论; 全部答完合并成单个 deny+reason 注入。卡不会一次性轰炸 N 张。
+// 整体转讨论; 全部答完合并成一份 answers 随 allow 的 updatedInput 交回。卡不会一次性轰炸 N 张。
 const handleAskUserQuestion = async ({ cfg, log, client, body, getMirrorTarget, flushBeforeCard, clientGone }) => {
     // ── codebuddy 镜像流去重 ────────────────────────────────────────────────
     // codebuddy 的 hook 只在本地面板被提交后到达。mirror 早已发过 vote 卡:
@@ -1319,12 +1327,12 @@ const handleAskUserQuestion = async ({ cfg, log, client, body, getMirrorTarget,
     const approver = resolveApprover(cfg, body.session_id, getMirrorTarget);
     if (!approver)
         return { decision: "ask", reason: "no_approver" };
-    if (!client.isConnected)
+    if (!canReach(client, approver))
         return { decision: "ask", reason: "ws_disconnected" };
     const target = targetChatId(approver);
     const longPollMs = cfg.approval.longPollSec * 1000;
     const total = questions.length;
-    const answers = [];
+    const answers = {};
     const flowStart = Date.now();
     for (let i = 0; i < total; i++) {
         const q = questions[i];
@@ -1415,12 +1423,13 @@ const handleAskUserQuestion = async ({ cfg, log, client, body, getMirrorTarget,
         }
         if (ans.kind === "empty")
             return { decision: "ask", reason: "askq_empty_pick" };
-        answers.push(`"${q.header || q.question}": ${ans.labels}`);
+        answers[q.question] = ans.labels; // 键是题目原文, Claude Code 按它对答案
     }
-    const reason = total === 1
-        ? `User answered ${answers[0]} via WeCom`
-        : `User answered ${total} questions via WeCom — ${answers.join("; ")}`;
-    return { decision: "deny", reason };
+    return {
+        decision: "allow",
+        reason: "answered via WeCom",
+        updated_input: { ...body.tool_input, answers },
+    };
 };
 const decisionToHook = (d) => (d === "deny" ? "deny" : "allow");
 // 「完全跳过审批」的模式字面量, 各家 CLI 不统一: bypassPermissions 是 Claude Code
@@ -1699,6 +1708,7 @@ export const makeApproveHandler = ({ cfg, log, client, sourcePath, getMirrorTarg
                 sessionId,
                 turn: openTurnsOf(owner, sessionId)[0]?.id ?? "",
                 toolName,
+                toolInput,
                 budget: chatPolicyOf(cfg, owner).stewardBudget,
             });
             if (reason) {
@@ -1788,7 +1798,7 @@ export const makeApproveHandler = ({ cfg, log, client, sourcePath, getMirrorTarg
             });
             return;
         }
-        // AskUserQuestion 走单独的投票卡分支(deny+reason 注入答案 / ask 转 CLI)。
+        // AskUserQuestion 走单独的投票卡分支(allow+updatedInput 交答案 / deny 先聊聊 / ask 转 CLI)。
         if (toolName === "AskUserQuestion") {
             // writableEnded 为 false 时的 close = 响应还没写就断线 = hook 客户端先死。
             // 正常完成时 json() 先置 writableEnded, close 到来后 resolve 不再发生。
@@ -1918,7 +1928,7 @@ export const makeApproveHandler = ({ cfg, log, client, sourcePath, getMirrorTarg
             json(res, 200, fallback(cfg, "no_approver", mustCard || guardActive));
             return;
         }
-        if (!client.isConnected) {
+        if (!canReach(client, approver)) {
             log.warn("ws not connected");
             json(res, 200, fallback(cfg, "ws_disconnected", mustCard || guardActive));
             return;