@jerryliang122/openclaw-qqbot 1.0.7 → 1.0.9

package/README.md

@@ -12,7 +12,7 @@
 
 [![License](https://img.shields.io/badge/license-MIT-green)](./LICENSE)
 [![QQ Bot](https://img.shields.io/badge/QQ_Bot-API_v2-red)](https://bot.q.qq.com/wiki/)
-[![Platform](https://img.shields.io/badge/OpenClaw-%3E%3D2026.9.2-orange)](https://github.com/jerryliang122/qqbot-openclaw)
+[![Platform](https://img.shields.io/badge/OpenClaw-%3E%3D2026.9.1-orange)](https://github.com/jerryliang122/qqbot-openclaw)
 [![Node.js](https://img.shields.io/badge/Node.js->=18-339933?logo=node.js&logoColor=white)](https://nodejs.org/)
 [![TypeScript](https://img.shields.io/badge/TypeScript-5.9-3178C6?logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
 [![Fork](https://img.shields.io/badge/fork-enhanced-9cf)](https://github.com/jerryliang122/qqbot-openclaw)
@@ -23,7 +23,7 @@
 
 > This is an **independently maintained fork** with its own versioning (v1.x, decoupled from the upstream 2.x line). Upstream: [tencent-connect/openclaw-qqbot](https://github.com/tencent-connect/openclaw-qqbot).
 >
-> **Requirements**: OpenClaw `>= 2026.9.2` · Published to npm as [`@jerryliang122/openclaw-qqbot`](https://www.npmjs.com/package/@jerryliang122/openclaw-qqbot). See [CHANGELOG](CHANGELOG.md) for differences vs the old version and the upgrade guide.
+> **Requirements**: OpenClaw `>= 2026.9.1` · Published to npm as [`@jerryliang122/openclaw-qqbot`](https://www.npmjs.com/package/@jerryliang122/openclaw-qqbot). See [CHANGELOG](CHANGELOG.md) for differences vs the old version and the upgrade guide.
 
 Scan to join the QQ group chat
 
@@ -179,7 +179,7 @@ Measures end-to-end latency from QQ server push to plugin response, broken down
 
 > **You**: `/bot-version`
 >
-> **QQBot**: 🦞 Framework: OpenClaw 2026.9.2 / 🤖 Plugin: v1.0.0 / 🌟 GitHub repo
+> **QQBot**: 🦞 Framework: OpenClaw 2026.9.1 / 🤖 Plugin: v1.0.0 / 🌟 GitHub repo
 
 Shows framework version, plugin version, and a direct link to the official repository.
 
@@ -282,7 +282,7 @@ Answers "why does this group have no context" diagnostics: the push mode is chos
 
 ### Step 2 — Install / Upgrade the Plugin
 
-> **Note**: The unscoped npm name `openclaw-qqbot` belongs to the original upstream project — this fork publishes as the scoped package `@jerryliang122/openclaw-qqbot`. Requires OpenClaw >= 2026.9.2.
+> **Note**: The unscoped npm name `openclaw-qqbot` belongs to the original upstream project — this fork publishes as the scoped package `@jerryliang122/openclaw-qqbot`. Requires OpenClaw >= 2026.9.1.
 
 **Option A: Install from npm (Recommended)**
 

package/README.zh.md

@@ -10,14 +10,14 @@
 **让你的 AI 助手接入 QQ — 私聊、群聊、富媒体，一个插件全搞定。**
 
 > 本仓库为**独立维护的 fork**，自 v1.0.0 起独立发版（与上游 2.x 版本线完全脱钩）。
-> 运行要求：OpenClaw `>= 2026.9.2`；npm 包名 [`@jerryliang122/openclaw-qqbot`](https://www.npmjs.com/package/@jerryliang122/openclaw-qqbot)。
+> 运行要求：OpenClaw `>= 2026.9.1`；npm 包名 [`@jerryliang122/openclaw-qqbot`](https://www.npmjs.com/package/@jerryliang122/openclaw-qqbot)。
 > 与旧版本的差异及升级指南见 [CHANGELOG](CHANGELOG.md)。上游仓库：[tencent-connect/openclaw-qqbot](https://github.com/tencent-connect/openclaw-qqbot)。
 
 ### 🚀 当前版本： `v1.0.0`
 
 [![License](https://img.shields.io/badge/license-MIT-green)](./LICENSE)
 [![QQ Bot](https://img.shields.io/badge/QQ_Bot-API_v2-red)](https://bot.q.qq.com/wiki/)
-[![Platform](https://img.shields.io/badge/OpenClaw-%3E%3D2026.9.2-orange)](https://github.com/jerryliang122/qqbot-openclaw)
+[![Platform](https://img.shields.io/badge/OpenClaw-%3E%3D2026.9.1-orange)](https://github.com/jerryliang122/qqbot-openclaw)
 [![Node.js](https://img.shields.io/badge/Node.js->=18-339933?logo=node.js&logoColor=white)](https://nodejs.org/)
 [![TypeScript](https://img.shields.io/badge/TypeScript-5.9-3178C6?logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
 
@@ -177,7 +177,7 @@ AI 可直接发送视频，支持本地文件和公网 URL。
 
 > **你**：`/bot-version`
 >
-> **QQBot**：🦞框架版本：OpenClaw 2026.9.2 / 🤖QQBot 插件版本：v1.0.0 / 🌟GitHub 仓库
+> **QQBot**：🦞框架版本：OpenClaw 2026.9.1 / 🤖QQBot 插件版本：v1.0.0 / 🌟GitHub 仓库
 
 一目了然查看框架版本、插件版本，并可直接跳转官方仓库。
 
@@ -282,7 +282,7 @@ AI 可直接发送视频，支持本地文件和公网 URL。
 
 ### 第二步 — 安装 / 升级插件
 
-> 无 scope 的 npm 包名 `openclaw-qqbot` 属于上游原项目——本 fork 以 `@jerryliang122/openclaw-qqbot` 发布。要求 OpenClaw >= 2026.9.2。
+> 无 scope 的 npm 包名 `openclaw-qqbot` 属于上游原项目——本 fork 以 `@jerryliang122/openclaw-qqbot` 发布。要求 OpenClaw >= 2026.9.1。
 
 **方式 A：从 npm 安装（推荐）**
 

package/dist/index.cjs

@@ -8259,7 +8259,7 @@ var init_outbound_service = __esm({
 
 // src/utils/pkg-version.ts
 function getPackageVersion() {
-  return true ? "1.0.7" : "unknown";
+  return true ? "1.0.9" : "unknown";
 }
 function getOpenclawVersion(runtimeVersion) {
   return runtimeVersion && runtimeVersion !== "unknown" ? runtimeVersion : "unknown";
@@ -10454,7 +10454,7 @@ function getAdapters(rt, log5) {
 async function persistAuthConfig(runtime2, cfg, afterWrite = "restart") {
   const config = runtime2.config;
   if (typeof config?.mutateConfigFile !== "function") {
-    throw new Error("persistAuthConfig: runtime.config.mutateConfigFile is unavailable (requires openclaw >= 2026.9.2)");
+    throw new Error("persistAuthConfig: runtime.config.mutateConfigFile is unavailable (requires openclaw >= 2026.9.1)");
   }
   await config.mutateConfigFile({
     mutate: () => cfg,
@@ -15131,7 +15131,7 @@ async function dispatchToOpenClaw(ctx, msg, account, runtime2, log5) {
   const envelope = buildEnvelope2(ctx, msg, account);
   dlog?.debug(`received sender=${envelope.senderId} scope=${envelope.chatScope} msgId=${envelope.messageId}`);
   if (!adapters.inboundRun || !adapters.dispatchReply) {
-    dlog?.error(`runtime adapter inboundRun/dispatchReply not available (openclaw=${adapters.version}, requires >=2026.9.2)`);
+    dlog?.error(`runtime adapter inboundRun/dispatchReply not available (openclaw=${adapters.version}, requires >=2026.9.1)`);
     return;
   }
   const assembled = ctx.state.assembledBody ?? assembleBody(ctx, msg, account);
@@ -17478,9 +17478,33 @@ init_runtime();
 
 // src/tools/platform.ts
 init_config();
-init_bot_instance();
-init_request_context();
+init_outbound_service();
 init_plugin_logger();
+
+// src/tools/tool-session.ts
+init_request_context();
+function resolveToolSessionRoute(delivery) {
+  const alsTarget = getRequestTarget();
+  if (alsTarget) {
+    return {
+      target: alsTarget,
+      accountId: getRequestAccountId(),
+      source: "request-context"
+    };
+  }
+  const to = typeof delivery?.to === "string" ? delivery.to.trim() : "";
+  if (!to) return void 0;
+  const channel = typeof delivery?.channel === "string" ? delivery.channel.trim() : "";
+  if (channel && channel !== "qqbot") return void 0;
+  if (!/^qqbot:(c2c|group|channel):/i.test(to)) return void 0;
+  return {
+    target: to,
+    accountId: delivery?.accountId,
+    source: "delivery-context"
+  };
+}
+
+// src/tools/platform.ts
 var toolLog = createPluginLogger({ prefix: "[tool:platform]" });
 var PlatformApiSchema = {
   type: "object",
@@ -17526,68 +17550,76 @@ function registerPlatformTool(api) {
   const accountIds = listQQBotAccountIds(cfg);
   if (accountIds.length === 0) return;
   api.registerTool(
-    {
-      name: "qqbot_platform_api",
-      label: "QQBot Platform API Gateway",
-      description: "QQ \u5F00\u653E\u5E73\u53F0\u7EDF\u4E00 HTTP API \u7F51\u5173\uFF0C\u81EA\u52A8\u586B\u5145\u9274\u6743 Token\u3002\u5E38\u7528\u63A5\u53E3\u901F\u67E5\uFF1A\u3010\u9891\u9053\u3011GET /users/@me/guilds | /guilds/{guild_id}/channels | /channels/{channel_id} | \u3010\u7FA4\u3011GET /v2/groups/{group_id}/bot_state | /v2/groups/{group_id}/members/{member_id} | /v2/groups/{group_id}/info\u3002\u66F4\u591A\u63A5\u53E3\u548C\u53C2\u6570\u8BE6\u60C5\u8BF7\u9605\u8BFB qqbot-channel \u548C qqbot-group skill\u3002",
-      parameters: PlatformApiSchema,
-      async execute(_toolCallId, params) {
-        const p2 = params;
-        if (!p2.method) return json({ error: "method \u4E3A\u5FC5\u586B\u53C2\u6570" });
-        if (!p2.path) return json({ error: "path \u4E3A\u5FC5\u586B\u53C2\u6570" });
-        const method = p2.method.toUpperCase();
-        if (!["GET", "POST", "PUT", "PATCH", "DELETE"].includes(method)) {
-          return json({ error: `\u4E0D\u652F\u6301\u7684 HTTP \u65B9\u6CD5: ${method}` });
-        }
-        const pathError = validatePath(p2.path);
-        if (pathError) return json({ error: pathError });
-        const accountId = getRequestAccountId();
-        if (!accountId) {
-          return json({ error: "\u65E0\u6CD5\u83B7\u53D6\u5F53\u524D\u8BF7\u6C42\u7684\u8D26\u53F7\u4FE1\u606F\uFF0C\u6B64\u5DE5\u5177\u4EC5\u652F\u6301\u5728\u6D88\u606F\u4F1A\u8BDD\u4E2D\u4F7F\u7528" });
-        }
-        try {
-          const bot = getBotForAccount(accountId);
-          const apiGateway = bot.api;
-          const startedAt = Date.now();
-          let data;
-          switch (method) {
-            case "GET":
-              data = await apiGateway.get(p2.path, p2.query);
-              break;
-            case "POST":
-              data = await apiGateway.post(p2.path, p2.body);
-              break;
-            case "PUT":
-              data = await apiGateway.put(p2.path, p2.body);
-              break;
-            case "PATCH":
-              data = await apiGateway.patch(p2.path, p2.body);
-              break;
-            case "DELETE":
-              data = await apiGateway.delete(p2.path);
-              break;
+    (factoryCtx) => {
+      const delivery = factoryCtx.deliveryContext;
+      return {
+        name: "qqbot_platform_api",
+        label: "QQBot Platform API Gateway",
+        description: "QQ \u5F00\u653E\u5E73\u53F0\u7EDF\u4E00 HTTP API \u7F51\u5173\uFF0C\u81EA\u52A8\u586B\u5145\u9274\u6743 Token\u3002\u5E38\u7528\u63A5\u53E3\u901F\u67E5\uFF1A\u3010\u9891\u9053\u3011GET /users/@me/guilds | /guilds/{guild_id}/channels | /channels/{channel_id} | \u3010\u7FA4\u3011GET /v2/groups/{group_id}/bot_state | /v2/groups/{group_id}/members/{member_id} | /v2/groups/{group_id}/info\u3002\u66F4\u591A\u63A5\u53E3\u548C\u53C2\u6570\u8BE6\u60C5\u8BF7\u9605\u8BFB qqbot-channel \u548C qqbot-group skill\u3002",
+        parameters: PlatformApiSchema,
+        async execute(_toolCallId, params) {
+          const p2 = params;
+          if (!p2.method) return json({ error: "method \u4E3A\u5FC5\u586B\u53C2\u6570" });
+          if (!p2.path) return json({ error: "path \u4E3A\u5FC5\u586B\u53C2\u6570" });
+          const method = p2.method.toUpperCase();
+          if (!["GET", "POST", "PUT", "PATCH", "DELETE"].includes(method)) {
+            return json({ error: `\u4E0D\u652F\u6301\u7684 HTTP \u65B9\u6CD5: ${method}` });
+          }
+          const pathError = validatePath(p2.path);
+          if (pathError) return json({ error: pathError });
+          const route = resolveToolSessionRoute(delivery);
+          if (!route) {
+            return json({
+              error: "\u5F53\u524D\u8FD0\u884C\u6CA1\u6709 QQ \u4F1A\u8BDD\u6765\u6E90\uFF08\u53EF\u80FD\u7531\u5B9A\u65F6\u4EFB\u52A1\u6216\u6846\u67B6\u5185\u90E8\u89E6\u53D1\u7684 run\uFF09\uFF0C\u65E0\u6CD5\u786E\u5B9A\u8C03\u7528\u54EA\u4E2A QQ Bot \u8D26\u6237\u3002\u8BF7\u5728 QQ \u6D88\u606F\u4F1A\u8BDD\u4E2D\u4F7F\u7528\u672C\u5DE5\u5177\u3002"
+            });
+          }
+          try {
+            const resolvedGateway = resolveGatewayForSend(route.accountId ?? "default");
+            if (!resolvedGateway) {
+              return json({ error: `\u8D26\u6237 ${route.accountId ?? "default"} \u7684 gateway \u5C1A\u672A\u542F\u52A8` });
+            }
+            const bot = resolvedGateway.gw.bot;
+            const apiGateway = bot.api;
+            const startedAt = Date.now();
+            let data;
+            switch (method) {
+              case "GET":
+                data = await apiGateway.get(p2.path, p2.query);
+                break;
+              case "POST":
+                data = await apiGateway.post(p2.path, p2.body);
+                break;
+              case "PUT":
+                data = await apiGateway.put(p2.path, p2.body);
+                break;
+              case "PATCH":
+                data = await apiGateway.patch(p2.path, p2.body);
+                break;
+              case "DELETE":
+                data = await apiGateway.delete(p2.path);
+                break;
+            }
+            toolLog.info(`${method} ${p2.path} ok (${Date.now() - startedAt}ms)`, { accountId: resolvedGateway.accountId });
+            return json(data);
+          } catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            const apiErr = err;
+            toolLog.warn(`${method} ${p2.path} failed status=${apiErr.httpStatus ?? "?"} code=${apiErr.bizCode ?? "?"}: ${errMsg}`, { accountId: route.accountId ?? "default" });
+            return json({
+              error: errMsg,
+              status: apiErr.httpStatus,
+              code: apiErr.bizCode,
+              path: p2.path
+            });
           }
-          toolLog.info(`${method} ${p2.path} ok (${Date.now() - startedAt}ms)`, { accountId });
-          return json(data);
-        } catch (err) {
-          const errMsg = err instanceof Error ? err.message : String(err);
-          const apiErr = err;
-          toolLog.warn(`${method} ${p2.path} failed status=${apiErr.httpStatus ?? "?"} code=${apiErr.bizCode ?? "?"}: ${errMsg}`, { accountId });
-          return json({
-            error: errMsg,
-            status: apiErr.httpStatus,
-            code: apiErr.bizCode,
-            path: p2.path
-          });
         }
-      }
+      };
     },
     { name: "qqbot_platform_api" }
   );
 }
 
 // src/tools/remind.ts
-init_request_context();
 var RemindSchema = {
   type: "object",
   properties: {
@@ -17732,71 +17764,76 @@ function formatDelay(ms) {
 }
 function registerRemindTool(api) {
   api.registerTool(
-    {
-      name: "qqbot_remind",
-      label: "QQBot \u5B9A\u65F6\u63D0\u9192",
-      description: '\u521B\u5EFA\u3001\u67E5\u8BE2\u3001\u5220\u9664 QQ \u5B9A\u65F6\u63D0\u9192\u3002\u4F7F\u7528\u7B80\u5355\u53C2\u6570\u5373\u53EF\uFF0C\u65E0\u9700\u624B\u52A8\u6784\u9020 cron JSON\u3002\n\u521B\u5EFA\u63D0\u9192\uFF1Aaction=add, content=\u63D0\u9192\u5185\u5BB9, to=\u76EE\u6807\u5730\u5740, time=\u65F6\u95F4\n\u67E5\u770B\u63D0\u9192\uFF1Aaction=list\n\u5220\u9664\u63D0\u9192\uFF1Aaction=remove, jobId=\u4EFB\u52A1ID\uFF08\u5148 list \u83B7\u53D6\uFF09\n\u65F6\u95F4\u683C\u5F0F\u793A\u4F8B\uFF1A"5m"(5\u5206\u949F\u540E) "1h"(1\u5C0F\u65F6\u540E) "0 8 * * *"(\u6BCF\u59298\u70B9)',
-      parameters: RemindSchema,
-      execute(_toolCallId, params) {
-        const p2 = params;
-        if (p2.action === "list") {
-          return json2({
-            _instruction: "\u8BF7\u7ACB\u5373\u4F7F\u7528 cron \u5DE5\u5177\u6267\u884C\u4EE5\u4E0B\u53C2\u6570",
-            cronParams: { action: "list" }
-          });
-        }
-        if (p2.action === "remove") {
-          if (!p2.jobId) {
-            return json2({ error: "action=remove \u65F6 jobId \u4E3A\u5FC5\u586B\u53C2\u6570\u3002\u8BF7\u5148\u7528 action=list \u83B7\u53D6 jobId\u3002" });
+    (factoryCtx) => {
+      const delivery = factoryCtx.deliveryContext;
+      return {
+        name: "qqbot_remind",
+        label: "QQBot \u5B9A\u65F6\u63D0\u9192",
+        description: '\u521B\u5EFA\u3001\u67E5\u8BE2\u3001\u5220\u9664 QQ \u5B9A\u65F6\u63D0\u9192\u3002\u4F7F\u7528\u7B80\u5355\u53C2\u6570\u5373\u53EF\uFF0C\u65E0\u9700\u624B\u52A8\u6784\u9020 cron JSON\u3002\n\u521B\u5EFA\u63D0\u9192\uFF1Aaction=add, content=\u63D0\u9192\u5185\u5BB9, to=\u76EE\u6807\u5730\u5740, time=\u65F6\u95F4\n\u67E5\u770B\u63D0\u9192\uFF1Aaction=list\n\u5220\u9664\u63D0\u9192\uFF1Aaction=remove, jobId=\u4EFB\u52A1ID\uFF08\u5148 list \u83B7\u53D6\uFF09\n\u65F6\u95F4\u683C\u5F0F\u793A\u4F8B\uFF1A"5m"(5\u5206\u949F\u540E) "1h"(1\u5C0F\u65F6\u540E) "0 8 * * *"(\u6BCF\u59298\u70B9)',
+        parameters: RemindSchema,
+        async execute(_toolCallId, params) {
+          const p2 = params;
+          if (p2.action === "list") {
+            return json2({
+              _instruction: "\u8BF7\u7ACB\u5373\u4F7F\u7528 cron \u5DE5\u5177\u6267\u884C\u4EE5\u4E0B\u53C2\u6570",
+              cronParams: { action: "list" }
+            });
           }
-          return json2({
-            _instruction: "\u8BF7\u7ACB\u5373\u4F7F\u7528 cron \u5DE5\u5177\u6267\u884C\u4EE5\u4E0B\u53C2\u6570",
-            cronParams: { action: "remove", jobId: p2.jobId }
-          });
-        }
-        if (!p2.content) {
-          return json2({ error: "action=add \u65F6 content\uFF08\u63D0\u9192\u5185\u5BB9\uFF09\u4E3A\u5FC5\u586B\u53C2\u6570" });
-        }
-        const resolvedTo = p2.to || getRequestTarget();
-        if (!resolvedTo) {
-          return json2({ error: "action=add \u65F6\u65E0\u6CD5\u786E\u5B9A\u6295\u9012\u76EE\u6807\u5730\u5740\u3002\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002" });
-        }
-        const resolvedAccountId = getRequestAccountId() || "default";
-        if (!p2.time) {
-          return json2({ error: 'action=add \u65F6 time\uFF08\u65F6\u95F4\uFF09\u4E3A\u5FC5\u586B\u53C2\u6570\u3002\u793A\u4F8B\uFF1A"5m"\u3001"1h30m"\u3001"0 8 * * *"' });
-        }
-        if (isCronExpression(p2.time)) {
-          const cronJob = buildCronJob(p2, resolvedTo, resolvedAccountId);
+          if (p2.action === "remove") {
+            if (!p2.jobId) {
+              return json2({ error: "action=remove \u65F6 jobId \u4E3A\u5FC5\u586B\u53C2\u6570\u3002\u8BF7\u5148\u7528 action=list \u83B7\u53D6 jobId\u3002" });
+            }
+            return json2({
+              _instruction: "\u8BF7\u7ACB\u5373\u4F7F\u7528 cron \u5DE5\u5177\u6267\u884C\u4EE5\u4E0B\u53C2\u6570",
+              cronParams: { action: "remove", jobId: p2.jobId }
+            });
+          }
+          if (!p2.content) {
+            return json2({ error: "action=add \u65F6 content\uFF08\u63D0\u9192\u5185\u5BB9\uFF09\u4E3A\u5FC5\u586B\u53C2\u6570" });
+          }
+          const route = resolveToolSessionRoute(delivery);
+          const resolvedTo = p2.to || route?.target;
+          if (!resolvedTo) {
+            return json2({
+              error: "action=add \u65F6\u65E0\u6CD5\u786E\u5B9A\u6295\u9012\u76EE\u6807\u5730\u5740\uFF08\u5F53\u524D run \u65E0 QQ \u4F1A\u8BDD\u6765\u6E90\uFF09\u3002\u8BF7\u663E\u5F0F\u4F20\u5165 to\uFF08\u683C\u5F0F\uFF1Aqqbot:c2c:user_openid \u6216 qqbot:group:group_openid\uFF09\u540E\u91CD\u8BD5\u3002"
+            });
+          }
+          const resolvedAccountId = route?.accountId || "default";
+          if (!p2.time) {
+            return json2({ error: 'action=add \u65F6 time\uFF08\u65F6\u95F4\uFF09\u4E3A\u5FC5\u586B\u53C2\u6570\u3002\u793A\u4F8B\uFF1A"5m"\u3001"1h30m"\u3001"0 8 * * *"' });
+          }
+          if (isCronExpression(p2.time)) {
+            const cronJob = buildCronJob(p2, resolvedTo, resolvedAccountId);
+            return json2({
+              _instruction: "\u8BF7\u7ACB\u5373\u4F7F\u7528 cron \u5DE5\u5177\uFF0C\u5C06 cronParams \u7684\u503C\u539F\u6837\u4F5C\u4E3A\u53C2\u6570\u4F20\u5165\uFF08\u4E0D\u8981\u4FEE\u6539\u6216\u7701\u7565\u4EFB\u4F55\u5B57\u6BB5\uFF0C\u7279\u522B\u662F delivery.accountId\uFF09\uFF0C\u7136\u540E\u56DE\u590D\u7528\u6237\u63D0\u9192\u5DF2\u8BBE\u7F6E",
+              cronParams: cronJob,
+              summary: `\u23F0 \u5468\u671F\u63D0\u9192: "${p2.content}" (${p2.time}, tz=${p2.timezone || "Asia/Shanghai"})`
+            });
+          }
+          const delayMs = parseRelativeTime(p2.time);
+          if (!delayMs || delayMs <= 0) {
+            return json2({
+              error: `\u65E0\u6CD5\u89E3\u6790\u65F6\u95F4 "${p2.time}"\u3002\u652F\u6301\u683C\u5F0F\uFF1A\u76F8\u5BF9\u65F6\u95F4\u5982 "5m"\u3001"1h"\u3001"1h30m"\u3001"2d"\uFF1Bcron \u8868\u8FBE\u5F0F\u5982 "0 8 * * *"\uFF08\u6BCF\u59298\u70B9\uFF09`
+            });
+          }
+          if (delayMs < 3e4) {
+            return json2({ error: "\u63D0\u9192\u65F6\u95F4\u4E0D\u80FD\u5C11\u4E8E 30 \u79D2" });
+          }
+          const onceJob = buildOnceJob(p2, delayMs, resolvedTo, resolvedAccountId);
           return json2({
             _instruction: "\u8BF7\u7ACB\u5373\u4F7F\u7528 cron \u5DE5\u5177\uFF0C\u5C06 cronParams \u7684\u503C\u539F\u6837\u4F5C\u4E3A\u53C2\u6570\u4F20\u5165\uFF08\u4E0D\u8981\u4FEE\u6539\u6216\u7701\u7565\u4EFB\u4F55\u5B57\u6BB5\uFF0C\u7279\u522B\u662F delivery.accountId\uFF09\uFF0C\u7136\u540E\u56DE\u590D\u7528\u6237\u63D0\u9192\u5DF2\u8BBE\u7F6E",
-            cronParams: cronJob,
-            summary: `\u23F0 \u5468\u671F\u63D0\u9192: "${p2.content}" (${p2.time}, tz=${p2.timezone || "Asia/Shanghai"})`
+            cronParams: onceJob,
+            summary: `\u23F0 ${formatDelay(delayMs)}\u540E\u63D0\u9192: "${p2.content}"`
           });
         }
-        const delayMs = parseRelativeTime(p2.time);
-        if (!delayMs || delayMs <= 0) {
-          return json2({
-            error: `\u65E0\u6CD5\u89E3\u6790\u65F6\u95F4 "${p2.time}"\u3002\u652F\u6301\u683C\u5F0F\uFF1A\u76F8\u5BF9\u65F6\u95F4\u5982 "5m"\u3001"1h"\u3001"1h30m"\u3001"2d"\uFF1Bcron \u8868\u8FBE\u5F0F\u5982 "0 8 * * *"\uFF08\u6BCF\u59298\u70B9\uFF09`
-          });
-        }
-        if (delayMs < 3e4) {
-          return json2({ error: "\u63D0\u9192\u65F6\u95F4\u4E0D\u80FD\u5C11\u4E8E 30 \u79D2" });
-        }
-        const onceJob = buildOnceJob(p2, delayMs, resolvedTo, resolvedAccountId);
-        return json2({
-          _instruction: "\u8BF7\u7ACB\u5373\u4F7F\u7528 cron \u5DE5\u5177\uFF0C\u5C06 cronParams \u7684\u503C\u539F\u6837\u4F5C\u4E3A\u53C2\u6570\u4F20\u5165\uFF08\u4E0D\u8981\u4FEE\u6539\u6216\u7701\u7565\u4EFB\u4F55\u5B57\u6BB5\uFF0C\u7279\u522B\u662F delivery.accountId\uFF09\uFF0C\u7136\u540E\u56DE\u590D\u7528\u6237\u63D0\u9192\u5DF2\u8BBE\u7F6E",
-          cronParams: onceJob,
-          summary: `\u23F0 ${formatDelay(delayMs)}\u540E\u63D0\u9192: "${p2.content}"`
-        });
-      }
+      };
     },
     { name: "qqbot_remind" }
   );
 }
 
 // src/tools/secret-input.ts
-init_bot_instance();
-init_request_context();
+init_outbound_service();
 init_target();
 init_plugin_logger();
 var toolLog2 = createPluginLogger({ prefix: "[tool:secret-input]" });
@@ -17856,67 +17893,77 @@ function json3(data) {
 }
 function registerSecretInputTool(api) {
   api.registerTool(
-    {
-      name: "qqbot_secret_input",
-      label: "QQBot Secret Input Card",
-      description: "\u5F53\u7528\u6237\u8981\u4EA4\u4ED8\u4E00\u4E2A\u65B0\u5BC6\u94A5/\u51ED\u636E\uFF08API Key\u3001Token \u7B49\uFF09\u7ED9\u7CFB\u7EDF\u4FDD\u5B58\u65F6\u8C03\u7528\uFF1A\u5411\u7528\u6237\u79C1\u804A\u53D1\u9001\u4E00\u5F20\u5BC6\u94A5\u8F93\u5165\u5361\u7247\uFF0C\u7528\u6237\u628A\u5BC6\u94A5\u7C98\u8D34\u5728\u8F93\u5165\u6846\u53D1\u9001\u540E\uFF0C\u63D2\u4EF6\u4F1A\u81EA\u52A8\u62E6\u622A\u8BE5\u6D88\u606F\u5E76\u6267\u884C openclaw secrets store set \u5B8C\u6210\u4FDD\u5B58\uFF0C\u7ED3\u679C\u7531\u63D2\u4EF6\u76F4\u63A5\u56DE\u590D\u7528\u6237\u3002\u5BC6\u94A5\u5185\u5BB9\u4E0D\u4F1A\u8FDB\u5165\u5BF9\u8BDD\u3002\u5FC5\u987B\u7531\u7528\u6237\u63D0\u4F9B name \u53C2\u6570\uFF08\u73AF\u5883\u53D8\u91CF\u540D\uFF09\u3002",
-      parameters: SecretInputSchema,
-      async execute(_toolCallId, params) {
-        const p2 = params;
-        const name = (p2.name ?? "").trim();
-        if (!name) return json3({ error: "name \u4E3A\u5FC5\u586B\u53C2\u6570\uFF08\u73AF\u5883\u53D8\u91CF\u540D\uFF09" });
-        if (!isValidSecretName(name)) {
-          return json3({
-            error: `\u73AF\u5883\u53D8\u91CF\u540D\u4E0D\u5408\u6CD5\uFF1A\u5FC5\u987B\u4EE5\u5927\u5199\u5B57\u6BCD\u5F00\u5934\uFF0C\u4EC5\u542B\u5927\u5199\u5B57\u6BCD/\u6570\u5B57/\u4E0B\u5212\u7EBF\uFF0C\u6700\u957F 128 \u5B57\u7B26\uFF08\u6536\u5230 "${name}"\uFF09\u3002\u793A\u4F8B\uFF1AOPENWEATHER_API_KEY\u3002\u8BF7\u4FEE\u6B63\u540E\u91CD\u8BD5\u3002`
-          });
-        }
-        const kind = "env";
-        const target = getRequestTarget();
-        const accountId = getRequestAccountId() ?? "default";
-        if (!target) {
-          return json3({ error: "\u65E0\u6CD5\u83B7\u53D6\u5F53\u524D\u4F1A\u8BDD\u76EE\u6807\uFF0C\u6B64\u5DE5\u5177\u4EC5\u652F\u6301\u5728 QQ Bot \u6D88\u606F\u4F1A\u8BDD\u4E2D\u4F7F\u7528" });
-        }
-        const parsed = parseTarget(target);
-        if (parsed.scope !== "c2c" || !parsed.targetId) {
-          return json3({
-            error: `\u5BC6\u94A5\u8F93\u5165\u5361\u7247\u4EC5\u652F\u6301\u79C1\u804A\uFF08c2c\uFF09\u4F1A\u8BDD\uFF0C\u5F53\u524D\u76EE\u6807 ${target} \u4E0D\u9002\u7528\u2014\u2014\u5BC6\u94A5\u4E0D\u5E94\u51FA\u73B0\u5728\u7FA4\u804A\u4E2D\u3002\u8BF7\u5F15\u5BFC\u7528\u6237\u5728\u79C1\u804A\u4E2D\u53D1\u8D77\u3002`
+    (factoryCtx) => {
+      const delivery = factoryCtx.deliveryContext;
+      return {
+        name: "qqbot_secret_input",
+        label: "QQBot Secret Input Card",
+        description: "\u5F53\u7528\u6237\u8981\u4EA4\u4ED8\u4E00\u4E2A\u65B0\u5BC6\u94A5/\u51ED\u636E\uFF08API Key\u3001Token \u7B49\uFF09\u7ED9\u7CFB\u7EDF\u4FDD\u5B58\u65F6\u8C03\u7528\uFF1A\u5411\u7528\u6237\u79C1\u804A\u53D1\u9001\u4E00\u5F20\u5BC6\u94A5\u8F93\u5165\u5361\u7247\uFF0C\u7528\u6237\u628A\u5BC6\u94A5\u7C98\u8D34\u5728\u8F93\u5165\u6846\u53D1\u9001\u540E\uFF0C\u63D2\u4EF6\u4F1A\u81EA\u52A8\u62E6\u622A\u8BE5\u6D88\u606F\u5E76\u6267\u884C openclaw secrets store set \u5B8C\u6210\u4FDD\u5B58\uFF0C\u7ED3\u679C\u7531\u63D2\u4EF6\u76F4\u63A5\u56DE\u590D\u7528\u6237\u3002\u5BC6\u94A5\u5185\u5BB9\u4E0D\u4F1A\u8FDB\u5165\u5BF9\u8BDD\u3002\u5FC5\u987B\u7531\u7528\u6237\u63D0\u4F9B name \u53C2\u6570\uFF08\u73AF\u5883\u53D8\u91CF\u540D\uFF09\u3002",
+        parameters: SecretInputSchema,
+        async execute(_toolCallId, params) {
+          const p2 = params;
+          const name = (p2.name ?? "").trim();
+          if (!name) return json3({ error: "name \u4E3A\u5FC5\u586B\u53C2\u6570\uFF08\u73AF\u5883\u53D8\u91CF\u540D\uFF09" });
+          if (!isValidSecretName(name)) {
+            return json3({
+              error: `\u73AF\u5883\u53D8\u91CF\u540D\u4E0D\u5408\u6CD5\uFF1A\u5FC5\u987B\u4EE5\u5927\u5199\u5B57\u6BCD\u5F00\u5934\uFF0C\u4EC5\u542B\u5927\u5199\u5B57\u6BCD/\u6570\u5B57/\u4E0B\u5212\u7EBF\uFF0C\u6700\u957F 128 \u5B57\u7B26\uFF08\u6536\u5230 "${name}"\uFF09\u3002\u793A\u4F8B\uFF1AOPENWEATHER_API_KEY\u3002\u8BF7\u4FEE\u6B63\u540E\u91CD\u8BD5\u3002`
+            });
+          }
+          const kind = "env";
+          const route = resolveToolSessionRoute(delivery);
+          if (!route) {
+            return json3({
+              error: "\u5F53\u524D\u8FD0\u884C\u6CA1\u6709 QQ \u4F1A\u8BDD\u6765\u6E90\uFF08\u53EF\u80FD\u7531\u5B9A\u65F6\u4EFB\u52A1\u6216\u6846\u67B6\u5185\u90E8\u89E6\u53D1\u7684 run\uFF09\uFF0C\u65E0\u6CD5\u5B9A\u4F4D\u8981\u53D1\u5361\u7684\u7528\u6237\u3002\u8BF7\u5F15\u5BFC\u7528\u6237\u5728 QQ \u79C1\u804A\u4E2D\u76F4\u63A5\u53D1\u8D77\u5BC6\u94A5\u8F93\u5165\uFF0C\u4E0D\u8981\u5728\u65E0\u4F1A\u8BDD\u4E0A\u4E0B\u6587\u7684\u4EFB\u52A1\u91CC\u8C03\u7528\u672C\u5DE5\u5177\u3002"
+            });
+          }
+          const scope = QQBOT_PREFIX_RE.exec(route.target)?.[1]?.toLowerCase();
+          const parsed = parseTarget(route.target);
+          if (scope !== "c2c" || !parsed.targetId) {
+            return json3({
+              error: `\u5BC6\u94A5\u8F93\u5165\u5361\u7247\u4EC5\u652F\u6301\u79C1\u804A\uFF08c2c\uFF09\u4F1A\u8BDD\uFF0C\u5F53\u524D\u76EE\u6807 ${route.target} \u4E0D\u9002\u7528\u2014\u2014\u5BC6\u94A5\u4E0D\u5E94\u51FA\u73B0\u5728\u7FA4\u804A\u6216\u9891\u9053\u4E2D\u3002\u8BF7\u5F15\u5BFC\u7528\u6237\u5728\u79C1\u804A\u4E2D\u53D1\u8D77\u3002`
+            });
+          }
+          const requestedAccountId = route.accountId ?? "default";
+          const resolvedGateway = resolveGatewayForSend(requestedAccountId);
+          if (!resolvedGateway) {
+            return json3({ error: `\u8D26\u6237 ${requestedAccountId} \u7684 gateway \u5C1A\u672A\u542F\u52A8\uFF0C\u65E0\u6CD5\u53D1\u9001\u5BC6\u94A5\u8F93\u5165\u5361\u7247` });
+          }
+          const accountId = resolvedGateway.accountId;
+          const bot = resolvedGateway.gw.bot;
+          const description = p2.description?.trim() || void 0;
+          registerPendingSecretInput({
+            accountId,
+            senderOpenid: parsed.targetId,
+            name,
+            kind,
+            description,
+            createdAt: Date.now()
           });
-        }
-        const bot = tryGetBotForAccount(accountId);
-        if (!bot) {
-          return json3({ error: `\u8D26\u6237 ${accountId} \u7684 gateway \u5C1A\u672A\u542F\u52A8\uFF0C\u65E0\u6CD5\u53D1\u9001\u5BC6\u94A5\u8F93\u5165\u5361\u7247` });
-        }
-        const description = p2.description?.trim() || void 0;
-        registerPendingSecretInput({
-          accountId,
-          senderOpenid: parsed.targetId,
-          name,
-          kind,
-          description,
-          createdAt: Date.now()
-        });
-        try {
-          await bot.sendTextWithKeyboard(
-            { scope: "c2c", targetId: parsed.targetId },
-            buildSecretInputCard(name, description, DEFAULT_SECRET_INPUT_TTL_MS / 6e4),
-            buildSecretInputKeyboard()
+          try {
+            await bot.sendTextWithKeyboard(
+              { scope: "c2c", targetId: parsed.targetId },
+              buildSecretInputCard(name, description, DEFAULT_SECRET_INPUT_TTL_MS / 6e4),
+              buildSecretInputKeyboard()
+            );
+          } catch (err) {
+            cancelPendingSecretInput(accountId, parsed.targetId);
+            toolLog2.error(`card send failed: ${err instanceof Error ? err.message : String(err)}`, { name, accountId });
+            return json3({
+              error: `\u5BC6\u94A5\u8F93\u5165\u5361\u7247\u53D1\u9001\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`
+            });
+          }
+          toolLog2.info(
+            `card sent, pending registered name=${name} accountId=${accountId} route=${route.source} ttlMinutes=${DEFAULT_SECRET_INPUT_TTL_MS / 6e4}`
           );
-        } catch (err) {
-          cancelPendingSecretInput(accountId, parsed.targetId);
-          toolLog2.error(`card send failed: ${err instanceof Error ? err.message : String(err)}`, { name, accountId });
           return json3({
-            error: `\u5BC6\u94A5\u8F93\u5165\u5361\u7247\u53D1\u9001\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`
+            ok: true,
+            name,
+            kind,
+            command: `openclaw secrets store set ${name} --kind env --value <\u7528\u6237\u8F93\u5165>`,
+            instruction: `\u5361\u7247\u5DF2\u53D1\u9001\u7ED9\u7528\u6237\u3002\u7528\u6237\u4E0B\u4E00\u6761\u79C1\u804A\u6D88\u606F\u5C06\u88AB\u63D2\u4EF6\u81EA\u52A8\u62E6\u622A\uFF08\u4E0D\u4F1A\u8FDB\u5165\u5BF9\u8BDD\uFF09\uFF0C\u6267\u884C\u4E0A\u8FF0\u547D\u4EE4\u4FDD\u5B58\u5BC6\u94A5\uFF0C\u6210\u529F/\u5931\u8D25\u7531\u63D2\u4EF6\u76F4\u63A5\u56DE\u590D\u7528\u6237\u3002\u8BF7\u76F4\u63A5\u7ED3\u675F\u672C\u8F6E\uFF08\u53EF\u544A\u77E5\u7528\u6237\u6309\u5361\u7247\u63D0\u793A\u53D1\u9001\u5BC6\u94A5\uFF09\uFF0C\u4E0D\u8981\u7B49\u5F85\u7528\u6237\u8F93\u5165\uFF0C\u4E5F\u4E0D\u8981\u8BA9\u7528\u6237\u628A\u5BC6\u94A5\u5185\u5BB9\u53D1\u5230\u5BF9\u8BDD\u91CC\u3002`
           });
         }
-        toolLog2.info(`card sent, pending registered name=${name} ttlMinutes=${DEFAULT_SECRET_INPUT_TTL_MS / 6e4}`);
-        return json3({
-          ok: true,
-          name,
-          kind,
-          command: `openclaw secrets store set ${name} --kind env --value <\u7528\u6237\u8F93\u5165>`,
-          instruction: `\u5361\u7247\u5DF2\u53D1\u9001\u7ED9\u7528\u6237\u3002\u7528\u6237\u4E0B\u4E00\u6761\u79C1\u804A\u6D88\u606F\u5C06\u88AB\u63D2\u4EF6\u81EA\u52A8\u62E6\u622A\uFF08\u4E0D\u4F1A\u8FDB\u5165\u5BF9\u8BDD\uFF09\uFF0C\u6267\u884C\u4E0A\u8FF0\u547D\u4EE4\u4FDD\u5B58\u5BC6\u94A5\uFF0C\u6210\u529F/\u5931\u8D25\u7531\u63D2\u4EF6\u76F4\u63A5\u56DE\u590D\u7528\u6237\u3002\u8BF7\u76F4\u63A5\u7ED3\u675F\u672C\u8F6E\uFF08\u53EF\u544A\u77E5\u7528\u6237\u6309\u5361\u7247\u63D0\u793A\u53D1\u9001\u5BC6\u94A5\uFF09\uFF0C\u4E0D\u8981\u7B49\u5F85\u7528\u6237\u8F93\u5165\uFF0C\u4E5F\u4E0D\u8981\u8BA9\u7528\u6237\u628A\u5BC6\u94A5\u5185\u5BB9\u53D1\u5230\u5BF9\u8BDD\u91CC\u3002`
-        });
-      }
+      };
     },
     { name: "qqbot_secret_input" }
   );