@eyeclaw/eyeclaw 2.0.13 → 2.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyeclaw/eyeclaw",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "EyeClaw channel plugin for OpenClaw - Connect your local OpenClaw instance to EyeClaw platform",
   "type": "module",
   "main": "./index.ts",

package/src/channel.ts

@@ -202,7 +202,7 @@ export const eyeclawPlugin: ChannelPlugin<ResolvedEyeClawAccount> = {
       // Use runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher for true streaming
       client.setSendAgentCallback(async (message: string) => {
         const streamId = Date.now().toString()
-        const streamKey = 'eyeclaw-web-chat'
+        const streamKey = `eyeclaw-${ctx.accountId}`
         
         try {
           ctx.log?.info(`🤖 Processing message via OpenClaw dispatchReply: ${message}`)
@@ -210,21 +210,51 @@ export const eyeclawPlugin: ChannelPlugin<ResolvedEyeClawAccount> = {
           // 发送 stream_start
           client.sendStreamChunk('stream_start', streamId, '')
           
+          // Build message context using OpenClaw's proper API (like WeCom plugin)
+          const runtime = getRuntime()
+          const core = runtime.channel
+          
+          // Get envelope format options
+          const envelopeOptions = core.reply.resolveEnvelopeFormatOptions(ctx.cfg)
+          
+          // Format the message envelope (like WeCom does)
+          const body = core.reply.formatAgentEnvelope({
+            channel: 'EyeClaw Web',
+            from: 'web_user',
+            timestamp: Date.now(),
+            previousTimestamp: undefined,
+            envelope: envelopeOptions,
+            body: message,
+          })
+          
+          // Build the inbound context payload
+          const ctxBase = {
+            Body: body,
+            RawBody: message,
+            CommandBody: message,
+            From: `eyeclaw:${streamKey}`,
+            To: `eyeclaw:${ctx.accountId}`,
+            SessionKey: `eyeclaw:${streamKey}`,
+            AccountId: ctx.accountId,
+            ChatType: 'direct',
+            ConversationLabel: streamKey,
+            SenderName: 'web_user',
+            SenderId: streamKey,
+            Provider: 'eyeclaw',
+            Surface: 'eyeclaw',
+            OriginatingChannel: 'eyeclaw',
+            OriginatingTo: ctx.accountId,
+            CommandAuthorized: true,
+          }
+          
+          // Finalize the context payload
+          const ctxPayload = core.reply.finalizeInboundContext(ctxBase)
+          
+          ctx.log?.info(`Prepared context: SessionKey=${ctxPayload.SessionKey}, Body=${ctxPayload.Body?.substring(0, 50)}`)
+          
           // 使用 OpenClaw 的 dispatchReplyWithBufferedBlockDispatcher 实现真正的流式
-          // 这和 WeCom 插件使用的方式完全相同
-          // API 路径: runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher
           await runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-            ctx: {
-              // Inbound message context
-              sessionKey: `eyeclaw:${streamKey}`,
-              messageKey: `eyeclaw:${streamKey}:${streamId}`,
-              peerKey: streamKey,
-              message: {
-                role: 'user',
-                content: message,
-                roleDetail: 'user',
-              },
-            },
+            ctx: ctxPayload,
             cfg: ctx.cfg,
             dispatcherOptions: {
               // 流式回调 - LLM 每生成一块文本就实时调用

package/src/client.ts

@@ -296,20 +296,54 @@ export class EyeClawClient {
   }
 
   sendLog(level: string, message: string): void {
+    // Send to BotChannel
     this.sendChannelMessage('log', {
       level,
       message,
       timestamp: new Date().toISOString(),
     })
+    
+    // Also broadcast directly to bot_{id} stream as backup
+    this.send({
+      command: 'message',
+      identifier: JSON.stringify({
+        channel: `bot_${this.config.botId}`,
+      }),
+      data: JSON.stringify({
+        action: 'log',
+        level,
+        message,
+        timestamp: new Date().toISOString(),
+      }),
+    })
   }
 
   sendStreamChunk(type: string, streamId: string, chunk: string): void {
+    this.logger.info(`📤 Sending stream_chunk: type=${type}, streamId=${streamId}, chunk="${chunk.substring(0, 30)}..."`)
+    
+    // Send to BotChannel which will broadcast to bot_{id} for Rails to receive
     this.sendChannelMessage('stream_chunk', {
       type,
       stream_id: streamId,
       chunk,
       timestamp: new Date().toISOString(),
     })
+    
+    // Also broadcast directly to bot_{id} stream as backup (Rails expects stream_type)
+    this.logger.info(`📤 Also sending to bot_${this.config.botId} channel`)
+    this.send({
+      command: 'message',
+      identifier: JSON.stringify({
+        channel: `bot_${this.config.botId}`,
+      }),
+      data: JSON.stringify({
+        action: 'stream_chunk',
+        stream_type: type,  // Rails expects 'stream_type'
+        stream_id: streamId,
+        chunk,
+        timestamp: new Date().toISOString(),
+      }),
+    })
   }
 
   sendCommandResult(command: string, result: unknown, error?: string): void {