@ynhcj/xiaoyi-channel 0.0.154-beta → 0.0.155-beta

package/dist/src/cron-command.d.ts

@@ -7,10 +7,9 @@ export interface SendCommandViaPushParams {
  * Send a tool command through the push channel (for cron-triggered tool calls).
  *
  * Flow:
- *  1. Command JSON is persisted via savePushData → pushDataId
- *  2. Push notification is sent to all registered pushIds, referencing pushDataId
- *  3. Device receives push → retrieves command → executes it
- *  4. Device returns result via WebSocket (data-event / gui-agent-response / …)
- *  5. The calling tool listens on the WebSocket manager as usual
+ *  1. Push notification is sent with command embedded in data.directives
+ *  2. Device receives push → extracts directives → executes command
+ *  3. Device returns result via WebSocket (data-event / gui-agent-response / …)
+ *  4. The calling tool listens on the WebSocket manager as usual
  */
 export declare function sendCommandViaPush(params: SendCommandViaPushParams): Promise<void>;

package/dist/src/cron-command.js

@@ -5,60 +5,45 @@
 // independently of any session. The device processes the command and returns
 // results through the normal WebSocket connection, so response listening
 // works the same as for regular tool calls.
+import { randomUUID } from "crypto";
 import { XYPushService } from "./push.js";
-import { savePushData } from "./utils/pushdata-manager.js";
 import { getAllPushIds } from "./utils/pushid-manager.js";
 import { logger } from "./utils/logger.js";
 /**
  * Send a tool command through the push channel (for cron-triggered tool calls).
  *
  * Flow:
- *  1. Command JSON is persisted via savePushData → pushDataId
- *  2. Push notification is sent to all registered pushIds, referencing pushDataId
- *  3. Device receives push → retrieves command → executes it
- *  4. Device returns result via WebSocket (data-event / gui-agent-response / …)
- *  5. The calling tool listens on the WebSocket manager as usual
+ *  1. Push notification is sent with command embedded in data.directives
+ *  2. Device receives push → extracts directives → executes command
+ *  3. Device returns result via WebSocket (data-event / gui-agent-response / …)
+ *  4. The calling tool listens on the WebSocket manager as usual
  */
 export async function sendCommandViaPush(params) {
     const { config, command } = params;
-    const commandJson = JSON.stringify(command);
     const intentName = command.payload?.executeParam?.intentName ??
         command.header?.name ??
         "Command";
     logger.log(`[CRON-CMD] Sending command via push, intent=${intentName}`);
-    // 1. Persist command data
-    let pushDataId = "";
+    // 1. Load push IDs, use first one
+    let pushId = config.pushId;
     try {
-        pushDataId = await savePushData(commandJson);
-        logger.log(`[CRON-CMD] Command data saved, pushDataId=${pushDataId.substring(0, 20)}`);
+        const pushIdList = await getAllPushIds();
+        if (pushIdList.length > 0) {
+            pushId = pushIdList[0];
+        }
     }
     catch (error) {
-        logger.error("[CRON-CMD] Failed to save command data:", error);
+        logger.error("[CRON-CMD] Failed to load pushIds:", error);
     }
-    // 2. Load push IDs
-    let pushIdList = [];
+    // 2. Build and send push notification with command in directives
+    const pushService = new XYPushService(config);
+    const sessionId = randomUUID();
     try {
-        pushIdList = await getAllPushIds();
+        await pushService.sendPushWithDirectives(pushId, sessionId, [command]);
+        logger.log(`[CRON-CMD] Push sent successfully, intent=${intentName}`);
     }
     catch (error) {
-        logger.error("[CRON-CMD] Failed to load pushIds:", error);
-    }
-    if (pushIdList.length === 0) {
-        pushIdList = [config.pushId];
-    }
-    // 3. Broadcast push notification
-    const pushService = new XYPushService(config);
-    const title = `定时任务: ${intentName}`;
-    const pushText = commandJson.length > 1000 ? commandJson.slice(0, 1000) : commandJson;
-    let successCount = 0;
-    for (const pushId of pushIdList) {
-        try {
-            await pushService.sendPush(pushText, title, undefined, config.defaultSessionId || "", pushDataId, pushId);
-            successCount++;
-        }
-        catch (error) {
-            logger.error(`[CRON-CMD] Failed to send push to pushId=${pushId.substring(0, 20)}`, error);
-        }
+        logger.error(`[CRON-CMD] Failed to send push`, error);
+        throw error;
     }
-    logger.log(`[CRON-CMD] Push sent to ${successCount}/${pushIdList.length} pushId(s), intent=${intentName}`);
 }

package/dist/src/push.d.ts

@@ -23,6 +23,11 @@ export declare class XYPushService {
      * @param pushId - Push ID to use (required)
      */
     sendPush(content: string, title: string, data?: Record<string, any>, sessionId?: string, pushDataId?: string, pushId?: string): Promise<void>;
+    /**
+     * Send a push message with command directives embedded directly.
+     * Used for cron-triggered commands where pushText is empty and pushType=101.
+     */
+    sendPushWithDirectives(pushId: string, sessionId: string, directives: any[]): Promise<void>;
     /**
      * Send a push message with file attachments.
      */

package/dist/src/push.js

@@ -114,6 +114,84 @@ export class XYPushService {
             throw error;
         }
     }
+    /**
+     * Send a push message with command directives embedded directly.
+     * Used for cron-triggered commands where pushText is empty and pushType=101.
+     */
+    async sendPushWithDirectives(pushId, sessionId, directives) {
+        const pushUrl = this.config.pushUrl || this.DEFAULT_PUSH_URL;
+        const traceId = this.generateTraceId();
+        logger.log(`[PUSH] Preparing to send push with directives, pushId: ${pushId.substring(0, 20)}...`);
+        const requestBody = {
+            jsonrpc: "2.0",
+            id: randomUUID(),
+            result: {
+                id: randomUUID(),
+                apiId: this.config.apiId,
+                pushId,
+                pushText: "",
+                pushType: 101,
+                kind: "task",
+                sessionId,
+                artifacts: [
+                    {
+                        artifactId: randomUUID(),
+                        parts: [
+                            {
+                                kind: "data",
+                                data: { directives },
+                            },
+                        ],
+                    },
+                ],
+            },
+        };
+        try {
+            const response = await fetch(pushUrl, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "Accept": "application/json",
+                    "x-hag-trace-id": traceId,
+                    "x-uid": this.config.uid,
+                    "x-api-key": this.config.apiKey,
+                    "x-request-from": this.REQUEST_FROM,
+                },
+                body: JSON.stringify(requestBody),
+            });
+            logger.log(`[PUSH] Response received, HTTP Status: ${response.status} ${response.statusText}`);
+            if (!response.ok) {
+                const errorText = await response.text();
+                logger.error(`[PUSH] Push request failed, HTTP Status: ${response.status}`);
+                throw new Error(`Push failed: HTTP ${response.status} - ${errorText}`);
+            }
+            let result;
+            try {
+                const responseText = await response.text();
+                if (!responseText || responseText.trim() === '') {
+                    logger.error(`[PUSH] Received empty response body`);
+                    result = {};
+                }
+                else {
+                    result = JSON.parse(responseText);
+                }
+            }
+            catch (parseError) {
+                logger.error(`[PUSH] Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+                throw new Error(`Invalid JSON response from push service: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+            }
+            logger.log(`[PUSH] Push message sent successfully, Trace ID: ${traceId}`);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                logger.error(`[PUSH] Failed to send push message: ${error.name} - ${error.message}`);
+            }
+            else {
+                logger.error(`[PUSH] Failed to send push message:`, error);
+            }
+            throw error;
+        }
+    }
     /**
      * Send a push message with file attachments.
      */

package/package.json

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