Merge pull request #193 from byronpiao/feature/fix-yuanqi-0227

feature: fix yuanqi conversation separation

Author: yhsunshining

httpfunctions/adp-js/package.json

@@ -12,8 +12,8 @@
   "license": "ISC",
   "dependencies": {
     "@ag-ui/client": "^0.0.42",
-    "@cloudbase/agent-adapter-adp": "^1.0.1-alpha.30",
-    "@cloudbase/agent-adapter-wx": "^1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-adp": "1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-wx": "1.0.1-alpha.30",
     "@cloudbase/agent-server": "^0.0.20",
     "@dotenvx/dotenvx": "^1.51.1",
     "cors": "^2.8.5",

httpfunctions/adp-ts/package.json

@@ -28,8 +28,8 @@
   "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0",
   "dependencies": {
     "@ag-ui/client": "^0.0.42",
-    "@cloudbase/agent-adapter-adp": "^1.0.1-alpha.30",
-    "@cloudbase/agent-adapter-wx": "^1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-adp": "1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-wx": "1.0.1-alpha.30",
     "@cloudbase/agent-server": "^0.0.20",
     "@dotenvx/dotenvx": "^1.51.1",
     "cors": "^2.8.5",

httpfunctions/openclaw-js/package.json

@@ -16,7 +16,7 @@
   "license": "ISC",
   "dependencies": {
     "@ag-ui/client": "^0.0.42",
-    "@cloudbase/agent-adapter-llm": "^1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-llm": "1.0.1-alpha.30",
     "@cloudbase/agent-server": "^0.0.16",
     "@dotenvx/dotenvx": "^1.51.1",
     "cors": "^2.8.5",

httpfunctions/openclaw-ts/package.json

@@ -27,7 +27,7 @@
   "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0",
   "dependencies": {
     "@ag-ui/client": "^0.0.42",
-    "@cloudbase/agent-adapter-llm": "^1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-llm": "1.0.1-alpha.30",
     "@cloudbase/agent-server": "^0.0.16",
     "@dotenvx/dotenvx": "^1.51.1",
     "cors": "^2.8.5",

httpfunctions/yuanqi-js/README.md

@@ -1,24 +1,27 @@
 # 腾讯元器 JavaScript 模板
 
-基于腾讯元器的 JavaScript Agent 函数型模板。本模板提供了将腾讯元器智能体快速部署为 HTTP 云函数的完整解决方案，支持流式响应、用户认证、对话历史持久化、自定义参数等功能。
+基于腾讯元器的 JavaScript Agent 函数型模板。本模板提供了将腾讯元器智能体快速部署为 HTTP 云函数的完整解决方案，支持流式响应、用户认证、对话历史持久化、自定义参数、微信消息接入等功能。
 
 ## 📋 项目概述
 
-本模板使用 `@cloudbase/agent-adapter-yuanqi` 适配器，将腾讯元器智能体封装为符合 AG-UI 协议的 Agent 服务，并通过 `@cloudbase/agent-server` 提供标准的 HTTP API 接口。
+本模板使用 `@cloudbase/agent-adapter-yuanqi` 适配器，将腾讯元器智能体封装为符合 AG-UI 协议的 Agent 服务，并通过 `@cloudbase/agent-server` 提供标准的 HTTP API 接口。同时支持通过 `@cloudbase/agent-adapter-wx` 适配器接入微信消息。
 
 ### 核心特性
 
 - ✅ **腾讯元器集成** - 快速接入腾讯元器智能体平台
 - ✅ **对话历史持久化** - 通过云开发数据库自动保存和加载对话历史
 - ✅ **自定义参数支持** - 支持传递自定义变量到工作流和知识库
 - ✅ **思考/推理支持** - 支持元器模型的推理内容展示
+- ✅ **微信消息接入** - 支持通过微信适配器接收和处理微信消息
 
 ### 调用链路
 
 ```
 客户端 → HTTP 云函数 → Yuanqi Agent → 腾讯元器服务 → 流式响应返回
                             ↓
                     云开发数据库（对话历史）
+
+微信 → /wx-send-message → WeChatAgent → Yuanqi Agent → 腾讯元器服务
 ```
 
 ## 使用方法
@@ -47,11 +50,15 @@ class MyAgent extends YuanqiAgent {
   }
 
   // 重写父类方法，自定义获取历史对话的逻辑
-  async getChatHistory(subscriber, latestUserMessage) {
+  async getChatHistory(subscriber, input, latestUserMessage) {
     // 调用父类方法获取历史对话（从云开发数据库读取）
-    const history = await super.getChatHistory(subscriber, latestUserMessage);
+    const history = await super.getChatHistory(
+      subscriber,
+      input,
+      latestUserMessage,
+    );
     // 也可以忽略父类方法，自行处理历史对话的获取逻辑
-    // const history = await myMethodToGetChatHistory(subscriber, latestUserMessage);
+    // const history = await myMethodToGetChatHistory(subscriber, input, latestUserMessage);
     return history;
   }
 
@@ -93,7 +100,7 @@ function createAgent({ request }) {
 
 `@cloudbase/agent-adapter-yuanqi` 适配器会通过云开发数据库自动管理对话历史的保存与加载。开发者只需要传递当前用户的最新消息，适配器会自动：
 
-1. 从云开发数据库加载历史对话（默认 10 轮，可通过 `historyCount` 配置）
+1. 从云开发数据库加载历史对话（默认 10 条，可通过 `historyCount` 配置）
 2. 将历史对话与当前消息合并后发送给元器
 3. 自动保存用户消息和 AI 回复到数据库
 
@@ -102,7 +109,7 @@ function createAgent({ request }) {
 如果需要自定义历史对话的获取逻辑，可以重写 `getChatHistory` 方法：
 
 ```javascript
-async getChatHistory(subscriber, latestUserMessage) {
+async getChatHistory(subscriber, input, latestUserMessage) {
   // 自定义获取历史对话的逻辑
   const history = await myCustomHistoryService.getHistory();
   return history;
@@ -174,6 +181,60 @@ createExpressRoutes({
 - `POST /chat/completions` - OpenAI 兼容的聊天接口
 - `GET /healthz` - 健康检查接口
 
+### 微信消息路由
+
+本模板还提供了微信消息处理路由，支持通过 `@cloudbase/agent-adapter-wx` 接入微信消息：
+
+```javascript
+import {
+  WeChatAgent,
+  createWxMessageHandler,
+  WeChatHistoryManager,
+} from "@cloudbase/agent-adapter-wx";
+
+// 创建微信 Agent 适配器
+function createWxAgent({ request, options }) {
+  const { agent: baseAgent } = createAgent({ request });
+  const envId = process.env.TCB_ENV || process.env.ENV_ID;
+
+  return {
+    agent: new WeChatAgent({
+      agentId: options?.agentId || "agent-wx",
+      agent: baseAgent,
+      wechatConfig: {
+        sendMode: "aitools",
+        context: {
+          extendedContext: {
+            envId,
+            accessToken: request.headers.authorization,
+          },
+        },
+      },
+      historyManager: new WeChatHistoryManager({
+        envId,
+      }),
+    }),
+  };
+}
+
+// 注册微信消息路由
+app.post(
+  "/wx-send-message",
+  express.json(),
+  createWxMessageHandler(createWxAgent),
+);
+app.post(
+  "/v1/aibot/bots/:agentId/wx-send-message",
+  express.json(),
+  createWxMessageHandler(createWxAgent),
+);
+```
+
+微信消息路由：
+
+- `POST /wx-send-message` - 微信消息处理接口
+- `POST /v1/aibot/bots/:agentId/wx-send-message` - 带 agentId 参数的微信消息处理接口
+
 ## 🚀 快速开始
 
 ### 环境要求
@@ -386,6 +447,7 @@ docker run -p 9000:9000 \
 ### SDK 和工具
 
 - [@cloudbase/agent-adapter-yuanqi](https://www.npmjs.com/package/@cloudbase/agent-adapter-yuanqi) - 元器适配器
+- [@cloudbase/agent-adapter-wx](https://www.npmjs.com/package/@cloudbase/agent-adapter-wx) - 微信适配器
 - [@cloudbase/agent-server](https://www.npmjs.com/package/@cloudbase/agent-server) - Agent 服务器
 
 ---

httpfunctions/yuanqi-js/package.json

@@ -12,8 +12,8 @@
   "license": "ISC",
   "dependencies": {
     "@ag-ui/client": "0.0.42",
-    "@cloudbase/agent-adapter-wx": "^1.0.1-alpha.30",
-    "@cloudbase/agent-adapter-yuanqi": "^1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-wx": "1.0.1-alpha.30",
+    "@cloudbase/agent-adapter-yuanqi": "1.0.1-alpha.31",
     "@cloudbase/agent-server": "^0.0.20",
     "@dotenvx/dotenvx": "^1.51.1",
     "cors": "^2.8.5",

httpfunctions/yuanqi-js/src/index.js

@@ -4,7 +4,11 @@ import { YuanqiAgent } from "@cloudbase/agent-adapter-yuanqi";
 import dotenvx from "@dotenvx/dotenvx";
 // import cors from "cors";
 import { DetectCloudbaseUserMiddleware } from "./utils.js";
-import { WeChatAgent, createWxMessageHandler, WeChatHistoryManager } from '@cloudbase/agent-adapter-wx';
+import {
+  WeChatAgent,
+  createWxMessageHandler,
+  WeChatHistoryManager,
+} from "@cloudbase/agent-adapter-wx";
 
 dotenvx.config();
 
@@ -25,11 +29,15 @@ class MyAgent extends YuanqiAgent {
   }
 
   // 重写父类方法，获取历史对话
-  async getChatHistory(subscriber, latestUserMessage) {
+  async getChatHistory(subscriber, input, latestUserMessage) {
     // 调用父类方法获取历史对话
-    const history = await super.getChatHistory(subscriber, latestUserMessage);
+    const history = await super.getChatHistory(
+      subscriber,
+      input,
+      latestUserMessage,
+    );
     // 也可以忽略父类方法，自行处理历史对话的获取逻辑
-    // const history = await myMethodToGetChatHistory(subscriber, latestUserMessage);
+    // const history = await myMethodToGetChatHistory(subscriber, input, latestUserMessage);
     // 可以在这里对历史对话进行处理
     return history;
   }
@@ -47,7 +55,8 @@ class MyAgent extends YuanqiAgent {
 
 function createAgent({ request }) {
   // 元器 Token 体验活动 - 云开发身份认证
-  const Authorization = request.headers.Authorization || request.headers.get("Authorization")
+  const Authorization =
+    request.headers.Authorization || request.headers.get("Authorization");
   const accessToken = Authorization?.split(" ")[1] || "";
   const headers = {};
   if (accessToken) {
@@ -94,21 +103,21 @@ function createWxAgent({ request, options }) {
 
   return {
     agent: new WeChatAgent({
-      agentId: options?.agentId || 'agent-wx',
+      agentId: options?.agentId || "agent-wx",
       agent: baseAgent,
       wechatConfig: {
-        sendMode: 'aitools',
+        sendMode: "aitools",
         context: {
           extendedContext: {
             envId,
             accessToken: request.headers.authorization,
-          }
-        }
+          },
+        },
       },
       historyManager: new WeChatHistoryManager({
         envId,
-      })
-    })
+      }),
+    }),
   };
 }
 
@@ -128,7 +137,15 @@ createExpressRoutes({
 });
 
 // Register WeChat message route
-app.post('/wx-send-message', express.json(), createWxMessageHandler(createWxAgent));
-app.post('/v1/aibot/bots/:agentId/wx-send-message', express.json(), createWxMessageHandler(createWxAgent));
+app.post(
+  "/wx-send-message",
+  express.json(),
+  createWxMessageHandler(createWxAgent),
+);
+app.post(
+  "/v1/aibot/bots/:agentId/wx-send-message",
+  express.json(),
+  createWxMessageHandler(createWxAgent),
+);
 
 app.listen(9000, () => console.log("Listening on 9000!"));