@izhimu/qq 0.2.0 → 0.2.2

package/dist/src/adapters/message.js

@@ -5,6 +5,7 @@
  */
 import { Logger as log, extractImageUrl, getEmojiForFaceId } from '../utils/index.js';
 import { CQCodeUtils } from '../utils/cqcode.js';
+import { getMsg } from "../core/request.js";
 // =============================================================================
 // CQ Code Parsing
 // =============================================================================
@@ -64,7 +65,7 @@ function parseJsonSegment(segment) {
 // =============================================================================
 // NapCat -> OpenClaw Adapters (Inbound)
 // =============================================================================
-function napCatToOpenClaw(segment) {
+async function napCatToOpenClaw(segment) {
     const data = segment.data;
     switch (segment.type) {
         case 'text':
@@ -80,7 +81,19 @@ function napCatToOpenClaw(segment) {
             return url ? { type: 'image', url, summary: data.summary } : null;
         }
         case 'reply':
-            return { type: 'reply', messageId: String(data.id || '') };
+            const response = await getMsg({
+                message_id: Number(data.id),
+            });
+            if (response.data?.message == undefined) {
+                return null;
+            }
+            return {
+                type: 'reply',
+                messageId: String(data.id),
+                message: response.data.raw_message,
+                senderId: String(response.data.sender.user_id),
+                sender: response.data.sender.nickname
+            };
         case 'face':
             return { type: 'text', text: getEmojiForFaceId(String(data.id || '')) };
         case 'record':
@@ -143,7 +156,7 @@ export async function napCatToOpenClawMessage(segments) {
     const normalized = normalizeMessage(segments);
     const content = [];
     for (const segment of normalized) {
-        const result = napCatToOpenClaw(segment);
+        const result = await napCatToOpenClaw(segment);
         if (result) {
             content.push(result);
         }

package/dist/src/channel.d.ts

@@ -2,6 +2,6 @@
  * QQ NapCat Plugin for OpenClaw
  * Main plugin entry point
  */
-import type { ChannelPlugin } from "openclaw/plugin-sdk";
+import { ChannelPlugin } from "openclaw/plugin-sdk";
 import type { QQConfig } from "./types/index.js";
 export declare const qqPlugin: ChannelPlugin<QQConfig>;

package/dist/src/channel.js

@@ -2,6 +2,7 @@
  * QQ NapCat Plugin for OpenClaw
  * Main plugin entry point
  */
+import { setAccountEnabledInConfigSection, deleteAccountFromConfigSection } from "openclaw/plugin-sdk";
 import { buildChannelConfigSchema, DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk";
 import { messageIdToString, getFileType, getFileName, Logger as log } from "./utils/index.js";
 import { setContext, setContextStatus, clearContext, setConnection, getConnection, clearConnection } from "./core/runtime.js";
@@ -18,6 +19,7 @@ export const qqPlugin = {
         selectionLabel: "QQ",
         docsPath: "/channels/qq",
         blurb: "通过 NapCat WebSocket 连接 QQ 机器人",
+        quickstartAllowFrom: true,
     },
     capabilities: {
         chatTypes: ["direct", "group"],
@@ -33,6 +35,18 @@ export const qqPlugin = {
         resolveAccount: (cfg) => resolveQQAccount({ cfg }),
         isEnabled: (account) => Boolean(account?.enabled),
         isConfigured: (account) => Boolean(account?.wsUrl),
+        setAccountEnabled: ({ cfg, accountId, enabled }) => setAccountEnabledInConfigSection({
+            cfg,
+            sectionKey: "qq",
+            accountId,
+            enabled,
+            allowTopLevel: true,
+        }),
+        deleteAccount: ({ cfg, accountId }) => deleteAccountFromConfigSection({
+            cfg,
+            sectionKey: "qq",
+            accountId,
+        }),
     },
     configSchema: buildChannelConfigSchema(QQConfigSchema),
     messaging: {

package/dist/src/core/dispatch.js

@@ -3,7 +3,7 @@
  * Handles routing and dispatching incoming messages to the AI
  */
 import { getRuntime, getContext } from './runtime.js';
-import { getMsg, getFile, sendMsg, setInputStatus } from './request.js';
+import { getFile, sendMsg, setInputStatus } from './request.js';
 import { napCatToOpenClawMessage } from '../adapters/message.js';
 import { Logger as log, markdownToText } from '../utils/index.js';
 import { CHANNEL_ID } from "./config.js";
@@ -14,19 +14,23 @@ import { CHANNEL_ID } from "./config.js";
  */
 async function contentToPlainText(content) {
     return content
-        .filter(c => c.type !== 'reply' && c.type !== 'image' && c.type !== 'audio' && c.type !== 'file')
+        .filter(c => c.type !== 'image' && c.type !== 'audio' && c.type !== 'file')
         .map((c) => {
         switch (c.type) {
             case 'text':
-                return `[消息]\n${c.text}`;
+                return `${c.text}`;
             case 'at':
                 return c.isAll ? '@全体成员' : `@${c.userId}`;
             case 'json':
                 return `[JSON]\n\`\`\`json\n${c.data}\n\`\`\``;
+            case 'reply':
+                let replyContent = `${c.sender}(${c.senderId}):\n${c.message}`;
+                replyContent = replyContent.split('\n').map(line => `> ${line}`).join('\n');
+                return `[回复]\n${replyContent}\n`;
             default:
                 return '';
         }
-    }).join('');
+    }).join('\n');
 }
 async function contextToMedia(content) {
     const hasMedia = content.some(c => c.type === 'image' || c.type === 'audio' || c.type === 'file');
@@ -63,30 +67,6 @@ async function contextToMedia(content) {
     }
     return;
 }
-// TODO弃用
-async function contextToReply(content) {
-    const hasReply = content.some(c => c.type === 'reply');
-    if (!hasReply) {
-        return;
-    }
-    const reply = content.find(c => c.type === 'reply');
-    if (!reply) {
-        return;
-    }
-    const response = await getMsg({
-        message_id: Number(reply.messageId),
-    });
-    if (response.data?.message == undefined) {
-        return;
-    }
-    const replyMessage = await napCatToOpenClawMessage(response.data?.message);
-    const text = await contentToPlainText(replyMessage);
-    return {
-        id: reply.messageId,
-        content: text,
-        sender: String(response.data?.sender.user_id)
-    };
-}
 async function sendText(isGroup, chatId, text) {
     const cleanText = text.replace(/NO_REPLY\s*$/, '');
     const messageSegments = [{ type: 'text', data: { text: markdownToText(cleanText) } }];
@@ -107,7 +87,7 @@ async function sendText(isGroup, chatId, text) {
  * Dispatch an incoming message to the AI for processing
  */
 export async function dispatchMessage(params) {
-    const { chatType, chatId, senderId, senderName, messageId, content, media, reply, timestamp } = params;
+    const { chatType, chatId, senderId, senderName, messageId, content, media, timestamp } = params;
     const runtime = getRuntime();
     if (!runtime) {
         log.warn('dispatch', `Plugin runtime not available`);
@@ -120,20 +100,20 @@ export async function dispatchMessage(params) {
     }
     const isGroup = chatType === 'group';
     const peerId = isGroup ? `group:${chatId}` : senderId;
-    const fullContent = `${content}\n\nFrom QQ(${senderId}) - Nickname: ${senderName}`;
     const route = runtime.channel.routing.resolveAgentRoute({
         cfg: context.cfg,
         channel: CHANNEL_ID,
         peer: {
-            kind: isGroup ? 'group' : 'dm',
+            kind: 'group',
             id: peerId,
         },
     });
+    log.debug('dispatch', `Resolved route: ${JSON.stringify(route)}`);
     const envelopeOptions = runtime.channel.reply.resolveEnvelopeFormatOptions(context.cfg);
     const body = runtime.channel.reply.formatInboundEnvelope({
         channel: CHANNEL_ID,
         from: senderName || senderId,
-        body: fullContent,
+        body: content,
         timestamp,
         chatType: isGroup ? 'group' : 'direct',
         sender: {
@@ -142,12 +122,13 @@ export async function dispatchMessage(params) {
         },
         envelope: envelopeOptions,
     });
-    const fromAddress = isGroup ? `qq:group:${chatId}` : `qq:private:${senderId}`;
-    const toAddress = `qq:${route.accountId}`;
+    log.debug('dispatch', `Inbound envelope: ${body}`);
+    const fromAddress = isGroup ? `qq:group:${chatId}` : `qq:${senderId}`;
+    const toAddress = `qq:${chatId}`;
     const ctxPayload = runtime.channel.reply.finalizeInboundContext({
         Body: body,
-        RawBody: fullContent,
-        CommandBody: fullContent,
+        RawBody: content,
+        CommandBody: content,
         From: fromAddress,
         To: toAddress,
         SessionKey: route.sessionKey,
@@ -159,10 +140,6 @@ export async function dispatchMessage(params) {
         Surface: CHANNEL_ID,
         MessageSid: messageId,
         Timestamp: timestamp,
-        ReplyToId: reply?.id,
-        ReplyToBody: reply?.content,
-        ReplyToSender: reply?.sender,
-        ReplyToIsQuote: !!reply,
         MediaType: media?.type,
         MediaPath: media?.path,
         MediaUrl: media?.url,
@@ -224,8 +201,7 @@ export async function handleGroupMessage(event) {
     const content = await napCatToOpenClawMessage(event.message);
     const plainText = await contentToPlainText(content);
     const media = await contextToMedia(content);
-    const reply = await contextToReply(content);
-    log.info('dispatch', `Group message from ${event.sender?.nickname || event.sender?.card || event.user_id}: ${plainText}, media: ${media != undefined}, reply: ${reply != undefined}`);
+    log.info('dispatch', `Group message from ${event.sender?.nickname || event.sender?.card || event.user_id}: ${plainText}, media: ${media != undefined}`);
     await dispatchMessage({
         chatType: 'group',
         chatId: String(event.group_id),
@@ -234,7 +210,6 @@ export async function handleGroupMessage(event) {
         messageId: String(event.message_id),
         content: plainText,
         media,
-        reply,
         timestamp: event.time * 1000,
     });
 }
@@ -245,8 +220,7 @@ export async function handlePrivateMessage(event) {
     const content = await napCatToOpenClawMessage(event.message);
     const plainText = await contentToPlainText(content);
     const media = await contextToMedia(content);
-    const reply = await contextToReply(content);
-    log.info('dispatch', `Private message from ${event.sender?.nickname || event.user_id}: ${plainText}, media: ${media != undefined}, reply: ${reply != undefined}`);
+    log.info('dispatch', `Private message from ${event.sender?.nickname || event.user_id}: ${plainText}, media: ${media != undefined}`);
     await dispatchMessage({
         chatType: 'direct',
         chatId: String(event.user_id),
@@ -255,7 +229,6 @@ export async function handlePrivateMessage(event) {
         messageId: String(event.message_id),
         content: plainText,
         media,
-        reply,
         timestamp: event.time * 1000,
     });
 }

package/dist/src/types/index.d.ts

@@ -120,6 +120,9 @@ export interface OpenClawImageContent {
 export interface OpenClawReplyContent {
     type: 'reply';
     messageId: string;
+    message?: string;
+    senderId?: string;
+    sender?: string;
 }
 export interface OpenClawAudioContent {
     type: 'audio';
@@ -245,11 +248,6 @@ export interface DispatchMessageMedia {
     path?: string;
     url?: string;
 }
-export interface DispatchMessageReply {
-    id?: string;
-    content?: string;
-    sender?: string;
-}
 export interface DispatchMessageParams {
     chatType: 'direct' | 'group';
     chatId: string;
@@ -258,6 +256,5 @@ export interface DispatchMessageParams {
     messageId: string;
     content: string;
     media?: DispatchMessageMedia;
-    reply?: DispatchMessageReply;
     timestamp: number;
 }

package/dist/src/utils/markdown.d.ts

@@ -4,21 +4,21 @@ export declare class MarkdownToText {
     private maskCounter;
     /**
      * 主入口：将 Markdown 转换为纯文本
-     * @param markdown 原始 Markdown 字符串
      */
     convert(markdown: string): string;
     /**
-     * 保护代码块
-     * 支持 ```language 和 ~~~ 两种写法
+     * 保护代码块 (```)
+     * 生成 Key 格式：%%MD-MASK-BLOCK-0
      */
     private maskCodeBlocks;
     /**
-     * 保护行内代码
-     * `code` -> 使用单引号包裹，区别于普通文本
+     * 保护行内代码 (`)
+     * 生成 Key 格式：%%MD-MASK-INLINE-0
      */
     private maskInlineCode;
     /**
-     * 还原被掩码的内容
+     * 还原掩码内容
+     * 必须匹配连字符，支持 %%MD-MASK-BLOCK-1 格式
      */
     private unmaskContent;
     /**

package/dist/src/utils/markdown.js

@@ -1,116 +1,122 @@
 export class MarkdownToText {
-    // 用于暂存被保护的代码块，防止被正则误伤
+    // 1. 存储池
     codeBlockStore = new Map();
-    maskPrefix = '%%MD_MASK_';
+    // 2. 关键修复：使用连字符 "-" 而非下划线，避免被斜体正则(Text)误伤
+    maskPrefix = '%%MD-MASK-';
     maskCounter = 0;
     /**
      * 主入口：将 Markdown 转换为纯文本
-     * @param markdown 原始 Markdown 字符串
      */
     convert(markdown) {
         if (!markdown)
             return '';
-        // 1. 初始化
+        // 初始化
         this.codeBlockStore.clear();
         this.maskCounter = 0;
         let text = markdown;
-        // --- 阶段 1: 保护性预处理 (Protect) ---
-        // 必须最先执行，防止代码里的注释 # 被当成标题，或 ** 被当成粗体
+        // ============================================================
+        // 阶段 1: 保护性预处理 (Protect)
+        // 必须最先执行，将代码块抽离，防止内部字符被后续逻辑误处理
+        // ============================================================
         text = this.maskCodeBlocks(text);
         text = this.maskInlineCode(text);
-        // --- 阶段 2: 结构化转换 (Structure) ---
-        // 2.1 清理 HTML 标签 (保留 <br> 的换行效果)
+        // ============================================================
+        // 阶段 2: 优先处理特殊标签 (Priority Tags)
+        // 必须在清理 HTML 之前处理，防止 <http://...> 被当成 HTML 标签误删
+        // ============================================================
+        // 2.1 图片 -> [图片: Alt]
+        text = text.replace(/!\[([^\]]*)]\(([^)]+)\)/g, (_match, alt) => {
+            return `[图片: ${alt || 'Image'}]`;
+        });
+        // 2.2 自动链接 <http://...> -> http://...
+        // 注意：这一步非常重要，Markdown 的自动链接语法和 HTML 标签很像
+        text = text.replace(/<((?:https?|ftp|email|mailto):[^>]+)>/g, '$1');
+        // 2.3 普通链接 [Text](url) -> Text (url)
+        text = text.replace(/\[([^\]]+)]\(([^)]+)\)/g, '$1 ($2)');
+        // ============================================================
+        // 阶段 3: 结构化转换 & 清理 (Structure & Clean)
+        // ============================================================
+        // 3.1 预处理换行和分割线标签
         text = text.replace(/<br\s*\/?>/gi, '\n');
-        text = text.replace(/<hr\s*\/?>/gi, '\n────────────────────\n');
-        text = text.replace(/<[^>]+>/g, ''); // 移除剩余所有标签
-        // 2.2 标题 (Headers) -> 转换为视觉醒目的文本
-        // H1/H2 使用双线/单线分隔，H3+ 使用括号包裹
-        text = text.replace(/^#\s+(.*)$/gm, '\n$1\n════════════════════\n');
-        text = text.replace(/^##\s+(.*)$/gm, '\n$1\n────────────────────\n');
+        text = text.replace(/<hr\s*\/?>/gi, '\n──────────\n');
+        // 3.2 安全清理 HTML 标签 (Smart Strip)
+        // A. 移除 <script> 和 <style> 及其内容
+        text = text.replace(/<(script|style)[^>]*>[\s\S]*?<\/\1>/gi, '');
+        // B. 移除 HTML 注释 (修复了之前的语法错误)
+        text = text.replace(/<!--[\s\S]*?-->/g, '');
+        // C. 智能移除 HTML 标签
+        // 逻辑：匹配 < 后紧跟字母的模式，保留 "a < b" 或 "1 < 5" 这种数学公式
+        text = text.replace(/<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, '');
+        // 3.3 标题 (Headers) -> 视觉醒目文本
+        text = text.replace(/^#\s+(.*)$/gm, '\n$1\n══════════\n');
+        text = text.replace(/^##\s+(.*)$/gm, '\n$1\n──────────\n');
         text = text.replace(/^(#{3,6})\s+(.*)$/gm, '\n【 $2 】\n');
-        // 2.3 水平分割线 (---, ***, ___)
-        text = text.replace(/^(-\s*?|\*\s*?|_\s*?){3,}\s*$/gm, '────────────────────');
-        // 2.4 引用 (Blockquotes) -> 使用竖线前缀
-        // 处理多级引用 >> Text
-        text = text.replace(/^(>+)\s?(.*)$/gm, (_match, _arrows, content) => {
-            return `▎ ${content}`;
-        });
-        // 2.5 任务列表 (Task Lists)
-        text = text.replace(/^(\s*)-\s\[x]\s/gim, '$1✅ '); // 完成
-        text = text.replace(/^(\s*)-\s\[\s]\s/gim, '$1⬜ '); // 未完成
-        // 2.6 无序与有序列表 (Lists)
-        // 保留 $1 (缩进空格)，将 -/*/+ 替换为 •
-        text = text.replace(/^(\s*)[-*+]\s+(.*)$/gm, '$1• $2');
-        // 有序列表 1. 2. 通常不需要改动，保留原样即可
-        // 2.7 表格 (Tables)
-        // 移除对齐行 |---|---|
-        text = text.replace(/^\s*\|?[\s\-:|]+\|?\s*$/gm, '');
-        // 将 | Cell | Cell | 转换为空格分隔，尽量保持一行
+        // 3.4 Markdown 分割线 (---, ***)
+        text = text.replace(/^(-\s*?|\*\s*?|_\s*?){3,}\s*$/gm, '──────────');
+        // 3.5 引用 (Blockquotes)
+        text = text.replace(/^(>+)\s?(.*)$/gm, (_match, _arrows, content) => `▎ ${content}`);
+        // 3.6 任务列表 & 无序列表
+        text = text.replace(/^(\s*)-\s\[x]\s/gim, '$1✅ '); // 完成的任务
+        text = text.replace(/^(\s*)-\s\[\s]\s/gim, '$1⬜ '); // 未完成的任务
+        text = text.replace(/^(\s*)[-*+]\s+(.*)$/gm, '$1• $2'); // 列表项变圆点
+        // 3.7 表格 (Tables) -> 空格分隔
+        text = text.replace(/^\s*\|?[\s\-:|]+\|?\s*$/gm, ''); // 移除 |---|---| 分隔行
         text = text.replace(/^\|(.*)\|$/gm, (_match, content) => {
-            // 移除首尾管道符，中间管道符变为空格
             return content.split('|').map((s) => s.trim()).join('  ');
         });
-        // --- 阶段 3: 行内格式清理 (Inline Formatting) ---
-        // 3.1 粗体 (Bold) -> 使用中文引号或双星号强调
-        // 使用 [\s\S] 确保匹配跨行粗体
+        // ============================================================
+        // 阶段 4: 行内格式 (Inline Formatting)
+        // ============================================================
+        // 4.1 粗体 (**Text**) -> “Text”
         text = text.replace(/(\*\*|__)([\s\S]*?)\1/g, '“$2”');
-        // 3.2 斜体 (Italic) -> 直接移除符号，纯文本很难表现斜体
-        // 注意：必须在处理完粗体后处理斜体
+        // 4.2 斜体 (*Text*) -> Text
+        // 此时 Mask Key 是 "MD-MASK"，不包含下划线或星号，所以不会被这里误伤
         text = text.replace(/([*_])([\s\S]*?)\1/g, '$2');
-        // 3.3 删除线 (Strikethrough) -> 移除内容或仅移除符号？通常仅移除符号
+        // 4.3 删除线 (~~Text~~) -> Text
         text = text.replace(/~~([\s\S]*?)~~/g, '$1');
-        // 3.4 图片 (Images) -> 转换为占位符
-        text = text.replace(/!\[([^\]]*)]\(([^)]+)\)/g, (_match, alt) => {
-            return `[图片: ${alt || 'Image'}]`;
-        });
-        // 3.5 链接 (Links) -> Text (URL)
-        // 排除锚点链接或空链接
-        text = text.replace(/\[([^\]]+)]\(([^)]+)\)/g, '$1 ($2)');
-        // 处理自动链接 <http://example.com>
-        text = text.replace(/<((?:https?|ftp|email):[^>]+)>/g, '$1');
-        // --- 阶段 4: 还原与收尾 (Restore & Finalize) ---
-        // 4.1 还原代码块
+        // ============================================================
+        // 阶段 5: 还原与收尾 (Restore & Finalize)
+        // ============================================================
+        // 5.1 还原代码块
         text = this.unmaskContent(text);
-        // 4.2 解码 HTML 实体 (&amp; -> &)
+        // 5.2 解码 HTML 实体 (&amp; -> &)
         text = this.decodeHtmlEntities(text);
-        // 4.3 最终排版优化
-        // 移除段首段尾多余空白，将连续3个以上换行压缩为2个（段落间距）
+        // 5.3 最终排版优化：合并多余换行
         text = text.replace(/\n{3,}/g, '\n\n').trim();
         return text;
     }
     /**
-     * 保护代码块
-     * 支持 ```language 和 ~~~ 两种写法
+     * 保护代码块 (```)
+     * 生成 Key 格式：%%MD-MASK-BLOCK-0
      */
     maskCodeBlocks(text) {
-        // 匹配 3个或更多反引号/波浪线
         const codeBlockRegex = /(`{3,}|~{3,})(\w*)\n([\s\S]*?)\1/g;
         return text.replace(codeBlockRegex, (_match, _fence, lang, code) => {
-            const key = `${this.maskPrefix}BLOCK_${this.maskCounter++}`;
+            const key = `${this.maskPrefix}BLOCK-${this.maskCounter++}`;
             const langTag = lang ? ` [${lang}]` : '';
-            // 构造美观的代码块样式
-            const formatted = `\n────────────────────${langTag}\n${code.replace(/^\n+|\n+$/g, '')}\n────────────────────\n`;
+            const formatted = `\n───code───${langTag}\n${code.replace(/^\n+|\n+$/g, '')}\n──────────\n`;
             this.codeBlockStore.set(key, formatted);
             return key;
         });
     }
     /**
-     * 保护行内代码
-     * `code` -> 使用单引号包裹，区别于普通文本
+     * 保护行内代码 (`)
+     * 生成 Key 格式：%%MD-MASK-INLINE-0
      */
     maskInlineCode(text) {
         return text.replace(/`([^`]+)`/g, (_match, code) => {
-            const key = `${this.maskPrefix}INLINE_${this.maskCounter++}`;
-            this.codeBlockStore.set(key, ` ‘${code}’ `); // 加空格防止粘连
+            const key = `${this.maskPrefix}INLINE-${this.maskCounter++}`;
+            this.codeBlockStore.set(key, ` ‘${code}’ `);
             return key;
         });
     }
     /**
-     * 还原被掩码的内容
+     * 还原掩码内容
+     * 必须匹配连字符，支持 %%MD-MASK-BLOCK-1 格式
      */
     unmaskContent(text) {
-        // 使用正则全局匹配所有 mask key
-        const maskRegex = new RegExp(`${this.maskPrefix}\\w+_\\d+`, 'g');
+        // 这里的正则 [\w-]+ 允许匹配字母、数字、下划线和连字符
+        const maskRegex = new RegExp(`${this.maskPrefix}[\\w-]+`, 'g');
         return text.replace(maskRegex, (key) => {
             return this.codeBlockStore.get(key) || '';
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izhimu/qq",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A QQ channel plugin for OpenClaw using NapCat WebSocket",
   "type": "module",
   "main": "dist/index.js",