@tencent-connect/openclaw-qqbot 1.6.5-alpha.0 → 1.6.5-alpha.2

package/dist/src/admin-resolver.js

@@ -129,26 +129,24 @@ export function sendStartupGreetings(ctx, trigger) {
             return;
         }
         const upgradeTargetOpenId = loadUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId, ctx.log);
-        const targetOpenId = upgradeTargetOpenId || resolveAdminOpenId(ctx);
-        if (!targetOpenId) {
-            markStartupGreetingFailed(ctx.accountId, ctx.appId, plan.version, "no-admin");
-            ctx.log?.info(`[qqbot:${ctx.accountId}] Skipping startup greeting (no admin or known user)`);
+        // 没有 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(ctx.accountId, ctx.appId, plan.version);
-            if (upgradeTargetOpenId) {
-                clearUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId);
-            }
-            ctx.log?.info(`[qqbot:${ctx.accountId}] Sent startup greeting to ${receiverType}: ${targetOpenId}`);
+            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);

package/openclaw.plugin.json

@@ -3,6 +3,7 @@
   "name": "OpenClaw QQ Bot",
   "description": "QQ Bot channel plugin with message support, cron jobs, and proactive messaging",
   "channels": ["qqbot"],
+  "extensions": ["./dist/index.js"],
   "skills": ["skills/qqbot-channel", "skills/qqbot-remind", "skills/qqbot-media"],
   "capabilities": {
     "proactiveMessaging": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-connect/openclaw-qqbot",
-  "version": "1.6.5-alpha.0",
+  "version": "1.6.5-alpha.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,32 +16,19 @@
     "scripts",
     "index.ts",
     "tsconfig.json",
-    "openclaw.plugin.json",
-    "clawdbot.plugin.json",
-    "moltbot.plugin.json"
+    "openclaw.plugin.json"
   ],
-  "clawdbot": {
-    "id": "openclaw-qqbot",
-    "extensions": [
-      "./index.ts"
-    ]
-  },
-  "moltbot": {
-    "id": "openclaw-qqbot",
-    "extensions": [
-      "./index.ts"
-    ]
-  },
   "openclaw": {
     "id": "openclaw-qqbot",
     "extensions": [
-      "./index.ts"
+      "./dist/index.js"
     ]
   },
   "scripts": {
     "build": "tsc || true",
     "dev": "tsc --watch",
-    "prepack": "npm install --omit=dev"
+    "prepack": "npm install --omit=dev",
+    "postinstall": "node scripts/postinstall-link-sdk.js 2>/dev/null || true"
   },
   "dependencies": {
     "mpg123-decoder": "^1.0.3",
@@ -59,8 +46,6 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "clawdbot": "*",
-    "moltbot": "*",
     "openclaw": "*"
   },
   "homepage": "https://github.com/tencent-connect/openclaw-qqbot",

package/scripts/postinstall-link-sdk.js

