@zaofan/dsh-qqbot 1.1.7 → 1.2.0

package/dist/features/qq-user-questions.d.ts

@@ -9,11 +9,60 @@
  * 形状(@deepseek-ai/dsh-user-questions/types):
  *   request = { questions: [{ id, question, detail?, header?, options?:[{label,...}], multiSelect? }], agent?, signal? }
  *   answer   = { answers: [{ id, selected: string[], custom? }] }
+ *
+ * 2026-09-11 增强(主人需求, 本轮新增):
+ *   ① 按钮 label 带字母前缀(A. / B. / …), 卡片正文列出**全部**选项字母表;
+ *   ② **文字选项兜底**: 待答期间直接回文字也算回答 ——
+ *        回 `A` / `2`            → 选第 1 / 第 2 个选项(字母与序号都认);
+ *        回 `A,C` / `1 3` / `选 1 3` → 多选;
+ *        回选项原文(与某个 label 完全一致) → 选它;
+ *        回**其它任意文字**       → 作为自由回答(custom)透传给 AI(answers[].custom);
+ *   ③ 多问题(questions > 1): 依次发卡, 回答时可用 `#2 B` 指定第 2 问;
+ *   ④ 选项超过按钮上限(QQ 卡片最多 5 行 → 5 个可点按钮)时, 卡片正文照样列全, 靠文字兜底补齐;
+ *   ⑤ 按钮卡片发送失败时不再放弃提问 —— 退化成纯文字选项清单, pending 保留(文字兜底能收答案)。
  */
 import type { ReplyTarget } from '@tencent-connect/qqbot-nodejs';
 import type { QQBotSender } from '../transport/outbound-buffer.js';
 import type { SessionManager } from '../session/index.js';
 import type { Logger } from '../types.js';
+interface PendingItem {
+    qid: string;
+    question: string;
+    header: string;
+    detail: string;
+    opts: Array<{
+        label: string;
+    }>;
+    /** 发起者 openid(群=member_openid, c2c=user_openid); 回调/文字兜底都校验, 防止别人代答 */
+    ownerId: string;
+    /** 是否多选(宿主给的 multiSelect) */
+    multiSelect: boolean;
+    /** 会话键 `scope:peerId`: 文字兜底据此判断"这条消息是不是在回答本问题" */
+    peerKey: string;
+    /** 同批问题共享的组(多问题时按组收集全部答案后统一 resolve) */
+    group: PendingGroup;
+    /** 本问题在该批中的序号(1 起; 文字兜底用 `#2 B` 指定) */
+    index: number;
+    /** 该批问题总数 */
+    total: number;
+    deadlineAt: number;
+}
+/** 一批提问(一次 ask_user_question 的全部问题) —— 全部答完/超时后统一 resolve 宿主 */
+interface PendingGroup {
+    /** 该批问题的 qid 顺序(resolve 时按此顺序出答案) */
+    qids: string[];
+    /** qid → 已收答案 */
+    answers: Map<string, {
+        selected: string[];
+        custom?: string;
+    }>;
+    resolve: (ans: unknown) => void;
+    timer: ReturnType<typeof setTimeout>;
+    /** 该批占用的 pending key(收尾清理用) */
+    keys: string[];
+    signal?: AbortSignal;
+    onAbort?: () => void;
+}
 /** Web 浮层看到的待办提问(去敏) */
 export interface WebPendingQuestion {
     /** 唯一键 = qid:token(web 结算回传用) */
@@ -26,6 +75,26 @@ export interface WebPendingQuestion {
     }>;
     deadlineAt: number;
 }
