@wu529778790/open-im 1.11.2-beta.23 → 1.11.2-beta.25

package/dist/index.js

@@ -159,32 +159,30 @@ function getEnabledPlugins() {
 /**
  * 统一通知格式模板
  * 所有发送给 IM 的通知都使用这个格式，保持一致性
+ * 注意：ClawBot/微信不支持 \n 换行，使用 | 分隔
  */
 function buildNotification(opts) {
-    const lines = [];
-    // 标题行
-    lines.push(`${opts.emoji} ${opts.title}`);
-    // 详情行
-    const details = [];
+    const parts = [];
+    // 标题
+    parts.push(`${opts.emoji} ${opts.title}`);
+    // 详情
     if (opts.platform)
-        details.push(`📱 平台: ${opts.platform}`);
+        parts.push(`📱 ${opts.platform}`);
     if (opts.aiCommand)
-        details.push(`🤖 AI: ${opts.aiCommand}`);
+        parts.push(`🤖 ${opts.aiCommand}`);
     if (opts.dir)
-        details.push(`📁 目录: ${opts.dir}`);
+        parts.push(`📁 ${opts.dir}`);
     const plugins = getEnabledPlugins();
     if (plugins.length > 0)
-        details.push(`🧩 插件: ${plugins.join(", ")}`);
+        parts.push(`🧩 ${plugins.join(", ")}`);
     if (opts.uptime)
-        details.push(`⏱️ 运行: ${opts.uptime}`);
-    if (details.length > 0) {
-        lines.push("", ...details);
-    }
+        parts.push(`⏱️ ${opts.uptime}`);
     // 额外信息
     if (opts.extra?.length) {
-        lines.push("", ...opts.extra);
+        parts.push(...opts.extra);
     }
-    return lines.join("\n");
+    // 使用 | 分隔（ClawBot/微信不支持 \n）
+    return parts.join(" | ");
 }
 function buildStartupMessage(platform, appVersion, aiCommand, defaultWorkDir, sessionManager) {
     let sessionDir;

package/dist/shared/choice-detector.d.ts

@@ -0,0 +1,35 @@
+/**
+ * 选择检测器 — 从 AI 输出中检测并提取编号选项
+ *
+ * 当 AI 问"请选择 1/2/3"时，提取选项并返回结构化数据。
+ */
+export interface DetectedChoice {
+    number: number;
+    text: string;
+}
+export interface DetectionResult {
+    /** 是否检测到选择 */
+    hasChoices: boolean;
+    /** 提取的选项列表 */
+    choices: DetectedChoice[];
+    /** 去除选项后的纯文本（用于显示） */
+    cleanText: string;
+}
+/**
+ * 检测 AI 输出中的编号选择
+ *
+ * 支持格式：
+ * - "1. Option A\n2. Option B\n3. Option C"
+ * - "1）Option A\n2）Option B"
+ * - "**选择 1：** Option A"
+ */
+export declare function detectChoices(text: string): DetectionResult;
+/**
+ * 构建 Telegram inline keyboard
+ */
+export declare function buildChoiceKeyboard(choices: DetectedChoice[], userId: string): {
+    inline_keyboard: Array<Array<{
+        text: string;
+        callback_data: string;
+    }>>;
+};

package/dist/shared/choice-detector.js

@@ -0,0 +1,58 @@
+/**
+ * 选择检测器 — 从 AI 输出中检测并提取编号选项
+ *
+ * 当 AI 问"请选择 1/2/3"时，提取选项并返回结构化数据。
+ */
+/**
+ * 检测 AI 输出中的编号选择
+ *
+ * 支持格式：
+ * - "1. Option A\n2. Option B\n3. Option C"
+ * - "1）Option A\n2）Option B"
+ * - "**选择 1：** Option A"
+ */
+export function detectChoices(text) {
+    // 匹配 "1." 或 "1）" 或 "1:" 开头的行
+    const choicePattern = /^\s*(\d+)[.）:]\s*(.+)$/gm;
+    const matches = [];
+    let match;
+    while ((match = choicePattern.exec(text)) !== null) {
+        const num = parseInt(match[1], 10);
+        const content = match[2].trim();
+        if (num >= 1 && num <= 9 && content.length > 0) {
+            matches.push({ number: num, text: content });
+        }
+    }
+    // 检查是否有选择提示（如"请选择"、"选择哪个"等）
+    const hasChoicePrompt = /请选择|选择哪个|选一个|pick|choose|select/i.test(text);
+    // 至少需要 2 个选项且有选择提示
+    const hasChoices = matches.length >= 2 && hasChoicePrompt;
+    if (!hasChoices) {
+        return { hasChoices: false, choices: [], cleanText: text };
+    }
+    // 去除选项行，保留其他内容
+    const lines = text.split('\n');
+    const cleanLines = lines.filter(line => {
+        const trimmed = line.trim();
+        return !/^\s*\d+[.）:]\s*.+/.test(trimmed);
+    });
+    return {
+        hasChoices: true,
+        choices: matches,
+        cleanText: cleanLines.join('\n').trim(),
+    };
+}
+/**
+ * 构建 Telegram inline keyboard
+ */
+export function buildChoiceKeyboard(choices, userId) {
+    const buttons = [];
+    // 每行 1 个按钮（选项通常较长）
+    for (const choice of choices) {
+        buttons.push([{
+                text: `${choice.number}. ${choice.text}`,
+                callback_data: `choice:${userId}:${choice.number}`,
+            }]);
+    }
+    return { inline_keyboard: buttons };
+}

package/dist/telegram/event-handler.js

@@ -310,6 +310,36 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
                 await ctx.answerCbQuery("任务已完成或不存在");
             }
         }