@@ -0,0 +1,113 @@
+#!/usr/bin/env node
+
+// When installed as an openclaw extension under ~/.openclaw/extensions/,
+// the plugin needs access to `openclaw/plugin-sdk` at runtime.
+// openclaw's jiti loader resolves this via alias by walking up from the plugin
+// path to find the openclaw package root — but ~/.openclaw/extensions/ is not
+// under the openclaw package tree, so the alias lookup fails.
+//
+// This script creates a symlink from the plugin's node_modules/openclaw to the
+// globally installed openclaw package, allowing Node's native ESM resolver
+// (used by jiti with tryNative:true for .js files) to find `openclaw/plugin-sdk`.
+
+import { existsSync, symlinkSync, mkdirSync, realpathSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { execSync } from "node:child_process";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pluginRoot = resolve(__dirname, "..");
+
+// Only run when installed under an openclaw-like extensions directory
+// (supports openclaw, clawdbot, moltbot, etc.)
+if (!pluginRoot.includes("extensions")) {
+  process.exit(0);
+}
+
+const linkTarget = join(pluginRoot, "node_modules", "openclaw");
+
+// Already linked or exists
+if (existsSync(linkTarget)) {
+  process.exit(0);
+}
+
+// CLI names to try (openclaw and its aliases)
+const CLI_NAMES = ["openclaw", "clawdbot", "moltbot"];
+
+// Find the global openclaw installation
+let openclawRoot = null;
+
+// Strategy 1: npm root -g → look for any known CLI package name
+if (!openclawRoot) {
+  try {
+    const globalRoot = execSync("npm root -g", { encoding: "utf-8" }).trim();
+    for (const name of CLI_NAMES) {
+      const candidate = join(globalRoot, name);
+      if (existsSync(join(candidate, "package.json"))) {
+        openclawRoot = candidate;
+        break;
+      }
+    }
+  } catch {}
+}
+
+// Strategy 2: resolve from the CLI binary (which openclaw / clawdbot / moltbot)
+if (!openclawRoot) {
+  const whichCmd = process.platform === "win32" ? "where" : "which";
+  for (const name of CLI_NAMES) {
+    try {
+      const bin = execSync(`${whichCmd} ${name}`, { encoding: "utf-8" }).trim().split("\n")[0];
+      if (!bin) continue;
+      // Resolve symlinks to get actual binary location
+      const realBin = realpathSync(bin);
+      // bin is typically <prefix>/bin/<name> -> ../lib/node_modules/<name>/...
+      const candidate = resolve(dirname(realBin), "..", "lib", "node_modules", name);
+      if (existsSync(join(candidate, "package.json"))) {
+        openclawRoot = candidate;
+        break;
+      }
+      // Also try: binary might be inside the package itself (e.g. .../node_modules/<name>/bin/<name>)
+      const candidate2 = resolve(dirname(realBin), "..");
+      if (existsSync(join(candidate2, "package.json")) && existsSync(join(candidate2, "plugin-sdk"))) {
+        openclawRoot = candidate2;
+        break;
+      }
+    } catch {}
+  }
+}
+
+// Strategy 3: walk up from the extensions directory to find the CLI's data root,
+// then look for a global node_modules sibling
+if (!openclawRoot) {
+  // pluginRoot is like /home/user/.openclaw/extensions/openclaw-qqbot
+  // The CLI data dir is /home/user/.openclaw (or .clawdbot, .moltbot)
+  const extensionsDir = dirname(pluginRoot);
+  const dataDir = dirname(extensionsDir);
+  const dataDirName = dataDir.split("/").pop() || dataDir.split("\\").pop() || "";
+  // dataDirName is like ".openclaw" → strip the dot to get "openclaw"
+  const cliName = dataDirName.replace(/^\./, "");
+  if (cliName) {
+    try {
+      const globalRoot = execSync("npm root -g", { encoding: "utf-8" }).trim();
+      const candidate = join(globalRoot, cliName);
+      if (existsSync(join(candidate, "package.json"))) {
+        openclawRoot = candidate;
+      }
+    } catch {}
+  }
+}
+
+if (!openclawRoot) {
+  // Not fatal — plugin may work if openclaw loads it with proper alias resolution
+  // But log a warning so upgrade scripts can detect the failure
+  console.error("[postinstall-link-sdk] WARNING: could not find openclaw/clawdbot/moltbot global installation, symlink not created");
+  process.exit(0);
+}
+
+try {
+  mkdirSync(join(pluginRoot, "node_modules"), { recursive: true });
+  symlinkSync(openclawRoot, linkTarget, "junction");
+  console.log(`[postinstall-link-sdk] symlink created: node_modules/openclaw -> ${openclawRoot}`);
+} catch (e) {
+  console.error(`[postinstall-link-sdk] WARNING: symlink creation failed: ${e.message}`);
+}

package/scripts/upgrade-via-npm.ps1

@@ -315,6 +315,47 @@ foreach ($legacyName in @("qqbot", "openclaw-qq")) {
 }
 Write-Host "  Installed to: $TARGET_DIR"
 
+# Execute postinstall script to create openclaw SDK symlink
+# (upgrade-via-npm is pure file operation, npm install is not run, so postinstall won't trigger automatically)
+$PostinstallScript = Join-Path $TARGET_DIR "scripts" "postinstall-link-sdk.js"
+if (Test-Path $PostinstallScript) {
+    Write-Host "  Running postinstall: creating openclaw SDK symlink..."
+    try {
+        Push-Location $TARGET_DIR
+        $postOutput = & node $PostinstallScript 2>&1
+        Pop-Location
+        if ($postOutput) { Write-Host "  $postOutput" }
+    } catch {
+        Write-Host "  [WARN] postinstall script failed (non-fatal)" -ForegroundColor Yellow
+        try { Pop-Location } catch {}
+    }
+    # Verify symlink creation
+    $symlinkPath = Join-Path $TARGET_DIR "node_modules" "openclaw"
+    if (Test-Path $symlinkPath) {
+        Write-Host "  [OK] openclaw SDK symlink ready"
+    } else {
+        Write-Host "  [WARN] openclaw SDK symlink not created, attempting manual fallback..." -ForegroundColor Yellow
+        $cliDataDir = Split-Path $EXTENSIONS_DIR -Parent
+        $cliName = (Split-Path $cliDataDir -Leaf) -replace '^\.',''
+        try {
+            $globalRoot = (& npm root -g 2>$null).Trim()
+            $globalPkg = Join-Path $globalRoot $cliName
+            if ($globalRoot -and (Test-Path $globalPkg)) {
+                $nmDir = Join-Path $TARGET_DIR "node_modules"
+                if (-not (Test-Path $nmDir)) { New-Item -ItemType Directory -Path $nmDir -Force | Out-Null }
+                New-Item -ItemType Junction -Path $symlinkPath -Target $globalPkg -Force | Out-Null
+                Write-Host "  [OK] Manual symlink created: -> $globalPkg"
+            } else {
+                Write-Host "  [ERROR] Cannot locate global $cliName installation (npm root -g: $globalRoot)" -ForegroundColor Red
+            }
+        } catch {
+            Write-Host "  [ERROR] Manual symlink creation also failed: $($_.Exception.Message)" -ForegroundColor Red
+        }
+    }
+} else {
+    Write-Host "  [WARN] postinstall script not found, skipping symlink creation" -ForegroundColor Yellow
+}
+
 # [4/5] Verify installation
 Write-Host ""
 Write-Host "[4/5] Verifying installation..."

package/scripts/upgrade-via-npm.sh

@@ -297,6 +297,36 @@ for dir_name in qqbot openclaw-qq; do
 done
 echo "  已安装到: $TARGET_DIR"
 
+# 执行 postinstall 脚本创建 openclaw SDK symlink
+# （upgrade-via-npm 是纯文件操作，不走 npm install，所以 postinstall 不会自动触发）
+POSTINSTALL_SCRIPT="$TARGET_DIR/scripts/postinstall-link-sdk.js"
+if [ -f "$POSTINSTALL_SCRIPT" ]; then
+    echo "  执行 postinstall: 创建 openclaw SDK symlink..."
+    POSTINSTALL_OUTPUT="$(cd "$TARGET_DIR" && node "$POSTINSTALL_SCRIPT" 2>&1)" || true
+    [ -n "$POSTINSTALL_OUTPUT" ] && echo "  $POSTINSTALL_OUTPUT"
+    # 验证 symlink 是否创建成功
+    if [ -d "$TARGET_DIR/node_modules/openclaw" ]; then
+        echo "  ✅ openclaw SDK symlink 已就绪"
+    else
+        echo "  ⚠️  openclaw SDK symlink 未创建，插件可能无法加载"
+        echo "  尝试手动创建 symlink..."
+        # 手动 fallback：尝试从 CLI 数据目录名推断全局包名
+        _CLI_DATA_DIR="$(dirname "$EXTENSIONS_DIR")"
+        _CLI_NAME="$(basename "$_CLI_DATA_DIR" | sed 's/^\.//')"
+        _GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"
+        if [ -n "$_GLOBAL_ROOT" ] && [ -n "$_CLI_NAME" ] && [ -d "$_GLOBAL_ROOT/$_CLI_NAME" ]; then
+            mkdir -p "$TARGET_DIR/node_modules"
+            ln -sf "$_GLOBAL_ROOT/$_CLI_NAME" "$TARGET_DIR/node_modules/openclaw" 2>/dev/null && \
+                echo "  ✅ 手动 symlink 创建成功: -> $_GLOBAL_ROOT/$_CLI_NAME" || \
+                echo "  ❌ 手动 symlink 创建也失败了"
+        else
+            echo "  ❌ 无法定位全局 $_CLI_NAME 安装路径（npm root -g: $_GLOBAL_ROOT）"
+        fi
+    fi
+else
+    echo "  ⚠️  未找到 postinstall 脚本，跳过 symlink 创建"
+fi
+
 # [4/5] 输出新版本号和升级报告（供调用方解析）
 echo ""
 echo "[4/5] 验证安装..."

package/src/admin-resolver.ts

@@ -152,27 +152,26 @@ export function sendStartupGreetings(ctx: AdminResolverContext, trigger: "READY"
     }
 
     const upgradeTargetOpenId = loadUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId, ctx.log);
