@cloudbase/agent-adapter-wx 1.0.1-alpha.25-1 → 1.0.1-alpha.25-2

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { AbstractAgent, AgentConfig, BaseEvent, RunAgentInput } from '@ag-ui/client';
 import { Observable } from 'rxjs';
-import { WxSendMessageInput } from '@cloudbase/aiagent-framework';
+import { WxSendMessageInput, aitools } from '@cloudbase/aiagent-framework';
 import { Logger } from '@cloudbase/agent-shared';
 
 /**
@@ -236,8 +236,8 @@ interface WeChatReplyMessage {
     createTime: number;
     msgType: string;
     content: string;
+    msgId: string;
     openKfId?: string;
-    msgId?: string;
 }
 /**
  * Format reply message for WeChat
@@ -465,13 +465,13 @@ interface IWxRunAgentInput extends RunAgentInput {
 declare class WeChatAgent extends AbstractAgent {
     private wrappedAgent;
     private wechatSender?;
-    private aitools?;
     private wechatConfig;
     private _historyManager;
     private messageFormatter;
     private eventFilter;
     private messageBuffer;
     private recommendQuestions?;
+    aitools?: aitools.AITools;
     constructor(config: WeChatAgentConfig);
     /**
      * Last assembled reply content after run() completes
@@ -568,15 +568,15 @@ interface AgentCreatorResult {
         toAGUIAgent(): AbstractAgent;
     };
     cleanup?: () => void;
-    aitools?: {
-        getWxMediaContent: (botId: string, triggerSrc: string, mediaId: string) => Promise<string | null>;
-    };
 }
 /**
  * Agent creator function type
  */
 type AgentCreator = (params: {
     request: Request;
+    options?: {
+        agentId: string;
+    };
 }) => AgentCreatorResult | Promise<AgentCreatorResult>;
 /**
  * Handler options
@@ -589,7 +589,7 @@ interface WxMessageHandlerOptions {
  * Directly using sendMessageAGUI.handler from @cloudbase/agent-server
  * Aligned with chat_wx_v2.service.ts logic
  *
- * @param createAgent - Function to create agent instance (returns { agent, cleanup?, aitools? })
+ * @param createAgent - Function to create agent instance (returns { agent, cleanup?})
  * @param options - Handler options
  * @returns Express route handler
  */

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { AbstractAgent, AgentConfig, BaseEvent, RunAgentInput } from '@ag-ui/client';
 import { Observable } from 'rxjs';
-import { WxSendMessageInput } from '@cloudbase/aiagent-framework';
+import { WxSendMessageInput, aitools } from '@cloudbase/aiagent-framework';
 import { Logger } from '@cloudbase/agent-shared';
 
 /**
@@ -236,8 +236,8 @@ interface WeChatReplyMessage {
     createTime: number;
     msgType: string;
     content: string;
+    msgId: string;
     openKfId?: string;
-    msgId?: string;
 }
 /**
  * Format reply message for WeChat
@@ -465,13 +465,13 @@ interface IWxRunAgentInput extends RunAgentInput {
 declare class WeChatAgent extends AbstractAgent {
     private wrappedAgent;
     private wechatSender?;
-    private aitools?;
     private wechatConfig;
     private _historyManager;
     private messageFormatter;
     private eventFilter;
     private messageBuffer;
     private recommendQuestions?;
+    aitools?: aitools.AITools;
     constructor(config: WeChatAgentConfig);
     /**
      * Last assembled reply content after run() completes
@@ -568,15 +568,15 @@ interface AgentCreatorResult {
         toAGUIAgent(): AbstractAgent;
     };
     cleanup?: () => void;
-    aitools?: {
-        getWxMediaContent: (botId: string, triggerSrc: string, mediaId: string) => Promise<string | null>;
-    };
 }
 /**
  * Agent creator function type
  */
 type AgentCreator = (params: {
     request: Request;
+    options?: {
+        agentId: string;
+    };
 }) => AgentCreatorResult | Promise<AgentCreatorResult>;
 /**
  * Handler options
@@ -589,7 +589,7 @@ interface WxMessageHandlerOptions {
  * Directly using sendMessageAGUI.handler from @cloudbase/agent-server
  * Aligned with chat_wx_v2.service.ts logic
  *
- * @param createAgent - Function to create agent instance (returns { agent, cleanup?, aitools? })
+ * @param createAgent - Function to create agent instance (returns { agent, cleanup?})
  * @param options - Handler options
  * @returns Express route handler
  */

