@ryantest/openclaw-qqbot 1.6.6-alpha.4 → 1.6.7-beta.2

package/dist/src/types.d.ts

@@ -24,6 +24,28 @@ export interface ResolvedQQBotAccount {
     markdownSupport: boolean;
     config: QQBotAccountConfig;
 }
+/** 群消息策略：open=全响应 | allowlist=白名单 | disabled=不响应 */
+export type GroupPolicy = "open" | "allowlist" | "disabled";
+/** 工具策略：full=全部 | restricted=限制敏感工具 | none=禁止 */
+export type ToolPolicy = "full" | "restricted" | "none";
+/** 单个群的配置 */
+export interface GroupConfig {
+    /** 是否需要 @机器人才响应（默认 true） */
+    requireMention?: boolean;
+    /**
+     * 是否忽略 @了其他用户但没有 @机器人的消息（默认 false）。
+     * 开启后，消息中 @了其他人但未 @bot 时直接丢弃（不记录历史、不触发 AI）。
+     */
+    ignoreOtherMentions?: boolean;
+    /** 群聊中 AI 可使用的工具范围（默认 restricted） */
+    toolPolicy?: ToolPolicy;
+    /** 群名称 */
+    name?: string;
+    /** 群消息行为 PE（未配置时使用内置默认值） */
+    prompt?: string;
+    /** 群历史消息缓存条数（0 禁用，默认 20） */
+    historyLimit?: number;
+}
 /**
  * QQ Bot 账户配置
  */
