@ryantest/openclaw-qqbot 1.6.7-beta.16 → 1.6.7-beta.18

package/dist/src/slash-commands.js

@@ -757,12 +757,16 @@ function fireHotUpgrade(targetVersion, pkg, useLocal) {
                     changed = true;
                 }
                 // 同步 plugins.entries（openclaw plugins install 会写入 entries）
+                // 注意：不同步 openclaw-qqbot 自身的 entry，因为插件通过 auto-discover 加载，
+                // 显式写入 entries 会导致 "duplicate plugin id" 警告刷屏。
                 if (tmp.plugins?.entries) {
                     if (!real.plugins)
                         real.plugins = {};
                     if (!real.plugins.entries)
                         real.plugins.entries = {};
                     for (const [k, v] of Object.entries(tmp.plugins.entries)) {
+                        if (k === "openclaw-qqbot")
+                            continue; // 跳过自身，避免 duplicate
                         if (!real.plugins.entries[k]) {
                             real.plugins.entries[k] = v;
                             changed = true;
@@ -895,12 +899,64 @@ CLI="${cliInvoke}"
 CONFIG="${configPath}"
 BACKUP="${qqbotChannelBackup}"
 
+# ── 兼容 openclaw 3.23+ 配置严格校验 ──
+# 所有 openclaw CLI 命令（包括 gateway stop/start）启动时都会 loadConfig 校验配置，
+# 如果 channels.qqbot 存在但 qqbot 插件尚未加载，校验会报 "unknown channel id: qqbot"。
+#
+# 策略：
+#   1. gateway stop：使用 OPENCLAW_CONFIG_PATH 临时配置（不含 channels.qqbot）
+#   2. gateway start：先尝试直接启动（真实配置），如果 CLI 校验失败，
+#      则临时修改真实配置（此时 gateway 已停止，无 config watcher），启动后恢复。
+#      这样 gateway 进程读取的是完整配置（含 channels.qqbot）。
+
+# 为 gateway stop 创建临时配置
+TEMP_RESTART_CONFIG=""
+if [ -f "$BACKUP" ]; then
+  TEMP_RESTART_CONFIG="\$(mktemp)"
+  node -e "
+    const fs = require('fs');
+    const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
+    if (cfg.channels && cfg.channels.qqbot) {
+      delete cfg.channels.qqbot;
+      if (Object.keys(cfg.channels).length === 0) delete cfg.channels;
+    }
+    if (cfg.plugins && cfg.plugins.entries && cfg.plugins.entries['openclaw-qqbot']) {
+      delete cfg.plugins.entries['openclaw-qqbot'];
+      if (Object.keys(cfg.plugins.entries).length === 0) delete cfg.plugins.entries;
+    }
+    fs.writeFileSync(process.argv[2], JSON.stringify(cfg, null, 4) + '\\n');
+  " "$CONFIG" "$TEMP_RESTART_CONFIG" 2>/dev/null
+  if [ \$? -ne 0 ] || [ ! -s "$TEMP_RESTART_CONFIG" ]; then
+    echo "[qqbot-upgrade] WARNING: failed to create temp config"
+    TEMP_RESTART_CONFIG=""
+  fi
+fi
+
 echo "[qqbot-upgrade] Stopping gateway..."
-$CLI gateway stop 2>/dev/null || true
+if [ -n "$TEMP_RESTART_CONFIG" ]; then
+  OPENCLAW_CONFIG_PATH="$TEMP_RESTART_CONFIG" $CLI gateway stop 2>/dev/null || true
+else
+  $CLI gateway stop 2>/dev/null || true
+fi
 sleep 2
 
-if [ -f "$BACKUP" ]; then
-  echo "[qqbot-upgrade] Temporarily removing channels.qqbot and plugins.entries for config validation bypass..."
+# 清理临时配置（不再需要）
+if [ -n "$TEMP_RESTART_CONFIG" ] && [ -f "$TEMP_RESTART_CONFIG" ]; then
+  rm -f "$TEMP_RESTART_CONFIG"
+fi
+
+echo "[qqbot-upgrade] Starting gateway..."
+START_OK=false
+
+# 先尝试直接启动（使用真实配置，含 channels.qqbot）
+# 如果 openclaw 版本不做严格校验，或者插件已注册，这会直接成功
+if $CLI gateway start 2>/dev/null; then
+  START_OK=true
+  echo "[qqbot-upgrade] Gateway started successfully (direct start)"
+elif [ -f "$BACKUP" ]; then
+  # 直接启动失败（可能是 channels.qqbot 校验失败），
+  # 临时修改真实配置（此时 gateway 已停止，无 config watcher，安全）
+  echo "[qqbot-upgrade] Direct start failed, temporarily removing channels.qqbot from real config..."
   node -e "
     const fs = require('fs');
     const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
@@ -919,42 +975,44 @@ if [ -f "$BACKUP" ]; then
       fs.writeFileSync(process.argv[1], JSON.stringify(cfg, null, 4) + '\\n');
     }
   " "$CONFIG" 2>/dev/null
-  echo "[qqbot-upgrade] channels.qqbot temporarily removed"
-fi
 
-echo "[qqbot-upgrade] Starting gateway..."
-START_OK=false
-if $CLI gateway start 2>/dev/null; then
-  START_OK=true
-  echo "[qqbot-upgrade] Gateway started successfully"
-else
-  echo "[qqbot-upgrade] WARNING: gateway start failed, will still restore config"
-fi
+  if $CLI gateway start 2>/dev/null; then
+    START_OK=true
+    echo "[qqbot-upgrade] Gateway started successfully (after config fix)"
+  else
+    echo "[qqbot-upgrade] WARNING: gateway start still failed after config fix"
+  fi
 
-echo "[qqbot-upgrade] Waiting for plugin to load (8s)..."
-sleep 8
+  # 等待 gateway 进程启动并加载插件（插件注册 qqbot channel type）
+  echo "[qqbot-upgrade] Waiting for plugin to load (8s)..."
+  sleep 8
 
-if [ -f "$BACKUP" ]; then
-  echo "[qqbot-upgrade] Restoring channels.qqbot and plugins.entries..."
+  # 恢复 channels.qqbot 到真实配置
+  # gateway 的 config file watcher 会检测到变更并热加载
+  echo "[qqbot-upgrade] Restoring channels.qqbot to real config..."
   node -e "
+    const fs = require('fs');
     const fs = require('fs');
     const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
     const qqbot = JSON.parse(fs.readFileSync(process.argv[2], 'utf8'));
     if (!cfg.channels) cfg.channels = {};
     cfg.channels.qqbot = qqbot;
-    // 恢复 plugins.entries
-    if (!cfg.plugins) cfg.plugins = {};
-    if (!cfg.plugins.entries) cfg.plugins.entries = {};
-    if (!cfg.plugins.entries['openclaw-qqbot']) {
-      cfg.plugins.entries['openclaw-qqbot'] = { enabled: true };
-    }
+    // 注意：不写入 plugins.entries.openclaw-qqbot，
+    // 插件通过 auto-discover 加载，显式 entry 会导致 duplicate plugin id 警告。
     fs.writeFileSync(process.argv[1], JSON.stringify(cfg, null, 4) + '\\n');
   " "$CONFIG" "$BACKUP" 2>/dev/null
   rm -f "$BACKUP"
   echo "[qqbot-upgrade] channels.qqbot restored"
+else
+  echo "[qqbot-upgrade] WARNING: gateway start failed, no backup to restore"
+fi
+
+# 直接启动成功的情况下，清理备份文件
+if [ "$START_OK" = "true" ] && [ -f "$BACKUP" ]; then
+  rm -f "$BACKUP"
 fi
 
-# 如果 start 失败，尝试再次启动（此时 channels.qqbot 已恢复，插件可能已注册）
+# 如果 start 失败，尝试再次启动
 if [ "$START_OK" != "true" ]; then
   echo "[qqbot-upgrade] Retrying gateway start..."
   sleep 2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryantest/openclaw-qqbot",
-  "version": "1.6.7-beta.16",
+  "version": "1.6.7-beta.18",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/slash-commands.ts

@@ -861,10 +861,13 @@ function fireHotUpgrade(targetVersion?: string, pkg?: string, useLocal?: boolean
           changed = true;
         }
         // 同步 plugins.entries（openclaw plugins install 会写入 entries）
+        // 注意：不同步 openclaw-qqbot 自身的 entry，因为插件通过 auto-discover 加载，
+        // 显式写入 entries 会导致 "duplicate plugin id" 警告刷屏。
         if (tmp.plugins?.entries) {
           if (!real.plugins) real.plugins = {};
           if (!real.plugins.entries) real.plugins.entries = {};
           for (const [k, v] of Object.entries(tmp.plugins.entries)) {
+            if (k === "openclaw-qqbot") continue; // 跳过自身，避免 duplicate
             if (!real.plugins.entries[k]) {
               real.plugins.entries[k] = v;
               changed = true;
@@ -997,12 +1000,64 @@ CLI="${cliInvoke}"
 CONFIG="${configPath}"
 BACKUP="${qqbotChannelBackup}"
 
+# ── 兼容 openclaw 3.23+ 配置严格校验 ──
+# 所有 openclaw CLI 命令（包括 gateway stop/start）启动时都会 loadConfig 校验配置，
+# 如果 channels.qqbot 存在但 qqbot 插件尚未加载，校验会报 "unknown channel id: qqbot"。
+#
+# 策略：
+#   1. gateway stop：使用 OPENCLAW_CONFIG_PATH 临时配置（不含 channels.qqbot）
+#   2. gateway start：先尝试直接启动（真实配置），如果 CLI 校验失败，
+#      则临时修改真实配置（此时 gateway 已停止，无 config watcher），启动后恢复。
+#      这样 gateway 进程读取的是完整配置（含 channels.qqbot）。
+
+# 为 gateway stop 创建临时配置
+TEMP_RESTART_CONFIG=""
+if [ -f "$BACKUP" ]; then
+  TEMP_RESTART_CONFIG="\$(mktemp)"
+  node -e "
+    const fs = require('fs');
+    const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
+    if (cfg.channels && cfg.channels.qqbot) {
+      delete cfg.channels.qqbot;
+      if (Object.keys(cfg.channels).length === 0) delete cfg.channels;
+    }
+    if (cfg.plugins && cfg.plugins.entries && cfg.plugins.entries['openclaw-qqbot']) {
+      delete cfg.plugins.entries['openclaw-qqbot'];
+      if (Object.keys(cfg.plugins.entries).length === 0) delete cfg.plugins.entries;
+    }
+    fs.writeFileSync(process.argv[2], JSON.stringify(cfg, null, 4) + '\\n');
+  " "$CONFIG" "$TEMP_RESTART_CONFIG" 2>/dev/null
+  if [ \$? -ne 0 ] || [ ! -s "$TEMP_RESTART_CONFIG" ]; then
+    echo "[qqbot-upgrade] WARNING: failed to create temp config"
+    TEMP_RESTART_CONFIG=""
+  fi
+fi
+
 echo "[qqbot-upgrade] Stopping gateway..."
-$CLI gateway stop 2>/dev/null || true
+if [ -n "$TEMP_RESTART_CONFIG" ]; then
+  OPENCLAW_CONFIG_PATH="$TEMP_RESTART_CONFIG" $CLI gateway stop 2>/dev/null || true
+else
+  $CLI gateway stop 2>/dev/null || true
+fi
 sleep 2
 
-if [ -f "$BACKUP" ]; then
-  echo "[qqbot-upgrade] Temporarily removing channels.qqbot and plugins.entries for config validation bypass..."
+# 清理临时配置（不再需要）
+if [ -n "$TEMP_RESTART_CONFIG" ] && [ -f "$TEMP_RESTART_CONFIG" ]; then
+  rm -f "$TEMP_RESTART_CONFIG"
+fi
+
+echo "[qqbot-upgrade] Starting gateway..."
+START_OK=false
+
+# 先尝试直接启动（使用真实配置，含 channels.qqbot）
+# 如果 openclaw 版本不做严格校验，或者插件已注册，这会直接成功
+if $CLI gateway start 2>/dev/null; then
+  START_OK=true
+  echo "[qqbot-upgrade] Gateway started successfully (direct start)"
+elif [ -f "$BACKUP" ]; then
+  # 直接启动失败（可能是 channels.qqbot 校验失败），
+  # 临时修改真实配置（此时 gateway 已停止，无 config watcher，安全）
+  echo "[qqbot-upgrade] Direct start failed, temporarily removing channels.qqbot from real config..."
   node -e "
     const fs = require('fs');
     const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
@@ -1021,42 +1076,44 @@ if [ -f "$BACKUP" ]; then
       fs.writeFileSync(process.argv[1], JSON.stringify(cfg, null, 4) + '\\n');
     }
   " "$CONFIG" 2>/dev/null
-  echo "[qqbot-upgrade] channels.qqbot temporarily removed"
-fi
 
-echo "[qqbot-upgrade] Starting gateway..."
-START_OK=false
-if $CLI gateway start 2>/dev/null; then
-  START_OK=true
-  echo "[qqbot-upgrade] Gateway started successfully"
-else
-  echo "[qqbot-upgrade] WARNING: gateway start failed, will still restore config"
-fi
+  if $CLI gateway start 2>/dev/null; then
+    START_OK=true
+    echo "[qqbot-upgrade] Gateway started successfully (after config fix)"
+  else
+    echo "[qqbot-upgrade] WARNING: gateway start still failed after config fix"
+  fi
 
-echo "[qqbot-upgrade] Waiting for plugin to load (8s)..."
-sleep 8
+  # 等待 gateway 进程启动并加载插件（插件注册 qqbot channel type）
+  echo "[qqbot-upgrade] Waiting for plugin to load (8s)..."
+  sleep 8
 
-if [ -f "$BACKUP" ]; then
-  echo "[qqbot-upgrade] Restoring channels.qqbot and plugins.entries..."
+  # 恢复 channels.qqbot 到真实配置
+  # gateway 的 config file watcher 会检测到变更并热加载
+  echo "[qqbot-upgrade] Restoring channels.qqbot to real config..."
   node -e "
+    const fs = require('fs');
     const fs = require('fs');
     const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
     const qqbot = JSON.parse(fs.readFileSync(process.argv[2], 'utf8'));
     if (!cfg.channels) cfg.channels = {};
     cfg.channels.qqbot = qqbot;
-    // 恢复 plugins.entries
-    if (!cfg.plugins) cfg.plugins = {};
-    if (!cfg.plugins.entries) cfg.plugins.entries = {};
-    if (!cfg.plugins.entries['openclaw-qqbot']) {
-      cfg.plugins.entries['openclaw-qqbot'] = { enabled: true };
-    }
+    // 注意：不写入 plugins.entries.openclaw-qqbot，
+    // 插件通过 auto-discover 加载，显式 entry 会导致 duplicate plugin id 警告。
     fs.writeFileSync(process.argv[1], JSON.stringify(cfg, null, 4) + '\\n');
   " "$CONFIG" "$BACKUP" 2>/dev/null
   rm -f "$BACKUP"
   echo "[qqbot-upgrade] channels.qqbot restored"
+else
+  echo "[qqbot-upgrade] WARNING: gateway start failed, no backup to restore"
+fi
+
+# 直接启动成功的情况下，清理备份文件
+if [ "$START_OK" = "true" ] && [ -f "$BACKUP" ]; then
+  rm -f "$BACKUP"
 fi
 
-# 如果 start 失败，尝试再次启动（此时 channels.qqbot 已恢复，插件可能已注册）
+# 如果 start 失败，尝试再次启动
 if [ "$START_OK" != "true" ]; then
   echo "[qqbot-upgrade] Retrying gateway start..."
   sleep 2