openclaw-xiaoyou 1.4.4 → 1.4.6

package/package.json

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

package/src/channel.ts

@@ -1,17 +1,17 @@
 /**
  * xiaoyou ChannelPlugin 实现
  *
- * 运行在 OpenClaw Gateway 进程内，通过 gateway adapter 管理
- * 与企业服务的 WebSocket 连接生命周期。
+ * 运行�?OpenClaw Gateway 进程内，通过 gateway adapter 管理
+ * 与企业服务的 WebSocket 连接生命周期�?
  */
 
 import type { ResolvedAccount } from "./types.js";
 import { createEnterpriseClient, type EnterpriseClient } from "./enterprise-client.js";
 
-// ─── 运行时状态 ──────────────────────────────────────
+// ─── 运行时状�?──────────────────────────────────────
 
 let _client: EnterpriseClient | null = null;
-/** 记录最后一个活跃的 conversationId，用于 cron delivery 兜底 */
+/** 记录最后一个活跃的 conversationId，用�?cron delivery 兜底 */
 let _lastConversationId: string | null = null;
 
 let _runtime: any = null;
@@ -102,8 +102,8 @@ export const xiayouPlugin = {
     startAccount: async (ctx: any) => {
       const { account, cfg, log } = ctx;
 
-      // 使用 register 时注入的 runtime（有 channel.reply 等完整 API）
-      // 注意：ctx.runtime 只有 log/error/exit，不能用它覆盖
+      // 使用 register 时注入的 runtime（有 channel.reply 等完�?API�?
+      // 注意：ctx.runtime 只有 log/error/exit，不能用它覆�?
       const section = account?.config || getChannelConfig(cfg);
       const logger = log || console;
 
@@ -139,7 +139,9 @@ export const xiayouPlugin = {
           const senderName = msg.senderName ?? msg.senderId;
           const conversationId = msg.conversationId;
           const inboundMessageId = msg.messageId;
+          const inboundSn = msg.sn || msg.messageId;
           const text = msg.text ?? "";
+          const metadata = msg.metadata ?? undefined;
 
           // 记录最后活跃的 conversationId，供 cron delivery 兜底使用
           _lastConversationId = conversationId;
@@ -153,7 +155,7 @@ export const xiayouPlugin = {
             peer: { kind: "direct", id: senderId },
           });
 
-          // 2. 格式化入站消息
+          // 2. 格式化入站消�?
           const fromLabel = `${senderName} (${senderId})`;
           const envelopeOptions = rt.channel.reply.resolveEnvelopeFormatOptions(cfg);
           const body = rt.channel.reply.formatInboundEnvelope({
@@ -166,7 +168,7 @@ export const xiayouPlugin = {
             envelope: envelopeOptions,
           });
 
-          // 3. 构建上下文
+          // 3. 构建上下�?
           const inboundCtx = rt.channel.reply.finalizeInboundContext({
             Body: body,
             RawBody: text,
@@ -185,10 +187,10 @@ export const xiayouPlugin = {
             Timestamp: Date.now(),
           });
 
-          // 4. 分发并获取回复（流式 — 按标点拆分）
+          // 4. 分发并获取回复（流式 �?按标点拆分）
           //
-          // Gateway 的 block streaming 会多次调用 deliver，每次一个 block。
-          // 我们在 deliver 内部进一步按标点/换行拆分，实现更细粒度的流式推送。
+          // Gateway �?block streaming 会多次调�?deliver，每次一�?block�?
+          // 我们�?deliver 内部进一步按标点/换行拆分，实现更细粒度的流式推送�?
           //
           const replyMessageId = `xiaoyou-${Date.now()}`;
           let chunkSeq = 1;
@@ -211,9 +213,10 @@ export const xiayouPlugin = {
                     type: "reply",
                     conversationId,
                     messageId: replyMessageId,
-                    replyToMessageId: inboundMessageId,
+                    sn: inboundSn,
                     senderId,
                     text: textToSend,
+                    ...(metadata ? { metadata } : {}),
                     streamStatus: "chunk",
                     seq: chunkSeq++,
                     timestamp: Date.now(),
@@ -228,9 +231,10 @@ export const xiayouPlugin = {
                     type: "reply",
                     conversationId,
                     messageId: replyMessageId,
-                    replyToMessageId: inboundMessageId,
+                    sn: inboundSn,
                     senderId,
                     text: fullText,
+                    ...(metadata ? { metadata } : {}),
                     streamStatus: "end",
                     timestamp: Date.now(),
                   });
@@ -246,9 +250,10 @@ export const xiayouPlugin = {
               type: "reply",
               conversationId,
               messageId: replyMessageId,
-              replyToMessageId: inboundMessageId,
+              sn: inboundSn,
               senderId,
               text: fullText,
+              ...(metadata ? { metadata } : {}),
               streamStatus: "end",
               timestamp: Date.now(),
             });
@@ -263,7 +268,7 @@ export const xiayouPlugin = {
       _client = client;
       logger.info("[xiaoyou] gateway started");
 
-      // 保持 startAccount 挂起，直到 abortSignal 触发
+      // 保持 startAccount 挂起，直�?abortSignal 触发
       return new Promise<void>((resolve) => {
         if (ctx.abortSignal) {
           ctx.abortSignal.addEventListener("abort", () => {
@@ -283,7 +288,7 @@ export const xiayouPlugin = {
 
   // ── Target 解析（让 Gateway delivery 系统识别 xiaoyou target）──
   normalizeTarget: (target: string) => {
-    // 如果 target 为空，返回默认值 "schedule"，避免 Gateway 报 "requires target"
+    // 如果 target 为空，返回默认�?"schedule"，避�?Gateway �?"requires target"
     const normalized = (target || "schedule").replace(/^xiaoyou:/i, "");
     return { ok: true, to: normalized || "schedule" };
   },
@@ -297,7 +302,7 @@ export const xiayouPlugin = {
     hint: "conversationId (e.g. conv-125)",
   },
 
-  // ── Outbound 出站（符合 ChannelPluginOutbound 接口）──────
+  // ── Outbound 出站（符�?ChannelPluginOutbound 接口）──────
   outbound: {
     deliveryMode: "direct" as const,
     textChunkLimit: 2000,
@@ -315,9 +320,8 @@ export const xiayouPlugin = {
         type: "reply" as const,
         conversationId: targetTo,
         messageId: `xiaoyou-${Date.now()}`,
-        replyToMessageId: replyToId,
+        sn: replyToId,
         senderId: to,
-        ...(replyToId ? {} : { source: "scheduled_task" as const }),
         text: text,
         timestamp: Date.now(),
       };
@@ -338,9 +342,8 @@ export const xiayouPlugin = {
         type: "reply" as const,
         conversationId: targetTo,
         messageId: `xiaoyou-${Date.now()}`,
-        replyToMessageId: replyToId,
+        sn: replyToId,
         senderId: to,
-        ...(replyToId ? {} : { source: "scheduled_task" as const }),
         text: text ?? "",
         mediaUrls: mediaUrl ? [mediaUrl] : [],
         timestamp: Date.now(),
@@ -352,7 +355,7 @@ export const xiayouPlugin = {
     },
   },
 
-  // ── Status 状态检查 ────────────────────────────────
+  // ── Status 状态检�?────────────────────────────────
   status: {
     describe: async ({ account }: any) => {
       const issues: Array<{ severity: string; message: string }> = [];

package/src/types.ts

@@ -32,6 +32,9 @@ export type InboundMessage = {
   conversationId: string;
   senderId: string;
   senderName?: string;
+  /** 流水号，用于请求-回复关联 */
+  sn?: string;
+  /** @deprecated 使用 sn 代替 */
   messageId?: string;
   text?: string;
   attachments?: Attachment[];
@@ -59,12 +62,17 @@ export type OutboundReply = {
   type: "reply";
   conversationId: string;
   messageId: string;
+  /** 流水号，关联入站消息的 sn */
+  sn?: string;
+  /** @deprecated 使用 sn 代替 */
   replyToMessageId?: string;
   senderId?: string;
   text: string;
   mediaUrls?: string[];
   agentId?: string;
   timestamp: number;
+  /** 业务元数据，透传企业服务端发来的自定义字段 */
+  metadata?: Record<string, unknown>;
   /** 消息来源标识：scheduled_task=定时任务推送，不传=正常对话回复 */
   source?: "scheduled_task";
   /** 流式标记：chunk=增量片段, end=流结束, 不传=一次性完整回复 */