@tencent-connect/openclaw-qqbot 1.6.4-alpha.14 → 1.6.4-alpha.16

package/clawdbot.plugin.json

@@ -3,7 +3,7 @@
   "name": "OpenClaw QQ Bot",
   "description": "QQ Bot channel plugin with message support, cron jobs, and proactive messaging",
   "channels": ["qqbot"],
-  "skills": ["skills/qqbot-channel", "skills/qqbot-cron", "skills/qqbot-media"],
+  "skills": ["skills/qqbot-channel", "skills/qqbot-remind", "skills/qqbot-media"],
   "capabilities": {
     "proactiveMessaging": true,
     "cronJobs": true

package/dist/index.js

@@ -2,6 +2,7 @@ import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { qqbotPlugin } from "./src/channel.js";
 import { setQQBotRuntime } from "./src/runtime.js";
 import { registerChannelTool } from "./src/tools/channel.js";
+import { registerRemindTool } from "./src/tools/remind.js";
 const plugin = {
     id: "openclaw-qqbot",
     name: "QQ Bot",
@@ -11,6 +12,7 @@ const plugin = {
         setQQBotRuntime(api.runtime);
         api.registerChannel({ plugin: qqbotPlugin });
         registerChannelTool(api);
+        registerRemindTool(api);
     },
 };
 export default plugin;

package/dist/src/admin-resolver.d.ts

@@ -0,0 +1,27 @@
+/**
+ * 管理员解析器模块
+ * - 管理员 openid 持久化读写
+ * - 升级问候目标读写
+ * - 启动问候语发送
+ */
+export interface AdminResolverContext {
+    accountId: string;
+    appId: string;
+    clientSecret: string;
+    log?: {
+        info: (msg: string) => void;
+        error: (msg: string) => void;
+    };
+}
+export declare function loadAdminOpenId(accountId: string): string | undefined;
+export declare function saveAdminOpenId(accountId: string, openid: string): void;
+export declare function loadUpgradeGreetingTargetOpenId(accountId: string, appId: string): string | undefined;
+export declare function clearUpgradeGreetingTargetOpenId(accountId: string, appId: string): void;
+/**
+ * 解析管理员 openid：
+ * 1. 优先读持久化文件（稳定）
+ * 2. fallback 取第一个私聊用户，并写入文件锁定
+ */
+export declare function resolveAdminOpenId(ctx: Pick<AdminResolverContext, "accountId" | "log">): string | undefined;
+/** 异步发送启动问候语（仅发给管理员） */
+export declare function sendStartupGreetings(ctx: AdminResolverContext, trigger: "READY" | "RESUMED"): void;

package/dist/src/admin-resolver.js

@@ -0,0 +1,122 @@
+/**
+ * 管理员解析器模块
+ * - 管理员 openid 持久化读写
+ * - 升级问候目标读写
+ * - 启动问候语发送
+ */
+import path from "node:path";
+import * as fs from "node:fs";
+import { getQQBotDataDir } from "./utils/platform.js";
+import { listKnownUsers } from "./known-users.js";
+import { getAccessToken, sendProactiveC2CMessage } from "./api.js";
+import { getStartupGreetingPlan, markStartupGreetingSent, markStartupGreetingFailed } from "./startup-greeting.js";
+// ---- 文件路径 ----
+function getAdminMarkerFile(accountId) {
+    return path.join(getQQBotDataDir("data"), `admin-${accountId}.json`);
+}
+function getUpgradeGreetingTargetFile(accountId, appId) {
+    const safeAccountId = accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
+    const safeAppId = appId.replace(/[^a-zA-Z0-9._-]/g, "_");
+    return path.join(getQQBotDataDir("data"), `upgrade-greeting-target-${safeAccountId}-${safeAppId}.json`);
+}
+// ---- 管理员 openid 持久化 ----
+export function loadAdminOpenId(accountId) {
+    try {
+        const file = getAdminMarkerFile(accountId);
+        if (fs.existsSync(file)) {
+            const data = JSON.parse(fs.readFileSync(file, "utf8"));
+            if (data.openid)
+                return data.openid;
+        }
+    }
+    catch { /* 文件损坏视为无 */ }
+    return undefined;
+}
+export function saveAdminOpenId(accountId, openid) {
+    try {
+        fs.writeFileSync(getAdminMarkerFile(accountId), JSON.stringify({ openid, savedAt: new Date().toISOString() }));
+    }
+    catch { /* ignore */ }
+}
+// ---- 升级问候目标 ----
+export function loadUpgradeGreetingTargetOpenId(accountId, appId) {
+    try {
+        const file = getUpgradeGreetingTargetFile(accountId, appId);
+        if (fs.existsSync(file)) {
+            const data = JSON.parse(fs.readFileSync(file, "utf8"));
+            if (!data.openid)
+                return undefined;
+            if (data.appId && data.appId !== appId)
+                return undefined;
+            if (data.accountId && data.accountId !== accountId)
+                return undefined;
+            return data.openid;
+        }
+    }
+    catch { /* 文件损坏视为无 */ }
+    return undefined;
+}
+export function clearUpgradeGreetingTargetOpenId(accountId, appId) {
+    try {
+        const file = getUpgradeGreetingTargetFile(accountId, appId);
+        if (fs.existsSync(file)) {
+            fs.unlinkSync(file);
+        }
+    }
+    catch { /* ignore */ }
+}
+// ---- 解析管理员 ----
+/**
+ * 解析管理员 openid：
+ * 1. 优先读持久化文件（稳定）
+ * 2. fallback 取第一个私聊用户，并写入文件锁定
+ */
+export function resolveAdminOpenId(ctx) {
+    const saved = loadAdminOpenId(ctx.accountId);
+    if (saved)
+        return saved;
+    const first = listKnownUsers({ accountId: ctx.accountId, type: "c2c", sortBy: "firstSeenAt", sortOrder: "asc", limit: 1 })[0]?.openid;
+    if (first) {
+        saveAdminOpenId(ctx.accountId, first);
+        ctx.log?.info(`[qqbot:${ctx.accountId}] Auto-detected admin openid: ${first} (persisted)`);
+    }
+    return first;
+}
+// ---- 启动问候语 ----
+/** 异步发送启动问候语（仅发给管理员） */
+export function sendStartupGreetings(ctx, trigger) {
+    (async () => {
+        const plan = getStartupGreetingPlan();
+        if (!plan.shouldSend || !plan.greeting) {
+            ctx.log?.info(`[qqbot:${ctx.accountId}] Skipping startup greeting (${plan.reason ?? "debounced"}, trigger=${trigger})`);
+            return;
+        }
+        const upgradeTargetOpenId = loadUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId);
+        const targetOpenId = upgradeTargetOpenId || resolveAdminOpenId(ctx);
+        if (!targetOpenId) {
+            markStartupGreetingFailed(plan.version, "no-admin");
+            ctx.log?.info(`[qqbot:${ctx.accountId}] Skipping startup greeting (no admin or known user)`);
+            return;
+        }
+        try {
+            const receiverType = upgradeTargetOpenId ? "upgrade-requester" : "admin";
+            ctx.log?.info(`[qqbot:${ctx.accountId}] Sending startup greeting to ${receiverType} (trigger=${trigger}): "${plan.greeting}"`);
+            const token = await getAccessToken(ctx.appId, ctx.clientSecret);
+            const GREETING_TIMEOUT_MS = 10_000;
+            await Promise.race([
+                sendProactiveC2CMessage(token, targetOpenId, plan.greeting),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("Startup greeting send timeout (10s)")), GREETING_TIMEOUT_MS)),
+            ]);
+            markStartupGreetingSent(plan.version);
+            if (upgradeTargetOpenId) {
+                clearUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId);
+            }
+            ctx.log?.info(`[qqbot:${ctx.accountId}] Sent startup greeting to ${receiverType}: ${targetOpenId}`);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            markStartupGreetingFailed(plan.version, message);
+            ctx.log?.error(`[qqbot:${ctx.accountId}] Failed to send startup greeting: ${message}`);
+        }
+    })();
+}

