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

package/dist/src/inbound-attachments.js

@@ -7,7 +7,7 @@
 import { downloadFile } from "./image-server.js";
 import { convertSilkToWav, isVoiceAttachment, formatDuration } from "./utils/audio-convert.js";
 import { transcribeAudio, resolveSTTConfig } from "./stt.js";
-import { getQQBotDataDir } from "./utils/platform.js";
+import { getQQBotMediaDir } from "./utils/platform.js";
 // ============ 空结果常量 ============
 const EMPTY_RESULT = {
     attachmentInfo: "",
@@ -33,7 +33,7 @@ export async function processAttachments(attachments, ctx) {
     if (!attachments?.length)
         return EMPTY_RESULT;
     const { accountId, cfg, log } = ctx;
-    const downloadDir = getQQBotDataDir("downloads");
+    const downloadDir = getQQBotMediaDir("downloads");
     const prefix = `[qqbot:${accountId}]`;
     // 结果收集
     const imageUrls = [];

package/dist/src/outbound.js

@@ -7,7 +7,7 @@ import { getAccessToken, sendC2CMessage, sendChannelMessage, sendGroupMessage, s
 import { isAudioFile, audioFileToSilkBase64, waitForFile, shouldTranscodeVoice } from "./utils/audio-convert.js";
 import { normalizeMediaTags } from "./utils/media-tags.js";
 import { checkFileSize, readFileAsync, fileExistsAsync, formatFileSize } from "./utils/file-utils.js";
-import { isLocalPath as isLocalFilePath, normalizePath, sanitizeFileName, getQQBotDataDir } from "./utils/platform.js";
+import { isLocalPath as isLocalFilePath, normalizePath, sanitizeFileName, getQQBotMediaDir } from "./utils/platform.js";
 import { downloadFile } from "./image-server.js";
 // ============ 消息回复限流器 ============
 // 同一 message_id 1小时内最多回复 4 次，超过 1 小时无法被动回复（需改为主动消息）
@@ -269,7 +269,7 @@ export async function sendPhoto(ctx, imagePath) {
  */
 async function downloadAndRetrySendPhoto(ctx, httpUrl, prefix) {
     try {
-        const downloadDir = getQQBotDataDir("downloads", "url-fallback");
+        const downloadDir = getQQBotMediaDir("downloads", "url-fallback");
         const localFile = await downloadFile(httpUrl, downloadDir);
         if (!localFile) {
             console.error(`${prefix} sendPhoto fallback: download also failed for ${httpUrl.slice(0, 80)}`);
@@ -566,7 +566,7 @@ async function sendDocumentFromLocal(ctx, mediaPath, prefix) {
  */
 async function downloadToFallbackDir(httpUrl, prefix, caller) {
     try {
-        const downloadDir = getQQBotDataDir("downloads", "url-fallback");
+        const downloadDir = getQQBotMediaDir("downloads", "url-fallback");
         const localFile = await downloadFile(httpUrl, downloadDir);
         if (!localFile) {
             console.error(`${prefix} ${caller} fallback: download also failed for ${httpUrl.slice(0, 80)}`);

package/dist/src/slash-commands.js

@@ -606,13 +606,14 @@ registerCommand({
                 ].join("\n");
             }
             if (!info.hasUpdate) {
-                return [
+                const lines = [
                     `✅ 当前已是最新版本 v${PLUGIN_VERSION}`,
                     ``,
                     `项目地址：[GitHub](${GITHUB_URL})`,
-                ].join("\n");
+                ];
+                return lines.join("\n");
             }
-            // 有新版本：展示信息 + 确认按钮
+            // 有新版本：展示信息 + 确认按钮（同通道：alpha 只展示 alpha，正式版只展示正式版）
             return [
                 `🆕 发现新版本`,
                 ``,
@@ -656,6 +657,8 @@ registerCommand({
             }
         }
         const targetVersion = versionArg || info.latest || undefined;
+        // --force 时如果 targetVersion 等于当前版本，属于强制重装
+        const isReinstall = isForce && targetVersion === PLUGIN_VERSION;
         // ── 环境兼容性检查 ──
         const compat = checkUpgradeCompatibility();
         if (!compat.ok) {
@@ -704,16 +707,20 @@ registerCommand({
             ].join("\n");
         }
         saveUpgradeGreetingTarget(ctx.accountId, ctx.appId, ctx.senderId);
-        const resultLines = [
-            `🔄 正在升级...`,
-            ``,
-            `当前版本：v${PLUGIN_VERSION}`,
-        ];
-        if (targetVersion) {
-            resultLines.push(`目标版本：v${targetVersion}`);
-        }
-        resultLines.push(``);
-        resultLines.push(`预计 30~60 秒完成，届时会自动通知您`);
+        const resultLines = isReinstall
+            ? [
+                `🔄 正在重新安装 v${PLUGIN_VERSION}...`,
+                ``,
+                `预计 30~60 秒完成，届时会自动通知您`,
+            ]
+            : [
+                `🔄 正在升级...`,
+                ``,
+                `当前版本：v${PLUGIN_VERSION}`,
+                ...(targetVersion ? [`目标版本：v${targetVersion}`] : []),
+                ``,
+                `预计 30~60 秒完成，届时会自动通知您`,
+            ];
         return resultLines.join("\n");
     },
 });

package/dist/src/update-checker.d.ts

@@ -9,7 +9,12 @@
  */
 export interface UpdateInfo {
     current: string;
+    /** 最佳升级目标（prerelease 用户优先 alpha，稳定版用户取 latest） */
     latest: string | null;
+    /** 稳定版 dist-tag */
+    stable: string | null;
+    /** alpha dist-tag */
+    alpha: string | null;
     hasUpdate: boolean;
     checkedAt: number;
     error?: string;

package/dist/src/update-checker.js

@@ -64,13 +64,21 @@ async function fetchDistTags() {
 }
 function buildUpdateInfo(tags) {
     const currentIsPrerelease = CURRENT_VERSION.includes("-");
-    const compareTarget = currentIsPrerelease
-        ? (tags.alpha || tags.latest || null)
-        : (tags.latest || null);
+    const stableTag = tags.latest || null;
+    const alphaTag = tags.alpha || null;
+    // 严格隔离：alpha 只跟 alpha 比，正式版只跟正式版比，不交叉
+    const compareTarget = currentIsPrerelease ? alphaTag : stableTag;
     const hasUpdate = typeof compareTarget === "string"
         && compareTarget !== CURRENT_VERSION
         && compareVersions(compareTarget, CURRENT_VERSION) > 0;
-    return { current: CURRENT_VERSION, latest: compareTarget, hasUpdate, checkedAt: Date.now() };
+    return {
+        current: CURRENT_VERSION,
+        latest: compareTarget,
+        stable: stableTag,
+        alpha: alphaTag,
+        hasUpdate,
+        checkedAt: Date.now(),
+    };
 }
 /** gateway 启动时调用，保存 log 引用 */
 export function triggerUpdateCheck(log) {
@@ -91,7 +99,7 @@ export async function getUpdateInfo() {
     }
     catch (err) {
         _log?.debug?.(`[qqbot:update-checker] check failed: ${err.message}`);
-        return { current: CURRENT_VERSION, latest: null, hasUpdate: false, checkedAt: Date.now(), error: err.message };
+        return { current: CURRENT_VERSION, latest: null, stable: null, alpha: null, hasUpdate: false, checkedAt: Date.now(), error: err.message };
     }
 }
 /**

package/package.json

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

package/scripts/cleanup-legacy-plugins.sh

@@ -50,12 +50,9 @@ cleanup_installation() {
       const ids = ['qqbot', 'openclaw-qq', '@sliverp/qqbot', '@tencent-connect/qqbot', '@tencent-connect/openclaw-qq', '@tencent-connect/openclaw-qqbot', 'openclaw-qqbot'];
       
       for (const id of ids) {
-        // 删除 channels.<id>
-        if (config.channels && config.channels[id]) {
-          delete config.channels[id];
-          console.log('  - 已删除 channels.' + id);
-        }
-        
+        // 注意: 不删除 channels.<id>，因为里面保存了用户的 appid/secret 凭证
+        // 凭证与插件版本无关，清理插件时不应清除凭证
+
         // 删除 plugins.entries.<id>
         if (config.plugins && config.plugins.entries && config.plugins.entries[id]) {
           delete config.plugins.entries[id];

package/scripts/upgrade-via-source.sh

@@ -186,6 +186,34 @@ INSTALL_LOG="/tmp/openclaw-install-$(date +%s).log"
 echo "安装日志文件: $INSTALL_LOG"
 echo "详细信息将记录到日志文件中..."
 
+# ── 临时移除 channels.qqbot 配置 ──
+# openclaw CLI 任何子命令（包括 gateway stop、plugins install）启动时都会校验 openclaw.json，
+# 如果 channels.qqbot 存在但插件还未安装，CLI 不认识该 channel id，
+# 导致 "Config invalid: unknown channel id: qqbot" 而命令失败（鸡生蛋问题）。
+# 解决方案：在所有 openclaw 命令之前把 channels.qqbot 暂存，完成后恢复。
+_QQBOT_CHANNEL_STASH=""
+for _app in openclaw clawdbot moltbot; do
+    _cfg="$HOME/.$_app/$_app.json"
+    if [ -f "$_cfg" ]; then
+        _QQBOT_CHANNEL_STASH=$(node -e "
+            const fs = require('fs');
+            const cfg = JSON.parse(fs.readFileSync('$_cfg', 'utf8'));
+            if (cfg.channels && cfg.channels.qqbot) {
+                const stashed = JSON.stringify(cfg.channels.qqbot);
+                delete cfg.channels.qqbot;
+                fs.writeFileSync('$_cfg', JSON.stringify(cfg, null, 4) + '\n');
+                process.stdout.write(stashed);
+            }
+        " 2>/dev/null || true)
+        if [ -n "$_QQBOT_CHANNEL_STASH" ]; then
+            _STASH_APP="$_app"
+            _STASH_CFG="$_cfg"
+            echo "  已暂存 channels.qqbot 配置（避免 CLI 校验失败）"
+        fi
+        break
+    fi
+done
+
 # 安装前先 stop gateway，防止 chokidar 在 plugins install 写入配置的中间状态
 # 触发 restart，导致 "unknown channel id: qqbot" 等错误
 _gw_was_running=0
@@ -251,6 +279,16 @@ if ! openclaw plugins install . 2>&1 | tee "$INSTALL_LOG"; then
         * )
             echo "安装失败，脚本退出。"
             echo "请先解决安装问题后再运行此脚本。"
+            # 恢复 channels.qqbot 后再退出
+            if [ -n "$_QQBOT_CHANNEL_STASH" ] && [ -n "$_STASH_CFG" ] && [ -f "$_STASH_CFG" ]; then
+                node -e "
+                    const fs = require('fs');
+                    const cfg = JSON.parse(fs.readFileSync('$_STASH_CFG', 'utf8'));
+                    if (!cfg.channels) cfg.channels = {};
+                    cfg.channels.qqbot = $_QQBOT_CHANNEL_STASH;
+                    fs.writeFileSync('$_STASH_CFG', JSON.stringify(cfg, null, 4) + '\n');
+                " 2>/dev/null || true
+            fi
             exit 1
             ;;  
     esac
@@ -424,6 +462,18 @@ else
     ' 2>/dev/null || echo "unknown")
 fi
 
+# ── 恢复 channels.qqbot 配置 ──
+# 安装完成（无论成功或失败），把之前暂存的 channels.qqbot 写回 openclaw.json
+if [ -n "$_QQBOT_CHANNEL_STASH" ] && [ -n "$_STASH_CFG" ] && [ -f "$_STASH_CFG" ]; then
+    node -e "
+        const fs = require('fs');
+        const cfg = JSON.parse(fs.readFileSync('$_STASH_CFG', 'utf8'));
+        if (!cfg.channels) cfg.channels = {};
+        cfg.channels.qqbot = $_QQBOT_CHANNEL_STASH;
+        fs.writeFileSync('$_STASH_CFG', JSON.stringify(cfg, null, 4) + '\n');
+    " 2>/dev/null && echo "  已恢复 channels.qqbot 配置" || echo "  ⚠️  恢复 channels.qqbot 配置失败"
+fi
+
 # 4. 配置机器人通道（仅在需要变更时写入配置，避免无意义覆盖）
 echo ""
 echo "[4/6] 配置机器人通道..."

package/src/inbound-attachments.ts

@@ -8,7 +8,7 @@
 import { downloadFile } from "./image-server.js";
 import { convertSilkToWav, isVoiceAttachment, formatDuration } from "./utils/audio-convert.js";
 import { transcribeAudio, resolveSTTConfig } from "./stt.js";
-import { getQQBotDataDir } from "./utils/platform.js";
+import { getQQBotMediaDir } from "./utils/platform.js";
 
 // ============ 类型定义 ============
 
@@ -85,7 +85,7 @@ export async function processAttachments(
   if (!attachments?.length) return EMPTY_RESULT;
 
   const { accountId, cfg, log } = ctx;
-  const downloadDir = getQQBotDataDir("downloads");
+  const downloadDir = getQQBotMediaDir("downloads");
   const prefix = `[qqbot:${accountId}]`;
 
   // 结果收集

package/src/outbound.ts

@@ -24,7 +24,7 @@ import {
 import { isAudioFile, audioFileToSilkBase64, waitForFile, shouldTranscodeVoice } from "./utils/audio-convert.js";
 import { normalizeMediaTags } from "./utils/media-tags.js";
 import { checkFileSize, readFileAsync, fileExistsAsync, isLargeFile, formatFileSize } from "./utils/file-utils.js";
-import { isLocalPath as isLocalFilePath, normalizePath, sanitizeFileName, getQQBotDataDir } from "./utils/platform.js";
+import { isLocalPath as isLocalFilePath, normalizePath, sanitizeFileName, getQQBotDataDir, getQQBotMediaDir } from "./utils/platform.js";
 import { downloadFile } from "./image-server.js";
 
 // ============ 消息回复限流器 ============
@@ -378,7 +378,7 @@ async function downloadAndRetrySendPhoto(
   prefix: string,
 ): Promise<OutboundResult | null> {
   try {
-    const downloadDir = getQQBotDataDir("downloads", "url-fallback");
+    const downloadDir = getQQBotMediaDir("downloads", "url-fallback");
     const localFile = await downloadFile(httpUrl, downloadDir);
     if (!localFile) {
       console.error(`${prefix} sendPhoto fallback: download also failed for ${httpUrl.slice(0, 80)}`);
@@ -702,7 +702,7 @@ async function sendDocumentFromLocal(ctx: MediaTargetContext, mediaPath: string,
  */
 async function downloadToFallbackDir(httpUrl: string, prefix: string, caller: string): Promise<string | null> {
   try {
-    const downloadDir = getQQBotDataDir("downloads", "url-fallback");
+    const downloadDir = getQQBotMediaDir("downloads", "url-fallback");
     const localFile = await downloadFile(httpUrl, downloadDir);
     if (!localFile) {
       console.error(`${prefix} ${caller} fallback: download also failed for ${httpUrl.slice(0, 80)}`);

package/src/slash-commands.ts

@@ -710,14 +710,15 @@ registerCommand({
         ].join("\n");
       }
       if (!info.hasUpdate) {
-        return [
+        const lines = [
           `✅ 当前已是最新版本 v${PLUGIN_VERSION}`,
           ``,
           `项目地址：[GitHub](${GITHUB_URL})`,
-        ].join("\n");
+        ];
+        return lines.join("\n");
       }
 
-      // 有新版本：展示信息 + 确认按钮
+      // 有新版本：展示信息 + 确认按钮（同通道：alpha 只展示 alpha，正式版只展示正式版）
       return [
         `🆕 发现新版本`,
         ``,
@@ -766,6 +767,9 @@ registerCommand({
 
     const targetVersion = versionArg || info.latest || undefined;
 
+    // --force 时如果 targetVersion 等于当前版本，属于强制重装
+    const isReinstall = isForce && targetVersion === PLUGIN_VERSION;
+
     // ── 环境兼容性检查 ──
     const compat = checkUpgradeCompatibility();
     if (!compat.ok) {
@@ -819,16 +823,20 @@ registerCommand({
 
     saveUpgradeGreetingTarget(ctx.accountId, ctx.appId, ctx.senderId);
 
-    const resultLines = [
-      `🔄 正在升级...`,
-      ``,
-      `当前版本：v${PLUGIN_VERSION}`,
-    ];
-    if (targetVersion) {
-      resultLines.push(`目标版本：v${targetVersion}`);
-    }
-    resultLines.push(``);
-    resultLines.push(`预计 30~60 秒完成，届时会自动通知您`);
+    const resultLines = isReinstall
+      ? [
+        `🔄 正在重新安装 v${PLUGIN_VERSION}...`,
+        ``,
+        `预计 30~60 秒完成，届时会自动通知您`,
+      ]
+      : [
+        `🔄 正在升级...`,
+        ``,
+        `当前版本：v${PLUGIN_VERSION}`,
+        ...(targetVersion ? [`目标版本：v${targetVersion}`] : []),
+        ``,
+        `预计 30~60 秒完成，届时会自动通知您`,
+      ];
     return resultLines.join("\n");
   },
 });

package/src/update-checker.ts

@@ -31,7 +31,12 @@ try {
 
 export interface UpdateInfo {
   current: string;
+  /** 最佳升级目标（prerelease 用户优先 alpha，稳定版用户取 latest） */
   latest: string | null;
+  /** 稳定版 dist-tag */
+  stable: string | null;
+  /** alpha dist-tag */
+  alpha: string | null;
   hasUpdate: boolean;
   checkedAt: number;
   error?: string;
@@ -73,13 +78,24 @@ async function fetchDistTags(): Promise<Record<string, string>> {
 
 function buildUpdateInfo(tags: Record<string, string>): UpdateInfo {
   const currentIsPrerelease = CURRENT_VERSION.includes("-");
-  const compareTarget = currentIsPrerelease
-    ? (tags.alpha || tags.latest || null)
-    : (tags.latest || null);
+  const stableTag = tags.latest || null;
+  const alphaTag = tags.alpha || null;
+
+  // 严格隔离：alpha 只跟 alpha 比，正式版只跟正式版比，不交叉
+  const compareTarget = currentIsPrerelease ? alphaTag : stableTag;
+
   const hasUpdate = typeof compareTarget === "string"
     && compareTarget !== CURRENT_VERSION
     && compareVersions(compareTarget, CURRENT_VERSION) > 0;
-  return { current: CURRENT_VERSION, latest: compareTarget, hasUpdate, checkedAt: Date.now() };
+
+  return {
+    current: CURRENT_VERSION,
+    latest: compareTarget,
+    stable: stableTag,
+    alpha: alphaTag,
+    hasUpdate,
+    checkedAt: Date.now(),
+  };
 }
 
 /** gateway 启动时调用，保存 log 引用 */
@@ -104,7 +120,7 @@ export async function getUpdateInfo(): Promise<UpdateInfo> {
     return buildUpdateInfo(tags);
   } catch (err: any) {
     _log?.debug?.(`[qqbot:update-checker] check failed: ${err.message}`);
-    return { current: CURRENT_VERSION, latest: null, hasUpdate: false, checkedAt: Date.now(), error: err.message };
+    return { current: CURRENT_VERSION, latest: null, stable: null, alpha: null, hasUpdate: false, checkedAt: Date.now(), error: err.message };
   }
 }