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

package/dist/src/bot.js

@@ -1,11 +1,12 @@
 import { getXYRuntime } from "./runtime.js";
 import { createXYReplyDispatcher } from "./reply-dispatcher.js";
-import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId } from "./parser.js";
+import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractTriggerData } from "./parser.js";
 import { resolveXYConfig } from "./config.js";
-import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse } from "./formatter.js";
+import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
 import { registerSession, unregisterSession, runWithSessionContext } from "./tools/session-manager.js";
 import { configManager } from "./utils/config-manager.js";
 import { addPushId } from "./utils/pushid-manager.js";
+import { getPushDataById } from "./utils/pushdata-manager.js";
 import { registerTaskId, decrementTaskIdRef, lockTaskId, unlockTaskId, hasActiveTask, } from "./task-manager.js";
 /**
  * Handle an incoming A2A message.
@@ -57,6 +58,44 @@ export async function handleXYMessage(params) {
         }
         // Parse the A2A message (for regular messages)
         const parsed = parseA2AMessage(message);
+        // ========== 检测 Trigger 消息 ==========
+        // 如果消息中包含 Trigger 事件数据，直接返回 pushData 内容，不走正常流程
+        const triggerData = extractTriggerData(parsed.parts);
+        if (triggerData) {
+            log(`[BOT] 📌 Detected Trigger message with pushDataId: ${triggerData.pushDataId}`);
+            log(`[BOT]   - Session ID: ${parsed.sessionId}`);
+            log(`[BOT]   - Task ID: ${parsed.taskId}`);
+            try {
+                // 读取 pushData
+                const pushDataItem = await getPushDataById(triggerData.pushDataId);
+                if (!pushDataItem) {
+                    error(`[BOT] ❌ pushData not found for ID: ${triggerData.pushDataId}`);
+                    return;
+                }
+                log(`[BOT] ✅ Found pushData, sending direct response`);
+                log(`[BOT]   - pushDataId: ${pushDataItem.pushDataId}`);
+                log(`[BOT]   - time: ${pushDataItem.time}`);
+                log(`[BOT]   - content length: ${pushDataItem.dataDetail.length} chars`);
+                const config = resolveXYConfig(cfg);
+                // 直接发送响应（final=true，不走 openclaw 流程）
+                await sendA2AResponse({
+                    config,
+                    sessionId: parsed.sessionId,
+                    taskId: parsed.taskId,
+                    messageId: parsed.messageId,
+                    text: pushDataItem.dataDetail,
+                    append: false,
+                    final: true,
+                });
+                log(`[BOT] ✅ Trigger response sent successfully, exiting early`);
+                return; // 提前返回，不继续处理
+            }
+            catch (err) {
+                error(`[BOT] ❌ Failed to handle Trigger message:`, err);
+                return;
+            }
+        }
+        // ========================================
         // 🔑 检测steer模式和是否是第二条消息
         const isSteerMode = cfg.messages?.queue?.mode === "steer";
         const isSecondMessage = isSteerMode && hasActiveTask(parsed.sessionId);

package/dist/src/formatter.d.ts

@@ -92,3 +92,17 @@ export interface SendTasksCancelResponseParams {
  * Send a tasks/cancel response.
  */
 export declare function sendTasksCancelResponse(params: SendTasksCancelResponseParams): Promise<void>;
+/**
+ * Parameters for sending a Trigger response.
+ */
+export interface SendTriggerResponseParams {
+    config: XYChannelConfig;
+    sessionId: string;
+    taskId: string;
+    messageId: string;
+    content: string;
+}
+/**
+ * Send a Trigger response with pushData content.
+ */
+export declare function sendTriggerResponse(params: SendTriggerResponseParams): Promise<void>;

package/dist/src/formatter.js

@@ -293,3 +293,49 @@ export async function sendTasksCancelResponse(params) {
     await wsManager.sendMessage(sessionId, outboundMessage);
     log(`Sent tasks/cancel response: sessionId=${sessionId}, taskId=${taskId}`);
 }
