@cxyhhhhh/openclaw-qqbot 2.0.0-dev.202607081621 → 2.0.0-dev.202607082155

package/src/gateway/qqbot-gateway.ts

@@ -22,7 +22,7 @@ import { setupMiddlewares } from './middleware-setup.js';
 import { handleMessage, handleInteraction } from './event-handlers.js';
 import { getQQBotDataDir } from '../utils/platform.js';
 import { buildUserAgent } from '../bot-instance.js';
-import { createPluginWebhookAdapter } from '../runtime-adapter/webhook-adapter.js';
+import { createPluginWebhookAdapter } from '../adapter/webhook.js';
 import { getPersistedRefIndexStore } from '../features/ref-index-store.js';
 import { getCachedMsgId } from '../features/msgid-cache.js';
 

package/src/middleware/access-control.ts

@@ -5,7 +5,7 @@
  * 模式：disabled | open | allowlist | pairing（仅 c2c）
  */
 import type { Middleware } from '@tencent-connect/qqbot-nodejs';
-import { getPairingApi } from '../runtime-adapter/pairing-runtime.js';
+import { getPairingApi } from '../adapter/pairing.js';
 
 
 /**

package/src/middleware/attachment.ts

@@ -14,11 +14,11 @@ import {
   convertSilkToWav,
   isVoiceAttachment,
 } from '@tencent-connect/qqbot-nodejs/protocol';
-import { saveRemoteMedia } from 'openclaw/plugin-sdk/media-runtime';
 import type { MessageAttachment } from '../types.js';
 import { transcribeAudio, resolveSTTConfig } from '../utils/stt.js';
 import { formatVoiceText, formatDuration, type VoiceTranscript, type TranscriptSource } from '../utils/voice-text.js';
-import { getAdapters } from '../runtime-adapter/resolve.js';
+import { downloadRemoteMedia } from '../adapter/media.js';
+import { getAdapters } from '../adapter/resolve.js';
 
 export { formatVoiceText, formatDuration };
 export type { VoiceTranscript, TranscriptSource };
@@ -298,12 +298,12 @@ async function downloadMediaFile(
   }
 
   try {
-    const result = await saveRemoteMedia({
+    const result = await downloadRemoteMedia({
       url,
       subdir: 'qqbot/downloads',
       originalFilename: filename,
       maxBytes: 500 * 1024 * 1024,
-      timeoutMs: 60_000,
+      timeoutMs: 120_000,
     });
     log?.debug?.(`Downloaded: ${result.path}`);
     return result.path;

package/src/openclaw-plugin-sdk.d.ts

@@ -675,6 +675,47 @@ declare module "openclaw/plugin-sdk" {
   export function normalizeAccountId(accountId: string | undefined | null): string;
 }
 
+declare module "openclaw/plugin-sdk/setup" {
+  export interface ChannelSetupWizardStatus {
+    channelLabel: string;
+    configuredLabel: string;
+    unconfiguredLabel: string;
+    configuredHint?: string;
+    unconfiguredHint?: string;
+    configuredScore?: number;
+    unconfiguredScore?: number;
+    includeStatusLine?: boolean;
+    resolveConfigured: (params: { cfg: unknown; accountId: string }) => boolean;
+  }
+
+  export interface ChannelSetupWizard {
+    channel: string;
+    status: ChannelSetupWizardStatus;
+    credentials?: Array<{ id: string; label: string }>;
+    onStatusChange?: (params: { cfg: unknown }) => void | Promise<void>;
+    configure?: (params: { cfg: unknown; accountId: string; prompter: unknown; runtime: unknown }) => Promise<unknown>;
+    finalize: (params: { cfg: unknown; accountId: string; prompter: unknown; runtime: unknown }) => Promise<unknown>;
+    enable?: (cfg: unknown) => unknown;
+    disable?: (cfg: unknown) => unknown;
+  }
+
+  export function createStandardChannelSetupStatus(
+    opts: ChannelSetupWizardStatus,
+  ): ChannelSetupWizardStatus;
+
+  export function setSetupChannelEnabled(
+    cfg: unknown,
+    channel: string,
+    enabled: boolean,
+  ): void;
+
+  export const DEFAULT_ACCOUNT_ID: string;
+}
+
+declare module "openclaw/plugin-sdk/setup-tools" {
+  export function formatDocsLink(href: string, text?: string): string;
+}
+
 declare module "openclaw/plugin-sdk/approval-runtime" {
   export interface ExecApprovalReplyMetadata {
     approvalId: string;

package/src/outbound/media-send.ts

@@ -13,11 +13,11 @@
 import * as path from 'node:path';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
-import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from 'openclaw/plugin-sdk/health';
+import { resolveAgentWorkspace } from '../adapter/workspace.js';
 import type { ReplyTarget } from '@tencent-connect/qqbot-nodejs';
 import type { QQBotGateway } from '../gateway/index.js';
 import { tryGetQQBotRuntime } from '../runtime.js';
-import { getAdapters } from '../runtime-adapter/resolve.js';
+import { getAdapters } from '../adapter/resolve.js';
 import type { PluginLogger } from '../utils/plugin-logger.js';
 import { getGateway } from './outbound-service.js';
 import { parseTarget } from './target.js';
@@ -174,13 +174,11 @@ function resolveMediaPath(source: string, log?: SendMediaParams['log'], workspac
   return { ok: true, path: real, isLocal: true };
 }
 
-/** Agent ID → workspaceDir（出站时解析，无需透传） */
+/** Agent ID → workspaceDir（动态加载 plugin-sdk/health） */
 function resolveWorkspaceFromAgent(agentId?: string): string | undefined {
   const cfg = resolveConfigViaAdapter();
   if (!cfg) return undefined;
-  try {
-    return resolveAgentWorkspaceDir(cfg, agentId ?? resolveDefaultAgentId(cfg));
-  } catch { return undefined; }
+  return resolveAgentWorkspace(cfg, agentId);
 }
 
 /** 通过 adapter 获取配置 */

