@tencent-connect/openclaw-qqbot 1.6.5-alpha.5 → 1.6.5-alpha.6

package/dist/src/slash-commands.js

@@ -251,7 +251,7 @@ registerCommand({
         return lines.join("\n");
     },
 });
-const DEFAULT_UPGRADE_URL = "https://doc.weixin.qq.com/doc/w3_AKEAGQaeACgCNHrh1CbHzTAKtT2gB?scode=AJEAIQdfAAozxFEnLZAKEAGQaeACg";
+const DEFAULT_UPGRADE_URL = "https://docs.qq.com/doc/DSGxOZk1oVnVKVkpq";
 function saveUpgradeGreetingTarget(accountId, appId, openid) {
     const safeAccountId = accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
     const safeAppId = appId.replace(/[^a-zA-Z0-9._-]/g, "_");
@@ -561,6 +561,38 @@ function findPowerShell() {
     }
     return null;
 }
+/**
+ * 将升级脚本复制到临时位置，避免升级过程中插件目录被清理后脚本丢失。
+ * 返回临时脚本路径，失败返回 null。
+ */
+function copyScriptToTemp(scriptPath) {
+    try {
+        const ext = path.extname(scriptPath);
+        const tmpDir = path.join(getHomeDir(), ".openclaw", ".qqbot-upgrade-tmp");
+        fs.mkdirSync(tmpDir, { recursive: true });
+        const tmpScript = path.join(tmpDir, `upgrade-via-npm${ext}`);
+        fs.copyFileSync(scriptPath, tmpScript);
+        if (!isWindows()) {
+            fs.chmodSync(tmpScript, 0o755);
+        }
+        return tmpScript;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * 清理临时升级脚本目录
+ */
+function cleanupTempScript() {
+    try {
+        const tmpDir = path.join(getHomeDir(), ".openclaw", ".qqbot-upgrade-tmp");
+        fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+    catch {
+        // 非关键，静默忽略
+    }
+}
 /**
  * 执行热更新：执行脚本(--no-restart) → 立即触发 gateway restart
  *
@@ -570,11 +602,15 @@ function findPowerShell() {
  * - 新进程启动时 getStartupGreeting() 检测到版本变更，自动通知管理员
  *
  * Windows 使用 PowerShell 执行 .ps1 脚本，Mac/Linux 使用 bash 执行 .sh 脚本。
+ *
+ * 安全机制：脚本会被复制到临时目录再执行，避免升级过程中插件目录被操作导致脚本自身丢失。
  */
 function fireHotUpgrade(targetVersion) {
-    const scriptPath = getUpgradeScriptPath();
-    if (!scriptPath)
+    const originalScriptPath = getUpgradeScriptPath();
+    if (!originalScriptPath)
         return { ok: false, reason: "no-script" };
+    // 将脚本复制到临时位置，避免升级过程中脚本被删除
+    const scriptPath = copyScriptToTemp(originalScriptPath) || originalScriptPath;
     const cli = findCli();
     if (!cli)
         return { ok: false, reason: "no-cli" };
@@ -601,7 +637,7 @@ function fireHotUpgrade(targetVersion) {
         shell = bash;
         shellArgs = [scriptPath, "--no-restart", ...(targetVersion ? ["--version", targetVersion] : [])];
     }
-    console.log(`[qqbot] fireHotUpgrade: shell=${shell}, script=${scriptPath}, cli=${cli}, target=${targetVersion || "latest"}`);
+    console.log(`[qqbot] fireHotUpgrade: shell=${shell}, script=${scriptPath} (original: ${originalScriptPath}), cli=${cli}, target=${targetVersion || "latest"}`);
     // 异步执行升级脚本
     execFile(shell, shellArgs, {
         timeout: 120_000,
@@ -614,6 +650,7 @@ function fireHotUpgrade(targetVersion) {
                 console.error(`[qqbot] fireHotUpgrade: stdout: ${stdout.slice(0, 2000)}`);
             if (_stderr)
                 console.error(`[qqbot] fireHotUpgrade: stderr: ${_stderr.slice(0, 2000)}`);
+            cleanupTempScript();
             _upgrading = false;
             return;
         }
@@ -623,10 +660,13 @@ function fireHotUpgrade(targetVersion) {
         const newVersion = versionMatch?.[1];
         if (newVersion === "unknown") {
             console.error(`[qqbot] fireHotUpgrade: script output QQBOT_NEW_VERSION=unknown, aborting restart`);
+            cleanupTempScript();
             _upgrading = false;
             return;
         }
         console.log(`[qqbot] fireHotUpgrade: new version=${newVersion || "(not detected)"}, triggering restart...`);
+        // 脚本执行成功，清理临时脚本副本
+        cleanupTempScript();
         // 文件替换成功，在 restart 之前把 source 从 path 切换为 npm，
         // 确保新进程启动时读到的是 npm source，不会被本地源码覆盖。
         switchPluginSourceToNpm();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-connect/openclaw-qqbot",
-  "version": "1.6.5-alpha.5",
+  "version": "1.6.5-alpha.6",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/upgrade-via-npm.sh

@@ -230,20 +230,40 @@ if [ "$USE_UPDATE" = "true" ]; then
 fi
 
 if [ "$UPGRADE_OK" != "true" ]; then
-    # 清理旧目录（包含当前插件和历史遗留名称）
-    for dir_name in "$PLUGIN_ID" qqbot openclaw-qq; do
-        [ -d "$EXTENSIONS_DIR/$dir_name" ] && rm -rf "$EXTENSIONS_DIR/$dir_name" && echo "  已清理: $EXTENSIONS_DIR/$dir_name"
+    # 备份旧目录（而非直接删除），install 失败时可回滚
+    BACKUP_DIR=""
+    if [ -d "$EXTENSIONS_DIR/$PLUGIN_ID" ]; then
+        BACKUP_DIR="$EXTENSIONS_DIR/.openclaw-qqbot-backup-$$"
+        mv "$EXTENSIONS_DIR/$PLUGIN_ID" "$BACKUP_DIR"
+        echo "  已备份旧目录: $BACKUP_DIR"
+    fi
+
+    # 清理历史遗留名称（这些不需要回滚）
+    for dir_name in qqbot openclaw-qq; do
+        [ -d "$EXTENSIONS_DIR/$dir_name" ] && rm -rf "$EXTENSIONS_DIR/$dir_name" && echo "  已清理历史目录: $EXTENSIONS_DIR/$dir_name"
     done
 
     echo "  执行 install: $INSTALL_SRC"
     if $CMD plugins install "$INSTALL_SRC" --pin 2>&1; then
         UPGRADE_OK=true
         echo "  ✅ install 成功"
+        # install 成功，清理备份
+        if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+            rm -rf "$BACKUP_DIR"
+            echo "  已清理旧版备份"
+        fi
+        # 清理 openclaw CLI install 可能留下的额外 backup 目录
+        find "$EXTENSIONS_DIR" -maxdepth 1 -name ".openclaw-qqbot-backup-*" -exec rm -rf {} + 2>/dev/null || true
     else
-        echo "❌ install 失败"
+        echo "  ❌ install 失败"
+        # 回滚：恢复旧目录
+        if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+            mv "$BACKUP_DIR" "$EXTENSIONS_DIR/$PLUGIN_ID"
+            echo "  ↩️  已回滚到旧版本"
+        fi
         restore_qqbot_channel
         echo "QQBOT_NEW_VERSION=unknown"
-        echo "QQBOT_REPORT=❌ QQBot 安装失败，请检查网络和 npm registry"
+        echo "QQBOT_REPORT=❌ QQBot 安装失败（已回滚到旧版本），请检查网络和 npm registry"
         exit 1
     fi
 fi
@@ -336,6 +356,19 @@ if [ "$PREFLIGHT_OK" != "true" ]; then
 fi
 echo "  ✅ 验证全部通过"
 
+# 确保 openclaw/plugin-sdk 可解析：
+# openclaw plugins install 不会执行 npm lifecycle scripts，
+# 需要手动调用 postinstall-link-sdk.js 创建 node_modules/openclaw → 全局 openclaw 的符号链接
+POSTINSTALL_SCRIPT="$TARGET_DIR/scripts/postinstall-link-sdk.js"
+if [ -f "$POSTINSTALL_SCRIPT" ]; then
+    echo "  执行 postinstall-link-sdk..."
+    if node "$POSTINSTALL_SCRIPT" 2>&1; then
+        echo "  ✅ plugin-sdk 链接就绪"
+    else
+        echo "  ⚠️  postinstall-link-sdk 失败，插件可能无法加载"
+    fi
+fi
+
 # [3/4] 输出结构化信息（供 TS handler 解析）
 echo ""
 echo "[3/4] 升级结果..."

package/scripts/upgrade-via-source.sh

@@ -444,6 +444,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 {

package/src/slash-commands.ts

@@ -337,7 +337,7 @@ registerCommand({
   },
 });
 
-const DEFAULT_UPGRADE_URL = "https://doc.weixin.qq.com/doc/w3_AKEAGQaeACgCNHrh1CbHzTAKtT2gB?scode=AJEAIQdfAAozxFEnLZAKEAGQaeACg";
+const DEFAULT_UPGRADE_URL = "https://docs.qq.com/doc/DSGxOZk1oVnVKVkpq";
 
 function saveUpgradeGreetingTarget(accountId: string, appId: string, openid: string): void {
   const safeAccountId = accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
@@ -660,6 +660,38 @@ function findPowerShell(): string | null {
   return null;
 }
 
+/**
+ * 将升级脚本复制到临时位置，避免升级过程中插件目录被清理后脚本丢失。
+ * 返回临时脚本路径，失败返回 null。
+ */
+function copyScriptToTemp(scriptPath: string): string | null {
+  try {
+    const ext = path.extname(scriptPath);
+    const tmpDir = path.join(getHomeDir(), ".openclaw", ".qqbot-upgrade-tmp");
+    fs.mkdirSync(tmpDir, { recursive: true });
+    const tmpScript = path.join(tmpDir, `upgrade-via-npm${ext}`);
+    fs.copyFileSync(scriptPath, tmpScript);
+    if (!isWindows()) {
+      fs.chmodSync(tmpScript, 0o755);
+    }
+    return tmpScript;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 清理临时升级脚本目录
+ */
+function cleanupTempScript(): void {
+  try {
+    const tmpDir = path.join(getHomeDir(), ".openclaw", ".qqbot-upgrade-tmp");
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  } catch {
+    // 非关键，静默忽略
+  }
+}
+
 /**
  * 执行热更新：执行脚本(--no-restart) → 立即触发 gateway restart
  *
@@ -669,10 +701,15 @@ function findPowerShell(): string | null {
  * - 新进程启动时 getStartupGreeting() 检测到版本变更，自动通知管理员
  *
  * Windows 使用 PowerShell 执行 .ps1 脚本，Mac/Linux 使用 bash 执行 .sh 脚本。
+ *
+ * 安全机制：脚本会被复制到临时目录再执行，避免升级过程中插件目录被操作导致脚本自身丢失。
  */
 function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
-  const scriptPath = getUpgradeScriptPath();
-  if (!scriptPath) return { ok: false, reason: "no-script" };
+  const originalScriptPath = getUpgradeScriptPath();
+  if (!originalScriptPath) return { ok: false, reason: "no-script" };
+
+  // 将脚本复制到临时位置，避免升级过程中脚本被删除
+  const scriptPath = copyScriptToTemp(originalScriptPath) || originalScriptPath;
 
   const cli = findCli();
   if (!cli) return { ok: false, reason: "no-cli" };
@@ -699,7 +736,7 @@ function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
     shellArgs = [scriptPath, "--no-restart", ...(targetVersion ? ["--version", targetVersion] : [])];
   }
 
-  console.log(`[qqbot] fireHotUpgrade: shell=${shell}, script=${scriptPath}, cli=${cli}, target=${targetVersion || "latest"}`);
+  console.log(`[qqbot] fireHotUpgrade: shell=${shell}, script=${scriptPath} (original: ${originalScriptPath}), cli=${cli}, target=${targetVersion || "latest"}`);
 
   // 异步执行升级脚本
   execFile(shell, shellArgs, {
@@ -711,6 +748,7 @@ function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
       console.error(`[qqbot] fireHotUpgrade: script failed: ${error.message}`);
       if (stdout) console.error(`[qqbot] fireHotUpgrade: stdout: ${stdout.slice(0, 2000)}`);
       if (_stderr) console.error(`[qqbot] fireHotUpgrade: stderr: ${_stderr.slice(0, 2000)}`);
+      cleanupTempScript();
       _upgrading = false;
       return;
     }
@@ -722,12 +760,16 @@ function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
     const newVersion = versionMatch?.[1];
     if (newVersion === "unknown") {
       console.error(`[qqbot] fireHotUpgrade: script output QQBOT_NEW_VERSION=unknown, aborting restart`);
+      cleanupTempScript();
       _upgrading = false;
       return;
     }
 
     console.log(`[qqbot] fireHotUpgrade: new version=${newVersion || "(not detected)"}, triggering restart...`);
 
+    // 脚本执行成功，清理临时脚本副本
+    cleanupTempScript();
+
     // 文件替换成功，在 restart 之前把 source 从 path 切换为 npm，
     // 确保新进程启动时读到的是 npm source，不会被本地源码覆盖。
     switchPluginSourceToNpm();