@ryantest/openclaw-qqbot 0.0.3 → 1.6.6-alpha.0

package/scripts/upgrade-via-source.sh

@@ -25,6 +25,7 @@ cd "$PROJ_DIR"
 APPID=""
 SECRET=""
 MARKDOWN=""
+STREAMING=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -40,6 +41,10 @@ while [[ $# -gt 0 ]]; do
             MARKDOWN="$2"
             shift 2
             ;;
+        --streaming)
+            STREAMING="$2"
+            shift 2
+            ;;
         -h|--help)
             echo "用法: $0 [选项]"
             echo ""
@@ -47,6 +52,7 @@ while [[ $# -gt 0 ]]; do
             echo "  --appid <appid>       QQ机器人 appid"
             echo "  --secret <secret>     QQ机器人 secret"
             echo "  --markdown <yes|no>   是否启用 markdown 消息格式（默认: no）"
+            echo "  --streaming <yes|no>  是否启用流式消息（默认: no，仅 C2C 私聊）"
             echo "  -h, --help            显示帮助信息"
             echo ""
             echo "也可以通过环境变量设置:"
@@ -54,6 +60,7 @@ while [[ $# -gt 0 ]]; do
             echo "  QQBOT_SECRET          QQ机器人 secret"
             echo "  QQBOT_TOKEN           QQ机器人 token (appid:secret)"
             echo "  QQBOT_MARKDOWN        是否启用 markdown（yes/no）"
+            echo "  QQBOT_STREAMING       是否启用流式消息（yes/no）"
             echo ""
             echo "不带参数时，将使用已有配置直接启动。"
             echo ""
@@ -72,6 +79,7 @@ done
 APPID="${APPID:-$QQBOT_APPID}"
 SECRET="${SECRET:-$QQBOT_SECRET}"
 MARKDOWN="${MARKDOWN:-$QQBOT_MARKDOWN}"
+STREAMING="${STREAMING:-$QQBOT_STREAMING}"
 
 echo "========================================="
 echo "  qqbot 一键更新启动脚本"
@@ -131,6 +139,29 @@ if [ -z "$SAVED_QQBOT_TOKEN" ] && [ -d "$HOME/.openclaw" ]; then
     fi
 fi
 
+# 备份 streaming 配置（升级后恢复）
+SAVED_STREAMING=""
+for _app in openclaw clawdbot moltbot; do
+    _cfg="$HOME/.$_app/$_app.json"
+    if [ -f "$_cfg" ]; then
+        SAVED_STREAMING=$(node -e "
+            const cfg = JSON.parse(require('fs').readFileSync('$_cfg', 'utf8'));
+            const keys = ['qqbot', 'openclaw-qqbot', 'openclaw-qq'];
+            for (const key of keys) {
+                const ch = cfg.channels && cfg.channels[key];
+                if (ch && typeof ch.streaming === 'boolean') {
+                    process.stdout.write(String(ch.streaming));
+                    process.exit(0);
+                }
+            }
+        " 2>/dev/null || true)
+        [ -n "$SAVED_STREAMING" ] && break
+    fi
+done
+if [ -n "$SAVED_STREAMING" ]; then
+    echo "已备份 streaming 配置: $SAVED_STREAMING"
+fi
+
 # 2. 移除老版本
 echo ""
 echo "[2/6] 移除老版本..."
@@ -444,6 +475,27 @@ else
     # gateway 已在安装前 stop，此时不会有自动 restart 的问题
     # 所有配置写入完成后，在 Step 6 统一启动
 
+    # 确保 openclaw/plugin-sdk 可解析：
+    # openclaw plugins install 不会执行 npm lifecycle scripts，
+    # 需要手动调用 postinstall-link-sdk.js 创建 node_modules/openclaw → 全局 openclaw 的符号链接。
+    # 必须在 peerDeps 清理之后执行，否则 symlink 会被清理逻辑删除。
+    for _candidate_name in openclaw-qqbot qqbot openclaw-qq; do
+        _postinstall="$HOME/.openclaw/extensions/$_candidate_name/scripts/postinstall-link-sdk.js"
+        if [ -f "$_postinstall" ]; then
+            echo "  执行 postinstall-link-sdk..."
+            if node "$_postinstall" 2>&1; then
+                echo "  ✅ plugin-sdk 链接就绪"
+            else
+                echo "  ⚠️  postinstall-link-sdk 失败，插件可能无法加载"
+            fi
+            break
+        fi
+    done
+
+    # 清理 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
+
     # 记录更新后的 qqbot 插件版本
     NEW_QQBOT_VERSION=$(node -e '
         try {
@@ -525,6 +577,8 @@ if [ -n "$DESIRED_QQBOT_TOKEN" ]; then
         # 由 channel 插件热重载处理，通常 <1 秒完成，无需长时间等待。
         sleep 1
     fi
+
+
 else
     # 未提供任何可用 token 时，检查是否已有可用配置
     _has_channel=0
@@ -612,6 +666,69 @@ else
     echo "未指定 markdown 选项，使用已有配置"
 fi
 
+# 5.5. 配置 streaming 选项
+echo ""
+echo "[5.5/6] 配置 streaming（流式消息）选项..."
+
+# 确定目标 streaming 值：命令行参数 > 备份值
+STREAMING_VALUE=""
+if [ -n "$STREAMING" ]; then
+    if [ "$STREAMING" = "yes" ] || [ "$STREAMING" = "y" ] || [ "$STREAMING" = "true" ]; then
+        STREAMING_VALUE="true"
+        echo "启用流式消息..."
+    else
+        STREAMING_VALUE="false"
+        echo "禁用流式消息..."
+    fi
+elif [ -n "$SAVED_STREAMING" ]; then
+    STREAMING_VALUE="$SAVED_STREAMING"
+    echo "从备份恢复 streaming 配置: $SAVED_STREAMING"
+fi
+
+if [ -n "$STREAMING_VALUE" ]; then
+    CURRENT_STREAMING_VALUE=$(node -e "
+      const fs = require('fs');
+      const path = require('path');
+      const home = process.env.HOME;
+      for (const app of ['openclaw', 'clawdbot', 'moltbot']) {
+        const f = path.join(home, '.' + app, app + '.json');
+        if (!fs.existsSync(f)) continue;
+        try {
+          const cfg = JSON.parse(fs.readFileSync(f, 'utf8'));
+          const keys = ['qqbot', 'openclaw-qqbot', 'openclaw-qq'];
+          for (const key of keys) {
+            const ch = cfg.channels && cfg.channels[key];
+            if (!ch) continue;
+            if (typeof ch.streaming === 'boolean') { process.stdout.write(String(ch.streaming)); process.exit(0); }
+          }
+        } catch {}
+      }
+    " 2>/dev/null || true)
+
+    if [ "$CURRENT_STREAMING_VALUE" = "$STREAMING_VALUE" ]; then
+        echo "✅ streaming 配置已是目标值，跳过写入"
+    else
+        OPENCLAW_CONFIG="$HOME/.openclaw/openclaw.json"
+        if [ -f "$OPENCLAW_CONFIG" ] && node -e "
+          const fs = require('fs');
+          const cfg = JSON.parse(fs.readFileSync('$OPENCLAW_CONFIG', 'utf-8'));
+          if (!cfg.channels) cfg.channels = {};
+          if (!cfg.channels.qqbot) cfg.channels.qqbot = {};
+          const target = $STREAMING_VALUE;
+          if (cfg.channels.qqbot.streaming === target) process.exit(0);
+          cfg.channels.qqbot.streaming = target;
+          fs.writeFileSync('$OPENCLAW_CONFIG', JSON.stringify(cfg, null, 4) + '\n');
+        " 2>&1; then
+            echo "✅ streaming 配置成功"
+            _config_changed=1
+        else
+            echo "⚠️  streaming 配置设置失败，不影响后续运行"
+        fi
+    fi
+else
+    echo "未指定 streaming 选项且无备份值，使用默认配置"
+fi
+
 # 6. 启动 openclaw
 echo ""
 echo "[6/6] 启动 openclaw..."

package/skills/qqbot-media/SKILL.md

@@ -28,11 +28,15 @@ metadata: {"openclaw":{"emoji":"📸","requires":{"config":["channels.qqbot"]}}}
 
 1. **路径必须是绝对路径**（以 `/` 或 `http` 开头）
 2. **标签必须用开闭标签包裹路径**：`<qqmedia>路径</qqmedia>`
-3. **文件大小上限 10MB**
-4. **你有能力发送本地图片/文件**——直接用标签包裹路径即可，**不要说"无法发送"**
-5. 发送语音时不要重复语音中已朗读的文字
-6. 多个媒体用多个标签
-7. 以会话上下文中的能力说明为准（如未启用语音则不要发语音）
+3. **你有能力发送本地图片/文件**——直接用标签包裹路径即可，**不要说"无法发送"**
+4. 发送语音时不要重复语音中已朗读的文字
+5. 多个媒体用多个标签
+6. 以会话上下文中的能力说明为准（如未启用语音则不要发语音）
+7. **发送前需检查文件大小**，当文件超限时告知用户文件太大，QQBot 发送文件大小规则如下：
+   - 图片：最大 **30MB**
+   - 语音：最大 **20MB**
+   - 视频：最大 **200MB**
+   - 文件：最大 **200MB**
 
 ## 示例
 

package/skills/qqbot-remind/SKILL.md

@@ -22,7 +22,7 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
 |------|------|------|
 | `action` | 操作类型 | `"add"` / `"list"` / `"remove"` |
 | `content` | 提醒内容 | `"喝水"` |
-| `to` | 目标地址（取自上下文 `[QQBot] to=` 的值） | `"user_openid_xxx"` 或 `"group:group_openid_xxx"` |
+| `to` | 目标地址（可选，系统自动获取，通常无需填写） | — |
 | `time` | 时间（相对时间或 cron 表达式） | `"5m"` / `"1h30m"` / `"0 8 * * *"` |
 | `jobId` | 任务 ID（仅 remove） | `"xxx"` |
 
@@ -34,7 +34,7 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
 
 用户说："5分钟后提醒我喝水"
 
-1. 调用 `qqbot_remind`：`{ "action": "add", "content": "喝水", "to": "xxx", "time": "5m" }`
+1. 调用 `qqbot_remind`：`{ "action": "add", "content": "喝水", "time": "5m" }`
 2. 收到返回的 `cronParams` → 立即调用 `cron` 工具，参数为该 `cronParams`
 3. 回复用户：`⏰ 好的，5分钟后提醒你喝水~`
 
@@ -56,7 +56,7 @@ metadata: {"openclaw":{"emoji":"⏰","requires":{"config":["channels.qqbot"]}}}
 | `payload.kind` | `"agentTurn"` | `systemEvent` 不会发 QQ 消息 |
 | `payload.deliver` | `true` | 否则不投递 |
 | `payload.channel` | `"qqbot"` | QQ 通道标识 |
-| `payload.to` | 用户 openid | 从上下文获取 |
+| `payload.to` | 用户 openid | 从 `To` 字段获取 |
 | `sessionTarget` | `"isolated"` | 隔离会话避免污染 |
 
 > `schedule.atMs` 必须是**绝对毫秒时间戳**（如 `1770733800000`），不支持 `"5m"` 等相对字符串。

package/src/admin-resolver.ts

@@ -26,48 +26,90 @@ export interface AdminResolverContext {
 
 // ---- 文件路径 ----
 
-function getAdminMarkerFile(accountId: string): string {
+function safeName(id: string): string {
+  return id.replace(/[^a-zA-Z0-9._-]/g, "_");
+}
+
+/** 新版 admin 文件路径（按 accountId + appId 区分） */
+function getAdminMarkerFile(accountId: string, appId: string): string {
+  return path.join(getQQBotDataDir("data"), `admin-${safeName(accountId)}-${safeName(appId)}.json`);
+}
+
+/** 旧版 admin 文件路径（仅按 accountId 区分，用于迁移兼容） */
+function getLegacyAdminMarkerFile(accountId: string): string {
   return path.join(getQQBotDataDir("data"), `admin-${accountId}.json`);
 }
 
 function getUpgradeGreetingTargetFile(accountId: string, appId: string): string {
-  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`);
+  return path.join(getQQBotDataDir("data"), `upgrade-greeting-target-${safeName(accountId)}-${safeName(appId)}.json`);
 }
 
 // ---- 管理员 openid 持久化 ----
 
-export function loadAdminOpenId(accountId: string): string | undefined {
+/**
+ * 读取 admin openid（按 accountId + appId 区分）
+ * 兼容策略：新路径优先 → fallback 旧路径 → 自动迁移
+ */
+export function loadAdminOpenId(accountId: string, appId: string): string | undefined {
   try {
-    const file = getAdminMarkerFile(accountId);
-    if (fs.existsSync(file)) {
-      const data = JSON.parse(fs.readFileSync(file, "utf8"));
+    // 1. 先尝试新版路径
+    const newFile = getAdminMarkerFile(accountId, appId);
+    if (fs.existsSync(newFile)) {
+      const data = JSON.parse(fs.readFileSync(newFile, "utf8"));
       if (data.openid) return data.openid;
     }
+
+    // 2. fallback 旧版路径（仅按 accountId）
+    const legacyFile = getLegacyAdminMarkerFile(accountId);
+    if (fs.existsSync(legacyFile)) {
+      const data = JSON.parse(fs.readFileSync(legacyFile, "utf8"));
+      if (data.openid) {
+        // 自动迁移：写到新路径，删除旧文件
+        saveAdminOpenId(accountId, appId, data.openid);
+        try { fs.unlinkSync(legacyFile); } catch { /* ignore */ }
+        return data.openid;
+      }
+    }
   } catch { /* 文件损坏视为无 */ }
   return undefined;
 }
 
-export function saveAdminOpenId(accountId: string, openid: string): void {
+export function saveAdminOpenId(accountId: string, appId: string, openid: string): void {
   try {
-    fs.writeFileSync(getAdminMarkerFile(accountId), JSON.stringify({ openid, savedAt: new Date().toISOString() }));
+    fs.writeFileSync(
+      getAdminMarkerFile(accountId, appId),
+      JSON.stringify({ accountId, appId, openid, savedAt: new Date().toISOString() }),
+    );
   } catch { /* ignore */ }
 }
 
 // ---- 升级问候目标 ----
 
-export function loadUpgradeGreetingTargetOpenId(accountId: string, appId: string): string | undefined {
+export function loadUpgradeGreetingTargetOpenId(accountId: string, appId: string, log?: { info: (msg: string) => void }): string | undefined {
   try {
     const file = getUpgradeGreetingTargetFile(accountId, appId);
     if (fs.existsSync(file)) {
       const data = JSON.parse(fs.readFileSync(file, "utf8")) as { accountId?: string; appId?: string; openid?: string };
-      if (!data.openid) return undefined;
-      if (data.appId && data.appId !== appId) return undefined;
-      if (data.accountId && data.accountId !== accountId) return undefined;
+      if (!data.openid) {
+        log?.info(`[qqbot:${accountId}] upgrade-greeting-target file found but openid is empty`);
+        return undefined;
+      }
+      if (data.appId && data.appId !== appId) {
+        log?.info(`[qqbot:${accountId}] upgrade-greeting-target appId mismatch: file=${data.appId}, current=${appId}`);
+        return undefined;
+      }
+      if (data.accountId && data.accountId !== accountId) {
+        log?.info(`[qqbot:${accountId}] upgrade-greeting-target accountId mismatch: file=${data.accountId}, current=${accountId}`);
+        return undefined;
+      }
+      log?.info(`[qqbot:${accountId}] upgrade-greeting-target loaded: openid=${data.openid}`);
       return data.openid;
+    } else {
+      log?.info(`[qqbot:${accountId}] upgrade-greeting-target file not found: ${file}`);
     }
-  } catch { /* 文件损坏视为无 */ }
+  } catch (err) {
+    log?.info(`[qqbot:${accountId}] upgrade-greeting-target file read error: ${err}`);
+  }
   return undefined;
 }
 
@@ -84,15 +126,15 @@ export function clearUpgradeGreetingTargetOpenId(accountId: string, appId: strin
 
 /**
  * 解析管理员 openid：
- * 1. 优先读持久化文件（稳定）
+ * 1. 优先读持久化文件（按 accountId + appId 区分）
  * 2. fallback 取第一个私聊用户，并写入文件锁定
  */
-export function resolveAdminOpenId(ctx: Pick<AdminResolverContext, "accountId" | "log">): string | undefined {
-  const saved = loadAdminOpenId(ctx.accountId);
+export function resolveAdminOpenId(ctx: Pick<AdminResolverContext, "accountId" | "appId" | "log">): string | undefined {
+  const saved = loadAdminOpenId(ctx.accountId, ctx.appId);
   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);
+    saveAdminOpenId(ctx.accountId, ctx.appId, first);
     ctx.log?.info(`[qqbot:${ctx.accountId}] Auto-detected admin openid: ${first} (persisted)`);
   }
   return first;
@@ -100,40 +142,39 @@ export function resolveAdminOpenId(ctx: Pick<AdminResolverContext, "accountId" |
 
 // ---- 启动问候语 ----
 
-/** 异步发送启动问候语（仅发给管理员） */
+/** 异步发送启动问候语（优先发给升级触发者，fallback 发给管理员） */
 export function sendStartupGreetings(ctx: AdminResolverContext, trigger: "READY" | "RESUMED"): void {
   (async () => {
-    const plan = getStartupGreetingPlan();
+    const plan = getStartupGreetingPlan(ctx.accountId, ctx.appId);
     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)`);
+    const upgradeTargetOpenId = loadUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId, ctx.log);
+
+    // 没有 upgrade-greeting-target 文件 → 不是通过 /bot-upgrade 触发的升级
+    // （console 手动重启、脚本升级等场景），静默更新 marker 不发消息
+    if (!upgradeTargetOpenId) {
+      markStartupGreetingSent(ctx.accountId, ctx.appId, plan.version);
+      ctx.log?.info(`[qqbot:${ctx.accountId}] Version changed but no upgrade-greeting-target, silently updating marker (trigger=${trigger})`);
       return;
     }
 
     try {
-      const receiverType = upgradeTargetOpenId ? "upgrade-requester" : "admin";
-      ctx.log?.info(`[qqbot:${ctx.accountId}] Sending startup greeting to ${receiverType} (trigger=${trigger}): "${plan.greeting}"`);
+      ctx.log?.info(`[qqbot:${ctx.accountId}] Sending startup greeting to upgrade-requester (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),
+        sendProactiveC2CMessage(token, upgradeTargetOpenId, 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}`);
+      markStartupGreetingSent(ctx.accountId, ctx.appId, plan.version);
+      clearUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId);
+      ctx.log?.info(`[qqbot:${ctx.accountId}] Sent startup greeting to upgrade-requester: ${upgradeTargetOpenId}`);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      markStartupGreetingFailed(plan.version, message);
+      markStartupGreetingFailed(ctx.accountId, ctx.appId, plan.version, message);
       ctx.log?.error(`[qqbot:${ctx.accountId}] Failed to send startup greeting: ${message}`);
     }
   })();