package/dist/index.js

@@ -189,7 +189,8 @@ function formatWeChatReplyMessage(callbackData, triggerSrc, content) {
       openKfId: callbackData.openKfId,
       createTime,
       msgType: "text",
-      content: finalContent
+      content: finalContent,
+      msgId: callbackData.msgId
     };
   }
   return {
@@ -197,7 +198,8 @@ function formatWeChatReplyMessage(callbackData, triggerSrc, content) {
     fromUserName: callbackData.toUserName || callbackData.ToUserName,
     createTime,
     msgType: "text",
-    content: finalContent
+    content: finalContent,
+    msgId: callbackData.msgId
   };
 }
 function dealMsgData(originMsg, triggerSrc, wxVerify, botId) {
@@ -277,20 +279,57 @@ var import_agent_server = require("@cloudbase/agent-server");
 var import_agent_shared = require("@cloudbase/agent-shared");
 var import_client = require("@ag-ui/client");
 var import_agent_shared2 = require("@cloudbase/agent-shared");
+var import_aiagent_framework = require("@cloudbase/aiagent-framework");
+function getServiceNameFromHostname(hostname) {
+  const parts = hostname.split("-");
+  let versionIdx = -1;
+  for (let i = parts.length - 1; i >= 0; i--) {
+    if (/^\d+$/.test(parts[i])) {
+      versionIdx = i;
+      break;
+    }
+  }
+  return versionIdx > 0 ? parts.slice(0, versionIdx).join("-") : hostname;
+}
+function getBotId(url, fallback = "agent-id") {
+  if (process.env.SCF_FUNCTIONNAME) {
+    return process.env.SCF_FUNCTIONNAME;
+  }
+  if (url) {
+    const parsedBotId = import_aiagent_framework.utils.parseBotId(url);
+    if (parsedBotId) {
+      return parsedBotId;
+    }
+  }
+  if (process.env.HOSTNAME) {
+    return getServiceNameFromHostname(process.env.HOSTNAME);
+  }
+  return fallback;
+}
 function createWxMessageHandler(createAgent, options) {
   const { logger: parentLogger = import_agent_shared.noopLogger } = options ?? {};
   const adapterLogger = parentLogger.child?.({ component: "sendWXMessageAGUI" }) ?? parentLogger;
   return async (req, res) => {
     let cleanup = null;
+    let agent = void 0;
+    const { callbackData } = import_aiagent_framework.utils.transformKeysToCamelCase(req.body);
+    const { triggerSrc, wxVerify } = import_aiagent_framework.utils.parseWxEnvParam({
+      httpContext: {
+        headers: req.headers
+      }
+    });
+    const wxSendmessageInput = {
+      callbackData,
+      triggerSrc,
+      wxVerify
+    };
+    const requestId = (0, import_uuid.v4)();
+    const logger = adapterLogger.child?.({ requestId }) ?? adapterLogger;
+    const botId = getBotId(
+      `${req.protocol}://${req.get("host")}${req.originalUrl}`,
+      "agent-wx-send-message"
+    );
     try {
-      const {
-        callbackData,
-        triggerSrc,
-        wxVerify = false,
-        botId = "default"
-      } = req.body;
-      const requestId = (0, import_uuid.v4)();
-      const logger = adapterLogger.child?.({ requestId }) ?? adapterLogger;
       if (!callbackData || !triggerSrc) {
         return res.status(400).json({
           error: "Bad Request",
@@ -298,9 +337,11 @@ function createWxMessageHandler(createAgent, options) {
         });
       }
       logger.info?.("[WX] Received message:", { triggerSrc, wxVerify, botId });
-      const { agent: unknownAgent, cleanup: agentCleanup } = await Promise.resolve(createAgent({ request: req }));
+      const { agent: unknownAgent, cleanup: agentCleanup } = await Promise.resolve(
+        createAgent({ request: req, options: { agentId: botId } })
+      );
       cleanup = agentCleanup ?? null;
-      const agent = "toAGUIAgent" in unknownAgent ? unknownAgent.toAGUIAgent() : unknownAgent;
+      agent = "toAGUIAgent" in unknownAgent ? unknownAgent.toAGUIAgent() : unknownAgent;
       const { msgData, replyMsgData } = dealMsgData(
         callbackData,
         triggerSrc,
@@ -321,17 +362,12 @@ function createWxMessageHandler(createAgent, options) {
       );
       const voiceHandler = async (vBotId, vTriggerSrc, mediaId) => {
         try {
-          const content2 = await agent?.aitools?.getWxMediaContent(
+          const result = await agent?.aitools?.getWxMediaContent(
             vBotId,
             vTriggerSrc,
             mediaId
           );
-          if (content2) {
-            return {
-              content: content2
-            };
-          }
-          return null;
+          return result || null;
         } catch {
           return null;
         }
@@ -388,7 +424,7 @@ function createWxMessageHandler(createAgent, options) {
         tools: [],
         context: [],
         forwardedProps: {
-          wxSendmessageInput: req.body,
+          wxSendmessageInput,
           // Pass full msgData for history storage
           msgData,
           // Pass replay info with replyMsgData for assistant history
@@ -416,10 +452,34 @@ function createWxMessageHandler(createAgent, options) {
         formatWeChatReplyMessage(callbackData, triggerSrc, finalContent)
       );
     } catch (error) {
-      console.error("[WX] Error processing message:", error);
+      logger.error?.("[WX] Error processing message:", error);
+      const message = error instanceof Error ? error.message : String(error);
+      try {
+        if (agent?.aitools?.sendWxClientMessage) {
+          const data = formatWeChatReplyMessage(
+            callbackData,
+            triggerSrc,
+            message
+          );
+          await agent.aitools.sendWxClientMessage(
+            agent.agentId || botId,
+            triggerSrc,
+            {
+              msgType: data.msgType,
+              touser: data.toUserName,
+              text: {
+                content: data.content
+              },
+              openKfId: data.openKfId,
+              msgId: data.msgId
+            }
+          );
+        }
+      } catch (e) {
+      }
       return res.status(500).json({
         error: "Internal Server Error",
-        message: error instanceof Error ? error.message : String(error)
+        message
       });
     } finally {
       if (cleanup) cleanup();
@@ -822,9 +882,9 @@ var WeChatHistoryManager = class _WeChatHistoryManager {
 var getHistoryManager = WeChatHistoryManager.getInstance;
 
 // src/agent.ts
-var import_aiagent_framework = require("@cloudbase/aiagent-framework");
+var import_aiagent_framework2 = require("@cloudbase/aiagent-framework");
 var import_crypto = require("crypto");
-var AITOOLS = import_aiagent_framework.aitools.AITools;
+var AITOOLS = import_aiagent_framework2.aitools.AITools;
 var WeChatAgent = class extends import_client2.AbstractAgent {
   constructor(config) {
     super({
@@ -1118,15 +1178,19 @@ var WeChatAgent = class extends import_client2.AbstractAgent {
       return;
     }
     const triggerSrc = wxSendmessageInput.triggerSrc || this.wechatConfig.platform;
-    await this.aitools.sendWxClientMessage(triggerSrc, {
-      msgType: toWxMsgData.msgType,
-      touser: toWxMsgData.toUserName,
-      text: {
-        content: toWxMsgData.content
-      },
-      openKfId: toWxMsgData.openKfId,
-      msgId: toWxMsgData.msgId
-    });
+    await this.aitools.sendWxClientMessage(
+      this.agentId || "agent",
+      triggerSrc,
+      {
+        msgType: toWxMsgData.msgType,
+        touser: toWxMsgData.toUserName,
+        text: {
+          content: toWxMsgData.content
+        },
+        openKfId: toWxMsgData.openKfId,
+        msgId: toWxMsgData.msgId || ""
+      }
+    );
   }
   /**
    * Format reply message for WeChat HTTP response (sync mode)