@@ -35,6 +57,12 @@ export interface QQBotAccountConfig {
     clientSecretFile?: string;
     dmPolicy?: "open" | "pairing" | "allowlist";
     allowFrom?: string[];
+    /** 群消息策略（默认 allowlist） */
+    groupPolicy?: GroupPolicy;
+    /** 群白名单（groupPolicy 为 allowlist 时生效） */
+    groupAllowFrom?: string[];
+    /** 群配置映射（按 groupOpenid 索引，"*" 为默认） */
+    groups?: Record<string, GroupConfig>;
     /** 系统提示词，会添加在用户消息前面 */
     systemPrompt?: string;
     /** 图床服务器公网地址，用于发送图片，例如 http://your-ip:18765 */
@@ -64,8 +92,8 @@ export interface QQBotAccountConfig {
     upgradeUrl?: string;
     /**
      * /bot-upgrade 指令的行为模式
-     * - "doc"：展示升级文档链接（默认，安全模式）
-     * - "hot-reload"：检测到新版本时直接执行 npm 升级脚本进行热更新
+     * - "doc"：展示升级文档链接（安全模式）
+     * - "hot-reload"：检测到新版本时直接执行 npm 升级脚本进行热更新（默认）
      */
     upgradeMode?: "doc" | "hot-reload";
     /**
@@ -191,6 +219,8 @@ export interface GroupMessageEvent {
     author: {
         id: string;
         member_openid: string;
+        username?: string;
+        bot?: boolean;
     };
     content: string;
     id: string;
@@ -202,6 +232,64 @@ export interface GroupMessageEvent {
         ext?: string[];
     };
     attachments?: MessageAttachment[];
+    /** @提及列表 */
+    mentions?: Array<{
+        scope?: "all" | "single";
+        id?: string;
+        user_openid?: string;
+        member_openid?: string;
+        nickname?: string;
+        bot?: boolean;
+        /** 是否 @机器人自身 */
+        is_you?: boolean;
+    }>;
+}
+/**
+ * 按钮交互事件（INTERACTION_CREATE）
+ */
+export interface InteractionEvent {
+    /** 事件 ID，用于回应交互（PUT /interactions/{id}） */
+    id: string;
+    /** 事件类型：11=消息按钮 12=单聊快捷菜单 */
+    type: number;
+    /** 场景：c2c / group / guild */
+    scene?: string;
+    /** 场景类型：0=频道 1=群聊 2=单聊 */
+    chat_type?: number;
+    /** 触发时间 RFC3339 */
+    timestamp?: string;
+    /** 频道 openid（仅频道场景） */
+    guild_id?: string;
+    /** 子频道 openid（仅频道场景） */
+    channel_id?: string;
+    /** 单聊用户 openid（仅 c2c 场景） */
+    user_openid?: string;
+    /** 群 openid（仅群聊场景） */
+    group_openid?: string;
+    /** 群内触发用户 openid（仅群聊场景） */
+    group_member_openid?: string;
+    version: number;
+    data: {
+        type: number;
+        resolved: {
+            /** 按钮 action.data 值 */
+            button_data?: string;
+            /** 按钮 id */
+            button_id?: string;
+            /** 操作用户 userid（仅频道场景） */
+            user_id?: string;
+            /** 自定义菜单 id（仅菜单场景） */
+            feature_id?: string;
+            /** 操作的消息 id（仅频道场景） */
+            message_id?: string;
+            /** 配置更新：群消息模式 "mention"=@机器人时激活 "always"=总是激活 */
+            require_mention?: string;
+            /** 配置更新：群消息策略 */
+            group_policy?: GroupPolicy;
+            /** 配置更新：@文本的名称提及BOT名，多个使用,分隔 */
+            mention_patterns?: string;
+        };
+    };
 }
 /**
  * WebSocket 事件负载

package/dist/src/utils/audio-convert.d.ts

@@ -62,7 +62,7 @@ export declare function textToSilk(text: string, ttsCfg: TTSConfig, outputDir: s
  * 将本地音频文件转换为 QQ Bot 可上传的 Base64
  *
  * QQ Bot API 支持直传 WAV、MP3、SILK 三种格式，其他格式仍需转换。
- * 转换策略（参考 NapCat/go-cqhttp/Discord/Telegram 的做法）：
+ * 转换策略：
  *
  * 1. WAV / MP3 / SILK → 直传（跳过转换）
  * 2. 有 ffmpeg → ffmpeg 万能解码为 PCM → silk-wasm 编码

package/dist/src/utils/audio-convert.js

@@ -340,7 +340,7 @@ const QQ_NATIVE_UPLOAD_FORMATS = [".wav", ".mp3", ".silk"];
  * 将本地音频文件转换为 QQ Bot 可上传的 Base64
  *
  * QQ Bot API 支持直传 WAV、MP3、SILK 三种格式，其他格式仍需转换。
- * 转换策略（参考 NapCat/go-cqhttp/Discord/Telegram 的做法）：
+ * 转换策略：
  *
  * 1. WAV / MP3 / SILK → 直传（跳过转换）
  * 2. 有 ffmpeg → ffmpeg 万能解码为 PCM → silk-wasm 编码

package/dist/src/utils/chunked-upload.d.ts

@@ -13,6 +13,17 @@
  * 注意：N 个分片之间是并行的，但每个分片的"上传 + 完成"是串行的。
  */
 import { type MediaFileType, type MediaUploadResponse } from "../api.js";
+/**
+ * upload_prepare 返回特定错误码（40093002）时抛出：文件超过每日累积上传限制
+ * 调用方根据携带的文件信息构造兜底文案发送给用户
+ */
+export declare class UploadDailyLimitExceededError extends Error {
+    /** 触发错误的本地文件路径 */
+    readonly filePath: string;
+    /** 文件大小（字节） */
+    readonly fileSize: number;
+    constructor(filePath: string, fileSize: number, originalMessage: string);
+}
 /** 分片上传进度回调 */
 export interface ChunkedUploadProgress {
     /** 当前已完成分片数 */
@@ -28,8 +39,6 @@ export interface ChunkedUploadProgress {
 export interface ChunkedUploadOptions {
     /** 进度回调 */
     onProgress?: (progress: ChunkedUploadProgress) => void;
-    /** 最大并发数（默认 2） */
-    maxConcurrent?: number;
     /** 日志前缀 */
     logPrefix?: string;
 }

package/dist/src/utils/chunked-upload.js

@@ -14,10 +14,30 @@
  */
 import * as crypto from "node:crypto";
 import * as fs from "node:fs";
-import { c2cUploadPrepare, c2cUploadPartFinish, c2cCompleteUpload, groupUploadPrepare, groupUploadPartFinish, groupCompleteUpload, getAccessToken, } from "../api.js";
+import { ApiError, UPLOAD_PREPARE_FALLBACK_CODE, c2cUploadPrepare, c2cUploadPartFinish, c2cCompleteUpload, groupUploadPrepare, groupUploadPartFinish, groupCompleteUpload, getAccessToken, } from "../api.js";
 import { formatFileSize } from "./file-utils.js";
-/** 分片上传并发控制：最多同时上传 N 个分片 */
-const MAX_CONCURRENT_PARTS = 1;
+/**
+ * upload_prepare 返回特定错误码（40093002）时抛出：文件超过每日累积上传限制
+ * 调用方根据携带的文件信息构造兜底文案发送给用户
+ */
+export class UploadDailyLimitExceededError extends Error {
+    /** 触发错误的本地文件路径 */
+    filePath;
+    /** 文件大小（字节） */
+    fileSize;
+    constructor(filePath, fileSize, originalMessage) {
+        super(originalMessage);
+        this.name = "UploadDailyLimitExceededError";
+        this.filePath = filePath;
+        this.fileSize = fileSize;
+    }
+}
+/** 分片上传默认并发数（服务端未返回 concurrency 时的兜底） */
+const DEFAULT_CONCURRENT_PARTS = 1;
+/** 分片上传并发上限（即使服务端返回更大的值也不超过此限制） */
+const MAX_CONCURRENT_PARTS = 10;
+/** partFinish 特定错误码重试超时上限（10 分钟），即使服务端 retry_timeout 更大也不超过此值 */
+const MAX_PART_FINISH_RETRY_TIMEOUT_MS = 10 * 60 * 1000;
 /** 单个分片上传超时（毫秒）— 5 分钟，兼容低带宽场景 */
 const PART_UPLOAD_TIMEOUT = 300_000;
 /** 单个分片上传最大重试次数 */
@@ -35,7 +55,6 @@ const PART_UPLOAD_MAX_RETRIES = 2;
  */
 export async function chunkedUploadC2C(appId, clientSecret, userId, filePath, fileType, options) {
     const prefix = options?.logPrefix ?? "[chunked-upload]";
-    const maxConcurrent = options?.maxConcurrent ?? MAX_CONCURRENT_PARTS;
     // 1. 读取文件信息
     const stat = await fs.promises.stat(filePath);
     const fileSize = stat.size;
@@ -48,12 +67,29 @@ export async function chunkedUploadC2C(appId, clientSecret, userId, filePath, fi
     // 3. 申请上传 → 获取 upload_id + block_size + 预签名链接
     const accessToken = await getAccessToken(appId, clientSecret);
     console.log(`${prefix} >>> Calling c2cUploadPrepare(fileType=${fileType}, fileName=${fileName}, fileSize=${fileSize}, md5=${hashes.md5}, sha1=${hashes.sha1}, md5_10m=${hashes.md5_10m})`);
-    const prepareResp = await c2cUploadPrepare(accessToken, userId, fileType, fileName, fileSize, hashes);
+    let prepareResp;
+    try {
+        prepareResp = await c2cUploadPrepare(accessToken, userId, fileType, fileName, fileSize, hashes);
+    }
+    catch (err) {
+        // 命中特定错误码 → 携带文件信息抛出，由上层构造兜底文案
+        if (err instanceof ApiError && err.bizCode === UPLOAD_PREPARE_FALLBACK_CODE) {
+            console.warn(`${prefix} c2cUploadPrepare hit fallback code ${UPLOAD_PREPARE_FALLBACK_CODE}`);
+            throw new UploadDailyLimitExceededError(filePath, fileSize, err.message);
+        }
+        throw err;
+    }
     console.log(`${prefix} <<< c2cUploadPrepare response:`, JSON.stringify(prepareResp));
     const { upload_id, parts } = prepareResp;
     // QQ 开放平台返回的 block_size 可能是字符串，需要转为数字
     const block_size = Number(prepareResp.block_size);
-    console.log(`${prefix} Upload prepared: upload_id=${upload_id}, block_size=${formatFileSize(block_size)}, parts=${parts.length}`);
+    // 并发数：使用 API 返回的 concurrency，未返回则用默认值，且不超过上限
+    const maxConcurrent = Math.min(prepareResp.concurrency ? Number(prepareResp.concurrency) : DEFAULT_CONCURRENT_PARTS, MAX_CONCURRENT_PARTS);
+    // partFinish 特定错误码的重试超时：使用 API 返回的 retry_timeout（秒），上限 10 分钟
+    const retryTimeoutMs = prepareResp.retry_timeout
+        ? Math.min(Number(prepareResp.retry_timeout) * 1000, MAX_PART_FINISH_RETRY_TIMEOUT_MS)
+        : undefined;
+    console.log(`${prefix} Upload prepared: upload_id=${upload_id}, block_size=${formatFileSize(block_size)}, parts=${parts.length}, concurrency=${maxConcurrent}, retryTimeout=${retryTimeoutMs ? retryTimeoutMs / 1000 + 's' : 'default'}`);
     // 4. 并行上传所有分片（带并发控制）
     let completedParts = 0;
     let uploadedBytes = 0;
@@ -73,7 +109,7 @@ export async function chunkedUploadC2C(appId, clientSecret, userId, filePath, fi
         // b. 通知开放平台分片上传完成（需要重新获取 token，避免长时间上传后 token 过期）
         const token = await getAccessToken(appId, clientSecret);
         console.log(`${prefix} >>> Calling c2cUploadPartFinish(upload_id=${upload_id}, partIndex=${partIndex}, blockSize=${length}, md5=${md5Hex})`);
-        await c2cUploadPartFinish(token, userId, upload_id, partIndex, length, md5Hex);
+        await c2cUploadPartFinish(token, userId, upload_id, partIndex, length, md5Hex, retryTimeoutMs);
         console.log(`${prefix} <<< c2cUploadPartFinish(partIndex=${partIndex}) done`);
         // 更新进度
         completedParts++;
@@ -112,7 +148,6 @@ export async function chunkedUploadC2C(appId, clientSecret, userId, filePath, fi
  */
 export async function chunkedUploadGroup(appId, clientSecret, groupId, filePath, fileType, options) {
     const prefix = options?.logPrefix ?? "[chunked-upload]";
-    const maxConcurrent = options?.maxConcurrent ?? MAX_CONCURRENT_PARTS;
     // 1. 读取文件信息
     const stat = await fs.promises.stat(filePath);
     const fileSize = stat.size;
@@ -125,12 +160,29 @@ export async function chunkedUploadGroup(appId, clientSecret, groupId, filePath,
     // 3. 申请上传
     const accessToken = await getAccessToken(appId, clientSecret);
     console.log(`${prefix} >>> Calling groupUploadPrepare(fileType=${fileType}, fileName=${fileName}, fileSize=${fileSize}, md5=${hashes.md5}, sha1=${hashes.sha1}, md5_10m=${hashes.md5_10m})`);
-    const prepareResp = await groupUploadPrepare(accessToken, groupId, fileType, fileName, fileSize, hashes);
+    let prepareResp;
+    try {
+        prepareResp = await groupUploadPrepare(accessToken, groupId, fileType, fileName, fileSize, hashes);
+    }
+    catch (err) {
+        // 命中特定错误码 → 携带文件信息抛出，由上层构造兜底文案
+        if (err instanceof ApiError && err.bizCode === UPLOAD_PREPARE_FALLBACK_CODE) {
+            console.warn(`${prefix} groupUploadPrepare hit fallback code ${UPLOAD_PREPARE_FALLBACK_CODE}`);
+            throw new UploadDailyLimitExceededError(filePath, fileSize, err.message);
+        }
+        throw err;
+    }
     console.log(`${prefix} <<< groupUploadPrepare response:`, JSON.stringify(prepareResp));
     const { upload_id, parts } = prepareResp;
     // QQ 开放平台返回的 block_size 可能是字符串，需要转为数字
     const block_size = Number(prepareResp.block_size);
-    console.log(`${prefix} Upload prepared: upload_id=${upload_id}, block_size=${formatFileSize(block_size)}, parts=${parts.length}`);
+    // 并发数：使用 API 返回的 concurrency，未返回则用默认值，且不超过上限
+    const maxConcurrent = Math.min(prepareResp.concurrency ? Number(prepareResp.concurrency) : DEFAULT_CONCURRENT_PARTS, MAX_CONCURRENT_PARTS);
+    // partFinish 特定错误码的重试超时：使用 API 返回的 retry_timeout（秒），上限 10 分钟
+    const retryTimeoutMs = prepareResp.retry_timeout
+        ? Math.min(Number(prepareResp.retry_timeout) * 1000, MAX_PART_FINISH_RETRY_TIMEOUT_MS)
+        : undefined;
+    console.log(`${prefix} Upload prepared: upload_id=${upload_id}, block_size=${formatFileSize(block_size)}, parts=${parts.length}, concurrency=${maxConcurrent}, retryTimeout=${retryTimeoutMs ? retryTimeoutMs / 1000 + 's' : 'default'}`);
     // 4. 并行上传所有分片（带并发控制）
     let completedParts = 0;
     let uploadedBytes = 0;
@@ -145,7 +197,7 @@ export async function chunkedUploadGroup(appId, clientSecret, groupId, filePath,
         await putToPresignedUrl(part.presigned_url, partBuffer, prefix, partNum, parts.length);
         const token = await getAccessToken(appId, clientSecret);
         console.log(`${prefix} >>> Calling groupUploadPartFinish(upload_id=${upload_id}, partIndex=${partIndex}, blockSize=${length}, md5=${md5Hex})`);
-        await groupUploadPartFinish(token, groupId, upload_id, partIndex, length, md5Hex);
+        await groupUploadPartFinish(token, groupId, upload_id, partIndex, length, md5Hex, retryTimeoutMs);
         console.log(`${prefix} <<< groupUploadPartFinish(partIndex=${partIndex}) done`);
         completedParts++;
         uploadedBytes += length;

package/dist/src/utils/media-send.js

@@ -240,6 +240,7 @@ export async function executeSendQueue(queue, ctx, options = {}) {
         }
     };
     for (const item of queue) {
+        const FALLBACK_MSG = "发送失败，请稍后重试。";
         try {
             if (item.type === "text") {
                 if (options.skipInterTagText) {
@@ -255,7 +256,6 @@ export async function executeSendQueue(queue, ctx, options = {}) {
                 continue;
             }
             log?.info(`${prefix} executeSendQueue: sending ${item.type}: ${item.content.slice(0, 80)}...`);
-            const FALLBACK_MSG = "发送失败，请稍后重试。";
             if (item.type === "image") {
                 const result = await sendPhoto(mediaTarget, item.content);
                 if (result.error) {

package/dist/src/utils/text-parsing.js

@@ -1,6 +1,7 @@
 /**
  * QQ Bot 文本解析工具函数
  */
+import { inferAttachmentType } from "../group-history.js";
 /**
  * 解析 QQ 表情标签，将 <faceType=1,faceId="13",ext="base64..."> 格式
  * 替换为 【表情: 中文名】 格式
@@ -59,22 +60,10 @@ export function parseRefIndices(ext) {
 export function buildAttachmentSummaries(attachments, localPaths) {
     if (!attachments || attachments.length === 0)
         return undefined;
-    return attachments.map((att, idx) => {
-        const ct = att.content_type?.toLowerCase() ?? "";
-        let type = "unknown";
-        if (ct.startsWith("image/"))
-            type = "image";
-        else if (ct === "voice" || ct.startsWith("audio/") || ct.includes("silk") || ct.includes("amr"))
-            type = "voice";
-        else if (ct.startsWith("video/"))
-            type = "video";
-        else if (ct.startsWith("application/") || ct.startsWith("text/"))
-            type = "file";
-        return {
-            type,
-            filename: att.filename,
-            contentType: att.content_type,
-            localPath: localPaths?.[idx] ?? undefined,
-        };
-    });
+    return attachments.map((att, idx) => ({
+        type: inferAttachmentType(att.content_type),
+        filename: att.filename,
+        contentType: att.content_type,
+        localPath: localPaths?.[idx] ?? undefined,
+    }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryantest/openclaw-qqbot",
-  "version": "1.6.6-alpha.4",
+  "version": "1.6.7-beta.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/postinstall-link-sdk.js

@@ -10,7 +10,7 @@
 // globally installed openclaw package, allowing Node's native ESM resolver
 // (used by jiti with tryNative:true for .js files) to find `openclaw/plugin-sdk`.
 
-import { existsSync, symlinkSync, mkdirSync, realpathSync } from "node:fs";
+import { existsSync, lstatSync, symlinkSync, unlinkSync, rmSync, mkdirSync, realpathSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { execSync } from "node:child_process";
@@ -18,17 +18,30 @@ import { execSync } from "node:child_process";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pluginRoot = resolve(__dirname, "..");
 
-// Only run when installed under an openclaw-like extensions directory
-// (supports openclaw, clawdbot, moltbot, etc.)
-if (!pluginRoot.includes("extensions")) {
-  process.exit(0);
-}
-
 const linkTarget = join(pluginRoot, "node_modules", "openclaw");
 
-// Already linked or exists
+// Check if already a valid symlink pointing to a directory with plugin-sdk/core
 if (existsSync(linkTarget)) {
-  process.exit(0);
+  try {
+    const stat = lstatSync(linkTarget);
+    if (stat.isSymbolicLink()) {
+      // Symlink exists — verify it has plugin-sdk/core
+      if (existsSync(join(linkTarget, "plugin-sdk", "core.js"))) {
+        process.exit(0);
+      }
+      // Symlink is stale or points to wrong target, remove and re-create
+      unlinkSync(linkTarget);
+    } else if (existsSync(join(linkTarget, "plugin-sdk", "core.js"))) {
+      // Real directory with correct structure (e.g. npm installed a good version)
+      process.exit(0);
+    } else {
+      // Real directory from npm install but missing plugin-sdk/core — replace with symlink
+      rmSync(linkTarget, { recursive: true, force: true });
+    }
+  } catch {
+    // If stat fails, try to remove and re-create
+    try { rmSync(linkTarget, { recursive: true, force: true }); } catch {}
+  }
 }
 
 // CLI names to try (openclaw and its aliases)

package/scripts/upgrade-via-npm.sh

@@ -18,14 +18,21 @@
 
 set -eo pipefail
 
-# 异常退出时清理临时配置文件（防止泄露或残留）
+# 异常退出时清理临时文件（防止泄露或残留）
 cleanup_on_exit() {
     if [ -n "$TEMP_CONFIG_FILE" ] && [ -f "$TEMP_CONFIG_FILE" ]; then
         rm -f "$TEMP_CONFIG_FILE" 2>/dev/null || true
     fi
+    # 异常退出时清理本次备份目录（正常流程中备份已被删除或回滚，这里是兜底）
+    if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+        rm -rf "$BACKUP_DIR" 2>/dev/null || true
+    fi
 }
 trap cleanup_on_exit EXIT
 
+# 清理上次升级可能遗留的备份目录（如上次脚本被 kill 等极端情况）
+find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".qqbot-upgrade-backup-*" -exec rm -rf {} + 2>/dev/null || true
+
 PKG_NAME="@tencent-connect/openclaw-qqbot"
 PLUGIN_ID="openclaw-qqbot"
 INSTALL_SRC=""
@@ -291,7 +298,7 @@ if [ "$UPGRADE_OK" != "true" ]; then
     # 备份旧目录（而非直接删除），install 失败时可回滚
     BACKUP_DIR=""
     if [ -d "$EXTENSIONS_DIR/$PLUGIN_ID" ]; then
-        BACKUP_DIR="$EXTENSIONS_DIR/.openclaw-qqbot-backup-$$"
+        BACKUP_DIR="$(mktemp -d "${TMPDIR:-/tmp}/.qqbot-upgrade-backup-XXXXXX")"
         mv "$EXTENSIONS_DIR/$PLUGIN_ID" "$BACKUP_DIR"
         echo "  已备份旧目录: $BACKUP_DIR"
     fi
@@ -311,8 +318,9 @@ if [ "$UPGRADE_OK" != "true" ]; then
             rm -rf "$BACKUP_DIR"
             echo "  已清理旧版备份"
         fi
-        # 清理 openclaw CLI install 可能留下的额外 backup 目录
+        # 清理 openclaw CLI install 可能留下的额外 backup 目录（extensions 内遗留 + 新路径）
         find "$EXTENSIONS_DIR" -maxdepth 1 -name ".openclaw-qqbot-backup-*" -exec rm -rf {} + 2>/dev/null || true
+        find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".qqbot-upgrade-backup-*" -exec rm -rf {} + 2>/dev/null || true
     else
         echo "  ❌ install 失败"
         # 回滚：恢复旧目录

package/scripts/upgrade-via-source.sh

@@ -92,30 +92,44 @@ echo "========================================="
 echo ""
 echo "[1/6] 备份已有配置..."
 SAVED_QQBOT_TOKEN=""
+SAVED_QQBOT_CONFIG_FILE=""  # 有 qqbot 配置的文件路径
+SAVED_QQBOT_CHANNEL_JSON="" # 完整 channels.qqbot JSON
+
+# 完整备份 channels.qqbot 对象（含 token / groups / env / allowFrom 等）
 for APP_NAME in openclaw clawdbot moltbot; do
     CONFIG_FILE="$HOME/.$APP_NAME/$APP_NAME.json"
     if [ -f "$CONFIG_FILE" ]; then
-        SAVED_QQBOT_TOKEN=$(node -e "
+        SAVED_QQBOT_CHANNEL_JSON=$(node -e "
             const cfg = JSON.parse(require('fs').readFileSync('$CONFIG_FILE', 'utf8'));
-            // 尝试所有可能的 channel key（原仓库 + 本仓库）
             const keys = ['qqbot', 'openclaw-qqbot', 'openclaw-qq'];
             for (const key of keys) {
                 const ch = cfg.channels && cfg.channels[key];
-                if (!ch) continue;
-                if (ch.token) { process.stdout.write(ch.token); process.exit(0); }
-                if (ch.appId && ch.clientSecret) { process.stdout.write(ch.appId + ':' + ch.clientSecret); process.exit(0); }
+                if (ch && Object.keys(ch).length > 0) {
+                    process.stdout.write(JSON.stringify(ch));
+                    process.exit(0);
+                }
             }
         " 2>/dev/null || true)
-        if [ -n "$SAVED_QQBOT_TOKEN" ]; then
-            echo "已备份 qqbot 通道 token: ${SAVED_QQBOT_TOKEN:0:10}..."
+        if [ -n "$SAVED_QQBOT_CHANNEL_JSON" ]; then
+            SAVED_QQBOT_CONFIG_FILE="$CONFIG_FILE"
+            # 提取 token 供 Step 4 fallback
+            SAVED_QQBOT_TOKEN=$(node -e "
+                const ch = JSON.parse(process.argv[1]);
+                if (ch.token) { process.stdout.write(ch.token); }
+                else if (ch.appId && ch.clientSecret) { process.stdout.write(ch.appId + ':' + ch.clientSecret); }
+            " "$SAVED_QQBOT_CHANNEL_JSON" 2>/dev/null || true)
+            echo "已备份完整 qqbot 通道配置"
+            if [ -n "$SAVED_QQBOT_TOKEN" ]; then
+                echo "  token: ${SAVED_QQBOT_TOKEN:0:10}..."
+            fi
             break
         fi
     fi
 done
 
-# 若当前配置中没有，再尝试从 openclaw 备份文件恢复
-if [ -z "$SAVED_QQBOT_TOKEN" ] && [ -d "$HOME/.openclaw" ]; then
-    SAVED_QQBOT_TOKEN=$(node -e "
+# 若当前配置中没有，从 openclaw 备份文件恢复
+if [ -z "$SAVED_QQBOT_CHANNEL_JSON" ] && [ -d "$HOME/.openclaw" ]; then
+    SAVED_QQBOT_CHANNEL_JSON=$(node -e "
       const fs = require('fs');
       const path = require('path');
       const dir = path.join(process.env.HOME, '.openclaw');
@@ -129,16 +143,25 @@ if [ -z "$SAVED_QQBOT_TOKEN" ] && [ -d "$HOME/.openclaw" ]; then
           const keys = ['qqbot', 'openclaw-qqbot', 'openclaw-qq'];
           for (const key of keys) {
             const ch = cfg.channels && cfg.channels[key];
-            if (!ch) continue;
-            if (ch.token) { process.stdout.write(ch.token); process.exit(0); }
-            if (ch.appId && ch.clientSecret) { process.stdout.write(ch.appId + ':' + ch.clientSecret); process.exit(0); }
+            if (ch && Object.keys(ch).length > 0) {
+              process.stdout.write(JSON.stringify(ch));
+              process.exit(0);
+            }
           }
         } catch {}
       }
     " 2>/dev/null || true)
 
-    if [ -n "$SAVED_QQBOT_TOKEN" ]; then
-        echo "已从 ~/.openclaw/openclaw.json.bak* 找到 qqbot 备份 token: ${SAVED_QQBOT_TOKEN:0:10}..."
+    if [ -n "$SAVED_QQBOT_CHANNEL_JSON" ]; then
+        SAVED_QQBOT_TOKEN=$(node -e "
+            const ch = JSON.parse(process.argv[1]);
+            if (ch.token) { process.stdout.write(ch.token); }
+            else if (ch.appId && ch.clientSecret) { process.stdout.write(ch.appId + ':' + ch.clientSecret); }
+        " "$SAVED_QQBOT_CHANNEL_JSON" 2>/dev/null || true)
+        echo "已从 ~/.openclaw/openclaw.json.bak* 恢复 qqbot 通道配置"
+        if [ -n "$SAVED_QQBOT_TOKEN" ]; then
+            echo "  token: ${SAVED_QQBOT_TOKEN:0:10}..."
+        fi
     fi
 fi
 
@@ -504,6 +527,31 @@ else
     # 清理 openclaw CLI install 留下的 backup 目录，
     # 避免 gateway 发现两个同 id 插件不断刷 duplicate plugin id 警告
     find "$HOME/.openclaw/extensions/" -maxdepth 1 -name ".openclaw-qqbot-backup-*" -exec rm -rf {} + 2>/dev/null || true
+    find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".qqbot-upgrade-backup-*" -exec rm -rf {} + 2>/dev/null || true
+
+    # 恢复 channels.qqbot 完整配置（防止 plugins install 意外覆盖）
+    # 策略：直接用备份完整覆盖回去，确保 groups / env / prompts / allowFrom 等所有用户配置不丢失。
+    if [ -n "$SAVED_QQBOT_CHANNEL_JSON" ]; then
+        node -e "
+          const fs = require('fs');
+          const path = require('path');
+          const saved = JSON.parse(process.argv[1]);
+          for (const app of ['openclaw', 'clawdbot', 'moltbot']) {
+            const f = path.join(process.env.HOME, '.' + app, app + '.json');
+            if (!fs.existsSync(f)) continue;
+            const cfg = JSON.parse(fs.readFileSync(f, 'utf8'));
+            if (!cfg.channels) { cfg.channels = {}; }
+            if (JSON.stringify(cfg.channels.qqbot) === JSON.stringify(saved)) {
+              process.stderr.write('  channels.qqbot 配置无变化，无需恢复\\n');
+            } else {
+              cfg.channels.qqbot = saved;
+              fs.writeFileSync(f, JSON.stringify(cfg, null, 4) + '\\n');
+              process.stderr.write('  已完整恢复 channels.qqbot 配置（' + Object.keys(saved).join(', ') + '）\\n');
+            }
+            break;
+          }
+        " "$SAVED_QQBOT_CHANNEL_JSON" 2>&1 || true
+    fi
 
     # 记录更新后的 qqbot 插件版本
     NEW_QQBOT_VERSION=$(node -e '

package/skills/qqbot-remind/SKILL.md

@@ -26,7 +26,7 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
 | `time` | 时间（相对时间或 cron 表达式） | `"5m"` / `"1h30m"` / `"0 8 * * *"` |
 | `jobId` | 任务 ID（仅 remove） | `"xxx"` |
 
-**第二步**：`qqbot_remind` 会返回 `cronParams`，你必须**立即**将 `cronParams` 的值作为参数调用 `cron` 工具。
+**第二步**：`qqbot_remind` 会返回 `cronParams`，你必须**立即**将 `cronParams` 的值**原样**作为参数调用 `cron` 工具。**禁止修改、省略或重组 `cronParams` 中的任何字段**（尤其是 `delivery` 对象中的 `accountId`）。
 
 **第三步**：根据 `cron` 工具的返回结果，回复用户。
 
@@ -54,11 +54,13 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
 | 字段 | 固定值 | 原因 |
 |------|--------|------|
 | `payload.kind` | `"agentTurn"` | `systemEvent` 不会发 QQ 消息 |
-| `payload.deliver` | `true` | 否则不投递 |
-| `payload.channel` | `"qqbot"` | QQ 通道标识 |
-| `payload.to` | 用户 openid | 从 `To` 字段获取 |
+| `delivery.mode` | `"announce"` | 投递模式 |
+| `delivery.channel` | `"qqbot"` | QQ 通道标识 |
+| `delivery.to` | 用户 openid | 从 `To` 字段获取 |
 | `sessionTarget` | `"isolated"` | 隔离会话避免污染 |
 
+> `delivery.accountId` 必须填写当前会话的账户 ID（如果已知），以确保多账户场景下消息通过正确的机器人账户发送。
+
 > `schedule.atMs` 必须是**绝对毫秒时间戳**（如 `1770733800000`），不支持 `"5m"` 等相对字符串。
 > 计算方式：`当前时间戳ms + 延迟毫秒`。
 
@@ -75,10 +77,13 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
     "deleteAfterRun": true,
     "payload": {
       "kind": "agentTurn",
-      "message": "你是一个暖心的提醒助手。请用温暖、有趣的方式提醒用户：{提醒内容}。要求：(1) 不要回复HEARTBEAT_OK (2) 不要解释你是谁 (3) 直接输出一条暖心的提醒消息 (4) 可以加一句简短的鸡汤或关怀的话 (5) 控制在2-3句话以内 (6) 用emoji点缀",
-      "deliver": true,
+      "message": "你是一个暖心的提醒助手。请用温暖、有趣的方式提醒用户：{提醒内容}。要求：(1) 不要回复HEARTBEAT_OK (2) 不要解释你是谁 (3) 直接输出一条暖心的提醒消息 (4) 可以加一句简短的鸡汤或关怀的话 (5) 控制在2-3句话以内 (6) 用emoji点缀"
+    },
+    "delivery": {
+      "mode": "announce",
       "channel": "qqbot",
-      "to": "{openid}"
+      "to": "{openid}",
+      "accountId": "{accountId}"
     }
   }
 }
@@ -96,16 +101,19 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
     "wakeMode": "now",
     "payload": {
       "kind": "agentTurn",
-      "message": "你是一个暖心的提醒助手。请用温暖、有趣的方式提醒用户：{提醒内容}。要求：(1) 不要回复HEARTBEAT_OK (2) 不要解释你是谁 (3) 直接输出一条暖心的提醒消息 (4) 可以加一句简短的鸡汤或关怀的话 (5) 控制在2-3句话以内 (6) 用emoji点缀",
-      "deliver": true,
+      "message": "你是一个暖心的提醒助手。请用温暖、有趣的方式提醒用户：{提醒内容}。要求：(1) 不要回复HEARTBEAT_OK (2) 不要解释你是谁 (3) 直接输出一条暖心的提醒消息 (4) 可以加一句简短的鸡汤或关怀的话 (5) 控制在2-3句话以内 (6) 用emoji点缀"
+    },
+    "delivery": {
+      "mode": "announce",
       "channel": "qqbot",
-      "to": "{openid}"
+      "to": "{openid}",
+      "accountId": "{accountId}"
     }
   }
 }
 ```
 
-> 周期任务**不加** `deleteAfterRun`。群聊 `to` 格式为 `"group:{group_openid}"`。
+> 周期任务**不加** `deleteAfterRun`。群聊 `to` 格式为 `"qqbot:group:{group_openid}"`。
 
 ---
 
@@ -147,3 +155,5 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
 - 周期：`⏰ 收到，{周期}提醒你{内容}~`
 - 查询无结果：`📋 目前没有提醒哦~ 说"5分钟后提醒我xxx"试试？`
 - 删除成功：`✅ 已取消"{名称}"`
+
+openclaw cron add \ --name "下班提醒" \ --at "2026-03-26T21:42:31+08:00" \ --message "test" \ --to …``