package/src/runtime.ts

@@ -7,13 +7,15 @@
 import type { PluginRuntime } from "openclaw/plugin-sdk";
 import { setOpenClawVersion } from "./bot-instance.js";
 import { flushAllRefIndexStores } from "./features/ref-index-store.js";
+import { getOpenclawVersion } from "./utils/pkg-version.js";
 
 let runtime: PluginRuntime | null = null;
 let exitHooksInstalled = false;
 
 export function setQQBotRuntime(next: PluginRuntime) {
   runtime = next;
-  setOpenClawVersion(next.version);
+  const version = getOpenclawVersion(next.version);
+  setOpenClawVersion(version);
   installExitHooksOnce();
 }
 

package/src/setup/finalize.ts

@@ -2,8 +2,7 @@
  * openclaw setup 引导 — QQ Bot 扫码/手动绑定
  */
 import type { OpenClawConfig } from 'openclaw/plugin-sdk';
-import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/setup';
-import { formatDocsLink } from 'openclaw/plugin-sdk/setup-tools';
+import { DEFAULT_ACCOUNT_ID, formatDocsLink } from '../adapter/setup.js';
 import { qrConnect } from '@tencent-connect/qqbot-connector';
 import { applyQQBotAccountConfig, resolveQQBotAccount } from '../config.js';
 

package/src/setup/surface.ts

@@ -1,11 +1,10 @@
 /**
  * OpenClaw setup 向导 — QQ Bot 配置界面
  */
-import type { ChannelSetupWizard } from 'openclaw/plugin-sdk/setup';
-import { createStandardChannelSetupStatus } from 'openclaw/plugin-sdk/setup';
+import type { ChannelSetupWizard } from '../adapter/setup.js';
+import { createStandardChannelSetupStatus, setSetupChannelEnabled } from '../adapter/setup.js';
 import { listQQBotAccountIds, resolveQQBotAccount } from '../config.js';
 import { finalizeQQBotSetup } from './finalize.js';
-import { setSetupChannelEnabled } from 'openclaw/plugin-sdk/setup';
 
 const CHANNEL = 'qqbot' as const;
 