+/**
+ * Send a Trigger response with pushData content.
+ */
+export async function sendTriggerResponse(params) {
+    const { config, sessionId, taskId, messageId, content } = params;
+    const runtime = getXYRuntime();
+    const log = runtime?.log ?? console.log;
+    const error = runtime?.error ?? console.error;
+    // Build JSON-RPC response for Trigger
+    const jsonRpcResponse = {
+        jsonrpc: "2.0",
+        id: messageId,
+        result: {
+            taskId: taskId,
+            kind: "artifact-update",
+            append: false,
+            lastChunk: true,
+            final: true,
+            artifact: {
+                artifactId: uuidv4(),
+                parts: [
+                    {
+                        kind: "text",
+                        text: content,
+                    },
+                ],
+            },
+        },
+        error: {
+            code: 0,
+            message: "",
+        },
+    };
+    // Send via WebSocket
+    const wsManager = getXYWebSocketManager(config);
+    const outboundMessage = {
+        msgType: "agent_response",
+        agentId: config.agentId,
+        sessionId,
+        taskId,
+        msgDetail: JSON.stringify(jsonRpcResponse),
+    };
+    log(`[TRIGGER_RESPONSE] Sending Trigger response: sessionId=${sessionId}, taskId=${taskId}`);
+    await wsManager.sendMessage(sessionId, outboundMessage);
+    log(`[TRIGGER_RESPONSE] Trigger response sent successfully`);
+}

package/dist/src/outbound.js