package/dist/src/channel.js

@@ -5,6 +5,7 @@ import { startGateway } from "./gateway.js";
 import { qqbotOnboardingAdapter } from "./onboarding.js";
 import { getQQBotRuntime } from "./runtime.js";
 import { saveCredentialBackup, loadCredentialBackup } from "./credential-backup.js";
+import { initApiConfig } from "./api.js";
 /** QQ Bot 单条消息文本长度上限 */
 export const TEXT_CHUNK_LIMIT = 5000;
 /**
@@ -201,6 +202,7 @@ export const qqbotPlugin = {
             console.log(`[qqbot:channel] sendText called — accountId=${accountId}, to=${to}, replyToId=${replyToId}, text.length=${text?.length ?? 0}`);
             console.log(`[qqbot:channel] sendText text preview: ${text?.slice(0, 100)}${(text?.length ?? 0) > 100 ? "..." : ""}`);
             const account = resolveQQBotAccount(cfg, accountId);
+            initApiConfig({ markdownSupport: account.markdownSupport });
             console.log(`[qqbot:channel] sendText resolved account: id=${account.accountId}, appId=${account.appId}, enabled=${account.enabled}`);
             const result = await sendText({ to, text, accountId, replyToId, account });
             console.log(`[qqbot:channel] sendText result: messageId=${result.messageId}, error=${result.error ?? "none"}`);
@@ -213,6 +215,7 @@ export const qqbotPlugin = {
         sendMedia: async ({ to, text, mediaUrl, accountId, replyToId, cfg }) => {
             console.log(`[qqbot:channel] sendMedia called — accountId=${accountId}, to=${to}, replyToId=${replyToId}, mediaUrl=${mediaUrl?.slice(0, 80)}, text.length=${text?.length ?? 0}`);
             const account = resolveQQBotAccount(cfg, accountId);
+            initApiConfig({ markdownSupport: account.markdownSupport });
             console.log(`[qqbot:channel] sendMedia resolved account: id=${account.accountId}, appId=${account.appId}, enabled=${account.enabled}`);
             const result = await sendMedia({ to, text: text ?? "", mediaUrl: mediaUrl ?? "", accountId, replyToId, account });
             console.log(`[qqbot:channel] sendMedia result: messageId=${result.messageId}, error=${result.error ?? "none"}`);