@jerryliang122/openclaw-qqbot 1.0.1 → 1.0.2

package/src/middleware/secret-capture.ts

@@ -49,14 +49,16 @@ async function replyToUser(
       try {
         await ctx.bot.sendText(ctx.replyTarget, text);
         return;
-      } catch {
+      } catch (err) {
         rollback();
-        // 落到主动降级
+        ctx.log?.warn?.(`[secret] passive reply failed, falling back to proactive: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
   }
   const proactiveTarget = { scope: 'c2c' as const, targetId: ctx.message.senderId as string };
-  await ctx.bot.sendText(proactiveTarget, text).catch(() => {/* 尽力而为 */});
+  await ctx.bot.sendText(proactiveTarget, text).catch((err: unknown) => {
+    ctx.log?.warn?.(`[secret] proactive reply failed: ${err instanceof Error ? err.message : String(err)}`);
+  });
 }
 
 function formatSetFailure(name: string, result: SecretsStoreSetResult): string {

package/src/outbound/debounce.ts

@@ -13,6 +13,9 @@ const DEFAULT_WINDOW_MS = 1500;
 const DEFAULT_MAX_WAIT_MS = 8000;
 const DEFAULT_SEPARATOR = '\n\n---\n\n';
 
+// 最小结构类型：兼容 PluginLogger 与 SDK Logger（与 config-util 同款）
+type WarnSink = { warn?: (msg: string, meta?: Record<string, unknown>) => void };
+
 interface PendingDeliver {
   texts: string[];
   firstAt: number;
@@ -26,15 +29,18 @@ export class DeliverDebouncer {
   private readonly maxWaitMs: number;
   private readonly separator: string;
   private readonly flush: (targetId: string, mergedText: string) => Promise<void>;
+  private readonly log?: WarnSink;
 
   constructor(
     config: DeliverDebounceConfig | undefined,
     flush: (targetId: string, mergedText: string) => Promise<void>,
+    log?: WarnSink,
   ) {
     this.windowMs = config?.windowMs ?? DEFAULT_WINDOW_MS;
     this.maxWaitMs = config?.maxWaitMs ?? DEFAULT_MAX_WAIT_MS;
     this.separator = config?.separator ?? DEFAULT_SEPARATOR;
     this.flush = flush;
+    this.log = log;
   }
 
   get enabled(): boolean {
@@ -60,7 +66,7 @@ export class DeliverDebouncer {
       if (Date.now() - existing.firstAt >= this.maxWaitMs) {
         await this.doFlush(targetId);
       } else {
-        existing.timer = setTimeout(() => this.doFlush(targetId), this.windowMs);
+        existing.timer = setTimeout(() => this.scheduledFlush(targetId), this.windowMs);
       }
       return;
     }
@@ -70,13 +76,24 @@ export class DeliverDebouncer {
       const pending: PendingDeliver = {
         texts: [text],
         firstAt: Date.now(),
-        timer: setTimeout(() => this.doFlush(targetId), this.windowMs),
+        timer: setTimeout(() => this.scheduledFlush(targetId), this.windowMs),
         resolve,
       };
       this.pending.set(targetId, pending);
     });
   }
 
+  /**
+   * 定时器触发的 flush：promise 被 setTimeout 回调丢弃，失败若不就地
+   * 捕获会成为 unhandledRejection——记 WARN 封口（pending.resolve 在
+   * doFlush 的 finally 中仍会执行，入队方不会被悬挂）。
+   */
+  private scheduledFlush(targetId: string): void {
+    void this.doFlush(targetId).catch((err: unknown) => {
+      this.log?.warn?.(`[debounce] timer flush failed target=${targetId}: ${err instanceof Error ? err.message : String(err)}`);
+    });
+  }
+
   private async doFlush(targetId: string): Promise<void> {
     const pending = this.pending.get(targetId);
     if (!pending) return;

package/src/outbound-adapter.ts

@@ -28,6 +28,11 @@ import { isApprovalPayload } from './features/approval-utils.js';
 import { TEXT_CHUNK_LIMIT } from './constants.js';
 import { tryGetQQBotRuntime } from './runtime.js';
 import { getAdapters } from './adapter/resolve.js';
+import { createPluginLogger } from './utils/plugin-logger.js';
+
+// 契约入口（框架直发 / message 工具 / cron announce）无调用方 logger 可传，
+// 用模块级 logger 兜底——frameworkSink 每次调用时 resolve，register 早期自动降级 console
+const alog = createPluginLogger({ prefix: '[outbound]' });
 
 export type SendTextFn = (params: {
   to: string;
@@ -178,6 +183,8 @@ export function createQQBotOutboundAdapter(params: QQBotOutboundAdapterParams):
       if (canReply && replyToId && result.error) {
         rollback();
         log?.debug?.(`[${resolvedAccountId}] rollback quota: send failed`);
+      } else if (!canReply) {
+        log?.info?.(`[${resolvedAccountId}] [quota] fallback to proactive media send: quota exhausted or no msgId`);
       }
 
       return result;
@@ -287,6 +294,7 @@ export function createQQBotChannelOutbound(params: QQBotOutboundAdapterParams =
         accountId: ctx.accountId ?? undefined,
         replyToId: resolvePassiveFirstReplyToId(ctx.to, ctx.replyToId),
         account,
+        log: alog,
       });
       if (result.error) throw new Error(result.error);
       return { channel: 'qqbot', messageId: result.messageId ?? '' };
@@ -302,7 +310,8 @@ export function createQQBotChannelOutbound(params: QQBotOutboundAdapterParams =
         accountId: resolvedAccountId,
         replyToId: resolvePassiveFirstReplyToId(ctx.to, ctx.replyToId),
         account,
-        agentId: resolveMCPAgentId(ctx.to, resolvedAccountId, ctx.cfg),
+        agentId: resolveMCPAgentId(ctx.to, resolvedAccountId, ctx.cfg, alog),
+        log: alog,
       });
       if (result.error) throw new Error(result.error);
       return { channel: 'qqbot', messageId: result.messageId ?? '' };

package/src/setup/finalize.ts

@@ -49,13 +49,14 @@ async function linkViaQrCode(cfg: OpenClawConfig, _accountId: string, prompter:
   }
 }
 
-async function linkViaManual(cfg: OpenClawConfig, _accountId: string, prompter: Prompter): Promise<OpenClawConfig> {
+async function linkViaManual(cfg: OpenClawConfig, _accountId: string, prompter: Prompter, rt: Runtime): Promise<OpenClawConfig> {
   const appIdInput = await prompter.text({ message: '请输入 QQ Bot AppID', validate: (v) => v.trim() ? undefined : 'AppID 不能为空' });
   const secret = await prompter.text({ message: '请输入 QQ Bot AppSecret', validate: (v) => v.trim() ? undefined : 'AppSecret 不能为空' });
   const appId = appIdInput.trim();
   const key = resolveAccountKey(cfg, appId);
   let next = applyQQBotAccountConfig(cfg, key, { appId, clientSecret: secret.trim() });
   next = applyAccountDefaults(next, key);
+  rt.log(`手动绑定完成！账户: ${key} (AppID: ${appId})`);
   await prompter.note('✔ QQ Bot 配置完成！', 'QQ Bot');
   return next;
 }
@@ -82,7 +83,7 @@ export async function finalizeQQBotSetup(params: {
   if (mode === 'qr') {
     next = await linkViaQrCode(next, accountId, params.prompter, params.runtime);
   } else if (mode === 'manual') {
-    next = await linkViaManual(next, accountId, params.prompter);
+    next = await linkViaManual(next, accountId, params.prompter, params.runtime);
   } else if (!configured) {
     await params.prompter.note('您可以稍后运行以下命令重新配置：\n  openclaw channels add', 'QQ Bot');
   }

package/src/tools/platform.ts

@@ -2,6 +2,11 @@ import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
 import { listQQBotAccountIds } from '../config.js';
 import { getBotForAccount } from '../bot-instance.js';
 import { getRequestAccountId } from '../request-context.js';
+import { createPluginLogger } from '../utils/plugin-logger.js';
+
+// 工具 execute 无 logger 参数；request-context 活跃期间 enrichMeta
+// 自动带上 accountId/openId/messageId
+const toolLog = createPluginLogger({ prefix: '[tool:platform]' });
 
 // ========== JSON Schema ==========
 
@@ -111,6 +116,7 @@ export function registerPlatformTool(api: OpenClawPluginApi): void {
         try {
           const bot = getBotForAccount(accountId);
           const apiGateway = bot.api;
+          const startedAt = Date.now();
 
           let data: unknown;
           switch (method) {
@@ -131,10 +137,12 @@ export function registerPlatformTool(api: OpenClawPluginApi): void {
               break;
           }
 
+          toolLog.info(`${method} ${p.path} ok (${Date.now() - startedAt}ms)`, { accountId });
           return json(data);
         } catch (err: unknown) {
           const errMsg = err instanceof Error ? err.message : String(err);
           const apiErr = err as { httpStatus?: number; bizCode?: number; path?: string };
+          toolLog.warn(`${method} ${p.path} failed status=${apiErr.httpStatus ?? '?'} code=${apiErr.bizCode ?? '?'}: ${errMsg}`, { accountId });
           return json({
             error: errMsg,
             status: apiErr.httpStatus,

package/src/tools/secret-input.ts

@@ -22,8 +22,13 @@ import {
 } from '../features/secret-input-store.js';
 import { getRequestAccountId, getRequestTarget } from '../request-context.js';
 import { parseTarget } from '../outbound/target.js';
+import { createPluginLogger } from '../utils/plugin-logger.js';
 import type { InlineKeyboard, KeyboardButton } from '../types.js';
 
+// 工具 execute 无 logger 参数可传；request-context 在工具执行期间处于活跃，
+// 模块级 logger 的 enrichMeta 会自动带上 accountId/openId/messageId
+const toolLog = createPluginLogger({ prefix: '[tool:secret-input]' });
+
 // ========== JSON Schema ==========
 
 const SecretInputSchema = {
@@ -162,11 +167,14 @@ export function registerSecretInputTool(api: OpenClawPluginApi): void {
           );
         } catch (err) {
           cancelPendingSecretInput(accountId, parsed.targetId);
+          toolLog.error(`card send failed: ${err instanceof Error ? err.message : String(err)}`, { name, accountId });
           return json({
             error: `密钥输入卡片发送失败：${err instanceof Error ? err.message : String(err)}`,
           });
         }
 
+        toolLog.info(`card sent, pending registered name=${name} ttlMinutes=${DEFAULT_SECRET_INPUT_TTL_MS / 60_000}`);
+
         return json({
           ok: true,
           name,

package/src/types-plugin.ts

@@ -69,6 +69,7 @@ export interface TypingParams {
   replyToId: string;
   log?: {
     debug?: (message: string) => void;
+    warn?: (message: string) => void;
   };
 }
 

package/src/typing-lifecycle.ts

@@ -59,14 +59,17 @@ export async function startTypingWithRenewal(
 
   log?.debug?.(`[${accountId}] typing started: ${sessionKey}`);
 
-  const timer = setTimeout(async () => {
-    await handleTypingRenewal({
+  const timer = setTimeout(() => {
+    // promise 被 setTimeout 回调丢弃，失败不就地捕获会成为 unhandledRejection
+    void handleTypingRenewal({
       sessionKey,
       accountId,
       to,
       replyToId,
       log,
       sendTyping,
+    }).catch((err: unknown) => {
+      log?.warn?.(`[${accountId}] typing renewal error: ${err instanceof Error ? err.message : String(err)}`);
     });
   }, TYPING_RENEWAL_MS);
 
@@ -120,8 +123,10 @@ async function handleTypingRenewal(
   state.renewalCount += 1;
   log?.debug?.(`[${accountId}] typing renewed #${state.renewalCount}: ${sessionKey}`);
 
-  state.timer = setTimeout(async () => {
-    await handleTypingRenewal(params);
+  state.timer = setTimeout(() => {
+    void handleTypingRenewal(params).catch((err: unknown) => {
+      log?.warn?.(`[${accountId}] typing renewal error: ${err instanceof Error ? err.message : String(err)}`);
+    });
   }, TYPING_RENEWAL_MS);
 
   activeTypingSessions.set(sessionKey, state);