weclaude 0.0.4 → 0.1.1

package/dist/daemon/approval.js

@@ -1,6 +1,7 @@
-import { createPending, getPending, resolvePending } from "./pending.js";
-import { cacheGet, cachePut, cacheKey, isAutoWindowActive, autoWindowRemainingMs, setAutoWindow, } from "./session-cache.js";
+import { createPending, getPending, getResolvedSnapshot, resolvePending, resolvePendingsBySession } from "./pending.js";
+import { cacheGet, cachePut, cacheKey, isAutoWindowActive, autoWindowRemainingMs, setAutoWindow, clearAutoWindow, getWindowMeta, } from "./session-cache.js";
 import { redact } from "./redact.js";
+import { recordApproval, recordApprovalDecision, buildDetailUrl } from "./detail.js";
 import { json, readBody } from "./http.js";
 // ── Routing helpers ────────────────────────────────────────────────────
 const targetChatId = (principal) => {
@@ -35,13 +36,13 @@ const EDIT_SNIPPET_LEN = 160;
 const WRITE_PREVIEW_LINES = 4;
 const WRITE_PREVIEW_CHARS = 200;
 const SOURCE_BASE = {
-    icon_url: "https://wwcdn.weixin.qq.com/node/wework/images/icon.44f2d37c14.jpg",
+    icon_url: "https://wwcdn.weixin.qq.com/node/wework/images/3d-claude-ai-logo.bce0ddae70.jpg",
     desc: "Claude Code",
     desc_color: 0,
 };
 // Source bar sits ABOVE main_title — only place we can hoist transcript context.
 const buildSource = (tail) => {
-    const desc = tail ? `💬 ${TRUNC(tail, 80)}` : SOURCE_BASE.desc;
+    const desc = tail ? TRUNC(tail, 80) : SOURCE_BASE.desc;
     return { ...SOURCE_BASE, desc };
 };
 const prefixLines = (s, prefix) => s.split("\n").map((l) => `${prefix} ${l}`).join("\n");
@@ -117,56 +118,114 @@ const renderInput = (toolName, toolInput, _toolInputStr, cwd) => {
 };
 const quoteArea = (text) => ({ type: 0, quote_text: text });
 const dirName = (cwd) => cwd.replace(/^.*\//, "") || cwd;
+const detailJumpList = (url) => url ? [{ type: 1, title: "🔍 详情", url }] : undefined;
 const buildCard = (a) => {
     const r = renderInput(a.toolName, a.toolInput, a.toolInputStr, a.cwd);
     const dir = dirName(a.cwd);
     const tail = oneLine(a.transcriptTail).trim();
+    const jl = detailJumpList(a.detailUrl);
     return {
         card_type: "button_interaction",
         source: buildSource(tail),
         main_title: {
-            title: `🔐 授权 · ${a.toolName} · 📁 ${dir}/`,
+            title: `🔐 授权 · ${a.toolName} · ${dir}/`,
         },
         ...(r.body ? { quote_area: quoteArea(r.body) } : {}),
+        ...(jl ? { jump_list: jl } : {}),
         task_id: a.reqId,
         button_list: [
-            { text: "❌", style: 3, key: encodeKey(a.reqId, "deny") },
-            { text: "⚠️", style: 3, key: encodeKey(a.reqId, "allow_window") },
-            { text: "✅", style: 3, key: encodeKey(a.reqId, "allow") },
+            { text: "❌", style: 4, key: encodeKey(a.reqId, "deny") },
+            { text: "10min", style: 3, key: encodeKey(a.reqId, "allow_window") },
+            { text: "✅", style: 4, key: encodeKey(a.reqId, "allow") },
         ],
     };
 };
 const verbOf = (d, windowMinutes) => {
     switch (d) {
         case "deny": return "已拒绝";
-        case "allow_window": return `${windowMinutes}分钟此会话内通过所有`;
+        case "allow_window": return `${windowMinutes}min会话内通过所有`;
         case "allow_session": return "本会话通过";
         default: return "已通过";
     }
 };
 const emojiOf = (d) => (d === "deny" ? "❌" : "✅");
-const resolvedButtonText = (d, windowMinutes) => `${emojiOf(d)} ${verbOf(d, windowMinutes)}`;
+// allow_window 仍可点击以取消自动窗口；其余决策为最终态 noop。
+const resolvedButton = (d, windowMinutes, reqId, sessionId) => {
+    if (d === "allow_window") {
+        return {
+            text: `${verbOf(d, windowMinutes)}(点击取消)`,
+            style: 4,
+            key: encodeCancelKey(sessionId),
+        };
+    }
+    return {
+        text: `${emojiOf(d)} ${verbOf(d, windowMinutes)}`,
+        style: 4,
+        key: `noop:${reqId}`,
+    };
+};
 const buildResolvedCard = (a) => {
     const r = renderInput(a.toolName, a.toolInput, a.toolInputStr, a.cwd);
     const dir = dirName(a.cwd);
     const tail = oneLine(a.transcriptTail).trim();
+    const jl = detailJumpList(a.detailUrl);
     return {
         card_type: "button_interaction",
         source: buildSource(tail),
         main_title: {
-            title: `${a.toolName} · 📁 ${dir}/`,
+            title: `${a.toolName} · ${dir}/`,
         },
         ...(r.body ? { quote_area: quoteArea(r.body) } : {}),
+        ...(jl ? { jump_list: jl } : {}),
+        task_id: a.reqId,
+        button_list: [resolvedButton(a.decision, a.windowMinutes, a.reqId, a.sessionId)],
+    };
+};
+const buildCancelledCard = (a) => {
+    const r = renderInput(a.toolName, a.toolInput, a.toolInputStr, a.cwd);
+    const dir = dirName(a.cwd);
+    const tail = oneLine(a.transcriptTail).trim();
+    const jl = detailJumpList(a.detailUrl);
+    return {
+        card_type: "button_interaction",
+        source: buildSource(tail),
+        main_title: { title: `${a.toolName} · ${dir}/` },
+        ...(r.body ? { quote_area: quoteArea(r.body) } : {}),
+        ...(jl ? { jump_list: jl } : {}),
         task_id: a.reqId,
         button_list: [
-            { text: resolvedButtonText(a.decision, a.windowMinutes), style: 4, key: `noop:${a.reqId}` },
+            { text: "已取消自动通过", style: 4, key: `noop:cancelled:${a.reqId}` },
         ],
     };
 };
+// 已 resolved 的卡再次被点击 — 仅作视觉反馈, 不改变任何状态。
+const buildAlreadyResolvedCard = (a) => {
+    const r = renderInput(a.toolName, a.toolInput, a.toolInputStr, a.cwd);
+    const dir = dirName(a.cwd);
+    const tail = oneLine(a.transcriptTail).trim();
+    const jl = detailJumpList(a.detailUrl);
+    return {
+        card_type: "button_interaction",
+        source: buildSource(tail),
+        main_title: { title: `${a.toolName} · ${dir}/` },
+        ...(r.body ? { quote_area: quoteArea(r.body) } : {}),
+        ...(jl ? { jump_list: jl } : {}),
+        task_id: a.reqId,
+        button_list: [{ text: "已经放行", style: 4, key: `noop:${a.reqId}` }],
+    };
+};
 const encodeKey = (reqId, decision) => `${reqId}|${decision}`;
+const NOOP_PREFIX = "noop:";
+const CANCEL_PREFIX = "cancel_window:";
+const encodeCancelKey = (sessionId) => `${CANCEL_PREFIX}${sessionId}`;
 const decodeKey = (key) => {
-    if (key.startsWith("noop:"))
-        return {};
+    if (key.startsWith(NOOP_PREFIX)) {
+        // noop:cancelled:<id> 也走这里，noopReqId 取剩余部分作为 task_id 兜底。
+        return { noopReqId: key.slice(NOOP_PREFIX.length) };
+    }
+    if (key.startsWith(CANCEL_PREFIX)) {
+        return { cancelSessionId: key.slice(CANCEL_PREFIX.length) };
+    }
     const [reqId, d] = key.split("|");
     if (!reqId || !d)
         return {};
@@ -174,12 +233,198 @@ const decodeKey = (key) => {
         return {};
     return { reqId, decision: d };
 };
+// ── AskUserQuestion 投票卡分支 ─────────────────────────────────────────
+// PreToolUse 协议端只能输出 allow/deny/ask, 没有「合成 tool_result」通道。
+// 取舍: 用户在 WeCom 选了选项 → 走 deny + 把答案塞进 reason, model 把 reason
+// 当作上下文继续推理(CLI 不会弹原生 picker, 流程不被打断);
+// 选「🖥️ CLI 处理」哨兵选项 → 返回 ask, CLI 弹原生 picker 由用户本地作答。两路互斥。
+// vote_interaction 不支持 button_list (SDK 类型注释明写「button_interaction 类型卡片使用」),
+// 微信侧静默吞掉, 所以 cli 入口只能塞进 checkbox option_list 作为哨兵 id。
+const ASKQ_PREFIX = "ASKQ|";
+const ASKQ_PICKED_PREFIX = "picked:";
+const ASKQ_CLI_OPTION_ID = "__cli__";
+const ASKQ_NOOP_PREFIX = "askq_noop:";
+const encodeAskqKey = (reqId) => `${ASKQ_PREFIX}${reqId}|submit`;
+const encodeAskqNoopKey = (reqId) => `${ASKQ_NOOP_PREFIX}${reqId}`;
+const decodeAskqKey = (key) => {
+    if (!key.startsWith(ASKQ_PREFIX))
+        return undefined;
+    const [reqId, action] = key.slice(ASKQ_PREFIX.length).split("|");
+    if (!reqId || action !== "submit")
+        return undefined;
+    return { reqId, action };
+};
+const decodeAskqNoopKey = (key) => key.startsWith(ASKQ_NOOP_PREFIX) ? key.slice(ASKQ_NOOP_PREFIX.length) : undefined;
+const parseAskqInput = (i) => {
+    if (!i || typeof i !== "object")
+        return undefined;
+    const qs = i.questions;
+    if (!Array.isArray(qs))
+        return undefined;
+    return qs.map((q) => {
+        const qq = (q ?? {});
+        const opts = Array.isArray(qq.options) ? qq.options : [];
+        return {
+            question: typeof qq.question === "string" ? qq.question : "",
+            header: typeof qq.header === "string" ? qq.header : "",
+            multiSelect: Boolean(qq.multiSelect),
+            options: opts.flatMap((o) => {
+                const oo = (o ?? {});
+                return typeof oo.label === "string"
+                    ? [{
+                            label: oo.label,
+                            description: typeof oo.description === "string" ? oo.description : undefined,
+                        }]
+                    : [];
+            }),
+        };
+    });
+};
+const ASKQ_OPTION_TEXT_MAX = 11;
+const ASKQ_TITLE_MAX = 26;
+const ASKQ_SUB_MAX = 480;
+const buildAskqCard = (reqId, q, transcriptTail) => {
+    const lines = [];
+    if (q.question)
+        lines.push(q.question);
+    q.options.forEach((o, idx) => {
+        if (o.description)
+            lines.push(`${idx + 1}. ${o.label} — ${o.description}`);
+    });
+    const tail = oneLine(transcriptTail).trim();
+    return {
+        card_type: "vote_interaction",
+        source: buildSource(tail),
+        main_title: { title: TRUNC(`🤔 ${q.header || "请选择"}`, ASKQ_TITLE_MAX) },
+        sub_title_text: TRUNC(lines.join("\n"), ASKQ_SUB_MAX),
+        task_id: reqId,
+        checkbox: {
+            question_key: "q",
+            mode: q.multiSelect ? 1 : 0,
+            option_list: [
+                ...q.options.map((o, idx) => ({
+                    id: String(idx),
+                    text: TRUNC(o.label, ASKQ_OPTION_TEXT_MAX),
+                })),
+                { id: ASKQ_CLI_OPTION_ID, text: "🖥️ CLI 处理" },
+            ],
+        },
+        submit_button: { text: "提交", key: encodeAskqKey(reqId) },
+    };
+};
+const askqResolvedStash = new Map();
+const ASKQ_RESOLVED_TTL_MS = 30 * 60_000;
+const ASKQ_RESOLVED_MAX = 200;
+const stashAskqResolved = (reqId, snap) => {
+    askqResolvedStash.set(reqId, { ...snap, at: Date.now() });
+    if (askqResolvedStash.size > ASKQ_RESOLVED_MAX) {
+        const cutoff = Date.now() - ASKQ_RESOLVED_TTL_MS;
+        for (const [k, v] of askqResolvedStash)
+            if (v.at < cutoff)
+                askqResolvedStash.delete(k);
+    }
+};
+const getAskqResolved = (reqId) => {
+    const e = askqResolvedStash.get(reqId);
+    if (!e)
+        return undefined;
+    if (Date.now() - e.at > ASKQ_RESOLVED_TTL_MS) {
+        askqResolvedStash.delete(reqId);
+        return undefined;
+    }
+    return e;
+};
+const buildAskqResolvedCard = (reqId, q, outcome, transcriptTail) => {
+    const summary = outcome.kind === "cli"
+        ? "🖥️ 已转 CLI 处理"
+        : outcome.kind === "empty"
+            ? "⚠️ 未选择"
+            : `✅ ${outcome.picked.map((i) => q.options[i]?.label ?? `#${i}`).join(", ")}`;
+    const tail = oneLine(transcriptTail).trim();
+    return {
+        card_type: "button_interaction",
+        source: buildSource(tail),
+        main_title: { title: TRUNC(`🤔 ${q.header || "已回答"}`, ASKQ_TITLE_MAX) },
+        sub_title_text: TRUNC(q.question, ASKQ_SUB_MAX),
+        task_id: reqId,
+        button_list: [{ text: TRUNC(summary, 30), style: 4, key: encodeAskqNoopKey(reqId) }],
+    };
+};
+const handleAskUserQuestion = async ({ cfg, log, client, body, getMirrorTarget }) => {
+    const questions = parseAskqInput(body.tool_input);
+    if (!questions || questions.length === 0)
+        return { decision: "ask", reason: "askq_unparsable" };
+    if (questions.length > 1)
+        return { decision: "ask", reason: "askq_multi_unsupported" };
+    const q = questions[0];
+    if (q.options.length === 0)
+        return { decision: "ask", reason: "askq_no_options" };
+    const approver = resolveApprover(cfg, body.session_id, getMirrorTarget);
+    if (!approver)
+        return { decision: "ask", reason: "no_approver" };
+    if (!client.isConnected)
+        return { decision: "ask", reason: "ws_disconnected" };
+    const longPollMs = cfg.approval.longPollSec * 1000;
+    // toolInput 存原始 input,事件 listener 通过 getPending 重解析。
+    // transcriptTail 一并存进 meta, resolved 卡渲染时复用同一份 source。
+    const { reqId, promise } = createPending({
+        meta: {
+            kind: "generic",
+            createdAt: Date.now(),
+            toolName: "AskUserQuestion",
+            toolInput: body.tool_input,
+            cwd: body.cwd,
+            sessionId: body.session_id,
+            transcriptTail: body.transcript_tail ?? "",
+        },
+        timeoutMs: longPollMs,
+    });
+    try {
+        await client.sendMessage(targetChatId(approver), {
+            msgtype: "template_card",
+            template_card: buildAskqCard(reqId, q, body.transcript_tail ?? ""),
+        });
+        log.info({ reqId, approver }, "askq card sent");
+    }
+    catch (e) {
+        log.error({ err: e.message }, "askq send failed");
+        resolvePending(reqId, "deny"); // 释放 pending 槽
+        return { decision: "ask", reason: `askq_send_fail:${e.message}` };
+    }
+    let raw;
+    try {
+        raw = (await promise);
+    }
+    catch {
+        return { decision: "ask", reason: "askq_timeout" };
+    }
+    if (raw === "cli")
+        return { decision: "ask", reason: "askq_cli" };
+    if (raw.startsWith(ASKQ_PICKED_PREFIX)) {
+        const idxs = raw.slice(ASKQ_PICKED_PREFIX.length)
+            .split(",")
+            .map((s) => parseInt(s, 10))
+            .filter((n) => Number.isInteger(n) && n >= 0 && n < q.options.length);
+        if (idxs.length === 0)
+            return { decision: "ask", reason: "askq_empty_pick" };
+        const labels = idxs.map((i) => q.options[i].label).join(", ");
+        return {
+            decision: "deny",
+            reason: `User answered "${q.header || q.question}" via WeCom: ${labels}`,
+        };
+    }
+    return { decision: "ask", reason: "askq_unknown" };
+};
 const decisionToHook = (d) => (d === "deny" ? "deny" : "allow");
 const fallback = (cfg, reason) => ({
     decision: cfg.approval.fallbackOnError,
     reason,
 });
-export const makeApproveHandler = ({ cfg, log, client }) => {
+const resolveApprover = (cfg, sessionId, getMirrorTarget) => {
+    const mirror = sessionId ? getMirrorTarget?.(sessionId) : undefined;
+    return mirror || pickApprover(cfg);
+};
+export const makeApproveHandler = ({ cfg, log, client, getMirrorTarget }) => {
     return async (req, res) => {
         if (!cfg.approval.enabled) {
             json(res, 200, { decision: "ask", reason: "approval_disabled" });
@@ -200,6 +445,24 @@ export const makeApproveHandler = ({ cfg, log, client }) => {
             json(res, 200, { decision: "allow", reason: "matcher_skip" });
             return;
         }
+        // AskUserQuestion 走单独的投票卡分支(deny+reason 注入答案 / ask 转 CLI)。
+        if (toolName === "AskUserQuestion") {
+            const resp = await handleAskUserQuestion({
+                cfg,
+                log,
+                client,
+                getMirrorTarget,
+                body: {
+                    session_id: sessionId,
+                    tool_name: toolName,
+                    tool_input: toolInput,
+                    cwd,
+                    transcript_tail: transcriptTail,
+                },
+            });
+            json(res, 200, resp);
+            return;
+        }
         // Auto-approve window: while active for THIS session, requests short-circuit to allow.
         if (isAutoWindowActive(sessionId)) {
             const remainSec = Math.ceil(autoWindowRemainingMs(sessionId) / 1000);
@@ -221,7 +484,7 @@ export const makeApproveHandler = ({ cfg, log, client }) => {
             });
             return;
         }
-        const approver = pickApprover(cfg);
+        const approver = resolveApprover(cfg, sessionId, getMirrorTarget);
         if (!approver) {
             log.warn("no approver configured");
             json(res, 200, fallback(cfg, "no_approver"));
@@ -256,6 +519,15 @@ export const makeApproveHandler = ({ cfg, log, client }) => {
             },
             timeoutMs: longPollMs,
         });
+        const detailUrl = buildDetailUrl(cfg.daemon.detailPublicBase, cfg.daemon.host, cfg.daemon.port, reqId);
+        recordApproval({
+            id: reqId,
+            toolName,
+            toolInput: display,
+            cwd,
+            sessionId,
+            transcriptTail,
+        });
         const card = buildCard({
             reqId,
             toolName,
@@ -265,6 +537,7 @@ export const makeApproveHandler = ({ cfg, log, client }) => {
             sessionShort,
             transcriptTail,
             windowMinutes: cfg.approval.windowMinutes,
+            detailUrl,
         });
         try {
             await client.sendMessage(targetChatId(approver), {
@@ -292,8 +565,32 @@ export const makeApproveHandler = ({ cfg, log, client }) => {
             cachePut(ck, decision, cfg.approval.sessionCacheMinutes * 60_000);
         }
         if (decision === "allow_window" && cfg.approval.windowMinutes > 0) {
-            setAutoWindow(sessionId, cfg.approval.windowMinutes * 60_000);
-            log.info({ sessionId, minutes: cfg.approval.windowMinutes }, "auto-window opened");
+            setAutoWindow(sessionId, cfg.approval.windowMinutes * 60_000, {
+                toolName,
+                toolInput: display,
+                cwd,
+                transcriptTail,
+            });
+            // 同 turn 并发触发的其它 pending 卡 — 一并放行，免得用户逐个点。
+            // 我们没有那些卡的事件 frame, 不能 updateTemplateCard 改文案；
+            // 改用一条 markdown 消息回执让用户知道发生了什么。
+            const swept = resolvePendingsBySession(sessionId, "allow_window", reqId);
+            log.info({ sessionId, minutes: cfg.approval.windowMinutes, swept: swept.length }, "auto-window opened");
+            if (swept.length > 0) {
+                try {
+                    const tools = swept
+                        .map(({ meta }) => meta.toolName)
+                        .filter((s) => Boolean(s));
+                    const summary = tools.length > 0 ? tools.join(" / ") : `${swept.length} 个`;
+                    await client.sendMessage(targetChatId(approver), {
+                        msgtype: "markdown",
+                        markdown: { content: `⚡ 已批量自动放行其他 ${swept.length} 个并发请求：${summary}` },
+                    });
+                }
+                catch (e) {
+                    log.warn({ err: e.message }, "sweep notice send failed");
+                }
+            }
         }
         // Resolved-card refresh happens inline in the click listener via
         // `updateTemplateCard` (5-sec window). No follow-up sendMessage here.
@@ -304,7 +601,7 @@ export const makeApproveHandler = ({ cfg, log, client }) => {
     };
 };
 // ── Card click event → resolvePending + update card in place ────────────
-export const installApprovalEventListener = (client, log, cfg) => {
+export const installApprovalEventListener = (client, log, cfg, onApproved) => {
     client.on("event", (frame) => {
         try {
             log.info({ raw: JSON.stringify(frame.body).slice(0, 1200) }, "raw event frame");
@@ -318,18 +615,154 @@ export const installApprovalEventListener = (client, log, cfg) => {
         // SDK d.ts says ev.event_key, but the actual payload nests it under
         // ev.template_card_event.event_key. Fall back across both for safety.
         const key = ev?.template_card_event?.event_key ?? ev?.event_key ?? "";
-        const { reqId, decision } = decodeKey(key);
+        // Update 时 task_id 必须跟回调里的一致，否则微信会拒掉更新。
+        const cbTaskId = ev?.template_card_event?.task_id ?? ev?.task_id ?? "";
+        // ── AskUserQuestion 投票卡: 在普通 approval 解码前先匹配 ASKQ| 前缀。
+        const askq = decodeAskqKey(key);
+        if (askq) {
+            const meta = getPending(askq.reqId);
+            const q = parseAskqInput(meta?.toolInput)?.[0];
+            // 实际 payload 是 XML→JSON 双层包装, 不能直接 [0].option_ids; 同时
+            // 兼容 SDK 文档里那个扁平形态(以防固件升级)。
+            const si = ev?.template_card_event?.selected_items;
+            const firstItem = Array.isArray(si)
+                ? si[0]
+                : si?.selected_item?.[0];
+            const oids = firstItem?.option_ids;
+            const rawIds = Array.isArray(oids)
+                ? oids
+                : (oids?.option_id ?? []);
+            const cliPicked = rawIds.includes(ASKQ_CLI_OPTION_ID);
+            const numericIdxs = rawIds
+                .filter((s) => s !== ASKQ_CLI_OPTION_ID)
+                .map((s) => parseInt(s, 10))
+                .filter((n) => Number.isInteger(n) && n >= 0);
+            // CLI 哨兵优先 (即便和其它选项混选,也按转 CLI 处理)。
+            const outcome = cliPicked
+                ? { kind: "cli" }
+                : numericIdxs.length === 0
+                    ? { kind: "empty" }
+                    : { kind: "picked", picked: numericIdxs };
+            const resolved = outcome.kind === "cli"
+                ? "cli"
+                : `${ASKQ_PICKED_PREFIX}${numericIdxs.join(",")}`;
+            const ok = resolvePending(askq.reqId, resolved);
+            log.info({ reqId: askq.reqId, outcome, ok }, "askq event resolved");
+            if (q) {
+                // 存一份给后续在 resolved 卡上重复点击 askq_noop 用 — resolvePending
+                // 已经把 pending entry 删掉了,不再 stash 这次拿不到原 question。
+                stashAskqResolved(askq.reqId, { q, outcome, transcriptTail: meta?.transcriptTail ?? "" });
+                try {
+                    await client.updateTemplateCard(frame, buildAskqResolvedCard(cbTaskId || askq.reqId, q, outcome, meta?.transcriptTail ?? ""));
+                }
+                catch (e) {
+                    log.warn({ err: e.message, reqId: askq.reqId }, "askq updateTemplateCard failed");
+                }
+            }
+            return;
+        }
+        const decoded = decodeKey(key);
+        const detailUrlFor = (id) => buildDetailUrl(cfg.daemon.detailPublicBase, cfg.daemon.host, cfg.daemon.port, id);
+        // Askq-noop 分支: askq 投票卡 submit 后那张「已回答」卡再次被点。
+        // 必须在普通 noop 分支前匹配 — 否则会落到 buildAlreadyResolvedCard
+        // 渲染成「授权 · 已经放行」,污染原卡。
+        const askqNoopReqId = decodeAskqNoopKey(key);
+        if (askqNoopReqId !== undefined) {
+            const snap = getAskqResolved(askqNoopReqId);
+            if (snap) {
+                try {
+                    await client.updateTemplateCard(frame, buildAskqResolvedCard(cbTaskId || askqNoopReqId, snap.q, snap.outcome, snap.transcriptTail));
+                    log.info({ reqId: askqNoopReqId }, "askq noop click — resolved card refreshed");
+                }
+                catch (e) {
+                    log.warn({ err: e.message, reqId: askqNoopReqId }, "updateTemplateCard (askq-noop) failed");
+                }
+            }
+            else {
+                log.info({ reqId: askqNoopReqId }, "askq noop click — stash expired, ignored");
+            }
+            return;
+        }
+        // Noop branch: 卡片已 resolved, 用户再次点击 — 给一次视觉反馈。
+        if (decoded.noopReqId !== undefined) {
+            const reqId = decoded.noopReqId;
+            const snap = getResolvedSnapshot(reqId);
+            try {
+                await client.updateTemplateCard(frame, buildAlreadyResolvedCard({
+                    reqId: cbTaskId || reqId,
+                    toolName: snap?.meta.toolName ?? "授权",
+                    toolInput: snap?.meta.toolInput ?? {},
+                    toolInputStr: "",
+                    cwd: snap?.meta.cwd ?? "",
+                    sessionShort: snap?.meta.sessionId ? snap.meta.sessionId.slice(-8) : "?",
+                    transcriptTail: snap?.meta.transcriptTail ?? "",
+                    windowMinutes: cfg.approval.windowMinutes,
+                    detailUrl: detailUrlFor(reqId),
+                }));
+                log.info({ reqId }, "noop click — already-resolved card refreshed");
+            }
+            catch (e) {
+                log.warn({ err: e.message, reqId }, "updateTemplateCard (noop) failed");
+            }
+            return;
+        }
+        // Cancel branch: resolved allow_window card was clicked again to cancel
+        // the auto-approve window for that session. No pending to resolve.
+        if (decoded.cancelSessionId) {
+            const wmeta = getWindowMeta(decoded.cancelSessionId);
+            clearAutoWindow(decoded.cancelSessionId);
+            log.info({ sessionId: decoded.cancelSessionId }, "auto-window cancelled by click");
+            try {
+                await client.updateTemplateCard(frame, buildCancelledCard({
+                    reqId: cbTaskId, // 必须用回调的 task_id，否则微信拒更新
+                    toolName: wmeta?.toolName ?? "授权",
+                    toolInput: wmeta?.toolInput ?? {},
+                    toolInputStr: "",
+                    cwd: wmeta?.cwd ?? "",
+                    sessionShort: decoded.cancelSessionId.slice(-8),
+                    transcriptTail: wmeta?.transcriptTail ?? "",
+                    windowMinutes: cfg.approval.windowMinutes,
+                    detailUrl: cbTaskId ? detailUrlFor(cbTaskId) : undefined,
+                }));
+                log.info({ sessionId: decoded.cancelSessionId, cbTaskId }, "cancel card updated in place");
+            }
+            catch (e) {
+                log.warn({ err: e.message }, "updateTemplateCard (cancel) failed");
+            }
+            return;
+        }
+        const { reqId, decision } = decoded;
         if (!reqId || !decision) {
             log.info({ key }, "card event ignored (bad key)");
             return;
         }
         // Snapshot meta BEFORE resolve (resolve deletes the entry).
-        const meta = getPending(reqId);
+        const livePending = getPending(reqId);
         const ok = resolvePending(reqId, decision);
+        // 兜底: 这张卡如果是被 sweep 提前 resolve 掉的"鬼卡", livePending 已经没了
+        // (resolvePendingsBySession 删过); 从 resolvedStash 里捞回原始 meta + 真实
+        // decision, 渲染成"已自动放行"形态而非 (probe)。
+        const snap = livePending ? undefined : getResolvedSnapshot(reqId);
+        const meta = livePending ?? snap?.meta;
+        const effectiveDecision = snap?.decision ?? decision;
+        const by = frame.body?.from?.userid ?? "?";
+        recordApprovalDecision(reqId, snap ? "swept" : effectiveDecision, by);
         if (ok)
             log.info({ reqId, decision }, "card event resolved");
-        else
-            log.warn({ reqId, decision }, "card event for unknown reqId (probe? expired?) — still updating card");
+        else if (snap)
+            log.info({ reqId, snap: snap.decision }, "card event on swept card — rendering snapshot");
+        else {
+            // meta 完全缺失 (daemon 重启 / stash 过期 / 真探测包)。任何 update 都会用
+            // 空字段把原卡覆盖成 "(probe) · /"，比保留原卡更糟。直接放弃 update。
+            log.warn({ reqId, decision }, "card event for unknown reqId (probe? expired?) — skipping update to avoid clobbering original card");
+            return;
+        }
+        // 用户实际点击的那一下 — 通知 mirror 立刻 finalize 当前 liveStream,
+        // 后续的 tool_use / tool_result 走防抖 standalone 路径,避免点击后仍把
+        // 内容续写进同一个气泡。sweep 二次点击 (snap 命中, ok=false) 不触发,
+        // 避免重复 finalize。
+        if (ok && meta?.sessionId)
+            onApproved?.(meta.sessionId);
         // Refresh original card in place (must be within 5s of click).
         // Independent of pending resolution: we always want visual ACK on any
         // well-formed click so the user knows the click landed.
@@ -342,21 +775,38 @@ export const installApprovalEventListener = (client, log, cfg) => {
             }
         })();
         const sessionShort = meta?.sessionId ? meta.sessionId.slice(-8) : "?";
-        const by = frame.body?.from?.userid ?? "?";
+        // snap 命中 = 这张卡已被 sweep / 重复点击, 没有真正状态变更, 渲染成
+        // 「已经放行」而不是再画一遍 allow_window「点击取消」按钮 — 否则用户
+        // 在被批量放行的卡上会看到一个会去取消整个窗口的按钮, 误导。
         try {
-            await client.updateTemplateCard(frame, buildResolvedCard({
-                reqId,
-                toolName: meta?.toolName ?? "(probe)",
-                toolInput: meta?.toolInput,
-                toolInputStr,
-                cwd: meta?.cwd ?? "",
-                sessionShort,
-                transcriptTail: meta?.transcriptTail ?? "",
-                windowMinutes: cfg.approval.windowMinutes,
-                decision,
-                by,
-            }));
-            log.info({ reqId, decision }, "card updated in place");
+            const card = snap
+                ? buildAlreadyResolvedCard({
+                    reqId: cbTaskId || reqId,
+                    toolName: meta?.toolName ?? "授权",
+                    toolInput: meta?.toolInput ?? {},
+                    toolInputStr,
+                    cwd: meta?.cwd ?? "",
+                    sessionShort,
+                    transcriptTail: meta?.transcriptTail ?? "",
+                    windowMinutes: cfg.approval.windowMinutes,
+                    detailUrl: detailUrlFor(reqId),
+                })
+                : buildResolvedCard({
+                    reqId,
+                    toolName: meta?.toolName ?? "授权",
+                    toolInput: meta?.toolInput,
+                    toolInputStr,
+                    cwd: meta?.cwd ?? "",
+                    sessionShort,
+                    transcriptTail: meta?.transcriptTail ?? "",
+                    windowMinutes: cfg.approval.windowMinutes,
+                    decision: effectiveDecision,
+                    by,
+                    sessionId: meta?.sessionId ?? "",
+                    detailUrl: detailUrlFor(reqId),
+                });
+            await client.updateTemplateCard(frame, card);
+            log.info({ reqId, decision, swept: Boolean(snap) }, "card updated in place");
         }
         catch (e) {
             log.warn({ err: e.message, reqId }, "updateTemplateCard failed");