@tencent-connect/openclaw-qqbot 1.7.0 → 1.7.2

package/src/slash-commands.ts

@@ -22,6 +22,7 @@ import { saveCredentialBackup } from "./credential-backup.js";
 import { fileURLToPath } from "node:url";
 import { getPackageVersion } from "./utils/pkg-version.js";
 import { getQQBotRuntime } from "./runtime.js";
+import { isApprovalFeatureAvailable } from "./approval-handler.js";
 const require = createRequire(import.meta.url);
 
 let PLUGIN_VERSION = getPackageVersion(import.meta.url);
@@ -33,11 +34,16 @@ export function getFrameworkVersion(): string {
     // Windows 上 npm 安装的 CLI 通常是 .cmd wrapper，execFileSync 需要 shell:true 才能执行
     for (const cli of ["openclaw", "clawdbot", "moltbot"]) {
       try {
-        const out = execFileSync(cli, ["--version"], {
+        const rawOut = execFileSync(cli, ["--version"], {
           timeout: 3000, encoding: "utf8",
           ...(isWindows() ? { shell: true } : {}),
         }).trim();
         // 输出格式: "OpenClaw 2026.3.13 (61d171a)"
+        // CLI 启动时可能输出 proxy 等初始化日志到 stdout，需过滤出真正的版本行
+        const out = rawOut
+          .split("\n")
+          .find((line) => /^(OpenClaw|clawdbot|moltbot)\s/i.test(line))
+          ?.trim() ?? rawOut;
         if (out) {
           return out;
         }
@@ -216,8 +222,8 @@ export interface QueueSnapshot {
   senderPending: number;
 }
 
-/** 斜杠指令返回值：文本、带文件的结果、或 null（不处理） */
-export type SlashCommandResult = string | SlashCommandFileResult | null;
+/** 斜杠指令返回值：文本、带文件的结果、委托给模型、或 null（不处理） */
+export type SlashCommandResult = string | SlashCommandFileResult | SlashCommandDelegateResult | null;
 
 /** 带文件的指令结果（先回复文本，再发送文件） */
 export interface SlashCommandFileResult {
@@ -226,6 +232,12 @@ export interface SlashCommandFileResult {
   filePath: string;
 }
 
+/** 委托给 AI 模型处理：用加工后的 prompt 替换原始消息入队 */
+export interface SlashCommandDelegateResult {
+  /** 替换原始消息内容的 prompt，交给 AI 模型执行 */
+  delegatePrompt: string;
+}
+
 /** 斜杠指令定义 */
 interface SlashCommand {
   /** 指令名（不含 /） */
@@ -325,7 +337,7 @@ registerCommand({
   ].join("\n"),
   handler: (ctx) => {
     // 群聊场景排除仅限私聊的指令
-    const GROUP_EXCLUDED_COMMANDS = new Set(["bot-upgrade", "bot-clear-storage"]);
+    const GROUP_EXCLUDED_COMMANDS = new Set(["bot-upgrade", "bot-clear-storage", "bot-logs", "bot-approve", "bot-group-allways", "bot-streaming"]);
     const isGroup = ctx.type === "group";
 
     const lines = [`### QQBot插件内置调试指令`, ``];
@@ -1630,7 +1642,12 @@ registerCommand({
     `导出最近的 OpenClaw 日志文件（最多 4 个）。`,
     `每个文件最多保留最后 1000 行，以文件形式返回。`,
   ].join("\n"),
-  handler: () => {
+  handler: (ctx) => {
+    // 日志导出仅在私聊中可用
+    if (ctx.type !== "c2c") {
+      return `💡 请在私聊中使用此指令`;
+    }
+
     const logDirs = collectCandidateLogDirs();
     const recentFiles = collectRecentLogFiles(logDirs).slice(0, 4);
 
@@ -2008,6 +2025,374 @@ registerCommand({
   },
 });
 
+// ============ /bot-approve 审批配置管理 ============
+
+/**
+ * /bot-approve — 管理命令执行审批配置
+ *
+ * 修改 openclaw.json 中 tools.exec.security / tools.exec.ask 字段。
+ *
+ * security: deny | allowlist | full
+ * ask: off | on-miss | always
+ */
+registerCommand({
+  name: "bot-approve",
+  description: "管理命令执行审批配置",
+  usage: [
+    `/bot-approve            查看操作指引`,
+    `/bot-approve on         开启审批（白名单模式，推荐）`,
+    `/bot-approve off        关闭审批，命令直接执行`,
+    `/bot-approve always     始终审批，每次执行都需审批`,
+    `/bot-approve reset      恢复框架默认值`,
+    `/bot-approve status     查看当前审批配置`,
+  ].join("\n"),
+  handler: async (ctx) => {
+    // 审批管理仅在私聊中可用
+    if (ctx.type !== "c2c") {
+      return `💡 请在私聊中使用此指令`;
+    }
+
+    const arg = ctx.args.trim().toLowerCase();
+
+    // 审批功能需要 openclaw >= 3.22（gateway-runtime 模块）
+    if (!isApprovalFeatureAvailable()) {
+      return `❌ 当前 OpenClaw 版本不支持审批功能，请升级至最新版本后重试。`;
+    }
+
+    let runtime;
+    try {
+      runtime = getQQBotRuntime();
+    } catch {
+      // runtime 不可用，构造 prompt 委托给 AI 模型通过 CLI 完成
+      const presetMap: Record<string, { security: string; ask: string; desc: string }> = {
+        on: { security: "allowlist", ask: "on-miss", desc: "开启审批（白名单模式）" },
+        off: { security: "full", ask: "off", desc: "关闭审批" },
+        always: { security: "allowlist", ask: "always", desc: "严格模式（每次都审批）" },
+        strict: { security: "allowlist", ask: "always", desc: "严格模式（每次都审批）" },
+      };
+      const preset = presetMap[arg];
+      if (preset) {
+        return {
+          delegatePrompt: [
+            `请帮我${preset.desc}。执行以下单条命令（不要拆开）：`,
+            `openclaw config set tools.exec.security ${preset.security} && openclaw config set tools.exec.ask ${preset.ask}`,
+            `执行完成后告诉用户审批配置已更新为 security=${preset.security}, ask=${preset.ask}。`,
+          ].join("\n"),
+        };
+      }
+      if (arg === "reset") {
+        return {
+          delegatePrompt: [
+            `请帮我重置审批配置。执行以下单条命令（不要拆开）：`,
+            `openclaw config unset tools.exec.security && openclaw config unset tools.exec.ask`,
+            `执行完成后告诉用户审批配置已重置为框架默认值。`,
+          ].join("\n"),
+        };
+      }
+      if (arg === "status") {
+        return {
+          delegatePrompt: [
+            `请帮我查看当前命令执行审批配置。执行以下单条命令（不要拆开）：`,
+            `echo "security=$(openclaw config get tools.exec.security)" && echo "ask=$(openclaw config get tools.exec.ask)"`,
+            `然后告诉用户当前 security 和 ask 的值，以及可用的操作选项：`,
+            `- /bot-approve on    开启审批（白名单模式）`,
+            `- /bot-approve off   关闭审批`,
+            `- /bot-approve always 严格模式`,
+            `- /bot-approve reset 恢复默认`,
+          ].join("\n"),
+        };
+      }
+      // 无参数或未知参数：直接返回操作指引
+      return [
+        `🔐 命令执行审批配置`,
+        ``,
+        `<qqbot-cmd-input text="/bot-approve on" show="/bot-approve on"/> 开启审批（白名单模式）`,
+        `<qqbot-cmd-input text="/bot-approve off" show="/bot-approve off"/> 关闭审批`,
+        `<qqbot-cmd-input text="/bot-approve always" show="/bot-approve always"/> 严格模式`,
+        `<qqbot-cmd-input text="/bot-approve reset" show="/bot-approve reset"/> 恢复默认`,
+        `<qqbot-cmd-input text="/bot-approve status" show="/bot-approve status"/> 查看当前配置`,
+      ].join("\n");
+    }
+    const configApi = runtime.config as {
+      loadConfig: () => Record<string, unknown>;
+      writeConfigFile: (cfg: unknown) => Promise<void>;
+    };
+
+    const loadExecConfig = () => {
+      const cfg = configApi.loadConfig() as Record<string, unknown>;
+      const tools = (cfg.tools ?? {}) as Record<string, unknown>;
+      const exec = (tools.exec ?? {}) as Record<string, unknown>;
+      return {
+        security: String(exec.security ?? "deny"),
+        ask: String(exec.ask ?? "on-miss"),
+      };
+    };
+
+    const writeExecConfig = async (security: string, ask: string) => {
+      const cfg = structuredClone(configApi.loadConfig()) as Record<string, unknown>;
+      const tools = ((cfg.tools ?? {}) as Record<string, unknown>);
+      const exec = ((tools.exec ?? {}) as Record<string, unknown>);
+      exec.security = security;
+      exec.ask = ask;
+      tools.exec = exec;
+      cfg.tools = tools;
+      await configApi.writeConfigFile(cfg);
+    };
+
+    const formatStatus = (security: string, ask: string) => {
+      const secIcon = security === "full" ? "🟢" : security === "allowlist" ? "🟡" : "🔴";
+      const askIcon = ask === "off" ? "🟢" : ask === "always" ? "🔴" : "🟡";
+      return [
+        `🔐 当前审批配置`,
+        ``,
+        `${secIcon} 安全模式 (security): **${security}**`,
+        `${askIcon} 审批模式 (ask): **${ask}**`,
+        ``,
+        security === "deny" ? `⚠️ 当前为 deny 模式，所有命令执行被拒绝` :
+        security === "full" && ask === "off" ? `✅ 所有命令无需审批直接执行` :
+        security === "allowlist" && ask === "on-miss" ? `🛡️ 白名单命令直接执行，其余需审批` :
+        ask === "always" ? `🔒 每次命令执行都需要人工审批` :
+        `ℹ️ security=${security}, ask=${ask}`,
+      ].join("\n");
+    };
+
+    // 无参数：操作指引
+    if (!arg) {
+      return [
+        `🔐 命令执行审批配置`,
+        ``,
+        `<qqbot-cmd-input text="/bot-approve on" show="/bot-approve on"/> 开启审批（白名单模式）`,
+        `<qqbot-cmd-input text="/bot-approve off" show="/bot-approve off"/> 关闭审批`,
+        `<qqbot-cmd-input text="/bot-approve always" show="/bot-approve always"/> 严格模式`,
+        `<qqbot-cmd-input text="/bot-approve reset" show="/bot-approve reset"/> 恢复默认`,
+        `<qqbot-cmd-input text="/bot-approve status" show="/bot-approve status"/> 查看当前配置`,
+      ].join("\n");
+    }
+
+    // status: 查看当前配置
+    if (arg === "status") {
+      const { security, ask } = loadExecConfig();
+      return [
+        formatStatus(security, ask),
+        ``,
+        `<qqbot-cmd-input text="/bot-approve on" show="/bot-approve on"/> 开启审批`,
+        `<qqbot-cmd-input text="/bot-approve off" show="/bot-approve off"/> 关闭审批`,
+        `<qqbot-cmd-input text="/bot-approve always" show="/bot-approve always"/> 严格模式`,
+        `<qqbot-cmd-input text="/bot-approve reset" show="/bot-approve reset"/> 恢复默认`,
+      ].join("\n");
+    }
+
+    // on: 开启审批（白名单 + 未命中审批）
+    if (arg === "on") {
+      try {
+        await writeExecConfig("allowlist", "on-miss");
+        return [
+          `✅ 审批已开启`,
+          ``,
+          `• security = allowlist（白名单模式）`,
+          `• ask = on-miss（未命中白名单时需审批）`,
+          ``,
+          `已批准的命令自动加入白名单，下次直接执行。`,
+        ].join("\n");
+      } catch (err) {
+        return `❌ 配置更新失败: ${err}`;
+      }
+    }
+
+    // off: 关闭审批
+    if (arg === "off") {
+      try {
+        await writeExecConfig("full", "off");
+        return [
+          `✅ 审批已关闭`,
+          ``,
+          `• security = full（允许所有命令）`,
+          `• ask = off（不需要审批）`,
+          ``,
+          `⚠️ 所有命令将直接执行，不会弹出审批确认。`,
+        ].join("\n");
+      } catch (err) {
+        return `❌ 配置更新失败: ${err}`;
+      }
+    }
+
+    // always: 始终审批（每次都审批）
+    if (arg === "always") {
+      try {
+        await writeExecConfig("allowlist", "always");
+        return [
+          `✅ 已切换为严格审批模式`,
+          ``,
+          `• security = allowlist`,
+          `• ask = always（每次执行都需审批）`,
+          ``,
+          `每个命令都会弹出审批按钮，需手动确认。`,
+        ].join("\n");
+      } catch (err) {
+        return `❌ 配置更新失败: ${err}`;
+      }
+    }
+
+    // reset: 删除配置，恢复框架默认值
+    if (arg === "reset") {
+      try {
+        const cfg = structuredClone(configApi.loadConfig()) as Record<string, unknown>;
+        const tools = (cfg.tools ?? {}) as Record<string, unknown>;
+        const exec = (tools.exec ?? {}) as Record<string, unknown>;
+        delete exec.security;
+        delete exec.ask;
+        if (Object.keys(exec).length === 0) {
+          delete tools.exec;
+        } else {
+          tools.exec = exec;
+        }
+        if (Object.keys(tools).length === 0) {
+          delete cfg.tools;
+        } else {
+          cfg.tools = tools;
+        }
+        await configApi.writeConfigFile(cfg);
+        return [
+          `✅ 审批配置已重置`,
+          ``,
+          `已移除 tools.exec.security 和 tools.exec.ask`,
+          `框架将使用默认值（security=deny, ask=on-miss）`,
+          ``,
+          `如需开启命令执行，请使用 /bot-approve on`,
+        ].join("\n");
+      } catch (err) {
+        return `❌ 配置更新失败: ${err}`;
+      }
+    }
+
+    return [
+      `❌ 未知参数: ${arg}`,
+      ``,
+      `可用选项: on | off | always | reset`,
+      `输入 /bot-approve ? 查看详细用法`,
+    ].join("\n");
+  },
+});
+
+// ============ /bot-group-allways ============
+
+/**
+ * /bot-group-allways on|off — 修改群消息默认响应模式
+ *
+ * 直接修改当前账户的 defaultRequireMention 配置项并持久化到 openclaw.json。
+ * 修改后即时生效（下一条消息起按新配置处理）。
+ *
+ * on = AI 自主判断何时发言（无需 @），off = 仅被 @ 时回复
+ */
+registerCommand({
+  name: "bot-group-allways",
+  description: "修改群消息默认响应模式",
+  usage: [
+    `/bot-group-allways on   AI 自主判断何时发言（无需 @）`,
+    `/bot-group-allways off  仅在被 @ 时回复`,
+    `/bot-group-allways      查看当前设置`,
+    ``,
+    `设为 on 后，AI 会自主判断每条消息是否需要回复（无需 @）。`,
+    `仍可通过 groups.{groupId}.requireMention 对单个群覆盖。`,
+    ``,
+    `优先级：具体群配置 > 通配符 "*" > defaultRequireMention（本指令）> 默认 true`,
+  ].join("\n"),
+  handler: async (ctx) => {
+    // 群响应模式设置仅在私聊中可用
+    if (ctx.type !== "c2c") {
+      return `💡 请在私聊中使用此指令`;
+    }
+
+    const arg = ctx.args.trim().toLowerCase();
+
+    // 读取当前 defaultRequireMention 状态
+    const currentVal = ctx.accountConfig?.defaultRequireMention;
+    const currentRequireMention = currentVal ?? true; // 未设置时硬编码默认为 true
+
+    // 无参数：查看当前状态
+    if (!arg) {
+      return [
+        `🤖 群自主发言状态：${currentRequireMention ? "❌ 仅被 @ 时回复" : "✅ 自主判断何时发言"}`,
+        `使用 <qqbot-cmd-input text="/bot-group-allways on" show="/bot-group-allways on"/> 设为自主发言`,
+        `使用 <qqbot-cmd-input text="/bot-group-allways off" show="/bot-group-allways off"/> 设为仅被 @ 时回复`,
+      ].join("\n");
+    }
+
+    if (arg !== "on" && arg !== "off") {
+      return `❌ 参数错误，请使用 on 或 off\n\n示例：/bot-group-allways on`;
+    }
+
+    const newRequireMention = arg === "off"; // on=自主发言(requireMention=false), off=仅被@时回复(requireMention=true)
+
+    // 如果状态没变，直接返回
+    if (newRequireMention === currentRequireMention) {
+      return `🤖 群自主发言已经是"${arg}"状态，无需操作`;
+    }
+
+    // 更新配置
+    try {
+      const runtime = getQQBotRuntime();
+      const configApi = runtime.config as {
+        loadConfig: () => Record<string, unknown>;
+        writeConfigFile: (cfg: unknown) => Promise<void>;
+      };
+
+      const currentCfg = structuredClone(configApi.loadConfig()) as Record<string, unknown>;
+      const qqbot = ((currentCfg.channels ?? {}) as Record<string, unknown>).qqbot as Record<string, unknown> | undefined;
+
+      if (!qqbot) {
+        return `❌ 配置文件中未找到 qqbot 通道配置`;
+      }
+
+      const accountId = ctx.accountId;
+      const isNamedAccount = accountId !== "default" && (qqbot.accounts as Record<string, Record<string, unknown>> | undefined)?.[accountId];
+
+      if (isNamedAccount) {
+        // 命名账户：更新 accounts.{accountId}.defaultRequireMention
+        const accounts = qqbot.accounts as Record<string, Record<string, unknown>>;
+        const acct = accounts[accountId] ?? {};
+        acct.defaultRequireMention = newRequireMention;
+        accounts[accountId] = acct;
+        qqbot.accounts = accounts;
+      } else {
+        // 默认账户：更新 qqbot.defaultRequireMention
+        qqbot.defaultRequireMention = newRequireMention;
+      }
+
+      await configApi.writeConfigFile(currentCfg);
+
+      return [
+        `✅ 群自主发言已设置为 ${newRequireMention ? "**off**（仅被 @ 时回复）" : "**on**（AI 自主判断何时发言）"}`,
+        ``,
+        newRequireMention
+          ? `仅在被 @ 机器人才会回复。`
+          : `AI 将自主判断群消息是否需要回复，无需被 @ 即可发言。`,
+        ``,
+      ].join("\n");
+    } catch (err) {
+      const fwVer = getFrameworkVersion();
+      return [
+        `❌ 当前版本不支持该指令`,
+        ``,
+        `🦞框架版本：${fwVer}`,
+        `🤖QQBot 插件版本：v${PLUGIN_VERSION}`,
+        ``,
+        `可通过以下命令手动设置：`,
+        ``,
+        `\`\`\`shell`,
+        `# 设为 AI 自主判断何时发言（defaultRequireMention=false）`,
+        `openclaw config set channels.qqbot.defaultRequireMention false`,
+        `# 或设为仅被 @ 时回复（defaultRequireMention=true）`,
+        `openclaw config set channels.qqbot.defaultRequireMention true`,
+        ``,
+        `# 重启网关使配置生效`,
+        `openclaw gateway restart`,
+        `\`\`\``,
+      ].join("\n");
+    }
+  },
+});
+
 // ============ 匹配入口 ============
 
 /**

package/src/tools/channel.ts

@@ -1,11 +1,7 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { resolveQQBotAccount } from "../config.js";
 import { listQQBotAccountIds } from "../config.js";
-import { getAccessToken } from "../api.js";
-
-// ========== 常量 ==========
-
-const API_BASE = "https://api.sgroup.qq.com";
+import { getAccessToken, API_BASE } from "../api.js";
 
 const DEFAULT_TIMEOUT_MS = 30000;
 
@@ -276,6 +272,4 @@ export function registerChannelTool(api: OpenClawPluginApi): void {
     },
     { name: "qqbot_channel_api" },
   );
-
-  console.log("[qqbot-channel-api] Registered QQ channel API proxy tool");
 }

package/src/tools/remind.ts

@@ -303,6 +303,4 @@ export function registerRemindTool(api: OpenClawPluginApi): void {
     },
     { name: "qqbot_remind" },
   );
-
-  console.log("[qqbot-remind] Registered QQBot remind tool");
 }

package/src/transport/index.ts

@@ -0,0 +1,11 @@
+/**
+ * Transport module — QQ Bot event receiving mechanisms.
+ *
+ * Supports two transport modes:
+ *   - **WebSocket** (default): long-lived WS connection with heartbeat, RESUME, etc.
+ *   - **Webhook** (HTTP callback): QQ platform POSTs events to registered path.
+ */
+
+export type { WebhookInboundEvent, WebhookTransportOptions, QQBotWebhookTarget } from "./webhook-transport.js";
+export { startWebhookTransport, resolveWebhookPath } from "./webhook-transport.js";
+export { verifyWebhookSignature, signValidationResponse, ed25519Sign } from "./webhook-verify.js";