@ynhcj/xiaoyi-channel 0.0.51-beta → 0.0.52-beta

package/dist/src/tools/xiaoyi-collection-tool.js

@@ -1,7 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentSessionContext } from "./session-manager.js";
-import { logger } from "../utils/logger.js";
 /**
  * XY collection tool - retrieves user's collection data from XiaoYi.
  * Returns personalized knowledge data saved in user's collection.
@@ -22,29 +21,15 @@ export const xiaoyiCollectionTool = {
         required: [],
     },
     async execute(toolCallId, params) {
-        logger.log(`[XIAOYI_COLLECTION_TOOL] 🚀 Starting execution`);
-        logger.log(`[XIAOYI_COLLECTION_TOOL]   - toolCallId: ${toolCallId}`);
-        logger.log(`[XIAOYI_COLLECTION_TOOL]   - params:`, JSON.stringify(params));
-        logger.log(`[XIAOYI_COLLECTION_TOOL]   - timestamp: ${new Date().toISOString()}`);
         // Get session context
-        logger.log(`[XIAOYI_COLLECTION_TOOL] 🔍 Attempting to get session context...`);
         const sessionContext = getCurrentSessionContext();
         if (!sessionContext) {
-            logger.error(`[XIAOYI_COLLECTION_TOOL] ❌ FAILED: No active session found!`);
-            logger.error(`[XIAOYI_COLLECTION_TOOL]   - toolCallId: ${toolCallId}`);
             throw new Error("No active XY session found. XiaoYi collection tool can only be used during an active conversation.");
         }
-        logger.log(`[XIAOYI_COLLECTION_TOOL] ✅ Session context found`);
-        logger.log(`[XIAOYI_COLLECTION_TOOL]   - sessionId: ${sessionContext.sessionId}`);
-        logger.log(`[XIAOYI_COLLECTION_TOOL]   - taskId: ${sessionContext.taskId}`);
-        logger.log(`[XIAOYI_COLLECTION_TOOL]   - messageId: ${sessionContext.messageId}`);
         const { config, sessionId, taskId, messageId } = sessionContext;
         // Get WebSocket manager
-        logger.log(`[XIAOYI_COLLECTION_TOOL] 🔌 Getting WebSocket manager...`);
         const wsManager = getXYWebSocketManager(config);
-        logger.log(`[XIAOYI_COLLECTION_TOOL] ✅ WebSocket manager obtained`);
         // Build QueryCollection command
-        logger.log(`[XIAOYI_COLLECTION_TOOL] 📦 Building QueryCollection command...`);
         const command = {
             header: {
                 namespace: "Common",
@@ -79,96 +64,35 @@ export const xiaoyiCollectionTool = {
             },
         };
         // Send command and wait for response (60 second timeout)
-        logger.log(`[XIAOYI_COLLECTION_TOOL] ⏳ Setting up promise to wait for collection query response...`);
-        logger.log(`[XIAOYI_COLLECTION_TOOL]   - Timeout: 60 seconds`);
         return new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
-                logger.error(`[XIAOYI_COLLECTION_TOOL] ⏰ Timeout: No response received within 60 seconds`);
                 wsManager.off("data-event", handler);
                 reject(new Error("查询小艺收藏超时（60秒）"));
             }, 60000);
             // Listen for data events from WebSocket
             const handler = (event) => {
-                logger.log(`[XIAOYI_COLLECTION_TOOL] 📨 Received data event:`, JSON.stringify(event));
                 if (event.intentName === "QueryCollection") {
-                    logger.log(`[XIAOYI_COLLECTION_TOOL] 🎯 QueryCollection event received`);
-                    logger.log(`[XIAOYI_COLLECTION_TOOL]   - status: ${event.status}`);
                     clearTimeout(timeout);
                     wsManager.off("data-event", handler);
                     if (event.status === "success" && event.outputs) {
-                        logger.log(`[XIAOYI_COLLECTION_TOOL] ✅ Collection query completed successfully`);
-                        logger.log(`[XIAOYI_COLLECTION_TOOL]   - outputs:`, JSON.stringify(event.outputs));
-                        // Check for error code first
-                        if (event.outputs.code && event.outputs.code !== 0) {
-                            logger.error(`[XIAOYI_COLLECTION_TOOL] ❌ Query failed with error code: ${event.outputs.code}`);
-                            reject(new Error(`查询小艺收藏失败 (错误码: ${event.outputs.code})`));
-                            return;
-                        }
-                        // Get the result from outputs
-                        const result = event.outputs.result;
-                        // Check if result exists
-                        if (!result) {
-                            logger.warn(`[XIAOYI_COLLECTION_TOOL] ⚠️ No collection data found`);
-                            resolve({
-                                content: [
-                                    {
-                                        type: "text",
-                                        text: JSON.stringify({
-                                            success: true,
-                                            memoryInfo: [],
-                                            message: "未找到收藏数据"
-                                        }),
-                                    },
-                                ],
-                            });
-                            return;
-                        }
-                        // Extract memoryInfo from the nested result structure
-                        const memoryInfo = result.result?.memoryInfo || [];
-                        logger.log(`[XIAOYI_COLLECTION_TOOL] 📊 Collections found: ${memoryInfo.length} items`);
-                        // Process and simplify the collection data
-                        const simplifiedCollections = memoryInfo.map((item) => ({
-                            uuid: item.uuid,
-                            type: item.type,
-                            status: item.status,
-                            collectionTime: item.collectionTime,
-                            editTime: item.editTime,
-                            title: item.linkTitle || item.aiTitle || item.textTitle || item.imageTitle || item.podcastTitle || "",
-                            description: item.description || item.abstract || "",
-                            content: item.textContent || "",
-                            linkUrl: item.linkUrl,
-                            linkType: item.linkType,
-                            appName: item.appNameFromPab || item.appName || "",
-                            labels: item.label || [],
-                            collectionMethod: item.collectionMethod,
-                        }));
-                        // Return the result with valid string content
+                        // 成功，直接返回完整的 event.outputs JSON 字符串
                         resolve({
                             content: [
                                 {
                                     type: "text",
-                                    text: JSON.stringify({
-                                        success: true,
-                                        totalResults: simplifiedCollections.length,
-                                        collections: simplifiedCollections,
-                                        message: result.message,
-                                    }),
-                                },
-                            ],
+                                    text: JSON.stringify(event.outputs),
+                                }
+                            ]
                         });
                     }
                     else {
-                        logger.error(`[XIAOYI_COLLECTION_TOOL] ❌ Collection query failed`);
-                        logger.error(`[XIAOYI_COLLECTION_TOOL]   - status: ${event.status}`);
                         reject(new Error(`查询小艺收藏失败: ${event.status}`));
                     }
                 }
             };
             // Register event handler
-            logger.log(`[XIAOYI_COLLECTION_TOOL] 📡 Registering data-event handler on WebSocket manager`);
             wsManager.on("data-event", handler);
             // Send the command
-            logger.log(`[XIAOYI_COLLECTION_TOOL] 📤 Sending QueryCollection command...`);
             sendCommand({
                 config,
                 sessionId,
@@ -177,10 +101,8 @@ export const xiaoyiCollectionTool = {
                 command,
             })
                 .then(() => {
-                logger.log(`[XIAOYI_COLLECTION_TOOL] ✅ Command sent successfully, waiting for response...`);
             })
                 .catch((error) => {
-                logger.error(`[XIAOYI_COLLECTION_TOOL] ❌ Failed to send command:`, error);
                 clearTimeout(timeout);
                 wsManager.off("data-event", handler);
                 reject(error);

package/dist/src/tools/xiaoyi-gui-tool.js

@@ -2,7 +2,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentSessionContext } from "./session-manager.js";
-import { logger } from "../utils/logger.js";
 /**
  * XiaoYi GUI tool - executes phone app interactions through GUI agent.
  * Simulates user interactions on phone screen (click, swipe, input, navigation, etc.)
@@ -38,35 +37,19 @@ export const xiaoyiGuiTool = {
         required: ["query"],
     },
     async execute(toolCallId, params) {
-        logger.log(`[XIAOYI_GUI_TOOL] 🚀 Starting execution`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - toolCallId: ${toolCallId}`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - query: ${params.query}`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - timestamp: ${new Date().toISOString()}`);
         // Validate parameters
         if (!params.query || typeof params.query !== "string") {
-            logger.error(`[XIAOYI_GUI_TOOL] ❌ FAILED: Invalid query parameter`);
             throw new Error("Missing or invalid required parameter: query must be a non-empty string");
         }
         // Get session context
-        logger.log(`[XIAOYI_GUI_TOOL] 🔍 Attempting to get session context...`);
         const sessionContext = getCurrentSessionContext();
         if (!sessionContext) {
-            logger.error(`[XIAOYI_GUI_TOOL] ❌ FAILED: No active session found!`);
-            logger.error(`[XIAOYI_GUI_TOOL]   - toolCallId: ${toolCallId}`);
             throw new Error("No active XY session found. XiaoYi GUI tool can only be used during an active conversation.");
         }
-        logger.log(`[XIAOYI_GUI_TOOL] ✅ Session context found`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - sessionId: ${sessionContext.sessionId}`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - taskId (interactionId): ${sessionContext.taskId}`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - messageId: ${sessionContext.messageId}`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - agentId: ${sessionContext.agentId}`);
         const { config, sessionId, taskId, messageId } = sessionContext;
         // Get WebSocket manager
-        logger.log(`[XIAOYI_GUI_TOOL] 🔌 Getting WebSocket manager...`);
         const wsManager = getXYWebSocketManager(config);
-        logger.log(`[XIAOYI_GUI_TOOL] ✅ WebSocket manager obtained`);
         // Build InvokeJarvisGUIAgentRequest command
-        logger.log(`[XIAOYI_GUI_TOOL] 📦 Building InvokeJarvisGUIAgentRequest command...`);
         const command = {
             header: {
                 namespace: "ClawAgent",
@@ -78,32 +61,23 @@ export const xiaoyiGuiTool = {
                 interactionId: taskId, // taskId corresponds to interactionId
             },
         };
-        logger.log(`[XIAOYI_GUI_TOOL] 📋 Command details:`, JSON.stringify(command, null, 2));
         // Send command and wait for response (5 minute timeout)
-        logger.log(`[XIAOYI_GUI_TOOL] ⏳ Setting up promise to wait for GUI agent response...`);
-        logger.log(`[XIAOYI_GUI_TOOL]   - Timeout: 300 seconds (5 minutes)`);
         return new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
-                logger.error(`[XIAOYI_GUI_TOOL] ⏰ Timeout: No response received within 300 seconds (5 minutes)`);
                 wsManager.off("gui-agent-response", handler);
                 reject(new Error("XiaoYi GUI Agent 操作超时（5分钟）"));
             }, 180000); // 5 minutes timeout
             // Listen for GUI agent response events
             const handler = (event) => {
-                logger.log(`[XIAOYI_GUI_TOOL] 📨 Received event:`, JSON.stringify(event));
                 // Check if this is the InvokeJarvisGUIAgentResponse we're waiting for
                 if (event.header?.namespace === "ClawAgent" &&
                     event.header?.name === "InvokeJarvisGUIAgentResponse") {
-                    logger.log(`[XIAOYI_GUI_TOOL] 🎯 InvokeJarvisGUIAgentResponse event received`);
-                    logger.log(`[XIAOYI_GUI_TOOL]   - isFinal: ${event.payload?.isFinal}`);
                     // According to the spec, we only get one response (isFinal: true)
                     if (event.payload?.isFinal === true) {
                         clearTimeout(timeout);
                         wsManager.off("gui-agent-response", handler);
                         const streamContent = event.payload?.streamInfo?.streamContent;
                         if (streamContent) {
-                            logger.log(`[XIAOYI_GUI_TOOL] ✅ GUI Agent operation completed successfully`);
-                            logger.log(`[XIAOYI_GUI_TOOL]   - streamContent: ${streamContent}`);
                             resolve({
                                 content: [
                                     {
@@ -114,23 +88,18 @@ export const xiaoyiGuiTool = {
                             });
                         }
                         else {
-                            logger.error(`[XIAOYI_GUI_TOOL] ❌ Response missing streamContent`);
-                            logger.error(`[XIAOYI_GUI_TOOL]   - payload:`, JSON.stringify(event.payload));
                             reject(new Error("XiaoYi GUI Agent 响应格式错误：缺少 streamContent"));
                         }
                     }
                     else if (event.payload?.isFinal === false) {
                         // According to spec, we shouldn't get intermediate responses, but log if we do
-                        logger.log(`[XIAOYI_GUI_TOOL] 📝 Intermediate response received (isFinal: false), waiting for final...`);
                     }
                 }
             };
             // Register event handler
             // Note: The WebSocket manager needs to emit 'gui-agent-response' when receiving this type of response
-            logger.log(`[XIAOYI_GUI_TOOL] 📡 Registering gui-agent-response handler on WebSocket manager`);
             wsManager.on("gui-agent-response", handler);
             // Send the command
-            logger.log(`[XIAOYI_GUI_TOOL] 📤 Sending InvokeJarvisGUIAgentRequest command...`);
             sendCommand({
                 config,
                 sessionId,
@@ -138,10 +107,7 @@ export const xiaoyiGuiTool = {
                 messageId,
                 command,
             }).then(() => {
-                logger.log(`[XIAOYI_GUI_TOOL] ✅ Command sent successfully, waiting for response...`);
-                logger.log(`[XIAOYI_GUI_TOOL]   - This may take up to 5 minutes depending on the task complexity`);
             }).catch((error) => {
-                logger.error(`[XIAOYI_GUI_TOOL] ❌ Failed to send command:`, error);
                 clearTimeout(timeout);
                 wsManager.off("gui-agent-response", handler);
                 reject(error);

package/dist/src/websocket.js

@@ -323,24 +323,40 @@ export class XYWebSocketManager extends EventEmitter {
             const messageStr = data.toString();
             console.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} bytes`);
             const parsed = JSON.parse(messageStr);
-            console.log("[WS-RECV] Parsed message:", JSON.stringify(parsed, null, 2));
+            // 提取并打印消息内容（只显示 text，data 只打印提示）
+            const parts = parsed.params?.message?.parts;
+            if (parts && Array.isArray(parts) && parts.length > 0) {
+                const textParts = parts.filter((p) => p?.kind === "text");
+                const dataParts = parts.filter((p) => p?.kind === "data");
+                // 打印 text 内容
+                if (textParts.length > 0) {
+                    const textContents = textParts
+                        .map((p) => p?.text || "")
+                        .filter((text) => text.length > 0)
+                        .join(" ");
+                    if (textContents.length > 0) {
+                        console.log("[WS-RECV] Text:", textContents);
+                    }
+                }
+                // 打印 data 提示
+                if (dataParts.length > 0) {
+                    console.log("[WS-RECV] Data: received data message(s)");
+                }
+            }
             // Check if message is in direct A2A JSON-RPC format (server push)
             if (parsed.jsonrpc === "2.0") {
                 const a2aRequest = parsed;
-                console.log(`[XY] Message type: Direct A2A JSON-RPC, method: ${a2aRequest.method}`);
                 // Extract sessionId from params
                 const sessionId = a2aRequest.params?.sessionId;
                 if (!sessionId) {
                     console.error("[XY] Message missing sessionId");
                     return;
                 }
-                console.log(`[XY] Session ID: ${sessionId}`);
                 // Check if message contains only data parts (tool results)
                 const dataParts = a2aRequest.params?.message?.parts?.filter((p) => p.kind === "data");
                 const hasOnlyDataParts = dataParts && dataParts.length > 0 &&
                     dataParts.length === a2aRequest.params?.message?.parts?.length;
                 if (hasOnlyDataParts) {
-                    console.log("[XY] Message contains only data parts, processing as tool result");
                     for (const dataPart of dataParts) {
                         const events = dataPart.data?.events;
                         if (!Array.isArray(events)) {
@@ -355,11 +371,11 @@ export class XYWebSocketManager extends EventEmitter {
                                     outputs: item.payload.outputs || {},
                                     status: "success",
                                 };
-                                console.log("[XY] Emitting data-event:", dataEvent);
+                                console.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
                                 this.emit("data-event", dataEvent);
                             }
                             else if (item.header?.namespace === "ClawAgent" && item.header?.name === "InvokeJarvisGUIAgentResponse") {
-                                console.log("[XY] Emitting gui-agent-response:", item);
+                                console.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
                                 this.emit("gui-agent-response", item);
                             }
                             else if (item.header?.namespace === "Common" && item.header?.name === "Trigger") {
@@ -410,11 +426,11 @@ export class XYWebSocketManager extends EventEmitter {
                                         outputs: item.payload.outputs || {},
                                         status: "success",
                                     };
-                                    console.log("[XY] Emitting data-event:", dataEvent);
+                                    console.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
                                     this.emit("data-event", dataEvent);
                                 }
                                 else if (item.header?.namespace === "ClawAgent" && item.header?.name === "InvokeJarvisGUIAgentResponse") {
-                                    console.log("[XY] Emitting gui-agent-response:", item);
+                                    console.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
                                     this.emit("gui-agent-response", item);
                                 }
                                 else if (item.header?.namespace === "Common" && item.header?.name === "Trigger") {

package/package.json

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