@@ -20,8 +19,8 @@ export const qqbotSetupWizard: ChannelSetupWizard = {
     configuredScore: 1,
     unconfiguredScore: 6,
     resolveConfigured: ({ cfg, accountId }) =>
-      (accountId ? [accountId] : listQQBotAccountIds(cfg)).some((id) => {
-        const account = resolveQQBotAccount(cfg, id);
+      (accountId ? [accountId] : listQQBotAccountIds(cfg as any)).some((id) => {
+        const account = resolveQQBotAccount(cfg as any, id);
         return Boolean(account.appId && account.clientSecret);
       }),
   }),
@@ -29,5 +28,5 @@ export const qqbotSetupWizard: ChannelSetupWizard = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   finalize: (async ({ cfg, accountId, prompter, runtime }: any) =>
     finalizeQQBotSetup({ cfg, accountId, prompter: prompter as any, runtime: runtime as any })) as any,
-  disable: (cfg) => setSetupChannelEnabled(cfg, CHANNEL, false),
+  disable: (cfg) => { setSetupChannelEnabled(cfg, CHANNEL, false); return cfg; },
 };

package/src/utils/pkg-version.ts

@@ -1,35 +1,26 @@
 /**
- * 从当前文件位置向上遍历目录树查找 package.json 并读取 version。
- * 不依赖硬编码的 "../" 层级，无论编译输出结构如何变化都能可靠找到。
+ * 版本号获取工具。
  *
- * 兼容 CJS（tsup bundle）和 ESM 两种输出格式。
+ * - getPackageVersion(): 插件自身版本（@tencent-connect/openclaw-qqbot）
+ * - getOpenclawVersion():  OpenClaw 框架版本降级链
+ *
+ * 兼容 CJS（tsup bundle）环境，不依赖 require.resolve。
  */
 
-import { fileURLToPath } from "node:url";
-import { createRequire } from "node:module";
 import path from "node:path";
 import fs from "node:fs";
 
-/** 已定位到的 package.json 路径，避免重复遍历目录树 */
+/** 已定位到的插件 package.json 路径，避免重复遍历目录树 */
 let _resolvedPkgPath: string | null = null;
 
+/** OpenClaw 框架版本缓存（一次查完不再重复 io） */
+let _cachedOpenclawVersion: string | undefined;
+
 /**
- * 获取当前文件路径（兼容 CJS/ESM）。
- * tsup CJS bundle 中 __filename 由构建工具注入。
+ * 获取插件自身版本号（@tencent-connect/openclaw-qqbot）。
+ * 从 __filename 向上遍历目录树找同名 package.json。
  */
