openclaw-xiaoyou 1.3.0 → 1.3.2

package/package.json

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

package/src/channel.ts

@@ -180,18 +180,14 @@ export const xiayouPlugin = {
             Timestamp: Date.now(),
           });
 
-          // 4. 分发并获取回复（流式 — block 级）
+          // 4. 分发消息给 Agent
           //
-          // OpenClaw 2026.3.x 的 block streaming 机制：
-          // capabilities.blockStreaming = true 告诉 Gateway 按 block 逐个调用 deliver，
-          // 而非等全部生成完毕。每个 block（段落/代码块等）生成完成后立即 deliver。
-          // 我们将每次 deliver 作为一个 reply_chunk 推送给企业服务，
-          // dispatch promise resolve 后发送 reply_end 标记。
+          // Block streaming 机制说明：
+          // 当 blockStreaming=true 且 Gateway 配置了 blockStreamingDefault="on" 时，
+          // Gateway 会在 LLM 生成过程中通过 outbound.send 逐块推送消息，
+          // 不经过 deliver 回调。deliver 仅在非流式场景下被调用（作为 fallback）。
           //
           const replyMessageId = `xiaoyou-${Date.now()}`;
-          let chunkSeq = 0;
-          let fullText = "";
-          let replyEndSent = false;
 
           await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
             ctx: inboundCtx,
@@ -199,57 +195,24 @@ export const xiayouPlugin = {
             dispatcherOptions: {
               responsePrefix: "",
               deliver: async (payload: any) => {
+                // Fallback: 当 block streaming 未生效时，deliver 被调用
                 const textToSend = payload.markdown || payload.text;
                 if (!textToSend) return;
 
-                fullText += (fullText ? "\n" : "") + textToSend;
-
                 if (_client && _client.isConnected()) {
-                  // 每个 block 作为一个 chunk 推送
-                  _client.sendChunk({
-                    type: "reply_chunk",
+                  _client.sendReply({
+                    type: "reply",
                     conversationId,
                     messageId: replyMessageId,
                     replyToMessageId: inboundMessageId,
-                    delta: textToSend,
-                    seq: chunkSeq++,
+                    text: textToSend,
                     timestamp: Date.now(),
                   });
-                  logger.info(`[xiaoyou] chunk #${chunkSeq} sent to ${conversationId}`);
-                }
-              },
-              onComplete: async () => {
-                // Gateway 调用 onComplete 表示所有 block 已推送完毕
-                replyEndSent = true;
-                if (_client && _client.isConnected()) {
-                  _client.sendReplyEnd({
-                    type: "reply_end",
-                    conversationId,
-                    messageId: replyMessageId,
-                    replyToMessageId: inboundMessageId,
-                    fullText,
-                    timestamp: Date.now(),
-                  });
-                  logger.info(`[xiaoyou] streaming completed to ${conversationId} (${chunkSeq} blocks)${inboundMessageId ? ` (replyTo=${inboundMessageId})` : ""}`);
+                  logger.info(`[xiaoyou] reply sent to ${conversationId}${inboundMessageId ? ` (replyTo=${inboundMessageId})` : ""}`);
                 }
               },
             },
           });
-
-          // dispatch resolve 后，如果 onComplete 未被调用（旧版本兼容），手动发 reply_end
-          if (!replyEndSent && chunkSeq > 0 && _client && _client.isConnected()) {
-            _client.sendReplyEnd({
-              type: "reply_end",
-              conversationId,
-              messageId: replyMessageId,
-              replyToMessageId: inboundMessageId,
-              fullText,
-              timestamp: Date.now(),
-            });
-            logger.info(`[xiaoyou] streaming completed (fallback) to ${conversationId} (${chunkSeq} blocks)${inboundMessageId ? ` (replyTo=${inboundMessageId})` : ""}`);
-          } else if (chunkSeq === 0) {
-            logger.warn(`[xiaoyou] no reply generated for ${conversationId}`);
-          }
         },
       });
 