-    const targetOpenId = upgradeTargetOpenId || resolveAdminOpenId(ctx);
-    if (!targetOpenId) {
-      markStartupGreetingFailed(ctx.accountId, ctx.appId, plan.version, "no-admin");
-      ctx.log?.info(`[qqbot:${ctx.accountId}] Skipping startup greeting (no admin or known user)`);
+
+    // 没有 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(ctx.accountId, ctx.appId, plan.version);
-      if (upgradeTargetOpenId) {
-        clearUpgradeGreetingTargetOpenId(ctx.accountId, ctx.appId);
-      }
-      ctx.log?.info(`[qqbot:${ctx.accountId}] Sent startup greeting to ${receiverType}: ${targetOpenId}`);
+      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(ctx.accountId, ctx.appId, plan.version, message);

package/clawdbot.plugin.json

@@ -1,16 +0,0 @@
-{
-  "id": "openclaw-qqbot",
-  "name": "OpenClaw QQ Bot",
-  "description": "QQ Bot channel plugin with message support, cron jobs, and proactive messaging",
-  "channels": ["qqbot"],
-  "skills": ["skills/qqbot-channel", "skills/qqbot-remind", "skills/qqbot-media"],
-  "capabilities": {
-    "proactiveMessaging": true,
-    "cronJobs": true
-  },
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}

package/moltbot.plugin.json

@@ -1,16 +0,0 @@
-{
-  "id": "openclaw-qqbot",
-  "name": "OpenClaw QQ Bot",
-  "description": "QQ Bot channel plugin with message support, cron jobs, and proactive messaging",
-  "channels": ["qqbot"],
-  "skills": ["skills/qqbot-channel", "skills/qqbot-remind", "skills/qqbot-media"],
-  "capabilities": {
-    "proactiveMessaging": true,
-    "cronJobs": true
-  },
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  }
-}