-function getCurrentFilename(metaUrl?: string): string {
-  if (metaUrl) {
-    return fileURLToPath(metaUrl);
-  }
-  // CJS 环境：__filename 由 tsup 注入
-  if (typeof __filename !== "undefined") {
-    return __filename;
-  }
-  return process.cwd();
-}
-
-export function getPackageVersion(metaUrl?: string): string {
-  // 如果之前已定位到 package.json 路径，直接重新读取（快速路径）
+export function getPackageVersion(): string {
   if (_resolvedPkgPath) {
     try {
       const pkg = JSON.parse(fs.readFileSync(_resolvedPkgPath, "utf8"));
@@ -37,45 +28,105 @@ export function getPackageVersion(metaUrl?: string): string {
         return pkg.version as string;
       }
     } catch {
-      // 文件可能已被删除（升级过程中），清除路径缓存，走完整查找
       _resolvedPkgPath = null;
     }
   }
 
-  // Strategy 1: 从调用者位置向上遍历找 package.json
-  const startFile = getCurrentFilename(metaUrl);
-  let dir = path.dirname(startFile);
-  const root = path.parse(dir).root;
-
-  while (dir !== root) {
-    const candidate = path.join(dir, "package.json");
-    try {
-      if (fs.existsSync(candidate)) {
-        const pkg = JSON.parse(fs.readFileSync(candidate, "utf8"));
-        // 确认是我们自己的包（避免找到其他 package.json）
-        if (pkg.name === "@tencent-connect/openclaw-qqbot" && pkg.version) {
-          _resolvedPkgPath = candidate;
-          return pkg.version as string;
+  // 从 __filename 向上遍历目录树
+  if (typeof __filename === "string") {
+    let dir = path.dirname(__filename);
+    const root = path.parse(dir).root;
+    while (dir !== root) {
+      const candidate = path.join(dir, "package.json");
+      try {
+        if (fs.existsSync(candidate)) {
+          const pkg = JSON.parse(fs.readFileSync(candidate, "utf8"));
+          if (pkg.name === "@tencent-connect/openclaw-qqbot" && pkg.version) {
+            _resolvedPkgPath = candidate;
+            return pkg.version as string;
+          }
         }
-      }
-    } catch {
-      // ignore and try parent
+      } catch { /* next */ }
+      dir = path.dirname(dir);
     }
-    dir = path.dirname(dir);
   }
 
-  // Strategy 2: fallback 用 createRequire 尝试常见相对路径
+  return "unknown";
+}
+
+// ── OpenClaw 框架版本 ──
+
+/**
+ * OpenClaw 框架版本降级链（优先后）。
+ *   1. PluginRuntime.version（3.31+，非 "unknown"）
+ *   2. OPENCLAW_VERSION / OPENCLAW_SERVICE_VERSION 环境变量
+ *   3. 文件系统搜索 openclaw/package.json
+ *   4. 兜底 "unknown"
+ */
+export function getOpenclawVersion(runtimeVersion?: string): string {
+  if (_cachedOpenclawVersion) return _cachedOpenclawVersion;
+
+  // 1. runtime.version（排除兜底值）
+  if (runtimeVersion && runtimeVersion !== "unknown") {
+    return _cachedOpenclawVersion = runtimeVersion;
+  }
+  // 2. 环境变量
+  if (process.env.OPENCLAW_VERSION) {
+    return _cachedOpenclawVersion = process.env.OPENCLAW_VERSION;
+  }
+  if (process.env.OPENCLAW_SERVICE_VERSION) {
+    return _cachedOpenclawVersion = process.env.OPENCLAW_SERVICE_VERSION;
+  }
+  // 3. 文件系统
+  const pkgVer = readOpenclawPackageVersion();
+  if (pkgVer) return _cachedOpenclawVersion = pkgVer;
+
+  return "unknown";
+}
+
+function readOpenclawPackageVersion(): string | undefined {
   try {
-    const req = createRequire(__filename);
-    for (const rel of ["../../package.json", "../package.json", "./package.json"]) {
+    const dirs = searchRoots();
+    for (const dir of dirs) {
+      const pkgPath = path.join(dir, "package.json");
       try {
-        const pkg = req(rel);
-        if (pkg?.version) {
-          return pkg.version as string;
-        }
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8")) as { name?: string; version?: string };
+        if (pkg.name === "openclaw" && pkg.version) return pkg.version;
       } catch { /* next */ }
     }
-  } catch { /* fallback */ }
+  } catch { /* fallthrough */ }
+  return undefined;
+}
 
-  return "unknown";
+function searchRoots(): string[] {
+  const roots: string[] = [];
+
+  // 从插件自身路径向上查找
+  if (typeof __filename === "string") {
+    let dir = path.dirname(__filename);
+    for (let i = 0; i < 10; i++) {
+      roots.push(dir);
+      const parent = path.dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
+    }
+  }
+
+  // STATE_DIR 指向的 openclaw 安装目录附近
+  for (const key of ["OPENCLAW_STATE_DIR", "CLAWDBOT_STATE_DIR", "MOLTBOT_STATE_DIR"]) {
+    const v = process.env[key];
+    if (v) {
+      roots.push(path.dirname(v));
+      roots.push(path.resolve(v, ".."));
+    }
+  }
+
+  // 常见安装路径
+  const home = process.env.HOME || process.env.USERPROFILE || "/tmp";
+  for (const name of ["openclaw", "clawdbot", "moltbot"]) {
+    roots.push(path.join(home, `.${name}`));
+  }
+  roots.push(process.cwd());
+
+  return [...new Set(roots.filter((r) => typeof r === "string" && r.length > 0))];
 }

package/tsup.config.ts

@@ -22,7 +22,7 @@ export default defineConfig({
   clean: true,
   external: [
     'openclaw',
-    'openclaw/plugin-sdk',
+    /^openclaw\/plugin-sdk(\/.+)?$/,
   ],
   noExternal: [
     '@tencent-connect/qqbot-nodejs',