@rezti/dsh-rez-wechat 0.1.11 → 0.1.13

package/README.md

@@ -3,10 +3,11 @@
 企业微信走现成 `wecom-mcp`；个人微信走 QClaw 同款 `dsh-wechat-bridge`（腾讯 iLink）。都不自写长连接。
 
 ```bash
-dsh plugin --profile web add @rezti/dsh-rez-sso
-dsh plugin --profile web add @rezti/dsh-rez-wechat
+dsh plugin --profile web add @rezti/dsh-rez-suite
 ```
 
+以后升级只记：`dsh plugin --profile web update @rezti/dsh-rez-suite`。不要再单独 add 本包。
+
 | 能力 | 做法 |
 |---|---|
 | 企业微信发到群 | `wecom-mcp`（`mcp__wechat__*`）+ `REZ_WECHAT_WEBHOOK` |
@@ -18,8 +19,10 @@ dsh plugin --profile web add @rezti/dsh-rez-wechat
 - 连续消息延续同一会话
 - 模型跟网页默认（网页选了 Kimi，微信也走 Kimi）
 - 网页归档后再从微信说话会自动回到侧栏（官方会藏空白会话，所以「重启对话」会先打一句招呼）
+- 网页端选择题（Selection）会编成 `1. 2. 3.` 发到微信；回复数字或选项原文即可继续，不必在网页点选
+- 思考过程不会发到微信；多段正文会保留换行
 - 通道断了点「重新连接」，已登录不必再扫码
 
-扫码 UI 暂时还在旧单体 `dsh-rez-suite` 面板；通道本身在本包。不要对同一 profile 既 `plugin add suite` 又 `plugin add wechat`，会重复注册。
+扫码 UI 在 suite 面板；通道本身在本包。不要对同一 profile 既 add suite 又 add wechat，会重复注册。
 
 这是 ClawBot 客服会话，不是用个人微信号管好友/群，也不是客户层 WhatsApp/邮件通道。

package/lib/index.js