+/** 文字兜底的解析结果: 命中选项(可能多选) 或 自由文本 */
+export type ParsedQuestionAnswer = {
+    kind: 'option';
+    indices: number[];
+    labels: string[];
+} | {
+    kind: 'custom';
+    text: string;
+};
+/**
+ * 把一条**文字回复**解析成对某问题的答案(2026-09-11 主人定的文字兜底):
+ *   - 先去口语前缀(`选`/`选择`/`选：` 等);
+ *   - 用 `,`/`，`/空格/`、`/`;` 切 token;
+ *   - token 命中规则: ①单个字母 A-Z → 第 N 个选项 ②纯数字 1-26 → 第 N 个选项
+ *     ③与该问题某个选项 label 完全相同(去空白/忽略大小写) → 那个选项;
+ *   - 所有 token 都命中 → option(非多选时只取第一个);
+ *   - 否则(含"自定义:xxx"这类) → custom, 原文透传给 AI。
+ * @returns null = 这条不该当成答案(空文本)
+ */
+export declare function parseQuestionAnswer(raw: string, item: Pick<PendingItem, 'opts' | 'multiSelect'>): ParsedQuestionAnswer | null;
 export declare class QqUserQuestionsController {
     private readonly manager;
     private readonly sender;
@@ -34,18 +103,56 @@ export declare class QqUserQuestionsController {
     private readonly pending;
     constructor(manager: SessionManager, sender: QQBotSender, logger: Logger, timeoutMsProvider: () => number);
     /**
-     * 宿主 user-questions/request 处理器。只 claim"会话可定位 + 第一个问题带选项"的场景;
-     * 其余(无会话/无选项/多问题) → next() 交回宿主(Web UI 或原样)。
+     * 宿主 user-questions/request 处理器。只 claim"会话可定位 + 每个问题都带选项"的场景;
+     * 其余(无会话/无选项/选项过多/问题过多) → next() 交回宿主(Web UI 或原样)。
+     * 多问题时依次发卡, 回答用 `#2 B` 指定; 全部答完或超时后一起回给宿主。
      */
     request(req: {
         questions?: Array<Record<string, unknown>>;
         agent?: unknown;
         signal?: AbortSignal;
     }, next: () => Promise<unknown>): Promise<unknown>;
+    /**
+     * 入站文字兜底(2026-09-11 主人需求): 待答提问期间, 发起者发来的文字也算回答 ——
+     *   命中选项(字母/序号/选项原文, 支持多选) → 选中结算;
+     *   其它文字 → 作为自由回答(custom)透传给 AI。
+     * 非本会话/非发起者/斜杠命令 → 不消费(交回正常入站链)。
+     * @returns true = 消息已被提问逻辑消费(调用方不要再派发给 agent)
+     */
+    handleInbound(msg: {
+        kind?: string;
+        senderId?: string;
+        content?: string;
+        groupOpenid?: string;
+    }, replyTarget: ReplyTarget): Promise<boolean>;
+    /**
+     * 斜杠命令兜底入口(`/答` / `/ans`, 2026-09-11 主人定): 与 handleInbound 同一套解析与结算,
+     * 但**不依赖消息在链上的位置** —— 命令层在 @门控之后、延迟聚合之上就执行完并 ctx.stop。
+     * 为什么必须有它: 裸文字作答在群里被 mentionGate 拦下, 私聊/群消息又被 debounce 聚合层
+     * 直接吞进 agent(那一层自己调 transport.handleInbound, 绕过 message 处理器), 实测无效;
+     * 而以 `/` 开头的消息被 debounce 直放行(见 gateway/debounce.ts), 命令层随即处理。
+     * @returns ok=false 时 msg 是给用户看的提示(命令层原样回执)
+     */
+    answerByText(args: {
+        scope: 'c2c' | 'group';
+        peerId: string;
+        senderId?: string;
+        text: string;
+    }): {
+        ok: boolean;
+        msg: string;
+    };
     /** interaction 回调: data = q:<qid>:<token>:<idx> → 按选项 label 组 answer; 仅发起者本人可答 */
     handleInteraction(event: unknown, replyTarget: ReplyTarget): Promise<boolean>;
-    /** 结算: timedOut/abort → 空答案(selected:[]); answered → 携带选择 */
-    private settle;
+    /** 回执(QQ 直发, 失败不影响结算) */
+    private receipt;
+    /** 结算单个问题: 写进组, 该批全部答完 → 一次交回宿主 */
+    private settleAnswer;
+    /**
+     * 该批提问收尾: 清定时器/监听 + 清理未答项的 pending + 按 qid 顺序组装宿主 answer。
+     * 超时/取消时未答的问题给空答案(selected: []) —— 与宿主原语义一致。
+     */
+    private finishGroup;
     /** Web 浮层拉取待办问题列表 */
     listPendingForWeb(): WebPendingQuestion[];
     /** Web 浮层点选项: key + 选项下标 → 与 QQ 按钮同源结算(先到先得) */
@@ -66,4 +173,20 @@ export declare function decideQuestionByWebAny(key: string, optIdx: number): {
     ns?: string;
     msg: string;
 };
+/**
+ * 斜杠命令(`/答` / `/ans`)的结算入口: 按实例 ns 找到提问控制器 → 把文字当答案结算(2026-09-11 主人定)。
+ * 命令层在 @门控之后、延迟聚合之上执行, 是**唯一可靠**的用户文字作答通道
+ * (裸文字在群里被 mentionGate 拦、私聊被 debounce 聚合层直接吞进 agent, 实测无效)。
+ */
+export declare function answerPendingQuestionByText(args: {
+    ns?: string;
+    scope: 'c2c' | 'group';
+    peerId: string;
+    senderId?: string;
+    text: string;
+}): {
+    ok: boolean;
+    msg: string;
+};
+export {};
 //# sourceMappingURL=qq-user-questions.d.ts.map

package/dist/features/qq-user-questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qq-user-questions.d.ts","sourceRoot":"","sources":["../../src/features/qq-user-questions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAmB1C,wBAAwB;AACxB,MAAM,WAAW,kBAAkB;IACjC,iCAAiC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;CACpB;AA0ED,qBAAa,yBAAyB;IAIlC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;gBAGvC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,MAAM;IAGlD;;;OAGG;IACG,OAAO,CACX,GAAG,EAAE;QAAE,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,EAC1F,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAC3B,OAAO,CAAC,OAAO,CAAC;IAkEnB,kFAAkF;IAC5E,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCnF,6DAA6D;IAC7D,OAAO,CAAC,MAAM;IAWd,qBAAqB;IACrB,iBAAiB,IAAI,kBAAkB,EAAE;IAezC,gDAAgD;IAChD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;IAStE,OAAO,IAAI,IAAI;CAGhB;AAKD,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,yBAAyB,GAAG,SAAS,GAAG,IAAI,CAGrG;AAED,kBAAkB;AAClB,wBAAgB,0BAA0B,IAAI,KAAK,CAAC,kBAAkB,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,CAMvF;AAED,cAAc;AACd,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAM7G"}
+{"version":3,"file":"qq-user-questions.d.ts","sourceRoot":"","sources":["../../src/features/qq-user-questions.ts"],"names":[],"mappings":"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"}

package/dist/features/qq-user-questions.js

@@ -1,30 +1,59 @@
 const BTN_PREFIX = 'q:';
-/** 选项按钮 keyboard(每行1个=竖排, 字宽不截断; QQ 最多5行 → 最多5个选项可见)
+/** 选项字母表(文字兜底按它映射) */
+const LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+/** QQ 卡片按钮上限: 最多 5 行, 每行 1 个选项 → 最多 5 个可点按钮 */
+const CARD_MAX_OPTIONS = 5;
+/** 单个问题的选项上限(超出交回宿主, 不接管) */
+const MAX_OPTIONS = 26;
+/** 单次提问最多接管几个问题(超出交回宿主) */
+const MAX_QUESTIONS = 5;
+/** 选项按钮 keyboard(每行1个=竖排, 字宽不截断; QQ 最多5行 → 最多5个按钮)
+ *  label 带字母前缀(A. xxx) —— 与文字兜底/卡片正文的字母表对齐。
  *  permission: 群聊限定"发起对话者本人"可点(specify_user_ids=ownerId), 防群里其他人替你选 */
-function optionsKeyboard(qid, token, opts, ownerId) {
-    const maxRows = 5;
-    const shown = opts.slice(0, maxRows);
+function optionsKeyboard(item, token, ownerId) {
+    const shown = item.opts.slice(0, CARD_MAX_OPTIONS);
     const permission = ownerId
         ? { type: 0, specify_user_ids: [ownerId] }
         : { type: 2 };
-    const rows = shown.map((opt, idx) => ({
-        buttons: [{
-                id: `${BTN_PREFIX}${qid}:${token}:${idx}`,
-                render_data: {
-                    label: String(opt.label ?? '').slice(0, 24),
-                    visited_label: String(opt.label ?? '').slice(0, 24),
-                    style: 1,
-                },
-                action: {
-                    type: 1,
-                    permission,
-                    data: `${BTN_PREFIX}${qid}:${token}:${idx}`,
-                    unsupport_tips: '请直接回复选项文字',
-                },
-            }],
-    }));
+    const rows = shown.map((opt, idx) => {
+        const label = `${LETTERS[idx] ?? String(idx + 1)}. ${String(opt.label ?? '')}`.slice(0, 24);
+        return {
+            buttons: [{
+                    id: `${BTN_PREFIX}${item.qid}:${token}:${idx}`,
+                    render_data: { label, visited_label: label, style: 1 },
+                    action: {
+                        type: 1,
+                        permission,
+                        data: `${BTN_PREFIX}${item.qid}:${token}:${idx}`,
+                        unsupport_tips: '按钮不可用时, 发 /答 A (或 /答 你的回答)',
+                    },
+                }],
+        };
+    });
     return { content: { rows } };
 }
+/** 选项字母表(卡片正文用): `A. xxx` 一行一个, 列全 */
+function optionsLines(opts, from = 0) {
+    return opts.map((o, i) => `${LETTERS[i] ?? String(i + 1)}. ${String(o?.label ?? '')}`).slice(from);
+}
+/** 卡片/文字提示的正文 */
+function promptOf(item, timeoutMs, forCard) {
+    const header = item.header ? `**${item.header}**\n\n` : '';
+    const detail = item.detail ? `\n\n${item.detail}` : '';
+    const seq = item.total > 1 ? `（第 ${item.index}/${item.total} 问）` : '';
+    const ask = `${header}❓ **${item.question}**${seq}${detail}`;
+    const list = optionsLines(item.opts).map((l) => `  ${l}`).join('\n');
+    const point = forCard && item.opts.length <= CARD_MAX_OPTIONS
+        ? `⏱ ${Math.ceil(timeoutMs / 1000)} 秒内点下方按钮回答：`
+        : `⏱ ${Math.ceil(timeoutMs / 1000)} 秒内回答：`;
+    const tips = [
+        `按钮点不动或想自己打字时, 用斜杠回答: \`/答 ${LETTERS[0] ?? 'A'}\`` + (item.multiSelect ? '（多选 `/答 A,C`）' : ''),
+        item.total > 1 ? `多个提问并存用 \`/答 #${item.index} 你的选择\`` : '',
+        item.opts.length > CARD_MAX_OPTIONS ? `选项超过 ${CARD_MAX_OPTIONS} 个, 第 ${CARD_MAX_OPTIONS + 1} 个起请用 \`/答 字母\` 选择` : '',
+        '想自由回答: `/答 你的话`（原样转给 AI）',
+    ].filter(Boolean).join('；');
+    return `${ask}\n\n${list}\n\n${point}\n（${tips}）`;
+}
 /**
  * 解析"这张提问卡片该谁回答"(按钮 permission.type=0 + specify_user_ids 显式指定人):
  *  ① 本次提问的 question/header 文本里的 <@openid> —— 工具输入直接写明 id 指定(优先级最高)
@@ -77,6 +106,54 @@ function resolveCardOwner(record, inlineText) {
     catch { /* 解析失败回落 */ }
     return record.senderId;
 }
+/**
+ * 把一条**文字回复**解析成对某问题的答案(2026-09-11 主人定的文字兜底):
+ *   - 先去口语前缀(`选`/`选择`/`选：` 等);
+ *   - 用 `,`/`，`/空格/`、`/`;` 切 token;
+ *   - token 命中规则: ①单个字母 A-Z → 第 N 个选项 ②纯数字 1-26 → 第 N 个选项
+ *     ③与该问题某个选项 label 完全相同(去空白/忽略大小写) → 那个选项;
+ *   - 所有 token 都命中 → option(非多选时只取第一个);
+ *   - 否则(含"自定义:xxx"这类) → custom, 原文透传给 AI。
+ * @returns null = 这条不该当成答案(空文本)
+ */
+export function parseQuestionAnswer(raw, item) {
+    const text = String(raw ?? '').trim();
+    if (text === '')
+        return null;
+    const body = text.replace(/^(选|选择|选择：|选：|答|答案[:：]?)\s*/u, '').trim();
+    const tokens = body.split(/[,，、;；\s]+/u).filter((t) => t !== '');
+    if (tokens.length === 0)
+        return null;
+    const idxOf = (tok) => {
+        const up = tok.toUpperCase();
+        // ① 单个字母: A=0, B=1 ...
+        if (/^[A-Z]$/u.test(up)) {
+            const i = LETTERS.indexOf(up);
+            return i >= 0 && i < item.opts.length ? i : null;
+        }
+        // ② 纯数字: 1=0, 2=1 ...
+        if (/^\d{1,2}$/u.test(tok)) {
+            const n = Number(tok);
+            return n >= 1 && n <= item.opts.length ? n - 1 : null;
+        }
+        // ③ 与选项文字完全相同
+        const norm = (s) => s.replace(/\s+/gu, '').toLowerCase();
+        const i = item.opts.findIndex((o) => norm(String(o?.label ?? '')) === norm(tok));
+        return i >= 0 ? i : null;
+    };
+    const indices = [];
+    for (const tok of tokens) {
+        const i = idxOf(tok);
+        if (i === null)
+            return { kind: 'custom', text }; // 有任何一个 token 不命中 → 整条当自由文本
+        if (!indices.includes(i))
+            indices.push(i);
+    }
+    if (indices.length === 0)
+        return { kind: 'custom', text };
+    const picked = item.multiSelect ? indices : [indices[0]];
+    return { kind: 'option', indices: picked, labels: picked.map((i) => String(item.opts[i]?.label ?? '')) };
+}
 export class QqUserQuestionsController {
     manager;
     sender;
@@ -90,73 +167,190 @@ export class QqUserQuestionsController {
         this.timeoutMsProvider = timeoutMsProvider;
     }
     /**
-     * 宿主 user-questions/request 处理器。只 claim"会话可定位 + 第一个问题带选项"的场景;
-     * 其余(无会话/无选项/多问题) → next() 交回宿主(Web UI 或原样)。
+     * 宿主 user-questions/request 处理器。只 claim"会话可定位 + 每个问题都带选项"的场景;
+     * 其余(无会话/无选项/选项过多/问题过多) → next() 交回宿主(Web UI 或原样)。
+     * 多问题时依次发卡, 回答用 `#2 B` 指定; 全部答完或超时后一起回给宿主。
      */
     async request(req, next) {
         const record = this.manager.findByAgent(req.agent);
         if (!record)
             return next();
         const questions = Array.isArray(req.questions) ? req.questions : [];
-        if (questions.length === 0)
+        if (questions.length === 0 || questions.length > MAX_QUESTIONS)
             return next();
-        const q = questions[0];
-        const qid = String(q?.id ?? '');
-        const opts = Array.isArray(q?.options) ? q.options : [];
-        if (!qid || opts.length === 0 || opts.length > 25)
+        const parsed = questions.map((q) => {
+            const raw = q;
+            return {
+                qid: String(raw?.id ?? ''),
+                question: String(raw?.question ?? ''),
+                header: String(raw?.header ?? ''),
+                detail: String(raw?.detail ?? ''),
+                multiSelect: raw?.multiSelect === true,
+                opts: (Array.isArray(raw?.options) ? raw.options : []).map((o) => ({ label: String(o?.label ?? '') })),
+            };
+        });
+        // 只有"每个问题都有选项且不超过上限"才接管 —— 否则答案形状与宿主期望不符, 交回 Web UI 更稳
+        if (parsed.some((q) => q.qid === '' || q.opts.length === 0 || q.opts.length > MAX_OPTIONS))
             return next();
         const timeoutMs = Math.max(5000, this.timeoutMsProvider() || 120000);
         const token = Math.random().toString(36).slice(2, 8);
-        const key = `${qid}:${token}`;
-        const headerRaw = String(q?.header ?? '');
-        const detailRaw = String(q?.detail ?? '');
-        const questionRaw = String(q?.question ?? '');
+        const peerKey = `${record.replyTarget.scope}:${record.replyTarget.targetId}`;
         // 卡片可点人: 从最近真人消息解析——被点名的最后一人(@)优先, 其次消息发送者壳, 回落会话发起者
         // (修复: 主人让 bot 问群友时, 卡片应绑被问者而不是 bot/主人, 否则被问者点卡片=无权限)
-        const owner = resolveCardOwner(record, headerRaw + ' ' + questionRaw);
-        // 先注册 pending(防按钮回调先于 Promise 建立到达)
+        const owner = resolveCardOwner(record, parsed.map((q) => `${q.header} ${q.question}`).join(' '));
+        // 先注册 pending(防按钮回调/文字回复先于 Promise 建立到达)
         let resolver = () => undefined;
         const answer = new Promise((resolve) => { resolver = resolve; });
-        const item = {
-            qid, question: questionRaw, header: headerRaw, detail: detailRaw,
-            opts: opts.map((o) => ({ label: String(o?.label ?? '') })),
-            ownerId: owner,
-            deadlineAt: Date.now() + timeoutMs,
-            resolve: resolver, timer: setTimeout(() => this.settle(key, true), timeoutMs),
+        const group = {
+            qids: parsed.map((q) => q.qid),
+            answers: new Map(),
+            resolve: resolver,
+            timer: setTimeout(() => this.finishGroup(group), timeoutMs),
+            keys: [],
             signal: req.signal,
         };
         if (req.signal) {
-            item.onAbort = () => this.settle(key, true);
+            group.onAbort = () => this.finishGroup(group);
             try {
-                req.signal.addEventListener('abort', item.onAbort, { once: true });
+                req.signal.addEventListener('abort', group.onAbort, { once: true });
             }
             catch { /* ignore */ }
         }
-        this.pending.set(key, item);
-        const header = headerRaw ? `**${headerRaw}**\n\n` : '';
-        const detail = detailRaw ? `\n\n${detailRaw}` : '';
-        const prompt = `${header}❓ **${questionRaw}**${detail}\n\n⏱ ${Math.ceil(timeoutMs / 1000)} 秒内点下方按钮回答：`;
-        try {
-            await this.sender.sendMarkdownWithKeyboard(record.replyTarget, prompt, optionsKeyboard(qid, token, opts, owner));
-            this.logger.info(`QQ question sent: qid=${qid} opts=${opts.length}`);
-        }
-        catch (err) {
-            this.logger.warn(`QQ question card failed: ${err instanceof Error ? err.message : String(err)}`);
-            // 卡片不可用 → 文本列选项, 不 claim(回复走正常入站, agent 自己取答案)
-            const lines = [`❓ ${questionRaw}`, '', ...opts.map((o, i) => `${i + 1}. ${o?.label ?? ''}`), '', '（直接回复序号或内容）'];
+        const items = parsed.map((q, i) => {
+            const key = `${q.qid}:${token}`;
+            const item = {
+                qid: q.qid, question: q.question, header: q.header, detail: q.detail,
+                opts: q.opts, ownerId: owner, multiSelect: q.multiSelect,
+                peerKey, group, index: i + 1, total: parsed.length,
+                deadlineAt: Date.now() + timeoutMs,
+            };
+            group.keys.push(key);
+            this.pending.set(key, item);
+            return item;
+        });
+        // 依次发卡(多问题 = 多张卡, 各自带序号与字母表)
+        for (const item of items) {
             try {
-                await this.sender.sendMarkdown(record.replyTarget, lines.join('\n'));
+                await this.sender.sendMarkdownWithKeyboard(record.replyTarget, promptOf(item, timeoutMs, true), optionsKeyboard(item, token, owner));
+                this.logger.info(`QQ question sent: qid=${item.qid} opts=${item.opts.length} (${item.index}/${item.total})`);
             }
-            catch (err2) {
-                // QQ 文本降级也失败(限频/网络)≠ 提问结束: 保留 pending 供 Web 浮层兜底,
-                // 不要 settle —— 否则 QQ 没送达时 web 也看不到。
-                this.logger.error(`QQ question fallback text failed: ${err2 instanceof Error ? err2.message : String(err2)} (qid=${qid}, web 浮层可兜底)`);
-                return answer;
+            catch (err) {
+                this.logger.warn(`QQ question card failed: ${err instanceof Error ? err.message : String(err)}`);
+                // 卡片不可用 → 发纯文字选项清单; **保留 pending**(文字兜底能收答案, 不再像以前那样直接放弃)
+                try {
+                    await this.sender.sendMarkdown(record.replyTarget, promptOf(item, timeoutMs, false));
+                }
+                catch (err2) {
+                    // 连文字都发不出去(限频/网络) ≠ 提问结束: 保留 pending 供 Web 浮层兜底
+                    this.logger.error(`QQ question fallback text failed: ${err2 instanceof Error ? err2.message : String(err2)} (qid=${item.qid}, web 浮层可兜底)`);
+                }
             }
-            this.settle(key, true);
         }
         return answer;
     }
+    /**
+     * 入站文字兜底(2026-09-11 主人需求): 待答提问期间, 发起者发来的文字也算回答 ——
+     *   命中选项(字母/序号/选项原文, 支持多选) → 选中结算;
+     *   其它文字 → 作为自由回答(custom)透传给 AI。
+     * 非本会话/非发起者/斜杠命令 → 不消费(交回正常入站链)。
+     * @returns true = 消息已被提问逻辑消费(调用方不要再派发给 agent)
+     */
+    async handleInbound(msg, replyTarget) {
+        const scope = msg.kind === 'group' ? 'group' : 'c2c';
+        const peerId = scope === 'group' ? (msg.groupOpenid ?? msg.senderId ?? '') : (msg.senderId ?? '');
+        const peerKey = `${scope}:${peerId}`;
+        const text = String(msg.content ?? '').trim();
+        if (text === '' || text.startsWith('/'))
+            return false;
+        const items = [...this.pending.values()].filter((p) => p.peerKey === peerKey);
+        if (items.length === 0)
+            return false;
+        // 只认"卡片指定的那个人"的回答(与按钮回调同一判据); 别人说话照常进 agent
+        const sender = String(msg.senderId ?? '');
+        const owner = items[0].ownerId;
+        if (owner && sender && sender !== owner)
+            return false;
+        // 目标是哪一问: `#2 xxx` 指定第 2 问; 否则取序号最小的未答问题
+        let target;
+        let body = text;
+        const seq = /^#\s*(\d{1,2})\s*([\s\S]*)$/u.exec(text);
+        if (seq) {
+            const want = Number(seq[1]);
+            body = String(seq[2] ?? '').trim();
+            target = items.find((p) => p.index === want);
+            if (!target)
+                return false;
+            if (body === '')
+                return false;
+        }
+        else {
+            target = items.slice().sort((a, b) => a.index - b.index)[0];
+        }
+        if (!target)
+            return false;
+        const parsedAnswer = parseQuestionAnswer(body, target);
+        if (!parsedAnswer)
+            return false;
+        if (parsedAnswer.kind === 'option') {
+            await this.receipt(replyTarget, `已选择：${parsedAnswer.labels.join(' / ')}`);
+            this.settleAnswer(target, { selected: parsedAnswer.labels });
+        }
+        else {
+            await this.receipt(replyTarget, `已回复：${parsedAnswer.text}`);
+            this.settleAnswer(target, { selected: [], custom: parsedAnswer.text });
+        }
+        return true;
+    }
+    /**
+     * 斜杠命令兜底入口(`/答` / `/ans`, 2026-09-11 主人定): 与 handleInbound 同一套解析与结算,
+     * 但**不依赖消息在链上的位置** —— 命令层在 @门控之后、延迟聚合之上就执行完并 ctx.stop。
+     * 为什么必须有它: 裸文字作答在群里被 mentionGate 拦下, 私聊/群消息又被 debounce 聚合层
+     * 直接吞进 agent(那一层自己调 transport.handleInbound, 绕过 message 处理器), 实测无效;
+     * 而以 `/` 开头的消息被 debounce 直放行(见 gateway/debounce.ts), 命令层随即处理。
+     * @returns ok=false 时 msg 是给用户看的提示(命令层原样回执)
+     */
+    answerByText(args) {
+        const peerKey = `${args.scope}:${args.peerId}`;
+        const raw = String(args.text ?? '').trim();
+        if (raw === '')
+            return { ok: false, msg: '没看到回答内容' };
+        const items = [...this.pending.values()].filter((p) => p.peerKey === peerKey);
+        if (items.length === 0)
+            return { ok: false, msg: '当前没有待回答的提问(可能已超时或被撤回)。' };
+        // 只认卡片指定的那个人(与按钮回调、文字兜底同一判据)
+        const sender = String(args.senderId ?? '');
+        const owner = items[0].ownerId;
+        if (owner && sender && sender !== owner)
+            return { ok: false, msg: '这个问题不是问你的哦~' };
+        // `#2 xxx` 指定第 2 问; 否则取序号最小的未答项
+        let target;
+        let body = raw;
+        const seq = /^#\s*(\d{1,2})\s*([\s\S]*)$/u.exec(raw);
+        if (seq) {
+            const want = Number(seq[1]);
+            body = String(seq[2] ?? '').trim();
+            target = items.find((p) => p.index === want);
+            if (!target)
+                return { ok: false, msg: `没有第 ${want} 个待答提问(当前共 ${items.length} 个)。` };
+            if (body === '')
+                return { ok: false, msg: '请在 #N 后面写上你的选择' };
+        }
+        else {
+            target = items.slice().sort((a, b) => a.index - b.index)[0];
+        }
+        if (!target)
+            return { ok: false, msg: '当前没有待回答的提问。' };
+        const parsedAnswer = parseQuestionAnswer(body, target);
+        if (!parsedAnswer)
+            return { ok: false, msg: '没看到回答内容' };
+        const head = target.total > 1 ? `第 ${target.index}/${target.total} 问：` : '';
+        if (parsedAnswer.kind === 'option') {
+            this.settleAnswer(target, { selected: parsedAnswer.labels });
+            return { ok: true, msg: `${head}已选择：${parsedAnswer.labels.join(' / ')}` };
+        }
+        this.settleAnswer(target, { selected: [], custom: parsedAnswer.text });
+        return { ok: true, msg: `${head}已回复：${parsedAnswer.text}` };
+    }
     /** interaction 回调: data = q:<qid>:<token>:<idx> → 按选项 label 组 answer; 仅发起者本人可答 */
     async handleInteraction(event, replyTarget) {
         const e = event;
@@ -191,23 +385,54 @@ export class QqUserQuestionsController {
             this.sender.sendMarkdown(replyTarget, `已选择：${label}`).catch(() => undefined);
         }
         catch { /* ignore */ }
-        this.settle(key, false, { answers: [{ id: item.qid, selected: [label] }] });
+        this.settleAnswer(item, { selected: [label] });
         return true;
     }
-    /** 结算: timedOut/abort → 空答案(selected:[]); answered → 携带选择 */
-    settle(key, empty, value) {
-        const item = this.pending.get(key);
-        if (!item)
-            return;
-        this.pending.delete(key);
-        clearTimeout(item.timer);
-        if (item.signal && item.onAbort) {
+    /** 回执(QQ 直发, 失败不影响结算) */
+    async receipt(replyTarget, text) {
+        try {
+            await this.sender.sendMarkdown(replyTarget, text);
+        }
+        catch { /* ignore */ }
+    }
+    /** 结算单个问题: 写进组, 该批全部答完 → 一次交回宿主 */
+    settleAnswer(item, ans) {
+        for (const [k, v] of this.pending) {
+            if (v === item) {
+                this.pending.delete(k);
+                break;
+            }
+        }
+        const group = item.group;
+        group.answers.set(item.qid, ans);
+        if (group.answers.size >= group.qids.length)
+            this.finishGroup(group);
+    }
+    /**
+     * 该批提问收尾: 清定时器/监听 + 清理未答项的 pending + 按 qid 顺序组装宿主 answer。
+     * 超时/取消时未答的问题给空答案(selected: []) —— 与宿主原语义一致。
+     */
+    finishGroup(group) {
+        clearTimeout(group.timer);
+        if (group.signal && group.onAbort) {
             try {
-                item.signal.removeEventListener('abort', item.onAbort);
+                group.signal.removeEventListener('abort', group.onAbort);
             }
             catch { /* ignore */ }
         }
-        item.resolve(empty ? { answers: [{ id: item.qid, selected: [] }] } : value);
+        for (const [k, v] of [...this.pending]) {
+            if (v.group === group)
+                this.pending.delete(k);
+        }
+        const answers = group.qids.map((qid) => {
+            const a = group.answers.get(qid);
+            if (!a)
+                return { id: qid, selected: [] };
+            return a.custom === undefined
+                ? { id: qid, selected: a.selected }
+                : { id: qid, selected: a.selected, custom: a.custom };
+        });
+        group.resolve({ answers });
     }
     /** Web 浮层拉取待办问题列表 */
     listPendingForWeb() {
@@ -232,12 +457,13 @@ export class QqUserQuestionsController {
         const label = item.opts[optIdx]?.label;
         if (!label)
             return { ok: false, msg: '无效选项' };
-        this.settle(key, false, { answers: [{ id: item.qid, selected: [label] }] });
+        this.settleAnswer(item, { selected: [label] });
         return { ok: true, msg: `已选择：${label}` };
     }
     dispose() {
-        for (const key of [...this.pending.keys()])
-            this.settle(key, true);
+        for (const group of new Set([...this.pending.values()].map((p) => p.group))) {
+            this.finishGroup(group);
+        }
     }
 }
 // ── 按实例(ns)注册的提问控制器注册表 —— Web 提问浮层(settings-host 同源路由)经此读写 ──
@@ -266,4 +492,18 @@ export function decideQuestionByWebAny(key, optIdx) {
     }
     return { ok: false, msg: '该问题不存在或已过期' };
 }
+/**
+ * 斜杠命令(`/答` / `/ans`)的结算入口: 按实例 ns 找到提问控制器 → 把文字当答案结算(2026-09-11 主人定)。
+ * 命令层在 @门控之后、延迟聚合之上执行, 是**唯一可靠**的用户文字作答通道
+ * (裸文字在群里被 mentionGate 拦、私聊被 debounce 聚合层直接吞进 agent, 实测无效)。
+ */
+export function answerPendingQuestionByText(args) {
+    const ns = String(args.ns ?? '').trim();
+    const c = ns !== ''
+        ? questionControllers.get(ns)
+        : (questionControllers.size === 1 ? [...questionControllers.values()][0] : undefined);
+    if (!c)
+        return { ok: false, msg: `提问控制器未注册(ns=${ns || '(未指定)'})` };
+    return c.answerByText({ scope: args.scope, peerId: args.peerId, senderId: args.senderId, text: args.text });
+}
 //# sourceMappingURL=qq-user-questions.js.map