@eyeclaw/eyeclaw 2.3.8 → 2.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyeclaw/eyeclaw",
-  "version": "2.3.8",
+  "version": "2.3.11",
   "description": "EyeClaw plugin for OpenClaw - HTTP SSE streaming + WebSocket client",
   "type": "module",
   "main": "./index.ts",

package/src/http-handler.ts

@@ -74,7 +74,7 @@ export function createHttpHandler(api: OpenClawPluginApi, getConfig: () => EyeCl
     
     try {
       const body = await readJsonBody(req)
-      const { message, session_id, stream_id } = body
+      const { message, session_id, stream_id, openclaw_session_id } = body
       
       if (!message) {
         res.statusCode = 400
@@ -84,6 +84,7 @@ export function createHttpHandler(api: OpenClawPluginApi, getConfig: () => EyeCl
       }
       
       logger.info(`[EyeClaw] Chat: ${message.substring(0, 50)}...`)
+      logger.info(`[EyeClaw] OpenClaw Session: ${openclaw_session_id || 'default'}`)
       
       // SSE 响应头
       res.setHeader('Content-Type', 'text/event-stream')
@@ -94,7 +95,8 @@ export function createHttpHandler(api: OpenClawPluginApi, getConfig: () => EyeCl
       // 获取 Gateway 配置
       const gatewayPort = api.config?.gateway?.port ?? 18789
       const gatewayToken = api.config?.gateway?.auth?.token
-      const sessionKey = session_id ? `eyeclaw:${session_id}` : 'eyeclaw:default'
+      // 使用 openclaw_session_id 作为 OpenClaw 的会话标识，如果未提供则使用默认值
+      const sessionKey = openclaw_session_id || 'eyeclaw:default'
       
       // 调用 OpenClaw
       const openclawUrl = `http://127.0.0.1:${gatewayPort}/v1/chat/completions`

package/src/websocket-client.ts

@@ -26,6 +26,7 @@ export class EyeClawWebSocketClient {
   private reconnectDelay = 3000
   private subscribed = false
   private pingInterval: any = null
+  private chunkSequence = 0 // 每个会话的 chunk 序号
 
   constructor(api: OpenClawPluginApi, config: EyeClawConfig, getState: () => any) {
     this.api = api
@@ -103,9 +104,9 @@ export class EyeClawWebSocketClient {
         return
       }
 
-      // Ping/pong (协议级别的 ping，直接响应 pong)
+      // Ping/pong (WebSocket 协议级别的 ping 由浏览器自动响应，无需手动处理)
       if (message.type === 'ping') {
-        this.send({ type: 'pong' })
+        this.api.logger.debug('[EyeClaw] Received protocol-level ping (auto-handled by WebSocket)')
         return
       }
       
@@ -175,21 +176,29 @@ export class EyeClawWebSocketClient {
       return
     }
     
-    // 从 metadata 提取 session_id
+    // 从 metadata 提取 session_id (用于 Rails 内部追踪)
     const sessionId = metadata?.session_id
     
+    // 从 metadata 提取 openclaw_session_id (用于 OpenClaw 对话上下文)
+    // 如果未指定，使用 bot_id 作为默认值，这样同一个 Bot 的所有请求共享上下文
+    const openclawSessionId = metadata?.openclaw_session_id || `bot_${this.config.botId}`
+    
     this.api.logger.info(`[EyeClaw] Processing: ${userMessage.substring(0, 50)}...`)
-    this.api.logger.info(`[EyeClaw] Session ID: ${sessionId}`)
+    this.api.logger.info(`[EyeClaw] Rails Session ID: ${sessionId}`)
+    this.api.logger.info(`[EyeClaw] OpenClaw Session ID: ${openclawSessionId}`)
 
     // 通过 OpenClaw API 处理消息，获取流式响应
-    await this.processWithOpenClaw(userMessage, sessionId)
+    await this.processWithOpenClaw(userMessage, sessionId, openclawSessionId)
   }
 
   /**
    * 使用 OpenClaw API 处理消息（流式）
    * 调用自己的 HTTP 端点 /eyeclaw/chat
    */
-  private async processWithOpenClaw(message: string, sessionId?: string) {
+  private async processWithOpenClaw(message: string, sessionId?: string, openclawSessionId?: string) {
+    // 重置 chunk 序号（每个新会话）
+    this.chunkSequence = 0
+    
     const state = this.getState()
     const gatewayPort = state.gatewayPort
     const eyeclawUrl = `http://127.0.0.1:${gatewayPort}/eyeclaw/chat`
@@ -197,6 +206,7 @@ export class EyeClawWebSocketClient {
     const requestBody = {
       message,
       session_id: sessionId,
+      openclaw_session_id: openclawSessionId,
     }
 
     const headers: Record<string, string> = {
@@ -311,10 +321,12 @@ export class EyeClawWebSocketClient {
    */
   private sendChunk(content: string, sessionId?: string) {
     const timestamp = new Date().toISOString();
-    this.api.logger.info(`[EyeClaw] [${timestamp}] Sending chunk to Rails: "${content}"`);
+    const sequence = this.chunkSequence++;
+    this.api.logger.info(`[EyeClaw] [${timestamp}] Sending chunk #${sequence} to Rails: "${content}"`);
     this.sendMessage('stream_chunk', {
       content,
       session_id: sessionId,
+      sequence, // 添加序号
     })
   }
 
@@ -339,7 +351,7 @@ export class EyeClawWebSocketClient {
    */
   private startPing() {
     this.pingInterval = setInterval(() => {
-      // 调用 Rails BotChannel 的 ping action
+      // 调用 Rails BotChannel 的 ping 方法（使用 ActionCable 标准协议）
       const channelIdentifier = JSON.stringify({
         channel: 'BotChannel',
         bot_id: this.config.botId,
@@ -350,6 +362,7 @@ export class EyeClawWebSocketClient {
         identifier: channelIdentifier,
         data: JSON.stringify({
           action: 'ping',
+          timestamp: new Date().toISOString(),
         }),
       })
     }, 60000) // 60秒心跳一次