@jerryliang122/openclaw-qqbot 1.0.8 → 2.0.0

package/dist/index.cjs

@@ -8259,7 +8259,7 @@ var init_outbound_service = __esm({
 
 // src/utils/pkg-version.ts
 function getPackageVersion() {
-  return true ? "1.0.8" : "unknown";
+  return true ? "2.0.0" : "unknown";
 }
 function getOpenclawVersion(runtimeVersion) {
   return runtimeVersion && runtimeVersion !== "unknown" ? runtimeVersion : "unknown";
@@ -12904,70 +12904,42 @@ init_webhook_server_node();
 init_webhook_verify();
 
 // src/utils/stt.ts
-var fs18 = __toESM(require("fs"), 1);
 var path16 = __toESM(require("path"), 1);
+var import_media_understanding_runtime = require("openclaw/plugin-sdk/media-understanding-runtime");
 function shouldUsePlatformAsr(cfg) {
   const channels = asRecord(cfg.channels);
   const qqbot = asRecord(channels?.qqbot);
-  return asRecord(qqbot?.stt)?.asrFallback === true;
+  return asRecord(qqbot?.stt)?.asrFallback !== false;
 }
-function resolveSTTConfig(cfg) {
+function isFrameworkSttConfigured(cfg) {
   const channels = asRecord(cfg.channels);
   const qqbot = asRecord(channels?.qqbot);
-  const sttCfg = asRecord(qqbot?.stt);
-  if (sttCfg?.enabled === false) {
-    return null;
-  }
-  const models = asRecord(cfg.models);
-  const providers = asRecord(models?.providers);
-  if (sttCfg) {
-    const providerId = readString(sttCfg, "provider") ?? "openai";
-    const providerCfg = asRecord(providers?.[providerId]);
-    const baseUrl = readString(sttCfg, "baseUrl") ?? readString(providerCfg, "baseUrl");
-    const apiKey = readString(sttCfg, "apiKey") ?? readString(providerCfg, "apiKey");
-    const model = readString(sttCfg, "model") ?? "whisper-1";
-    if (baseUrl && apiKey) {
-      return { enabled: true, baseUrl: baseUrl.replace(/\/+$/, ""), apiKey, model };
-    }
+  if (asRecord(qqbot?.stt)?.enabled === false) {
+    return false;
   }
   const tools = asRecord(cfg.tools);
   const media = asRecord(tools?.media);
   const audio = asRecord(media?.audio);
-  const audioModels = audio?.models;
-  const audioModelEntry = Array.isArray(audioModels) ? asRecord(audioModels[0]) : void 0;
-  if (audioModelEntry) {
-    const providerId = readString(audioModelEntry, "provider") ?? "openai";
-    const providerCfg = asRecord(providers?.[providerId]);
-    const baseUrl = readString(audioModelEntry, "baseUrl") ?? readString(providerCfg, "baseUrl");
-    const apiKey = readString(audioModelEntry, "apiKey") ?? readString(providerCfg, "apiKey");
-    const model = readString(audioModelEntry, "model") ?? "whisper-1";
-    if (baseUrl && apiKey) {
-      return { enabled: true, baseUrl: baseUrl.replace(/\/+$/, ""), apiKey, model };
-    }
+  if (!audio || audio.enabled === false) {
+    return false;
   }
-  return null;
+  return Array.isArray(audio.models) && audio.models.length > 0;
 }
-async function transcribeAudio(audioPath, cfg) {
-  const sttCfg = resolveSTTConfig(cfg);
-  if (!sttCfg) {
-    return null;
-  }
-  const fileBuffer = fs18.readFileSync(audioPath);
-  const fileName = sanitizeFileName2(path16.basename(audioPath));
-  const mime = guessMimeType(fileName);
-  const form = new FormData();
-  form.append("file", new Blob([fileBuffer], { type: mime }), fileName);
-  form.append("model", sttCfg.model);
-  const resp = await fetch(`${sttCfg.baseUrl}/audio/transcriptions`, {
-    method: "POST",
-    headers: { Authorization: `Bearer ${sttCfg.apiKey}` },
-    body: form
+function hasLegacySttCredentials(cfg) {
+  const channels = asRecord(cfg.channels);
+  const qqbot = asRecord(channels?.qqbot);
+  const stt = asRecord(qqbot?.stt);
+  if (!stt) return false;
+  return ["provider", "baseUrl", "apiKey", "model"].some(
+    (key2) => typeof stt[key2] === "string" && stt[key2].trim().length > 0
+  );
+}
+async function transcribeAudioViaFramework(audioPath, cfg) {
+  const result = await (0, import_media_understanding_runtime.transcribeAudioFile)({
+    filePath: audioPath,
+    cfg,
+    mime: guessMimeType(audioPath)
   });
-  if (!resp.ok) {
-    const detail = await resp.text().catch(() => "");
-    throw new Error(`STT failed (HTTP ${resp.status}): ${detail.slice(0, 300)}`);
-  }
-  const result = await resp.json();
   return result.text?.trim() || null;
 }
 function asRecord(value) {
@@ -12976,16 +12948,6 @@ function asRecord(value) {
   }
   return void 0;
 }
-function readString(obj, key2) {
-  const val = obj?.[key2];
-  if (typeof val === "string" && val.trim()) {
-    return val.trim();
-  }
-  return void 0;
-}
-function sanitizeFileName2(name) {
-  return name.replace(/[^a-zA-Z0-9._-]/g, "_");
-}
 function guessMimeType(fileName) {
   const ext = path16.extname(fileName).toLowerCase();
   const mimeMap = {
@@ -13061,8 +13023,9 @@ function attachmentProcessor(opts) {
   };
 }
 async function processAttachments(attachments, cfg, log5) {
-  const sttCfg = resolveSTTConfig(cfg);
   const usePlatformAsr = shouldUsePlatformAsr(cfg);
+  const sttConfigured = isFrameworkSttConfigured(cfg);
+  warnLegacySttCredentials(cfg, log5);
   const audioPolicy = resolveAudioPolicy(cfg);
   const imageUrls = [];
   const otherParts = [];
@@ -13080,7 +13043,7 @@ async function processAttachments(attachments, cfg, log5) {
       return { type: "image", localPath, url, contentType: att.content_type ?? "image/png", filename: att.filename };
     }
     if (isVoice) {
-      const transcript = await processVoiceAttachment(att, sttCfg, usePlatformAsr, audioPolicy, log5);
+      const transcript = await processVoiceAttachment(att, cfg, usePlatformAsr, sttConfigured, audioPolicy, log5);
       return { type: "voice", transcript };
     }
     if (url) {
@@ -13153,16 +13116,25 @@ function kindFromContentType(contentType) {
   if (contentType?.startsWith("audio/")) return "audio";
   return "document";
 }
-async function processVoiceAttachment(att, sttCfg, usePlatformAsr, audioPolicy, log5) {
+var legacySttWarned = false;
+function warnLegacySttCredentials(cfg, log5) {
+  if (!legacySttWarned && hasLegacySttCredentials(cfg)) {
+    legacySttWarned = true;
+    log5?.info(
+      "Voice: channels.qqbot.stt credentials (provider/baseUrl/apiKey/model) are deprecated and ignored; configure tools.media.audio.models instead \u2014 platform asr_refer_text is used when framework STT is absent"
+    );
+  }
+}
+async function processVoiceAttachment(att, cfg, usePlatformAsr, sttConfigured, audioPolicy, log5) {
   const rawAsrText = att.asr_refer_text?.trim() || void 0;
   const asrReferText = usePlatformAsr ? rawAsrText : void 0;
   const remoteUrl = normalizeUrl(att.voice_wav_url) || normalizeUrl(att.url) || void 0;
-  if (!sttCfg) {
+  if (!sttConfigured) {
     if (!usePlatformAsr && rawAsrText) {
-      log5?.info(`Voice: STT not configured; platform asr_refer_text discarded (asrFallback not enabled)`);
+      log5?.info(`Voice: framework STT not configured; platform asr_refer_text discarded (asrFallback: false)`);
     }
     if (asrReferText) {
-      log5?.debug?.(`Voice: using asr_refer_text (STT not configured, asrFallback enabled)`);
+      log5?.debug?.(`Voice: using platform asr_refer_text (framework STT not configured)`);
       return { text: asrReferText, source: "asr", asrReferText, remoteUrl };
     }
     return {
@@ -13209,16 +13181,17 @@ async function processVoiceAttachment(att, sttCfg, usePlatformAsr, audioPolicy,
   }
   if (localPath) {
     try {
-      const transcript = await transcribeAudio(localPath, cfg2stt(sttCfg));
+      const transcript = await transcribeAudioViaFramework(localPath, cfg);
       if (transcript) {
-        log5?.debug?.(`Voice STT: ${transcript.slice(0, 80)}...`);
+        log5?.debug?.(`Voice STT (framework): ${transcript.slice(0, 80)}...`);
         return { text: transcript, source: "stt", duration, localPath, remoteUrl, asrReferText };
       }
     } catch (err) {
-      log5?.error(`Voice STT failed: ${err instanceof Error ? err.message : String(err)}`);
+      log5?.error(`Voice STT (framework) failed: ${err instanceof Error ? err.message : String(err)}`);
     }
   }
   if (asrReferText) {
+    log5?.debug?.(`Voice: falling back to platform asr_refer_text after framework STT failure`);
     return { text: asrReferText, source: "asr", duration, localPath, remoteUrl, asrReferText };
   }
   return {
@@ -13248,9 +13221,6 @@ function normalizeFormats(formats) {
     return lower.startsWith(".") ? lower : `.${lower}`;
   });
 }
-function cfg2stt(sttCfg) {
-  return { channels: { qqbot: { stt: sttCfg } } };
-}
 function normalizeUrl(url) {
   if (!url) return "";
   return url.startsWith("//") ? `https:${url}` : url;
@@ -15891,7 +15861,7 @@ function getQQBotApprovalCapability() {
 
 // src/features/proactive.ts
 init_plugin_logger();
-var fs19 = __toESM(require("fs"), 1);
+var fs18 = __toESM(require("fs"), 1);
 var path20 = __toESM(require("path"), 1);
 init_bot_instance();
 init_config();
@@ -15902,8 +15872,8 @@ var KNOWN_USERS_FILE = path20.join(STORAGE_DIR, "known-users.json");
 var knownUsersCache = null;
 var cacheLastModified = 0;
 function ensureStorageDir() {
-  if (!fs19.existsSync(STORAGE_DIR)) {
-    fs19.mkdirSync(STORAGE_DIR, { recursive: true });
+  if (!fs18.existsSync(STORAGE_DIR)) {
+    fs18.mkdirSync(STORAGE_DIR, { recursive: true });
   }
 }
 function getUserKey(type, openid, accountId) {
@@ -15912,7 +15882,7 @@ function getUserKey(type, openid, accountId) {
 function loadKnownUsers() {
   if (knownUsersCache !== null) {
     try {
-      const stat = fs19.statSync(KNOWN_USERS_FILE);
+      const stat = fs18.statSync(KNOWN_USERS_FILE);
       if (stat.mtimeMs <= cacheLastModified) {
         return knownUsersCache;
       }
@@ -15922,14 +15892,14 @@ function loadKnownUsers() {
   }
   const users = /* @__PURE__ */ new Map();
   try {
-    if (fs19.existsSync(KNOWN_USERS_FILE)) {
-      const data = fs19.readFileSync(KNOWN_USERS_FILE, "utf-8");
+    if (fs18.existsSync(KNOWN_USERS_FILE)) {
+      const data = fs18.readFileSync(KNOWN_USERS_FILE, "utf-8");
       const parsed = JSON.parse(data);
       for (const user of parsed) {
         const key2 = getUserKey(user.type, user.openid, user.accountId);
         users.set(key2, user);
       }
-      cacheLastModified = fs19.statSync(KNOWN_USERS_FILE).mtimeMs;
+      cacheLastModified = fs18.statSync(KNOWN_USERS_FILE).mtimeMs;
     }
   } catch (err) {
     log3.error(`Failed to load known users: ${err}`);
@@ -15941,7 +15911,7 @@ function saveKnownUsers(users) {
   try {
     ensureStorageDir();
     const data = Array.from(users.values());
-    fs19.writeFileSync(KNOWN_USERS_FILE, JSON.stringify(data, null, 2), "utf-8");
+    fs18.writeFileSync(KNOWN_USERS_FILE, JSON.stringify(data, null, 2), "utf-8");
     cacheLastModified = Date.now();
     knownUsersCache = users;
   } catch (err) {
@@ -17478,9 +17448,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 +17520,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 +17734,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"})`
-          });
-        }
-        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`
+            cronParams: onceJob,
+            summary: `\u23F0 ${formatDelay(delayMs)}\u540E\u63D0\u9192: "${p2.content}"`
           });
         }
-        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 +17863,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" }
   );