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

package/src/api.ts

@@ -9,12 +9,16 @@ import { sanitizeFileName } from "./utils/platform.js";
 
 // ============ 自定义错误 ============
 
-/** API 请求错误，携带 HTTP status code */
+/** API 请求错误，携带 HTTP status code 和业务错误码 */
 export class ApiError extends Error {
   constructor(
     message: string,
     public readonly status: number,
     public readonly path: string,
+    /** 业务错误码（回包中的 code / err_code 字段），不一定存在 */
+    public readonly bizCode?: number,
+    /** 回包中的原始 message 字段（用于向用户展示兜底文案） */
+    public readonly bizMessage?: string,
   ) {
     super(message);
     this.name = "ApiError";
@@ -320,8 +324,9 @@ export async function apiRequest<T = unknown>(
     }
     // JSON 错误响应
     try {
-      const error = JSON.parse(rawBody) as { message?: string; code?: number };
-      throw new ApiError(`API Error [${path}]: ${error.message ?? rawBody}`, res.status, path);
+      const error = JSON.parse(rawBody) as { message?: string; code?: number; err_code?: number };
+      const bizCode = error.code ?? error.err_code;
+      throw new ApiError(`API Error [${path}]: ${error.message ?? rawBody}`, res.status, path, bizCode, error.message);
     } catch (parseErr) {
       if (parseErr instanceof ApiError) throw parseErr;
       throw new ApiError(`API Error [${path}] HTTP ${res.status}: ${rawBody.slice(0, 200)}`, res.status, path);
@@ -413,16 +418,62 @@ async function completeUploadWithRetry(
   throw lastError!;
 }
 
-// ============ 分片完成重试（无条件，与 completeUpload 策略一致） ============
+// ============ 分片完成重试 ============
 
+/** 普通错误最大重试次数 */
 const PART_FINISH_MAX_RETRIES = 2;
 const PART_FINISH_BASE_DELAY_MS = 1000;
 
+/**
+ * 需要持续重试的业务错误码集合
+ * 当 upload_part_finish 返回这些错误码时，会以固定 1s 间隔持续重试直到成功或超时
+ */
+export const PART_FINISH_RETRYABLE_CODES: Set<number> = new Set([
+  40093001,
+]);
+
+/**
+ * upload_prepare 接口命中此错误码时，携带文件信息抛出 UploadDailyLimitExceededError，
+ * 由上层（outbound.ts）构造包含文件路径和大小的兜底文案发送给用户，
+ * 而非走通用的"文件发送失败，请稍后重试"
+ */
+export const UPLOAD_PREPARE_FALLBACK_CODE = 40093002;
+
+/** 特定错误码持续重试的默认超时（服务端未返回 retry_timeout 时的兜底） */
+const PART_FINISH_RETRYABLE_DEFAULT_TIMEOUT_MS = 2 * 60 * 1000;
+
+/** 特定错误码重试的固定间隔（1 秒） */
+const PART_FINISH_RETRYABLE_INTERVAL_MS = 1000;
+
+/**
+ * 判断错误是否命中"需要持续重试"的业务错误码
+ */
+function isRetryableBizCode(err: unknown): boolean {
+  if (PART_FINISH_RETRYABLE_CODES.size === 0) return false;
+  if (err instanceof ApiError && err.bizCode !== undefined) {
+    return PART_FINISH_RETRYABLE_CODES.has(err.bizCode);
+  }
+  return false;
+}
+
+/**
+ * 分片完成接口重试策略：
+ * 
+ * 1. 命中 PART_FINISH_RETRYABLE_CODES 的错误码 → 每 1s 重试一次，直到成功或超时
+ *    超时时间 = min(API 返回的 retry_timeout, 10 分钟)
+ * 2. 其他错误 → 最多重试 PART_FINISH_MAX_RETRIES 次（与之前逻辑一致）
+ * 
+ * 若持续重试超时或普通重试耗尽，抛出错误，调用方（chunkedUpload）
+ * 可据此中止后续分片上传。
+ * 
+ * @param retryTimeoutMs - 持续重试的超时时间（毫秒），由 upload_prepare 返回的 retry_timeout 计算得出
+ */
 async function partFinishWithRetry(
   accessToken: string,
   method: string,
   path: string,
   body?: unknown,
+  retryTimeoutMs?: number,
 ): Promise<void> {
   let lastError: Error | null = null;
 
@@ -433,6 +484,14 @@ async function partFinishWithRetry(
     } catch (err) {
       lastError = err instanceof Error ? err : new Error(String(err));
 
+      // 命中特定错误码 → 进入持续重试模式
+      if (isRetryableBizCode(err)) {
+        const timeoutMs = retryTimeoutMs ?? PART_FINISH_RETRYABLE_DEFAULT_TIMEOUT_MS;
+        console.warn(`[qqbot-api] PartFinish hit retryable bizCode=${(err as ApiError).bizCode}, entering persistent retry (timeout=${timeoutMs / 1000}s, interval=1s)...`);
+        await partFinishPersistentRetry(accessToken, method, path, body, timeoutMs);
+        return;
+      }
+
       if (attempt < PART_FINISH_MAX_RETRIES) {
         const delay = PART_FINISH_BASE_DELAY_MS * Math.pow(2, attempt);
         console.warn(`[qqbot-api] PartFinish attempt ${attempt + 1} failed, retrying in ${delay}ms: ${lastError.message.slice(0, 200)}`);
@@ -444,11 +503,71 @@ async function partFinishWithRetry(
   throw lastError!;
 }
 
+/**
+ * 特定错误码的持续重试模式
+ * 不限次数，仅受总超时时间约束，固定每 1 秒重试一次
+ */
+async function partFinishPersistentRetry(
+  accessToken: string,
+  method: string,
+  path: string,
+  body: unknown,
+  timeoutMs: number,
+): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  let attempt = 0;
+  let lastError: Error | null = null;
+
+  while (Date.now() < deadline) {
+    try {
+      await apiRequest<Record<string, unknown>>(accessToken, method, path, body);
+      console.log(`[qqbot-api] PartFinish persistent retry succeeded after ${attempt} retries`);
+      return;
+    } catch (err) {
+      lastError = err instanceof Error ? err : new Error(String(err));
+
+      // 如果不再是可重试的错误码，直接抛出（可能是其他类型的错误）
+      if (!isRetryableBizCode(err)) {
+        console.error(`[qqbot-api] PartFinish persistent retry: error is no longer retryable (bizCode=${(err as ApiError).bizCode ?? "N/A"}), aborting`);
+        throw lastError;
+      }
+
+      attempt++;
+      const remaining = deadline - Date.now();
+
+      if (remaining <= 0) break;
+
+      const actualDelay = Math.min(PART_FINISH_RETRYABLE_INTERVAL_MS, remaining);
+      console.warn(`[qqbot-api] PartFinish persistent retry #${attempt}: bizCode=${(err as ApiError).bizCode}, retrying in ${actualDelay}ms (remaining=${Math.round(remaining / 1000)}s)`);
+      await new Promise(resolve => setTimeout(resolve, actualDelay));
+    }
+  }
+
+  // 超时
+  console.error(`[qqbot-api] PartFinish persistent retry timed out after ${timeoutMs / 1000}s (${attempt} attempts)`);
+  throw new Error(`upload_part_finish 持续重试超时（${timeoutMs / 1000}s, ${attempt} 次重试），中止上传`);
+}
+
 export async function getGatewayUrl(accessToken: string): Promise<string> {
   const data = await apiRequest<{ url: string }>(accessToken, "GET", "/gateway");
   return data.url;
 }
 
+/** 回应按钮交互（INTERACTION_CREATE），避免客户端按钮持续 loading */
+export async function acknowledgeInteraction(
+  accessToken: string,
+  interactionId: string,
+  code: 0 | 1 | 2 | 3 | 4 | 5 = 0,
+  data?: Record<string, unknown>
+): Promise<void> {
+  await apiRequest(accessToken, "PUT", `/interactions/${interactionId}`, { code, ...(data ? { data } : {}) });
+}
+
+/** 获取插件版本号（从 package.json 读取，和 PLUGIN_USER_AGENT 同源） */
+export function getApiPluginVersion(): string {
+  return _pluginVersion;
+}
+
 // ============ 消息发送接口 ============
 
 export interface MessageResponse {
@@ -574,11 +693,12 @@ export async function sendGroupMessage(
   accessToken: string,
   groupOpenid: string,
   content: string,
-  msgId?: string
+  msgId?: string,
+  messageReference?: string
 ): Promise<MessageResponse> {
   const msgSeq = msgId ? getNextMsgSeq(msgId) : 1;
-  const body = buildMessageBody(content, msgId, msgSeq);
-  return apiRequest(accessToken, "POST", `/v2/groups/${groupOpenid}/messages`, body);
+  const body = buildMessageBody(content, msgId, msgSeq, messageReference);
+  return sendAndNotify(accessToken, "POST", `/v2/groups/${groupOpenid}/messages`, body, { text: content });
 }
 
 function buildProactiveMessageBody(content: string): Record<string, unknown> {
@@ -644,6 +764,10 @@ export interface UploadPrepareResponse {
   block_size: number;
   /** 分片列表（含预签名链接） */
   parts: UploadPart[];
+  /** 上传并发数（由服务端控制，可选，不返回时使用客户端默认值） */
+  concurrency?: number;
+  /** upload_part_finish 特定错误码的重试超时时间（秒），由服务端控制，客户端上限 10 分钟 */
+  retry_timeout?: number;
 }
 
 /** 完成文件上传响应（与 UploadMediaResponse 一致） */
@@ -710,10 +834,12 @@ export async function c2cUploadPartFinish(
   partIndex: number,
   blockSize: number,
   md5: string,
+  retryTimeoutMs?: number,
 ): Promise<void> {
   await partFinishWithRetry(
     accessToken, "POST", `/v2/users/${userId}/upload_part_finish`,
     { upload_id: uploadId, part_index: partIndex, block_size: blockSize, md5 },
+    retryTimeoutMs,
   );
 }
 
@@ -766,10 +892,12 @@ export async function groupUploadPartFinish(
   partIndex: number,
   blockSize: number,
   md5: string,
+  retryTimeoutMs?: number,
 ): Promise<void> {
   await partFinishWithRetry(
     accessToken, "POST", `/v2/groups/${groupId}/upload_part_finish`,
     { upload_id: uploadId, part_index: partIndex, block_size: blockSize, md5 },
+    retryTimeoutMs,
   );
 }
 

package/src/channel.ts

@@ -7,7 +7,7 @@ import {
 } from "openclaw/plugin-sdk/core";
 
 import type { ResolvedQQBotAccount } from "./types.js";
-import { DEFAULT_ACCOUNT_ID, listQQBotAccountIds, resolveQQBotAccount, applyQQBotAccountConfig, resolveDefaultQQBotAccountId } from "./config.js";
+import { DEFAULT_ACCOUNT_ID, listQQBotAccountIds, resolveQQBotAccount, applyQQBotAccountConfig, resolveDefaultQQBotAccountId, resolveRequireMention, resolveToolPolicy, resolveGroupConfig } from "./config.js";
 import { sendText, sendMedia } from "./outbound.js";
 import { startGateway } from "./gateway.js";
 import { qqbotOnboardingAdapter } from "./onboarding.js";
@@ -50,8 +50,49 @@ export const qqbotPlugin: ChannelPlugin<ResolvedQQBotAccount> = {
     blockStreaming: true,
   },
   reload: { configPrefixes: ["channels.qqbot"] },
+
+  // ============ 群消息策略适配器 ============
+  groups: {
+    /** 是否需要 @机器人才响应 */
+    resolveRequireMention: ({ cfg, accountId, groupId }) => {
+      if (!groupId) return undefined;
+      return resolveRequireMention(cfg, groupId, accountId ?? undefined);
+    },
+
+    /** 群聊工具范围 */
+    resolveToolPolicy: ({ cfg, accountId, groupId }) => {
+      if (!groupId) return undefined;
+      const policy = resolveToolPolicy(cfg, groupId, accountId ?? undefined);
+      // 将简单字符串策略映射为 GroupToolPolicyConfig 对象
+      if (policy === "full") return undefined; // full = 默认不限制
+      if (policy === "none") return { allow: [], deny: ["*"] };
+      // restricted: 默认空 allow（框架会使用内置 restricted 列表）
+      return { allow: [] };
+    },
+
+    /** QQ Bot 平台特有的群聊行为提示 */
+    resolveGroupIntroHint: ({ cfg, accountId, groupId }) => {
+      if (!groupId) return undefined;
+      const groupCfg = resolveGroupConfig(cfg, groupId, accountId ?? undefined);
+      const hints: string[] = [];
+      if (groupCfg.name) {
+        hints.push(`当前群: ${groupCfg.name}`);
+      }
+      // bot 互聊防护、@状态行为指引在 gateway.ts 动态注入
+      return hints.join(" ") || undefined;
+    },
+  },
+
+  // ============ @mention 检测与清理 ============
+  mentions: {
+    /** 清理 @mention 文本（SDK ChannelMentionAdapter 接口） */
+    stripMentions: ({ text, ctx }) => {
+      const mentions = (ctx as any)?.mentions as Array<{ member_openid?: string; id?: string; user_openid?: string; is_you?: boolean; nickname?: string; username?: string }> | undefined;
+      return stripMentionText(text, mentions);
+    },
+  },
   // CLI onboarding wizard
-  // @ts-expect-error onboarding removed from ChannelPlugin type in 2026.3.23 but still supported at runtime
+  // @ts-ignore onboarding removed from ChannelPlugin type in 2026.3.23 but still supported at runtime
   onboarding: qqbotOnboardingAdapter,
 
   config: {
@@ -392,3 +433,45 @@ export const qqbotPlugin: ChannelPlugin<ResolvedQQBotAccount> = {
     }),
   },
 };
+
+// ============ 独立的 mention 工具函数（供 gateway.ts 等直接调用） ============
+
+/** 清理 @mention：替换 <@openid> 为 @用户名，去除 @机器人自身 */
+export function stripMentionText(text: string, mentions?: Array<{ member_openid?: string; id?: string; user_openid?: string; is_you?: boolean; nickname?: string; username?: string }>): string {
+  if (!text || !mentions?.length) return text;
+  let cleaned = text;
+  for (const m of mentions) {
+    const openid = m.member_openid ?? m.id ?? m.user_openid;
+    if (!openid) continue;
+    if (m.is_you) {
+      cleaned = cleaned.replace(new RegExp(`<@!?${openid}>`, "g"), "").trim();
+    } else {
+      const displayName = m.nickname ?? m.username;
+      if (displayName) {
+        cleaned = cleaned.replace(new RegExp(`<@!?${openid}>`, "g"), `@${displayName}`);
+      }
+    }
+  }
+  return cleaned;
+}
+
+/** 检测消息是否 @了机器人（mentions > eventType > mentionPatterns） */
+export function detectWasMentioned({ eventType, mentions, content, mentionPatterns }: {
+  eventType?: string;
+  mentions?: Array<{ is_you?: boolean }>;
+  content?: string;
+  mentionPatterns?: string[];
+}): boolean {
+  if (mentions?.some((m) => m.is_you)) return true;
+  if (eventType === "GROUP_AT_MESSAGE_CREATE") return true;
+  if (mentionPatterns?.length && content) {
+    for (const pattern of mentionPatterns) {
+      try {
+        if (new RegExp(pattern, "i").test(content)) return true;
+      } catch {
+        // 无效正则，跳过
+      }
+    }
+  }
+  return false;
+}

package/src/config.ts

@@ -1,12 +1,179 @@
-import type { ResolvedQQBotAccount, QQBotAccountConfig } from "./types.js";
-import type { OpenClawConfig } from "openclaw/plugin-sdk";
+import type { ResolvedQQBotAccount, QQBotAccountConfig, ToolPolicy, GroupConfig } from "./types.js";
+import type { OpenClawConfig, GroupPolicy } from "openclaw/plugin-sdk";
+
+// ============ Agent-aware mentionPatterns 解析 ============
+
+type AgentEntry = { id?: string; groupChat?: { mentionPatterns?: string[]; historyLimit?: number } };
+
+/**
+ * 解析 mentionPatterns（agent → global → 空数组）
+ *
+ * 优先级：
+ *   1. agents.list[agentId].groupChat.mentionPatterns
+ *   2. messages.groupChat.mentionPatterns
+ *   3. []
+ */
+export function resolveMentionPatterns(cfg: OpenClawConfig, agentId?: string): string[] {
+  // 1. agent 级别
+  if (agentId) {
+    const agents = (cfg as Record<string, unknown>).agents as { list?: AgentEntry[] } | undefined;
+    const entry = agents?.list?.find((a) => a.id?.trim().toLowerCase() === agentId.trim().toLowerCase());
+    const agentGroupChat = entry?.groupChat;
+    if (agentGroupChat && Object.hasOwn(agentGroupChat, "mentionPatterns")) {
+      return agentGroupChat.mentionPatterns ?? [];
+    }
+  }
+  // 2. 全局级别
+  const globalGroupChat = (cfg as any)?.messages?.groupChat;
+  if (globalGroupChat && typeof globalGroupChat === "object" && Object.hasOwn(globalGroupChat, "mentionPatterns")) {
+    return (globalGroupChat as { mentionPatterns?: string[] }).mentionPatterns ?? [];
+  }
+  // 3. 空数组
+  return [];
+}
 
 export const DEFAULT_ACCOUNT_ID = "default";
 
+// 内联 evaluateMatchedGroupAccessForPolicy（openclaw dist 尚未导出，本地实现）
+
+type MatchedGroupAccessReason = "allowed" | "disabled" | "missing_match_input" | "empty_allowlist" | "not_allowlisted";
+
+interface MatchedGroupAccessDecision {
+  allowed: boolean;
+  groupPolicy: GroupPolicy;
+  reason: MatchedGroupAccessReason;
+}
+
+function evaluateMatchedGroupAccessForPolicy(params: {
+  groupPolicy: GroupPolicy;
+  allowlistConfigured: boolean;
+  allowlistMatched: boolean;
+  requireMatchInput?: boolean;
+  hasMatchInput?: boolean;
+}): MatchedGroupAccessDecision {
+  if (params.groupPolicy === "disabled") {
+    return { allowed: false, groupPolicy: params.groupPolicy, reason: "disabled" };
+  }
+  if (params.groupPolicy === "allowlist") {
+    if (params.requireMatchInput && !params.hasMatchInput) {
+      return { allowed: false, groupPolicy: params.groupPolicy, reason: "missing_match_input" };
+    }
+    if (!params.allowlistConfigured) {
+      return { allowed: false, groupPolicy: params.groupPolicy, reason: "empty_allowlist" };
+    }
+    if (!params.allowlistMatched) {
+      return { allowed: false, groupPolicy: params.groupPolicy, reason: "not_allowlisted" };
+    }
+  }
+  return { allowed: true, groupPolicy: params.groupPolicy, reason: "allowed" };
+}
+
 interface QQBotChannelConfig extends QQBotAccountConfig {
   accounts?: Record<string, QQBotAccountConfig>;
 }
 
+// ============ 群消息策略 ============
+
+const DEFAULT_GROUP_POLICY: GroupPolicy = "open";
+
+/** 群历史缓存条数默认值 */
+const DEFAULT_GROUP_HISTORY_LIMIT = 50;
+
+const DEFAULT_GROUP_CONFIG: Omit<Required<GroupConfig>, "prompt"> = {
+  requireMention: true,
+  ignoreOtherMentions: false,
+  toolPolicy: "restricted",
+  name: "",
+  historyLimit: DEFAULT_GROUP_HISTORY_LIMIT,
+};
+
+/** 默认群消息行为 PE（可通过配置覆盖） */
+const DEFAULT_GROUP_PROMPT = [
+  "若发送者为机器人，仅在对方明确@你提问或请求协助具体任务时，以简洁明了的内容回复，",
+  "避免与其他机器人产生抢答或多轮无意义对话。",
+  "在群聊中优先让人类用户的消息得到响应，机器人之间保持协作而非竞争，确保对话有序不刷屏。",
+].join("");
+
+/** 解析群消息策略 */
+export function resolveGroupPolicy(cfg: OpenClawConfig, accountId?: string): GroupPolicy {
+  const account = resolveQQBotAccount(cfg, accountId);
+  return account.config?.groupPolicy ?? DEFAULT_GROUP_POLICY;
+}
+
+/** 解析群白名单（统一转大写） */
+export function resolveGroupAllowFrom(cfg: OpenClawConfig, accountId?: string): string[] {
+  const account = resolveQQBotAccount(cfg, accountId);
+  return (account.config?.groupAllowFrom ?? []).map((id) => String(id).trim().toUpperCase());
+}
+
+/** 检查指定群是否被允许（使用标准策略引擎） */
+export function isGroupAllowed(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): boolean {
+  const policy = resolveGroupPolicy(cfg, accountId);
+  const allowList = resolveGroupAllowFrom(cfg, accountId);
+  const allowlistConfigured = allowList.length > 0;
+  const allowlistMatched = allowList.some((id) => id === "*" || id === groupOpenid.toUpperCase());
+
+  return evaluateMatchedGroupAccessForPolicy({
+    groupPolicy: policy,
+    allowlistConfigured,
+    allowlistMatched,
+  }).allowed;
+}
+
+type ResolvedGroupConfig = Omit<Required<GroupConfig>, "prompt"> & Pick<GroupConfig, "prompt">;
+
+/** 解析指定群配置（具体 groupOpenid > 通配符 "*" > 默认值） */
+export function resolveGroupConfig(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): ResolvedGroupConfig {
+  const account = resolveQQBotAccount(cfg, accountId);
+  const groups = account.config?.groups ?? {};
+
+  const wildcardCfg = groups["*"] ?? {};
+  const specificCfg = groups[groupOpenid] ?? {};
+
+  return {
+    requireMention: specificCfg.requireMention ?? wildcardCfg.requireMention ?? DEFAULT_GROUP_CONFIG.requireMention,
+    ignoreOtherMentions: specificCfg.ignoreOtherMentions ?? wildcardCfg.ignoreOtherMentions ?? DEFAULT_GROUP_CONFIG.ignoreOtherMentions,
+    toolPolicy: specificCfg.toolPolicy ?? wildcardCfg.toolPolicy ?? DEFAULT_GROUP_CONFIG.toolPolicy,
+    name: specificCfg.name ?? wildcardCfg.name ?? DEFAULT_GROUP_CONFIG.name,
+    prompt: specificCfg.prompt ?? wildcardCfg.prompt,
+    historyLimit: specificCfg.historyLimit ?? wildcardCfg.historyLimit ?? DEFAULT_GROUP_CONFIG.historyLimit,
+  };
+}
+
+/** 解析群历史消息缓存条数 */
+export function resolveHistoryLimit(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): number {
+  return Math.max(0, resolveGroupConfig(cfg, groupOpenid, accountId).historyLimit);
+}
+
+/** 解析群行为 PE（具体群 > "*" > 默认值） */
+export function resolveGroupPrompt(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): string {
+  const account = resolveQQBotAccount(cfg, accountId);
+  const groups = account.config?.groups ?? {};
+
+  return groups[groupOpenid]?.prompt ?? groups["*"]?.prompt ?? DEFAULT_GROUP_PROMPT;
+}
+
+/** 解析群是否需要 @机器人才响应 */
+export function resolveRequireMention(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): boolean {
+  return resolveGroupConfig(cfg, groupOpenid, accountId).requireMention;
+}
+
+/** 解析群是否忽略 @了其他人（非 bot）的消息 */
+export function resolveIgnoreOtherMentions(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): boolean {
+  return resolveGroupConfig(cfg, groupOpenid, accountId).ignoreOtherMentions;
+}
+
+/** 解析群工具策略 */
+export function resolveToolPolicy(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): ToolPolicy {
+  return resolveGroupConfig(cfg, groupOpenid, accountId).toolPolicy;
+}
+
+/** 解析群名称（优先配置，fallback 为 openid 前 8 位） */
+export function resolveGroupName(cfg: OpenClawConfig, groupOpenid: string, accountId?: string): string {
+  const name = resolveGroupConfig(cfg, groupOpenid, accountId).name;
+  return name || groupOpenid.slice(0, 8);
+}
+
 function normalizeAppId(raw: unknown): string {
   if (raw === null || raw === undefined) return "";
   return String(raw).trim();
@@ -60,7 +227,7 @@ export function resolveQQBotAccount(
   cfg: OpenClawConfig,
   accountId?: string | null
 ): ResolvedQQBotAccount {
-  const resolvedAccountId = accountId ?? DEFAULT_ACCOUNT_ID;
+  const resolvedAccountId = accountId ?? resolveDefaultQQBotAccountId(cfg);
   const qqbot = cfg.channels?.qqbot as QQBotChannelConfig | undefined;
 
   // 基础配置