openclaw-xiaoyou 1.3.9 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-xiaoyou",
-  "version": "1.3.9",
+  "version": "1.4.1",
   "type": "module",
   "description": "Xiaoyou channel plugin for OpenClaw — connects enterprise services via persistent outbound WebSocket",
   "openclaw": {

package/src/channel.ts

@@ -11,6 +11,8 @@ import { createEnterpriseClient, type EnterpriseClient } from "./enterprise-clie
 // ─── 运行时状态 ──────────────────────────────────────
 
 let _client: EnterpriseClient | null = null;
+/** 记录最后一个活跃的 conversationId，用于 cron delivery 兜底 */
+let _lastConversationId: string | null = null;
 
 let _runtime: any = null;
 export function setRuntime(rt: any) { _runtime = rt; }
@@ -138,6 +140,9 @@ export const xiayouPlugin = {
           const conversationId = msg.conversationId;
           const inboundMessageId = msg.messageId;
           const text = msg.text ?? "";
+
+          // 记录最后活跃的 conversationId，供 cron delivery 兜底使用
+          _lastConversationId = conversationId;
           const accountId = account?.accountId || "default";
 
           // 1. 路由
@@ -155,7 +160,7 @@ export const xiayouPlugin = {
             channel: "Xiaoyou",
             from: fromLabel,
             timestamp: Date.now(),
-            body: text,
+            body: `[系统信息] 当前 conversationId: ${conversationId} | 当前 senderId: ${senderId}\n\n${text}`,
             chatType: "direct",
             sender: { name: senderName, id: senderId },
             envelope: envelopeOptions,
@@ -207,6 +212,7 @@ export const xiayouPlugin = {
                     conversationId,
                     messageId: replyMessageId,
                     replyToMessageId: inboundMessageId,
+                    senderId,
                     text: textToSend,
                     streamStatus: "chunk",
                     seq: chunkSeq++,
@@ -223,6 +229,7 @@ export const xiayouPlugin = {
                     conversationId,
                     messageId: replyMessageId,
                     replyToMessageId: inboundMessageId,
+                    senderId,
                     text: fullText,
                     streamStatus: "end",
                     timestamp: Date.now(),
@@ -240,6 +247,7 @@ export const xiayouPlugin = {
               conversationId,
               messageId: replyMessageId,
               replyToMessageId: inboundMessageId,
+              senderId,
               text: fullText,
               streamStatus: "end",
               timestamp: Date.now(),
@@ -273,6 +281,22 @@ export const xiayouPlugin = {
     },
   },
 
+  // ── Target 解析（让 Gateway delivery 系统识别 xiaoyou target）──
+  normalizeTarget: (target: string) => {
+    // 去掉可能的 xiaoyou: 前缀
+    const normalized = target.replace(/^xiaoyou:/i, "");
+    return { ok: true, to: normalized };
+  },
+
+  targetResolver: {
+    looksLikeId: (id: string): boolean => {
+      // 支持 conv-xxx 格式和任意非空字符串
+      const normalized = id.replace(/^xiaoyou:/i, "");
+      return normalized.length > 0;
+    },
+    hint: "conversationId (e.g. conv-125)",
+  },
+
   // ── Outbound 出站（符合 ChannelPluginOutbound 接口）──────
   outbound: {
     deliveryMode: "direct" as const,
@@ -283,17 +307,22 @@ export const xiayouPlugin = {
         return { channel: "xiaoyou", error: new Error("xiaoyou: not connected") };
       }
 
+      // 如果 to 为空，使用最后活跃的 conversationId 兜底
+      const targetTo = to || _lastConversationId || "cron-delivery";
+
       const reply = {
         type: "reply" as const,
-        conversationId: to || "cron-delivery",
+        conversationId: targetTo,
         messageId: `xiaoyou-${Date.now()}`,
         replyToMessageId: replyToId,
+        senderId: to,
+        source: "scheduled_task" as const,
         text: text,
         timestamp: Date.now(),
       };
 
       _client.sendReply(reply);
-      console.log(`[xiaoyou][outbound] sendText to=${to}, text=${text?.substring(0, 50)}`);
+      console.log(`[xiaoyou][outbound] sendText to=${targetTo}, text=${text?.substring(0, 50)}`);
       return { channel: "xiaoyou", messageId: reply.messageId };
     },
 
@@ -302,18 +331,22 @@ export const xiayouPlugin = {
         return { channel: "xiaoyou", error: new Error("xiaoyou: not connected") };
       }
 
+      const targetTo = to || _lastConversationId || "cron-delivery";
+
       const reply = {
         type: "reply" as const,
-        conversationId: to || "cron-delivery",
+        conversationId: targetTo,
         messageId: `xiaoyou-${Date.now()}`,
         replyToMessageId: replyToId,
+        senderId: to,
+        source: "scheduled_task" as const,
         text: text ?? "",
         mediaUrls: mediaUrl ? [mediaUrl] : [],
         timestamp: Date.now(),
       };
 
       _client.sendReply(reply);
-      console.log(`[xiaoyou][outbound] sendMedia to=${to}`);
+      console.log(`[xiaoyou][outbound] sendMedia to=${targetTo}`);
       return { channel: "xiaoyou", messageId: reply.messageId };
     },
   },

package/src/types.ts

@@ -60,10 +60,13 @@ export type OutboundReply = {
   conversationId: string;
   messageId: string;
   replyToMessageId?: string;
+  senderId?: string;
   text: string;
   mediaUrls?: string[];
   agentId?: string;
   timestamp: number;
+  /** 消息来源标识：scheduled_task=定时任务推送，不传=正常对话回复 */
+  source?: "scheduled_task";
   /** 流式标记：chunk=增量片段, end=流结束, 不传=一次性完整回复 */
   streamStatus?: StreamStatus;
   /** 流式片段序号（仅 streamStatus="chunk" 时有值，从 0 开始） */