@dcrays/dcgchat-test 0.2.20 → 0.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",

package/src/monitor.ts

@@ -3,7 +3,7 @@ import WebSocket from "ws";
 import { handleDcgchatMessage } from "./bot.js";
 import { resolveAccount } from "./channel.js";
 import { setWsConnection } from "./connection.js";
-import type { InboundMessage, OutboundReply } from "./types.js";
+import type { InboundMessage } from "./types.js";
 import { setMsgParams,setMsgStatus } from "./tool.js";
 import { installSkill, uninstallSkill } from "./skill.js";
 
@@ -16,6 +16,7 @@ export type MonitorDcgchatOpts = {
 
 const RECONNECT_DELAY_MS = 3000;
 const HEARTBEAT_INTERVAL_MS = 30_000;
+const emptyToolText = ['/new', '/search','/stop', '/abort', '/queue interrupt']
 
 function buildConnectUrl(account: Record<string, string>): string {
   const { wsUrl, botToken, userId, domainId, appId } = account;
@@ -111,7 +112,9 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       
       if (parsed.messageType == "openclaw_bot_chat") {
         const msg = parsed as unknown as InboundMessage;
-        setMsgStatus('running');
+        if (!emptyToolText.includes(msg.content.text?.trim())) {
+          setMsgStatus('running');
+        }
         log(`dcgchat[${account.accountId}]: openclaw_bot_chat received, ${JSON.stringify(msg)}`);
         setMsgParams({
           userId: msg._userId,
@@ -123,6 +126,8 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
           botId: msg.content.bot_id,
           agentId: msg.content.agent_id,
         });
+        msg.content.app_id = account.appId || '100';
+        msg.content.domain_id = account.domainId || '1000';
         await handleDcgchatMessage({
           cfg,
           msg,

package/src/tool.ts

@@ -30,70 +30,112 @@ export function getMsgStatus() {
 }
 let toolCallId = '';
 let toolName = '';
-export function monitoringToolMessage(api: OpenClawPluginApi) {
-  api.on("after_tool_call", (event) => {
-    const ws = getWsConnection()
-    const params = getMsgParams();
-    const status = getMsgStatus();
+type PluginHookName = "before_model_resolve" | "before_prompt_build" | "before_agent_start" | "llm_input" | "llm_output" | "agent_end" | "before_compaction" | "after_compaction" | "before_reset" | "message_received" | "message_sending" | "message_sent" | "before_tool_call" | "after_tool_call" | "tool_result_persist" | "before_message_write" | "session_start" | "session_end" | "subagent_spawning" | "subagent_delivery_target" | "subagent_spawned" | "subagent_ended" | "gateway_start" | "gateway_stop";
+const eventList = [
+  {event: 'message_received', message: '书灵墨宝已就位，收到你的指令，正在解析...'},
+  // {event: 'before_prompt_build', message: '正在查阅背景资料，构建思考逻辑'},
+  // {event: 'before_agent_start', message: '书灵墨宝已就位，准备开始执行任务'},
+  {event: 'subagent_spawning', message: '任务较复杂，正在召唤专项助手协作...'},
+  {event: 'subagent_spawned', message: '专项助手已加入，准备并行处理...'},
+  {event: 'subagent_delivery_target', message: '正在将子任务分发给对应的助手...'},
+  {event: 'llm_input', message: '正在进行深度推理与思考'},
+  {event: 'llm_output', message: '模型思考完毕，正在整合最终答案...'},
+  {event: 'agent_end', message: '核心任务已处理完毕...'},
+  {event: 'subagent_ended', message: '专项助手任务结束，已安全退出。'},
+  // {event: 'before_message_write', message: '正在将本次对话存入记忆库...'},
+  {event: 'message_sending', message: ''},
+  {event: 'message_send', message: ''},
+  {event: 'before_tool_call', message: ''},
+  {event: 'after_tool_call', message: ''},
+];
+
+function sendToolCallMessage(text: string, toolCallId: string, isCover: number) {
+  const ws = getWsConnection()
+  const params = getMsgParams();
+  const status = getMsgStatus();
+  if (ws?.readyState === WebSocket.OPEN && status === 'running') {
+    ws.send(JSON.stringify({
+      messageType: "openclaw_bot_chat",
+      _userId: params?.userId,
+      source: "client",
+      content: {
+        bot_token: params?.token,
+        domain_id: params?.domainId,
+        app_id: params?.appId,
+        bot_id: params?.botId,
+        agent_id: params?.agentId,
+        response: 'all_finished',
+        session_id:params?.sessionId,
+        message_id: params?.messageId || Date.now().toString()
+      },
+    }))
+    ws.send(JSON.stringify({
+      messageType: "openclaw_bot_chat",
+      _userId: params?.userId,
+      source: "client",
+      content: {
+        bot_token: params?.token,
+        domain_id: params?.domainId,
+        app_id: params?.appId,
+        bot_id: params?.botId,
+        agent_id: params?.agentId,
+        tool_call_id: toolCallId,
+        is_cover: isCover,
+        thinking_content: text,
+        response: '',
+        session_id:params?.sessionId,
+        message_id: params?.messageId || Date.now().toString()
+      },
+    }));
+    ws.send(JSON.stringify({
+      messageType: "openclaw_bot_chat",
+      _userId: params?.userId,
+      source: "client",
+      content: {
+        bot_token: params?.token,
+        domain_id: params?.domainId,
+        app_id: params?.appId,
+        bot_id: params?.botId,
+        agent_id: params?.agentId,
+        response: 'all_finished',
+        session_id:params?.sessionId,
+        message_id: params?.messageId || Date.now().toString()
+      },
+    }))
+  }
+}
 
-    // 去除重复的工具调用结果字段
-    const { result: _result, ...rest } = event;
-    const log = api.runtime?.log ?? api.log ?? console.log;
-    if (ws?.readyState === WebSocket.OPEN && status === 'running') {
-      // @ts-ignore
-      if (!toolCallId || toolCallId !== event.toolCallId || !toolName || toolName !== event.toolName) {
-        ws.send(JSON.stringify({
-          messageType: "openclaw_bot_chat",
-          _userId: params?.userId,
-          source: "client",
-          content: {
-            bot_token: params?.token,
-            response: 'all_finished',
-            session_id:params?.sessionId,
-            message_id: params?.messageId || Date.now().toString()
-          },
-        }));
-      }
-      const text = JSON.stringify({
-        type: 'tool_call',
-        specialIdentification: 'dcgchat_tool_call_special_identification',
-        ...rest
+export function monitoringToolMessage(api: OpenClawPluginApi) {
+    for (const item of eventList) {
+      api.on(item.event as PluginHookName, (event: any) => {
+        console.log("🚀 ~ 工具调用结果： ~ event:", item.event)
+        if (['after_tool_call', 'before_tool_call'].includes(item.event)) {
+          const { result: _result, ...rest } = event;
+          const text = JSON.stringify({
+            type: item.event,
+            specialIdentification: 'dcgchat_tool_call_special_identification',
+            callId: event.toolCallId || event.runId || Date.now().toString(),
+            ...rest,
+            status: item.event === 'after_tool_call' ? 'finished' : 'running'
+          });
+          sendToolCallMessage(text, event.toolCallId || event.runId || Date.now().toString(), item.event === 'after_tool_call' ? 1 : 0)
+        } else if (item.message) {
+          const text = JSON.stringify({
+              type: item.event,
+              specialIdentification: 'dcgchat_tool_call_special_identification',
+              toolName: '',
+              callId: event.runId || Date.now().toString(),
+              params: item.message
+            });
+            sendToolCallMessage(text, event.runId || Date.now().toString(), 0)
+          console.log('消息事件：', item.event, item.message)
+        } else {
+          console.log('其他事件：', item.event, JSON.stringify(event).slice(0, 3200))
+        }
+    //   log?.(`dcgchat[${params?.sessionId}]:11111111 tool message to ${params?.sessionId}, ${JSON.stringify(rest)}`);
+    // } else {
+    //   log?.(`dcgchat[${params?.sessionId}]:22222222 tool ${status} message to ${ws?.readyState}, ${JSON.stringify(rest)}`);
+    // }
       });
-      ws.send(JSON.stringify({
-        messageType: "openclaw_bot_chat",
-        _userId: params?.userId,
-        source: "client",
-        content: {
-          bot_token: params?.token,
-          domain_id: params?.domainId,
-          app_id: params?.appId,
-          bot_id: params?.botId,
-          agent_id: params?.agentId,
-          thinking_content: text,
-          response: '',
-          session_id:params?.sessionId,
-          message_id: params?.messageId || Date.now().toString()
-        },
-      }));
-      // @ts-ignore
-      if (!toolCallId || toolCallId !== event.toolCallId || !toolName || toolName !== event.toolName) {
-        ws.send(JSON.stringify({
-          messageType: "openclaw_bot_chat",
-          _userId: params?.userId,
-          source: "client",
-          content: {
-            bot_token: params?.token,
-            response: 'all_finished',
-            session_id:params?.sessionId,
-            message_id: params?.messageId || Date.now().toString()
-          },
-        }));
-      }
-      toolCallId = event.toolCallId;
-      toolName = event.toolName;
-      log?.(`dcgchat[${params?.sessionId}]:11111111 tool message to ${params?.sessionId}, ${JSON.stringify(rest)}`);
-    } else {
-      log?.(`dcgchat[${params?.sessionId}]:22222222 tool ${status} message to ${ws?.readyState}, ${JSON.stringify(rest)}`);
     }
-  });
 }