@ynhcj/xiaoyi-channel 0.0.40-beta → 0.0.42-beta

package/dist/src/trigger-handler.js

@@ -1,7 +1,8 @@
 // Trigger 事件处理器
 import { randomUUID } from "crypto";
 import { getPushDataById } from "./utils/pushdata-manager.js";
-import { handleXYMessage } from "./bot.js";
+import { resolveXYConfig } from "./config.js";
+import { getXYWebSocketManager } from "./client.js";
 /**
  * 处理 Trigger 事件
  * 当用户在手机侧点击推送消息时触发
@@ -44,46 +45,50 @@ export async function handleTriggerEvent(context, cfg, runtime, accountId) {
         log(`[TRIGGER_HANDLER]   - pushDataId: ${pushDataItem.pushDataId}`);
         log(`[TRIGGER_HANDLER]   - time: ${pushDataItem.time}`);
         log(`[TRIGGER_HANDLER]   - dataDetail length: ${pushDataItem.dataDetail.length} chars`);
-        // 拼接消息
-        const prefixMessage = "这是定时任务的执行结果，你检查一下是否依赖手机侧的工具执行，如果依赖则在本轮任务中完成手机侧任务执行，如果不依赖，则直接把完整的执行结果返回给用户";
-        const fullMessage = `${prefixMessage}\n\n${pushDataItem.dataDetail}`;
-        log(`[TRIGGER_HANDLER] 📝 Constructed message (length: ${fullMessage.length} chars)`);
-        // 构造 A2A 消息
-        // 使用从 WebSocket 传递过来的 sessionId 和 taskId（新的 taskId）
-        // 这样可以触发 steer 模式，覆盖之前正在执行的任务
+        // ==================== 新逻辑：直接返回结果 ====================
+        log(`[TRIGGER_HANDLER] 📤 Directly responding with pushData content`);
+        // 获取配置
+        const config = resolveXYConfig(cfg);
+        // 构造 A2A Response（final=true，直接结束）
         const messageId = randomUUID();
-        const a2aMessage = {
+        const response = {
             jsonrpc: "2.0",
-            method: "sendMessage",
             id: messageId,
-            params: {
-                id: taskId, // 使用新的 taskId（点击推送时生成）
-                sessionId: sessionId, // 使用原始会话 sessionId
-                agentLoginSessionId: "",
-                message: {
-                    role: "user",
+            result: {
+                taskId: taskId,
+                kind: "artifact-update",
+                append: false,
+                lastChunk: true,
+                final: true, // 直接结束
+                artifact: {
+                    artifactId: randomUUID(),
                     parts: [
                         {
                             kind: "text",
-                            text: fullMessage,
+                            text: pushDataItem.dataDetail, // 直接返回原始内容
                         },
                     ],
                 },
             },
+            error: { code: 0 },
         };
-        log(`[TRIGGER_HANDLER] 🚀 Dispatching A2A message to bot handler`);
+        // 构造 WebSocket 消息
+        const outboundMessage = {
+            msgType: "agent_response",
+            agentId: config.agentId,
+            sessionId: sessionId,
+            taskId: taskId,
+            msgDetail: JSON.stringify(response),
+        };
+        log(`[TRIGGER_HANDLER] 📦 Sending direct response:`);
         log(`[TRIGGER_HANDLER]   - sessionId: ${sessionId}`);
-        log(`[TRIGGER_HANDLER]   - taskId: ${taskId} (NEW - will trigger steer mode if configured)`);
+        log(`[TRIGGER_HANDLER]   - taskId: ${taskId}`);
         log(`[TRIGGER_HANDLER]   - messageId: ${messageId}`);
-        // 透传给 openclaw 处理
-        // 如果配置了 steer 模式，且该 sessionId 有活跃任务，这个新的 taskId 会覆盖旧的
-        await handleXYMessage({
-            cfg,
-            runtime,
-            message: a2aMessage,
-            accountId,
-        });
-        log(`[TRIGGER_HANDLER] ✅ Trigger event handled successfully`);
+        log(`[TRIGGER_HANDLER]   - content length: ${pushDataItem.dataDetail.length} chars`);
+        // 发送消息
+        const wsManager = getXYWebSocketManager(config);
+        await wsManager.sendMessage(sessionId, outboundMessage);
+        log(`[TRIGGER_HANDLER] ✅ Direct response sent successfully`);
     }
     catch (err) {
         error(`[TRIGGER_HANDLER] ❌ Failed to handle Trigger event:`, err);

package/dist/src/utils/pushdata-manager.js

@@ -3,7 +3,7 @@ import { promises as fs } from "fs";
 import * as path from "path";
 import { randomUUID } from "crypto";
 import { logger } from "./logger.js";
-const PUSHDATA_FILE = "/home/snadbox/.openclaw/pushData.json";
+const PUSHDATA_FILE = "/home/sandbox/.openclaw/pushData.json";
 const MAX_PUSHDATA_ITEMS = 1000; // 最多保留 1000 条记录
 /**
  * 格式化北京时间（UTC+8）

package/dist/src/utils/pushid-manager.js

@@ -2,7 +2,7 @@
 import { promises as fs } from "fs";
 import * as path from "path";
 import { logger } from "./logger.js";
-const PUSHID_LIST_FILE = "/home/snadbox/.openclaw/pushIdList.json";
+const PUSHID_LIST_FILE = "/home/sandbox/.openclaw/pushIdList.json";
 /**
  * 确保目录存在
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.40-beta",
+  "version": "0.0.42-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",