@@ -147,8 +147,8 @@ export const xyOutbound = {
         for (const pushId of pushIdList) {
             try {
                 console.log(`[xyOutbound.sendText] Sending to pushId: ${pushId.substring(0, 20)}...`);
-                // 传入 pushDataId，使用 kind="data" 格式
-                await pushService.sendPush(pushText, title, undefined, actualTo, pushDataId);
+                // 传入 pushId 和 pushDataId，使用 kind="data" 格式
+                await pushService.sendPush(pushText, title, undefined, actualTo, pushDataId, pushId);
                 successCount++;
                 console.log(`[xyOutbound.sendText] ✅ Sent successfully to pushId: ${pushId.substring(0, 20)}...`);
             }

package/dist/src/parser.d.ts

@@ -43,6 +43,13 @@ export declare function isTasksCancelMessage(method: string): boolean;
  * Looks for push_id in data parts under variables.systemVariables.push_id
  */
 export declare function extractPushId(parts: A2AMessagePart[]): string | null;
+/**
+ * Extract Trigger event data from message parts.
+ * Looks for Trigger events with pushDataId in data parts.
+ */
+export declare function extractTriggerData(parts: A2AMessagePart[]): {
+    pushDataId: string;
+} | null;
 /**
  * Validate A2A request structure.
  */

package/dist/src/parser.js

@@ -72,6 +72,28 @@ export function extractPushId(parts) {
     }
     return null;
 }
+/**
+ * Extract Trigger event data from message parts.
+ * Looks for Trigger events with pushDataId in data parts.
+ */
+export function extractTriggerData(parts) {
+    for (const part of parts) {
+        if (part.kind === "data" && part.data) {
+            const events = part.data.events;
+            if (Array.isArray(events)) {
+                for (const event of events) {
+                    if (event.header?.namespace === "Common" && event.header?.name === "Trigger") {
+                        const pushDataId = event.payload?.dataMap?.pushDataId;
+                        if (pushDataId && typeof pushDataId === "string") {
+                            return { pushDataId };
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return null;
+}
 /**
  * Validate A2A request structure.
  */

package/dist/src/push.d.ts

@@ -20,8 +20,9 @@ export declare class XYPushService {
      * @param data - Optional additional data
      * @param sessionId - Optional session ID
      * @param pushDataId - Optional pushDataId for kind="data" format
+     * @param pushId - Push ID to use (required)
      */
-    sendPush(content: string, title: string, data?: Record<string, any>, sessionId?: string, pushDataId?: string): Promise<void>;
+    sendPush(content: string, title: string, data?: Record<string, any>, sessionId?: string, pushDataId?: string, pushId?: string): Promise<void>;
     /**
      * Send a push message with file attachments.
      */

package/dist/src/push.js

@@ -1,7 +1,6 @@
 // Push message service for scheduled tasks
 import fetch from "node-fetch";
 import { randomUUID } from "crypto";
-import { configManager } from "./utils/config-manager.js";
 /**
  * Service for sending push messages to users.
  * Used for outbound messages and scheduled tasks.
@@ -27,27 +26,21 @@ export class XYPushService {
      * @param data - Optional additional data
      * @param sessionId - Optional session ID
      * @param pushDataId - Optional pushDataId for kind="data" format
+     * @param pushId - Push ID to use (required)
      */
-    async sendPush(content, title, data, sessionId, pushDataId) {
+    async sendPush(content, title, data, sessionId, pushDataId, pushId) {
         const pushUrl = this.config.pushUrl || this.DEFAULT_PUSH_URL;
         const traceId = this.generateTraceId();
-        // Get dynamic pushId for the session (falls back to config pushId)
-        const dynamicPushId = configManager.getPushId(sessionId);
-        const pushId = dynamicPushId || this.config.pushId;
+        // Use provided pushId or fall back to config pushId
+        const actualPushId = pushId || this.config.pushId;
         console.log(`[PUSH] 📤 Preparing to send push message`);
         console.log(`[PUSH]   - Title: "${title}"`);
         console.log(`[PUSH]   - Content length: ${content.length} chars`);
         console.log(`[PUSH]   - Session ID: ${sessionId || 'none'}`);
         console.log(`[PUSH]   - Trace ID: ${traceId}`);
         console.log(`[PUSH]   - Push URL: ${pushUrl}`);
-        if (dynamicPushId) {
-            console.log(`[PUSH]   - Using dynamic pushId (from session): ${pushId.substring(0, 20)}...`);
-            console.log(`[PUSH]   - Full dynamic pushId: ${pushId}`);
-        }
-        else {
-            console.log(`[PUSH]   - Using config pushId (fallback): ${pushId.substring(0, 20)}...`);
-            console.log(`[PUSH]   - Full config pushId: ${pushId}`);
-        }
+        console.log(`[PUSH]   - Using pushId: ${actualPushId.substring(0, 20)}...`);
+        console.log(`[PUSH]   - Full pushId: ${actualPushId}`);
         console.log(`[PUSH]   - API ID: ${this.config.apiId}`);
         console.log(`[PUSH]   - UID: ${this.config.uid}`);
         try {
@@ -57,7 +50,7 @@ export class XYPushService {
                 result: {
                     id: randomUUID(),
                     apiId: this.config.apiId,
-                    pushId: pushId, // Use dynamic pushId
+                    pushId: actualPushId,
                     pushText: title,
                     kind: "task",
                     artifacts: [
@@ -129,14 +122,14 @@ export class XYPushService {
             console.log(`[PUSH] ✅ Push message sent successfully`);
             console.log(`[PUSH]   - Title: "${title}"`);
             console.log(`[PUSH]   - Trace ID: ${traceId}`);
-            console.log(`[PUSH]   - Used pushId: ${pushId.substring(0, 20)}...`);
+            console.log(`[PUSH]   - Used pushId: ${actualPushId.substring(0, 20)}...`);
             console.log(`[PUSH]   - Response:`, result);
         }
         catch (error) {
             console.log(`[PUSH] ❌ Failed to send push message`);
             console.log(`[PUSH]   - Trace ID: ${traceId}`);
             console.log(`[PUSH]   - Target URL: ${pushUrl}`);
-            console.log(`[PUSH]   - Push ID: ${pushId.substring(0, 20)}...`);
+            console.log(`[PUSH]   - Push ID: ${actualPushId.substring(0, 20)}...`);
             if (error instanceof Error) {
                 console.log(`[PUSH]   - Error name: ${error.name}`);
                 console.log(`[PUSH]   - Error message: ${error.message}`);

package/dist/src/trigger-handler.d.ts

@@ -11,6 +11,9 @@ export interface TriggerEventContext {
  * 处理 Trigger 事件
  * 当用户在手机侧点击推送消息时触发
  *
+ * 策略：构造一个包含 Trigger 事件的 A2A 消息，通过 handleXYMessage 处理
+ * 这样可以复用现有的消息链路和 runtime 初始化
+ *
  * @param context - Trigger 事件上下文（包含 event, sessionId, taskId）
  * @param cfg - OpenClaw 配置
  * @param runtime - 运行时环境

package/dist/src/trigger-handler.js

@@ -1,12 +1,11 @@
-// Trigger 事件处理器
-import { randomUUID } from "crypto";
-import { getPushDataById } from "./utils/pushdata-manager.js";
-import { resolveXYConfig } from "./config.js";
-import { getXYWebSocketManager } from "./client.js";
+import { handleXYMessage } from "./bot.js";
 /**
  * 处理 Trigger 事件
  * 当用户在手机侧点击推送消息时触发
  *
+ * 策略：构造一个包含 Trigger 事件的 A2A 消息，通过 handleXYMessage 处理
+ * 这样可以复用现有的消息链路和 runtime 初始化
+ *
  * @param context - Trigger 事件上下文（包含 event, sessionId, taskId）
  * @param cfg - OpenClaw 配置
  * @param runtime - 运行时环境
@@ -18,77 +17,41 @@ export async function handleTriggerEvent(context, cfg, runtime, accountId) {
     try {
         const { event, sessionId, taskId } = context;
         log(`[TRIGGER_HANDLER] 📌 Received Trigger event`);
-        log(`[TRIGGER_HANDLER] Event:`, JSON.stringify(event, null, 2));
-        log(`[TRIGGER_HANDLER] Context - sessionId: ${sessionId}, taskId: ${taskId}`);
-        if (!sessionId) {
-            error(`[TRIGGER_HANDLER] ❌ Missing sessionId in context`);
-            return;
-        }
-        if (!taskId) {
-            error(`[TRIGGER_HANDLER] ❌ Missing taskId in context`);
-            return;
-        }
-        // 从 event.payload.dataMap 中提取 pushDataId
-        const pushDataId = event.payload?.dataMap?.pushDataId;
-        if (!pushDataId) {
-            error(`[TRIGGER_HANDLER] ❌ Missing pushDataId in Trigger event payload`);
-            return;
-        }
-        log(`[TRIGGER_HANDLER] 🔍 Looking up pushDataId: ${pushDataId}`);
-        // 根据 pushDataId 查询原始数据
-        const pushDataItem = await getPushDataById(pushDataId);
-        if (!pushDataItem) {
-            error(`[TRIGGER_HANDLER] ❌ pushData not found for ID: ${pushDataId}`);
-            return;
-        }
-        log(`[TRIGGER_HANDLER] ✅ Found pushData`);
-        log(`[TRIGGER_HANDLER]   - pushDataId: ${pushDataItem.pushDataId}`);
-        log(`[TRIGGER_HANDLER]   - time: ${pushDataItem.time}`);
-        log(`[TRIGGER_HANDLER]   - dataDetail length: ${pushDataItem.dataDetail.length} chars`);
-        // ==================== 新逻辑：直接返回结果 ====================
-        log(`[TRIGGER_HANDLER] 📤 Directly responding with pushData content`);
-        // 获取配置
-        const config = resolveXYConfig(cfg);
-        // 构造 A2A Response（final=true，直接结束）
-        const messageId = randomUUID();
-        const response = {
+        log(`[TRIGGER_HANDLER]   - sessionId: ${sessionId}`);
+        log(`[TRIGGER_HANDLER]   - taskId: ${taskId}`);
+        log(`[TRIGGER_HANDLER]   - pushDataId: ${event.payload?.dataMap?.pushDataId}`);
+        // 构造包含 Trigger 事件的 A2A 消息
+        // 将原始 event 放入 message.parts 中，让 handleXYMessage 检测并处理
+        const a2aMessage = {
             jsonrpc: "2.0",
-            id: messageId,
-            result: {
-                taskId: taskId,
-                kind: "artifact-update",
-                append: false,
-                lastChunk: true,
-                final: true, // 直接结束
-                artifact: {
-                    artifactId: randomUUID(),
+            method: "sendMessage",
+            id: taskId,
+            params: {
+                id: taskId,
+                sessionId: sessionId,
+                agentLoginSessionId: "",
+                message: {
+                    role: "user",
                     parts: [
                         {
-                            kind: "text",
-                            text: pushDataItem.dataDetail, // 直接返回原始内容
+                            kind: "data",
+                            data: {
+                                events: [event], // 包含 Trigger 事件
+                            },
                         },
                     ],
                 },
             },
-            error: { code: 0 },
         };
-        // 构造 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}`);
-        log(`[TRIGGER_HANDLER]   - messageId: ${messageId}`);
-        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`);
+        log(`[TRIGGER_HANDLER] 🚀 Dispatching to handleXYMessage for processing`);
+        // 通过 handleXYMessage 处理（复用现有链路）
+        await handleXYMessage({
+            cfg,
+            runtime,
+            message: a2aMessage,
+            accountId,
+        });
+        log(`[TRIGGER_HANDLER] ✅ Trigger event dispatched successfully`);
     }
     catch (err) {
         error(`[TRIGGER_HANDLER] ❌ Failed to handle Trigger event:`, err);

package/package.json

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