+        // 处理选择回调
+        if (data.startsWith("choice:")) {
+            const parts = data.split(":");
+            if (parts.length >= 3) {
+                const choiceNum = parts[2];
+                const chatId = String(ctx.chat?.id ?? "");
+                // 将用户选择作为消息发送给 AI
+                const { handleTextFlow } = await import("../platform/handle-text-flow.js");
+                await handleTextFlow({
+                    platform: "telegram",
+                    userId,
+                    chatId,
+                    text: choiceNum,
+                    ctx: createPlatformEventContext({
+                        platform: "telegram",
+                        allowedUserIds: config.telegramAllowedUserIds,
+                        config,
+                        sessionManager,
+                        sender: { sendTextReply: async () => { } },
+                    }),
+                    handleAIRequest: async () => { },
+                    sendTextReply: async (c, t) => {
+                        await sendTextReply(c, t);
+                    },
+                    workDir: sessionManager.getWorkDir(userId),
+                    convId: sessionManager.getConvId(userId),
+                });
+                await ctx.answerCbQuery(`已选择 ${choiceNum}`);
+            }
+        }
     });
     bot.on(message("text"), async (tgCtx) => {
         try {

package/dist/telegram/message-sender.js

@@ -7,6 +7,7 @@ import { buildMessageTitle, OPEN_IM_SYSTEM_TITLE } from "../shared/message-title
 import { buildTextNote } from "../shared/message-note.js";
 import { MAX_TELEGRAM_MESSAGE_LENGTH } from "../constants.js";
 import { listDirectories, buildDirectoryKeyboard, } from "../commands/handler.js";
+import { detectChoices, buildChoiceKeyboard } from "../shared/choice-detector.js";
 const log = createLogger("TgSender");
 const lastSentByMsg = new Map();
 // Periodic cleanup of orphaned entries (entries not cleaned by done/error)
@@ -121,13 +122,31 @@ export async function sendTextReply(chatId, text) {
     const bot = getBot();
     try {
         const formatted = formatMessage(text, "done", undefined, OPEN_IM_SYSTEM_TITLE);
-        // 尝试 Markdown 模式，如果失败则回退到纯文本
-        try {
-            await bot.telegram.sendMessage(Number(chatId), formatted, { parse_mode: "Markdown" });
+        // 检测是否有编号选择
+        const detection = detectChoices(text);
+        if (detection.hasChoices) {
+            // 有选择：发送纯文本 + 按钮
+            const keyboard = buildChoiceKeyboard(detection.choices, chatId);
+            try {
+                await bot.telegram.sendMessage(Number(chatId), detection.cleanText || formatted, {
+                    parse_mode: "Markdown",
+                    reply_markup: keyboard,
+                });
+            }
+            catch {
+                await bot.telegram.sendMessage(Number(chatId), detection.cleanText || formatted, {
+                    reply_markup: keyboard,
+                });
+            }
         }
-        catch {
-            // Markdown 解析失败，回退到纯文本
-            await bot.telegram.sendMessage(Number(chatId), formatted);
+        else {
+            // 无选择：普通消息
+            try {
+                await bot.telegram.sendMessage(Number(chatId), formatted, { parse_mode: "Markdown" });
+            }
+            catch {
+                await bot.telegram.sendMessage(Number(chatId), formatted);
+            }
         }
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.11.2-beta.23",
+  "version": "1.11.2-beta.25",
   "description": "Your AI coding assistant, in every chat app. Multi-platform IM bridge for Claude Code, Codex, and CodeBuddy.",
   "type": "module",
   "main": "dist/index.js",