@ynhcj/xiaoyi-channel 1.1.8 → 1.1.10

package/dist/src/bot.js

@@ -1,11 +1,13 @@
 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 { downloadFilesFromParts } from "./file-download.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 +59,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);
@@ -81,6 +121,10 @@ export async function handleXYMessage(params) {
             log(`[BOT]   - Push ID preview: ${pushId.substring(0, 20)}...`);
             log(`[BOT]   - Full push_id: ${pushId}`);
             configManager.updatePushId(parsed.sessionId, pushId);
+            // 持久化 pushId 到本地文件（异步，不阻塞主流程）
+            addPushId(pushId).catch((err) => {
+                error(`[BOT] Failed to persist pushId:`, err);
+            });
         }
         else {
             log(`[BOT] ℹ️  No push_id found in message, will use config default`);
@@ -129,10 +173,9 @@ export async function handleXYMessage(params) {
         // Extract text and files from parts
         const text = extractTextFromParts(parsed.parts);
         const fileParts = extractFileParts(parsed.parts);
-        // Download files if present (using core's media download)
-        const mediaList = await downloadFilesFromParts(fileParts);
-        // Build media payload for inbound context (following feishu pattern)
-        const mediaPayload = buildXYMediaPayload(mediaList);
+        // Download files to local disk
+        const downloadedFiles = await downloadFilesFromParts(fileParts);
+        const mediaPayload = buildXYMediaPayload(downloadedFiles);
         // Resolve envelope format options (following feishu pattern)
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
         // Build message body with speaker prefix (following feishu pattern)
@@ -276,6 +319,8 @@ export async function handleXYMessage(params) {
 /**
  * Build media payload for inbound context.
  * Following feishu pattern: buildFeishuMediaPayload().
+ *
+ * @param mediaList - Downloaded files with local paths
  */
 function buildXYMediaPayload(mediaList) {
     const first = mediaList[0];
@@ -284,9 +329,7 @@ function buildXYMediaPayload(mediaList) {
     return {
         MediaPath: first?.path,
         MediaType: first?.mimeType,
-        MediaUrl: first?.path,
         MediaPaths: mediaPaths.length > 0 ? mediaPaths : undefined,
-        MediaUrls: mediaPaths.length > 0 ? mediaPaths : undefined,
         MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined,
     };
 }

package/dist/src/channel.js

@@ -14,14 +14,17 @@ import { uploadPhotoTool } from "./tools/upload-photo-tool.js";
 import { xiaoyiGuiTool } from "./tools/xiaoyi-gui-tool.js";
 import { callPhoneTool } from "./tools/call-phone-tool.js";
 import { searchMessageTool } from "./tools/search-message-tool.js";
+import { sendMessageTool } from "./tools/send-message-tool.js";
 import { searchFileTool } from "./tools/search-file-tool.js";
 import { uploadFileTool } from "./tools/upload-file-tool.js";
 import { createAlarmTool } from "./tools/create-alarm-tool.js";
 import { searchAlarmTool } from "./tools/search-alarm-tool.js";
 import { modifyAlarmTool } from "./tools/modify-alarm-tool.js";
 import { deleteAlarmTool } from "./tools/delete-alarm-tool.js";
-import { sendMessageTool } from "./tools/send-message-tool.js";
 import { sendFileToUserTool } from "./tools/send-file-to-user-tool.js";
+// import { xiaoyiCollectionTool } from "./tools/xiaoyi-collection-tool.js"; // 暂时取消注册
+import { viewPushResultTool } from "./tools/view-push-result-tool.js";
+import { imageReadingTool } from "./tools/image-reading-tool.js";
 /**
  * Xiaoyi Channel Plugin for OpenClaw.
  * Implements Xiaoyi A2A protocol with dual WebSocket connections.
@@ -61,7 +64,7 @@ export const xyPlugin = {
     },
     outbound: xyOutbound,
     onboarding: xyOnboardingAdapter,
-    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendMessageTool, sendFileToUserTool],
+    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool],
     messaging: {
         normalizeTarget: (raw) => {
             const trimmed = raw.trim();
@@ -88,10 +91,9 @@ export const xyPlugin = {
             const account = resolveXYConfig(context.cfg);
             context.setStatus?.({
                 accountId: context.accountId,
-                wsUrl1: account.wsUrl1,
-                wsUrl2: account.wsUrl2,
+                wsUrl: account.wsUrl,
             });
-            context.log?.info(`[${context.accountId}] starting xiaoyi channel (wsUrl1: ${account.wsUrl1}, wsUrl2: ${account.wsUrl2})`);
+            context.log?.info(`[${context.accountId}] starting xiaoyi channel (wsUrl: ${account.wsUrl})`);
             return monitorXYProvider({
                 config: context.cfg,
                 runtime: context.runtime,

package/dist/src/client.js

@@ -89,29 +89,16 @@ export function diagnoseAllManagers() {
         console.log(`📌 Manager: ${key}`);
         console.log(`   Shutting down: ${diag.isShuttingDown}`);
         console.log(`   Total event listeners on manager: ${diag.totalEventListeners}`);
-        // Server 1
-        console.log(`   🔌 Server1:`);
-        console.log(`      - Exists: ${diag.server1.exists}`);
-        console.log(`      - ReadyState: ${diag.server1.readyState}`);
-        console.log(`      - State connected/ready: ${diag.server1.stateConnected}/${diag.server1.stateReady}`);
-        console.log(`      - Reconnect attempts: ${diag.server1.reconnectAttempts}`);
-        console.log(`      - Listeners on WebSocket: ${diag.server1.listenerCount}`);
-        console.log(`      - Heartbeat active: ${diag.server1.heartbeatActive}`);
-        console.log(`      - Has reconnect timer: ${diag.server1.hasReconnectTimer}`);
-        if (diag.server1.isOrphan) {
-            console.log(`      ⚠️  ORPHAN CONNECTION DETECTED!`);
-            orphanCount++;
-        }
-        // Server 2
-        console.log(`   🔌 Server2:`);
-        console.log(`      - Exists: ${diag.server2.exists}`);
-        console.log(`      - ReadyState: ${diag.server2.readyState}`);
-        console.log(`      - State connected/ready: ${diag.server2.stateConnected}/${diag.server2.stateReady}`);
-        console.log(`      - Reconnect attempts: ${diag.server2.reconnectAttempts}`);
-        console.log(`      - Listeners on WebSocket: ${diag.server2.listenerCount}`);
-        console.log(`      - Heartbeat active: ${diag.server2.heartbeatActive}`);
-        console.log(`      - Has reconnect timer: ${diag.server2.hasReconnectTimer}`);
-        if (diag.server2.isOrphan) {
+        // Connection
+        console.log(`   🔌 Connection:`);
+        console.log(`      - Exists: ${diag.connection.exists}`);
+        console.log(`      - ReadyState: ${diag.connection.readyState}`);
+        console.log(`      - State connected/ready: ${diag.connection.stateConnected}/${diag.connection.stateReady}`);
+        console.log(`      - Reconnect attempts: ${diag.connection.reconnectAttempts}`);
+        console.log(`      - Listeners on WebSocket: ${diag.connection.listenerCount}`);
+        console.log(`      - Heartbeat active: ${diag.connection.heartbeatActive}`);
+        console.log(`      - Has reconnect timer: ${diag.connection.hasReconnectTimer}`);
+        if (diag.connection.isOrphan) {
             console.log(`      ⚠️  ORPHAN CONNECTION DETECTED!`);
             orphanCount++;
         }
@@ -134,7 +121,7 @@ export function cleanupOrphanConnections() {
     let cleanedCount = 0;
     wsManagerCache.forEach((manager, key) => {
         const diag = manager.getConnectionDiagnostics();
-        if (diag.server1.isOrphan || diag.server2.isOrphan) {
+        if (diag.connection.isOrphan) {
             console.log(`🧹 Cleaning up orphan connections in manager: ${key}`);
             manager.disconnect();
             cleanedCount++;

package/dist/src/config.js

@@ -17,8 +17,8 @@ export function resolveXYConfig(cfg) {
     // Return configuration with defaults
     return {
         enabled: xyConfig.enabled ?? false,
-        wsUrl1: xyConfig.wsUrl1 ?? "ws://localhost:8765/ws/link",
-        wsUrl2: xyConfig.wsUrl2 ?? "ws://localhost:8768/ws/link",
+        // ✅ 兼容旧配置：优先使用 wsUrl，然后 wsUrl2（wsUrl1 被忽略）
+        wsUrl: xyConfig.wsUrl ?? xyConfig.wsUrl2 ?? "ws://localhost:8768/ws/link",
         apiKey: xyConfig.apiKey,
         uid: xyConfig.uid,
         agentId: xyConfig.agentId,

package/dist/src/file-upload.d.ts

@@ -12,6 +12,11 @@ export declare class XYFileUploadService {
      * Returns the objectId (as fileId) for use in A2A messages.
      */
     uploadFile(filePath: string, objectType?: string): Promise<string>;
+    /**
+     * Upload a file and return its publicly accessible URL.
+     * Uses completeAndQuery endpoint to get the file URL directly.
+     */
+    uploadFileAndGetUrl(filePath: string, objectType?: string): Promise<string>;
     /**
      * Upload multiple files and return their file IDs.
      */

package/dist/src/file-upload.js

@@ -105,6 +105,98 @@ export class XYFileUploadService {
             return "";
         }
     }
+    /**
+     * Upload a file and return its publicly accessible URL.
+     * Uses completeAndQuery endpoint to get the file URL directly.
+     */
+    async uploadFileAndGetUrl(filePath, objectType = "TEMPORARY_MATERIAL_DOC") {
+        console.log(`[XY File Upload] Starting file upload with URL retrieval: ${filePath}`);
+        try {
+            // Read file
+            const fileBuffer = await fs.readFile(filePath);
+            const fileName = path.basename(filePath);
+            const fileSha256 = calculateSHA256(fileBuffer);
+            const fileSize = fileBuffer.length;
+            // Phase 1: Prepare
+            console.log(`[XY File Upload] Phase 1: Prepare upload for ${fileName}`);
+            const prepareResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/prepare`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "x-uid": this.uid,
+                    "x-api-key": this.apiKey,
+                    "x-request-from": "openclaw",
+                },
+                body: JSON.stringify({
+                    objectType,
+                    fileName,
+                    fileSha256,
+                    fileSize,
+                    fileOwnerInfo: {
+                        uid: this.uid,
+                        teamId: this.uid,
+                    },
+                    useEdge: false,
+                }),
+            });
+            if (!prepareResp.ok) {
+                throw new Error(`Prepare failed: HTTP ${prepareResp.status}`);
+            }
+            const prepareData = await prepareResp.json();
+            console.log(`[XY File Upload] Prepare response:`, JSON.stringify(prepareData, null, 2));
+            if (prepareData.code !== "0") {
+                throw new Error(`Prepare failed: ${prepareData.desc}`);
+            }
+            const { objectId, draftId, uploadInfos } = prepareData;
+            console.log(`[XY File Upload] Prepare complete: objectId=${objectId}, draftId=${draftId}`);
+            // Phase 2: Upload
+            console.log(`[XY File Upload] Phase 2: Upload file data`);
+            const uploadInfo = uploadInfos[0]; // Single-part upload
+            const uploadResp = await fetch(uploadInfo.url, {
+                method: uploadInfo.method,
+                headers: uploadInfo.headers,
+                body: fileBuffer,
+            });
+            console.log(`[XY File Upload] Upload response status: ${uploadResp.status}`);
+            if (!uploadResp.ok) {
+                const uploadErrorText = await uploadResp.text();
+                console.log(`[XY File Upload] Upload error response:`, uploadErrorText);
+                throw new Error(`Upload failed: HTTP ${uploadResp.status}`);
+            }
+            console.log(`[XY File Upload] Upload complete`);
+            // Phase 3: CompleteAndQuery - get file URL
+            console.log(`[XY File Upload] Phase 3: CompleteAndQuery to get file URL`);
+            const completeResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/completeAndQuery`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "x-uid": this.uid,
+                    "x-api-key": this.apiKey,
+                    "x-request-from": "openclaw",
+                },
+                body: JSON.stringify({
+                    objectId,
+                    draftId,
+                }),
+            });
+            if (!completeResp.ok) {
+                throw new Error(`CompleteAndQuery failed: HTTP ${completeResp.status}`);
+            }
+            const completeData = await completeResp.json();
+            console.log(`[XY File Upload] CompleteAndQuery response:`, JSON.stringify(completeData, null, 2));
+            // Extract file URL from response
+            const fileUrl = completeData?.fileDetailInfo?.url || "";
+            if (!fileUrl) {
+                throw new Error("No file URL returned from completeAndQuery");
+            }
+            console.log(`[XY File Upload] File upload successful: ${fileName} → URL=${fileUrl}`);
+            return fileUrl;
+        }
+        catch (error) {
+            console.error(`[XY File Upload] File upload with URL retrieval failed for ${filePath}:`, error);
+            throw error;
+        }
+    }
     /**
      * Upload multiple files and return their file IDs.
      */

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

