openclaw-xiaoyou 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-xiaoyou",
-  "version": "1.3.1",
+  "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,20 +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。
-          // 统一使用 type="reply"，通过 streamStatus 字段区分：
-          //   streamStatus="chunk" — 增量片段
-          //   streamStatus="end"   — 流结束（text 为完整文本）
-          //   无 streamStatus      — 一次性完整回复（向后兼容）
+          // 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,
@@ -201,11 +195,10 @@ 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()) {
                   _client.sendReply({
                     type: "reply",
@@ -213,46 +206,13 @@ export const xiayouPlugin = {
                     messageId: replyMessageId,
                     replyToMessageId: inboundMessageId,
                     text: textToSend,
-                    streamStatus: "chunk",
-                    seq: chunkSeq++,
                     timestamp: Date.now(),
                   });
-                  logger.info(`[xiaoyou] chunk #${chunkSeq} sent to ${conversationId}`);
-                }
-              },
-              onComplete: async () => {
-                replyEndSent = true;
-                if (_client && _client.isConnected()) {
-                  _client.sendReply({
-                    type: "reply",
-                    conversationId,
-                    messageId: replyMessageId,
-                    replyToMessageId: inboundMessageId,
-                    text: fullText,
-                    streamStatus: "end",
-                    timestamp: Date.now(),
-                  });
-                  logger.info(`[xiaoyou] stream end sent to ${conversationId} (${chunkSeq} chunks)${inboundMessageId ? ` (replyTo=${inboundMessageId})` : ""}`);
+                  logger.info(`[xiaoyou] reply sent to ${conversationId}${inboundMessageId ? ` (replyTo=${inboundMessageId})` : ""}`);
                 }
               },
             },
           });
-
-          // dispatch resolve 后，如果 onComplete 未被调用（旧版本兼容），手动发 end
-          if (!replyEndSent && chunkSeq > 0 && _client && _client.isConnected()) {
-            _client.sendReply({
-              type: "reply",
-              conversationId,
-              messageId: replyMessageId,
-              replyToMessageId: inboundMessageId,
-              text: fullText,
-              streamStatus: "end",
-              timestamp: Date.now(),
-            });
-            logger.info(`[xiaoyou] stream end (fallback) sent to ${conversationId} (${chunkSeq} chunks)${inboundMessageId ? ` (replyTo=${inboundMessageId})` : ""}`);
-          } else if (chunkSeq === 0) {
-            logger.warn(`[xiaoyou] no reply generated for ${conversationId}`);
-          }
         },
       });
 
@@ -280,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") {