@ynhcj/xiaoyi-channel 0.0.43-beta → 0.0.45-beta

package/dist/src/channel.js

@@ -14,6 +14,7 @@ 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";
@@ -62,7 +63,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, sendFileToUserTool, xiaoyiCollectionTool, viewPushResultTool],
+    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, xiaoyiCollectionTool, viewPushResultTool],
     messaging: {
         normalizeTarget: (raw) => {
             const trimmed = raw.trim();

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.

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/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/reply-dispatcher.js

@@ -289,7 +289,6 @@ export function createXYReplyDispatcher(params) {
                 const currentTaskId = getActiveTaskId();
                 const currentMessageId = getActiveMessageId();
                 const text = payload.text ?? "";
-                log(`[PARTIAL REPLY] Partial reply chunk received, taskId: ${currentTaskId}`);
                 try {
                     if (text.length > 0) {
                         await sendReasoningTextUpdate({
@@ -300,7 +299,6 @@ export function createXYReplyDispatcher(params) {
                             text,
                             append: false,
                         });
-                        log(`[PARTIAL REPLY] ✅ Sent partial reply as reasoningText update`);
                     }
                 }
                 catch (err) {

package/dist/src/tools/create-alarm-tool.js

@@ -312,28 +312,12 @@ b. 使用该工具之前需获取当前真实时间`,
                             reject(new Error(`创建闹钟失败: ${errorMsg} (错误代码: ${code})`));
                             return;
                         }
-                        // Extract result with safe navigation
-                        const result = event.outputs.result || {};
-                        logger.log(`[CREATE_ALARM_TOOL] 📋 Alarm result:`, JSON.stringify(result));
+                        // 成功，直接返回完整的 event.outputs JSON 字符串
                         resolve({
                             content: [
                                 {
                                     type: "text",
-                                    text: JSON.stringify({
-                                        success: true,
-                                        alarm: {
-                                            entityId: result.entityId,
-                                            entityName: result.entityName,
-                                            alarmTitle: result.alarmTitle,
-                                            alarmTime: result.alarmTime,
-                                            alarmState: result.alarmState,
-                                            alarmRingDuration: result.alarmRingDuration,
-                                            alarmSnoozeDuration: result.alarmSnoozeDuration,
-                                            alarmSnoozeTotal: result.alarmSnoozeTotal,
-                                            daysOfWakeType: result.daysOfWakeType,
-                                        },
-                                        code,
-                                    }),
+                                    text: JSON.stringify(event.outputs),
                                 },
                             ],
                         });

package/dist/src/tools/delete-alarm-tool.js

@@ -182,24 +182,13 @@ export const deleteAlarmTool = {
                             reject(new Error(`删除闹钟失败: ${errorMsg} (错误代码: ${code})`));
                             return;
                         }
-                        // Extract result with safe navigation
-                        const result = event.outputs.result || {};
-                        logger.log(`[DELETE_ALARM_TOOL] 📋 Deletion result:`, JSON.stringify(result));
-                        // Build response with safe navigation
-                        const response = {
-                            success: true,
-                            entityName: result.entityName || "Alarm",
-                            message: result.message || "Alarm deleted successfully",
-                            deletedCount: items.length,
-                        };
-                        // Add entityIds from request for reference
-                        response.deletedIds = items.map(item => item.entityId);
+                        // 成功，直接返回完整的 event.outputs JSON 字符串
                         logger.log(`[DELETE_ALARM_TOOL] 🎉 Successfully deleted ${items.length} alarm(s)`);
                         resolve({
                             content: [
                                 {
                                     type: "text",
-                                    text: JSON.stringify(response),
+                                    text: JSON.stringify(event.outputs),
                                 },
                             ],
                         });

package/dist/src/tools/location-tool.js

@@ -55,7 +55,9 @@ export const locationTool = {
                     dimension: "",
                     executeMode: "background",
                     intentName: "GetCurrentLocation",
-                    intentParam: {},
+                    intentParam: {
+                        isNeedGeoAddress: true,
+                    },
                     needUnlock: true,
                     permissionId: [],
                     timeOut: 5,
@@ -87,19 +89,14 @@ export const locationTool = {
                     clearTimeout(timeout);
                     wsManager.off("data-event", handler);
                     if (event.status === "success" && event.outputs) {
-                        const { latitude, longitude } = event.outputs;
                         logger.log(`[LOCATION_TOOL] ✅ Location retrieved successfully`);
-                        logger.log(`[LOCATION_TOOL]   - latitude: ${latitude}`);
-                        logger.log(`[LOCATION_TOOL]   - longitude: ${longitude}`);
+                        logger.log(`[LOCATION_TOOL]   - outputs:`, JSON.stringify(event.outputs));
+                        // 成功，直接返回完整的 event.outputs JSON 字符串
                         resolve({
                             content: [
                                 {
                                     type: "text",
-                                    text: JSON.stringify({
-                                        latitude,
-                                        longitude,
-                                        coordinateSystem: "WGS84",
-                                    })
+                                    text: JSON.stringify(event.outputs),
                                 }
                             ]
                         });

package/dist/src/tools/modify-alarm-tool.js

@@ -329,30 +329,12 @@ export const modifyAlarmTool = {
                             reject(new Error(`修改闹钟失败: ${errorMsg} (错误代码: ${code})`));
                             return;
                         }
-                        // Extract result with safe navigation
-                        const result = event.outputs.result || {};
-                        logger.log(`[MODIFY_ALARM_TOOL] 📋 Alarm result:`, JSON.stringify(result));
-                        // Build response with safe navigation
-                        const response = {
-                            success: true,
-                            alarm: {
-                                entityId: result.entityId || params.entityId,
-                                entityType: result.entityType || result.entityName,
-                                alarmTitle: result.alarmTitle,
-                                alarmTime: result.alarmTime,
-                                alarmState: result.alarmState,
-                                alarmRingDuration: result.alarmRingDuration,
-                                alarmSnoozeDuration: result.alarmSnoozeDuration,
-                                alarmSnoozeTotal: result.alarmSnoozeTotal,
-                                daysOfWakeType: result.daysOfWakeType,
-                            },
-                            code,
-                        };
+                        // 成功，直接返回完整的 event.outputs JSON 字符串
                         resolve({
                             content: [
                                 {
                                     type: "text",
-                                    text: JSON.stringify(response),
+                                    text: JSON.stringify(event.outputs),
                                 },
                             ],
                         });

package/dist/src/tools/modify-note-tool.js

@@ -115,17 +115,12 @@ export const modifyNoteTool = {
                     if (event.status === "success" && event.outputs) {
                         logger.log(`[MODIFY_NOTE_TOOL] ✅ Note modified successfully`);
                         logger.log(`[MODIFY_NOTE_TOOL]   - outputs:`, JSON.stringify(event.outputs));
-                        // Return the result directly as requested
-                        const result = event.outputs.result;
-                        logger.log(`[MODIFY_NOTE_TOOL] 📝 Note updated:`);
-                        logger.log(`[MODIFY_NOTE_TOOL]   - entityId: ${result?.entityId}`);
-                        logger.log(`[MODIFY_NOTE_TOOL]   - title: ${result?.title}`);
-                        logger.log(`[MODIFY_NOTE_TOOL]   - modifiedDate: ${result?.modifiedDate}`);
+                        // 成功，直接返回完整的 event.outputs JSON 字符串
                         resolve({
                             content: [
                                 {
                                     type: "text",
-                                    text: JSON.stringify(result),
+                                    text: JSON.stringify(event.outputs),
                                 },
                             ],
                         });

package/dist/src/tools/note-tool.js

@@ -106,23 +106,13 @@ export const noteTool = {
                     clearTimeout(timeout);
                     wsManager.off("data-event", handler);
                     if (event.status === "success" && event.outputs) {
-                        const { result, code } = event.outputs;
-                        logger.log(`Note created: title=${result?.title}, id=${result?.entityId}`);
+                        logger.log(`Note created successfully, outputs:`, JSON.stringify(event.outputs));
+                        // 成功，直接返回完整的 event.outputs JSON 字符串
                         resolve({
                             content: [
                                 {
                                     type: "text",
-                                    text: JSON.stringify({
-                                        success: true,
-                                        note: {
-                                            entityId: result?.entityId,
-                                            title: result?.title,
-                                            content: result?.content,
-                                            entityName: result?.entityName,
-                                            modifiedDate: result?.modifiedDate,
-                                        },
-                                        code,
-                                    }),
+                                    text: JSON.stringify(event.outputs),
                                 },
                             ],
                         });

package/dist/src/tools/search-photo-gallery-tool.js

@@ -14,7 +14,7 @@ export const searchPhotoGalleryTool = {
     label: "Search Photo Gallery",
     description: `插件功能描述：搜索用户手机图库中的照片
 
-  工具使用约束：如果用户说从手机图库中或者从相册中查询xx图片时调用此工具。
+  工具使用约束：如果用户说从手机图库中或者从相册中查询xx图片时调用此工具,注意此工具仅支持从本地图库检索，不支持云空间相册检索。
 
   工具输入输出简介：
   a. 根据图像描述语料检索匹配的照片,返回照片在手机本地的 mediaUri以及thumbnailUri。

package/package.json

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