@@ -277,17 +240,34 @@ export const xiayouPlugin = {
 
   // ── Outbound 出站 ──────────────────────────────────
   outbound: {
-    send: async ({ to, payload }: any) => {
+    send: async ({ to, payload, meta, ...rest }: any) => {
       if (!_client || !_client.isConnected()) {
         return { ok: false, error: "xiaoyou: not connected" };
       }
 
-      const baseReply = {
+      // 调试日志：观察 Gateway block streaming 时传入的完整参数
+      const rt = getRuntime();
+      const logger = rt?.log || console;
+      logger.info(`[xiaoyou] outbound.send called: to=${to}, payload=${JSON.stringify(payload)}, meta=${JSON.stringify(meta)}, rest=${JSON.stringify(rest)}`);
+
+      // 推断 streamStatus：
+      // Gateway block streaming 可能通过 meta 或 payload 传递流式信息
+      const streamMeta = meta?.blockStream || payload?.blockStream || meta?.stream;
+      const isFinal = streamMeta?.final ?? meta?.final ?? payload?.final;
+      const seq = streamMeta?.seq ?? meta?.seq ?? payload?.seq;
+      const streamStatus = streamMeta
+        ? (isFinal ? "end" : "chunk")
+        : (meta?.isBlock ? "chunk" : undefined);
+
+      const baseReply: any = {
         type: "reply" as const,
         conversationId: to,
-        messageId: `xiaoyou-${Date.now()}`,
+        messageId: payload.messageId || meta?.messageId || `xiaoyou-${Date.now()}`,
+        replyToMessageId: payload.replyToMessageId || meta?.replyToMessageId,
         agentId: payload.agentId,
         timestamp: Date.now(),
+        ...(streamStatus && { streamStatus }),
+        ...(seq !== undefined && { seq }),
       };
 
       if (payload.kind === "text") {

package/src/enterprise-client.ts

@@ -11,8 +11,6 @@ import type {
   Frame,
   InboundMessage,
   OutboundReply,
-  OutboundReplyChunk,
-  OutboundReplyEnd,
   PongFrame,
 } from "./types.js";
 
@@ -33,8 +31,6 @@ export type EnterpriseClient = {
   connect: () => void;
   disconnect: () => void;
   sendReply: (reply: OutboundReply) => boolean;
-  sendChunk: (chunk: OutboundReplyChunk) => boolean;
-  sendReplyEnd: (end: OutboundReplyEnd) => boolean;
   isConnected: () => boolean;
 };
 
@@ -186,27 +182,9 @@ export function createEnterpriseClient(opts: EnterpriseClientOptions): Enterpris
     return true;
   }
 
-  function sendChunk(chunk: OutboundReplyChunk): boolean {
-    if (!ws || ws.readyState !== WebSocket.OPEN || !authenticated) {
-      logger.warn("[xiaoyou] cannot send chunk: not connected");
-      return false;
-    }
-    ws.send(JSON.stringify(chunk));
-    return true;
-  }
-
-  function sendReplyEnd(end: OutboundReplyEnd): boolean {
-    if (!ws || ws.readyState !== WebSocket.OPEN || !authenticated) {
-      logger.warn("[xiaoyou] cannot send reply_end: not connected");
-      return false;
-    }
-    ws.send(JSON.stringify(end));
-    return true;
-  }
-
   function isConnected(): boolean {
     return ws !== null && ws.readyState === WebSocket.OPEN && authenticated;
   }
 
-  return { connect, disconnect, sendReply, sendChunk, sendReplyEnd, isConnected };
+  return { connect, disconnect, sendReply, isConnected };
 }

package/src/types.ts

@@ -47,6 +47,14 @@ export type Attachment = {
 
 // ─── 出站回复（插件 → 企业服务）─────────────────────────
 
+/**
+ * 流式状态标记：
+ * - "chunk"  — 流式片段，text 为增量内容
+ * - "end"    — 流结束，text 为完整文本
+ * - undefined — 非流式，一次性完整回复（向后兼容）
+ */
+export type StreamStatus = "chunk" | "end";
+
 export type OutboundReply = {
   type: "reply";
   conversationId: string;
@@ -56,33 +64,10 @@ export type OutboundReply = {
   mediaUrls?: string[];
   agentId?: string;
   timestamp: number;
-};
-
-/** 流式回复片段（插件 → 企业服务） */
-export type OutboundReplyChunk = {
-  type: "reply_chunk";
-  conversationId: string;
-  messageId: string;
-  replyToMessageId?: string;
-  /** 本次增量文本 */
-  delta: string;
-  /** 该 chunk 在整条回复中的序号（从 0 开始） */
-  seq: number;
-  agentId?: string;
-  timestamp: number;
-};
-
-/** 流式回复结束标记（插件 → 企业服务） */
-export type OutboundReplyEnd = {
-  type: "reply_end";
-  conversationId: string;
-  messageId: string;
-  replyToMessageId?: string;
-  /** 完整文本（可选，方便企业侧校验拼接结果） */
-  fullText?: string;
-  mediaUrls?: string[];
-  agentId?: string;
-  timestamp: number;
+  /** 流式标记：chunk=增量片段, end=流结束, 不传=一次性完整回复 */
+  streamStatus?: StreamStatus;
+  /** 流式片段序号（仅 streamStatus="chunk" 时有值，从 0 开始） */
+  seq?: number;
 };
 
 // ─── 控制帧 ─────────────────────────────────────────────
@@ -108,8 +93,6 @@ export type PongFrame = { type: "pong"; seq: number; ts: number };
 export type Frame =
   | InboundMessage
   | OutboundReply
-  | OutboundReplyChunk
-  | OutboundReplyEnd
   | AuthFrame
   | AuthResultFrame
   | PingFrame