@@ -5,7 +5,7 @@ export const name = 'rez-wechat';
 export const inject = ['systemPrompt', 'webServer', 'rezSso'];
 const GUIDANCE = [
     '企业微信群发送走官方 dsh-mcp-client + wecom-mcp（mcp__wechat__*），密钥 REZ_WECHAT_WEBHOOK。未配置时不拉起 wecom-mcp。Webhook 在 设置 → 插件 → ReZ-TI 里填。',
-    '个人微信是 QClaw 同款 ClawBot 通道：在 Rez 面板「微信」页扫码一次，然后直接在微信里说话。消息进入网页左侧「微信」文件夹并延续同一会话，模型跟网页默认（在网页里选了 Kimi 就会走 Kimi）。网页端归档了也能从微信自动恢复到侧栏（空白会话网页会藏起来，所以新开的会话会先打一句招呼再出现）。发「重启对话」会新开一条可见的网页会话并把旧的归档。通道断了点「重新连接」（已登录不必再扫码）。不要再跑 npx weixin-mcp login，也不要调用 mcp__weixin__*。网页端必须开着。',
+    '个人微信是 QClaw 同款 ClawBot 通道：在 Rez 面板「微信」页扫码一次，然后直接在微信里说话。消息进入网页左侧「微信」文件夹并延续同一会话，模型跟网页默认（在网页里选了 Kimi 就会走 Kimi）。网页端归档了也能从微信自动恢复到侧栏（空白会话网页会藏起来，所以新开的会话会先打一句招呼再出现）。网页端出现选择题时会编成纯文本发到微信，回复数字或选项原文即可；思考过程不会转发。发「重启对话」会新开一条可见的网页会话并把旧的归档。通道断了点「重新连接」（已登录不必再扫码）。不要再跑 npx weixin-mcp login，也不要调用 mcp__weixin__*。网页端必须开着。',
     '这是 ClawBot 客服会话，不是用个人微信号管好友/群。对外发消息必须先征得用户批准。',
 ].join('');
 function isLoopbackRequest(request) {

package/lib/web-shim.d.ts

@@ -13,12 +13,21 @@ export interface ModelRef {
     provider?: string;
     model: string;
 }
+export interface PendingQuestion {
+    id: string;
+    header?: string;
+    question: string;
+    options: string[];
+}
+export interface SessionRecord {
+    sessionId: string;
+    updatedAt: number;
+    pendingQuestions?: PendingQuestion[];
+}
 export interface SessionStore {
-    sessions: Record<string, {
-        sessionId: string;
-        updatedAt: number;
-    }>;
+    sessions: Record<string, SessionRecord>;
 }
+export declare const ASK_USER_QUESTION_TOOL = "ask_user_question";
 export interface RpcFn {
     (method: string, params: Record<string, unknown>): Promise<unknown>;
 }
@@ -34,6 +43,10 @@ export declare const RESTART_ACK = "\u5DF2\u65B0\u5F00\u7F51\u9875\u4F1A\u8BDD\u
 export declare const RESTART_SEED = "\u65B0\u4F1A\u8BDD\u5DF2\u5F00\u59CB\u3002\u8BF7\u7528\u4E00\u53E5\u4E2D\u6587\u6253\u62DB\u547C\uFF0C\u4E0D\u8981\u89E3\u91CA\u5185\u90E8\u6B65\u9AA4\u3002";
 export declare const STUCK_ACK = "\u7F51\u9875\u7AEF\u8FD9\u6761\u4F1A\u8BDD\u5361\u4F4F\u4E86\uFF08\u5728\u7B49\u6279\u51C6\uFF0C\u6216\u6A21\u578B\u628A\u5185\u90E8\u63A8\u7406\u53D1\u51FA\u6765\u4E86\uFF09\u3002\u8BF7\u770B\u7F51\u9875\u5DE6\u4FA7\u300C\u5FAE\u4FE1\u300D\u6587\u4EF6\u5939\uFF0C\u6216\u53D1\u300C\u91CD\u542F\u5BF9\u8BDD\u300D\u3002";
 export declare const RPC_TIMEOUT_MS = 15000;
+export declare const QUESTION_HINT = "\u56DE\u590D\u6570\u5B57\u6216\u9009\u9879\u539F\u6587\u5373\u53EF\u3002";
+export declare function stripThinkTags(text: string): string;
+/** 微信 iLink 单条 text 能保留真实换行；多段之间空一行，避免粘成一团。 */
+export declare function formatWechatPlain(text: string): string;
 export declare function looksLikeInternalMonologue(text: string): boolean;
 export declare function usableAssistantText(text: string): string;
 export declare function turnIsBlocked(events: unknown[]): boolean;
@@ -55,6 +68,14 @@ export declare function rpcErrorMessage(body: unknown): string | undefined;
 export declare function extractSessionId(body: unknown): string | undefined;
 export declare function extractWorkspaceId(body: unknown): string | undefined;
 export declare function findWorkspaceId(body: unknown, cwd?: string): string | undefined;
+export declare function flattenVisibleText(content: unknown): string;
+export declare function historySettledQuestions(events: unknown[]): boolean;
+export declare function extractPendingQuestions(events: unknown[]): PendingQuestion[];
+export declare function formatQuestionForWechat(questions: PendingQuestion[]): string;
+export declare function parseChoice(userText: string, questions: PendingQuestion[]): {
+    id: string;
+    label: string;
+} | undefined;
 export declare function historyEvents(body: unknown): unknown[];
 export declare function lastAssistantText(events: unknown[]): string;
 export declare function turnIsIdle(events: unknown[]): boolean;

package/lib/web-shim.js

@@ -13,6 +13,7 @@ import { homedir } from 'node:os';
 import { basename, dirname, join } from 'node:path';
 export const WECHAT_WORKSPACE_NAME = '微信';
 export const DEFAULT_WEB_URL = 'http://127.0.0.1:3080';
+export const ASK_USER_QUESTION_TOOL = 'ask_user_question';
 export function parseHeadlessArgv(argv) {
     const args = argv[0]?.endsWith('node') || argv[0]?.includes('node.exe') ? argv.slice(1) : argv;
     const start = args[0]?.endsWith('.js') || args[0]?.endsWith('.mjs') || args[0]?.endsWith('.cjs') ? 1 : 0;
@@ -40,6 +41,8 @@ export const RESTART_ACK = '已新开网页会话（左侧「微信」文件夹
 export const RESTART_SEED = '新会话已开始。请用一句中文打招呼，不要解释内部步骤。';
 export const STUCK_ACK = '网页端这条会话卡住了（在等批准，或模型把内部推理发出来了）。请看网页左侧「微信」文件夹，或发「重启对话」。';
 export const RPC_TIMEOUT_MS = 15_000;
+export const QUESTION_HINT = '回复数字或选项原文即可。';
+const SKIP_CONTENT_TYPES = new Set(['reasoning', 'thinking', 'tool-call', 'tool-result', 'image']);
 const MONOLOGUE_MARKERS = [
     'sandbox_permissions',
     'danger-full-access',
@@ -48,16 +51,37 @@ const MONOLOGUE_MARKERS = [
     'escalate speculatively',
     'outside workspace',
     'I need danger-full-access',
+    '思考过程',
+    '思考内容',
 ];
+export function stripThinkTags(text) {
+    return text
+        .replace(/<think(?:ing|thought)?>[\s\S]*?<\/think(?:ing|thought)?>/gi, '')
+        .replace(/<\/?think(?:ing|thought)?>/gi, '');
+}
+/** 微信 iLink 单条 text 能保留真实换行；多段之间空一行，避免粘成一团。 */
+export function formatWechatPlain(text) {
+    return text
+        .replace(/\r\n?/g, '\n')
+        .replace(/[\u2028\u2029]/g, '\n')
+        .replace(/[ \t]+\n/g, '\n')
+        .replace(/\n{3,}/g, '\n\n')
+        .trim();
+}
 export function looksLikeInternalMonologue(text) {
-    if (text.trim().length === 0)
+    const trimmed = text.trim();
+    if (trimmed.length === 0)
         return false;
-    if (MONOLOGUE_MARKERS.some(marker => text.includes(marker)))
+    if (MONOLOGUE_MARKERS.some(marker => trimmed.includes(marker)))
+        return true;
+    if (/^\s*(thought|thinking|reasoning)\b/i.test(trimmed))
         return true;
-    return text.length > 400 && /sandbox_permissions|danger-full-access|workspace-write|AbortSignal|justification/i.test(text);
+    if (/<(think|thinking|thought)>/i.test(trimmed) && stripThinkTags(trimmed).trim().length === 0)
+        return true;
+    return trimmed.length > 400 && /sandbox_permissions|danger-full-access|workspace-write|AbortSignal|justification/i.test(trimmed);
 }
 export function usableAssistantText(text) {
-    const trimmed = text.trim();
+    const trimmed = formatWechatPlain(stripThinkTags(text));
     if (trimmed.length === 0 || looksLikeInternalMonologue(trimmed))
         return '';
     return trimmed;
@@ -68,9 +92,10 @@ export function turnIsBlocked(events) {
         if (typeof event !== 'object' || event === null)
             continue;
         const type = event.type;
-        if (type === 'approval/asked' || type === 'approval/requested' || type === 'question/requested')
+        // Selection / ask_user_question 不是批准卡住：编成纯文本发给微信，不要 STUCK_ACK。
+        if (type === 'approval/asked' || type === 'approval/requested')
             blocked = true;
-        if (type === 'approval/decided' || type === 'approval/resolved' || type === 'question/resolved' || type === 'turn/end')
+        if (type === 'approval/decided' || type === 'approval/resolved' || type === 'turn/end')
             blocked = false;
     }
     return blocked;
@@ -225,23 +250,301 @@ export function findWorkspaceId(body, cwd) {
     }) ?? rows.find(row => row.title === WECHAT_WORKSPACE_NAME);
     return match !== undefined ? extractWorkspaceId(match) : undefined;
 }
-function flattenText(content) {
+function asRecord(value) {
+    return typeof value === 'object' && value !== null ? value : undefined;
+}
+function eventPayload(event) {
+    const data = asRecord(event.data);
+    return data ?? event;
+}
+export function flattenVisibleText(content) {
     if (typeof content === 'string')
-        return content;
+        return stripThinkTags(content);
     if (!Array.isArray(content))
         return '';
-    return content
-        .map(block => {
-        if (typeof block === 'string')
-            return block;
-        if (typeof block !== 'object' || block === null)
-            return '';
-        const rec = block;
-        if (typeof rec.text === 'string')
-            return rec.text;
-        return '';
-    })
-        .join('');
+    const parts = [];
+    for (const block of content) {
+        if (typeof block === 'string') {
+            const text = stripThinkTags(block).trim();
+            if (text !== '')
+                parts.push(text);
+            continue;
+        }
+        const rec = asRecord(block);
+        if (rec === undefined)
+            continue;
+        const type = typeof rec.type === 'string' ? rec.type : 'text';
+        if (SKIP_CONTENT_TYPES.has(type))
+            continue;
+        if (type !== 'text' && rec.type !== undefined)
+            continue;
+        if (typeof rec.text !== 'string')
+            continue;
+        const text = stripThinkTags(rec.text).trim();
+        if (text !== '')
+            parts.push(text);
+    }
+    return parts.join('\n\n');
+}
+function optionLabel(option) {
+    if (typeof option === 'string')
+        return option.trim();
+    const rec = asRecord(option);
+    if (rec !== undefined && typeof rec.label === 'string')
+        return rec.label.trim();
+    return '';
+}
+function questionsFromAskArgs(args, fallbackId) {
+    let parsed = args;
+    if (typeof args === 'string') {
+        try {
+            parsed = JSON.parse(args);
+        }
+        catch {
+            return [];
+        }
+    }
+    const rec = asRecord(parsed);
+    if (rec === undefined)
+        return [];
+    const rawQuestions = Array.isArray(rec.questions) ? rec.questions : [rec];
+    const out = [];
+    for (const item of rawQuestions) {
+        if (typeof item === 'string') {
+            const question = item.trim();
+            if (question !== '')
+                out.push({ id: fallbackId, question, options: [] });
+            continue;
+        }
+        const q = asRecord(item);
+        if (q === undefined)
+            continue;
+        const id = typeof q.id === 'string' && q.id.trim() !== '' ? q.id.trim() : fallbackId;
+        const question = typeof q.question === 'string' ? q.question.trim()
+            : typeof q.prompt === 'string' ? q.prompt.trim()
+                : '';
+        const header = typeof q.header === 'string' && q.header.trim() !== '' ? q.header.trim() : undefined;
+        const options = Array.isArray(q.options) ? q.options.map(optionLabel).filter(label => label !== '') : [];
+        if (question === '' && options.length === 0)
+            continue;
+        const pending = { id, question: question || header || '请选择', options };
+        if (header !== undefined)
+            pending.header = header;
+        out.push(pending);
+    }
+    return out;
+}
+function toolNameOf(rec) {
+    const payload = eventPayload(rec);
+    const name = payload.name ?? payload.tool ?? payload.toolName ?? rec.name ?? rec.tool ?? rec.toolName;
+    return typeof name === 'string' ? name : '';
+}
+function callIdOf(rec) {
+    const payload = eventPayload(rec);
+    const id = payload.callID ?? payload.callId ?? payload.toolCallId ?? rec.callID ?? rec.callId ?? rec.toolCallId ?? rec.id;
+    return typeof id === 'string' ? id : '';
+}
+function isAskUserTool(name) {
+    return name === ASK_USER_QUESTION_TOOL || name.endsWith(`__${ASK_USER_QUESTION_TOOL}`);
+}
+function addId(into, value) {
+    if (typeof value === 'string' && value.trim() !== '')
+        into.add(value.trim());
+}
+function resolvedIdsFrom(rec) {
+    const payload = eventPayload(rec);
+    const ids = new Set();
+    addId(ids, callIdOf(rec));
+    addId(ids, payload.questionId);
+    addId(ids, payload.requestId);
+    addId(ids, rec.questionId);
+    addId(ids, rec.requestId);
+    const buckets = [payload.answers, rec.answers, payload.questions, rec.questions];
+    for (const bucket of buckets) {
+        if (!Array.isArray(bucket))
+            continue;
+        for (const item of bucket) {
+            const row = asRecord(item);
+            if (row !== undefined)
+                addId(ids, row.id);
+        }
+    }
+    return [...ids];
+}
+function contentBlocks(rec) {
+    const payload = eventPayload(rec);
+    const message = asRecord(payload.message) ?? payload;
+    const content = message.content ?? payload.content ?? rec.content;
+    return Array.isArray(content) ? content : [];
+}
+export function historySettledQuestions(events) {
+    for (const event of events) {
+        const rec = asRecord(event);
+        if (rec === undefined)
+            continue;
+        const type = typeof rec.type === 'string' ? rec.type : '';
+        if (type === 'question/resolved' || type === 'question/answered' || type === 'question/cancelled')
+            return true;
+        if ((type === 'tool/result' || type === 'tool-result') && isAskUserTool(toolNameOf(rec)))
+            return true;
+        for (const block of contentBlocks(rec)) {
+            const b = asRecord(block);
+            if (b === undefined)
+                continue;
+            if (b.type !== 'tool-result' && b.type !== 'tool/result')
+                continue;
+            const name = typeof b.toolName === 'string' ? b.toolName : typeof b.name === 'string' ? b.name : '';
+            if (isAskUserTool(name))
+                return true;
+        }
+    }
+    return false;
+}
+export function extractPendingQuestions(events) {
+    const answered = new Set();
+    const requestedIds = [];
+    const pendingByKey = new Map();
+    const pendingOrigins = new Map();
+    const keyOf = (item) => `${item.id}:${item.question}:${item.options.join('|')}`;
+    const dropAnswered = () => {
+        for (const [key, item] of pendingByKey) {
+            const origins = pendingOrigins.get(key) ?? new Set([item.id]);
+            if ([...origins].some(id => answered.has(id)))
+                pendingByKey.delete(key);
+        }
+    };
+    const remember = (items, sourceId) => {
+        if (sourceId !== undefined && sourceId !== '')
+            requestedIds.push(sourceId);
+        for (const item of items) {
+            requestedIds.push(item.id);
+            const key = keyOf(item);
+            const origins = pendingOrigins.get(key) ?? new Set();
+            origins.add(item.id);
+            if (sourceId !== undefined && sourceId !== '')
+                origins.add(sourceId);
+            pendingOrigins.set(key, origins);
+            if ([...origins].some(id => answered.has(id)))
+                continue;
+            pendingByKey.set(key, item);
+        }
+    };
+    const markResolved = (rec) => {
+        const ids = resolvedIdsFrom(rec);
+        if (ids.length === 0) {
+            for (const id of requestedIds)
+                answered.add(id);
+            pendingByKey.clear();
+            return;
+        }
+        for (const id of ids)
+            answered.add(id);
+        dropAnswered();
+    };
+    for (const event of events) {
+        const rec = asRecord(event);
+        if (rec === undefined)
+            continue;
+        const type = typeof rec.type === 'string' ? rec.type : '';
+        const payload = eventPayload(rec);
+        if (type === 'question/resolved' || type === 'question/answered' || type === 'question/cancelled') {
+            markResolved(rec);
+            continue;
+        }
+        if (type === 'question/requested') {
+            const sourceId = callIdOf(rec) || 'question';
+            remember(questionsFromAskArgs(payload.questions !== undefined ? payload : rec, sourceId), sourceId);
+            continue;
+        }
+        if (type === 'tool/result' || type === 'tool-result') {
+            if (isAskUserTool(toolNameOf(rec))) {
+                const id = callIdOf(rec);
+                if (id !== '')
+                    answered.add(id);
+                dropAnswered();
+            }
+        }
+        if ((type === 'tool/call' || type === 'tool-call') && isAskUserTool(toolNameOf(rec))) {
+            const id = callIdOf(rec);
+            if (id === '' || !answered.has(id)) {
+                const args = payload.arguments ?? payload.input ?? payload.params ?? rec.arguments ?? rec.input;
+                remember(questionsFromAskArgs(args, id || ASK_USER_QUESTION_TOOL), id);
+            }
+        }
+        for (const block of contentBlocks(rec)) {
+            const b = asRecord(block);
+            if (b === undefined)
+                continue;
+            if (b.type === 'tool-result' || b.type === 'tool/result') {
+                const name = typeof b.toolName === 'string' ? b.toolName : typeof b.name === 'string' ? b.name : '';
+                if (!isAskUserTool(name))
+                    continue;
+                const id = typeof b.toolCallId === 'string' ? b.toolCallId : typeof b.callID === 'string' ? b.callID : '';
+                if (id !== '')
+                    answered.add(id);
+                dropAnswered();
+                continue;
+            }
+            if (b.type !== 'tool-call' && b.type !== 'tool/call')
+                continue;
+            const name = typeof b.toolName === 'string' ? b.toolName : typeof b.name === 'string' ? b.name : '';
+            if (!isAskUserTool(name))
+                continue;
+            const id = typeof b.toolCallId === 'string' ? b.toolCallId : typeof b.callID === 'string' ? b.callID : typeof b.id === 'string' ? b.id : '';
+            if (id !== '' && answered.has(id))
+                continue;
+            remember(questionsFromAskArgs(b.arguments ?? b.input ?? b.params, id || ASK_USER_QUESTION_TOOL), id);
+        }
+    }
+    return [...pendingByKey.values()];
+}
+export function formatQuestionForWechat(questions) {
+    const parts = [];
+    const hint = questions.length > 1
+        ? '多题时回复如 1-2（第1题第2项），或回复选项原文。'
+        : QUESTION_HINT;
+    questions.forEach((question, questionIndex) => {
+        const title = question.header?.trim() || question.question.trim() || '请选择';
+        parts.push(questions.length > 1 ? `${questionIndex + 1}) ${title}` : title);
+        if (question.header !== undefined && question.question.trim() !== '' && question.question.trim() !== title) {
+            parts.push(question.question.trim());
+        }
+        question.options.forEach((option, index) => {
+            parts.push(`${index + 1}. ${option}`);
+        });
+    });
+    if (questions.length > 0)
+        parts.push(hint);
+    return formatWechatPlain(parts.join('\n'));
+}
+export function parseChoice(userText, questions) {
+    const raw = userText.trim();
+    if (raw === '' || questions.length === 0)
+        return undefined;
+    const pick = (question, optionIndex) => {
+        const label = question?.options[optionIndex];
+        if (question === undefined || label === undefined)
+            return undefined;
+        return { id: question.id, label };
+    };
+    const dotted = raw.match(/^(\d{1,2})[-.．](\d{1,2})$/);
+    if (dotted !== null && questions.length > 1) {
+        return pick(questions[Number(dotted[1]) - 1], Number(dotted[2]) - 1);
+    }
+    const numbered = raw.match(/^(\d{1,2})(?:[.．、。)]\s*)?$/);
+    if (numbered !== null) {
+        if (questions.length !== 1)
+            return undefined;
+        return pick(questions[0], Number(numbered[1]) - 1);
+    }
+    const exact = [];
+    for (const question of questions) {
+        for (const option of question.options) {
+            if (option === raw || option.trim() === raw)
+                exact.push({ id: question.id, label: option });
+        }
+    }
+    return exact.length === 1 ? exact[0] : undefined;
 }
 function unwrapHistoryItem(item) {
     if (typeof item !== 'object' || item === null)
@@ -276,7 +579,7 @@ export function lastAssistantText(events) {
             continue;
         const data = typeof rec.data === 'object' && rec.data !== null ? rec.data : rec;
         const message = typeof data.message === 'object' && data.message !== null ? data.message : data;
-        const chunk = flattenText(message.content ?? data.content ?? rec.content) || (typeof rec.text === 'string' ? rec.text : '');
+        const chunk = flattenVisibleText(message.content ?? data.content ?? rec.content) || (typeof rec.text === 'string' ? stripThinkTags(rec.text) : '');
         if (chunk.trim() !== '')
             text = chunk;
     }
@@ -540,9 +843,52 @@ async function abortSessionTurn(rpc, sessionId) {
             return;
     }
 }
-async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs) {
+async function tryRpcQuick(rpc, method, params, ms = 2000) {
+    let timer;
+    try {
+        await Promise.race([
+            rpc(method, params),
+            new Promise((_, reject) => {
+                timer = setTimeout(() => reject(new Error('timeout')), ms);
+            }),
+        ]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        if (timer !== undefined)
+            clearTimeout(timer);
+    }
+}
+async function tryAnswerPendingQuestion(rpc, sessionId, choice) {
+    const answer = { answers: [{ id: choice.id, selected: [choice.label] }] };
+    const payloads = [
+        { sessionId, answer },
+        { sessionId, answers: answer.answers },
+    ];
+    for (const method of ['question.respond', 'session.respondQuestion']) {
+        for (const params of payloads) {
+            if (await tryRpcQuick(rpc, method, params))
+                return true;
+        }
+    }
+    return false;
+}
+function composeWechatReply(events, ignorePending) {
+    const ignore = new Set((ignorePending ?? []).map(question => question.id));
+    const pendingQuestions = extractPendingQuestions(events).filter(question => !ignore.has(question.id));
+    const visible = usableAssistantText(lastAssistantText(events));
+    if (pendingQuestions.length > 0) {
+        const combined = [visible, formatQuestionForWechat(pendingQuestions)].filter(part => part.length > 0).join('\n\n');
+        return { text: formatWechatPlain(combined), pendingQuestions };
+    }
+    return { text: visible, pendingQuestions };
+}
+async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePending) {
     const deadline = Date.now() + timeoutMs;
-    let last = '';
+    let last = { text: '', pendingQuestions: [] };
     let idleOnce = false;
     while (Date.now() < deadline) {
         let events = [];
@@ -552,23 +898,27 @@ async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs) {
         catch {
             events = [];
         }
+        const composed = composeWechatReply(events, ignorePending);
+        // 旧题（本轮 prompt 前就在的 Selection）不能立刻发回微信；只发新 turn 里新出现的题。
+        if (composed.pendingQuestions.length > 0 && composed.text !== '') {
+            return composed;
+        }
         if (turnIsBlocked(events))
-            return STUCK_ACK;
-        const text = usableAssistantText(lastAssistantText(events));
-        if (text !== '')
-            last = text;
+            return { text: STUCK_ACK, pendingQuestions: [] };
+        if (composed.text !== '')
+            last = composed;
         const idle = turnIsIdle(events);
         if (idle)
             idleOnce = true;
-        if (idle && text !== '' && text !== beforeText)
-            return text;
-        if (idleOnce && text !== '' && text !== beforeText)
-            return text;
+        if (idle && composed.text !== '' && composed.text !== beforeText)
+            return composed;
+        if (idleOnce && composed.text !== '' && composed.text !== beforeText)
+            return composed;
         await sleep(400);
     }
-    if (last !== '' && last !== beforeText)
+    if (last.text !== '' && last.text !== beforeText)
         return last;
-    return STUCK_ACK;
+    return { text: STUCK_ACK, pendingQuestions: [] };
 }
 export async function runHeadlessViaWeb(opts) {
     const env = opts.env ?? process.env;
@@ -585,6 +935,7 @@ export async function runHeadlessViaWeb(opts) {
     const restart = isRestartCommand(text);
     const fresh = isFreshBridgeTurn(opts.task) || restart;
     const store = loadSessionStore(storeFile);
+    const storedPending = restart ? undefined : store.sessions[key]?.pendingQuestions;
     let sessionId = store.sessions[key]?.sessionId;
     const previousId = sessionId;
     if (sessionId !== undefined && !fresh) {
@@ -607,8 +958,6 @@ export async function runHeadlessViaWeb(opts) {
     else {
         await ensureSessionVisible(rpc, sessionId, env, workspaceId, !customRpc);
     }
-    store.sessions[key] = { sessionId, updatedAt: Date.now() };
-    saveSessionStore(storeFile, store);
     const promptText = restart ? RESTART_SEED : text;
     let before = '';
     let events = [];
@@ -619,16 +968,46 @@ export async function runHeadlessViaWeb(opts) {
     catch {
         before = '';
     }
-    if (!turnIsIdle(events) || turnIsBlocked(events)) {
-        await abortSessionTurn(rpc, sessionId);
+    const pending = extractPendingQuestions(events);
+    const questions = pending.length > 0
+        ? pending
+        : (!restart && storedPending !== undefined && storedPending.length > 0 && !historySettledQuestions(events)
+            ? storedPending
+            : []);
+    let skipUserPrompt = false;
+    if (!restart && questions.length > 0) {
+        const choice = parseChoice(text, questions);
+        if (choice !== undefined) {
+            const answered = await tryAnswerPendingQuestion(rpc, sessionId, choice);
+            if (!answered) {
+                await abortSessionTurn(rpc, sessionId);
+                await rpc('session.prompt', {
+                    sessionId,
+                    mode: 'queue',
+                    content: [{ type: 'text', text: `用户在微信选择了：${choice.label}` }],
+                });
+            }
+            skipUserPrompt = true;
+        }
+    }
+    if (!skipUserPrompt) {
+        if (!turnIsIdle(events) || turnIsBlocked(events)) {
+            await abortSessionTurn(rpc, sessionId);
+        }
+        await rpc('session.prompt', {
+            sessionId,
+            mode: 'queue',
+            content: [{ type: 'text', text: promptText }],
+        });
     }
-    await rpc('session.prompt', {
+    const reply = await waitForAssistant(rpc, sessionId, before, timeoutMs, questions);
+    store.sessions[key] = {
         sessionId,
-        mode: 'queue',
-        content: [{ type: 'text', text: promptText }],
-    });
-    const reply = await waitForAssistant(rpc, sessionId, before, timeoutMs);
-    if (restart && (reply === STUCK_ACK || reply === ''))
+        updatedAt: Date.now(),
+        ...(reply.pendingQuestions.length > 0 ? { pendingQuestions: reply.pendingQuestions } : {}),
+    };
+    saveSessionStore(storeFile, store);
+    if (restart && (reply.text === STUCK_ACK || reply.text === ''))
         return RESTART_ACK;
-    return reply;
+    return reply.text;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezti/dsh-rez-wechat",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "ReZ-TI WeChat/WeCom bridges. Personal WeChat is QClaw/ClawBot scan-and-chat via dsh-wechat-bridge; WeCom group send uses wecom-mcp.",
   "type": "module",
   "engines": {
@@ -28,7 +28,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "qrcode": "^1.5.4",
-    "@rezti/dsh-rez-sso": "0.1.7"
+    "@rezti/dsh-rez-sso": "0.1.9"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",