@@ -106,9 +106,7 @@ export async function sendReasoningTextUpdate(params) {
         taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
-    log(`[REASONING_TEXT] 📤 Sending reasoningText update: sessionId=${sessionId}, taskId=${taskId}, text.length=${text.length}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log(`[REASONING_TEXT] ✅ Sent successfully`);
 }
 /**
  * Send an A2A task status update.
@@ -293,3 +291,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/monitor.js

@@ -3,6 +3,7 @@ import { getXYWebSocketManager, diagnoseAllManagers, cleanupOrphanConnections, r
 import { handleXYMessage } from "./bot.js";
 import { parseA2AMessage } from "./parser.js";
 import { hasActiveTask } from "./task-manager.js";
+import { handleTriggerEvent } from "./trigger-handler.js";
 /**
  * Per-session serial queue that ensures messages from the same session are processed
  * in arrival order while allowing different sessions to run concurrently.
@@ -150,6 +151,15 @@ export async function monitorXYProvider(opts = {}) {
         const errorHandler = (err, serverId) => {
             error(`XY gateway: ${serverId} error: ${String(err)}`);
         };
+        const triggerEventHandler = (context) => {
+            log(`[MONITOR] 📌 Received trigger-event, dispatching to handler...`);
+            log(`[MONITOR]   - sessionId: ${context.sessionId}`);
+            log(`[MONITOR]   - taskId: ${context.taskId}`);
+            // 异步处理 Trigger 事件，不阻塞主流程
+            handleTriggerEvent(context, cfg, runtime, accountId).catch((err) => {
+                error(`[MONITOR] Failed to handle trigger-event:`, err);
+            });
+        };
         const cleanup = () => {
             log("XY gateway: cleaning up...");
             // 🔍 Diagnose before cleanup
@@ -166,6 +176,7 @@ export async function monitorXYProvider(opts = {}) {
             wsManager.off("connected", connectedHandler);
             wsManager.off("disconnected", disconnectedHandler);
             wsManager.off("error", errorHandler);
+            wsManager.off("trigger-event", triggerEventHandler);
             // ✅ Disconnect the wsManager to prevent connection leaks
             // This is safe because each gateway lifecycle should have clean connections
             wsManager.disconnect();
@@ -195,6 +206,7 @@ export async function monitorXYProvider(opts = {}) {
         wsManager.on("connected", connectedHandler);
         wsManager.on("disconnected", disconnectedHandler);
         wsManager.on("error", errorHandler);
+        wsManager.on("trigger-event", triggerEventHandler);
         // Start periodic health check (every 5 minutes)
         console.log("🏥 Starting periodic health check (every 5 minutes)...");
         healthCheckInterval = setInterval(() => {