openclaw-xiaoyou 1.3.2 → 1.3.3

package/package.json

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

package/src/channel.ts

@@ -16,6 +16,25 @@ let _runtime: any = null;
 export function setRuntime(rt: any) { _runtime = rt; }
 export function getRuntime() { return _runtime; }
 
+// ─── 按标点/换行拆分文本 ─────────────────────────────
+
+/**
+ * 将文本按中英文标点符号和换行符拆分为多个片段。
+ * 每个片段以标点或换行结尾（保留标点在片段内）。
+ */
+function splitBySentence(text: string): string[] {
+  // 匹配：中文标点（。！？；）、英文标点（.!?;）后跟空格或结尾、换行符
+  const parts = text.split(/(?<=[。！？；\n])|(?<=[.!?;]\s)/);
+  const result: string[] = [];
+  for (const part of parts) {
+    const trimmed = part;
+    if (trimmed.length > 0) {
+      result.push(trimmed);
+    }
+  }
+  return result.length > 0 ? result : [text];
+}
+
 // ─── Config Adapter ──────────────────────────────────
 
 function getChannelConfig(cfg: any): any {
@@ -180,14 +199,15 @@ export const xiayouPlugin = {
             Timestamp: Date.now(),
           });
 
-          // 4. 分发消息给 Agent
+          // 4. 分发并获取回复（流式 — 按标点拆分）
           //
-          // Block streaming 机制说明：
-          // 当 blockStreaming=true 且 Gateway 配置了 blockStreamingDefault="on" 时，
-          // Gateway 会在 LLM 生成过程中通过 outbound.send 逐块推送消息，
-          // 不经过 deliver 回调。deliver 仅在非流式场景下被调用（作为 fallback）。
+          // Gateway 的 block streaming 会多次调用 deliver，每次一个 block。
+          // 我们在 deliver 内部进一步按标点/换行拆分，实现更细粒度的流式推送。
           //
           const replyMessageId = `xiaoyou-${Date.now()}`;
+          let chunkSeq = 0;
+          let fullText = "";
+          let replyEndSent = false;
 
           await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
             ctx: inboundCtx,
@@ -195,24 +215,62 @@ export const xiayouPlugin = {
             dispatcherOptions: {
               responsePrefix: "",
               deliver: async (payload: any) => {
-                // Fallback: 当 block streaming 未生效时，deliver 被调用
                 const textToSend = payload.markdown || payload.text;
                 if (!textToSend) return;
 
+                // 按标点/换行拆分为更细的片段
+                const sentences = splitBySentence(textToSend);
+
+                for (const sentence of sentences) {
+                  fullText += sentence;
+                  if (_client && _client.isConnected()) {
+                    _client.sendReply({
+                      type: "reply",
+                      conversationId,
+                      messageId: replyMessageId,
+                      replyToMessageId: inboundMessageId,
+                      text: sentence,
+                      streamStatus: "chunk",
+                      seq: chunkSeq++,
+                      timestamp: Date.now(),
+                    });
+                  }
+                }
+                logger.info(`[xiaoyou] ${sentences.length} chunks sent to ${conversationId} (total seq=${chunkSeq})`);
+              },
+              onComplete: async () => {
+                replyEndSent = true;
                 if (_client && _client.isConnected()) {
                   _client.sendReply({
                     type: "reply",
                     conversationId,
                     messageId: replyMessageId,
                     replyToMessageId: inboundMessageId,
-                    text: textToSend,
+                    text: fullText,
+                    streamStatus: "end",
                     timestamp: Date.now(),
                   });
-                  logger.info(`[xiaoyou] reply sent to ${conversationId}${inboundMessageId ? ` (replyTo=${inboundMessageId})` : ""}`);
+                  logger.info(`[xiaoyou] stream end sent to ${conversationId} (${chunkSeq} chunks)${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}`);
+          }
         },
       });
 
@@ -240,34 +298,17 @@ export const xiayouPlugin = {
 
   // ── Outbound 出站 ──────────────────────────────────
   outbound: {
-    send: async ({ to, payload, meta, ...rest }: any) => {
+    send: async ({ to, payload }: any) => {
       if (!_client || !_client.isConnected()) {
         return { ok: false, error: "xiaoyou: not connected" };
       }
 
-      // 调试日志：观察 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 = {
+      const baseReply = {
         type: "reply" as const,
         conversationId: to,
-        messageId: payload.messageId || meta?.messageId || `xiaoyou-${Date.now()}`,
-        replyToMessageId: payload.replyToMessageId || meta?.replyToMessageId,
+        messageId: `xiaoyou-${Date.now()}`,
         agentId: payload.agentId,
         timestamp: Date.now(),
-        ...(streamStatus && { streamStatus }),
-        ...(seq !== undefined && { seq }),
       };
 
       if (payload.kind === "text") {