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

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/package.json

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